test/options: Rename member variables (cppcheck-opensource#1720)

rikardfalkeborn · danmar · commit d49fe421e881 · 2019-03-03T07:42:14.000+01:00
diff --git a/test/options.cpp b/test/options.cpp
@@ -19,30 +19,30 @@
 #include <iterator>
 
 options::options(int argc, const char* const argv[])
-    :_options(argv + 1, argv + argc)
-    ,_which_test("")
-    ,_quiet(_options.count("-q") != 0)
-    ,_help(_options.count("-h") != 0 || _options.count("--help"))
+    :mOptions(argv + 1, argv + argc)
+    ,mWhichTest("")
+    ,mQuiet(mOptions.count("-q") != 0)
+    ,mHelp(mOptions.count("-h") != 0 || mOptions.count("--help"))
 {
-    _options.erase("-q");
-    _options.erase("-h");
-    _options.erase("--help");
-    if (! _options.empty()) {
-        _which_test = *_options.rbegin();
+    mOptions.erase("-q");
+    mOptions.erase("-h");
+    mOptions.erase("--help");
+    if (! mOptions.empty()) {
+        mWhichTest = *mOptions.rbegin();
     }
 }
 
 bool options::quiet() const
 {
-    return _quiet;
+    return mQuiet;
 }
 
 bool options::help() const
 {
-    return _help;
+    return mHelp;
 }
 
 const std::string& options::which_test() const
 {
-    return _which_test;
+    return mWhichTest;
 }
diff --git a/test/options.h b/test/options.h
@@ -42,10 +42,10 @@ class options {
     const options& operator =(const options& non_assign);
 
 private:
-    std::set<std::string> _options;
-    std::string _which_test;
-    const bool _quiet;
-    const bool _help;
+    std::set<std::string> mOptions;
+    std::string mWhichTest;
+    const bool mQuiet;
+    const bool mHelp;
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -19,30 +19,30 @@`
`19`	`19`	`#include <iterator>`
`20`	`20`
`21`	`21`	`options::options(int argc, const char* const argv[])`
`22`		`- :_options(argv + 1, argv + argc)`
`23`		`- ,_which_test("")`
`24`		`- ,_quiet(_options.count("-q") != 0)`
`25`		`- ,_help(_options.count("-h") != 0 \|\| _options.count("--help"))`
	`22`	`+ :mOptions(argv + 1, argv + argc)`
	`23`	`+ ,mWhichTest("")`
	`24`	`+ ,mQuiet(mOptions.count("-q") != 0)`
	`25`	`+ ,mHelp(mOptions.count("-h") != 0 \|\| mOptions.count("--help"))`
`26`	`26`	`{`
`27`		`- _options.erase("-q");`
`28`		`- _options.erase("-h");`
`29`		`- _options.erase("--help");`
`30`		`- if (! _options.empty()) {`
`31`		`- _which_test = *_options.rbegin();`
	`27`	`+ mOptions.erase("-q");`
	`28`	`+ mOptions.erase("-h");`
	`29`	`+ mOptions.erase("--help");`
	`30`	`+ if (! mOptions.empty()) {`
	`31`	`+ mWhichTest = *mOptions.rbegin();`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`bool options::quiet() const`
`36`	`36`	`{`
`37`		`- return _quiet;`
	`37`	`+ return mQuiet;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`bool options::help() const`
`41`	`41`	`{`
`42`		`- return _help;`
	`42`	`+ return mHelp;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`const std::string& options::which_test() const`
`46`	`46`	`{`
`47`		`- return _which_test;`
	`47`	`+ return mWhichTest;`
`48`	`48`	`}`