simplify logging by removing CCommLayerInner class

It had single use site. The class itself is trivial,
it just passed messages down to an CObserver.
Now we pass messages directly to an CObserver.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 1 insertions, 100 deletions

diff --git a/lib/CommLayer/CommLayerInner.h b/lib/CommLayer/CommLayerInner.h
index f4b1ac2..491c161 100644
--- a/lib/CommLayer/CommLayerInner.h
+++ b/lib/CommLayer/CommLayerInner.h
@@ -1,108 +1,9 @@
 #ifndef COMMLAYERINNER_H_
 #define COMMLAYERINNER_H_
 
-#include <iostream>
 #include "Observer.h"
 
-class CDebugCommLayer
-{
-    private:
-        CObserver *m_pObserver;
-    public:
-        CDebugCommLayer(CObserver *pObs) :
-            m_pObserver(pObs)
-        {}
-        void Message(const std::string& pMsg)
-            {
-                if(m_pObserver)
-                {
-                    m_pObserver->Debug(pMsg);
-                }
-            }
-};
-
-class CWarningCommLayer
-{
-    private:
-        CObserver *m_pObserver;
-    public:
-        CWarningCommLayer(CObserver *pObs) :
-            m_pObserver(pObs)
-        {}
-        void Message(const std::string& pMsg)
-            {
-                if(m_pObserver)
-                {
-                    m_pObserver->Warning(pMsg);
-                }
-            }
-};
-
-class CStatusCommLayer
-{
-    private:
-        CObserver *m_pObserver;
-    public:
-        CStatusCommLayer(CObserver *pObs) :
-            m_pObserver(pObs)
-        {}
-        void Message(const std::string& pMsg)
-            {
-                if(m_pObserver)
-                {
-                    m_pObserver->Status(pMsg);
-                }
-            }
-};
-
-class CCommLayerInner
-{
-    private:
-        CDebugCommLayer* m_pDebugCommLayer;
-        CWarningCommLayer* m_pWarningCommLayer;
-        CStatusCommLayer* m_pStatusCommLayer;
-    public:
-        CDebugCommLayer* GetDebugCommLayer()
-            {
-                return m_pDebugCommLayer;
-            }
-        CWarningCommLayer* GetWarningCommLayer()
-            {
-                return m_pWarningCommLayer;
-            }
-        CStatusCommLayer* GetStatusCommLayer()
-            {
-                return m_pStatusCommLayer;
-            }
-        CCommLayerInner(CObserver *pObs, bool pDebug, bool pWarning)
-            {
-                m_pDebugCommLayer = NULL;
-                m_pWarningCommLayer = NULL;
-                if (pDebug)
-                {
-                    m_pDebugCommLayer = new CDebugCommLayer(pObs);
-                }
-                if (pWarning)
-                {
-                    m_pWarningCommLayer = new CWarningCommLayer(pObs);
-                }
-                m_pStatusCommLayer = new CStatusCommLayer(pObs);
-            }
-        ~CCommLayerInner()
-            {
-                if (m_pDebugCommLayer)
-                {
-                    delete m_pDebugCommLayer;
-                }
-                if (m_pWarningCommLayer)
-                {
-                    delete m_pWarningCommLayer;
-                }
-                delete m_pStatusCommLayer;
-            }
-};
-
-void comm_layer_inner_init(CCommLayerInner *pCommLayerInner);
+void comm_layer_inner_init(CObserver *pObs);
 void comm_layer_inner_debug(const std::string& pMessage);
 void comm_layer_inner_warning(const std::string& pMessage);
 void comm_layer_inner_status(const std::string& pMessage);