Changeset 373 for cpp/frams

Timestamp:

04/23/15 03:16:55 (10 years ago)

Author:

Maciej Komosinski

Message:

Less cryptic variable names

Location:

cpp/frams/mhandlers

Files:

• mhandlers.cpp (modified) (4 diffs)
• mhandlers.h (modified) (6 diffs)

cpp/frams/mhandlers/mhandlers.cpp

@@ -31 +31 @@
 int MessageHandlerManager::add(MessageHandlerBase *h)
 {
-        h->mgr = this;
+        h->manager = this;
         handlers += h;
         return handlers.size() - 1;
@@ -39 +39 @@
 {
         MessageHandlerBase *h = handlers(i);
-        h->mgr = 0;
+        h->manager = NULL;
         handlers.remove(i);
 }
@@ -61 +61 @@
 {
         if (!isEnabled()) return;
-        int level = mgr->find(this);
-        if (level >= 0) mgr->send(level - 1, o, m, bl, w);
+        int level = manager->find(this);
+        if (level >= 0) manager->send(level - 1, o, m, bl, w);
 }
 
@@ -110 +110 @@
         if (w >= HMLV_ERROR) errcount++;
 
-        if (w >= storlevel)
+        if (w >= minleveltostore)
         {
-                storcount++;
+                storedcount++;
                 if (options & (StoreFirstMessage | StoreAllMessages))
                 {

cpp/frams/mhandlers/mhandlers.h

@@ -39 +39 @@
         friend class MessageHandlerManager;
 protected:
-        MessageHandlerManager* mgr;
+        MessageHandlerManager* manager;
         int options;
 
@@ -52 +52 @@
         void send(const char *o, const char *m, const char *bl, int w);
 
-        bool isEnabled() { return mgr ? 1 : 0; }
+        bool isEnabled() { return manager ? true : false; }
         void enable();
         void disable();
@@ -59 +59 @@
         void resume();
 
-        MessageHandlerBase(int opts = 0) :mgr(0), options(opts)
+        MessageHandlerBase(int opts = 0) :manager(NULL), options(opts)
         {
                 if (options&Enable) enable();
@@ -76 +76 @@
 {
 protected:
-        int maxlevel, errcount, warncount, storlevel, storcount, infocount;
+        int maxlevel, minleveltostore, errcount, warncount, storedcount, infocount;
         SString msgs;
 
 public:
 
-        void reset() { maxlevel = HMLV_INFO - 1; errcount = warncount = storcount = infocount = 0; msgs = 0; }
+        void reset() { maxlevel = HMLV_INFO - 1; errcount = warncount = storedcount = infocount = 0; msgs = 0; }
 
         enum Options2
@@ -91 +91 @@
         int getWarningCount()     { return warncount; }
         int getInfoCount()        { return infocount; }
-        int getStoredCount()      { return storcount; }
+        int getStoredCount()      { return storedcount; }
         int getErrorLevel()       { return maxlevel; }
         const SString& getMessages() { return msgs; }
 
-        MessageHandlerToMemory(int opts = 0, int minimal_level_to_store = HMLV_ERROR) :MessageHandlerBase(opts), storlevel(minimal_level_to_store)
+        MessageHandlerToMemory(int opts = 0, int minimal_level_to_store = HMLV_ERROR) :MessageHandlerBase(opts), minleveltostore(minimal_level_to_store)
         {
                 reset();
@@ -105 +105 @@
 class RedirectingMessageHandler : public MessageHandlerBase
 {
-        MessageHandlerManager *other_mgr;
+        MessageHandlerManager *other_manager;
 public:
-        RedirectingMessageHandler(MessageHandlerManager *om,int opts=0)
-                :MessageHandlerBase(opts), other_mgr(om) {}
+        RedirectingMessageHandler(MessageHandlerManager *other_mgr,int opts=0)
+                :MessageHandlerBase(opts), other_manager(other_mgr) {}
 
         void handle(const char *o, const char *m, const char *bl, int w)
         {
-                other_mgr->send(o, m, bl, w);
+                other_manager->send(o, m, bl, w);
         }
 };