accessmanager.h   accessmanager.h 
skipping to change at line 208 skipping to change at line 208
* *
* @see KIO::get. * @see KIO::get.
* @since 4.6 * @since 4.6
*/ */
static void putReplyOnHold(QNetworkReply* reply); static void putReplyOnHold(QNetworkReply* reply);
/** /**
* Sets the network reply object to emit readyRead when it receives met a data. * Sets the network reply object to emit readyRead when it receives met a data.
* *
* Meta data is any information that is not the actual content itself, e.g. * Meta data is any information that is not the actual content itself, e.g.
* HTTP response headers of the HTTP protocol. You should only call thi * HTTP response headers of the HTTP protocol.
s *
* function, when an application does not connect to a reply object's * Calling this function will force the code connecting to QNetworkRepl
* metaDataChanged signal. y's
* readyRead signal to prematurely start dealing with the content that
might
* not yet have arrived. However, it is essential to make the put iosla
ve on
* hold functionality of KIO work in libraries like QtWebKit.
* *
* @see QNetworkReply::metaDataChanged * @see QNetworkReply::metaDataChanged
* @since 4.7 * @since 4.7
*/ */
void setEmitReadyReadOnMetaDataChange(bool); void setEmitReadyReadOnMetaDataChange(bool);
protected: protected:
/** /**
* Reimplemented for internal reasons, the API is not affected. * Reimplemented for internal reasons, the API is not affected.
* *
 End of changes. 1 change blocks. 
4 lines changed or deleted 9 lines changed or added


 applet.h   applet.h 
skipping to change at line 1004 skipping to change at line 1004
* and if there was a message already it will be hid den * and if there was a message already it will be hid den
* @param buttons an OR combination of all the buttons needed * @param buttons an OR combination of all the buttons needed
* *
* @see Plasma::MessageButtons * @see Plasma::MessageButtons
* @see messageButtonPressed * @see messageButtonPressed
* @since 4.3 * @since 4.3
*/ */
void showMessage(const QIcon &icon, const QString &message, const P lasma::MessageButtons buttons); void showMessage(const QIcon &icon, const QString &message, const P lasma::MessageButtons buttons);
/** /**
* Called when any of the geometry constraints have been updated. * Called when any of the constraints for the applet have been upda
ted. These constraints
* range from notifying when the applet has officially "started up"
to when geometry changes
* to when the form factor changes.
* *
* This is always called prior to painting and should be used as an * Each constraint that has been changed is passed in the constrain
ts flag.
* All of the constraints and how they work is documented in the @s
ee Plasma::Constraints
* enumeration.
*
* On applet creation, this is always called prior to painting and
can be used as an
* opportunity to layout the widget, calculate sizings, etc. * opportunity to layout the widget, calculate sizings, etc.
* *
* Do not call update() from this method; an update() will be trigg ered * Do not call update() from this method; an update() will be trigg ered
* at the appropriate time for the applet. * at the appropriate time for the applet.
* *
* @param constraints the type of constraints that were updated * @param constraints the type of constraints that were updated
* @property constraint * @property constraint
*/ */
virtual void constraintsEvent(Plasma::Constraints constraints); virtual void constraintsEvent(Plasma::Constraints constraints);
 End of changes. 2 change blocks. 
2 lines changed or deleted 13 lines changed or added


 browserextension.h   browserextension.h 
