all repos — openbox @ 73f6bb1a7b6bb5f8b9cf22587722d713a1f15b59

openbox fork - make it a bit more like ryudo 

move screen.cc/hh to bbscreen.cc/hh
Dana Jansens danakj@orodu.net
commit

73f6bb1a7b6bb5f8b9cf22587722d713a1f15b59

parent

410a8264586671256f4a2d1b3095fa6ecffc01bd

9 files changed, 9 insertions(+), 9 deletions(-)

jump to
M src/Makefile.am → 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
M src/bbwindow.cc → src/bbwindow.cc 
@@ -27,7 +27,7 @@ #include "blackbox.hh"
 #include "font.hh"
 #include "gccache.hh"
 #include "image.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
 #include "bbwindow.hh"
 #include "workspace.hh"
M src/blackbox.cc → src/blackbox.cc 
@@ -79,7 +79,7 @@ #include "blackbox.hh"
 #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"
M src/client.cc → src/client.cc 
@@ -5,7 +5,7 @@ # include "../config.h"
 #endif
 
 #include "client.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
 #include "openbox.hh"
 #include "otk/display.hh"
 #include "otk/property.hh"
M src/frame.hh → src/frame.hh 
@@ -9,13 +9,13 @@ 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 {
M src/screen.cc → src/bbscreen.cc 
@@ -54,7 +54,7 @@ #include <functional>
 #include <string>
 using std::string;
 
-#include "screen.hh"
+#include "bbscreen.hh"
 #include "otk/font.hh"
 #include "otk/gccache.hh"
 #include "otk/image.hh"
M src/workspace.cc → src/workspace.cc 
@@ -27,7 +27,7 @@ 
 #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"
M src/xeventhandler.cc → src/xeventhandler.cc 
@@ -13,7 +13,7 @@ #include "otk/rect.hh"
 
 // XXX: REMOVE THIS SOON!!#!
 #include "blackbox.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
 
 extern "C" {
 #include <X11/Xlib.h>