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

diff --git a/src/Makefile.am b/src/Makefile.am
index 065efbb..19306b3 100644 (file)
--- a/src/Makefile.am
+++ b/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

diff --git a/src/bbwindow.cc b/src/bbwindow.cc
index 17c5396..64a6b25 100644 (file)
--- a/src/bbwindow.cc
+++ b/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;

diff --git a/src/blackbox.cc b/src/blackbox.cc
index a6a0b9f..ca6ac81 100644 (file)
--- a/src/blackbox.cc
+++ b/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"
 

diff --git a/src/screen.cc b/src/screen.cc
index f8b998e..4afe22a 100644 (file)
--- a/src/screen.cc
+++ b/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"

diff --git a/src/workspace.cc b/src/workspace.cc
index 5259f3a..ab209b0 100644 (file)
--- a/src/workspace.cc
+++ b/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"