| 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.4 (4.6.4)" | #define KDE_VERSION_STRING "4.6.5 (4.6.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 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 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 | |||
| kfiletreeview.h | kfiletreeview.h | |||
|---|---|---|---|---|
| skipping to change at line 75 | skipping to change at line 75 | |||
| * Returns the current root url of the view. | * Returns the current root url of the view. | |||
| */ | */ | |||
| KUrl rootUrl() const; | KUrl rootUrl() const; | |||
| /** | /** | |||
| * Returns true if the view is currently showing hidden files | * Returns true if the view is currently showing hidden files | |||
| * @since 4.3 | * @since 4.3 | |||
| */ | */ | |||
| bool showHiddenFiles() const; | bool showHiddenFiles() const; | |||
| /** | ||||
| * @reimplemented | ||||
| */ | ||||
| QSize sizeHint() const; | ||||
| public Q_SLOTS: | public Q_SLOTS: | |||
| /** | /** | |||
| * Sets whether the dir-only mode is @p enabled. | * Sets whether the dir-only mode is @p enabled. | |||
| * | * | |||
| * In dir-only mode, only directories and subdirectories | * In dir-only mode, only directories and subdirectories | |||
| * are listed in the view. | * are listed in the view. | |||
| */ | */ | |||
| void setDirOnlyMode(bool enabled); | void setDirOnlyMode(bool enabled); | |||
| /** | /** | |||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 5 lines changed or added | |||
| scheduler.h | scheduler.h | |||
|---|---|---|---|---|
| skipping to change at line 269 | skipping to change at line 269 | |||
| /** | /** | |||
| * When true, the next job will check whether KLauncher has a slave | * When true, the next job will check whether KLauncher has a slave | |||
| * on hold that is suitable for the job. | * on hold that is suitable for the job. | |||
| * @param b true when KLauncher has a job on hold | * @param b true when KLauncher has a job on hold | |||
| */ | */ | |||
| static void checkSlaveOnHold(bool b); | static void checkSlaveOnHold(bool b); | |||
| static void emitReparseSlaveConfiguration(); | static void emitReparseSlaveConfiguration(); | |||
| /** | ||||
| * Updates the internal metadata from job. | ||||
| * | ||||
| * @since 4.6.5 | ||||
| */ | ||||
| static void updateInternalMetaData(SimpleJob* job); | ||||
| Q_SIGNALS: | Q_SIGNALS: | |||
| void slaveConnected(KIO::Slave *slave); | void slaveConnected(KIO::Slave *slave); | |||
| void slaveError(KIO::Slave *slave, int error, const QString &errorM sg); | void slaveError(KIO::Slave *slave, int error, const QString &errorM sg); | |||
| // DBUS | // DBUS | |||
| Q_SCRIPTABLE void reparseSlaveConfiguration(const QString &); | Q_SCRIPTABLE void reparseSlaveConfiguration(const QString &); | |||
| private: | private: | |||
| Q_DISABLE_COPY(Scheduler) | Q_DISABLE_COPY(Scheduler) | |||
| Scheduler(); | Scheduler(); | |||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 7 lines changed or added | |||