From e4d52d9afbf6aeb090b225cc4852936dd3be5017 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Tue, 12 Aug 2014 21:24:33 +0200
Subject: CProfile refactoring

---
 src/common/profile.cpp | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/common/profile.cpp')

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();
-- 
cgit v1.2.3-1-g7c22