aboutsummaryrefslogtreecommitdiff
path: root/src/Focusable.hh
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-05-03 10:49:05 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-05-10 11:00:45 (GMT)
commit0775350fee345e37fb59835dda4d85664346b606 (patch)
tree390af82593f92e11033ca2a2590a5ec7b7a3d14c /src/Focusable.hh
parentbef2039d2c5a31ab9f974059d991557276647af1 (diff)
downloadfluxbox_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/Focusable.hh')
-rw-r--r--src/Focusable.hh8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Focusable.hh b/src/Focusable.hh
index 0aae1a4..72a1dcc 100644
--- a/src/Focusable.hh
+++ b/src/Focusable.hh
@@ -119,13 +119,13 @@ public:
119 @name signals 119 @name signals
120 @{ 120 @{
121 */ 121 */
122 typedef FbTk::Signal<void, const std::string&, Focusable&> TitleSignal; 122 typedef FbTk::Signal<const std::string&, Focusable&> TitleSignal;
123 /// Used for both title and icon changes. 123 /// Used for both title and icon changes.
124 TitleSignal &titleSig() { return m_titlesig; } 124 TitleSignal &titleSig() { return m_titlesig; }
125 /// Used for both title and icon changes. 125 /// Used for both title and icon changes.
126 const TitleSignal &titleSig() const { return m_titlesig; } 126 const TitleSignal &titleSig() const { return m_titlesig; }
127 FbTk::Signal<void, Focusable&> &focusSig() { return m_focussig; } 127 FbTk::Signal<Focusable&> &focusSig() { return m_focussig; }
128 const FbTk::Signal<void, Focusable&> &focusSig() const { return m_focussig; } 128 const FbTk::Signal<Focusable&> &focusSig() const { return m_focussig; }
129 FbTk::Subject &dieSig() { return m_diesig; } 129 FbTk::Subject &dieSig() { return m_diesig; }
130 const FbTk::Subject &dieSig() const { return m_diesig; } 130 const FbTk::Subject &dieSig() const { return m_diesig; }
131 FbTk::Subject &attentionSig() { return m_attentionsig; } 131 FbTk::Subject &attentionSig() { return m_attentionsig; }
@@ -153,7 +153,7 @@ protected:
153 FocusSubject m_diesig, m_attentionsig; 153 FocusSubject m_diesig, m_attentionsig;
154 154
155private: 155private:
156 FbTk::Signal<void, Focusable&> m_focussig; 156 FbTk::Signal<Focusable&> m_focussig;
157 TitleSignal m_titlesig; 157 TitleSignal m_titlesig;
158}; 158};
159 159