diff options
Diffstat (limited to 'lib/common/Configuration.h')
-rw-r--r-- | lib/common/Configuration.h | 55 |
1 files changed, 12 insertions, 43 deletions
diff --git a/lib/common/Configuration.h b/lib/common/Configuration.h index 80b3614b..64e7568e 100644 --- a/lib/common/Configuration.h +++ b/lib/common/Configuration.h @@ -29,51 +29,20 @@ enum class ConfigurationVerifyKey { public: - typedef enum - { - NoDefaultValue = 1 - } NoDefaultValue_t; - - ConfigurationVerifyKey(std::string name, int flags, - void *testFunction = NULL); - // to allow passing ConfigurationVerifyKey::NoDefaultValue - // for default ListenAddresses - ConfigurationVerifyKey(std::string name, int flags, - NoDefaultValue_t t, void *testFunction = NULL); - ConfigurationVerifyKey(std::string name, int flags, - std::string defaultValue, void *testFunction = NULL); - ConfigurationVerifyKey(std::string name, int flags, - const char* defaultValue, void *testFunction = NULL); - ConfigurationVerifyKey(std::string name, int flags, - int defaultValue, void *testFunction = NULL); - ConfigurationVerifyKey(std::string name, int flags, - bool defaultValue, void *testFunction = NULL); - const std::string& Name() const { return mName; } - const std::string& DefaultValue() const { return mDefaultValue; } - const bool HasDefaultValue() const { return mHasDefaultValue; } - const int Flags() const { return mFlags; } - const void* TestFunction() const { return mTestFunction; } - ConfigurationVerifyKey(const ConfigurationVerifyKey& rToCopy); - -private: - ConfigurationVerifyKey& operator=(const ConfigurationVerifyKey& - noAssign); - - std::string mName; // "*" for all other keys (not implemented yet) - std::string mDefaultValue; // default for when it's not present - bool mHasDefaultValue; - int mFlags; - void *mTestFunction; // set to zero for now, will implement later + const char *mpName; // "*" for all other keys (not implemented yet) + const char *mpDefaultValue; // default for when it's not present + int Tests; + void *TestFunction; // set to zero for now, will implement later }; class ConfigurationVerify { public: - std::string mName; // "*" for all other sub config names + const char *mpName; // "*" for all other sub config names const ConfigurationVerify *mpSubConfigurations; const ConfigurationVerifyKey *mpKeys; int Tests; - void *TestFunction; // set to zero for now, will implement later + void *TestFunction; // set to zero for now, will implement later }; class FdGetLine; @@ -110,14 +79,14 @@ public: std::string &rErrorMsg) { return LoadAndVerify(rFilename, 0, rErrorMsg); } - bool KeyExists(const std::string& rKeyName) const; - const std::string &GetKeyValue(const std::string& rKeyName) const; - int GetKeyValueInt(const std::string& rKeyName) const; - bool GetKeyValueBool(const std::string& rKeyName) const; + bool KeyExists(const char *pKeyName) const; + const std::string &GetKeyValue(const char *pKeyName) const; + int GetKeyValueInt(const char *pKeyName) const; + bool GetKeyValueBool(const char *pKeyName) const; std::vector<std::string> GetKeyNames() const; - bool SubConfigurationExists(const std::string& rSubName) const; - const Configuration &GetSubConfiguration(const std::string& rSubName) const; + bool SubConfigurationExists(const char *pSubName) const; + const Configuration &GetSubConfiguration(const char *pSubName) const; std::vector<std::string> GetSubConfigurationNames() const; std::string mName; |