namespace KWinInternal -> KWin - shorter typing of names in gdb, yay

svn path=/branches/work/kwin_composite/; revision=650770

CMakeLists.txt

@@ -100,7 +100,7 @@ if(HAVE_OPENGL)
    )
 endif(HAVE_OPENGL)
 
-qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml workspace.h KWinInternal::Workspace )
+qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml workspace.h KWin::Workspace )
 
 kde4_automoc(kwin ${kwin_KDEINIT_SRCS})
 

activation.cpp

@@ -29,9 +29,10 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "atoms.h"
 #include "group.h"
 #include "rules.h"
+#include "effects.h"
 #include <QX11Info>
 
-namespace KWinInternal
+namespace KWin
 {
 
 /*
@@ -221,8 +222,8 @@ void Workspace::setActiveClient( Client* c, allowed_t )
     ++set_active_client_recursion;
     if( active_client != NULL )
         { // note that this may call setActiveClient( NULL ), therefore the recursion counter
-        active_client->setActive( false );
+            active_client->setActive( false );
-        }
+    }
     active_client = c;
     Q_ASSERT( c == NULL || c->isActive());
     if( active_client != NULL )
@@ -245,6 +246,8 @@ void Workspace::setActiveClient( Client* c, allowed_t )
 
     rootInfo->setActiveWindow( active_client? active_client->window() : 0 );
     updateColormap();
+    if( effects )
+        effects->windowActivated( active_client ? active_client->effectWindow() : NULL );
     --set_active_client_recursion;
     }
 
@@ -263,7 +266,6 @@ void Workspace::activateClient( Client* c, bool force )
     {
     if( c == NULL )
         {
-        focusToNull();
         setActiveClient( NULL, Allowed );
         return;
         }
@@ -698,7 +700,7 @@ void Client::demandAttentionKNotify()
     }
 
 // TODO I probably shouldn't be lazy here and do it without the macro, so that people can read it
-KWIN_COMPARE_PREDICATE( SameApplicationActiveHackPredicate, const Client*,
+KWIN_COMPARE_PREDICATE( SameApplicationActiveHackPredicate, Client, const Client*,
     // ignore already existing splashes, toolbars, utilities, menus and topmenus,
     // as the app may show those before the main window
     !cl->isSplash() && !cl->isToolbar() && !cl->isTopMenu() && !cl->isUtility() && !cl->isMenu()

atoms.cpp

@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "utils.h"
 #include <assert.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 Atoms::Atoms()

atoms.h

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #define KWIN_ATOMS_H
 #include <X11/Xlib.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class Atoms 

bridge.cpp

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "client.h"
 #include "options.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 Bridge::Bridge( Client* cl )
@@ -197,9 +197,9 @@ QRegion Bridge::unobscuredRegion( const QRegion& r ) const
 void Bridge::grabXServer( bool grab )
     {
     if( grab )
-        KWinInternal::grabXServer();
+        KWin::grabXServer();
     else
-        KWinInternal::ungrabXServer();
+        KWin::ungrabXServer();
     }
 
 } // namespace

bridge.h

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <kdecoration_p.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class Client;

client.cpp

@@ -38,7 +38,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // put all externs before the namespace statement to allow the linker
 // to resolve them properly
 
-namespace KWinInternal
+namespace KWin
 {
 
 /*

client.h

@@ -34,7 +34,7 @@ class QTimer;
 class K3Process;
 class KStartupInfoData;
 
-namespace KWinInternal
+namespace KWin
 {
 
 class Workspace;
@@ -490,7 +490,7 @@ class GeometryUpdatesBlocker
 class WinInfo : public NETWinInfo
     {
     private:
-        typedef KWinInternal::Client Client; // because of NET::Client
+        typedef KWin::Client Client; // because of NET::Client
     public:
         WinInfo( Client* c, Display * display, Window window,
                 Window rwin, const unsigned long pr[], int pr_size );

composite.cpp

@@ -43,7 +43,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <X11/extensions/shape.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 //****************************************

deleted.cpp

@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "client.h"
 #include "effects.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 Deleted::Deleted( Workspace* ws )

deleted.h

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include "toplevel.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 class Deleted

effects.cpp

@@ -45,7 +45,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "effects/test_input.h"
 #include "effects/test_thumbnail.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 //****************************************
@@ -189,7 +189,7 @@ EffectsHandler::EffectsHandler()
     {
     if( !compositing())
         return;
-    KWinInternal::effects = this;
+    KWin::effects = this;
 
 #ifdef HAVE_CAPTURY
     registerEffect("VideoRecord", new GenericEffectFactory<VideoRecordEffect>);

effects.h

@@ -17,7 +17,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <qpair.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class Toplevel;

effects/boxswitch.cpp

@@ -21,7 +21,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <GL/gl.h>
 #endif
 
-namespace KWinInternal
+namespace KWin
 {
 
 BoxSwitchEffect::BoxSwitchEffect()

effects/boxswitch.h

@@ -21,7 +21,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <QRegion>
 #include <QSize>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class BoxSwitchEffect

effects/demo_taskbarthumbnail.cpp

@@ -18,7 +18,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // Note that currently effects need to be manually enabled in the EffectsHandler
 // class constructor (in effects.cpp).
 
-namespace KWinInternal
+namespace KWin
 {
 
 TaskbarThumbnailEffect::TaskbarThumbnailEffect()

effects/demo_taskbarthumbnail.h

@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <effects.h>
 
 
-namespace KWinInternal
+namespace KWin
 {
 
 /**

effects/desktopchangeslide.cpp

@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <workspace.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 const int MAX_PROGRESS = 1000;

effects/desktopchangeslide.h

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <effects.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class DesktopChangeSlideEffect

effects/dialogparent.cpp

@@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // Note that currently effects need to be manually enabled in the EffectsHandler
 // class constructor (in effects.cpp).
 
-namespace KWinInternal
+namespace KWin
 {
 
 void DialogParentEffect::prePaintWindow( EffectWindow* w, int* mask, QRegion* paint, QRegion* clip, int time )

effects/dialogparent.h

@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <effects.h>
 
 
-namespace KWinInternal
+namespace KWin
 {
 
 /**

effects/drunken.cpp

@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <math.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 void DrunkenEffect::prePaintScreen( int* mask, QRegion* region, int time )

effects/drunken.h

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <effects.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class DrunkenEffect

effects/explosioneffect.cpp

@@ -23,7 +23,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <math.h>
 
 
-namespace KWinInternal
+namespace KWin
 {
 
 ExplosionEffect::ExplosionEffect() : Effect()

effects/explosioneffect.h

@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // Include with base class for effects.
 #include <effects.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class GLShader;

effects/fade.cpp

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <client.h>
 #include <deleted.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 FadeEffect::FadeEffect()

effects/fade.h

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <effects.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class FadeEffect

effects/fallapart.cpp

@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <deleted.h>
 #include <scene_opengl.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 void FallApartEffect::prePaintScreen( int* mask, QRegion* region, int time )

effects/fallapart.h

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <effects.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class FallApartEffect

effects/flame.cpp

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <deleted.h>
 #include <scene_opengl.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 void FlameEffect::prePaintScreen( int* mask, QRegion* region, int time )

effects/flame.h

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <effects.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class FlameEffect

effects/howto.cpp

@@ -25,7 +25,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // Note that currently effects need to be manually enabled in the EffectsHandler
 // class constructor (in effects.cpp).
 
-namespace KWinInternal
+namespace KWin
 {
 
 // A pre-paint function that tells the compositing code how this effect will affect

effects/howto.h

@@ -23,7 +23,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 // Everything in KWin is in a namespace. There's no need to prefix names
 // with KWin or K, there's no (big) need to care about symbol clashes.
-namespace KWinInternal
+namespace KWin
 {
 
 // The class implementing the effect.

effects/maketransparent.cpp

@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <client.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 void MakeTransparentEffect::prePaintWindow( EffectWindow* w, int* mask, QRegion* paint, QRegion* clip, int time )

effects/maketransparent.h

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <effects.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class MakeTransparentEffect

effects/minimizeanimation.cpp

@@ -18,7 +18,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // Note that currently effects need to be manually enabled in the EffectsHandler
 // class constructor (in effects.cpp).
 
-namespace KWinInternal
+namespace KWin
 {
 
 MinimizeAnimationEffect::MinimizeAnimationEffect()

effects/minimizeanimation.h

@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <effects.h>
 
 
-namespace KWinInternal
+namespace KWin
 {
 
 /**

effects/presentwindows.cpp

@@ -25,7 +25,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // Note that currently effects need to be manually enabled in the EffectsHandler
 // class constructor (in effects.cpp).
 
-namespace KWinInternal
+namespace KWin
 {
 
 

effects/presentwindows.h

@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <effects.h>
 
 
-namespace KWinInternal
+namespace KWin
 {
 
 /**

effects/scalein.cpp

@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <client.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 void ScaleInEffect::prePaintScreen( int* mask, QRegion* region, int time )

effects/scalein.h

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <effects.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class ScaleInEffect

effects/shadow.cpp

@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <GL/gl.h>
 #endif
 
-namespace KWinInternal
+namespace KWin
 {
 
 ShadowEffect::ShadowEffect()

effects/shadow.h

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <effects.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class ShadowEffect

effects/shakymove.cpp

@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <workspace.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 ShakyMoveEffect::ShakyMoveEffect()

effects/shakymove.h

@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <effects.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class ShakyMoveEffect

effects/shiftworkspaceup.cpp

@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <workspace.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 ShiftWorkspaceUpEffect::ShiftWorkspaceUpEffect()

effects/shiftworkspaceup.h

@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <effects.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class ShiftWorkspaceUpEffect

effects/showfps.cpp

@@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <GL/gl.h>
 #endif
 
-namespace KWinInternal
+namespace KWin
 {
 
 const int FPS_WIDTH = 10;

effects/showfps.h

@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <qdatetime.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class ShowFpsEffect

effects/test_input.cpp

@@ -24,7 +24,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <workspace.h>
 #include <client.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 TestInputEffect::TestInputEffect()

effects/test_input.h

@@ -19,7 +19,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <effects.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class TestInputEffect

effects/test_thumbnail.cpp

@@ -17,7 +17,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include "test_thumbnail.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 TestThumbnailEffect::TestThumbnailEffect()

effects/test_thumbnail.h

@@ -19,7 +19,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <effects.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class TestThumbnailEffect

effects/videorecord.cpp

@@ -43,7 +43,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <GL/gl.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 VideoRecordEffect::VideoRecordEffect()

effects/videorecord.h

@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <captury/captury.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class VideoRecordEffect

effects/wavywindows.cpp

@@ -21,7 +21,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // Note that currently effects need to be manually enabled in the EffectsHandler
 // class constructor (in effects.cpp).
 
-namespace KWinInternal
+namespace KWin
 {
 
 WavyWindowsEffect::WavyWindowsEffect()

effects/wavywindows.h

@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <effects.h>
 
 
-namespace KWinInternal
+namespace KWin
 {
 
 /**

effects/zoom.cpp

@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <workspace.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 ZoomEffect::ZoomEffect()

effects/zoom.h

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <effects.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class ZoomEffect

events.cpp

@@ -34,7 +34,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <X11/Xatom.h>
 #include <QX11Info>
 
-namespace KWinInternal
+namespace KWin
 {
 
 // ****************************************

geometry.cpp

@@ -32,7 +32,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <QX11Info>
 #include <QDesktopWidget>
 
-namespace KWinInternal
+namespace KWin
 {
 
 //********************************************

geometrytip.cpp

@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "geometrytip.h"
 #include <QX11Info>
 
-namespace KWinInternal
+namespace KWin
 {
 
 GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ):

geometrytip.h

@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <QLabel>
 #include "client.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 class GeometryTip: public QLabel

glutils.cpp

@@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #define MAKE_GL_VERSION(major, minor, release)  ( ((major) << 16) | ((minor) << 8) | (release) )
 
 
-namespace KWinInternal
+namespace KWin
 {
 // Variables
 // GL version, use MAKE_GL_VERSION() macro for comparing with a specific version

glutils.h

@@ -27,7 +27,7 @@ License. See the file "COPYING" for the exact licensing terms.
 template< class K, class V > class QHash;
 
 
-namespace KWinInternal
+namespace KWin
 {
 
 

glutils_funcs.cpp

@@ -24,7 +24,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #ifdef HAVE_OPENGL
 
-namespace KWinInternal
+namespace KWin
 {
 
 // Function pointers

glutils_funcs.h

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #ifdef HAVE_OPENGL
 
-namespace KWinInternal
+namespace KWin
 {
 
 void glxResolveFunctions();

group.cpp

@@ -33,7 +33,7 @@ License. See the file "COPYING" for the exact licensing terms.
  or I'll get it backwards in half of the cases again.
 */
 
-namespace KWinInternal
+namespace KWin
 {
 
 //********************************************

group.h

@@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <X11/X.h>
 #include <netwm.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class Client;
@@ -41,8 +41,6 @@ class Group
         bool groupEvent( XEvent* e );
         void updateUserTime( Time time = CurrentTime );
         Time userTime() const;
-        void ref();
-        void deref();
     private:
         void getIcons();
         void startupIdChanged();
@@ -52,7 +50,6 @@ class Group
         Workspace* _workspace;
         NETWinInfo* leader_info;
         Time user_time;
-        int refcount;
     };
 
 inline Window Group::leader() const

kcmkwin/kwinrules/detectwidget.cpp

@@ -37,7 +37,7 @@
 #include <fixx11h.h>
 #include <QX11Info>
 
-namespace KWinInternal
+namespace KWin
 {
 
 DetectWidget::DetectWidget( QWidget* parent, const char* name )

kcmkwin/kwinrules/detectwidget.h

@@ -30,7 +30,7 @@
 #include <QEvent>
 #include <QByteArray>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class DetectWidget

kcmkwin/kwinrules/detectwidgetbase.ui

@@ -1,232 +1,218 @@
-<ui version="4.0" stdsetdef="1" >
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-  <author></author>
+<class>KWin::DetectWidgetBase</class>
-  <comment></comment>
+<widget class="QWidget">
-  <exportmacro></exportmacro>
+    <property name="name">
-  <class>KWinInternal::DetectWidgetBase</class>
+        <cstring>DetectWidgetBase</cstring>
-  <widget class="QWidget" name="KWinInternal::DetectWidgetBase" >
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>523</width>
-        <height>325</height>
-      </rect>
     </property>
-    <layout class="QGridLayout" >
+    <property name="geometry">
-      <property name="margin" >
+        <rect>
-        <number>0</number>
+            <x>0</x>
-      </property>
+            <y>0</y>
-      <item rowspan="1" row="9" column="0" colspan="2" >
+            <width>523</width>
-        <spacer name="spacer1" >
+            <height>325</height>
-          <property name="sizeHint" >
+        </rect>
-            <size>
+    </property>
-              <width>20</width>
+    <grid>
-              <height>40</height>
+        <property name="name">
-            </size>
+            <cstring>unnamed</cstring>
-          </property>
+        </property>
-          <property name="sizeType" >
+        <property name="margin">
-            <enum>Expanding</enum>
+            <number>0</number>
-          </property>
+        </property>
-          <property name="orientation" >
+        <spacer row="9" column="0" rowspan="1" colspan="2">
-            <enum>Qt::Vertical</enum>
+            <property name="name">
-          </property>
+                <cstring>spacer1</cstring>
-        </spacer>
+            </property>
-      </item>
+            <property name="orientation">
-      <item row="6" column="0" >
+                <enum>Qt::Vertical</enum>
-        <widget class="QLabel" name="textLabel11" >
+            </property>
-          <property name="text" >
+            <property name="sizeType">
-            <string>Extra role:</string>
+                <enum>Expanding</enum>
-          </property>
+            </property>
-          <property name="wordWrap" >
+            <property name="sizeHint">
-            <bool>false</bool>
+                <size>
-          </property>
+                    <width>20</width>
-        </widget>
+                    <height>40</height>
-      </item>
+                </size>
-      <item row="2" column="0" >
+            </property>
-        <widget class="QLabel" name="textLabel1" >
+        </spacer>
-          <property name="text" >
+        <widget class="QLabel" row="6" column="0">
-            <string>Class:</string>
+            <property name="name">
-          </property>
+                <cstring>textLabel11</cstring>
-          <property name="wordWrap" >
+            </property>
-            <bool>false</bool>
+            <property name="text">
-          </property>
+                <string>Extra role:</string>
-        </widget>
-      </item>
-      <item row="3" column="0" >
-        <widget class="QLabel" name="textLabel3" >
-          <property name="text" >
-            <string>Role:</string>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item row="4" column="1" >
-        <widget class="QLabel" name="type_label" >
-          <property name="text" >
-            <string/>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item row="5" column="0" >
-        <widget class="QLabel" name="textLabel8" >
-          <property name="text" >
-            <string>Title:</string>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item row="2" column="1" >
-        <widget class="QLabel" name="class_label" >
-          <property name="text" >
-            <string/>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item row="3" column="1" >
-        <widget class="QLabel" name="role_label" >
-          <property name="text" >
-            <string/>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item row="5" column="1" >
-        <widget class="QLabel" name="title_label" >
-          <property name="text" >
-            <string/>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item row="7" column="1" >
-        <widget class="QLabel" name="machine_label" >
-          <property name="text" >
-            <string/>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item row="4" column="0" >
-        <widget class="QLabel" name="textLabel4" >
-          <property name="text" >
-            <string>Type:</string>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item row="6" column="1" >
-        <widget class="QLabel" name="extrarole_label" >
-          <property name="text" >
-            <string/>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item row="7" column="0" >
-        <widget class="QLabel" name="textLabel13" >
-          <property name="text" >
-            <string>Machine:</string>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item rowspan="1" row="1" column="0" colspan="2" >
-        <widget class="Line" name="line1" >
-          <property name="frameShape" >
-            <enum>QFrame::HLine</enum>
-          </property>
-          <property name="frameShadow" >
-            <enum>QFrame::Sunken</enum>
-          </property>
-        </widget>
-      </item>
-      <item rowspan="1" row="0" column="0" colspan="2" >
-        <widget class="QLabel" name="textLabel9" >
-          <property name="text" >
-            <string>Information About Selected Window</string>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item rowspan="1" row="8" column="0" colspan="2" >
-        <widget class="Q3ButtonGroup" name="buttonGroup1" >
-          <property name="title" >
-            <string/>
-          </property>
-          <layout class="QVBoxLayout" >
-            <property name="margin" >
-              <number>0</number>
             </property>
-            <item>
-              <widget class="QRadioButton" name="use_class" >
-                <property name="text" >
-                  <string>Use window &amp;class (whole application)</string>
-                </property>
-                <property name="checked" >
-                  <bool>true</bool>
-                </property>
-                <property name="whatsThis" stdset="0" >
-                  <string>For selecting all windows belonging to a specific application, selecting only window class should usually work.</string>
-                </property>
-              </widget>
-            </item>
-            <item>
-              <widget class="QRadioButton" name="use_role" >
-                <property name="text" >
-                  <string>Use window class and window &amp;role (specific window)</string>
-                </property>
-                <property name="whatsThis" stdset="0" >
-                  <string>For selecting a specific window in an application, both window class and window role should be selected. Window class will determine the application, and window role the specific window in the application; many applications do not provide useful window roles though.</string>
-                </property>
-              </widget>
-            </item>
-            <item>
-              <widget class="QRadioButton" name="use_whole_class" >
-                <property name="text" >
-                  <string>Use &amp;whole window class (specific window)</string>
-                </property>
-                <property name="whatsThis" stdset="0" >
-                  <string>With some (non-KDE) applications whole window class can be sufficient for selecting a specific window in an application, as they set whole window class to contain both application and window role.</string>
-                </property>
-              </widget>
-            </item>
-            <item>
-              <widget class="QCheckBox" name="match_title" >
-                <property name="text" >
-                  <string>Match also window &amp;title</string>
-                </property>
-              </widget>
-            </item>
-          </layout>
         </widget>
-      </item>
+        <widget class="QLabel" row="2" column="0">
-    </layout>
+            <property name="name">
-  </widget>
+                <cstring>textLabel1</cstring>
-  <layoutdefault spacing="6" margin="11" />
+            </property>
-  <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
+            <property name="text">
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+                <string>Class:</string>
-</ui>
+            </property>
+        </widget>
+        <widget class="QLabel" row="3" column="0">
+            <property name="name">
+                <cstring>textLabel3</cstring>
+            </property>
+            <property name="text">
+                <string>Role:</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="4" column="1">
+            <property name="name">
+                <cstring>type_label</cstring>
+            </property>
+            <property name="text">
+                <string></string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="5" column="0">
+            <property name="name">
+                <cstring>textLabel8</cstring>
+            </property>
+            <property name="text">
+                <string>Title:</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="2" column="1">
+            <property name="name">
+                <cstring>class_label</cstring>
+            </property>
+            <property name="text">
+                <string></string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="3" column="1">
+            <property name="name">
+                <cstring>role_label</cstring>
+            </property>
+            <property name="text">
+                <string></string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="5" column="1">
+            <property name="name">
+                <cstring>title_label</cstring>
+            </property>
+            <property name="text">
+                <string></string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="7" column="1">
+            <property name="name">
+                <cstring>machine_label</cstring>
+            </property>
+            <property name="text">
+                <string></string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="4" column="0">
+            <property name="name">
+                <cstring>textLabel4</cstring>
+            </property>
+            <property name="text">
+                <string>Type:</string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="6" column="1">
+            <property name="name">
+                <cstring>extrarole_label</cstring>
+            </property>
+            <property name="text">
+                <string></string>
+            </property>
+        </widget>
+        <widget class="QLabel" row="7" column="0">
+            <property name="name">
+                <cstring>textLabel13</cstring>
+            </property>
+            <property name="text">
+                <string>Machine:</string>
+            </property>
+        </widget>
+        <widget class="Line" row="1" column="0" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>line1</cstring>
+            </property>
+            <property name="frameShape">
+                <enum>HLine</enum>
+            </property>
+            <property name="frameShadow">
+                <enum>Sunken</enum>
+            </property>
+            <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+            </property>
+        </widget>
+        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>textLabel9</cstring>
+            </property>
+            <property name="text">
+                <string>Information About Selected Window</string>
+            </property>
+        </widget>
+        <widget class="QButtonGroup" row="8" column="0" rowspan="1" colspan="2">
+            <property name="name">
+                <cstring>buttonGroup1</cstring>
+            </property>
+            <property name="title">
+                <string></string>
+            </property>
+            <vbox>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <widget class="QRadioButton">
+                    <property name="name">
+                        <cstring>use_class</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Use window &amp;class (whole application)</string>
+                    </property>
+                    <property name="checked">
+                        <bool>true</bool>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>For selecting all windows belonging to a specific application, selecting only window class should usually work.</string>
+                    </property>
+                </widget>
+                <widget class="QRadioButton">
+                    <property name="name">
+                        <cstring>use_role</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Use window class and window &amp;role (specific window)</string>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>For selecting a specific window in an application, both window class and window role should be selected. Window class will determine the application, and window role the specific window in the application; many applications do not provide useful window roles though.</string>
+                    </property>
+                </widget>
+                <widget class="QRadioButton">
+                    <property name="name">
+                        <cstring>use_whole_class</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Use &amp;whole window class (specific window)</string>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>With some (non-KDE) applications whole window class can be sufficient for selecting a specific window in an application, as they set whole window class to contain both application and window role.</string>
+                    </property>
+                </widget>
+                <widget class="QCheckBox">
+                    <property name="name">
+                        <cstring>match_title</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Match also window &amp;title</string>
+                    </property>
+                </widget>
+            </vbox>
+        </widget>
+    </grid>
+</widget>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</UI>

kcmkwin/kwinrules/kcm.cpp

@@ -30,10 +30,10 @@
 
 #include "ruleslist.h"
 
-typedef KGenericFactory<KWinInternal::KCMRules> KCMRulesFactory;
+typedef KGenericFactory<KWin::KCMRules> KCMRulesFactory;
 K_EXPORT_COMPONENT_FACTORY(kwinrules, KCMRulesFactory("kcmkwinrules"))
 
-namespace KWinInternal
+namespace KWin
 {
 
 KCMRules::KCMRules( QWidget *parent, const QStringList & )

kcmkwin/kwinrules/kcm.h

@@ -27,7 +27,7 @@ class KConfig;
 class KAboutData;
 class QStringList;
 
-namespace KWinInternal
+namespace KWin
 {
 
 class KCMRulesList;

kcmkwin/kwinrules/main.cpp

@@ -30,7 +30,7 @@
 #include "../../rules.h"
 #include <QByteArray>
 
-namespace KWinInternal
+namespace KWin
 {
 
 static void loadRules( QList< Rules* >& rules )
@@ -289,5 +289,5 @@ KDE_EXPORT int kdemain( int argc, char* argv[] )
 	KCmdLineArgs::usage( i18n( "This helper utility is not supposed to be called directly." ));
 	return 1;
         }
-    return KWinInternal::edit( id, whole_app );
+    return KWin::edit( id, whole_app );
     }

kcmkwin/kwinrules/ruleslist.cpp

@@ -25,7 +25,7 @@
 
 #include "ruleswidget.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 KCMRulesList::KCMRulesList( QWidget* parent, const char* name )

kcmkwin/kwinrules/ruleslist.h

@@ -20,32 +20,23 @@
 #ifndef __RULESLIST_H__
 #define __RULESLIST_H__
 
-#include "ui_ruleslistbase.h"
+#include "ruleslistbase.h"
 
 
 
 #include "../../rules.h"
 
-class QListWidgetItem;
+class Q3ListBoxItem;
 
-namespace KWinInternal
+namespace KWin
 {
 
-class KCMRulesListBase : public QWidget, public Ui::KCMRulesListBase
-{
-public:
-  KCMRulesListBase( QWidget *parent ) : QWidget( parent ) {
-    setupUi( this );
-  }
-};
-
-
 class KCMRulesList
     : public KCMRulesListBase
     {
     Q_OBJECT
     public:
-        KCMRulesList( QWidget* parent = NULL );
+        KCMRulesList( QWidget* parent = NULL, const char* name = NULL );
         virtual ~KCMRulesList();
         void load();
         void save();
@@ -58,7 +49,7 @@ class KCMRulesList
         void deleteClicked();
         void moveupClicked();
         void movedownClicked();
-        void activeChanged( QListWidgetItem* );
+        void activeChanged( Q3ListBoxItem* );
     private:
         QVector< Rules* > rules;
     };

kcmkwin/kwinrules/ruleslistbase.ui

@@ -1,5 +1,5 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>KWinInternal::KCMRulesListBase</class>
+<class>KWin::KCMRulesListBase</class>
 <widget class="QWidget">
     <property name="name">
         <cstring>KCMRulesListBase</cstring>

kcmkwin/kwinrules/ruleswidget.cpp

@@ -37,7 +37,7 @@
 
 #include "detectwidget.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 #define SETUP( var, type ) \

kcmkwin/kwinrules/ruleswidget.h

@@ -27,7 +27,7 @@
 #include "ruleswidgetbase.h"
 #include "editshortcutbase.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 class Rules;

kcmkwin/kwinrules/ruleswidgetbase.ui

@@ -1,5 +1,5 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>KWinInternal::RulesWidgetBase</class>
+<class>KWin::RulesWidgetBase</class>
 <widget class="QWidget">
     <property name="name">
         <cstring>RulesWidgetBase</cstring>
@@ -329,7 +329,7 @@
                             <cstring>types</cstring>
                         </property>
                     </widget>
-                    <widget class="KListWidget" row="1" column="0" rowspan="1" colspan="4">
+                    <widget class="K3ListBox" row="1" column="0" rowspan="1" colspan="4">
                         <item>
                             <property name="text">
                                 <string>Normal Window</string>
@@ -384,7 +384,7 @@
                             <cstring>types</cstring>
                         </property>
                         <property name="selectionMode">
-                            <enum>MultiSelection</enum>
+                            <enum>Multi</enum>
                         </property>
                     </widget>
                     <widget class="QLabel" row="2" column="0" rowspan="1" colspan="4">
@@ -2541,9 +2541,4 @@
 </slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>krestrictedline.h</includehint>
-</includehints>
 </UI>

killwindow.cpp

@@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <X11/cursorfont.h>
 #include <QX11Info>
 
-namespace KWinInternal
+namespace KWin
 {
 
 KillWindow::KillWindow( Workspace* ws )
@@ -76,7 +76,7 @@ void KillWindow::start()
                     mx /= 10;
                     my /= 10;
                     }
-                QCursor::setPos(QCursor::pos()+QPoint(mx, my));
+                QCursor::setPos(cursorPos()+QPoint(mx, my));
                 }
 
             if (ev.type == ButtonRelease) 
@@ -87,8 +87,7 @@ void KillWindow::start()
                     escape_pressed = true;
                     break;
                     }
-                if( ev.xbutton.button == Button1 || ev.xbutton.button == Button2 )
+                workspace->killWindowId(ev.xbutton.subwindow);
-                    workspace->killWindowId(ev.xbutton.subwindow);
                 }
             continue;
             }

