removed need for friend declaration of test class in CmdLineParser / cleanups (#7896)

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

@@ -47,7 +47,6 @@ class Library;
  * class internal options.
  */
 class CmdLineParser {
-    friend class TestCmdlineParser;
 public:
     /**
      * The constructor.
@@ -80,19 +79,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,26 +93,24 @@ class CmdLineParser {
         return mFileSettings;
     }
 
+protected:
     /**
-     * Return a list of paths user wants to ignore.
+     * Parse given command line.
+     * @return true if command line was ok, false if there was an error.
      */
-    const std::vector<std::string>& getIgnoredPaths() const {
-        return mIgnoredPaths;
-    }
+    Result parseFromArgs(int argc, const char* const argv[]);
 
     /**
      * Get Cppcheck version
      */
     std::string getVersion() const;
 
-protected:
-
+private:
     /**
      * Print help text to the console.
      */
     void printHelp() const;
 
-private:
     bool isCppcheckPremium() const;
 
     template<typename T>
@@ -168,19 +152,21 @@ class CmdLineParser {
 
     bool loadCppcheckCfg();
 
+    void outputFormatOptionMixingError() const;
+
     CmdLineLogger &mLogger;
 
+    Settings &mSettings;
+    Suppressions &mSuppressions;
+
+protected:
     std::vector<std::string> mPathNames;
     std::list<FileWithDetails> mFiles;
     std::list<FileSettings> mFileSettings;
     std::vector<std::string> mIgnoredPaths;
-    Settings &mSettings;
-    Suppressions &mSuppressions;
     bool mAnalyzeAllVsConfigsSetOnCmdLine = false;
     /** @brief Name of the language that is enforced. Empty per default. */
     Standards::Language mEnforcedLang{Standards::Language::None};
-
-    void outputFormatOptionMixingError() const;
 };
 
 /// @}