Remove redundand ctors.

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

diff --git a/projects/stargazer/plugins/other/ping/ping.h b/projects/stargazer/plugins/other/ping/ping.h
index d25f63888e4b40d7483fb18d6502d5b79b40d0c0..8b58e7eee2e038c62f02a5f3151a06ab2494232f 100644 (file)
--- a/projects/stargazer/plugins/other/ping/ping.h
+++ b/projects/stargazer/plugins/other/ping/ping.h
@@ -7,11 +7,6 @@
 #ifndef PING_H
 #define PING_H
 
-#include <pthread.h>
-
-#include <string>
-#include <list>
-
 #include "stg/os_int.h"
 #include "stg/plugin.h"
 #include "stg/module_settings.h"
@@ -19,6 +14,12 @@
 #include "stg/user_ips.h"
 #include "stg/pinger.h"
 #include "stg/users.h"
+#include "stg/logger.h"
+
+#include <string>
+#include <list>
+
+#include <pthread.h>
 
 extern "C" PLUGIN * GetPlugin();
 
@@ -28,15 +29,13 @@ class SETTINGS;
 //-----------------------------------------------------------------------------*/
 class CHG_CURRIP_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE<uint32_t> {
 public:
-    CHG_CURRIP_NOTIFIER_PING(const PING & p, USER_PTR u) : user(u), ping(p) {}
-    CHG_CURRIP_NOTIFIER_PING(const CHG_CURRIP_NOTIFIER_PING & rvalue)
-        : user(rvalue.user), ping(rvalue.ping)
-    {}
+    CHG_CURRIP_NOTIFIER_PING(const PING & p, USER_PTR u)
+        : user(u), ping(p) {}
     void Notify(const uint32_t & oldIP, const uint32_t & newIP);
     USER_PTR GetUser() const { return user; }
 
 private:
-    CHG_CURRIP_NOTIFIER_PING & operator=(const CHG_CURRIP_NOTIFIER_PING & rvalue);
+    CHG_CURRIP_NOTIFIER_PING & operator=(const CHG_CURRIP_NOTIFIER_PING &);
 
     USER_PTR user;
     const PING & ping;
@@ -44,15 +43,13 @@ private:
 //-----------------------------------------------------------------------------
 class CHG_IPS_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE<USER_IPS> {
 public:
-    CHG_IPS_NOTIFIER_PING(const PING & p, USER_PTR u) : user(u), ping(p) {}
-    CHG_IPS_NOTIFIER_PING(const CHG_IPS_NOTIFIER_PING & rvalue)
-        : user(rvalue.user), ping(rvalue.ping)
-    {}
+    CHG_IPS_NOTIFIER_PING(const PING & p, USER_PTR u)
+        : user(u), ping(p) {}
     void Notify(const USER_IPS & oldIPS, const USER_IPS & newIPS);
     USER_PTR GetUser() const { return user; }
 
 private:
-    CHG_IPS_NOTIFIER_PING & operator=(const CHG_IPS_NOTIFIER_PING & rvalue);
+    CHG_IPS_NOTIFIER_PING & operator=(const CHG_IPS_NOTIFIER_PING &);
 
     USER_PTR user;
     const PING & ping;
@@ -60,34 +57,31 @@ private:
 //-----------------------------------------------------------------------------
 class ADD_USER_NONIFIER_PING: public NOTIFIER_BASE<USER_PTR> {
 public:
-    ADD_USER_NONIFIER_PING(PING & p) : ping(p) {}
-    virtual ~ADD_USER_NONIFIER_PING() {}
+    explicit ADD_USER_NONIFIER_PING(PING & p) : ping(p) {}
     void Notify(const USER_PTR & user);
 
 private:
-    ADD_USER_NONIFIER_PING(const ADD_USER_NONIFIER_PING & rvalue);
-    ADD_USER_NONIFIER_PING & operator=(const ADD_USER_NONIFIER_PING & rvalue);
+    ADD_USER_NONIFIER_PING(const ADD_USER_NONIFIER_PING &);
+    ADD_USER_NONIFIER_PING & operator=(const ADD_USER_NONIFIER_PING &);
 
     PING & ping;
 };
 //-----------------------------------------------------------------------------
 class DEL_USER_NONIFIER_PING: public NOTIFIER_BASE<USER_PTR> {
 public:
-    DEL_USER_NONIFIER_PING(PING & p) : ping(p) {}
-    virtual ~DEL_USER_NONIFIER_PING() {}
+    explicit DEL_USER_NONIFIER_PING(PING & p) : ping(p) {}
     void Notify(const USER_PTR & user);
 
 private:
-    DEL_USER_NONIFIER_PING(const DEL_USER_NONIFIER_PING & rvalue);
-    DEL_USER_NONIFIER_PING & operator=(const DEL_USER_NONIFIER_PING & rvalue);
+    DEL_USER_NONIFIER_PING(const DEL_USER_NONIFIER_PING &);
+    DEL_USER_NONIFIER_PING & operator=(const DEL_USER_NONIFIER_PING &);
 
     PING & ping;
 };
 //-----------------------------------------------------------------------------
 class PING_SETTINGS {
 public:
-    PING_SETTINGS() : pingDelay(0), errorStr() {}
-    virtual ~PING_SETTINGS() {}
+    PING_SETTINGS() : pingDelay(0) {}
     const std::string & GetStrError() const { return errorStr; }
     int ParseSettings(const MODULE_SETTINGS & s);
     int GetPingDelay() const { return pingDelay; }
@@ -109,19 +103,19 @@ public:
 
     int Start();
     int Stop();
-    int Reload() { return 0; }
+    int Reload(const MODULE_SETTINGS & /*ms*/) { return 0; }
     bool IsRunning();
 
     const std::string & GetStrError() const { return errorStr; }
-    const std::string GetVersion() const { return "Pinger v.1.01"; }
-    uint16_t GetStartPosition() const { return 100; }
-    uint16_t GetStopPosition() const { return 100; }
+    std::string GetVersion() const { return "Pinger v.1.01"; }
+    uint16_t GetStartPosition() const { return 10; }
+    uint16_t GetStopPosition() const { return 10; }
 
     void AddUser(USER_PTR u);
     void DelUser(USER_PTR u);
 
 private:
-    PING(const PING & rvalue);
+    explicit PING(const PING & rvalue);
     PING & operator=(const PING & rvalue);
 
     void GetUsers();
@@ -146,6 +140,8 @@ private:
 
     ADD_USER_NONIFIER_PING onAddUserNotifier;
     DEL_USER_NONIFIER_PING onDelUserNotifier;
+
+    PLUGIN_LOGGER logger;
 };
 //-----------------------------------------------------------------------------