kevinchengshellcode
diff --git a/‎lib/cppcheck.cpp‎
Lines changed: 2 additions & 2 deletions b/‎lib/cppcheck.cpp‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎lib/preprocessor.cpp‎
Lines changed: 114 additions & 126 deletions b/‎lib/preprocessor.cpp‎
Lines changed: 114 additions & 126 deletions
diff --git a/‎lib/preprocessor.h‎
Lines changed: 2 additions & 2 deletions b/‎lib/preprocessor.h‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎test/testmemleak.cpp‎
Lines changed: 2 additions & 2 deletions b/‎test/testmemleak.cpp‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎test/testother.cpp‎
Lines changed: 2 additions & 2 deletions b/‎test/testother.cpp‎
Lines changed: 2 additions & 2 deletions
@@ -154,7 +154,7 @@ unsigned int CppCheck::processFile(const std::string& filename, std::istream& fi
 
     bool internalErrorFound(false);
     try {
-        Preprocessor preprocessor(&_settings, this);
+        Preprocessor preprocessor(_settings, this);
         std::list<std::string> configurations;
         std::string filedata;
 
@@ -289,7 +289,7 @@ void CppCheck::internalError(const std::string &filename, const std::string &msg
 void CppCheck::analyseFile(std::istream &fin, const std::string &filename)
 {
     // Preprocess file..
-    Preprocessor preprocessor(&_settings, this);
+    Preprocessor preprocessor(_settings, this);
     std::list<std::string> configurations;
     std::string filedata;
     preprocessor.preprocess(fin, filedata, configurations, filename, _settings._includePaths);
 
@@ -54,7 +54,7 @@ class CPPCHECKLIB Preprocessor {
     /** character that is inserted in expanded macros */
     static char macroChar;
 
-    Preprocessor(Settings *settings = nullptr, ErrorLogger *errorLogger = nullptr);
+    Preprocessor(Settings& settings, ErrorLogger *errorLogger = nullptr);
 
     static bool missingIncludeFlag;
     static bool missingSystemIncludeFlag;
@@ -268,7 +268,7 @@ class CPPCHECKLIB Preprocessor {
      */
     void handleIncludes(std::string &code, const std::string &filePath, const std::list<std::string> &includePaths);
 
-    Settings *_settings;
+    Settings& _settings;
     ErrorLogger *_errorLogger;
 
     /** filename for cpp/c file - useful when reporting errors */
 
@@ -6453,7 +6453,7 @@ class TestMemleakGLib : public TestFixture {
         errout.str("");
 
         // Preprocess...
-        Preprocessor preprocessor(&settings, this);
+        Preprocessor preprocessor(settings, this);
         std::istringstream istrpreproc(code);
         std::map<std::string, std::string> actual;
         preprocessor.preprocess(istrpreproc, actual, "test.c");
@@ -6507,7 +6507,7 @@ class TestMemleakWindows : public TestFixture {
         errout.str("");
 
         // Preprocess...
-        Preprocessor preprocessor(&settings, this);
+        Preprocessor preprocessor(settings, this);
         std::istringstream istrpreproc(code);
         std::map<std::string, std::string> actual;
         preprocessor.preprocess(istrpreproc, actual, "test.c");
 
@@ -183,7 +183,7 @@ class TestOther : public TestFixture {
         settings->experimental = experimental;
 
         // Preprocess file..
-        Preprocessor preprocessor(settings);
+        Preprocessor preprocessor(*settings);
         std::list<std::string> configurations;
         std::string filedata = "";
         std::istringstream fin(raw_code);
@@ -237,7 +237,7 @@ class TestOther : public TestFixture {
 
         // Preprocess file..
         SimpleSuppressor logger(settings, this);
-        Preprocessor preprocessor(&settings, &logger);
+        Preprocessor preprocessor(settings, &logger);
         std::list<std::string> configurations;
         std::string filedata = "";
         std::istringstream fin(precode);