Split SETTINGS to interface and implementation

[stg.git] / projects / stargazer / plugins / capture / ether_linux / ether_cap.h

diff --git a/projects/stargazer/plugins/capture/ether_linux/ether_cap.h b/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
index fde7d3a0f91435811f71041f2a1f0929292126fa..0988820082f6aa398d735a26a7438351ce684aef 100644 (file)
--- a/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
+++ b/projects/stargazer/plugins/capture/ether_linux/ether_cap.h
@@ -30,37 +30,40 @@
 
 #include <string>
 
 
 #include <string>
 

-#include "base_plugin.h"
-#include "base_settings.h"
+#include "plugin.h"
+#include "module_settings.h"

 #include "../../../traffcounter.h"
 
 #include "../../../traffcounter.h"
 

-using namespace std;
+class USERS;
+class TARIFFS;
+class ADMINS;
+class TRAFFCOUNTER;
+class SETTINGS;

 
 

-extern "C" BASE_PLUGIN * GetPlugin();
+extern "C" PLUGIN * GetPlugin();

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-class ETHER_CAP :public BASE_PLUGIN
-{
+class ETHER_CAP :public PLUGIN {

 public:
     ETHER_CAP();
 public:
     ETHER_CAP();

-    virtual ~ETHER_CAP(){};
+    virtual ~ETHER_CAP() {}

 
 

-    void                SetUsers(USERS *){};
-    void                SetTariffs(TARIFFS *){};
-    void                SetAdmins(ADMINS *){};
+    void                SetUsers(USERS *) {}
+    void                SetTariffs(TARIFFS *) {}
+    void                SetAdmins(ADMINS *) {}

     void                SetTraffcounter(TRAFFCOUNTER * tc);
     void                SetTraffcounter(TRAFFCOUNTER * tc);

-    void                SetStore(BASE_STORE *){};
-    void                SetStgSettings(const SETTINGS *){};
+    void                SetStore(STORE *) {}
+    void                SetStgSettings(const SETTINGS *) {}

 
     int                 Start();
     int                 Stop();
 
     int                 Start();
     int                 Stop();

-    int                 Reload() { return 0; };
+    int                 Reload() { return 0; }

     bool                IsRunning();
 
     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;
 
     uint16_t            GetStartPosition() const;
     uint16_t            GetStopPosition() const;
 


@@ -71,7 +74,7 @@ private:
     int                 EthCapRead(void * buffer, int blen, char ** iface);
     bool                WaitPackets(int sd) const;
 
     int                 EthCapRead(void * buffer, int blen, char ** iface);
     bool                WaitPackets(int sd) const;
 

-    mutable string      errorStr;
+    mutable std::string errorStr;

 
     pthread_t           thread;
     bool                nonstop;
 
     pthread_t           thread;
     bool                nonstop;


@@ -82,5 +85,4 @@ private:
 };
 //-----------------------------------------------------------------------------
 
 };
 //-----------------------------------------------------------------------------
 

-#endif //ETHER_CAP_H
-
+#endif