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.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/Keys.cc b/src/Keys.cc
index d3b82e9..79c273b 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -487,7 +487,7 @@ bool Keys::addBinding(const string &linebuffer) {
                         first_new_key = new t_key(type, mod, key, context,
                                                   isdouble);
                         current_key = first_new_key;
-                    } else if (*current_key->m_command) // already being used
+                    } else if (current_key->m_command) // already being used
                         return false;
                 } else {
                     t_key *temp_key = new t_key(type, mod, key, context,
@@ -511,7 +511,7 @@ bool Keys::addBinding(const string &linebuffer) {
             if (str) // +1 to skip ':'
                 current_key->m_command = FbTk::CommandParser<void>::instance().parse(str + 1);
 
-            if (!str || *current_key->m_command == 0 || mod) {
+            if (!str || current_key->m_command == 0 || mod) {
                 delete first_new_key;
                 return false;
             }
@@ -572,7 +572,7 @@ bool Keys::doAction(int type, unsigned int mods, unsigned int key,
         setKeyMode(next_key);
         return true;
     }
-    if (!temp_key || *temp_key->m_command == 0) {
+    if (!temp_key || temp_key->m_command == 0) {
         if (type == KeyPress &&
             !FbTk::KeyUtil::instance().keycodeToModmask(key)) {
             // if we're in the middle of an emacs-style keychain, exit it