yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modules -> Effects, for consistent naming (not sure if the calls

Browse source 
are used somewhere). Also fix the strange indent.
CCMAIL: Laurent Montel <montel@kde.org>


svn path=/trunk/KDE/kdebase/workspace/; revision=818994
This commit is contained in:
Luboš Luňák 2008-06-10 09:32:46 +00:00
parent 3f4a2dfaed
commit e2f835e142
5 changed files with 29 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
effects.cpp
View file

@ -716,31 +716,29 @@ void EffectsHandlerImpl::toggleEffect( const QString& name )
loadEffect( name ); loadEffect( name );
} }
QStringList EffectsHandlerImpl::loadedModules() const QStringList EffectsHandlerImpl::loadedEffects() const
{ {
QStringList listModules; QStringList listModules;
for(QVector< EffectPair >::const_iterator it = loaded_effects.constBegin(); it != loaded_effects.constEnd(); ++it) 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::listOfEffects() const
QStringList EffectsHandlerImpl::listOfModulesEffect() const
{ {
KService::List offers = KServiceTypeTrader::self()->query("KWin/Effect"); KService::List offers = KServiceTypeTrader::self()->query("KWin/Effect");
QStringList listOfModules; QStringList listOfModules;
// First unload necessary effects // First unload necessary effects
foreach( const KService::Ptr &service, offers ) foreach( const KService::Ptr &service, offers )
{ {
KPluginInfo plugininfo( service ); KPluginInfo plugininfo( service );
listOfModules<<plugininfo.pluginName(); listOfModules<<plugininfo.pluginName();
} }
return listOfModules; return listOfModules;
} }
bool EffectsHandlerImpl::loadEffect( const QString& name ) bool EffectsHandlerImpl::loadEffect( const QString& name )
{ {
Workspace::self()->addRepaintFull(); Workspace::self()->addRepaintFull();

4
effects.h
View file

@ -142,8 +142,8 @@ class EffectsHandlerImpl : public EffectsHandler
void unloadEffect( const QString& name ); void unloadEffect( const QString& name );
void reloadEffect( const QString& name ); void reloadEffect( const QString& name );
bool isEffectLoaded( const QString& name ); bool isEffectLoaded( const QString& name );
QStringList loadedModules() const; QStringList loadedEffects() const;
QStringList listOfModulesEffect() const; QStringList listOfEffects() const;
QList<EffectWindow*> elevatedWindows() const; QList<EffectWindow*> elevatedWindows() const;

4
org.kde.KWin.xml
View file

@ -47,10 +47,10 @@
<method name="reloadEffect"> <method name="reloadEffect">
<arg name="name" type="s" direction="in"/> <arg name="name" type="s" direction="in"/>
</method> </method>
<method name="loadedModules"> <method name="loadedEffects">
<arg type="as" direction="out"/> <arg type="as" direction="out"/>
</method> </method>
<method name="listOfModulesEffect"> <method name="listOfEffects">
<arg type="as" direction="out"/> <arg type="as" direction="out"/>
</method> </method>
<method name="decorationSupportedColors"> <method name="decorationSupportedColors">

21
useractions.cpp
View file

@ -734,23 +734,22 @@ void Workspace::reloadEffect( const QString& name )
static_cast<EffectsHandlerImpl*>(effects)->reloadEffect( name ); static_cast<EffectsHandlerImpl*>(effects)->reloadEffect( name );
} }
QStringList Workspace::loadedModules() const QStringList Workspace::loadedEffects() const
{ {
QStringList listModulesLoaded; QStringList listModulesLoaded;
if ( effects ) if ( effects )
listModulesLoaded = static_cast<EffectsHandlerImpl*>(effects)->loadedModules(); listModulesLoaded = static_cast<EffectsHandlerImpl*>(effects)->loadedEffects();
return listModulesLoaded; return listModulesLoaded;
} }
QStringList Workspace::listOfModulesEffect() const QStringList Workspace::listOfEffects() const
{ {
QStringList listModules; QStringList listModules;
if ( effects ) if ( effects )
listModules = static_cast<EffectsHandlerImpl*>(effects)->listOfModulesEffect(); listModules = static_cast<EffectsHandlerImpl*>(effects)->listOfEffects();
return listModules; return listModules;
} }
void Workspace::slotActivateAttentionWindow() void Workspace::slotActivateAttentionWindow()
{ {
if( attention_chain.count() > 0 ) if( attention_chain.count() > 0 )

4
workspace.h
View file

@ -213,8 +213,8 @@ class Workspace : public QObject, public KDecorationDefines
void unloadEffect( const QString& name ); void unloadEffect( const QString& name );
QStringList loadedModules() const; QStringList loadedEffects() const;
QStringList listOfModulesEffect() const; QStringList listOfEffects() const;
/** /**