Explicit prohibition of the PLUGIN_LOGGER assignment.

[stg.git] / projects / stargazer / plugins / other / smux / smux.h

diff --git a/projects/stargazer/plugins/other/smux/smux.h b/projects/stargazer/plugins/other/smux/smux.h
index ef7b191c1843589e38a6acee7ce2398695b6febd..721f02044c2f90028819b3aa0245515a77970f4e 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.h
+++ b/projects/stargazer/plugins/other/smux/smux.h
@@ -21,8 +21,6 @@
 #include "tables.h"
 #include "types.h"
 
 #include "tables.h"
 #include "types.h"
 

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

 class USER;
 class SETTINGS;
 class SMUX;
 class USER;
 class SETTINGS;
 class SMUX;


@@ -76,7 +74,7 @@ private:
 //-----------------------------------------------------------------------------
 class ADD_DEL_TARIFF_NOTIFIER : public NOTIFIER_BASE<TARIFF_DATA>, private NONCOPYABLE {
 public:
 //-----------------------------------------------------------------------------
 class ADD_DEL_TARIFF_NOTIFIER : public NOTIFIER_BASE<TARIFF_DATA>, private NONCOPYABLE {
 public:

-         ADD_DEL_TARIFF_NOTIFIER(SMUX & s)
+    explicit ADD_DEL_TARIFF_NOTIFIER(SMUX & s)

              : NOTIFIER_BASE<TARIFF_DATA>(), smux(s) {}
     void Notify(const TARIFF_DATA &);
 
              : NOTIFIER_BASE<TARIFF_DATA>(), smux(s) {}
     void Notify(const TARIFF_DATA &);
 


@@ -86,7 +84,7 @@ private:
 //-----------------------------------------------------------------------------
 class ADD_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR>, private NONCOPYABLE {
 public:
 //-----------------------------------------------------------------------------
 class ADD_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR>, private NONCOPYABLE {
 public:

-         ADD_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE<USER_PTR>(), smux(s) {}
+    explicit ADD_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE<USER_PTR>(), smux(s) {}

     void Notify(const USER_PTR &);
 
 private:
     void Notify(const USER_PTR &);
 
 private:


@@ -95,7 +93,7 @@ private:
 //-----------------------------------------------------------------------------
 class DEL_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR>, private NONCOPYABLE {
 public:
 //-----------------------------------------------------------------------------
 class DEL_USER_NOTIFIER : public NOTIFIER_BASE<USER_PTR>, private NONCOPYABLE {
 public:

-         DEL_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE<USER_PTR>(), smux(s) {}
+    explicit DEL_USER_NOTIFIER(SMUX & s) : NOTIFIER_BASE<USER_PTR>(), smux(s) {}

     void Notify(const USER_PTR &);
 
 private:
     void Notify(const USER_PTR &);
 
 private:


@@ -118,11 +116,11 @@ public:
 
     int Start();
     int Stop();
 
     int Start();
     int Stop();

-    int Reload();
+    int Reload(const MODULE_SETTINGS & ms);

     bool IsRunning() { return running && !stopped; }
 
     const std::string & GetStrError() const { return errorStr; }
     bool IsRunning() { return running && !stopped; }
 
     const std::string & GetStrError() const { return errorStr; }

-    const std::string GetVersion() const { return "Stg SMUX Plugin 1.1"; }
+    std::string GetVersion() const { return "Stg SMUX Plugin 1.1"; }

     uint16_t GetStartPosition() const { return 10; }
     uint16_t GetStopPosition() const { return 10; }
 
     uint16_t GetStartPosition() const { return 10; }
     uint16_t GetStopPosition() const { return 10; }
 


@@ -216,6 +214,4 @@ smux.UnsetNotifier(userPtr);
 smux.UpdateTables();
 }
 
 smux.UpdateTables();
 }
 

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

 #endif
 #endif