summaryrefslogtreecommitdiffstats
path: root/src/common/profile.h
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2014-08-12 20:03:56 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2014-08-12 20:58:55 +0200
commit74312b0405d6fb5ed75c675ceed471e1e5086f00 (patch)
tree96a3b40401ce5a4322bd069fd25be163d5d43270 /src/common/profile.h
parent4bdfa0aa4ee3ad00429e8d68823532bdb2d72a97 (diff)
downloadcolobot-74312b0405d6fb5ed75c675ceed471e1e5086f00.tar.gz
colobot-74312b0405d6fb5ed75c675ceed471e1e5086f00.tar.bz2
colobot-74312b0405d6fb5ed75c675ceed471e1e5086f00.zip
Better CMake organization and unit test cleanups
* created a static library containing most source modules to avoid compiling source modules twice in code and unit tests * moved profile_test to main unit tests executable * removed image_test and edit_test as not really useful
Diffstat (limited to 'src/common/profile.h')
-rw-r--r--src/common/profile.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/common/profile.h b/src/common/profile.h
index f084ece..52f9f15 100644
--- a/src/common/profile.h
+++ b/src/common/profile.h
@@ -45,6 +45,9 @@ public:
CProfile();
virtual ~CProfile();
+ /** Set flag to force using ini file from local directory */
+ void SetUseLocalDirectory(bool useLocalDirectory);
+
/** Loads colobot.ini from current directory
* \return return true on success
*/
@@ -130,9 +133,13 @@ public:
bool CopyFileToTemp(std::string filename);
private:
+ std::string GetIniFileLocation();
+
+private:
boost::property_tree::ptree m_propertyTree;
bool m_profileNeedSave;
std::string m_userDirectory;
+ bool m_useLocalDirectory;
};
//! Global function to get profile instance