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

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
 

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"

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"
 

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"

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"

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)

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"

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>