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/Screen.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/Screen.hh')
-rw-r--r-- | src/Screen.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index 4d1d933..96a4d43 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -197,7 +197,7 @@ public: | |||
197 | @name Screen signals | 197 | @name Screen signals |
198 | */ | 198 | */ |
199 | //@{ | 199 | //@{ |
200 | typedef FbTk::Signal<void, BScreen&> ScreenSignal; | 200 | typedef FbTk::Signal<BScreen&> ScreenSignal; |
201 | /// client list signal | 201 | /// client list signal |
202 | ScreenSignal &clientListSig() { return m_clientlist_sig; } | 202 | ScreenSignal &clientListSig() { return m_clientlist_sig; } |
203 | /// icon list sig | 203 | /// icon list sig |
@@ -211,7 +211,7 @@ public: | |||
211 | /// current workspace signal | 211 | /// current workspace signal |
212 | ScreenSignal ¤tWorkspaceSig() { return m_currentworkspace_sig; } | 212 | ScreenSignal ¤tWorkspaceSig() { return m_currentworkspace_sig; } |
213 | /// focused window signal | 213 | /// focused window signal |
214 | FbTk::Signal<void, BScreen&, FluxboxWindow*, WinClient*> &focusedWindowSig() { return m_focusedwindow_sig; } | 214 | FbTk::Signal<BScreen&, FluxboxWindow*, WinClient*> &focusedWindowSig() { return m_focusedwindow_sig; } |
215 | /// reconfigure signal | 215 | /// reconfigure signal |
216 | FbTk::Subject &reconfigureSig() { return m_reconfigure_sig; } | 216 | FbTk::Subject &reconfigureSig() { return m_reconfigure_sig; } |
217 | ScreenSignal &resizeSig() { return m_resize_sig; } | 217 | ScreenSignal &resizeSig() { return m_resize_sig; } |
@@ -479,7 +479,7 @@ private: | |||
479 | ScreenSubject m_reconfigure_sig; ///< reconfigure signal | 479 | ScreenSubject m_reconfigure_sig; ///< reconfigure signal |
480 | 480 | ||
481 | 481 | ||
482 | FbTk::Signal<void, BScreen&, FluxboxWindow*, WinClient*> m_focusedwindow_sig; ///< focused window signal | 482 | FbTk::Signal<BScreen&, FluxboxWindow*, WinClient*> m_focusedwindow_sig; ///< focused window signal |
483 | ScreenSignal m_resize_sig; ///< resize signal | 483 | ScreenSignal m_resize_sig; ///< resize signal |
484 | ScreenSignal m_workspace_area_sig; ///< workspace area changed signal | 484 | ScreenSignal m_workspace_area_sig; ///< workspace area changed signal |
485 | ScreenSignal m_iconlist_sig; ///< notify if a window gets iconified/deiconified | 485 | ScreenSignal m_iconlist_sig; ///< notify if a window gets iconified/deiconified |