Better handling of errors from server. Refactoring.

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

diff --git a/projects/sgauth/settings_impl.h b/projects/sgauth/settings_impl.h
index 74b70d39e2f38582b2dce78785857f4b380a9e68..253b69eabea7c3a00e485fe1862eb7f59988522b 100644 (file)
--- a/projects/sgauth/settings_impl.h
+++ b/projects/sgauth/settings_impl.h
@@ -23,20 +23,21 @@
 
 #include <string>
 
-#include "os_int.h"
+#include "stg/os_int.h"
 
 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; }
 
     const std::string & GetServerName() const { return serverName; }
     uint16_t            GetServerPort() const { return port; }
+    const std::string & GetLocalName() const { return localName; }
     uint16_t            GetLocalPort() const { return localPort; }
 
     const std::string & GetLogin() const { return login; }
@@ -56,6 +57,7 @@ private:
     std::string password;
     std::string serverName;
     int         port;
+    std::string localName;
     int         localPort;
     uint32_t    listenWebIP;
     int         refreshPeriod;
@@ -67,12 +69,6 @@ private:
 
     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