kdemacros.h   kdemacros.h 
skipping to change at line 446 skipping to change at line 446
#else #else
# define KDE_BF_ENUM(a) a # define KDE_BF_ENUM(a) a
# define KDE_CAST_BF_ENUM(a,b) b # define KDE_CAST_BF_ENUM(a,b) b
#endif #endif
/** /**
* @def KDE_WEAK_SYMBOL * @def KDE_WEAK_SYMBOL
* @ingroup KDEMacros * @ingroup KDEMacros
* *
* The KDE_WEAK_SYMBOL macro can be used to tell the compiler that * The KDE_WEAK_SYMBOL macro can be used to tell the compiler that
* a particular function should be a weak symbol (that e.g. may be override n * a particular function should be a weak symbol (that e.g. may be overridd en
* in another library, -Bdirect will not bind this symbol directly) * in another library, -Bdirect will not bind this symbol directly)
*/ */
#ifdef __GNUC__ #ifdef __GNUC__
#define KDE_WEAK_SYMBOL __attribute__((__weak__)) #define KDE_WEAK_SYMBOL __attribute__((__weak__))
#else #else
#define KDE_WEAK_SYMBOL #define KDE_WEAK_SYMBOL
#endif #endif
/** /**
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 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.9.00" #define KDE_VERSION_STRING "4.9.1"
/** /**
* @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 9 #define KDE_VERSION_MINOR 9
/** /**
* @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 00 #define KDE_VERSION_RELEASE 1
/** /**
* @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


 kpluginloader.h   kpluginloader.h 
skipping to change at line 39 skipping to change at line 39
class KPluginFactory; class KPluginFactory;
class KService; class KService;
class KPluginLoaderPrivate; class KPluginLoaderPrivate;
/** /**
* \class KPluginLoader kpluginloader.h <KPluginLoader> * \class KPluginLoader kpluginloader.h <KPluginLoader>
* *
* This class can be used to dynamically load a plugin library at runtime. * This class can be used to dynamically load a plugin library at runtime.
* *
* This class makes sure that the Qt and KDE versions used to compile this library aren't newer then * This class makes sure that the Qt and KDE versions used to compile this library aren't newer than
* the ones currently used. * the ones currently used.
* *
* *
* This class is reentrant, you can load plugins from different threads. Yo u can also have multiple * This class is reentrant, you can load plugins from different threads. Yo u can also have multiple
* PluginLoaders for one library without negative effects. * PluginLoaders for one library without negative effects.
* The object obtained with factory() or the inherited method QPluginLoader ::instance() is * The object obtained with factory() or the inherited method QPluginLoader ::instance() is
* cached inside the library. If you call factory() or instance() multiple times, you will always get * cached inside the library. If you call factory() or instance() multiple times, you will always get
* the same object, even from different threads and different KPluginLoader instances. * the same object, even from different threads and different KPluginLoader instances.
* You can delete this object easily, a new one will be created if factory( ) or instance() is called * You can delete this object easily, a new one will be created if factory( ) or instance() is called
* afterwards. factory() uses instance() internally. * afterwards. factory() uses instance() internally.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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/