diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-08-04 09:02:04 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-08-04 09:02:04 (GMT) |
commit | cf11e9c960636434f8b398f47b1e55d27ad18e4e (patch) | |
tree | d4df04e8b5a7aa26633f3a5474264931cccce23f /src/FbTk/LResource.hh | |
parent | 707df7d81b6df25fa98f3a867485cb7bbbbf74b8 (diff) | |
download | fluxbox_pavel-cf11e9c960636434f8b398f47b1e55d27ad18e4e.zip fluxbox_pavel-cf11e9c960636434f8b398f47b1e55d27ad18e4e.tar.bz2 |
Move most of the resource loading code into ResourceManager_base
I mostly do this to avoid code duplication between fluxbox and fluxbox-update_configs.
Diffstat (limited to 'src/FbTk/LResource.hh')
-rw-r--r-- | src/FbTk/LResource.hh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/FbTk/LResource.hh b/src/FbTk/LResource.hh index 30f0e02..a198197 100644 --- a/src/FbTk/LResource.hh +++ b/src/FbTk/LResource.hh | |||
@@ -45,7 +45,6 @@ public: | |||
45 | * starts a timer. If another resource is modified, the timer is restarted. 0 = disabled | 45 | * starts a timer. If another resource is modified, the timer is restarted. 0 = disabled |
46 | */ | 46 | */ |
47 | LResourceManager(const std::string &root, Lua &l, unsigned int autosave = 0); | 47 | LResourceManager(const std::string &root, Lua &l, unsigned int autosave = 0); |
48 | void load(const std::string &filename, const std::string &fallback); | ||
49 | virtual bool save(const char *filename, const char *); | 48 | virtual bool save(const char *filename, const char *); |
50 | virtual void addResource(Resource_base &r); | 49 | virtual void addResource(Resource_base &r); |
51 | virtual void removeResource(Resource_base &r); | 50 | virtual void removeResource(Resource_base &r); |
@@ -55,9 +54,9 @@ public: | |||
55 | private: | 54 | private: |
56 | void doAddResource(Resource_base &r); | 55 | void doAddResource(Resource_base &r); |
57 | void doRemoveResource(Resource_base &r); | 56 | void doRemoveResource(Resource_base &r); |
57 | virtual void doLoad(const std::string &filename); | ||
58 | 58 | ||
59 | Lua *m_l; | 59 | Lua *m_l; |
60 | std::string m_filename; | ||
61 | Timer m_savetimer; | 60 | Timer m_savetimer; |
62 | }; | 61 | }; |
63 | 62 | ||