1

cli/cmdlineparser.cpp

@@ -474,6 +474,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
                     _ignoredPaths.push_back(path);
                 }
             }
+
             // --library
             else if (std::strncmp(argv[i], "--library=", 10) == 0) {
                 if (!CppCheckExecutor::tryLoadLibrary(_settings->library, argv[0], argv[i]+10))

cli/threadexecutor.h

@@ -23,7 +23,7 @@
 #include <string>
 #include <list>
 #include "errorlogger.h"
-#include "settings.h" // Project::FileSettings
+#include "project.h"
 
 #if (defined(__GNUC__) || defined(__sun)) && !defined(__MINGW32__)
 #define THREADING_MODEL_FORK

lib/platform.h

@@ -27,9 +27,7 @@
 /// @{
 
 /**
-* @brief This is just a container for general settings so that we don't need
-* to pass individual values to functions or constructors now or in the
-* future when we might have even more detailed settings.
+* @brief Platform settings
 */
 struct CPPCHECKLIB Platform {
 public:

lib/project.h

@@ -32,15 +32,11 @@
 
 
 /**
- * @brief This is just a container for general settings so that we don't need
- * to pass individual values to functions or constructors now or in the
- * future when we might have even more detailed settings.
+ * @brief Project settings.
  */
 class CPPCHECKLIB Project {
 public:
-
-
-    /** File */
+    /** File settings. Multiple configurations for a file is allowed. */
     struct FileSettings {
         FileSettings() : platformType(Platform::Unspecified) {}
         std::string filename;

lib/settings.cpp

@@ -19,8 +19,6 @@
 #include "settings.h"
 #include "preprocessor.h"       // Preprocessor
 #include "utils.h"
-#include "path.h"
-#include "tokenlist.h"
 
 #include <fstream>
 #include <set>