Breaking BC in KWin again in order to keep BC for plugins. I forgot

a few private pointers *slap self*.

svn path=/trunk/kdebase/kwin/; revision=92998

clients/kwmtheme/kwmthemeclient.cpp

@@ -85,8 +85,6 @@ static bool pixmaps_created = false;
 static bool titleSunken = false;
 static bool titleTransparent;
 
-extern Options *options;
-
 static void init_theme()
 {
     const char *keys[] = {"wm_top", "wm_bottom", "wm_left", "wm_right",

clients/riscos/Button.cpp

@@ -24,6 +24,8 @@
 #include "Button.h"
 #include "Static.h"
 
+using namespace KWinInternal;
+
 namespace RiscOS
 {
 

clients/riscos/Manager.cpp

@@ -54,6 +54,8 @@ extern "C"
   }
 }
 
+using namespace KWinInternal;
+
 namespace RiscOS
 {
 

clients/riscos/Static.cpp

@@ -36,6 +36,8 @@
 
 #include "Static.h"
 
+using namespace KWinInternal;
+
 namespace RiscOS
 {
 

main.cpp

@@ -37,7 +37,10 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 
 using namespace KWinInternal;
 
+namespace KWinInternal {
 Options* options;
+};
+
 Atoms* atoms;
 
 Time kwin_time = CurrentTime;

options.cpp

@@ -11,9 +11,26 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 
+using namespace KWinInternal;
+
+namespace KWinInternal
+{
+class OptionsPrivate
+{
+public:
+    OptionsPrivate() {};
+    QColor colors[KWINCOLORS*2];
+    QColorGroup *cg[KWINCOLORS*2];
+};
+};
+
+#define colors (d->colors)
+#define cg (d->cg)
+
 Options::Options()
     : QObject( 0, 0)
 {
+    d = new OptionsPrivate;
     int i;
     for(i=0; i < KWINCOLORS*2; ++i)
         cg[i] = NULL;
@@ -30,6 +47,7 @@ Options::~Options(){
             cg[i] = NULL;
         }
     }
+    delete d;
 }
 
 const QColor& Options::color(ColorType type, bool active)

options.h

@@ -14,6 +14,10 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 // increment this when you add a color type (mosfet)
 #define KWINCOLORS 6
 
+namespace KWinInternal {
+
+class OptionsPrivate;
+
 class Options : public QObject {
     Q_OBJECT
 public:
@@ -251,8 +255,6 @@ signals:
 
 protected:
     QFont activeFont, inactiveFont, activeFontSmall, inactiveFontSmall;
-    QColor colors[KWINCOLORS*2];
-    QColorGroup *cg[KWINCOLORS*2];
 
 private:
 
@@ -273,8 +275,12 @@ private:
     MouseCommand CmdAll1;
     MouseCommand CmdAll2;
     MouseCommand CmdAll3;
+    
+    OptionsPrivate* d;
 };
 
 extern Options* options;
 
+}; // namespace
+
 #endif

workspace.h

@@ -51,7 +51,7 @@ public:
 
 typedef QValueList<SystemTrayWindow> SystemTrayWindowList;
 
-
+struct SessionInfoPrivate;
 struct SessionInfo
 {
     QCString sessionId;
@@ -70,6 +70,9 @@ struct SessionInfo
     bool shaded;
     bool staysOnTop;
     bool skipTaskbar;
+
+    private:
+    SessionInfoPrivate* d;
 };