Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: fix some compiler warnings due to 9ff99942

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-01-08 04:42:26 +02:00
parent 99a9337e9d
commit 43289ee0fb
8 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
kdecore/util/kpluginfactory.h
View file

@ -394,15 +394,6 @@ protected:
KPluginFactoryPrivate *const d_ptr;
/**
* @deprecated
*/
/**
* @deprecated
*/
/**
* This method sets the component data of the plugin. You can access the component data object
* later with componentData().

2
kdeui/tests/kxmlguitest.h
View file

@ -11,7 +11,7 @@ public:
Client() {}
void setXMLFile( const QString &f, bool merge = true, bool setXMLDoc = true ) { KXMLGUIClient::setXMLFile( f, merge, setXMLDoc ); }
void setComponentData(const KComponentData &inst) { KXMLGUIClient::setComponentData(inst); }
void setComponentData(const KComponentData &inst, bool loadPlugins = true) { KXMLGUIClient::setComponentData(inst, loadPlugins); }
public Q_SLOTS:
void slotSec();

2
kdeui/xmlgui/kxmlguiclient.cpp
View file

@ -181,7 +181,7 @@ void KXMLGUIClient::reloadXML()
setXMLFile( file );
}
void KXMLGUIClient::setComponentData(const KComponentData &componentData)
void KXMLGUIClient::setComponentData(const KComponentData &componentData, bool loadPlugins)
{
d->m_componentData = componentData;
actionCollection()->setComponentData( componentData );

2
kdeui/xmlgui/kxmlguiclient.h
View file

@ -310,7 +310,7 @@ protected:
* Call this first in the inherited class constructor.
* (At least before setXMLFile().)
*/
virtual void setComponentData(const KComponentData &componentData);
virtual void setComponentData(const KComponentData &componentData, bool loadPlugins = true);
/**
* Sets the name of the rc file containing the XML for the part.

2
kparts/part.cpp
View file

@ -138,7 +138,7 @@ void PartBase::setComponentData(const KComponentData &componentData, bool bLoadP
{
Q_D(PartBase);
KXMLGUIClient::setComponentData(componentData);
KXMLGUIClient::setComponentData(componentData, bLoadPlugins);
KGlobal::locale()->insertCatalog(componentData.catalogName());
// install 'instancename'data resource type
KGlobal::dirs()->addResourceType(QString(componentData.componentName() + "data").toUtf8(),

2
kparts/part.h
View file

@ -97,7 +97,7 @@ protected:
* KParts::MainWindow, plugins are automatically loaded in createGUI anyway,
* so set loadPlugins to false for KParts::MainWindow as well).
*/
virtual void setComponentData(const KComponentData &componentData, bool loadPlugins=true);
virtual void setComponentData(const KComponentData &componentData, bool loadPlugins = true);
// In the case of KParts MainWindows, plugins are automatically loaded in createGUI anyway,
// so setComponentData() should really not load the plugins.

4
kparts/plugin.cpp
View file

@ -213,10 +213,10 @@ bool Plugin::hasPlugin( QObject* parent, const QString& library )
return false;
}
void Plugin::setComponentData(const KComponentData &componentData)
void Plugin::setComponentData(const KComponentData &componentData, bool loadPlugins)
{
KGlobal::locale()->insertCatalog(componentData.catalogName());
KXMLGUIClient::setComponentData(componentData);
KXMLGUIClient::setComponentData(componentData, loadPlugins);
}
void Plugin::loadPlugins(QObject *parent, KXMLGUIClient* parentGUIClient,

2
kparts/plugin.h
View file

@ -171,7 +171,7 @@ protected:
*/
static Plugin* loadPlugin( QObject * parent, const QString &libname, const QString &keyword = QString() );
virtual void setComponentData(const KComponentData &instance);
virtual void setComponentData(const KComponentData &instance, bool loadPlugins = true);
private:
static bool hasPlugin( QObject* parent, const QString& library );