A bit better Makefile

[stg.git] / include / plugin.h

diff --git a/include/plugin.h b/include/plugin.h
index 16dfa5fa7903a8e34416d9b38bce695cc04ea72c..d196b353be45a078106a85ec806e35e185f6abe5 100644 (file)
--- a/include/plugin.h
+++ b/include/plugin.h
@@ -25,47 +25,41 @@
 */
 
 
 */
 
 

-#ifndef BASE_PLUGIN_H
-#define BASE_PLUGIN_H
+#ifndef PLUGIN_H
+#define PLUGIN_H

 
 #include <string>
 
 #include <string>

-#include "base_settings.h"
+

 #include "noncopyable.h"
 #include "os_int.h"
 #include "noncopyable.h"
 #include "os_int.h"

+#include "admins.h"
+#include "users.h"
+#include "tariffs.h"

 
 

-using namespace std;
-
-class ADMINS;
-class USERS;
-class TARIFFS;

 class TRAFFCOUNTER;
 class SETTINGS;
 class TRAFFCOUNTER;
 class SETTINGS;

-class BASE_STORE;
+class STORE;
+class MODULE_SETTINGS;

 
 

-//-----------------------------------------------------------------------------
-class BASE_PLUGIN : private NONCOPYABLE
-{
+class PLUGIN : private NONCOPYABLE {

 public:
 public:

-    virtual                 ~BASE_PLUGIN(){};
-    virtual void            SetUsers(USERS * u) = 0;
-    virtual void            SetTariffs(TARIFFS * t) = 0;
-    virtual void            SetAdmins(ADMINS * a) = 0;
-    virtual void            SetTraffcounter(TRAFFCOUNTER * tc) = 0;
-    virtual void            SetStore(BASE_STORE * st) = 0;
-    virtual void            SetStgSettings(const SETTINGS * s) = 0;
-    virtual void            SetSettings(const MODULE_SETTINGS & s) = 0;
-    virtual int             ParseSettings() = 0;
+    virtual void                SetUsers(USERS * u) = 0;
+    virtual void                SetTariffs(TARIFFS * t) = 0;
+    virtual void                SetAdmins(ADMINS * a) = 0;
+    virtual void                SetTraffcounter(TRAFFCOUNTER * tc) = 0;
+    virtual void                SetStore(STORE * st) = 0;
+    virtual void                SetStgSettings(const SETTINGS * s) = 0;
+    virtual void                SetSettings(const MODULE_SETTINGS & s) = 0;
+    virtual int                 ParseSettings() = 0;

 
 

-    virtual int             Start() = 0;
-    virtual int             Stop() = 0;
-    virtual int             Reload() = 0;
-    virtual bool            IsRunning() = 0;
-    virtual const string  & GetStrError() const = 0;
-    virtual const string    GetVersion() const = 0;
-    virtual uint16_t        GetStartPosition() const = 0;
-    virtual uint16_t        GetStopPosition() const = 0;
+    virtual int                 Start() = 0;
+    virtual int                 Stop() = 0;
+    virtual int                 Reload() = 0;
+    virtual bool                IsRunning() = 0;
+    virtual const std::string & GetStrError() const = 0;
+    virtual const std::string   GetVersion() const = 0;
+    virtual uint16_t            GetStartPosition() const = 0;
+    virtual uint16_t            GetStopPosition() const = 0;

 };
 };

-//-----------------------------------------------------------------------------
-#endif
-

 
 

+#endif