diff options
author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-13 02:01:20 +0100 |
---|---|---|
committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-13 02:01:20 +0100 |
commit | 742b76b006daf27ea19b2834e56696cb3c5a0e18 (patch) | |
tree | 58a08b0c8095561e6173a134e10e9894d4f0913f | |
parent | 35c176d435a7154a7bc3c646be9798e5a1ed3c28 (diff) |
auto format + made some functions const
-rw-r--r-- | src/core/common/Argument.cpp | 16 | ||||
-rw-r--r-- | src/core/common/Argument.hpp | 12 |
2 files changed, 18 insertions, 10 deletions
diff --git a/src/core/common/Argument.cpp b/src/core/common/Argument.cpp index 8face55..ac1edf4 100644 --- a/src/core/common/Argument.cpp +++ b/src/core/common/Argument.cpp @@ -48,7 +48,6 @@ Argument::Argument(std::string name, const RttiType &type) { } - Argument Argument::Any(std::string name) { return Argument{name, RttiTypes::None, RttiTypes::None, nullptr, false}; @@ -102,13 +101,15 @@ Argument Argument::String(std::string name, Argument Argument::Object(std::string name, const RttiType &type) { - return Argument(std::move(name), type, RttiTypes::None, Variant::fromObject(nullptr), false); + return Argument(std::move(name), type, RttiTypes::None, + Variant::fromObject(nullptr), false); } Argument Argument::Object(std::string name, const RttiType &type, std::nullptr_t) { - return Argument(std::move(name), type, RttiTypes::None, Variant::fromObject(nullptr), true); + return Argument(std::move(name), type, RttiTypes::None, + Variant::fromObject(nullptr), true); } Argument Argument::Function(std::string name) @@ -169,7 +170,7 @@ Argument Argument::Map(std::string name, const RttiType &innerType, true); } -bool Argument::validate(Variant &var, Logger &logger) +bool Argument::validate(Variant &var, Logger &logger) const { if (!VariantConverter::convert(var, type, innerType, logger, VariantConverter::Mode::SAFE)) { @@ -208,7 +209,7 @@ Arguments::Arguments(std::initializer_list<Argument> arguments) { } -bool Arguments::validateArray(Variant::arrayType &arr, Logger &logger) +bool Arguments::validateArray(Variant::arrayType &arr, Logger &logger) const { Logger nullLogger; @@ -251,7 +252,7 @@ bool Arguments::validateArray(Variant::arrayType &arr, Logger &logger) } bool Arguments::validateMap(Variant::mapType &map, Logger &logger, - bool ignoreUnknown) + bool ignoreUnknown) const { Logger nullLogger; @@ -271,7 +272,8 @@ bool Arguments::validateMap(Variant::mapType &map, Logger &logger, ok = ok && set[idx]; } else { if (ignoreUnknown) { - logger.note(std::string("Ignoring argument \"") + e.first + std::string("\"")); + logger.note(std::string("Ignoring argument \"") + e.first + + std::string("\"")); } else { logger.error(std::string("Unknown argument \"") + e.first + std::string("\"")); diff --git a/src/core/common/Argument.hpp b/src/core/common/Argument.hpp index 7227ddb..23078b2 100644 --- a/src/core/common/Argument.hpp +++ b/src/core/common/Argument.hpp @@ -380,7 +380,7 @@ public: * @param logger is the logger instance to which errors should be written. * @return true if the given variant was valid, false otherwise. */ - bool validate(Variant &var, Logger &logger); + bool validate(Variant &var, Logger &logger) const; }; /** @@ -401,6 +401,12 @@ private: std::unordered_map<std::string, size_t> names; public: + + /** + * Default constructor. Provides no arguments. + */ + Arguments() {}; + /** * Constructor of the Arguments class from a list of Argument instances. * @@ -422,7 +428,7 @@ public: * will be written. * @return true if the operation was successful, false if an error occured. */ - bool validateArray(Variant::arrayType &arr, Logger &logger); + bool validateArray(Variant::arrayType &arr, Logger &logger) const; /** * Checks whether the content of the given variant map matches the @@ -441,7 +447,7 @@ public: * @return true if the operation was successful, false if an error occured. */ bool validateMap(Variant::mapType &map, Logger &logger, - bool ignoreUnknown = false); + bool ignoreUnknown = false) const; }; } |