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.1 (4.6.1)" #define KDE_VERSION_STRING "4.6.2 (4.6.2)"
/** /**
* @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 1 #define KDE_VERSION_RELEASE 2
/** /**
* @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


 kglobal.h   kglobal.h 
skipping to change at line 311 skipping to change at line 311
/** /**
* This class is useful in libraries where you want to make sure that * This class is useful in libraries where you want to make sure that
* anyone that uses your library will get the correct catalog loaded. * anyone that uses your library will get the correct catalog loaded.
* Just declare a static KCatalogLoader in the global namespace of one of * Just declare a static KCatalogLoader in the global namespace of one of
* your cpp files and that will load your catalog once * your cpp files and that will load your catalog once
* the global klocale is created * the global klocale is created
* *
* @param catalogName The name of your catalog * @param catalogName The name of your catalog
* *
* @since 4.6 * @since 4.6.2
* *
* Example: * Example:
* @code * @code
* static const KCatalogLoader loader("libkdepim"); * static const KCatalogLoader loader("libkdepim");
* @endcode * @endcode
*/ */
class KCatalogLoader class KDECORE_EXPORT KCatalogLoader
{ {
public: public:
KCatalogLoader(const QString &catalogName); KCatalogLoader(const QString &catalogName);
}; };
/** /**
* Access to the KDE global objects. * Access to the KDE global objects.
* KGlobal provides you with pointers of many central * KGlobal provides you with pointers of many central
* objects that exist only once in the process. It is also * objects that exist only once in the process. It is also
* responsible for managing instances of KStaticDeleterBase. * responsible for managing instances of KStaticDeleterBase.
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/