Merge branch 'master' into full-month-stats

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

diff --git a/projects/sgauth/settings_impl.h b/projects/sgauth/settings_impl.h
index 74b70d39e2f38582b2dce78785857f4b380a9e68..9354e18decf236978f259ce8d5b9248a1ffeaf8a 100644 (file)
--- a/projects/sgauth/settings_impl.h
+++ b/projects/sgauth/settings_impl.h
@@ -23,14 +23,14 @@
 
 #include <string>
 
 
 #include <string>
 

-#include "os_int.h"
+#include "stg/os_int.h"

 
 class SETTINGS_IMPL {
 public:
                         SETTINGS_IMPL();
                         ~SETTINGS_IMPL() {}
     int                 Reload() { return 0; }
 
 class SETTINGS_IMPL {
 public:
                         SETTINGS_IMPL();
                         ~SETTINGS_IMPL() {}
     int                 Reload() { return 0; }

-    void                SetConfFile(const std::string cf) { confFile = cf; }
+    void                SetConfFile(const std::string & cf) { confFile = cf; }

     int                 ReadSettings();
 
     const std::string & GetStrError() const { return strError; }
     int                 ReadSettings();
 
     const std::string & GetStrError() const { return strError; }


@@ -67,12 +67,6 @@ private:
 
     std::string confFile;
     std::string strError;
 
     std::string confFile;
     std::string strError;

-
-    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);

 };
 
 #endif
 };
 
 #endif