Fix tariff field name in XML-RPC API documentation (tariff -> name)

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

diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h
index 86262808afe191ba9fd3b6e1c3db3f77b0126568..c7829b274be1f35912f897b5012bca0e0dd07a90 100644 (file)
--- a/projects/stargazer/settings_impl.h
+++ b/projects/stargazer/settings_impl.h
@@ -34,15 +34,16 @@
  */
 
 
  */
 
 

-#ifndef SETTINGS_H
-#define SETTINGS_H
+#ifndef SETTINGS_IMPL_H
+#define SETTINGS_IMPL_H

 
 #include <string>
 #include <vector>
 
 
 #include <string>
 #include <vector>
 

-#include "common.h"
-#include "stg_logger.h"
-#include "module_settings.h"
+#include "stg/settings.h"
+#include "stg/common.h"
+#include "stg/logger.h"
+#include "stg/module_settings.h"

 
 //-----------------------------------------------------------------------------
 enum DETAIL_STAT_PERIOD {
 
 //-----------------------------------------------------------------------------
 enum DETAIL_STAT_PERIOD {


@@ -55,12 +56,12 @@ dsPeriod_1_6,
 class STG_LOGGER;
 class DOTCONFDocumentNode;
 //-----------------------------------------------------------------------------
 class STG_LOGGER;
 class DOTCONFDocumentNode;
 //-----------------------------------------------------------------------------

-class SETTINGS {
+class SETTINGS_IMPL : public SETTINGS {

 public:
 public:

-    SETTINGS();
-    SETTINGS(const std::string &);
-    SETTINGS(const SETTINGS &);
-    virtual ~SETTINGS();
+    SETTINGS_IMPL();
+    SETTINGS_IMPL(const std::string &);
+    SETTINGS_IMPL(const SETTINGS_IMPL &);
+    virtual ~SETTINGS_IMPL() {}

     int Reload() { return ReadSettings(); }
     int ReadSettings();
 
     int Reload() { return ReadSettings(); }
     int ReadSettings();
 


@@ -68,14 +69,14 @@ public:
 
     int                 GetExecMsgKey() const { return stgExecMsgKey; }
     unsigned            GetExecutersNum() const { return executersNum; }
 
     int                 GetExecMsgKey() const { return stgExecMsgKey; }
     unsigned            GetExecutersNum() const { return executersNum; }

-    const std::string & GetDirName(int num) const { return dirName[num]; };
+    const std::string & GetDirName(size_t num) const { return dirName[num]; }

     const std::string & GetConfDir() const { return confDir; }
     const std::string & GetScriptsDir() const { return scriptsDir; }
     const std::string & GetRulesFileName() const { return rules; }
     const std::string & GetLogFileName() const { return logFile; }
     const std::string & GetPIDFileName() const { return pidFile; }
     unsigned            GetDetailStatWritePeriod() const 
     const std::string & GetConfDir() const { return confDir; }
     const std::string & GetScriptsDir() const { return scriptsDir; }
     const std::string & GetRulesFileName() const { return rules; }
     const std::string & GetLogFileName() const { return logFile; }
     const std::string & GetPIDFileName() const { return pidFile; }
     unsigned            GetDetailStatWritePeriod() const 

-        { return detailStatWritePeriod; };
+        { return detailStatWritePeriod; }

     unsigned            GetStatWritePeriod() const { return statWritePeriod * 60; }
     unsigned            GetDayFee() const { return dayFee; }
     bool                GetFullFee() const { return fullFee; }
     unsigned            GetStatWritePeriod() const { return statWritePeriod * 60; }
     unsigned            GetDayFee() const { return dayFee; }
     bool                GetFullFee() const { return fullFee; }


@@ -113,7 +114,7 @@ private:
 
     //////////settings
     std::string modulesPath;
 
     //////////settings
     std::string modulesPath;

-    std::string dirName[DIR_NUM];
+    std::vector<std::string> dirName;

     std::string confDir;
     std::string        scriptsDir;
     std::string rules;
     std::string confDir;
     std::string        scriptsDir;
     std::string rules;