Remove redindand ctors from USER_IPS.

[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 421b83da5ae3232115be566fdb834dfda3546008..34bbbc52c5bd407b2e8a7990baa02c3697a0fb40 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
 
 #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"
 #include "stg/os_int.h"
 #include "stg/plugin.h"
 #include "stg/module_settings.h"


@@ -21,6 +16,11 @@
 #include "stg/users.h"
 #include "stg/logger.h"
 
 #include "stg/users.h"
 #include "stg/logger.h"
 

+#include <string>
+#include <list>
+
+#include <pthread.h>
+

 extern "C" PLUGIN * GetPlugin();
 
 class PING;
 extern "C" PLUGIN * GetPlugin();
 
 class PING;


@@ -63,7 +63,7 @@ private:
 //-----------------------------------------------------------------------------
 class ADD_USER_NONIFIER_PING: public NOTIFIER_BASE<USER_PTR> {
 public:
 //-----------------------------------------------------------------------------
 class ADD_USER_NONIFIER_PING: public NOTIFIER_BASE<USER_PTR> {
 public:

-    ADD_USER_NONIFIER_PING(PING & p) : NOTIFIER_BASE<USER_PTR>(), ping(p) {}
+    explicit ADD_USER_NONIFIER_PING(PING & p) : NOTIFIER_BASE<USER_PTR>(), ping(p) {}

     virtual ~ADD_USER_NONIFIER_PING() {}
     void Notify(const USER_PTR & user);
 
     virtual ~ADD_USER_NONIFIER_PING() {}
     void Notify(const USER_PTR & user);
 


@@ -76,7 +76,7 @@ private:
 //-----------------------------------------------------------------------------
 class DEL_USER_NONIFIER_PING: public NOTIFIER_BASE<USER_PTR> {
 public:
 //-----------------------------------------------------------------------------
 class DEL_USER_NONIFIER_PING: public NOTIFIER_BASE<USER_PTR> {
 public:

-    DEL_USER_NONIFIER_PING(PING & p) : NOTIFIER_BASE<USER_PTR>(), ping(p) {}
+    explicit DEL_USER_NONIFIER_PING(PING & p) : NOTIFIER_BASE<USER_PTR>(), ping(p) {}

     virtual ~DEL_USER_NONIFIER_PING() {}
     void Notify(const USER_PTR & user);
 
     virtual ~DEL_USER_NONIFIER_PING() {}
     void Notify(const USER_PTR & user);
 


@@ -112,11 +112,11 @@ public:
 
     int Start();
     int Stop();
 
     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; }
     bool IsRunning();
 
     const std::string & GetStrError() const { return errorStr; }

-    const std::string GetVersion() const { return "Pinger v.1.01"; }
+    std::string GetVersion() const { return "Pinger v.1.01"; }

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


@@ -124,7 +124,7 @@ public:
     void DelUser(USER_PTR u);
 
 private:
     void DelUser(USER_PTR u);
 
 private:

-    PING(const PING & rvalue);
+    explicit PING(const PING & rvalue);

     PING & operator=(const PING & rvalue);
 
     void GetUsers();
     PING & operator=(const PING & rvalue);
 
     void GetUsers();