1 files changed, 17 insertions, 11 deletions
diff --git a/lib/CommLayer/CommLayerServer.h b/lib/CommLayer/CommLayerServer.h
index fc76cc9..f781813 100644
--- a/lib/CommLayer/CommLayerServer.h
+++ b/lib/CommLayer/CommLayerServer.h
@@ -1,10 +1,13 @@
+#ifndef COMMLAYERSERVER_H_
+#define COMMLAYERSERVER_H_
+
 #include <vector>
 #include <map>
 #include <string>
 #include <sstream>
 #include <iostream>
-#include "MiddleWare.h"
 #include "Observer.h"
+#include "CrashTypes.h"
 
 /* just a helper function */
 template< class T >
@@ -16,29 +19,32 @@ to_string( T x )
     return o.str();
 }
 
+
 class CCommLayerServer{
-    private:
+    protected:
         /* FIXME more observers? */
         //std::vector<Observer *obs>;
         CObserver *m_pObserver;
     public:
-        CMiddleWare *m_pMW;
-        CCommLayerServer(CMiddleWare *pMW);
+        //CMiddleWare *m_pMW;
+        //CCommLayerServer(CMiddleWare *pMW);
+        CCommLayerServer();
         virtual ~CCommLayerServer();
         /* observer */
         void Attach(CObserver *pObs);
         void Detach(CObserver *pObs);
         void Notify(const std::string& pMessage);
-        /*
-     virtual dbus_vector_crash_infos_t GetCrashInfos(const std::string &pUID) = 0;
-     virtual dbus_vector_map_crash_infos_t GetCrashInfosMap(const std::string &pDBusSender) = 0;
-     virtual dbus_map_report_info_t CreateReport(const std::string &pUUID,const std::string &pDBusSender) = 0;
-     virtual bool Report(dbus_map_report_info_t pReport) = 0;
-     virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pDBusSender) = 0;
-     */
+     
+        virtual vector_crash_infos_t GetCrashInfos(const std::string &pDBusSender) = 0;
+        virtual map_crash_report_t CreateReport(const std::string &pUUID,const std::string &pDBusSender) = 0;
+        virtual bool Report(map_crash_report_t pReport) = 0;
+        virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pDBusSender) = 0;
+     
     public:
     /* just stubs to be called when not implemented in specific comm layer */
         virtual void Crash(const std::string& arg1) {}
         virtual void AnalyzeComplete(map_crash_report_t arg1) {}
         virtual void Error(const std::string& arg1) {}
 };
+
+#endif //COMMLAYERSERVER_H_