astyle formatting

danmar · danmar · commit 13ed2effa128 · 2020-12-22T08:09:51.000+01:00
[ci skip]
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -2454,9 +2454,9 @@ void CheckClass::checkDuplInheritedMembersRecursive(const Type* typeCurrent, con
             for (const Variable &parentClassVarIt : parentClassIt.type->classScope->varlist) {
                 if (classVarIt.name() == parentClassVarIt.name() && !parentClassVarIt.isPrivate()) { // Check if the class and its parent have a common variable
                     duplInheritedMembersError(classVarIt.nameToken(), parentClassVarIt.nameToken(),
-                                                typeCurrent->name(), parentClassIt.type->name(), classVarIt.name(),
-                                                typeCurrent->classScope->type == Scope::eStruct,
-                                                parentClassIt.type->classScope->type == Scope::eStruct);
+                                              typeCurrent->name(), parentClassIt.type->name(), classVarIt.name(),
+                                              typeCurrent->classScope->type == Scope::eStruct,
+                                              parentClassIt.type->classScope->type == Scope::eStruct);
                 }
             }
         }
diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -567,9 +567,9 @@ class TestClass : public TestFixture {
                                   "        int j;\n"
                                   "};\n"
                                   "class Derived2 : public Derived1 {\n"
-                                  "    int i;\n"  
+                                  "    int i;\n"
                                   "};");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:10]: (warning) The class 'Derived2' defines member variable with name 'i' also defined in its parent class 'Base'.\n", errout.str());        
+        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:10]: (warning) The class 'Derived2' defines member variable with name 'i' also defined in its parent class 'Base'.\n", errout.str());
 
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2454,9 +2454,9 @@ void CheckClass::checkDuplInheritedMembersRecursive(const Type* typeCurrent, con`
`2454`	`2454`	`for (const Variable &parentClassVarIt : parentClassIt.type->classScope->varlist) {`
`2455`	`2455`	`if (classVarIt.name() == parentClassVarIt.name() && !parentClassVarIt.isPrivate()) { // Check if the class and its parent have a common variable`
`2456`	`2456`	`duplInheritedMembersError(classVarIt.nameToken(), parentClassVarIt.nameToken(),`
`2457`		`- typeCurrent->name(), parentClassIt.type->name(), classVarIt.name(),`
`2458`		`- typeCurrent->classScope->type == Scope::eStruct,`
`2459`		`- parentClassIt.type->classScope->type == Scope::eStruct);`
	`2457`	`+ typeCurrent->name(), parentClassIt.type->name(), classVarIt.name(),`
	`2458`	`+ typeCurrent->classScope->type == Scope::eStruct,`
	`2459`	`+ parentClassIt.type->classScope->type == Scope::eStruct);`
`2460`	`2460`	`}`
`2461`	`2461`	`}`
`2462`	`2462`	`}`