killwindow.h

@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include "workspace.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 class KillWindow 

layers.cpp

@@ -74,7 +74,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "rules.h"
 #include <QX11Info>
 
-namespace KWinInternal
+namespace KWin
 {
 
 //*******************************

main.cpp

@@ -14,7 +14,6 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include "main.h"
 
-#include <kglobal.h>
 #include <klocale.h>
 #include <stdlib.h>
 #include <kcmdlineargs.h>
@@ -26,11 +25,13 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <stdio.h>
 #include <fixx11h.h>
 #include <QtDBus/QtDBus>
+#include <kglobal.h>
 
 #include "atoms.h"
 #include "options.h"
 #include "sm.h"
 #include "utils.h"
+#include "effects.h"
 
 #define INT8 _X11INT8
 #define INT32 _X11INT32
@@ -38,7 +39,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #undef INT8
 #undef INT32
 
-namespace KWinInternal
+namespace KWin
 {
 
 Options* options;
@@ -120,6 +121,8 @@ Application::Application( )
     options = new Options;
     atoms = new Atoms;
 
+    initting = false; // TODO
+
     // create workspace.
     (void) new Workspace( isSessionRestored() );
 
@@ -127,13 +130,15 @@ Application::Application( )
 
     initting = false; // startup done, we are up and running now.
 
+    QDBusInterface ksplash( "org.kde.ksplash", "/ksplash", "org.kde.KSplash" );   
+    ksplash.call( "upAndRunning", QString( "wm started" ));
     XEvent e;
     e.xclient.type = ClientMessage;
     e.xclient.message_type = XInternAtom( display(), "_KDE_SPLASH_PROGRESS", False );
     e.xclient.display = display();
     e.xclient.window = rootWindow();
     e.xclient.format = 8;
-    strcpy( e.xclient.data.b, "wm" );
+    strcpy( e.xclient.data.b, "wm started" );
     XSendEvent( display(), rootWindow(), False, SubstructureNotifyMask, &e );
     }
 
@@ -143,6 +148,8 @@ Application::~Application()
     if( owner.ownerWindow() != None ) // if there was no --replace (no new WM)
         XSetInputFocus( display(), PointerRoot, RevertToPointerRoot, xTime() );
     delete options;
+    delete effects;
+    delete atoms;
     }
 
 void Application::lostSelection()
