diff options
| author | Dana Jansens <danakj@orodu.net> | 2002-11-10 10:22:47 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2002-11-10 10:22:47 +0000 |
| commit | 73f6bb1a7b6bb5f8b9cf22587722d713a1f15b59 (patch) | |
| tree | a3af0d7ddc760c2122e50de28fb9f356fd3c68a0 | |
| parent | 410a8264586671256f4a2d1b3095fa6ecffc01bd (diff) | |
move screen.cc/hh to bbscreen.cc/hh
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/bbscreen.cc (renamed from src/screen.cc) | 2 | ||||
| -rw-r--r-- | src/bbscreen.hh (renamed from src/screen.hh) | 0 | ||||
| -rw-r--r-- | src/bbwindow.cc | 2 | ||||
| -rw-r--r-- | src/blackbox.cc | 2 | ||||
| -rw-r--r-- | src/client.cc | 2 | ||||
| -rw-r--r-- | src/frame.hh | 4 | ||||
| -rw-r--r-- | src/workspace.cc | 2 | ||||
| -rw-r--r-- | src/xeventhandler.cc | 2 |
9 files changed, 9 insertions, 9 deletions
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 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 index f0bc33d5..f0bc33d5 100644 --- a/src/screen.hh +++ b/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> |