complete the change from window.cc/hh to bbwindow.cc/hh

src/Makefile.am

@@ -16,7 +16,7 @@ bin_PROGRAMS= openbox
 openbox_LDADD=../otk/libotk.a @LIBINTL@
 
 openbox_SOURCES= configuration.cc screen.cc openbox.cc \
-                 util.cc window.cc workspace.cc xatom.cc blackbox.cc \
+                 util.cc bbwindow.cc workspace.cc xatom.cc blackbox.cc \
                  main.cc xeventhandler.cc
 
 MAINTAINERCLEANFILES= Makefile.in

src/bbwindow.cc

@@ -29,7 +29,7 @@ extern "C" {
 #include "image.hh"
 #include "screen.hh"
 #include "util.hh"
-#include "window.hh"
+#include "bbwindow.hh"
 #include "workspace.hh"
 
 using std::string;

src/blackbox.cc

@@ -81,7 +81,7 @@ using std::string;
 #include "otk/assassin.hh"
 #include "screen.hh"
 #include "util.hh"
-#include "window.hh"
+#include "bbwindow.hh"
 #include "workspace.hh"
 #include "xatom.hh"
 

src/screen.cc

@@ -61,7 +61,7 @@ using std::string;
 #include "otk/assassin.hh"
 #include "openbox.hh"
 #include "util.hh"
-#include "window.hh"
+#include "bbwindow.hh"
 #include "workspace.hh"
 #include "util.hh"
 #include "xatom.hh"

src/workspace.cc

@@ -29,7 +29,7 @@ using std::string;
 #include "otk/display.hh"
 #include "screen.hh"
 #include "util.hh"
-#include "window.hh"
+#include "bbwindow.hh"
 #include "workspace.hh"
 #include "xatom.hh"