3 files changed, 51 insertions, 32 deletions

diff --git a/src/FbTk/LResource.cc b/src/FbTk/LResource.cc
index 18209cb..589e52f 100644
--- a/src/FbTk/LResource.cc
+++ b/src/FbTk/LResource.cc
@@ -89,21 +89,6 @@ namespace {
 
 } // anonymous namespace
 
-void LResourceManager::convert(ResourceManager &old, const std::string &new_file) {
-    Lua l;
-
-    LResourceManager new_rm(old.root(), l);
-    for(ResourceList::const_iterator i = old.begin(); i != old.end(); ++i) {
-        // adding the resource to new_rm will set it to default value
-        // we save the value to a temp variable so we can restore it later
-        const std::string &t = (*i)->getString();
-        new_rm.addResource(**i);
-        (*i)->setFromString(t.c_str());
-    }
-
-    new_rm.save(new_file.c_str(), NULL);
-}
-
 LResourceManager::LResourceManager(const std::string &root, Lua &l, unsigned int autosave)
     : ResourceManager_base(root), m_l(&l) {
 
@@ -116,6 +101,25 @@ LResourceManager::LResourceManager(const std::string &root, Lua &l, unsigned int
     setLua(l);
 }
 
+LResourceManager::LResourceManager(ResourceManager &old, Lua &l)
+    : ResourceManager_base(old.root()), m_l(&l) {
+
+    // We create a copy of the list so we can safely traverse it while the resources disassociate
+    // themselves from the old resource manager
+    ResourceList list;
+    for(ResourceList::const_iterator i = old.begin(); i != old.end(); ++i) {
+        list.push_back(*i);
+    }
+
+    for(ResourceList::const_iterator i = list.begin(); i != list.end(); ++i) {
+        // adding the resource to this resource manager will set it to default value
+        // we save the value to a temp variable so we can restore it later
+        const std::string &t = (*i)->getString();
+        (*i)->setResourceManager(*this);
+        (*i)->setFromString(t.c_str());
+    }
+}
+
 void LResourceManager::doLoad(const std::string &filename) {
     m_l->checkstack(1);
     lua::stack_sentry s(*m_l);
diff --git a/src/FbTk/LResource.hh b/src/FbTk/LResource.hh
index a198197..022e6f5 100644
--- a/src/FbTk/LResource.hh
+++ b/src/FbTk/LResource.hh
@@ -36,7 +36,6 @@ class Lua;
 
 class LResourceManager: public ResourceManager_base {
 public:
-    static void convert(ResourceManager &old, const std::string &new_file);
 
     /**
      * @param root the name of the table where settings will reside
@@ -45,16 +44,21 @@ public:
      * starts a timer. If another resource is modified, the timer is restarted. 0 = disabled
      */
     LResourceManager(const std::string &root, Lua &l, unsigned int autosave = 0);
+    /**
+     * Take over resources from the old resource manager. Used in fluxbox-update_configs.
+     * Resource managers created via this constructor don't support automatic saving.
+     */
+    explicit LResourceManager(ResourceManager &old, Lua &l);
     virtual bool save(const char *filename, const char *);
     virtual void addResource(Resource_base &r);
     virtual void removeResource(Resource_base &r);
     virtual void resourceChanged(Resource_base &r);
+    virtual void doLoad(const std::string &filename);
     void setLua(Lua &l);
 
 private:
     void doAddResource(Resource_base &r);
     void doRemoveResource(Resource_base &r);
-    virtual void doLoad(const std::string &filename);
 
     Lua *m_l;
     Timer m_savetimer;
diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh
index 700fe70..b729ad4 100644
--- a/src/FbTk/Resource.hh
+++ b/src/FbTk/Resource.hh
@@ -47,12 +47,19 @@ private:
     std::string m_str;
 };
 
+// forward declarations
+template <typename T, typename Traits>
+class Resource;
+class ResourceManager_base;
+
 /// Base class for resources, this is only used in ResourceManager
 class Resource_base:private FbTk::NotCopyable
 {
 public:
     virtual ~Resource_base() { };
 
+    virtual void setResourceManager(ResourceManager_base &rm) = 0;
+
     /// set from string value
     virtual void setFromString(char const *strval) = 0;
     /// set default value
@@ -80,9 +87,6 @@ private:
     std::string m_altname; ///< alternative name
 };
 
-template <typename T, typename Traits>
-class Resource;
-
 class ResourceManager_base
 {
 public:
@@ -134,10 +138,10 @@ public:
     ResourceList::const_iterator begin() { return m_resourcelist.begin(); }
     ResourceList::const_iterator end() { return m_resourcelist.end(); }
 
-protected:
     /// does the actual loading
     virtual void doLoad(const std::string &filename) = 0;
 
+protected:
     ResourceList m_resourcelist;
     const std::string m_root;
     std::string m_filename;
@@ -177,9 +181,10 @@ public:
             std::cerr<<(*it)->name()<<std::endl;
         }
     }
-protected:
+
     virtual void doLoad(const std::string &filename);
 
+protected:
     int m_db_lock;
 
 private:
@@ -202,31 +207,37 @@ public:
 
     Resource(ResourceManager_base &rm, T val, const std::string &name,
             const std::string &altname, const Traits &traits = Traits() ):
-        Resource_base(name, altname), Traits(traits), m_value(val), m_defaultval(val), m_rm(rm) {
-        m_rm.addResource(*this); // add this to resource handler
+        Resource_base(name, altname), Traits(traits), m_value(val), m_defaultval(val), m_rm(&rm) {
+        m_rm->addResource(*this); // add this to resource handler
     }
 
     // LResourceManager does not use altname, so we provide a constructor which initializes
     // altname to name
     Resource(ResourceManager_base &rm, T val, const std::string &name,
             const Traits &traits = Traits() ):
-        Resource_base(name, name), Traits(traits), m_value(val), m_defaultval(val), m_rm(rm) {
-        m_rm.addResource(*this); // add this to resource handler
+        Resource_base(name, name), Traits(traits), m_value(val), m_defaultval(val), m_rm(&rm) {
+        m_rm->addResource(*this); // add this to resource handler
     }
     virtual ~Resource() {
-        m_rm.removeResource(*this); // remove this from resource handler
+        m_rm->removeResource(*this); // remove this from resource handler
+    }
+
+    virtual void setResourceManager(ResourceManager_base &rm) {
+        m_rm->removeResource(*this);
+        m_rm = &rm;
+        m_rm->addResource(*this);
     }
 
     void setDefaultValue() {
         m_value = m_defaultval;
-        m_rm.resourceChanged(*this);
+        m_rm->resourceChanged(*this);
         m_modified_sig.emit(m_value);
     }
     /// sets resource from string, specialized, must be implemented
     void setFromString(const char *strval) {
         try {
             m_value = Traits::fromString(strval);
-            m_rm.resourceChanged(*this);
+            m_rm->resourceChanged(*this);
             m_modified_sig.emit(m_value);
         }
         catch(ConversionError &e) {
@@ -236,7 +247,7 @@ public:
     }
     Accessor<T> &operator =(const T& newvalue) {
         m_value = newvalue;
-        m_rm.resourceChanged(*this);
+        m_rm->resourceChanged(*this);
         m_modified_sig.emit(m_value);
         return *this;
     }
@@ -247,7 +258,7 @@ public:
     virtual void setFromLua(lua::state &l) {
         try {
             m_value = Traits::fromLua(l);
-            m_rm.resourceChanged(*this);
+            m_rm->resourceChanged(*this);
             m_modified_sig.emit(m_value);
         }
         catch(ConversionError &e) {
@@ -268,7 +279,7 @@ public:
 
 private:
     T m_value, m_defaultval;
-    ResourceManager_base &m_rm;
+    ResourceManager_base *m_rm;
     Signal<const T &> m_modified_sig;
 };