Code deduplication (plugin creation via template PLUGIN_CREATOR)

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

diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h
index f7ded85385cad37d4ec5ad848cd54e49429a8977..4ab5f31e57f11741dac4631e73f13720ccb07819 100644 (file)
--- a/projects/stargazer/settings_impl.h
+++ b/projects/stargazer/settings_impl.h
@@ -42,7 +42,7 @@
 
 #include "stg/settings.h"
 #include "stg/common.h"
 
 #include "stg/settings.h"
 #include "stg/common.h"

-#include "stg/stg_logger.h"
+#include "stg/logger.h"

 #include "stg/module_settings.h"
 
 //-----------------------------------------------------------------------------
 #include "stg/module_settings.h"
 
 //-----------------------------------------------------------------------------


@@ -90,6 +90,8 @@ public:
     const std::string & GetMonitorDir() const { return monitorDir; }
     bool                GetMonitoring() const { return monitoring; }
     unsigned            GetMessageTimeout() const { return messageTimeout * 3600 * 24; }
     const std::string & GetMonitorDir() const { return monitorDir; }
     bool                GetMonitoring() const { return monitoring; }
     unsigned            GetMessageTimeout() const { return messageTimeout * 3600 * 24; }

+    unsigned            GetFeeChargeType() const { return feeChargeType; }
+    bool                GetReconnectOnTariffChange() const { return reconnectOnTariffChange; }

 
     const std::string & GetModulesPath() const { return modulesPath; }
     const MODULE_SETTINGS & GetStoreModuleSettings() const
 
     const std::string & GetModulesPath() const { return modulesPath; }
     const MODULE_SETTINGS & GetStoreModuleSettings() const


@@ -99,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);


@@ -135,6 +131,8 @@ private:
     bool        writeFreeMbTraffCost;
     bool        showFeeInCash;
     unsigned    messageTimeout;
     bool        writeFreeMbTraffCost;
     bool        showFeeInCash;
     unsigned    messageTimeout;

+    unsigned    feeChargeType;
+    bool        reconnectOnTariffChange;

 
     std::vector<MODULE_SETTINGS> modulesSettings;
     MODULE_SETTINGS storeModuleSettings;
 
     std::vector<MODULE_SETTINGS> modulesSettings;
     MODULE_SETTINGS storeModuleSettings;