diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-05-03 10:49:05 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-05-10 11:00:45 (GMT) |
commit | 0775350fee345e37fb59835dda4d85664346b606 (patch) | |
tree | 390af82593f92e11033ca2a2590a5ec7b7a3d14c /src/FbTk/Theme.hh | |
parent | bef2039d2c5a31ab9f974059d991557276647af1 (diff) | |
download | fluxbox_pavel-0775350fee345e37fb59835dda4d85664346b606.zip fluxbox_pavel-0775350fee345e37fb59835dda4d85664346b606.tar.bz2 |
Last round of simplification of Signal/Slot classes
- merged all the common stuff from 0,1,2,3 argument versions into one common base class
- removed ReturnType template parameter as it was instantiated with "void" everywhere and the
current ignores the return value of the callbacks anyway
Diffstat (limited to 'src/FbTk/Theme.hh')
-rw-r--r-- | src/FbTk/Theme.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/FbTk/Theme.hh b/src/FbTk/Theme.hh index c700f9b..a0f2717 100644 --- a/src/FbTk/Theme.hh +++ b/src/FbTk/Theme.hh | |||
@@ -107,13 +107,13 @@ public: | |||
107 | template <typename T> | 107 | template <typename T> |
108 | void remove(ThemeItem<T> &item); | 108 | void remove(ThemeItem<T> &item); |
109 | virtual bool fallback(ThemeItem_base &) { return false; } | 109 | virtual bool fallback(ThemeItem_base &) { return false; } |
110 | Signal<void> &reconfigSig() { return m_reconfig_sig; } | 110 | Signal<> &reconfigSig() { return m_reconfig_sig; } |
111 | 111 | ||
112 | private: | 112 | private: |
113 | const int m_screen_num; | 113 | const int m_screen_num; |
114 | 114 | ||
115 | ItemList m_themeitems; | 115 | ItemList m_themeitems; |
116 | Signal<void> m_reconfig_sig; | 116 | Signal<> m_reconfig_sig; |
117 | }; | 117 | }; |
118 | 118 | ||
119 | /// Proxy interface for themes, so they can be substituted dynamically | 119 | /// Proxy interface for themes, so they can be substituted dynamically |
@@ -122,7 +122,7 @@ class ThemeProxy { | |||
122 | public: | 122 | public: |
123 | virtual ~ThemeProxy() { } | 123 | virtual ~ThemeProxy() { } |
124 | 124 | ||
125 | virtual Signal<void> &reconfigSig() = 0; | 125 | virtual Signal<> &reconfigSig() = 0; |
126 | 126 | ||
127 | virtual BaseTheme &operator *() = 0; | 127 | virtual BaseTheme &operator *() = 0; |
128 | virtual const BaseTheme &operator *() const = 0; | 128 | virtual const BaseTheme &operator *() const = 0; |