oxygen.h/.cpp renamed to oxygenfactory.h/.cpp for consistency.

svn path=/trunk/KDE/kdebase/workspace/; revision=1121941

clients/oxygen/CMakeLists.txt

@@ -6,7 +6,7 @@ include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen)
 ########### next target ###############
 set(kwin_oxygen_SRCS
      helper.cpp
-     oxygen.cpp
+     oxygenfactory.cpp
      oxygenbutton.cpp
      oxygenclient.cpp
      oxygenclientgroupitemdata.cpp

clients/oxygen/oxygenbutton.cpp

@@ -28,7 +28,6 @@
 #include "oxygenbutton.h"
 #include "oxygenbutton.moc"
 #include "oxygenclient.h"
-#include "oxygen.h"
 
 #include <cmath>
 

clients/oxygen/oxygenbutton.h

@@ -30,7 +30,7 @@
 
 #include <kcommondecoration.h>
 
-#include "oxygen.h"
+#include "oxygenfactory.h"
 #include "oxygenanimation.h"
 
 namespace Oxygen

clients/oxygen/oxygenclient.cpp

@@ -28,7 +28,6 @@
 #include "oxygenclient.h"
 #include "oxygenclient.moc"
 
-#include "oxygen.h"
 #include "oxygenbutton.h"
 #include "oxygensizegrip.h"
 #include "tileset.h"

clients/oxygen/oxygenclient.h

@@ -28,7 +28,7 @@
 // IN THE SOFTWARE.
 //////////////////////////////////////////////////////////////////////////////
 
-#include "oxygen.h"
+#include "oxygenfactory.h"
 #include "oxygenclientgroupitemdata.h"
 #include "oxygenconfiguration.h"
 #include "oxygentitleanimationdata.h"

clients/oxygen/oxygenclientgroupitemdata.cpp

@@ -29,7 +29,6 @@
 #include "oxygenclientgroupitemdata.h"
 #include "oxygenclientgroupitemdata.moc"
 #include "oxygenclient.h"
-#include "oxygen.h"
 
 namespace Oxygen
 {

clients/oxygen/oxygenfactory.cpp

@@ -24,8 +24,8 @@
 // IN THE SOFTWARE.
 //////////////////////////////////////////////////////////////////////////////
 
-#include "oxygen.h"
+#include "oxygenfactory.h"
-#include "oxygen.moc"
+#include "oxygenfactory.moc"
 #include "oxygenclient.h"
 
 #include <cassert>

clients/oxygen/oxygenshadowcache.cpp

@@ -26,7 +26,6 @@
 
 #include "oxygenshadowcache.h"
 #include "oxygenclient.h"
-#include "oxygen.h"
 #include "oxygenhelper.h"
 
 #include <cassert>