code reorganize

[chaz/openbox] / src / blackbox.cc

diff --git a/src/blackbox.cc b/src/blackbox.cc
index 0b5096557ba013955126cc058a982359519c8777..bfaefb7c8b1277247d593272d603ef6372e6e7d0 100644 (file)
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -79,8 +79,8 @@ using std::string;
 #include "otk/gccache.hh"
 #include "otk/image.hh"
 #include "otk/assassin.hh"
-#include "screen.hh"
-#include "util.hh"
+#include "bbscreen.hh"
+#include "otk/util.hh"
 #include "bbwindow.hh"
 #include "workspace.hh"
 
@@ -102,12 +102,12 @@ Blackbox::Blackbox(int argc, char **m_argv, char *rc)
   argv = m_argv;
 
   // try to make sure the ~/.openbox directory exists
-  mkdir(expandTilde("~/.openbox").c_str(), S_IREAD | S_IWRITE | S_IEXEC |
+  mkdir(otk::expandTilde("~/.openbox").c_str(), S_IREAD | S_IWRITE | S_IEXEC |
                                            S_IRGRP | S_IWGRP | S_IXGRP |
                                            S_IROTH | S_IWOTH | S_IXOTH);
   
   if (! rc) rc = "~/.openbox/rc3";
-  rc_file = expandTilde(rc);
+  rc_file = otk::expandTilde(rc);
   config.setFile(rc_file);  
 
   no_focus = False;
@@ -831,7 +831,7 @@ void Blackbox::process_event(XEvent *e) {
 
   default: {
 #ifdef    SHAPE
-    if (e->type == getShapeEventBase()) {
+    if (e->type == otk::OBDisplay::shapeEventBase()) {
       XShapeEvent *shape_event = (XShapeEvent *) e;
       BlackboxWindow *win = searchWindow(e->xany.window);
 
@@ -1062,7 +1062,7 @@ void Blackbox::load_rc(void) {
   else if (resource.colors_per_channel > 6) resource.colors_per_channel = 6;
 
   if (config.getValue("session.styleFile", s))
-    resource.style_file = expandTilde(s);
+    resource.style_file = otk::expandTilde(s);
   else
     resource.style_file = DEFAULTSTYLE;