From 1cec88dfbb12f7a8702c5bb98ac3b0b2b383d58a Mon Sep 17 00:00:00 2001
From: Pavel Labath <pavelo@centrum.sk>
Date: Fri, 3 Jun 2011 13:40:56 +0200
Subject: convert ResourceManager::{add,remove}Resource from template to a
 regular function

---
 src/FbTk/Resource.cc | 29 +++++++++++++++++++++++++++++
 src/FbTk/Resource.hh | 36 ++----------------------------------
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/src/FbTk/Resource.cc b/src/FbTk/Resource.cc
index 4be85de..85e78da 100644
--- a/src/FbTk/Resource.cc
+++ b/src/FbTk/Resource.cc
@@ -226,4 +226,33 @@ void ResourceManager::unlock() {
     }
 }
 
+// add the resource and load its value
+void ResourceManager::addResource(Resource_base &r) {
+    m_resourcelist.push_back(&r);
+    m_resourcelist.unique();
+
+    // lock ensures that the database is loaded.
+    lock();
+
+    if (m_database == 0) {
+        unlock();
+        return;
+    }
+
+    XrmValue value;
+    char *value_type;
+
+    // now, load the value for this resource
+    if (XrmGetResource(**m_database, r.name().c_str(),
+                       r.altName().c_str(), &value_type, &value)) {
+        r.setFromString(value.addr);
+    } else {
+        std::cerr<<"Failed to read: "<<r.name()<<std::endl;
+        std::cerr<<"Setting default value"<<std::endl;
+        r.setDefaultValue();
+    }
+
+    unlock();
+}
+
 } // end namespace FbTk
diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh
index 8c9d645..55afe60 100644
--- a/src/FbTk/Resource.hh
+++ b/src/FbTk/Resource.hh
@@ -96,12 +96,10 @@ public:
 
 
     /// Add resource to list, only used in Resource<T>
-    template <class T>
-    void addResource(Resource<T> &r);
+    void addResource(Resource_base &r);
 
     /// Remove a specific resource, only used in Resource<T>
-    template <class T>
-    void removeResource(Resource<T> &r) {
+    void removeResource(Resource_base &r) {
         m_resourcelist.remove(&r);
     }
 
@@ -194,36 +192,6 @@ private:
 };
 
 
-// add the resource and load its value
-template <class T>
-void ResourceManager::addResource(Resource<T> &r) {
-    m_resourcelist.push_back(&r);
-    m_resourcelist.unique();
-
-    // lock ensures that the database is loaded.
-    lock();
-
-    if (m_database == 0) {
-        unlock();
-        return;
-    }
-
-    XrmValue value;
-    char *value_type;
-
-    // now, load the value for this resource
-    if (XrmGetResource(**m_database, r.name().c_str(),
-                       r.altName().c_str(), &value_type, &value)) {
-        r.setFromString(value.addr);
-    } else {
-        std::cerr<<"Failed to read: "<<r.name()<<std::endl;
-        std::cerr<<"Setting default value"<<std::endl;
-        r.setDefaultValue();
-    }
-
-    unlock();
-}
-
 
 template <typename ResourceType>
 Resource<ResourceType> &ResourceManager::getResource(const std::string &resname) {
-- 
cgit v0.11.2