Merge #10592: [trivial] fix indentation for ArgsManager class

7810993 [trivial] fix indentation for ArgsManager class (John Newbery)

Tree-SHA512: 3d24fa94ba49ad73383ca8077776492bd75f1c2158c835c1d55b4be4787f107c2de5336173e083a5585df21ef053614628fe4fe6ddf2c05df567177445661b7b
This commit is contained in:
MarcoFalke 2017-06-18 14:07:29 +02:00
commit e053e05c13
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
1 changed files with 51 additions and 50 deletions

View File

@ -187,62 +187,63 @@ public:
void ParseParameters(int argc, const char*const argv[]); void ParseParameters(int argc, const char*const argv[]);
void ReadConfigFile(const std::string& confPath); void ReadConfigFile(const std::string& confPath);
std::vector<std::string> GetArgs(const std::string& strArg); std::vector<std::string> GetArgs(const std::string& strArg);
/**
* Return true if the given argument has been manually set
*
* @param strArg Argument to get (e.g. "-foo")
* @return true if the argument has been set
*/
bool IsArgSet(const std::string& strArg);
/** /**
* Return string argument or default value * Return true if the given argument has been manually set
* *
* @param strArg Argument to get (e.g. "-foo") * @param strArg Argument to get (e.g. "-foo")
* @param default (e.g. "1") * @return true if the argument has been set
* @return command-line argument or default value */
*/ bool IsArgSet(const std::string& strArg);
std::string GetArg(const std::string& strArg, const std::string& strDefault);
/** /**
* Return integer argument or default value * Return string argument or default value
* *
* @param strArg Argument to get (e.g. "-foo") * @param strArg Argument to get (e.g. "-foo")
* @param default (e.g. 1) * @param default (e.g. "1")
* @return command-line argument (0 if invalid number) or default value * @return command-line argument or default value
*/ */
int64_t GetArg(const std::string& strArg, int64_t nDefault); std::string GetArg(const std::string& strArg, const std::string& strDefault);
/** /**
* Return boolean argument or default value * Return integer argument or default value
* *
* @param strArg Argument to get (e.g. "-foo") * @param strArg Argument to get (e.g. "-foo")
* @param default (true or false) * @param default (e.g. 1)
* @return command-line argument or default value * @return command-line argument (0 if invalid number) or default value
*/ */
bool GetBoolArg(const std::string& strArg, bool fDefault); int64_t GetArg(const std::string& strArg, int64_t nDefault);
/** /**
* Set an argument if it doesn't already have a value * Return boolean argument or default value
* *
* @param strArg Argument to set (e.g. "-foo") * @param strArg Argument to get (e.g. "-foo")
* @param strValue Value (e.g. "1") * @param default (true or false)
* @return true if argument gets set, false if it already had a value * @return command-line argument or default value
*/ */
bool SoftSetArg(const std::string& strArg, const std::string& strValue); bool GetBoolArg(const std::string& strArg, bool fDefault);
/** /**
* Set a boolean argument if it doesn't already have a value * Set an argument if it doesn't already have a value
* *
* @param strArg Argument to set (e.g. "-foo") * @param strArg Argument to set (e.g. "-foo")
* @param fValue Value (e.g. false) * @param strValue Value (e.g. "1")
* @return true if argument gets set, false if it already had a value * @return true if argument gets set, false if it already had a value
*/ */
bool SoftSetBoolArg(const std::string& strArg, bool fValue); bool SoftSetArg(const std::string& strArg, const std::string& strValue);
// Forces an arg setting. Called by SoftSetArg() if the arg hasn't already /**
// been set. Also called directly in testing. * Set a boolean argument if it doesn't already have a value
void ForceSetArg(const std::string& strArg, const std::string& strValue); *
* @param strArg Argument to set (e.g. "-foo")
* @param fValue Value (e.g. false)
* @return true if argument gets set, false if it already had a value
*/
bool SoftSetBoolArg(const std::string& strArg, bool fValue);
// Forces an arg setting. Called by SoftSetArg() if the arg hasn't already
// been set. Also called directly in testing.
void ForceSetArg(const std::string& strArg, const std::string& strValue);
}; };
extern ArgsManager gArgs; extern ArgsManager gArgs;