[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kwin
From:       Lucas Murray <lmurray () undefinedfire ! com>
Date:       2009-09-02 2:30:25
Message-ID: 1251858625.376480.23910.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1018656 by lmurray:

Don't const effect proxies.


 M  +1 -1      effects.cpp  
 M  +1 -1      effects.h  
 M  +2 -2      effects/desktopgrid/desktopgrid.cpp  
 M  +1 -1      effects/presentwindows/presentwindows.cpp  
 M  +1 -1      effects/presentwindows/presentwindows.h  
 M  +1 -1      lib/kwineffects.cpp  
 M  +3 -3      lib/kwineffects.h  


--- trunk/KDE/kdebase/workspace/kwin/effects.cpp #1018655:1018656
@@ -347,7 +347,7 @@
         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_" );
--- trunk/KDE/kdebase/workspace/kwin/effects.h #1018655:1018656
@@ -83,7 +83,7 @@
         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;
--- trunk/KDE/kdebase/workspace/kwin/effects/desktopgrid/desktopgrid.cpp \
#1018655:1018656 @@ -776,8 +776,8 @@
         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();
--- trunk/KDE/kdebase/workspace/kwin/effects/presentwindows/presentwindows.cpp \
#1018655:1018656 @@ -154,7 +154,7 @@
     m_rightButtonDesktop = (DesktopMouseAction)conf.readEntry( "RightButtonDesktop", \
(int)DesktopNoAction );  }
 
-const void* PresentWindowsEffect::proxy() const
+void* PresentWindowsEffect::proxy()
     {
     return &m_proxy;
     }
--- trunk/KDE/kdebase/workspace/kwin/effects/presentwindows/presentwindows.h \
#1018655:1018656 @@ -64,7 +64,7 @@
         virtual ~PresentWindowsEffect();
 
         virtual void reconfigure( ReconfigureFlags );
-        virtual const void* proxy() const;
+        virtual void* proxy();
 
         // Screen painting
         virtual void prePaintScreen( ScreenPrePaintData &data, int time );
--- trunk/KDE/kdebase/workspace/kwin/lib/kwineffects.cpp #1018655:1018656
@@ -114,7 +114,7 @@
     {
     }
 
-const void* Effect::proxy() const
+void* Effect::proxy()
     {
     return NULL;
     }
--- trunk/KDE/kdebase/workspace/kwin/lib/kwineffects.h #1018655:1018656
@@ -170,7 +170,7 @@
 
 #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 @@
         /**
          * 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 @@
          * 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;


[prev in list] [next in list] [prev in thread] [next in thread]