Fix compilation issues

[stg.git] / projects / stargazer / plugins / capture / ipq_linux / ipq_cap.h

diff --git a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h
index 3b088ada51a9a8e61721eac9bbd9d3a7a11b364a..9c16f4fb4fb9bcca5c720ec78b25eb5df50edb10 100644 (file)
--- a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h
+++ b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h
@@ -1,39 +1,45 @@
+#ifndef IPQ_CAP_H
+#define IPQ_CAP_H
+
 #include <string>
 
-#include "base_plugin.h"
-#include "base_settings.h"
+#include "plugin.h"
+#include "module_settings.h"
 #include "../../../traffcounter.h"
 
 #define BUFSIZE     (256)
 #define PAYLOAD_LEN (96)
 
-using namespace std;
+class USERS;
+class TARIFFS;
+class ADMINS;
+class TRAFFCOUNTER;
+class SETTINGS;
 
-extern "C" BASE_PLUGIN * GetPlugin();
+extern "C" PLUGIN * GetPlugin();
 
 //-----------------------------------------------------------------------------
-class IPQ_CAP :public BASE_PLUGIN
-{
+class IPQ_CAP :public PLUGIN {
 public:
     IPQ_CAP();
-    virtual ~IPQ_CAP(){};
+    virtual ~IPQ_CAP() {}
 
-    void SetUsers(USERS *){};
-    void SetTariffs(TARIFFS *){};
-    void SetAdmins(ADMINS *){};
+    void SetUsers(USERS *) {}
+    void SetTariffs(TARIFFS *) {}
+    void SetAdmins(ADMINS *) {}
     void SetTraffcounter(TRAFFCOUNTER * tc);
-    void SetStore(BASE_STORE *){};
-    void SetStgSettings(const SETTINGS *){};
+    void SetStore(STORE *) {}
+    void SetStgSettings(const SETTINGS *) {}
 
     int Start();
     int Stop();
-    int Reload() { return 0; };
+    int Reload() { return 0; }
     bool IsRunning();
 
-    void  SetSettings(const MODULE_SETTINGS &){};
-    int  ParseSettings(){ return 0; };
-    const string & GetStrError() const;
-    const string GetVersion() const;
+    void  SetSettings(const MODULE_SETTINGS &) {}
+    int  ParseSettings() { return 0; }
+    const std::string & GetStrError() const;
+    const std::string GetVersion() const;
     uint16_t GetStartPosition() const;
     uint16_t GetStopPosition() const;
 
@@ -43,8 +49,8 @@ private:
     int IPQCapClose();
     int IPQCapRead(void * buffer, int blen);
 
-    struct ipq_handle *ipq_h;
-    mutable string errorStr;
+    struct ipq_handle * ipq_h;
+    mutable std::string errorStr;
 
     pthread_t thread;
     bool nonstop;
@@ -54,3 +60,5 @@ private:
     TRAFFCOUNTER * traffCnt;
     unsigned char buf[BUFSIZE];
 };
+
+#endif