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.2" #define KDE_VERSION_STRING "4.9.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 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 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


 kfilemetainfo.h   kfilemetainfo.h 
skipping to change at line 120 skipping to change at line 120
* @brief Construct a KFileMetaInfo instance from another one. * @brief Construct a KFileMetaInfo instance from another one.
**/ **/
KFileMetaInfo(const KFileMetaInfo&); KFileMetaInfo(const KFileMetaInfo&);
/** /**
* @brief Destructor. * @brief Destructor.
**/ **/
~KFileMetaInfo(); ~KFileMetaInfo();
/** /**
* @brief Copy a KFileMetaInfo instance from another one. * @brief Copy a KFileMetaInfo instance from another one.
**/ **/
const KFileMetaInfo& operator=(KFileMetaInfo const& kfmi); KFileMetaInfo& operator=(KFileMetaInfo const& kfmi);
/** /**
* @brief Save the changes made to this KFileMetaInfo instance. * @brief Save the changes made to this KFileMetaInfo instance.
*/ */
bool applyChanges(); bool applyChanges();
/** /**
* @brief Retrieve all the items. * @brief Retrieve all the items.
**/ **/
const QHash<QString, KFileMetaInfoItem>& items() const; const QHash<QString, KFileMetaInfoItem>& items() const;
KFileMetaInfoItem& item(const QString& key); KFileMetaInfoItem& item(const QString& key);
const KFileMetaInfoItem& item(const QString& key) const; const KFileMetaInfoItem& item(const QString& key) const;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 kjob.h   kjob.h 
skipping to change at line 358 skipping to change at line 358
#if !defined(Q_MOC_RUN) && !defined(DOXYGEN_SHOULD_SKIP_THIS) && !defined(I N_IDE_PARSER) #if !defined(Q_MOC_RUN) && !defined(DOXYGEN_SHOULD_SKIP_THIS) && !defined(I N_IDE_PARSER)
private: // don't tell moc, doxygen or kdevelop, but those signals are in f act private private: // don't tell moc, doxygen or kdevelop, but those signals are in f act private
#endif #endif
/** /**
* Emitted when the job is finished, in any case. It is used to notify * Emitted when the job is finished, in any case. It is used to notify
* observers that the job is terminated and that progress can be hidden . * observers that the job is terminated and that progress can be hidden .
* *
* This is a private signal, it can't be emitted directly by subclasses of * This is a private signal, it can't be emitted directly by subclasses of
* KJob, use emitResult() instead. * KJob, use emitResult() instead.
* *
* Client code is not supposed to connect to this signal, signal result * In general, to be notified of a job's completion, client code should
should connect to result()
* be used instead. * rather than finished(), so that kill(Quietly) is indeed quiet.
* * However if you store a list of jobs and they might get killed silent
* If you store a list of jobs and they might get killed silently, ly,
* then you must connect to this instead of result(). * then you must connect to this instead of result(), to avoid dangling
pointers in your list.
* *
* @param job the job that emitted this signal * @param job the job that emitted this signal
* @internal * @internal
* *
* @see result * @see result
*/ */
void finished(KJob *job); void finished(KJob *job);
/** /**
* Emitted when the job is suspended. * Emitted when the job is suspended.
 End of changes. 1 change blocks. 
6 lines changed or deleted 7 lines changed or added


 krun.h   krun.h 
skipping to change at line 182 skipping to change at line 182
* file name. * file name.
*/ */
void setSuggestedFileName(const QString& fileName); void setSuggestedFileName(const QString& fileName);
/** /**
* Suggested file name given by the server (e.g. HTTP content-dispositi on) * Suggested file name given by the server (e.g. HTTP content-dispositi on)
*/ */
QString suggestedFileName() const; QString suggestedFileName() const;
/** /**
* Associated window, as passed to the constructor
* @since 4.9.3
*/
QWidget* window() const;
/**
* Open a list of URLs with a certain service (application). * Open a list of URLs with a certain service (application).
* *
* @param service the service to run * @param service the service to run
* @param urls the list of URLs, can be empty (app launched * @param urls the list of URLs, can be empty (app launched
* without argument) * without argument)
* @param window The top-level widget of the app that invoked this obje ct. * @param window The top-level widget of the app that invoked this obje ct.
* @param tempFiles if true and urls are local files, they will be dele ted * @param tempFiles if true and urls are local files, they will be dele ted
* when the application exits. * when the application exits.
* @param suggestedFileName see setSuggestedFileName * @param suggestedFileName see setSuggestedFileName
* @param asn Application startup notification id, if any (otherwise "" ). * @param asn Application startup notification id, if any (otherwise "" ).
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 pluginloader.h   pluginloader.h 
skipping to change at line 46 skipping to change at line 46
// * add support for ContainmentActions plugins // * add support for ContainmentActions plugins
// * add KPluginInfo listing support for Containments (already loaded via t he applet loading code) // * add KPluginInfo listing support for Containments (already loaded via t he applet loading code)
/** /**
* This is an abstract base class which defines an interface to which Plasm a's * This is an abstract base class which defines an interface to which Plasm a's
* Applet Loading logic can communicate with a parent application. The plug in loader * Applet Loading logic can communicate with a parent application. The plug in loader
* must be set before any plugins are loaded, otherwise (for safety reasons ), the * must be set before any plugins are loaded, otherwise (for safety reasons ), the
* default PluginLoader implementation will be used. The reimplemented vers ion should * default PluginLoader implementation will be used. The reimplemented vers ion should
* not do more than simply returning a loaded plugin. It should not init() it, and it should not * not do more than simply returning a loaded plugin. It should not init() it, and it should not
* hang on to it. The associated methods will be called only when a compone nt of Plasma * hang on to it. The associated methods will be called only when a compone nt of Plasma
* needs to load a _new_ plugin. (e.g. DataEngine does it's own caching). * needs to load a _new_ plugin. (e.g. DataEngine does its own caching).
* *
* @author Ryan Rix <ry@n.rix.si> * @author Ryan Rix <ry@n.rix.si>
* @since 4.6 * @since 4.6
**/ **/
class PLASMA_EXPORT PluginLoader class PLASMA_EXPORT PluginLoader
{ {
public: public:
PluginLoader(); PluginLoader();
virtual ~PluginLoader(); virtual ~PluginLoader();
 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/