add OBProperty to otk, which was formerly known as ob::XAtom

[chaz/openbox] / src / workspace.cc

diff --git a/src/workspace.cc b/src/workspace.cc
index 891340621e75ccfd418db12d045dd7c3845322ae..ec220a6a2f0cc70175f498ce156f62978a69fcdb 100644 (file)
--- a/src/workspace.cc
+++ b/src/workspace.cc
@@ -29,9 +29,9 @@ 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"
+#include "atom.hh"
 
 namespace ob {
 
@@ -413,7 +413,7 @@ bool Workspace::isCurrent(void) const {
 }
 
 
-bool Workspace::isLastWindow(const BlackboxWindow* const w) const {
+bool Workspace::isLastWindow(const BlackboxWindow *w) const {
   return (w == windowList.back());
 }
 
@@ -424,12 +424,12 @@ void Workspace::setCurrent(void) {
 
 
 void Workspace::readName(void) {
-  XAtom::StringVect namesList;
+  OBAtom::StringVect namesList;
   unsigned long numnames = id + 1;
     
   // attempt to get from the _NET_WM_DESKTOP_NAMES property
-  if (xatom->getValue(screen->getRootWindow(), XAtom::net_desktop_names,
-                      XAtom::utf8, numnames, namesList) &&
+  if (xatom->getValue(screen->getRootWindow(), OBAtom::net_desktop_names,
+                      OBAtom::utf8, numnames, namesList) &&
       namesList.size() > id) {
     name = namesList[id];
   
@@ -451,17 +451,17 @@ void Workspace::readName(void) {
 
 void Workspace::setName(const string& new_name) {
   // set the _NET_WM_DESKTOP_NAMES property with the new name
-  XAtom::StringVect namesList;
+  OBAtom::StringVect namesList;
   unsigned long numnames = (unsigned) -1;
-  if (xatom->getValue(screen->getRootWindow(), XAtom::net_desktop_names,
-                      XAtom::utf8, numnames, namesList) &&
+  if (xatom->getValue(screen->getRootWindow(), OBAtom::net_desktop_names,
+                      OBAtom::utf8, numnames, namesList) &&
       namesList.size() > id)
     namesList[id] = new_name;
   else
     namesList.push_back(new_name);
 
-  xatom->setValue(screen->getRootWindow(), XAtom::net_desktop_names,
-                  XAtom::utf8, namesList);
+  xatom->setValue(screen->getRootWindow(), OBAtom::net_desktop_names,
+                  OBAtom::utf8, namesList);
 }