skipping to change at line 760 skipping to change at line 760
static BrowserHostExtension *childObject( QObject *obj ); static BrowserHostExtension *childObject( QObject *obj );
private: private:
class BrowserHostExtensionPrivate; class BrowserHostExtensionPrivate;
BrowserHostExtensionPrivate * const d; BrowserHostExtensionPrivate * const d;
}; };
/** /**
* An extension class for LiveConnect, i.e. a call from JavaScript * An extension class for LiveConnect, i.e. a call from JavaScript
* from a HTML page which embeds this part. * from a HTML page which embeds this part.
* A part can have an object hierarchie by using objid as a reference * A part can have an object hierarchy by using objid as a reference
* to an object. * to an object.
*/ */
class KPARTS_EXPORT LiveConnectExtension : public QObject class KPARTS_EXPORT LiveConnectExtension : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
enum Type { enum Type {
TypeVoid=0, TypeBool, TypeFunction, TypeNumber, TypeObject, TypeStrin g TypeVoid=0, TypeBool, TypeFunction, TypeNumber, TypeObject, TypeStrin g
}; };
typedef QList<QPair<Type, QString> > ArgList; typedef QList<QPair<Type, QString> > ArgList;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 configdialog.h   configdialog.h 
skipping to change at line 47 skipping to change at line 47
/** /**
* Sets the language/dictionary that will be selected by default * Sets the language/dictionary that will be selected by default
* in this config dialog. * in this config dialog.
* This overrides the setting in the config file. * This overrides the setting in the config file.
* *
* @param language the language which will be selected by default. * @param language the language which will be selected by default.
* @since 4.1 * @since 4.1
*/ */
void setLanguage( const QString &language ); void setLanguage( const QString &language );
/**
* return selected language
* @since 4.8.1
*/
QString language() const;
protected Q_SLOTS: protected Q_SLOTS:
virtual void slotOk(); virtual void slotOk();
virtual void slotApply(); virtual void slotApply();
Q_SIGNALS: Q_SIGNALS:
/** /**
* This is emitted when the user closed the dialog (and did not * This is emitted all the time when we change config and not just
* cancel it). language
* *
* @param language the language which the user has selected * @param language the language which the user has selected
* @since 4.1 * @since 4.1
*/ */
void languageChanged( const QString &language ); void languageChanged( const QString &language );
/**
* This is emitted when configChanged
* @since 4.8.1
*/
void configChanged();
private: private:
void init(KConfig *config); void init(KConfig *config);
private: private:
class Private; class Private;
friend class Private; friend class Private;
Private *const d; Private *const d;
Q_DISABLE_COPY(ConfigDialog) Q_DISABLE_COPY(ConfigDialog)
Q_PRIVATE_SLOT(d, void slotConfigChanged()) Q_PRIVATE_SLOT(d, void slotConfigChanged())
}; };
} }
 End of changes. 4 change blocks. 
2 lines changed or deleted 14 lines changed or added


 dispatcher.h   dispatcher.h 
