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

Don't const effect proxies.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1018656
This commit is contained in:
Lucas Murray 2009-09-02 02:30:22 +00:00
parent 1b76934880
commit da37b1f16d
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects.cpp
View file

@ -347,7 +347,7 @@ void EffectsHandlerImpl::grabbedKeyboardEvent( QKeyEvent* e )
keyboard_grab_effect->grabbedKeyboardEvent( e );
}
const void* EffectsHandlerImpl::getProxy( QString name )
void* EffectsHandlerImpl::getProxy( QString name )
{
// All effects start with "kwin4_effect_", prepend it to the name
name.prepend( "kwin4_effect_" );

2
effects.h
View file

@ -83,7 +83,7 @@ class EffectsHandlerImpl : public EffectsHandler
virtual QPoint cursorPos() const;
virtual bool grabKeyboard( Effect* effect );
virtual void ungrabKeyboard();
virtual const void* getProxy( QString name );
virtual void* getProxy( QString name );
virtual void startMousePolling();
virtual void stopMousePolling();
virtual EffectWindow* findWindow( WId id ) const;

4
effects/desktopgrid/desktopgrid.cpp
View file

@ -776,8 +776,8 @@ void DesktopGridEffect::setActive( bool active )
return; // Already in that state
// Example proxy code, TODO: Use or remove
//const PresentWindowsEffectProxy* proxy =
// static_cast<const PresentWindowsEffectProxy*>( effects->getProxy( "presentwindows" ));
//PresentWindowsEffectProxy* proxy =
// static_cast<PresentWindowsEffectProxy*>( effects->getProxy( "presentwindows" ));
//if( proxy )
// kDebug() << "Retrieved PresentWindowsEffectProxy, is present windows activate?"
// << proxy->isActive();

2
effects/presentwindows/presentwindows.cpp
View file

@ -154,7 +154,7 @@ void PresentWindowsEffect::reconfigure( ReconfigureFlags )
m_rightButtonDesktop = (DesktopMouseAction)conf.readEntry( "RightButtonDesktop", (int)DesktopNoAction );
}
const void* PresentWindowsEffect::proxy() const
void* PresentWindowsEffect::proxy()
{
return &m_proxy;
}

2
effects/presentwindows/presentwindows.h
View file

@ -64,7 +64,7 @@ class PresentWindowsEffect
virtual ~PresentWindowsEffect();
virtual void reconfigure( ReconfigureFlags );
virtual const void* proxy() const;
virtual void* proxy();
// Screen painting
virtual void prePaintScreen( ScreenPrePaintData &data, int time );

2
lib/kwineffects.cpp
View file

@ -114,7 +114,7 @@ void Effect::reconfigure( ReconfigureFlags )
{
}
const void* Effect::proxy() const
void* Effect::proxy()
{
return NULL;
}

6
lib/kwineffects.h
View file

@ -170,7 +170,7 @@ X-KDE-Library=kwin4_effect_cooleffect
#define KWIN_EFFECT_API_MAKE_VERSION( major, minor ) (( major ) << 8 | ( minor ))
#define KWIN_EFFECT_API_VERSION_MAJOR 0
#define KWIN_EFFECT_API_VERSION_MINOR 102
#define KWIN_EFFECT_API_VERSION_MINOR 103
#define KWIN_EFFECT_API_VERSION KWIN_EFFECT_API_MAKE_VERSION( \
KWIN_EFFECT_API_VERSION_MAJOR, KWIN_EFFECT_API_VERSION_MINOR )
@ -309,7 +309,7 @@ class KWIN_EXPORT Effect
/**
* Called when another effect requests the proxy for this effect.
*/
virtual const void* proxy() const;
virtual void* proxy();
/**
* Called before starting to paint the screen.
@ -541,7 +541,7 @@ class KWIN_EXPORT EffectsHandler
* Retrieve the proxy class for an effect if it has one. Will return NULL if
* the effect isn't loaded or doesn't have a proxy class.
*/
virtual const void* getProxy( QString name ) = 0;
virtual void* getProxy( QString name ) = 0;
// Mouse polling
virtual void startMousePolling() = 0;