diff --git a/effects.cpp b/effects.cpp index 761a25d496..a5a210cc7a 100644 --- a/effects.cpp +++ b/effects.cpp @@ -716,31 +716,29 @@ void EffectsHandlerImpl::toggleEffect( const QString& name ) loadEffect( name ); } -QStringList EffectsHandlerImpl::loadedModules() const +QStringList EffectsHandlerImpl::loadedEffects() const { - QStringList listModules; - for(QVector< EffectPair >::const_iterator it = loaded_effects.constBegin(); it != loaded_effects.constEnd(); ++it) + QStringList listModules; + for(QVector< EffectPair >::const_iterator it = loaded_effects.constBegin(); it != loaded_effects.constEnd(); ++it) { - listModules <<(*it).first; + listModules <<(*it).first; } - return listModules; + return listModules; } - -QStringList EffectsHandlerImpl::listOfModulesEffect() const +QStringList EffectsHandlerImpl::listOfEffects() const { - KService::List offers = KServiceTypeTrader::self()->query("KWin/Effect"); - QStringList listOfModules; - // First unload necessary effects - foreach( const KService::Ptr &service, offers ) + KService::List offers = KServiceTypeTrader::self()->query("KWin/Effect"); + QStringList listOfModules; + // First unload necessary effects + foreach( const KService::Ptr &service, offers ) { - KPluginInfo plugininfo( service ); - listOfModules<addRepaintFull(); diff --git a/effects.h b/effects.h index f78e7ad315..ea39c33ce0 100644 --- a/effects.h +++ b/effects.h @@ -142,8 +142,8 @@ class EffectsHandlerImpl : public EffectsHandler void unloadEffect( const QString& name ); void reloadEffect( const QString& name ); bool isEffectLoaded( const QString& name ); - QStringList loadedModules() const; - QStringList listOfModulesEffect() const; + QStringList loadedEffects() const; + QStringList listOfEffects() const; QList elevatedWindows() const; diff --git a/org.kde.KWin.xml b/org.kde.KWin.xml index f8df4b63c0..d4967298ad 100644 --- a/org.kde.KWin.xml +++ b/org.kde.KWin.xml @@ -47,10 +47,10 @@ - + - + diff --git a/useractions.cpp b/useractions.cpp index bda1be41cb..9a87e822c2 100644 --- a/useractions.cpp +++ b/useractions.cpp @@ -734,23 +734,22 @@ void Workspace::reloadEffect( const QString& name ) static_cast(effects)->reloadEffect( name ); } -QStringList Workspace::loadedModules() const +QStringList Workspace::loadedEffects() const { - QStringList listModulesLoaded; - if ( effects ) - listModulesLoaded = static_cast(effects)->loadedModules(); - return listModulesLoaded; + QStringList listModulesLoaded; + if ( effects ) + listModulesLoaded = static_cast(effects)->loadedEffects(); + return listModulesLoaded; } -QStringList Workspace::listOfModulesEffect() const +QStringList Workspace::listOfEffects() const { - QStringList listModules; - if ( effects ) - listModules = static_cast(effects)->listOfModulesEffect(); - return listModules; + QStringList listModules; + if ( effects ) + listModules = static_cast(effects)->listOfEffects(); + return listModules; } - void Workspace::slotActivateAttentionWindow() { if( attention_chain.count() > 0 ) diff --git a/workspace.h b/workspace.h index 3c417bd150..b0e2f4890d 100644 --- a/workspace.h +++ b/workspace.h @@ -213,8 +213,8 @@ class Workspace : public QObject, public KDecorationDefines void unloadEffect( const QString& name ); - QStringList loadedModules() const; - QStringList listOfModulesEffect() const; + QStringList loadedEffects() const; + QStringList listOfEffects() const; /**