Merge branch 'master' into full-month-stats

[stg.git] / projects / stargazer / settings_impl.h

diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h
index 43dcab0ccccdb535fd2bd20ae2480d02122aeb1c..739bbcc946cc273c9d85c9f54fcb0a4f7d77e0a6 100644 (file)
--- a/projects/stargazer/settings_impl.h
+++ b/projects/stargazer/settings_impl.h
@@ -50,7 +50,7 @@ enum DETAIL_STAT_PERIOD {
 dsPeriod_1,
 dsPeriod_1_2,
 dsPeriod_1_4,
 dsPeriod_1,
 dsPeriod_1_2,
 dsPeriod_1_4,

-dsPeriod_1_6,
+dsPeriod_1_6

 };
 //-----------------------------------------------------------------------------
 class STG_LOGGER;
 };
 //-----------------------------------------------------------------------------
 class STG_LOGGER;


@@ -101,13 +101,7 @@ public:
 
 private:
 
 
 private:
 

-    int ParseInt(const std::string & value, int * val);
-    int ParseUnsigned(const std::string & value, unsigned * val);
-    int ParseIntInRange(const std::string & value, int min, int max, int * val);
-    int ParseUnsignedInRange(const std::string & value, unsigned min, unsigned max, unsigned * val);
-    int ParseYesNo(const std::string & value, bool * val);
-    int ParseDetailStatWritePeriod(const std::string & detailStatPeriodStr);
-
+    int ParseDetailStatWritePeriod(const std::string & str);

     int ParseModuleSettings(const DOTCONFDocumentNode * dirNameNode, std::vector<PARAM_VALUE> * params);
 
     static void ErrorCallback(void * data, const char * buf);
     int ParseModuleSettings(const DOTCONFDocumentNode * dirNameNode, std::vector<PARAM_VALUE> * params);
 
     static void ErrorCallback(void * data, const char * buf);