From bfbe44dacc43b2d54f88afa5019bdc8d2ec6d197 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Tue, 2 Mar 2010 03:40:34 +0000
Subject: [PATCH] * move kstyles from runtime into workspace * make a proper
 library out of the oxygen helper lib * make the oxygen widget and kwin style
 link against it

svn path=/trunk/KDE/kdebase/workspace/; revision=1097791
---
 clients/oxygen/CMakeLists.txt              | 5 ++---
 clients/oxygen/oxygen.h                    | 2 +-
 clients/oxygen/oxygenbutton.h              | 2 +-
 clients/oxygen/oxygenclient.cpp            | 2 +-
 clients/oxygen/oxygenclient.h              | 4 ++--
 clients/oxygen/oxygenclientgroupitemdata.h | 2 +-
 clients/oxygen/oxygenshadowcache.cpp       | 2 +-
 clients/oxygen/oxygenshadowcache.h         | 2 +-
 clients/oxygen/oxygentitleanimationdata.h  | 2 +-
 9 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/clients/oxygen/CMakeLists.txt b/clients/oxygen/CMakeLists.txt
index 5a6d2ae83f..e732574893 100644
--- a/clients/oxygen/CMakeLists.txt
+++ b/clients/oxygen/CMakeLists.txt
@@ -1,12 +1,10 @@
 ########### add version number into compilation defines
 add_definitions ( -DAPP_VERSION=\\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\")
 add_subdirectory( config )
+include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen)
 
 ########### next target ###############
 set(kwin_oxygen_SRCS
-     lib/helper.cpp
-     lib/tileset.cpp
-     lib/oxygenanimation.cpp
      oxygen.cpp
      oxygenbutton.cpp
      oxygenclient.cpp
@@ -27,6 +25,7 @@ target_link_libraries(
     ${X11_X11_LIB}
     ${X11_Xrender_LIB}
     kdecorations
+    oxygenstyle
   )
 
 install(TARGETS kwin3_oxygen  DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/clients/oxygen/oxygen.h b/clients/oxygen/oxygen.h
index b7b1d12de0..66943853c9 100644
--- a/clients/oxygen/oxygen.h
+++ b/clients/oxygen/oxygen.h
@@ -35,7 +35,7 @@
 #include "oxygenexceptionlist.h"
 
 #include "oxygenshadowcache.h"
-#include "lib/helper.h"
+#include "oxygenhelper.h"
 
 namespace Oxygen
 {
diff --git a/clients/oxygen/oxygenbutton.h b/clients/oxygen/oxygenbutton.h
index 26c33280be..40751e4abc 100644
--- a/clients/oxygen/oxygenbutton.h
+++ b/clients/oxygen/oxygenbutton.h
@@ -31,7 +31,7 @@
 #include <kcommondecoration.h>
 
 #include "oxygen.h"
-#include "lib/oxygenanimation.h"
+#include "oxygenanimation.h"
 
 namespace Oxygen
 {
diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp
index a2dd30ed4f..4f173e9ffb 100644
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@@ -31,7 +31,7 @@
 #include "oxygen.h"
 #include "oxygenbutton.h"
 #include "oxygensizegrip.h"
-#include "lib/tileset.h"
+#include "tileset.h"
 
 #include <cassert>
 #include <cmath>
diff --git a/clients/oxygen/oxygenclient.h b/clients/oxygen/oxygenclient.h
index 6ad9b211d6..4caea2e8a5 100644
--- a/clients/oxygen/oxygenclient.h
+++ b/clients/oxygen/oxygenclient.h
@@ -32,8 +32,8 @@
 #include "oxygenclientgroupitemdata.h"
 #include "oxygenconfiguration.h"
 #include "oxygentitleanimationdata.h"
-#include "lib/oxygenanimation.h"
-#include "lib/helper.h"
+#include "oxygenanimation.h"
+#include "oxygenhelper.h"
 
 #include <kcommondecoration.h>
 #include <KGlobalSettings>
diff --git a/clients/oxygen/oxygenclientgroupitemdata.h b/clients/oxygen/oxygenclientgroupitemdata.h
index a3d79e484d..17125c3999 100644
--- a/clients/oxygen/oxygenclientgroupitemdata.h
+++ b/clients/oxygen/oxygenclientgroupitemdata.h
@@ -29,7 +29,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "oxygenbutton.h"
-#include "lib/oxygenanimation.h"
+#include "oxygenanimation.h"
 
 #include <QtCore/QList>
 #include <QtCore/QWeakPointer>
diff --git a/clients/oxygen/oxygenshadowcache.cpp b/clients/oxygen/oxygenshadowcache.cpp
index 893a03601b..c41ae23459 100644
--- a/clients/oxygen/oxygenshadowcache.cpp
+++ b/clients/oxygen/oxygenshadowcache.cpp
@@ -27,7 +27,7 @@
 #include "oxygenshadowcache.h"
 #include "oxygenclient.h"
 #include "oxygen.h"
-#include "lib/helper.h"
+#include "oxygenhelper.h"
 
 #include <cassert>
 #include <KColorUtils>
diff --git a/clients/oxygen/oxygenshadowcache.h b/clients/oxygen/oxygenshadowcache.h
index a00e903e47..8d704de0b4 100644
--- a/clients/oxygen/oxygenshadowcache.h
+++ b/clients/oxygen/oxygenshadowcache.h
@@ -31,7 +31,7 @@
 #include <QtGui/QRadialGradient>
 
 #include "oxygenshadowconfiguration.h"
-#include "lib/tileset.h"
+#include "tileset.h"
 
 class OxygenHelper;
 
diff --git a/clients/oxygen/oxygentitleanimationdata.h b/clients/oxygen/oxygentitleanimationdata.h
index 1e9b49176b..f83dd10374 100644
--- a/clients/oxygen/oxygentitleanimationdata.h
+++ b/clients/oxygen/oxygentitleanimationdata.h
@@ -28,7 +28,7 @@
 // IN THE SOFTWARE.
 //////////////////////////////////////////////////////////////////////////////
 
-#include "lib/oxygenanimation.h"
+#include "oxygenanimation.h"
 
 #include <cassert>
 #include <QtCore/QObject>