rm prefixes for all elements in the otk namepsace

1 files changed, 13 insertions, 12 deletions

diff --git a/otk/screeninfo.cc b/otk/screeninfo.cc
index 08d8517b..568b46b2 100644
--- a/otk/screeninfo.cc
+++ b/otk/screeninfo.cc
@@ -1,4 +1,5 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef    HAVE_CONFIG_H
 #  include "../config.h"
@@ -20,11 +21,11 @@ namespace otk {
 ScreenInfo::ScreenInfo(unsigned int num) {
   _screen = num;
 
-  _root_window = RootWindow(OBDisplay::display, _screen);
+  _root_window = RootWindow(Display::display, _screen);
 
-  _rect.setSize(WidthOfScreen(ScreenOfDisplay(OBDisplay::display,
+  _rect.setSize(WidthOfScreen(ScreenOfDisplay(Display::display,
                                               _screen)),
-               HeightOfScreen(ScreenOfDisplay(OBDisplay::display,
+               HeightOfScreen(ScreenOfDisplay(Display::display,
                                               _screen)));
   /*
     If the default depth is at least 8 we will use that,
@@ -32,9 +33,9 @@ ScreenInfo::ScreenInfo(unsigned int num) {
     Preference is given to 24 bit over larger depths if 24 bit is an option.
   */
 
-  _depth = DefaultDepth(OBDisplay::display, _screen);
-  _visual = DefaultVisual(OBDisplay::display, _screen);
-  _colormap = DefaultColormap(OBDisplay::display, _screen);
+  _depth = DefaultDepth(Display::display, _screen);
+  _visual = DefaultVisual(Display::display, _screen);
+  _colormap = DefaultColormap(Display::display, _screen);
   
   if (_depth < 8) {
     // search for a TrueColor Visual... if we can't find one...
@@ -46,7 +47,7 @@ ScreenInfo::ScreenInfo(unsigned int num) {
     vinfo_template.screen = _screen;
     vinfo_template.c_class = TrueColor;
 
-    vinfo_return = XGetVisualInfo(OBDisplay::display,
+    vinfo_return = XGetVisualInfo(Display::display,
                                   VisualScreenMask | VisualClassMask,
                                   &vinfo_template, &vinfo_nitems);
     if (vinfo_return) {
@@ -65,7 +66,7 @@ ScreenInfo::ScreenInfo(unsigned int num) {
     if (best != -1) {
       _depth = vinfo_return[best].depth;
       _visual = vinfo_return[best].visual;
-      _colormap = XCreateColormap(OBDisplay::display, _root_window, _visual,
+      _colormap = XCreateColormap(Display::display, _root_window, _visual,
                                   AllocNone);
     }
 
@@ -73,13 +74,13 @@ ScreenInfo::ScreenInfo(unsigned int num) {
   }
 
   // get the default display string and strip the screen number
-  string default_string = DisplayString(OBDisplay::display);
+  string default_string = DisplayString(Display::display);
   const string::size_type pos = default_string.rfind(".");
   if (pos != string::npos)
     default_string.resize(pos);
 
   _display_string = string("DISPLAY=") + default_string + '.' +
-    otk::itostring(static_cast<unsigned long>(_screen));
+    itostring(static_cast<unsigned long>(_screen));
   
 #if 0 //def    XINERAMA
   _xinerama_active = False;
@@ -93,7 +94,7 @@ ScreenInfo::ScreenInfo(unsigned int num) {
         in future versions we should be able, so the 'activeness' is checked
         on a pre-screen basis anyways.
       */
-      if (XineramaIsActive(OBDisplay::display)) {
+      if (XineramaIsActive(Display::display)) {
         /*
           If Xinerama is being used, there there is only going to be one screen
           present. We still, of course, want to use the screen class, but that
@@ -101,7 +102,7 @@ ScreenInfo::ScreenInfo(unsigned int num) {
           never be more than one screen present with Xinerama active.
         */
         int num;
-        XineramaScreenInfo *info = XineramaQueryScreens(OBDisplay::display,
+        XineramaScreenInfo *info = XineramaQueryScreens(Display::display,
                                                         &num);
         if (num > 0 && info) {
           _xinerama_areas.reserve(num);