From: Dana Jansens <danakj@orodu.net>
Date: Sun, 10 Nov 2002 10:22:47 +0000 (+0000)
Subject: move screen.cc/hh to bbscreen.cc/hh
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=73f6bb1a7b6bb5f8b9cf22587722d713a1f15b59;p=chaz%2Fopenbox

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

diff --git a/src/Makefile.am b/src/Makefile.am
index cbbebb23..ef61e4c7 100644
--- 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 d6350c2e..ebfceb98 100644
--- 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 82c31aa3..ea0bb55c 100644
--- 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 ce0e550c..bfaefb7c 100644
--- 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 d6111ce2..f770fecd 100644
--- 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 5e7ba927..f1632981 100644
--- 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 2bf9d29a..467d8684 100644
--- 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 9d738dde..afa5ecee 100644
--- 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>