Martchus
/
cpp-utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make argv const

This commit is contained in:
Martchus 2016-06-17 17:55:09 +02:00
parent 757b539b95
commit a3648963ee
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/argumentparser.cpp
View File

@ -363,7 +363,7 @@ Argument *ArgumentParser::findArg(const ArgumentVector &arguments, const Argumen
* \throws Throws Failure if the specified arguments violate the constraints defined
* by the Argument instances.
*/
void ArgumentParser::parseArgs(int argc, const char *argv[])
void ArgumentParser::parseArgs(int argc, const char *const *argv)
{
IF_DEBUG_BUILD(verifyArgs(m_mainArgs);)
m_actualArgc = 0;
@ -431,7 +431,7 @@ void ApplicationUtilities::ArgumentParser::verifyArgs(const ArgumentVector &args
* \brief Reads the specified commands line arguments.
* \remarks Results are stored in Argument instances added as main arguments and sub arguments.
*/
void ArgumentParser::readSpecifiedArgs(ArgumentVector &args, std::size_t &index, const char **&argv, const char **end, unsigned int level)
void ArgumentParser::readSpecifiedArgs(ArgumentVector &args, std::size_t &index, const char *const *&argv, const char *const *end, unsigned int level)
{
enum ArgumentDenotationType : unsigned char {
Value = 0, // parameter value

13
application/argumentparser.h
View File

@ -519,8 +519,7 @@ public:
void printHelp(std::ostream &os) const;
Argument *findArg(const ArgumentPredicate &predicate) const;
static Argument *findArg(const ArgumentVector &arguments, const ArgumentPredicate &predicate);
void parseArgs(int argc, char *argv[]);
void parseArgs(int argc, const char *argv[]);
void parseArgs(int argc, const char *const *argv);
unsigned int actualArgumentCount() const;
const char *executable() const;
bool areUnknownArgumentsIgnored() const;
@ -530,7 +529,7 @@ public:
private:
IF_DEBUG_BUILD(void verifyArgs(const ArgumentVector &args);)
void readSpecifiedArgs(ArgumentVector &args, std::size_t &index, const char **&argv, const char **end, unsigned int level = 0);
void readSpecifiedArgs(ArgumentVector &args, std::size_t &index, const char *const *&argv, const char *const *end, unsigned int level = 0);
void checkConstraints(const ArgumentVector &args);
void invokeCallbacks(const ArgumentVector &args);
@ -550,14 +549,6 @@ inline const ArgumentVector &ArgumentParser::mainArguments() const
return m_mainArgs;
}
/*!
* \brief Parses the specified command line arguments.
*/
inline void ArgumentParser::parseArgs(int argc, char *argv[])
{
parseArgs(argc, const_cast<const char **>(argv));
}
/*!
* \brief Returns the actual number of arguments that could be found when parsing.
*/