testclass.cpp: adjustments after Preprocessor was added by another PR

Author: firewave

test/testclass.cpp

@@ -259,9 +259,9 @@ class TestClass : public TestFixture {
     void checkCopyCtorAndEqOperator_(const char code[], const char* file, int line) {
         // Clear the error log
         errout.str("");
-        static const Settings settings = settingsBuilder().severity(Severity::warning).build();
+        Settings settings = settingsBuilder().severity(Severity::warning).build();
 
-        Preprocessor preprocessor(settings, settings.nomsg, nullptr);
+        Preprocessor preprocessor(settings, settings.nomsg);
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this, &preprocessor);
@@ -2886,7 +2886,7 @@ class TestClass : public TestFixture {
 
 #define checkNoMemset(...) checkNoMemset_(__FILE__, __LINE__, __VA_ARGS__)
     void checkNoMemset_(const char* file, int line, const char code[]) {
-        static const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability).build();
+        Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability).build();
         checkNoMemset_(file, line, code, settings);
     }
 
@@ -3150,7 +3150,7 @@ class TestClass : public TestFixture {
                       errout.str());
 
         // #1655
-        static const Settings s = settingsBuilder().library("std.cfg").build();
+        Settings s = settingsBuilder().library("std.cfg").build();
         checkNoMemset("void f() {\n"
                       "    char c[] = \"abc\";\n"
                       "    std::string s;\n"
@@ -7279,9 +7279,9 @@ class TestClass : public TestFixture {
         errout.str("");
 
         // Check..
-        static const Settings settings = settingsBuilder().severity(Severity::performance).build();
+        Settings settings = settingsBuilder().severity(Severity::performance).build();
 
-        Preprocessor preprocessor(settings, settings.nomsg, nullptr);
+        Preprocessor preprocessor(settings, settings.nomsg);
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this, &preprocessor);
@@ -7960,9 +7960,9 @@ class TestClass : public TestFixture {
         // Clear the error log
         errout.str("");
 
-        static const Settings settings = settingsBuilder().severity(Severity::style).build();
+        Settings settings = settingsBuilder().severity(Severity::style).build();
 
-        Preprocessor preprocessor(settings, settings.nomsg, nullptr);
+        Preprocessor preprocessor(settings, settings.nomsg);
 
         // Tokenize..
         Tokenizer tokenizer(&settings, this, &preprocessor);