corona.h   corona.h 
skipping to change at line 265 skipping to change at line 265
* Imports an applet layout from a config file. The results will be add ed to the * Imports an applet layout from a config file. The results will be add ed to the
* current set of Containments. * current set of Containments.
* *
* @param config the name of the config file to load from, * @param config the name of the config file to load from,
* or the default config file if QString() * or the default config file if QString()
* @return the list of containments that were loaded * @return the list of containments that were loaded
* @since 4.5 * @since 4.5
*/ */
QList<Plasma::Containment *> importLayout(const KConfigBase &config); QList<Plasma::Containment *> importLayout(const KConfigBase &config);
/**
* Exports a set of containments to a config file.
*
* @param config the config group to save to
* @param containments the list of containments to save
* @since 4.5.4
*/
void exportLayout(KConfigGroup &config, QList<Containment*> containment
s);
public Q_SLOTS: public Q_SLOTS:
/** /**
* Initializes the layout from a config file. This will first clear any existing * Initializes the layout from a config file. This will first clear any existing
* Containments, load a layout from the requested configuration file, r equest the * Containments, load a layout from the requested configuration file, r equest the
* default layout if needed and update immutability. * default layout if needed and update immutability.
* *
* @param config the name of the config file to load from, * @param config the name of the config file to load from,
* or the default config file if QString() * or the default config file if QString()
*/ */
void initializeLayout(const QString &config = QString()); void initializeLayout(const QString &config = QString());
 End of changes. 1 change blocks. 
0 lines changed or deleted 10 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.5.3 (KDE 4.5.3)" #define KDE_VERSION_STRING "4.5.4 (KDE 4.5.4)"
/** /**
* @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 5 #define KDE_VERSION_MINOR 5
/** /**
* @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 3 #define KDE_VERSION_RELEASE 4
/** /**
* @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


 kxmlguifactory.h   kxmlguifactory.h 
skipping to change at line 219 skipping to change at line 219
* makingChanges(true) is emitted before any change happens, and * makingChanges(true) is emitted before any change happens, and
* makingChanges(false) is emitted after the change is done. * makingChanges(false) is emitted after the change is done.
* This allows e.g. KMainWindow to know that the GUI is * This allows e.g. KMainWindow to know that the GUI is
* being changed programmatically and not by the user (so there is no r eason to * being changed programmatically and not by the user (so there is no r eason to
* save toolbar settings afterwards). * save toolbar settings afterwards).
* @since 4.1.3 * @since 4.1.3
*/ */
void makingChanges(bool); void makingChanges(bool);
private: private:
KXMLGUIFactoryPrivate *const d; friend class KXMLGUIClient;
/// Internal, called by KXMLGUIClient destructor
void forgetClient(KXMLGUIClient *client);
KXMLGUIFactoryPrivate *const d;
}; };
#endif #endif
/* vim: et sw=4 /* vim: et sw=4
*/ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 5 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/