'all' -> 'any'

[stg.git] / projects / stargazer / plugins / configuration / sgconfig2 / stgconfig.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig2/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig2/stgconfig.cpp
index cec02d419e4dc892c6a12a7e5618f66ccd455e6e..f08286ca7906e015cbfd983b2f945c23e6e82bd6 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig2/stgconfig.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig2/stgconfig.cpp
@@ -4,33 +4,13 @@
 #include <functional>
 #include <algorithm>
 
 #include <functional>
 #include <algorithm>
 

+#include "stg/plugin_creator.h"

 #include "stgconfig.h"
 #include "../../../tariffs.h"
 #include "../../../admins.h"
 #include "../../../users.h"
 
 #include "stgconfig.h"
 #include "../../../tariffs.h"
 #include "../../../admins.h"
 #include "../../../users.h"
 

-class STGCONFIG_CREATOR
-{
-private:
-    STG_CONFIG * stgconfig;
-
-public:
-    STGCONFIG_CREATOR()
-        : stgconfig(new STG_CONFIG())
-        {
-        };
-    ~STGCONFIG_CREATOR()
-        {
-        delete stgconfig;
-        };
-
-    STG_CONFIG * GetPlugin()
-        {
-        return stgconfig;
-        };
-};
-
-STGCONFIG_CREATOR stgc;
+PLUGIN_CREATOR<STG_CONFIG> stgc;

 
 BASE_PLUGIN * GetPlugin()
 {
 
 BASE_PLUGIN * GetPlugin()
 {


@@ -47,21 +27,6 @@ const string& STG_CONFIG_SETTINGS::GetStrError() const
 return errorStr;
 }
 
 return errorStr;
 }
 

-int STG_CONFIG_SETTINGS::ParseIntInRange(const 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;
-}
-

 int STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {
 int p;
 int STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {
 int p;


@@ -190,12 +155,12 @@ return NULL;
 
 uint16_t STG_CONFIG::GetStartPosition() const
 {
 
 uint16_t STG_CONFIG::GetStartPosition() const
 {

-return 220;
+return 20;

 }
 
 uint16_t STG_CONFIG::GetStopPosition() const
 {
 }
 
 uint16_t STG_CONFIG::GetStopPosition() const
 {

-return 220;
+return 20;

 }
 
 bool PrepareNetwork()
 }
 
 bool PrepareNetwork()