renamed the obResource class to Resource.

diff --git a/src/Resource.cc b/src/Resource.cc
index 42dd230175c985c2d7588fa3833a38395f5d6f1f..f3b0e5f9ef3bfb50f0f57d6376f91bbb0b573901 100644 (file)
--- a/src/Resource.cc
+++ b/src/Resource.cc
@@ -34,9 +34,9 @@
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
 
-bool obResource::m_initialized = false;
+bool Resource::m_initialized = false;
 
-obResource::obResource(const std::string &file) {
+Resource::Resource(const std::string &file) {
   setFile(file);
   m_modified = false;
   m_database = NULL;
@@ -47,7 +47,7 @@ obResource::obResource(const std::string &file) {
   }
 }
 
-obResource::obResource() {
+Resource::Resource() {
   m_modified = false;
   m_database = NULL;
   m_autosave = true;
@@ -57,26 +57,26 @@ obResource::obResource() {
   }
 }
 
-obResource::~obResource() {
+Resource::~Resource() {
   if (m_database != NULL)
     XrmDestroyDatabase(m_database);
 }
 
-void obResource::setFile(const std::string &file) {
+void Resource::setFile(const std::string &file) {
   m_file = file;
 }
 
-void obResource::setAutoSave(bool autosave) {
+void Resource::setAutoSave(bool autosave) {
   m_autosave = autosave;
 }
 
-void obResource::save() {
+void Resource::save() {
   ASSERT(m_database != NULL);
   XrmPutFileDatabase(m_database, m_file.c_str());
   m_modified = false;
 }
 
-bool obResource::load() {
+bool Resource::load() {
   if (m_database != NULL)
     XrmDestroyDatabase(m_database);
   m_modified = false;
@@ -85,7 +85,7 @@ bool obResource::load() {
   return true;
 }
 
-void obResource::setValue(const std::string &rname, bool value) {
+void Resource::setValue(const std::string &rname, bool value) {
   ASSERT(m_database != NULL);
 
   const char *val = (value ? "True" : "False");
@@ -97,11 +97,11 @@ void obResource::setValue(const std::string &rname, bool value) {
     save();
 }
 
-void obResource::setValue(const std::string &rname, int value) {
+void Resource::setValue(const std::string &rname, int value) {
   setValue(rname, (long)value);
 }
 
-void obResource::setValue(const std::string &rname, long value) {
+void Resource::setValue(const std::string &rname, long value) {
   ASSERT(m_database != NULL);
   
   char val[11];
@@ -114,7 +114,7 @@ void obResource::setValue(const std::string &rname, long value) {
     save();
 }
 
-void obResource::setValue(const std::string &rname, const char *value) {
+void Resource::setValue(const std::string &rname, const char *value) {
   ASSERT(m_database != NULL);
   
   std::string rc_string = rname + ": " + value;
@@ -125,7 +125,7 @@ void obResource::setValue(const std::string &rname, const char *value) {
     save();
 }
 
-void obResource::setValue(const std::string &rname, const std::string &value) {
+void Resource::setValue(const std::string &rname, const std::string &value) {
   ASSERT(m_database != NULL);
   
   std::string rc_string = rname + ": " + value;
@@ -136,7 +136,7 @@ void obResource::setValue(const std::string &rname, const std::string &value) {
     save();
 }
 
-bool obResource::getValue(const std::string &rname, const std::string &rclass,
+bool Resource::getValue(const std::string &rname, const std::string &rclass,
                           bool &value) const {
   ASSERT(rclass.c_str() != NULL);
   ASSERT(m_database != NULL);
@@ -154,7 +154,7 @@ bool obResource::getValue(const std::string &rname, const std::string &rclass,
   return true;
 }
 
-bool obResource::getValue(const std::string &rname, const std::string &rclass,
+bool Resource::getValue(const std::string &rname, const std::string &rclass,
                           long &value) const {
   ASSERT(m_database != NULL);
   
@@ -170,7 +170,7 @@ bool obResource::getValue(const std::string &rname, const std::string &rclass,
   return true;
 }
 
-bool obResource::getValue(const std::string &rname, const std::string &rclass,
+bool Resource::getValue(const std::string &rname, const std::string &rclass,
                           std::string &value) const {
   ASSERT(m_database != NULL);
   

diff --git a/src/Resource.h b/src/Resource.h
index 912ae75377b725604159f51789799dbfbf89be9f..726755f385d2aa5f8cf12e94871c07f75a250a3e 100644 (file)
--- a/src/Resource.h
+++ b/src/Resource.h
@@ -27,11 +27,11 @@
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
 
-class obResource {
+class Resource {
 public:
-  obResource(const std::string &file);
-  obResource();
-  virtual ~obResource();
+  Resource(const std::string &file);
+  Resource();
+  virtual ~Resource();
 
   inline const std::string &file() const {
     return static_cast<const std::string &>(m_file);

diff --git a/src/Screen.cc b/src/Screen.cc
index 239ed1b213e48f5d46fa02f56192a9fb4e820218..08c2d9eeb14eed235e2dd8a499ccdf3c1982ee28 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -996,7 +996,7 @@ void BScreen::removeWorkspaceNames(void) {
 
 
 void BScreen::LoadStyle(void) {
-  obResource &conf = resource.styleconfig;
+  Resource &conf = resource.styleconfig;
   
   conf.setFile(openbox.getStyleFilename());
   if (!conf.load()) {

diff --git a/src/Screen.h b/src/Screen.h
index 14dbff2140cc3936634a1b4cac9d7273c7bd281c..4b3e4dc3623430f8918227c0e8c5c886a7583d45 100644 (file)
--- a/src/Screen.h
+++ b/src/Screen.h
@@ -135,7 +135,7 @@ private:
       auto_edge_balance, image_dither, ordered_dither, opaque_move, full_max,
       focus_new, focus_last, toolbar_total_hide;
     BColor border_color;
-    obResource styleconfig;
+    Resource styleconfig;
 
     int workspaces, toolbar_placement, toolbar_width_percent, placement_policy,
       edge_snap_threshold, row_direction, col_direction;

diff --git a/src/openbox.h b/src/openbox.h
index 3e3d1ef2e9e46c886e68fe20db0795e856fff0d9..7881d6020d0da03acaa439c13399919252c55322 100644 (file)
--- a/src/openbox.h
+++ b/src/openbox.h
@@ -115,7 +115,7 @@ private:
   Window masked;
   char *rc_file, **argv;
   int argc;
-  obResource config;
+  Resource config;
 
 
 protected:
@@ -145,7 +145,7 @@ public:
   BScreen *getScreen(int);
   BScreen *searchScreen(Window);
 
-  inline obResource &getConfig() {
+  inline Resource &getConfig() {
     return config;
   }
   inline const Time &getDoubleClickInterval(void) const