skipping to change at line 47 skipping to change at line 47
* Dispatcher::registerComponent(componentData(), this, "loadSettings"); * Dispatcher::registerComponent(componentData(), this, "loadSettings");
* \endcode * \endcode
* *
* @author Matthias Kretz <kretz@kde.org> * @author Matthias Kretz <kretz@kde.org>
*/ */
namespace Dispatcher namespace Dispatcher
{ {
/** /**
* Register a slot to be called when the configuration for the componen tData * Register a slot to be called when the configuration for the componen tData
* has changed. @p componentData is the KComponentData object * has changed. @p componentData is the KComponentData object
* that is passed to KGenericFactory (if it is used). You can query * that is passed to KPluginFactory (if it is used). You can query
* it with KGenericFactory<YourClassName>::componentData(). * it with MyPluginFactory::componentData().
* componentData.componentName() is also the same name that is put into the * componentData.componentName() is also the same name that is put into the
* .desktop file of the KCMs for the X-KDE-ParentComponents. * .desktop file of the KCMs for the X-KDE-ParentComponents.
* *
* @param componentData The KComponentData object * @param componentData The KComponentData object
* @param recv The object that should receive the signal * @param recv The object that should receive the signal
* @param slot The slot to be called: "slotName" * @param slot The slot to be called: "slotName"
*/ */
KCMUTILS_EXPORT void registerComponent(const KComponentData &componentD ata, QObject *recv, const char *slot); KCMUTILS_EXPORT void registerComponent(const KComponentData &componentD ata, QObject *recv, const char *slot);
/** /**
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 genericfactory.h   genericfactory.h 
skipping to change at line 108 skipping to change at line 108
* called in createPartObject. * called in createPartObject.
* *
* Use the factory through the K_EXPORT_COMPONENT_FACTORY macro, like t hat: * Use the factory through the K_EXPORT_COMPONENT_FACTORY macro, like t hat:
* \code * \code
* typedef KParts::GenericFactory&lt;YourKPart&gt; YourKPartFactory; * typedef KParts::GenericFactory&lt;YourKPart&gt; YourKPartFactory;
* K_EXPORT_COMPONENT_FACTORY( yourlibrary, YourKPartFactory ) * K_EXPORT_COMPONENT_FACTORY( yourlibrary, YourKPartFactory )
* \endcode * \endcode
* yourlibrary is the library name that you compiled your KPart into. * yourlibrary is the library name that you compiled your KPart into.
*/ */
template <class T> template <class T>
class GenericFactory : public GenericFactoryBase<T> class KDE_DEPRECATED GenericFactory : public GenericFactoryBase<T>
{ {
public: public:
GenericFactory() { } GenericFactory() { }
virtual KParts::Part *createPartObject( QWidget *parentWidget, virtual KParts::Part *createPartObject( QWidget *parentWidget,
QObject *parent, QObject *parent,
const char *className, const char *className,
const QStringList &args ) const QStringList &args )
{ {
T *part = KDEPrivate::ConcreteFactory<T>::create( parentWidget, T *part = KDEPrivate::ConcreteFactory<T>::create( parentWidget,
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 htmlextension.h   htmlextension.h 
skipping to change at line 227 skipping to change at line 227
swap( copy ); swap( copy );
} }
return *this; return *this;
} }
private: private:
QSharedDataPointer<ElementPrivate> d; QSharedDataPointer<ElementPrivate> d;
}; };
}; };
/**
* @short An interface for modifying the settings of browser engines.
*
* This interface provides a generic means for querying or changing the
* settings of browser engines that implement it.
*
* To use this class simply cast an instance of the HTMLExtension object
* using qobject_cast<KParts::HtmlSettingsInterface>.
*
* Example:
* <code>
* KParts::HTMLExtension* extension = KParts::HTMLExtension::childObject(p
art);
* KParts::HtmlSettingsInterface* settings = qobject_cast&lt;KParts::HtmlS
ettingsInterface&gt;(extension);
* const bool autoLoadImages = settings->attribute(KParts::AutoLoadImages)
;
* </code>
*
* @since 4.9.0
*/
class KPARTS_EXPORT HtmlSettingsInterface
{
public:
/**
* Settings attribute types.
*/
enum HtmlSettingsType {
AutoLoadImages,
DnsPrefetchEnabled,
JavaEnabled,
JavascriptEnabled,
MetaRefreshEnabled,
PluginsEnabled,
PrivateBrowsingEnabled,
OfflineStorageDatabaseEnabled,
OfflineWebApplicationCacheEnabled,
LocalStorageEnabled,
UserDefinedStyleSheetURL
};
/**
* Destructor
*/
virtual ~HtmlSettingsInterface() {}
/**
* Returns the value of the browser engine's attribute @p type.
*/
virtual QVariant htmlSettingsProperty(HtmlSettingsType type) const = 0;
/**
* Sets the value of the browser engine's attribute @p type to @p value
.
*/
virtual bool setHtmlSettingsProperty(HtmlSettingsType type, const QVari
ant& value) = 0;
};
} // namespace KParts } // namespace KParts
inline void qSwap( KParts::SelectorInterface::Element & lhs, KParts::Select orInterface::Element & rhs ) inline void qSwap( KParts::SelectorInterface::Element & lhs, KParts::Select orInterface::Element & rhs )
{ {
lhs.swap( rhs ); lhs.swap( rhs );
} }
Q_DECLARE_OPERATORS_FOR_FLAGS(KParts::SelectorInterface::QueryMethods) Q_DECLARE_OPERATORS_FOR_FLAGS(KParts::SelectorInterface::QueryMethods)
Q_DECLARE_TYPEINFO(KParts::SelectorInterface::Element, Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(KParts::SelectorInterface::Element, Q_MOVABLE_TYPE);
Q_DECLARE_INTERFACE(KParts::SelectorInterface, Q_DECLARE_INTERFACE(KParts::SelectorInterface,
"org.kde.KParts.SelectorInterface") "org.kde.KParts.SelectorInterface")
Q_DECLARE_INTERFACE(KParts::HtmlSettingsInterface,
"org.kde.KParts.HtmlSettingsInterface")
#endif /* KPARTS_HTMLEXTENSION_H */ #endif /* KPARTS_HTMLEXTENSION_H */
 End of changes. 2 change blocks. 
0 lines changed or deleted 61 lines changed or added


 kcmodulecontainer.h   kcmodulecontainer.h 
skipping to change at line 166 skipping to change at line 166
* The module container takes care of testing the contained modules when be ing shown, as well * The module container takes care of testing the contained modules when be ing shown, as well
* as when the module itself is asked whether it should be shown. * as when the module itself is asked whether it should be shown.
* *
* @param modules the modules to put in the container * @param modules the modules to put in the container
* @param factoryName what factory name the module should have * @param factoryName what factory name the module should have
*/ */
#define KCMODULECONTAINER(modules, factoryName) \ #define KCMODULECONTAINER(modules, factoryName) \
class KCModuleContainer##factoryName : public KCModuleContainer \ class KCModuleContainer##factoryName : public KCModuleContainer \
{ \ { \
public: \ public: \
KCModuleContainer##factoryName(QWidget *parent, const QStringList & ) \ KCModuleContainer##factoryName(QWidget *parent, const QVariantList &) \
: KCModuleContainer(parent, QLatin1String(modules)) \ : KCModuleContainer(parent, QLatin1String(modules)) \
{ \ { \
} \ } \
}; \ }; \
typedef KGenericFactory<KCModuleContainer#factoryName> KCModuleContainer##f K_PLUGIN_FACTORY(KCModuleContainer##factoryName##Factory, \
actoryName##Factory; \ registerPlugin<KCModuleContainer#factoryName>(); \
K_EXPORT_COMPONENT_FACTORY(factoryName, KCModuleContainer##factoryName##Fac ) \
tory) K_EXPORT_PLUGIN(KCModuleContainer##factoryName##Factory)
#endif // KCMODULECONTAINER_H #endif // KCMODULECONTAINER_H
 End of changes. 2 change blocks. 
5 lines changed or deleted 5 lines changed or added


 kconfigdialog.h   kconfigdialog.h 
skipping to change at line 27 skipping to change at line 27
* along with this library; see the file COPYING.LIB. If not, write to * along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef KCONFIGDIALOG_H #ifndef KCONFIGDIALOG_H
#define KCONFIGDIALOG_H #define KCONFIGDIALOG_H
#include <kpagedialog.h> #include <kpagedialog.h>
class KConfig; class KConfig;
class KCoreConfigSkeleton;
class KConfigSkeleton; class KConfigSkeleton;
class KConfigDialogManager; class KConfigDialogManager;
/** /**
* \short Standard %KDE configuration dialog class * \short Standard %KDE configuration dialog class
* *
* The KConfigDialog class provides an easy and uniform means of displaying * The KConfigDialog class provides an easy and uniform means of displaying
* a settings dialog using KPageDialog, KConfigDialogManager and a * a settings dialog using KPageDialog, KConfigDialogManager and a
* KConfigSkeleton derived settings class. * KConfigSkeleton derived settings class.
* *
skipping to change at line 105 skipping to change at line 106
* there can be more than one dialog at a time. Use names such as: * there can be more than one dialog at a time. Use names such as:
* "Font Settings" or "Color Settings" and not just "Settings" in * "Font Settings" or "Color Settings" and not just "Settings" in
* applications where there is more than one dialog. * applications where there is more than one dialog.
* *
* @param config - Config object containing settings. * @param config - Config object containing settings.
*/ */
KConfigDialog( QWidget *parent, const QString& name, KConfigDialog( QWidget *parent, const QString& name,
KConfigSkeleton *config ); KConfigSkeleton *config );
/** /**
* @since 4.8.1
*
* @param parent - The parent of this object. Even though the class
* deletes itself the parent should be set so the dialog can be centered
* with the application on the screen.
*
* @param name - The name of this object. The name is used in determinin
g if
* there can be more than one dialog at a time. Use names such as:
* "Font Settings" or "Color Settings" and not just "Settings" in
* applications where there is more than one dialog.
*
* @param config - Config object containing settings.
*/
KConfigDialog( QWidget *parent, const QString& name,
KCoreConfigSkeleton *config );
/**
* Deconstructor, removes name from the list of open dialogs. * Deconstructor, removes name from the list of open dialogs.
* Deletes private class. * Deletes private class.
* @see exists() * @see exists()
*/ */
~KConfigDialog(); ~KConfigDialog();
/** /**
* Adds page to the dialog and to KConfigDialogManager. When an * Adds page to the dialog and to KConfigDialogManager. When an
* application is done adding pages show() should be called to * application is done adding pages show() should be called to
* display the dialog. * display the dialog.
 End of changes. 2 change blocks. 
0 lines changed or deleted 19 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.8.00 (4.8.0" #define KDE_VERSION_STRING "4.8.1 (4.8.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 8 #define KDE_VERSION_MINOR 8
/** /**
* @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


 kgenericfactory.h   kgenericfactory.h 
skipping to change at line 148 skipping to change at line 148
* class MyPlugin : public KParts::Plugin * class MyPlugin : public KParts::Plugin
* { * {
* Q_ OBJECT * Q_ OBJECT
* public: * public:
* MyPlugin( QObject *parent, const QStringList &args ); * MyPlugin( QObject *parent, const QStringList &args );
* ... * ...
* }; * };
* *
* K_EXPORT_COMPONENT_FACTORY( libmyplugin, KGenericFactory<MyPlugin> ) * K_EXPORT_COMPONENT_FACTORY( libmyplugin, KGenericFactory<MyPlugin> )
* \endcode * \endcode
*
* @deprecated use KPluginFactory
*/ */
template <class Product, class ParentType = QObject> template <class Product, class ParentType = QObject>
class KDE_DEPRECATED KGenericFactory : public KGenericFactoryBase<Product> class KDE_DEPRECATED KGenericFactory : public KGenericFactoryBase<Product>
{ {
public: public:
explicit KGenericFactory( const char *componentName = 0, const char *ca talogName = 0 ) explicit KGenericFactory( const char *componentName = 0, const char *ca talogName = 0 )
: KGenericFactoryBase<Product>(componentName, catalogName) : KGenericFactoryBase<Product>(componentName, catalogName)
{} {}
explicit KGenericFactory( const KAboutData *data ) explicit KGenericFactory( const KAboutData *data )
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 kglobalsettings.h   kglobalsettings.h 
skipping to change at line 595 skipping to change at line 595
* *
* @since 4.6 * @since 4.6
*/ */
void activate(ActivateOptions options); void activate(ActivateOptions options);
/** /**
* Valid values for the settingsChanged signal * Valid values for the settingsChanged signal
*/ */
enum SettingsCategory { SETTINGS_MOUSE, SETTINGS_COMPLETION, SETTINGS_P ATHS, enum SettingsCategory { SETTINGS_MOUSE, SETTINGS_COMPLETION, SETTINGS_P ATHS,
SETTINGS_POPUPMENU, SETTINGS_QT, SETTINGS_SHORT CUTS, SETTINGS_POPUPMENU, SETTINGS_QT, SETTINGS_SHORT CUTS,
SETTINGS_LOCALE }; SETTINGS_LOCALE, SETTINGS_STYLE };
Q_SIGNALS: Q_SIGNALS:
/** /**
* Emitted when the application has changed its palette due to a KContr ol request. * Emitted when the application has changed its palette due to a KContr ol request.
* *
* Normally, widgets will update their palette automatically, but you * Normally, widgets will update their palette automatically, but you
* should connect to this to program special behavior. * should connect to this to program special behavior.
* *
* Note: If you derive from a QWidget-based class, a faster method is t o * Note: If you derive from a QWidget-based class, a faster method is t o
* reimplement QWidget::changeEvent() and catch QEvent::PaletteCh ange. * reimplement QWidget::changeEvent() and catch QEvent::PaletteCh ange.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 kpushbutton.h   kpushbutton.h 
skipping to change at line 111 skipping to change at line 111
*/ */
KStandardGuiItem::StandardItem guiItem() const; KStandardGuiItem::StandardItem guiItem() const;
/** /**
* Sets the Icon Set for this button. It also takes into account the * Sets the Icon Set for this button. It also takes into account the
* KGlobalSettings::showIconsOnPushButtons() setting. * KGlobalSettings::showIconsOnPushButtons() setting.
*/ */
void setIcon( const KIcon &icon ); void setIcon( const KIcon &icon );
/** /**
* Sets the pixmap for this button. Rarely used. This one exists mostly * Sets the pixmap for this button. This one exists mostly for usage in
for usage in Qt designer, Qt designer.
* with icons embedded into the ui file. But you should rather save the
m separately, and load them
* with KIcon("name") so that the icons are themeable.
*/ */
#ifndef KDE_NO_DEPRECATED void setIcon( const QIcon &pix );
KDE_DEPRECATED void setIcon( const QIcon &pix );
#endif
/** /**
* Sets the text of the button * Sets the text of the button
*/ */
void setText( const QString &text ); void setText( const QString &text );
/** /**
* Sets a delayed popup menu * Sets a delayed popup menu
* for consistency, since menu() isn't virtual * for consistency, since menu() isn't virtual
*/ */
 End of changes. 2 change blocks. 
8 lines changed or deleted 3 lines changed or added


 ktoolbar.h   ktoolbar.h 
skipping to change at line 166 skipping to change at line 166
* and apply them. * and apply them.
* *
* @param forceGlobal is deprecated. In kde3 it used to mean * @param forceGlobal is deprecated. In kde3 it used to mean
* "force global settings, i.e. ignore @p cg", but only for visibility/ position/index, * "force global settings, i.e. ignore @p cg", but only for visibility/ position/index,
* not for icon size etc. Only visibility is still controlled by this. * not for icon size etc. Only visibility is still controlled by this.
*/ */
void applySettings( const KConfigGroup &cg, bool forceGlobal = false ); void applySettings( const KConfigGroup &cg, bool forceGlobal = false );
/** /**
* Sets the XML gui client. * Sets the XML gui client.
* @deprecated use addXMLGUIClient.
*/ */
void setXMLGUIClient( KXMLGUIClient *client ); #ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED void setXMLGUIClient( KXMLGUIClient *client );
#endif
/**
* Adds an XML gui client that uses this toolbar
* @since 4.8.1
*/
void addXMLGUIClient( KXMLGUIClient *client );
/** /**
* Load state from an XML @param element, called by KXMLGUIBuilder. * Load state from an XML @param element, called by KXMLGUIBuilder.
*/ */
void loadState( const QDomElement &element ); void loadState( const QDomElement &element );
/** /**
* Save state into an XML @param element, called by KXMLGUIBuilder. * Save state into an XML @param element, called by KXMLGUIBuilder.
*/ */
void saveState( QDomElement &element ) const; void saveState( QDomElement &element ) const;
 End of changes. 2 change blocks. 
1 lines changed or deleted 10 lines changed or added


 kviewstatesaver.h   kviewstatesaver.h 
skipping to change at line 174 skipping to change at line 174
@author Stephen Kelly <stephen@kdab.com> @author Stephen Kelly <stephen@kdab.com>
@since 4.5 @since 4.5
*/ */
class KDEUI_EXPORT KViewStateSaver : public QObject class KDEUI_EXPORT KViewStateSaver : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
/** /**
Constructor Constructor
@param parent standard parent object, but ignored since this object wil l delete itself
*/ */
explicit KViewStateSaver(QObject *parent = 0); explicit KViewStateSaver(QObject *parent = 0);
/** /**
Destructor Destructor
*/ */
~KViewStateSaver(); ~KViewStateSaver();
/** /**
* The view whose state is persisted. * The view whose state is persisted.
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 kwidgetitemdelegate.h   kwidgetitemdelegate.h 
skipping to change at line 37 skipping to change at line 37
#include <QtCore/QPersistentModelIndex> #include <QtCore/QPersistentModelIndex>
#include <QtGui/QAbstractItemDelegate> #include <QtGui/QAbstractItemDelegate>
#include <kdeui_export.h> #include <kdeui_export.h>
class QObject; class QObject;
class QPainter; class QPainter;
class QStyleOption; class QStyleOption;
class QStyleOptionViewItem; class QStyleOptionViewItem;
class QAbstractItemView; class QAbstractItemView;
class QItemSelection;
class KWidgetItemDelegatePrivate; class KWidgetItemDelegatePrivate;
class KWidgetItemDelegatePool; class KWidgetItemDelegatePool;
/** /**
* This class allows to create item delegates embedding simple widgets to i nteract * This class allows to create item delegates embedding simple widgets to i nteract
* with items. For instance you can add push buttons, line edits, etc. to y our delegate * with items. For instance you can add push buttons, line edits, etc. to y our delegate
* and use them to modify the state of your model. * and use them to modify the state of your model.
* *
* @since 4.1 * @since 4.1
skipping to change at line 166 skipping to change at line 167
//@cond PRIVATE //@cond PRIVATE
friend class KWidgetItemDelegatePool; friend class KWidgetItemDelegatePool;
friend class KWidgetItemDelegateEventListener; friend class KWidgetItemDelegateEventListener;
KWidgetItemDelegatePrivate *const d; KWidgetItemDelegatePrivate *const d;
Q_PRIVATE_SLOT(d, void _k_slotRowsInserted(const QModelIndex&,int,int)) Q_PRIVATE_SLOT(d, void _k_slotRowsInserted(const QModelIndex&,int,int))
Q_PRIVATE_SLOT(d, void _k_slotRowsAboutToBeRemoved(const QModelIndex&,i nt,int)) Q_PRIVATE_SLOT(d, void _k_slotRowsAboutToBeRemoved(const QModelIndex&,i nt,int))
Q_PRIVATE_SLOT(d, void _k_slotRowsRemoved(const QModelIndex&,int,int)) Q_PRIVATE_SLOT(d, void _k_slotRowsRemoved(const QModelIndex&,int,int))
Q_PRIVATE_SLOT(d, void _k_slotDataChanged(const QModelIndex&,const QMod elIndex&)) Q_PRIVATE_SLOT(d, void _k_slotDataChanged(const QModelIndex&,const QMod elIndex&))
Q_PRIVATE_SLOT(d, void _k_slotLayoutChanged()) Q_PRIVATE_SLOT(d, void _k_slotLayoutChanged())
Q_PRIVATE_SLOT(d, void _k_slotModelReset()) Q_PRIVATE_SLOT(d, void _k_slotModelReset())
Q_PRIVATE_SLOT(d, void _k_slotSelectionChanged(const QItemSelection&,co nst QItemSelection&))
//@endcond //@endcond
}; };
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 plasma.h   plasma.h 
skipping to change at line 45 skipping to change at line 45
*/ */
namespace Plasma namespace Plasma
{ {
/** /**
* The Constraint enumeration lists the various constraints that Plasma * The Constraint enumeration lists the various constraints that Plasma
* objects have managed for them and which they may wish to react to, * objects have managed for them and which they may wish to react to,
* for instance in Applet::constraintsUpdated * for instance in Applet::constraintsUpdated
*/ */
enum Constraint { enum Constraint {
NoConstraint = 0, NoConstraint = 0, /**< No constraint; never passed in to Applet::constr
/** The FormFactor for an object */ aintsEvent on its own */
FormFactorConstraint = 1, FormFactorConstraint = 1, /**< The FormFactor for an object */
/** The Location of an object */ LocationConstraint = 2, /**< The Location of an object */
LocationConstraint = 2, ScreenConstraint = 4, /**< Which screen an object is on */
/** Which screen an object is on */ SizeConstraint = 8, /**< the size of the applet was changed */
ScreenConstraint = 4, ImmutableConstraint = 16, /**< the immutability (locked) nature of the
/** the size of the applet was changed */ applet changed */
SizeConstraint = 8, StartupCompletedConstraint = 32, /**< application startup has completed
/** the immutability (locked) nature of the applet changed */ */
ImmutableConstraint = 16, ContextConstraint = 64, /**< the context (e.g. activity) has changed */
/** application startup has completed */ PopupConstraint = 128, /**< the position of the popup needs to be recal
StartupCompletedConstraint = 32, culated*/
/** the desktop context has changed */
ContextConstraint = 64,
/** the position of the popup needs to be recalculated*/
PopupConstraint = 128,
AllConstraints = FormFactorConstraint | LocationConstraint | ScreenCons traint | AllConstraints = FormFactorConstraint | LocationConstraint | ScreenCons traint |
SizeConstraint | ImmutableConstraint | ContextConstraint | PopupConstra int SizeConstraint | ImmutableConstraint | ContextConstraint | PopupConstra int
}; };
Q_DECLARE_FLAGS(Constraints, Constraint) Q_DECLARE_FLAGS(Constraints, Constraint)
/** /**
* The FormFactor enumeration describes how a Plasma::Applet should arrange * The FormFactor enumeration describes how a Plasma::Applet should arrange
* itself. The value is derived from the container managing the Applet * itself. The value is derived from the container managing the Applet
* (e.g. in Plasma, a Corona on the desktop or on a panel). * (e.g. in Plasma, a Corona on the desktop or on a panel).
**/ **/
 End of changes. 1 change blocks. 
17 lines changed or deleted 13 lines changed or added


 pluginpage.h   pluginpage.h 
skipping to change at line 40 skipping to change at line 40
class PluginPagePrivate; class PluginPagePrivate;
/** /**
* @short Convenience KCModule for creating a plugins config page. * @short Convenience KCModule for creating a plugins config page.
* *
* This class makes it very easy to create a plugins configuration page to your * This class makes it very easy to create a plugins configuration page to your
* program. All you need to do is create a class that is derived from * program. All you need to do is create a class that is derived from
* PluginPage and add the appropriate plugin information to the KPluginSele ctor. * PluginPage and add the appropriate plugin information to the KPluginSele ctor.
* This is done using the pluginSelector() method: * This is done using the pluginSelector() method:
* \code * \code
* typedef KGenericFactory<MyAppPluginConfig, QWidget> MyAppPluginConfigFac * K_PLUGIN_FACTORY(MyAppPluginConfigFactory,
tory; * registerPlugin<MyAppPluginConfig>();
* K_EXPORT_COMPONENT_FACTORY( kcm_myapppluginconfig, MyAppPluginConfigFact * )
ory( "kcm_myapppluginconfig" ) ); * K_EXPORT_PLUGIN(MyAppConfigFactory("kcm_myapppluginconfig"));
* *
* MyAppPluginConfig( QWidget * parent, const QStringList & args ) * MyAppPluginConfig(QWidget * parent, const QVariantList & args)
* : PluginPage( MyAppPluginConfigFactory::componentData(), parent, arg * : PluginPage(MyAppPluginConfigFactory::componentData(), parent, args
s ) )
* { * {
* pluginSelector()->addPlugins( KGlobal::mainComponent().componentName (), i18n( "General Plugins" ), "General" ); * pluginSelector()->addPlugins( KGlobal::mainComponent().componentName (), i18n( "General Plugins" ), "General" );
* pluginSelector()->addPlugins( KGlobal::mainComponent().componentName (), i18n( "Effects" ), "Effects" ); * pluginSelector()->addPlugins( KGlobal::mainComponent().componentName (), i18n( "Effects" ), "Effects" );
* } * }
* \endcode * \endcode
* *
* All that remains to be done is to create the appropriate .desktop file * All that remains to be done is to create the appropriate .desktop file
* \verbatim * \verbatim
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
 End of changes. 2 change blocks. 
7 lines changed or deleted 7 lines changed or added


 resourcemanager.h   resourcemanager.h 
skipping to change at line 38 skipping to change at line 38
namespace Soprano { namespace Soprano {
class Model; class Model;
} }
namespace Nepomuk { namespace Nepomuk {
class Resource; class Resource;
class Variant; class Variant;
class ResourceManagerHelper; class ResourceManagerHelper;
class ResourceManagerPrivate; class ResourceManagerPrivate;
namespace Types {
class Class;
class Property;
}
/** /**
* \class ResourceManager resourcemanager.h Nepomuk/ResourceManager * \class ResourceManager resourcemanager.h Nepomuk/ResourceManager
* *
* \brief The ResourceManager is the central \a %Nepomuk configuration point. * \brief The ResourceManager is the central \a %Nepomuk configuration point.
* *
* Use the initialized() method to check the availabity of the %Nepomuk system. * Use the initialized() method to check the availabity of the %Nepomuk system.
* Signals nepomukSystemStarted() and nepomukSystemStopped() can be use d to * Signals nepomukSystemStarted() and nepomukSystemStopped() can be use d to
* enable or disable Nepomuk-specific GUI elements. * enable or disable Nepomuk-specific GUI elements.
* *
skipping to change at line 265 skipping to change at line 269
void nepomukSystemStarted(); void nepomukSystemStarted();
/** /**
* Emitted once the Nepomuk system goes down. * Emitted once the Nepomuk system goes down.
* *
* \since 4.4 * \since 4.4
*/ */
void nepomukSystemStopped(); void nepomukSystemStopped();
private Q_SLOTS: private Q_SLOTS:
void slotStoreChanged(); void slotPropertyAdded(const Nepomuk::Resource &res, const Nepomuk:
:Types::Property &prop, const QVariant &value);
void slotPropertyRemoved(const Nepomuk::Resource &res, const Nepomu
k::Types::Property &prop, const QVariant &value);
private: private:
friend class Nepomuk::Resource; friend class Nepomuk::Resource;
friend class Nepomuk::ResourceManagerPrivate; friend class Nepomuk::ResourceManagerPrivate;
ResourceManager(); ResourceManager();
~ResourceManager(); ~ResourceManager();
static ResourceManager* s_instance; static ResourceManager* s_instance;
 End of changes. 2 change blocks. 
1 lines changed or deleted 8 lines changed or added


 svg.h   svg.h 
skipping to change at line 363 skipping to change at line 363
/** /**
* The Plasma::Theme used by this Svg object. * The Plasma::Theme used by this Svg object.
* *
* This determines how relative image paths are interpreted. * This determines how relative image paths are interpreted.
* *
* @return the theme used by this Svg * @return the theme used by this Svg
*/ */
Theme *theme() const; Theme *theme() const;
Q_SIGNALS: Q_SIGNALS:
/**
* Emitted whenever the SVG data has changed in such a way that a r
epaint is required.
* Any usage of an Svg object that does the painting itself must co
nnect to this signal
* and respond by updating the painting. Note that connected to The
me::themeChanged is
* incorrect in such a use case as the Svg itself may not be update
d yet nor may theme
* change be the only case when a repaint is needed. Also note that
classes or QML code
* which take Svg objects as parameters for their own painting all
respond to this signal
* so that in those cases manually responding to the signal is unne
cessary; ONLY when
* direct, manual painting with an Svg object is done in applicatio
n code is this signal
* used.
*/
void repaintNeeded(); void repaintNeeded();
/**
* Emitted whenever the size of the Svg is changed. @see resize()
*/
void sizeChanged(); void sizeChanged();
private: private:
SvgPrivate *const d; SvgPrivate *const d;
Q_PRIVATE_SLOT(d, void themeChanged()) Q_PRIVATE_SLOT(d, void themeChanged())
Q_PRIVATE_SLOT(d, void colorsChanged()) Q_PRIVATE_SLOT(d, void colorsChanged())
friend class SvgPrivate; friend class SvgPrivate;
friend class FrameSvgPrivate; friend class FrameSvgPrivate;
 End of changes. 2 change blocks. 
0 lines changed or deleted 23 lines changed or added


 theme.h   theme.h 
skipping to change at line 388 skipping to change at line 388
*/ */
KUrl homepage() const; KUrl homepage() const;
/** /**
* @return the default tool tip delay; -1 means "no tooltips" * @return the default tool tip delay; -1 means "no tooltips"
*/ */
int toolTipDelay() const; int toolTipDelay() const;
Q_SIGNALS: Q_SIGNALS:
/** /**
* Emitted when the user changes the theme. SVGs should be reloaded * Emitted when the user changes the theme. Stylesheet usage, color
at s, etc. should
* that point * be updated at this point. However, SVGs should *not* be repainte
d in response
* to this signal; connect to Svg::repaintNeeded() instead for that
, as Svg objects
* need repainting not only when themeChanged() is emitted; moreove
r Svg objects
* connect to and respond appropriately to themeChanged() internall
y, emitting
* Svg::repaintNeeded() at an appropriate time.
*/ */
void themeChanged(); void themeChanged();
public Q_SLOTS: public Q_SLOTS:
/** /**
* Notifies the Theme object that the theme settings have changed * Notifies the Theme object that the theme settings have changed
* and should be read from the config file * and should be read from the config file
**/ **/
void settingsChanged(); void settingsChanged();
 End of changes. 1 change blocks. 
3 lines changed or deleted 11 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/