aboutsummaryrefslogtreecommitdiff
path: root/src/Focusable.hh
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-05-03 21:48:24 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-05-10 11:00:45 (GMT)
commit129bac1e0f0979c80902edc8e092596b81fe14f6 (patch)
tree0624ee5da85ec2d1f758612cddae2e95a50249f9 /src/Focusable.hh
parent0775350fee345e37fb59835dda4d85664346b606 (diff)
downloadfluxbox_pavel-129bac1e0f0979c80902edc8e092596b81fe14f6.zip
fluxbox_pavel-129bac1e0f0979c80902edc8e092596b81fe14f6.tar.bz2
Convert Focusable::dieSig to FbTk::Signal
Diffstat (limited to 'src/Focusable.hh')
-rw-r--r--src/Focusable.hh9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Focusable.hh b/src/Focusable.hh
index 72a1dcc..cf2169a 100644
--- a/src/Focusable.hh
+++ b/src/Focusable.hh
@@ -41,9 +41,9 @@ public:
41 m_screen(scr), m_fbwin(fbwin), 41 m_screen(scr), m_fbwin(fbwin),
42 m_instance_name("fluxbox"), m_class_name("fluxbox"), 42 m_instance_name("fluxbox"), m_class_name("fluxbox"),
43 m_focused(false), m_attention_state(false), 43 m_focused(false), m_attention_state(false),
44 m_diesig(*this),
45 m_attentionsig(*this), 44 m_attentionsig(*this),
46 m_focussig(), 45 m_focussig(),
46 m_diesig(),
47 m_titlesig() { } 47 m_titlesig() { }
48 virtual ~Focusable() { } 48 virtual ~Focusable() { }
49 49
@@ -125,9 +125,7 @@ public:
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<Focusable&> &focusSig() { return m_focussig; } 127 FbTk::Signal<Focusable&> &focusSig() { return m_focussig; }
128 const FbTk::Signal<Focusable&> &focusSig() const { return m_focussig; } 128 FbTk::Signal<Focusable&> &dieSig() { return m_diesig; }
129 FbTk::Subject &dieSig() { return m_diesig; }
130 const FbTk::Subject &dieSig() const { return m_diesig; }
131 FbTk::Subject &attentionSig() { return m_attentionsig; } 129 FbTk::Subject &attentionSig() { return m_attentionsig; }
132 const FbTk::Subject &attentionSig() const { return m_attentionsig; } 130 const FbTk::Subject &attentionSig() const { return m_attentionsig; }
133 /** @} */ // end group signals 131 /** @} */ // end group signals
@@ -150,10 +148,11 @@ protected:
150 FbTk::PixmapWithMask m_icon; //< icon pixmap with mask 148 FbTk::PixmapWithMask m_icon; //< icon pixmap with mask
151 149
152 // state and hint signals 150 // state and hint signals
153 FocusSubject m_diesig, m_attentionsig; 151 FocusSubject m_attentionsig;
154 152
155private: 153private:
156 FbTk::Signal<Focusable&> m_focussig; 154 FbTk::Signal<Focusable&> m_focussig;
155 FbTk::Signal<Focusable&> m_diesig;
157 TitleSignal m_titlesig; 156 TitleSignal m_titlesig;
158}; 157};
159 158