1 files changed, 53 insertions, 53 deletions

diff --git a/src/Resource.cc b/src/Resource.cc
index cb871f1..fb96b71 100644
--- a/src/Resource.cc
+++ b/src/Resource.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Resource.cc,v 1.3 2002/07/20 09:51:26 fluxgen Exp $
+// $Id: Resource.cc,v 1.4 2002/12/01 13:41:58 rathnor Exp $
 
 #include "Resource.hh"
 #include "XrmDatabaseHelper.hh"
@@ -37,35 +37,35 @@ bool ResourceManager::m_init = false;
 // else false
 //-------------------------
 bool ResourceManager::load(const char *filename) {
-        assert(filename);
+    assert(filename);
 
-        ensureXrmIsInitialize();
+    ensureXrmIsInitialize();
         
-        XrmDatabaseHelper database;
-        database = XrmGetFileDatabase(filename);
-        if (database==0)
-                return false;
+    XrmDatabaseHelper database;
+    database = XrmGetFileDatabase(filename);
+    if (database==0)
+        return false;
         
-        XrmValue value;
-        char *value_type;
+    XrmValue value;
+    char *value_type;
         
-        //get list and go throu all the resources and load them
-        ResourceList::iterator i = m_resourcelist.begin();
-        ResourceList::iterator i_end = m_resourcelist.end();    
-        for (; i != i_end; ++i) {
+    //get list and go throu all the resources and load them
+    ResourceList::iterator i = m_resourcelist.begin();
+    ResourceList::iterator i_end = m_resourcelist.end();        
+    for (; i != i_end; ++i) {
         
-                Resource_base *resource = *i;
-                if (XrmGetResource(*database, resource->name().c_str(),
-                                resource->altName().c_str(), &value_type, &value))                      
-                        resource->setFromString(value.addr);
-                else {
-                        cerr<<"Failed to read: "<<resource->name()<<endl;
-                        cerr<<"Setting default value"<<endl;
-                        resource->setDefaultValue();
-                }
-        }
+        Resource_base *resource = *i;
+        if (XrmGetResource(*database, resource->name().c_str(),
+                           resource->altName().c_str(), &value_type, &value))                   
+            resource->setFromString(value.addr);
+        else {
+            cerr<<"Failed to read: "<<resource->name()<<endl;
+            cerr<<"Setting default value"<<endl;
+            resource->setDefaultValue();
+        }
+    }
 
-        return true;
+    return true;
 }
 
 //-------------- save -----------------
@@ -75,45 +75,45 @@ bool ResourceManager::load(const char *filename) {
 // the error
 //-------------------------------------
 bool ResourceManager::save(const char *filename, const char *mergefilename) {
-        assert(filename);
+    assert(filename);
         
-        ensureXrmIsInitialize();
+    ensureXrmIsInitialize();
 
-        XrmDatabaseHelper database;
+    XrmDatabaseHelper database;
 
-        string rc_string;       
-        ResourceList::iterator i = m_resourcelist.begin();
-        ResourceList::iterator i_end = m_resourcelist.end();
-        //write all resources to database
-        for (; i != i_end; ++i) {
-                Resource_base *resource = *i;
-                rc_string = resource->name() + string(": ") + resource->getString();
-                XrmPutLineResource(&*database, rc_string.c_str());
-        }
+    string rc_string;   
+    ResourceList::iterator i = m_resourcelist.begin();
+    ResourceList::iterator i_end = m_resourcelist.end();
+    //write all resources to database
+    for (; i != i_end; ++i) {
+        Resource_base *resource = *i;
+        rc_string = resource->name() + string(": ") + resource->getString();
+        XrmPutLineResource(&*database, rc_string.c_str());
+    }
 
-        if (database==0)
-                return false;
+    if (database==0)
+        return false;
         
-        //check if we want to merge a database
-        if (mergefilename) {
-                XrmDatabaseHelper olddatabase(mergefilename);
-                if (olddatabase == 0) // did we load the file?
-                        return false;
+    //check if we want to merge a database
+    if (mergefilename) {
+        XrmDatabaseHelper olddatabase(mergefilename);
+        if (olddatabase == 0) // did we load the file?
+            return false;
                 
-                XrmMergeDatabases(*database, &*olddatabase); // merge databases
-                XrmPutFileDatabase(*olddatabase, filename); // save database to file
+        XrmMergeDatabases(*database, &*olddatabase); // merge databases
+        XrmPutFileDatabase(*olddatabase, filename); // save database to file
                 
-                *database = 0; // don't try to destroy the database
-        } else // save database to file
-                XrmPutFileDatabase(*database, filename);
+        *database = 0; // don't try to destroy the database
+    } else // save database to file
+        XrmPutFileDatabase(*database, filename);
 
-        return true;
+    return true;
 }
 
 void ResourceManager::ensureXrmIsInitialize() {
-        if (!m_init) {
-                XrmInitialize();
-                m_init = true;
-        }
+    if (!m_init) {
+        XrmInitialize();
+        m_init = true;
+    }
 }