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

kparts: misc cleanups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2015-11-23 04:20:30 +02:00
parent b60991ae05
commit e33a856eab
2 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
kparts/plugin.cpp
View file

@ -138,22 +138,20 @@ void Plugin::loadPlugins(QObject *parent, const KComponentData &componentData)
void Plugin::loadPlugins(QObject *parent, const QList<PluginInfo> &pluginInfos, const KComponentData &componentData)
{
QList<PluginInfo>::ConstIterator pIt = pluginInfos.begin();
QList<PluginInfo>::ConstIterator pEnd = pluginInfos.end();
for (; pIt != pEnd; ++pIt )
foreach (const PluginInfo pIt, pluginInfos )
{
QString library = (*pIt).m_document.documentElement().attribute( "library" );
QString library = pIt.m_document.documentElement().attribute( "library" );
if ( library.isEmpty() || hasPlugin( parent, library ) )
continue;
Plugin *plugin = loadPlugin( parent, library, (*pIt).m_document.documentElement().attribute( "X-KDE-PluginKeyword" ) );
Plugin *plugin = loadPlugin( parent, library, pIt.m_document.documentElement().attribute( "X-KDE-PluginKeyword" ) );
if ( plugin )
{
plugin->d->m_parentInstance = componentData;
plugin->setXMLFile( (*pIt).m_relXMLFileName, false, false );
plugin->setDOMDocument( (*pIt).m_document );
plugin->setXMLFile( pIt.m_relXMLFileName, false, false );
plugin->setDOMDocument( pIt.m_document );
}
}
@ -165,11 +163,6 @@ void Plugin::loadPlugins( QObject *parent, const QList<PluginInfo> &pluginInfos
loadPlugins(parent, pluginInfos, KComponentData());
}
Plugin* Plugin::loadPlugin( QObject * parent, const QString &libname )
{
return loadPlugin( parent, libname, "" );
}
// static
Plugin* Plugin::loadPlugin( QObject * parent, const QString &libname, const QString &keyword )
{
@ -209,11 +202,9 @@ QList<KParts::Plugin *> Plugin::pluginObjects( QObject *parent )
bool Plugin::hasPlugin( QObject* parent, const QString& library )
{
const QObjectList plugins = parent->children();
QObjectList::ConstIterator it = plugins.begin();
for ( ; it != plugins.end() ; ++it )
foreach ( QObject *it, plugins )
{
Plugin * plugin = qobject_cast<Plugin *>( *it );
Plugin * plugin = qobject_cast<Plugin *>( it );
if ( plugin && plugin->d->m_library == library )
{
return true;

4
kparts/plugin.h
View file

@ -169,9 +169,7 @@ protected:
* @internal
* @return The plugin created from the library @p libname
*/
static Plugin* loadPlugin( QObject * parent, const QString &libname );
static Plugin* loadPlugin( QObject * parent, const QString &libname, const QString &keyword );
static Plugin* loadPlugin( QObject * parent, const QString &libname, const QString &keyword = QString() );
virtual void setComponentData(const KComponentData &instance);