diff options
Diffstat (limited to 'src/FbTk/LResource.hh')
-rw-r--r-- | src/FbTk/LResource.hh | 8 |
1 files changed, 6 insertions, 2 deletions
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; | |||
36 | 36 | ||
37 | class LResourceManager: public ResourceManager_base { | 37 | class LResourceManager: public ResourceManager_base { |
38 | public: | 38 | public: |
39 | static void convert(ResourceManager &old, const std::string &new_file); | ||
40 | 39 | ||
41 | /** | 40 | /** |
42 | * @param root the name of the table where settings will reside | 41 | * @param root the name of the table where settings will reside |
@@ -45,16 +44,21 @@ public: | |||
45 | * starts a timer. If another resource is modified, the timer is restarted. 0 = disabled | 44 | * starts a timer. If another resource is modified, the timer is restarted. 0 = disabled |
46 | */ | 45 | */ |
47 | LResourceManager(const std::string &root, Lua &l, unsigned int autosave = 0); | 46 | LResourceManager(const std::string &root, Lua &l, unsigned int autosave = 0); |
47 | /** | ||
48 | * Take over resources from the old resource manager. Used in fluxbox-update_configs. | ||
49 | * Resource managers created via this constructor don't support automatic saving. | ||
50 | */ | ||
51 | explicit LResourceManager(ResourceManager &old, Lua &l); | ||
48 | virtual bool save(const char *filename, const char *); | 52 | virtual bool save(const char *filename, const char *); |
49 | virtual void addResource(Resource_base &r); | 53 | virtual void addResource(Resource_base &r); |
50 | virtual void removeResource(Resource_base &r); | 54 | virtual void removeResource(Resource_base &r); |
51 | virtual void resourceChanged(Resource_base &r); | 55 | virtual void resourceChanged(Resource_base &r); |
56 | virtual void doLoad(const std::string &filename); | ||
52 | void setLua(Lua &l); | 57 | void setLua(Lua &l); |
53 | 58 | ||
54 | private: | 59 | private: |
55 | void doAddResource(Resource_base &r); | 60 | void doAddResource(Resource_base &r); |
56 | void doRemoveResource(Resource_base &r); | 61 | void doRemoveResource(Resource_base &r); |
57 | virtual void doLoad(const std::string &filename); | ||
58 | 62 | ||
59 | Lua *m_l; | 63 | Lua *m_l; |
60 | Timer m_savetimer; | 64 | Timer m_savetimer; |