move screen.cc/hh to bbscreen.cc/hh

diff --git a/src/Makefile.am b/src/Makefile.am
index cbbebb2363747c903387e32272a2adbda7a8552f..ef61e4c720b2142455aa62d9d90da33ea5df3526 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@ bin_PROGRAMS= openbox3
 
 openbox3_LDADD=../otk/libotk.a @LIBINTL@
 
-openbox3_SOURCES= client.cc frame.cc screen.cc openbox.cc \
+openbox3_SOURCES= client.cc frame.cc bbscreen.cc openbox.cc \
                  bbwindow.cc workspace.cc blackbox.cc \
                  main.cc xeventhandler.cc
 

diff --git a/src/screen.cc b/src/bbscreen.cc
similarity index 99%
rename from src/screen.cc
rename to src/bbscreen.cc
index d6350c2e4a82f0b727eb8f7d0d9d6511a56d4bba..ebfceb98965d04bbc6a6d0ed110adb2b0cd551f4 100644 (file)
--- a/src/screen.cc
+++ b/src/bbscreen.cc
@@ -54,7 +54,7 @@ extern "C" {
 #include <string>
 using std::string;
 
-#include "screen.hh"
+#include "bbscreen.hh"
 #include "otk/font.hh"
 #include "otk/gccache.hh"
 #include "otk/image.hh"

diff --git a/src/screen.hh b/src/bbscreen.hh
similarity index 100%
rename from src/screen.hh
rename to src/bbscreen.hh

diff --git a/src/bbwindow.cc b/src/bbwindow.cc
index 82c31aa34a56e2f11bf17b8243c0e47b8193811a..ea0bb55c7cdece4bc97d5ff459cc16dcbfac0331 100644 (file)
--- a/src/bbwindow.cc
+++ b/src/bbwindow.cc
@@ -27,7 +27,7 @@ extern "C" {
 #include "font.hh"
 #include "gccache.hh"
 #include "image.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
 #include "bbwindow.hh"
 #include "workspace.hh"
 

diff --git a/src/blackbox.cc b/src/blackbox.cc
index ce0e550cef1920cf6661e662409b034b42629de0..bfaefb7c8b1277247d593272d603ef6372e6e7d0 100644 (file)
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -79,7 +79,7 @@ using std::string;
 #include "otk/gccache.hh"
 #include "otk/image.hh"
 #include "otk/assassin.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
 #include "otk/util.hh"
 #include "bbwindow.hh"
 #include "workspace.hh"

diff --git a/src/client.cc b/src/client.cc
index d6111ce2b40a7a9ba255c3b9785ecae1f8b30b04..f770fecd9f842c6625ed89ced3a03ddaef487f46 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -5,7 +5,7 @@
 #endif
 
 #include "client.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
 #include "openbox.hh"
 #include "otk/display.hh"
 #include "otk/property.hh"

diff --git a/src/frame.hh b/src/frame.hh
index 5e7ba927c14daf4e448b775f28f387629ad6b350..f163298180e6249f999f060044cd130953e41dee 100644 (file)
--- a/src/frame.hh
+++ b/src/frame.hh
@@ -9,14 +9,14 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
-#include <string>
-
 #include "client.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
 #include "otk/screeninfo.hh"
 #include "otk/style.hh"
 
+#include <string>
+
 namespace ob {
 
 //! Holds and decorates a frame around an OBClient (client window)

diff --git a/src/workspace.cc b/src/workspace.cc
index 2bf9d29a599fd6d1caf9c33bafcc0fa8b75476f4..467d868400feda0670af4ed9f1c3897c3147e286 100644 (file)
--- a/src/workspace.cc
+++ b/src/workspace.cc
@@ -27,7 +27,7 @@ using std::string;
 #include "blackbox.hh"
 #include "otk/font.hh"
 #include "otk/display.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
 #include "otk/util.hh"
 #include "bbwindow.hh"
 #include "workspace.hh"

diff --git a/src/xeventhandler.cc b/src/xeventhandler.cc
index 9d738dde0e6773f2ff294af934b2348b21351d95..afa5eceeb4095923a28718fd67adf61a3dfd7bd2 100644 (file)
--- a/src/xeventhandler.cc
+++ b/src/xeventhandler.cc
@@ -13,7 +13,7 @@
 
 // XXX: REMOVE THIS SOON!!#!
 #include "blackbox.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
 
 extern "C" {
 #include <X11/Xlib.h>