X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fsettings.hh;h=9c2f2d83eb21dcc00744f77cfde2d7d990121526;hp=5cb09722bd43530aa48668eaa2f091b58fc35804;hb=7d15b919681bb9ec0088b4b27c6abf62d6dfb9b1;hpb=0fffd0097d7b496454413e57b398c903ecc252e4

diff --git a/src/settings.hh b/src/settings.hh
index 5cb0972..9c2f2d8 100644
--- a/src/settings.hh
+++ b/src/settings.hh
@@ -51,7 +51,10 @@ public:
 	settings(int argc, char* argv[]);
 
 	void parseArgs(int argc, char* argv[]);
-	void loadFromFile(std::string filePath);
+
+	void loadFromFile(const std::string& filePath, bool precedence = false);
+	void loadFromFiles(const std::vector<std::string>& filePaths,
+			bool precedence = false);
 
 	template <typename T>
 	bool get(const std::string& key, T& value);
@@ -82,3 +85,5 @@ bool settings::get(const std::string& key, T& value)
 
 #endif // _SETTINGS_HH_
 
+/** vim: set ts=4 sw=4 tw=80: *************************************************/
+