summaryrefslogtreecommitdiff
path: root/lib/common/Configuration.h
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2007-07-26 22:08:21 +0000
committerChris Wilson <chris+github@qwirx.com>2007-07-26 22:08:21 +0000
commit88edb51fc08aa8dfe1fed4c614343d1f2405dac9 (patch)
tree782403d864d9b68e50de9bf17aac821d6609b844 /lib/common/Configuration.h
parent273e5baec103e402d81004190413b3efd131716b (diff)
Make Configuration take a std::string filename instead of a char array,
in C++ style. (refs #3, merges [1684])
Diffstat (limited to 'lib/common/Configuration.h')
-rw-r--r--lib/common/Configuration.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/common/Configuration.h b/lib/common/Configuration.h
index 4c455b0f..64e7568e 100644
--- a/lib/common/Configuration.h
+++ b/lib/common/Configuration.h
@@ -69,8 +69,15 @@ public:
MultiValueSeparator = '\x01'
};
- static std::auto_ptr<Configuration> LoadAndVerify(const char *Filename, const ConfigurationVerify *pVerify, std::string &rErrorMsg);
- static std::auto_ptr<Configuration> Load(const char *Filename, std::string &rErrorMsg) { return LoadAndVerify(Filename, 0, rErrorMsg); }
+ static std::auto_ptr<Configuration> LoadAndVerify(
+ const std::string& rFilename,
+ const ConfigurationVerify *pVerify,
+ std::string &rErrorMsg);
+
+ static std::auto_ptr<Configuration> Load(
+ const std::string& rFilename,
+ std::string &rErrorMsg)
+ { return LoadAndVerify(rFilename, 0, rErrorMsg); }
bool KeyExists(const char *pKeyName) const;
const std::string &GetKeyValue(const char *pKeyName) const;