CProfile refactoring

2 files changed, 82 insertions, 82 deletions

diff --git a/src/common/profile.cpp b/src/common/profile.cpp
index a63a772..79d7152 100644
--- a/src/common/profile.cpp
+++ b/src/common/profile.cpp
@@ -17,10 +17,10 @@
 
 #include "common/profile.h"
 
-#include "common/logger.h"
-
 #include "app/system.h"
 
+#include "common/logger.h"
+
 #include <utility>
 #include <cstring>
 #include <boost/property_tree/ini_parser.hpp>
@@ -33,27 +33,27 @@ namespace bp = boost::property_tree;
 
 CProfile::CProfile()
    : m_profileNeedSave(false)
-   , m_useLocalDirectory(false)
+   , m_useCurrentDirectory(false)
 {
 }
 
 
 CProfile::~CProfile()
 {
-    SaveCurrentDirectory();
+    Save();
 }
 
-void CProfile::SetUseLocalDirectory(bool useLocalDirectory)
+void CProfile::SetUseCurrentDirectory(bool useCurrentDirectory)
 {
-    m_useLocalDirectory = useLocalDirectory;
+    m_useCurrentDirectory = useCurrentDirectory;
 }
 
 std::string CProfile::GetIniFileLocation()
 {
-    return m_useLocalDirectory ? "colobot.ini" : GetSystemUtils()->GetProfileFileLocation();
+    return m_useCurrentDirectory ? "colobot.ini" : GetSystemUtils()->GetProfileFileLocation();
 }
 
