kdeversion.h   kdeversion.h 
skipping to change at line 47 skipping to change at line 47
* This macro contains the KDE version in string form. As it is a macro, * This macro contains the KDE version in string form. As it is a macro,
* it contains the version at compile time. See versionString() if you need * it contains the version at compile time. See versionString() if you need
* the KDE version used at runtime. * the KDE version used at runtime.
* *
* @note The version string might contain a section in parentheses, * @note The version string might contain a section in parentheses,
* especially for development versions of KDE. * especially for development versions of KDE.
* If you use that macro directly for a file format (e.g. OASIS Open Docume nt) * If you use that macro directly for a file format (e.g. OASIS Open Docume nt)
* or for a protocol (e.g. http) be careful that it is appropriate. * or for a protocol (e.g. http) be careful that it is appropriate.
* (Fictional) example: "4.0.90 (>=20070101)" * (Fictional) example: "4.0.90 (>=20070101)"
*/ */
#define KDE_VERSION_STRING "4.6.3 (4.6.3)" #define KDE_VERSION_STRING "4.6.4 (4.6.4)"
/** /**
* @def KDE_VERSION_MAJOR * @def KDE_VERSION_MAJOR
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Major version of KDE, at compile time * @brief Major version of KDE, at compile time
*/ */
#define KDE_VERSION_MAJOR 4 #define KDE_VERSION_MAJOR 4
/** /**
* @def KDE_VERSION_MINOR * @def KDE_VERSION_MINOR
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Minor version of KDE, at compile time * @brief Minor version of KDE, at compile time
*/ */
#define KDE_VERSION_MINOR 6 #define KDE_VERSION_MINOR 6
/** /**
* @def KDE_VERSION_RELEASE * @def KDE_VERSION_RELEASE
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Release version of KDE, at compile time * @brief Release version of KDE, at compile time
*/ */
#define KDE_VERSION_RELEASE 3 #define KDE_VERSION_RELEASE 4
/** /**
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Make a number from the major, minor and release number of a KDE v ersion * @brief Make a number from the major, minor and release number of a KDE v ersion
* *
* This function can be used for preprocessing when KDE_IS_VERSION is not * This function can be used for preprocessing when KDE_IS_VERSION is not
* appropriate. * appropriate.
*/ */
#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 kidentityproxymodel.h   kidentityproxymodel.h 
skipping to change at line 56 skipping to change at line 56
QItemSelection mapSelectionFromSource(const QItemSelection& selection) co nst; QItemSelection mapSelectionFromSource(const QItemSelection& selection) co nst;
QItemSelection mapSelectionToSource(const QItemSelection& selection) cons t; QItemSelection mapSelectionToSource(const QItemSelection& selection) cons t;
QModelIndexList match(const QModelIndex& start, int role, const QVariant& value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStarts With|Qt::MatchWrap)) const; QModelIndexList match(const QModelIndex& start, int role, const QVariant& value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStarts With|Qt::MatchWrap)) const;
void setSourceModel(QAbstractItemModel* sourceModel); void setSourceModel(QAbstractItemModel* sourceModel);
bool insertColumns(int column, int count, const QModelIndex& parent = QMo delIndex()); bool insertColumns(int column, int count, const QModelIndex& parent = QMo delIndex());
bool insertRows(int row, int count, const QModelIndex& parent = QModelInd ex()); bool insertRows(int row, int count, const QModelIndex& parent = QModelInd ex());
bool removeColumns(int column, int count, const QModelIndex& parent = QMo delIndex()); bool removeColumns(int column, int count, const QModelIndex& parent = QMo delIndex());
bool removeRows(int row, int count, const QModelIndex& parent = QModelInd ex()); bool removeRows(int row, int count, const QModelIndex& parent = QModelInd ex());
virtual bool canFetchMore(const QModelIndex& parent) const;
virtual void fetchMore(const QModelIndex& parent);
virtual QStringList mimeTypes() const;
virtual QMimeData* mimeData(const QModelIndexList& indexes) const;
virtual Qt::DropActions supportedDropActions() const;
protected: protected:
KIdentityProxyModel(KIdentityProxyModelPrivate *privateClass, QObject* pa rent); KIdentityProxyModel(KIdentityProxyModelPrivate *privateClass, QObject* pa rent);
KIdentityProxyModelPrivate * const d_ptr; KIdentityProxyModelPrivate * const d_ptr;
protected Q_SLOTS: protected Q_SLOTS:
virtual void resetInternalData(); virtual void resetInternalData();
private: private:
Q_DECLARE_PRIVATE(KIdentityProxyModel) Q_DECLARE_PRIVATE(KIdentityProxyModel)
Q_DISABLE_COPY(KIdentityProxyModel) Q_DISABLE_COPY(KIdentityProxyModel)
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/