@@ -209,7 +216,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
                 }
 
             int number_of_screens = ScreenCount( dpy );
-            KWinInternal::screen_number = DefaultScreen( dpy );
+            KWin::screen_number = DefaultScreen( dpy );
             int pos; // temporarily needed to reconstruct DISPLAY var if multi-head
             QByteArray display_name = XDisplayString( dpy );
             XCloseDisplay( dpy );
@@ -225,9 +232,9 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
                     {
 		    // if execution doesn't pass by here, then kwin
 		    // acts exactly as previously
-                    if ( i != KWinInternal::screen_number && fork() == 0 )
+                    if ( i != KWin::screen_number && fork() == 0 )
                         {
-                        KWinInternal::screen_number = i;
+                        KWin::screen_number = i;
 			// break here because we are the child process, we don't
 			// want to fork() anymore
                         break;
@@ -235,7 +242,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
                     }
 		// in the next statement, display_name shouldn't contain a screen
 		//   number. If it had it, it was removed at the "pos" check
-                envir.sprintf("DISPLAY=%s.%d", display_name.data(), KWinInternal::screen_number);
+                envir.sprintf("DISPLAY=%s.%d", display_name.data(), KWin::screen_number);
 
                 if (putenv( strdup(envir.toAscii())) )
                     {
@@ -259,27 +266,27 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
     KCmdLineArgs::init(argc, argv, &aboutData);
     KCmdLineArgs::addCmdLineOptions( args );
 
-    if (signal(SIGTERM, KWinInternal::sighandler) == SIG_IGN)
+    if (signal(SIGTERM, KWin::sighandler) == SIG_IGN)
         signal(SIGTERM, SIG_IGN);
-    if (signal(SIGINT, KWinInternal::sighandler) == SIG_IGN)
+    if (signal(SIGINT, KWin::sighandler) == SIG_IGN)
         signal(SIGINT, SIG_IGN);
-    if (signal(SIGHUP, KWinInternal::sighandler) == SIG_IGN)
+    if (signal(SIGHUP, KWin::sighandler) == SIG_IGN)
         signal(SIGHUP, SIG_IGN);
 #ifdef __GNUC__
 #warning D-BUS TODO
 //    KApplication::disableAutoDcopRegistration();
 #endif
-    KWinInternal::Application a;
+    KWin::Application a;
-    KWinInternal::SessionManager weAreIndeed;
+    KWin::SessionManager weAreIndeed;
-    KWinInternal::SessionSaveDoneHelper helper;
+    KWin::SessionSaveDoneHelper helper;
 
-    fcntl(XConnectionNumber(KWinInternal::display()), F_SETFD, 1);
+    fcntl(XConnectionNumber(KWin::display()), F_SETFD, 1);
 
     QString appname;
-    if (KWinInternal::screen_number == 0)
+    if (KWin::screen_number == 0)
-        appname = "org.kde.kwin";
+        appname = "kwin";
     else
-        appname.sprintf("org.kde.kwin-screen-%d", KWinInternal::screen_number);
+        appname.sprintf("kwin-screen-%d", KWin::screen_number);
 
     QDBusConnection::sessionBus().interface()->registerService( appname, QDBusConnectionInterface::DontQueueService );
 

main.h

@@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "workspace.h"
 #include "utils.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 class Application : public  KApplication

manage.cpp

@@ -26,7 +26,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "rules.h"
 #include "group.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 /*!

notifications.cpp

@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include "client.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 QString Notify::eventToName( Event e )

notifications.h

@@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <QString>
 #include <QList>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class Client;

options.cpp

@@ -26,7 +26,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #endif
 
-namespace KWinInternal
+namespace KWin
 {
 
 #ifndef KCMRULES

options.h

@@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include "placement.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 class Client;

placement.cpp

@@ -22,7 +22,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "rules.h"
 #endif
 
-namespace KWinInternal
+namespace KWin
 {
 
 #ifndef KCMRULES

placement.h

@@ -17,7 +17,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <QRect>
 #include <QList>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class Workspace;

plugins.cpp

@@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <stdlib.h>
 #include <QPixmap>
 
-namespace KWinInternal
+namespace KWin
 {
 
 PluginMgr::PluginMgr()

plugins.h

@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <kdecoration_plugins_p.h>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class PluginMgr

popupinfo.cpp

@@ -33,7 +33,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 // specify externals before namespace
 
-namespace KWinInternal
+namespace KWin
 {
 
 PopupInfo::PopupInfo( const char *name )

popupinfo.h

@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <QWidget>
 #include <QTimer>
 
-namespace KWinInternal
+namespace KWin
 {
 
 class Workspace;

rules.cpp

@@ -22,7 +22,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "workspace.h"
 #endif
 
-namespace KWinInternal
+namespace KWin
 {
 
 Rules::Rules()
@@ -850,8 +850,6 @@ void Client::updateWindowRules()
     {
     if( !isManaged()) // not fully setup yet
         return;
-    if( workspace()->rulesUpdatesDisabled())
-        return;
     client_rules.update( this );
     }
 
@@ -1009,14 +1007,6 @@ void Workspace::rulesUpdated()
     rulesUpdatedTimer.start( 1000 );
     }
 
-void Workspace::disableRulesUpdates( bool disable )
-    {
-    rules_updates_disabled = disable;
-    if( !disable )
-        foreach( Client* c, clients )
-            c->updateWindowRules();
-    }
-
 #endif
 
 } // namespace

rules.h

@@ -24,7 +24,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 class KConfig;
 
-namespace KWinInternal
+namespace KWin
 {
 
 class Client;

scene.cpp

@@ -67,7 +67,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "deleted.h"
 #include "effects.h"
 
-namespace KWinInternal
+namespace KWin
 {
 
 //****************************************