-bool CProfile::InitCurrentDirectory()
+bool CProfile::Init()
 {
     try
     {
@@ -67,7 +67,7 @@ bool CProfile::InitCurrentDirectory()
     return true;
 }
 
-bool CProfile::SaveCurrentDirectory()
+bool CProfile::Save()
 {
     if (m_profileNeedSave)
     {
@@ -84,7 +84,7 @@ bool CProfile::SaveCurrentDirectory()
     return true;
 }
 
-bool CProfile::SetLocalProfileString(std::string section, std::string key, std::string value)
+bool CProfile::SetStringProperty(std::string section, std::string key, std::string value)
 {
     try
     {
@@ -100,7 +100,7 @@ bool CProfile::SetLocalProfileString(std::string section, std::string key, std::
 }
 
 
-bool CProfile::GetLocalProfileString(std::string section, std::string key, std::string &buffer)
+bool CProfile::GetStringProperty(std::string section, std::string key, std::string &buffer)
 {
     try
     {
@@ -115,7 +115,7 @@ bool CProfile::GetLocalProfileString(std::string section, std::string key, std::
 }
 
 
-bool CProfile::SetLocalProfileInt(std::string section, std::string key, int value)
+bool CProfile::SetIntProperty(std::string section, std::string key, int value)
 {
     try
     {
@@ -131,7 +131,7 @@ bool CProfile::SetLocalProfileInt(std::string section, std::string key, int valu
 }
 
 
-bool CProfile::GetLocalProfileInt(std::string section, std::string key, int &value)
+bool CProfile::GetIntProperty(std::string section, std::string key, int &value)
 {
     try
     {
@@ -146,7 +146,7 @@ bool CProfile::GetLocalProfileInt(std::string section, std::string key, int &val
 }
 
 
-bool CProfile::SetLocalProfileFloat(std::string section, std::string key, float value)
+bool CProfile::SetFloatProperty(std::string section, std::string key, float value)
 {
     try
     {
@@ -162,7 +162,7 @@ bool CProfile::SetLocalProfileFloat(std::string section, std::string key, float
 }
 
 
-bool CProfile::GetLocalProfileFloat(std::string section, std::string key, float &value)
+bool CProfile::GetFloatProperty(std::string section, std::string key, float &value)
 {
     try
     {
@@ -177,7 +177,7 @@ bool CProfile::GetLocalProfileFloat(std::string section, std::string key, float
 }
 
 
-std::vector< std::string > CProfile::GetLocalProfileSection(std::string section, std::string key)
+std::vector< std::string > CProfile::GetSection(std::string section, std::string key)
 {
     std::vector< std::string > ret_list;
     boost::regex re(key + "[0-9]*"); //we want to match all key followed by any number
@@ -207,13 +207,13 @@ void CProfile::SetUserDir(std::string dir)
 }
 
 
-std::string CProfile::GetUserBasedPath(std::string dir, std::string default_dir)
+std::string CProfile::GetUserBasedPath(std::string dir, std::string defaultDir)
 {
     std::string path = dir;
     boost::replace_all(path, "\\", "/");
     if (dir.find("/") == std::string::npos)
     {
-        path = default_dir + "/" + dir;
+        path = defaultDir + "/" + dir;
     }
 
     if (m_userDirectory.length() > 0)
@@ -222,7 +222,7 @@ std::string CProfile::GetUserBasedPath(std::string dir, std::string default_dir)
     }
     else
     {
-        boost::replace_all(path, "%user%", default_dir);
+        boost::replace_all(path, "%user%", defaultDir);
     }
 
     return fs::path(path).make_preferred().string();
diff --git a/src/common/profile.h b/src/common/profile.h
index 52f9f15..ad0458e 100644
--- a/src/common/profile.h
+++ b/src/common/profile.h
@@ -45,91 +45,91 @@ public:
     CProfile();
     virtual ~CProfile();
 
-    /** Set flag to force using ini file from local directory */
-    void SetUseLocalDirectory(bool useLocalDirectory);
+    /** Set flag to force using ini file from current directory */
+    void SetUseCurrentDirectory(bool useCurrentDirectory);
 
     /** Loads colobot.ini from current directory
-        * \return return true on success
-        */
-    bool InitCurrentDirectory();
+     * \return return true on success
+     */
+    bool Init();
 
     /** Saves colobot.ini to current directory
-        * \return return true on success
-        */
-    bool SaveCurrentDirectory();
+     * \return return true on success
+     */
+    bool Save();
 
     /** Sets string value in section under specified key
-        * \param section
-        * \param key
-        * \param value
-        * \return return true on success
-        */
-    bool SetLocalProfileString(std::string section, std::string key, std::string value);
+     * \param section
+     * \param key
+     * \param value
+     * \return return true on success
+     */
+    bool SetStringProperty(std::string section, std::string key, std::string value);
 
     /** Gets string value in section under specified key
-        * \param section
-        * \param key
-        * \param buffer
-        * \return return true on success
-        */
-    bool GetLocalProfileString(std::string section, std::string key, std::string& buffer);
+     * \param section
+     * \param key
+     * \param buffer
+     * \return return true on success
+     */
+    bool GetStringProperty(std::string section, std::string key, std::string& buffer);
 
     /** Sets int value in section under specified key
-        * \param section
-        * \param key
-        * \param value
-        * \return return true on success
-        */
-    bool SetLocalProfileInt(std::string section, std::string key, int value);
+     * \param section
+     * \param key
+     * \param value
+     * \return return true on success
+     */
+    bool SetIntProperty(std::string section, std::string key, int value);
 
     /** Gets int value in section under specified key
-        * \param section
-        * \param key
-        * \param value
-        * \return return true on success
-        */
-    bool GetLocalProfileInt(std::string section, std::string key, int &value);
+     * \param section
+     * \param key
+     * \param value
+     * \return return true on success
+     */
+    bool GetIntProperty(std::string section, std::string key, int &value);
 
     /** Sets float value in section under specified key
-        * \param section
-        * \param key
-        * \param value
-        * \return return true on success
-        */
-    bool SetLocalProfileFloat(std::string section, std::string key, float value);
+     * \param section
+     * \param key
+     * \param value
+     * \return return true on success
+     */
+    bool SetFloatProperty(std::string section, std::string key, float value);
 
     /** Gets float value in section under specified key
-        * \param section
-        * \param key
-        * \param value
-        * \return return true on success
-        */
-    bool GetLocalProfileFloat(std::string section, std::string key, float &value);
+     * \param section
+     * \param key
+     * \param value
+     * \return return true on success
+     */
+    bool GetFloatProperty(std::string section, std::string key, float &value);
 
     /** Gets all values in section under specified key
-        * \param section
-        * \param key
-        * \return vector of values
-        */
-    std::vector< std::string > GetLocalProfileSection(std::string section, std::string key);
+     * \param section
+     * \param key
+     * \return vector of values
+     */
+    std::vector< std::string > GetSection(std::string section, std::string key);
 
     /** Sets current user directory
-        * \param dir
-        */
+     * \param dir
+     */
     void SetUserDir(std::string dir);
 
     /** Returns path based on current user. Replaces %user% in path with current user dir or
-        * uses default_dir param if no user dir is specified
-        * \param dir
-        * \param default_dir
-        * \return path
-        */
-    std::string GetUserBasedPath(std::string dir, std::string default_dir);
-
-    /** opy a file into the temporary folder.
-        * \param filename
-        * \return true on success
-        */
+     * uses default_dir param if no user dir is specified
+     * \param dir
+     * \param default_dir
+     * \return path
+     */
+    std::string GetUserBasedPath(std::string dir, std::string defaultDir);
+
+    /** Copy a file into the temporary folder.
+     * \param filename
+     * \return true on success
+     */
     bool CopyFileToTemp(std::string filename);
 
 private:
@@ -139,7 +139,7 @@ private:
     boost::property_tree::ptree m_propertyTree;
     bool m_profileNeedSave;
     std::string m_userDirectory;
-    bool m_useLocalDirectory;
+    bool m_useCurrentDirectory;
 };
 
 //! Global function to get profile instance