Changeset 13997 for trunk

Timestamp:

05/31/12 15:28:31 (12 years ago)

Author:

tbretz

Message:

Made some member function protected  which do not have to be public

File:

• trunk/FACT++/src/DimState.h (modified) (6 diffs)

trunk/FACT++/src/DimState.h

@@ -11 +11 @@
     callback fCallback;
 
+    void HandlerImp(const EventImp &evt)
+    {
+        const bool disconnected = evt.GetSize()==0;
+
+        info = make_pair(evt.GetTime(), disconnected ? -256 : evt.GetQoS());
+
+        msg = disconnected ? "" : evt.GetString();
+    }
+
+    void Callback(const EventImp &evt)
+    {
+        if (fCallback)
+            fCallback(evt);
+    }
+
+    virtual void Handler(const EventImp &evt)
+    {
+        HandlerImp(evt);
+        Callback(evt);
+    }
+
 public:
     DimState(const string &n, const string s="STATE") : server(n),
@@ -36 +57 @@
         fCallback = cb;
     }
-
-    void HandlerImp(const EventImp &evt)
-    {
-        const bool disconnected = evt.GetSize()==0;
-
-        info = make_pair(evt.GetTime(), disconnected ? -256 : evt.GetQoS());
-
-        msg = disconnected ? "" : evt.GetString();
-    }
-
-    void Callback(const EventImp &evt)
-    {
-        if (fCallback)
-            fCallback(evt);
-    }
-
-    virtual void Handler(const EventImp &evt)
-    {
-        HandlerImp(evt);
-        Callback(evt);
-    }
-
 
     const Time &time() const { return info.first; }
@@ -132 +131 @@
 class DimVersion : public DimState
 {
-public:
-    DimVersion() : DimState("DIS_DNS", "VERSION_NUMBER") { }
-
     void Handler(const EventImp &evt)
     {
@@ -146 +142 @@
     }
 
+public:
+    DimVersion() : DimState("DIS_DNS", "VERSION_NUMBER") { }
+
     string version() const
     {
@@ -165 +164 @@
 {
     map<string, callback> fCallbacks;
-
-public:
-    DimControl() : DimState("DIM_CONTROL") { }
-
-    string file;
-    string shortmsg;
-    int scriptdepth;
-
-    void AddCallback(const string &script, const callback &cb)
-    {
-        fCallbacks[script] = cb;
-    }
 
     void Handler(const EventImp &evt)
@@ -219 +206 @@
     }
 
+
+public:
+    DimControl() : DimState("DIM_CONTROL") { }
+
+    string file;
+    string shortmsg;
+    int scriptdepth;
+
+    void AddCallback(const string &script, const callback &cb)
+    {
+        fCallbacks[script] = cb;
+    }
+
     State description() const
     {