CmdLineParser: small interface cleanup

Author: firewave

cli/cmdlineparser.cpp

@@ -191,7 +191,7 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
     }
 
     // Output a warning for the user if he tries to exclude headers
-    const std::vector<std::string>& ignored = getIgnoredPaths();
+    const std::vector<std::string>& ignored = mIgnoredPaths;
     const bool warn = std::any_of(ignored.cbegin(), ignored.cend(), [](const std::string& i) {
         return Path::isHeader(i);
     });
@@ -200,8 +200,8 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
         mLogger.printMessage("Please use --suppress for ignoring results from the header files.");
     }
 
-    const std::vector<std::string>& pathnamesRef = getPathNames();
-    const std::list<FileSettings>& fileSettingsRef = getFileSettings();
+    const std::vector<std::string>& pathnamesRef = mPathNames;
+    const std::list<FileSettings>& fileSettingsRef = mFileSettings;
 
     // the inputs can only be used exclusively - CmdLineParser should already handle this
     assert(!(!pathnamesRef.empty() && !fileSettingsRef.empty()));

cli/cmdlineparser.h

@@ -80,19 +80,6 @@ class CmdLineParser {
     static std::list<FileWithDetails> filterFiles(const std::vector<std::string>& fileFilters,
                                                   const std::list<FileWithDetails>& filesResolved);
 
-    /**
-     * Parse given command line.
-     * @return true if command line was ok, false if there was an error.
-     */
-    Result parseFromArgs(int argc, const char* const argv[]);
-
-    /**
-     * Return the path names user gave to command line.
-     */
-    const std::vector<std::string>& getPathNames() const {
-        return mPathNames;
-    }
-
     /**
      * Return the files user gave to command line.
      */
@@ -107,6 +94,14 @@ class CmdLineParser {
         return mFileSettings;
     }
 
+private:
+    /**
+     * Return the path names user gave to command line.
+     */
+    const std::vector<std::string>& getPathNames() const {
+        return mPathNames;
+    }
+
     /**
      * Return a list of paths user wants to ignore.
      */
@@ -119,14 +114,17 @@ class CmdLineParser {
      */
     std::string getVersion() const;
 
-protected:
-
     /**
      * Print help text to the console.
      */
     void printHelp() const;
 
-private:
+    /**
+     * Parse given command line.
+     * @return true if command line was ok, false if there was an error.
+     */
+    Result parseFromArgs(int argc, const char* const argv[]);
+
     bool isCppcheckPremium() const;
 
     template<typename T>