Code deduplication

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

diff --git a/projects/stargazer/plugins/other/ping/ping.cpp b/projects/stargazer/plugins/other/ping/ping.cpp
index 58b01c5541263fcfdaf0f0ca2a2cd4126afe3499..ec13704443db2f193fd06ce80089f77fed9c5292 100644 (file)
--- a/projects/stargazer/plugins/other/ping/ping.cpp
+++ b/projects/stargazer/plugins/other/ping/ping.cpp
@@ -4,10 +4,10 @@
 #include <ctime>
 #include <algorithm>
 
 #include <ctime>
 #include <algorithm>
 

+#include "stg/user.h"
+#include "stg/locker.h"
+#include "stg/user_property.h"

 #include "ping.h"
 #include "ping.h"

-#include "user.h"
-#include "stg_locker.h"
-#include "user_property.h"

 
 class PING_CREATOR
 {
 
 class PING_CREATOR
 {


@@ -87,21 +87,6 @@ if (ParseIntInRange(pvi->value[0], 5, 3600, &pingDelay))
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int PING_SETTINGS::ParseIntInRange(const std::string & str, int min, int max, int * val)
-{
-if (str2x(str.c_str(), *val))
-    {
-    errorStr = "Incorrect value \'" + str + "\'.";
-    return -1;
-    }
-if (*val < min || *val > max)
-    {
-    errorStr = "Value \'" + str + "\' out of range.";
-    return -1;
-    }
-return 0;
-}
-//-----------------------------------------------------------------------------

 PING::PING()
     : users(NULL),
       nonstop(false),
 PING::PING()
     : users(NULL),
       nonstop(false),