big batch of progress

[chaz/yoink] / src / settings.hh

diff --git a/src/settings.hh b/src/settings.hh
index 5cb09722bd43530aa48668eaa2f091b58fc35804..9c2f2d83eb21dcc00744f77cfde2d7d990121526 100644 (file)
--- 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: *************************************************/
+