diff options
author | Henrik Kinnunen <fluxgen@fluxbox.org> | 2010-03-18 09:56:15 (GMT) |
---|---|---|
committer | Henrik Kinnunen <fluxgen@fluxbox.org> | 2010-03-18 09:56:15 (GMT) |
commit | 18570d83a23c0b510d086f2dfa6e3651fcf3430d (patch) | |
tree | 4b5d34c489e984e2b3670a2ba0385b2127d17345 /src | |
parent | 0504de454a0a3bf06466029940af480e3caaa8b2 (diff) | |
download | fluxbox_pavel-18570d83a23c0b510d086f2dfa6e3651fcf3430d.zip fluxbox_pavel-18570d83a23c0b510d086f2dfa6e3651fcf3430d.tar.bz2 |
minor cleaning in MemFun.hh
Diffstat (limited to 'src')
-rw-r--r-- | src/FbTk/MemFun.hh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/FbTk/MemFun.hh b/src/FbTk/MemFun.hh index c2c6b20..0425fc6 100644 --- a/src/FbTk/MemFun.hh +++ b/src/FbTk/MemFun.hh | |||
@@ -38,9 +38,7 @@ public: | |||
38 | void operator ()() { | 38 | void operator ()() { |
39 | (m_obj.*m_action)(); | 39 | (m_obj.*m_action)(); |
40 | } | 40 | } |
41 | void call() { | 41 | |
42 | (m_obj.*m_action)(); | ||
43 | } | ||
44 | private: | 42 | private: |
45 | Object& m_obj; | 43 | Object& m_obj; |
46 | Action m_action; | 44 | Action m_action; |
@@ -150,7 +148,7 @@ public: | |||
150 | void operator ()(IgnoreType1&, IgnoreType2&, IgnoreType3&) { | 148 | void operator ()(IgnoreType1&, IgnoreType2&, IgnoreType3&) { |
151 | BaseType::operator ()(); | 149 | BaseType::operator ()(); |
152 | } | 150 | } |
153 | 151 | ||
154 | template <typename IgnoreType1, typename IgnoreType2> | 152 | template <typename IgnoreType1, typename IgnoreType2> |
155 | void operator ()(IgnoreType1&, IgnoreType2&) { | 153 | void operator ()(IgnoreType1&, IgnoreType2&) { |
156 | BaseType::operator ()(); | 154 | BaseType::operator ()(); |
@@ -213,9 +211,9 @@ MemFunIgnoreArgs( Object& obj, ReturnType (Object:: *action)(Arg1) ) { | |||
213 | return MemFun1IgnoreArgs<ReturnType, Object, Arg1>(obj, action); | 211 | return MemFun1IgnoreArgs<ReturnType, Object, Arg1>(obj, action); |
214 | } | 212 | } |
215 | 213 | ||
216 | /// Creates functor that ignores third argument. | 214 | /// Creates functor that ignores third argument. |
217 | template <typename ReturnType, typename Object, typename Arg1, typename Arg2> | 215 | template <typename ReturnType, typename Object, typename Arg1, typename Arg2> |
218 | MemFun2IgnoreArgs<ReturnType, Object, Arg1, Arg2> | 216 | MemFun2IgnoreArgs<ReturnType, Object, Arg1, Arg2> |
219 | MemFunIgnoreArgs( Object& obj, ReturnType (Object:: *action)(Arg1,Arg2) ) { | 217 | MemFunIgnoreArgs( Object& obj, ReturnType (Object:: *action)(Arg1,Arg2) ) { |
220 | return MemFun2IgnoreArgs<ReturnType, Object, Arg1, Arg2>(obj, action); | 218 | return MemFun2IgnoreArgs<ReturnType, Object, Arg1, Arg2>(obj, action); |
221 | } | 219 | } |