Fixed KWinInterface.h (thanks Simon for the temporary fix :)

Reverted the moving of inline functions in workspace.*

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

KWinInterface.h

@@ -1,13 +1,15 @@
-#ifndef __kwin_interface_h__
-#define __kwin_interface_h__
+#ifndef KWIN_INTERFACE_H
+#define KWIN_INTERFACE_H
 
 #include <dcopobject.h>
 
 class KWinInterface : virtual public DCOPObject
 {
   K_DCOP
-public:
 
+  k_dcop:
+
+    virtual void updateClientArea() = 0;
 };
 
 #endif

workspace.cpp

@@ -2296,28 +2296,3 @@ Workspace::updateClientArea()
   qDebug("clientArea now == l: %d, r: %d, t: %d, b: %d", clientArea_.left(), clientArea_.top(), clientArea_.right(), clientArea_.bottom());
 }
 
-WId Workspace::rootWin() const
-{
-    return root;
-}
-
-Client* Workspace::activeClient() const
-{
-    return active_client;
-}
-
-int Workspace::currentDesktop() const
-{
-    return current_desktop;
-}
-
-int Workspace::numberOfDesktops() const
-{
-    return number_of_desktops;
-}
-
-const ClientList& Workspace::stackingOrder() const
-{
-    return stacking_order;
-}
-

workspace.h

@@ -283,4 +283,29 @@ private:
     QRect clientArea_;
 };
 
+inline WId Workspace::rootWin() const
+{
+    return root;
+}
+
+inline Client* Workspace::activeClient() const
+{
+    return active_client;
+}
+
+inline int Workspace::currentDesktop() const
+{
+    return current_desktop;
+}
+
+inline int Workspace::numberOfDesktops() const
+{
+    return number_of_desktops;
+}
+
+inline const ClientList& Workspace::stackingOrder() const
+{
+    return stacking_order;
+}
+
 #endif