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.3.4 (KDE 4.3.4)" | #define KDE_VERSION_STRING "4.3.5 (KDE 4.3.5)" | |||
/** | /** | |||
* @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 3 | #define KDE_VERSION_MINOR 3 | |||
/** | /** | |||
* @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 4 | #define KDE_VERSION_RELEASE 5 | |||
/** | /** | |||
* @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 | |||
kfilepreviewgenerator.h | kfilepreviewgenerator.h | |||
---|---|---|---|---|
skipping to change at line 135 | skipping to change at line 135 | |||
Q_PRIVATE_SLOT(d, void updateIcons(const QModelIndex&, const QModelInde x&)) | Q_PRIVATE_SLOT(d, void updateIcons(const QModelIndex&, const QModelInde x&)) | |||
Q_PRIVATE_SLOT(d, void addToPreviewQueue(const KFileItem&, const QPixma p&)) | Q_PRIVATE_SLOT(d, void addToPreviewQueue(const KFileItem&, const QPixma p&)) | |||
Q_PRIVATE_SLOT(d, void slotPreviewJobFinished(KJob*)) | Q_PRIVATE_SLOT(d, void slotPreviewJobFinished(KJob*)) | |||
Q_PRIVATE_SLOT(d, void updateCutItems()) | Q_PRIVATE_SLOT(d, void updateCutItems()) | |||
Q_PRIVATE_SLOT(d, void dispatchIconUpdateQueue()) | Q_PRIVATE_SLOT(d, void dispatchIconUpdateQueue()) | |||
Q_PRIVATE_SLOT(d, void pauseIconUpdates()) | Q_PRIVATE_SLOT(d, void pauseIconUpdates()) | |||
Q_PRIVATE_SLOT(d, void resumeIconUpdates()) | Q_PRIVATE_SLOT(d, void resumeIconUpdates()) | |||
Q_PRIVATE_SLOT(d, void resolveMimeType()) | Q_PRIVATE_SLOT(d, void resolveMimeType()) | |||
Q_PRIVATE_SLOT(d, void requestSequenceIcon(const QModelIndex&, int)) | Q_PRIVATE_SLOT(d, void requestSequenceIcon(const QModelIndex&, int)) | |||
Q_PRIVATE_SLOT(d, void delayedIconUpdate()) | Q_PRIVATE_SLOT(d, void delayedIconUpdate()) | |||
Q_PRIVATE_SLOT(d, void rowsAboutToBeRemoved(const QModelIndex&, int, in t)) | ||||
}; | }; | |||
#endif | #endif | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 1 lines changed or added | |||
kzip.h | kzip.h | |||
---|---|---|---|---|
skipping to change at line 151 | skipping to change at line 151 | |||
* Opens the archive for reading. | * Opens the archive for reading. | |||
* Parses the directory listing of the archive | * Parses the directory listing of the archive | |||
* and creates the KArchiveDirectory/KArchiveFile entries. | * and creates the KArchiveDirectory/KArchiveFile entries. | |||
* @param mode the mode of the file | * @param mode the mode of the file | |||
*/ | */ | |||
virtual bool openArchive( QIODevice::OpenMode mode ); | virtual bool openArchive( QIODevice::OpenMode mode ); | |||
/// Closes the archive | /// Closes the archive | |||
virtual bool closeArchive(); | virtual bool closeArchive(); | |||
/** | /// Reimplemented from KArchive | |||
* @internal Not needed for zip | ||||
*/ | ||||
virtual bool doWriteDir( const QString& name, const QString& user, | virtual bool doWriteDir( const QString& name, const QString& user, | |||
const QString& group, mode_t perm, time_t atim e, | const QString& group, mode_t perm, time_t atim e, | |||
time_t mtime, time_t ctime ); | time_t mtime, time_t ctime ); | |||
protected: | protected: | |||
virtual void virtual_hook( int id, void* data ); | virtual void virtual_hook( int id, void* data ); | |||
private: | private: | |||
class KZipPrivate; | class KZipPrivate; | |||
KZipPrivate * const d; | KZipPrivate * const d; | |||
End of changes. 1 change blocks. | ||||
3 lines changed or deleted | 1 lines changed or added | |||