| 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.2 (4.6.2)" | #define KDE_VERSION_STRING "4.6.3 (4.6.3)" | |||
| /** | /** | |||
| * @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 2 | #define KDE_VERSION_RELEASE 3 | |||
| /** | /** | |||
| * @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 | |||
| kglobalsettings.h | kglobalsettings.h | |||
|---|---|---|---|---|
| skipping to change at line 525 | skipping to change at line 525 | |||
| * This is only useful for configuration modules such as krdb and shoul d not be | * This is only useful for configuration modules such as krdb and shoul d not be | |||
| * used in normal circumstances. | * used in normal circumstances. | |||
| * @param config KConfig from which to load the colors (passed as-is to | * @param config KConfig from which to load the colors (passed as-is to | |||
| * ::KColorScheme). | * ::KColorScheme). | |||
| * | * | |||
| * @return the QPalette | * @return the QPalette | |||
| */ | */ | |||
| static QPalette createApplicationPalette(const KSharedConfigPtr &config = KSharedConfigPtr()); | static QPalette createApplicationPalette(const KSharedConfigPtr &config = KSharedConfigPtr()); | |||
| /** | /** | |||
| * Used to obtain the QPalette that will be used to set the application | ||||
| palette. | ||||
| * | ||||
| * This is only useful for configuration modules such as krdb and shoul | ||||
| d not be | ||||
| * used in normal circumstances. | ||||
| * @param config KConfig from which to load the colors (passed as-is to | ||||
| * ::KColorScheme). | ||||
| * | ||||
| * @note The difference between this and the previous is that this neve | ||||
| r caches. | ||||
| * @since 4.6.3 | ||||
| * | ||||
| * @return the QPalette | ||||
| */ | ||||
| static QPalette createNewApplicationPalette(const KSharedConfigPtr &con | ||||
| fig = KSharedConfigPtr()); | ||||
| /** | ||||
| * An identifier for change signals. | * An identifier for change signals. | |||
| * \see emitChange | * \see emitChange | |||
| */ | */ | |||
| enum ChangeType { PaletteChanged = 0, FontChanged, StyleChanged, | enum ChangeType { PaletteChanged = 0, FontChanged, StyleChanged, | |||
| SettingsChanged, IconChanged, CursorChanged, | SettingsChanged, IconChanged, CursorChanged, | |||
| ToolbarStyleChanged, ClipboardConfigChanged, | ToolbarStyleChanged, ClipboardConfigChanged, | |||
| BlockShortcuts, NaturalSortingChanged }; | BlockShortcuts, NaturalSortingChanged }; | |||
| /** | /** | |||
| * Notifies all KDE applications on the current display of a change. | * Notifies all KDE applications on the current display of a change. | |||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 19 lines changed or added | |||