diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-05-01 14:47:53 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-05-10 11:00:45 (GMT) |
commit | 4b47675441b76620519b0204497686b09113daaa (patch) | |
tree | c3494c61a82b84418761000d5fc7fc5d12188204 /src/FbTk/MacroCommand.cc | |
parent | fa15400cc24ddcfd6e361bd068ae1986b9f9e561 (diff) | |
download | fluxbox_pavel-4b47675441b76620519b0204497686b09113daaa.zip fluxbox_pavel-4b47675441b76620519b0204497686b09113daaa.tar.bz2 |
Make RefCount<> more sensible
the previous version of operator*() made no sense. E.g., it violated the invariant
(*ptr).foo <=> ptr->foo. The dereferencing operator now returns a reference to the pointed-to
object, rather than a pointer to it.
I also added a bool conversion operator, which can be used in testing the NULL-ness of the
pointer. Anyone wondering if that could be done in a simpler way is encouraged to read
<http://www.artima.com/cppsource/safebool.html>.
And, finally, I removed the mutable flag from the m_data member, since it does not need it.
Diffstat (limited to 'src/FbTk/MacroCommand.cc')
-rw-r--r-- | src/FbTk/MacroCommand.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FbTk/MacroCommand.cc b/src/FbTk/MacroCommand.cc index 0b7a6b8..e04d92a 100644 --- a/src/FbTk/MacroCommand.cc +++ b/src/FbTk/MacroCommand.cc | |||
@@ -42,7 +42,7 @@ M *addCommands(M *macro, const std::string &args, bool trusted) { | |||
42 | std::list<std::string>::iterator it = cmds.begin(), it_end = cmds.end(); | 42 | std::list<std::string>::iterator it = cmds.begin(), it_end = cmds.end(); |
43 | for (; it != it_end; ++it) { | 43 | for (; it != it_end; ++it) { |
44 | cmd = CommandParser<void>::instance().parse(*it, trusted); | 44 | cmd = CommandParser<void>::instance().parse(*it, trusted); |
45 | if (*cmd) | 45 | if (cmd) |
46 | macro->add(cmd); | 46 | macro->add(cmd); |
47 | } | 47 | } |
48 | } | 48 | } |