diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp index 1ca332852..a6f0de833 100644 --- a/lib/checkclass.cpp +++ b/lib/checkclass.cpp @@ -551,8 +551,8 @@ void CheckClass::initializationListUsage() void CheckClass::suggestInitializationList(const Token* tok, const std::string& varname) { - reportError(tok, Severity::performance, "useInitializationList", "Variable '" + varname + "' is assigned in constructor body. Consider to perform initalization in initialization list.\n" - "When an object of a class is created, the constructors of all member variables are called consecutivly " + reportError(tok, Severity::performance, "useInitializationList", "Variable '" + varname + "' is assigned in constructor body. Consider performing initialization in initialization list.\n" + "When an object of a class is created, the constructors of all member variables are called consecutively " "in the order the variables are declared, even if you don't explicitly write them to the initialization list. You " "could avoid assigning '" + varname + "' a value by passing the value to the constructor in the initialization list."); } diff --git a/lib/checkclass.h b/lib/checkclass.h index 796fba57d..306a76f9a 100644 --- a/lib/checkclass.h +++ b/lib/checkclass.h @@ -160,8 +160,8 @@ private: "* 'operator=' should return reference to self\n" "* 'operator=' should check for assignment to self\n" "* Constness for member functions\n" - "* Order of initalizations\n" - "* Suggest usage of initalization list\n" + "* Order of initializations\n" + "* Suggest usage of initialization list\n" "* Suspicious subtraction from 'this'\n"; } diff --git a/test/testclass.cpp b/test/testclass.cpp index 1b880a395..1ff5376f1 100644 --- a/test/testclass.cpp +++ b/test/testclass.cpp @@ -5127,27 +5127,27 @@ private: " std::string s;\n" " Fred() { a = 0; s = \"foo\"; }\n" "};"); - ASSERT_EQUALS("[test.cpp:3]: (performance) Variable 's' is assigned in constructor body. Consider to perform initalization in initialization list.\n", errout.str()); + ASSERT_EQUALS("[test.cpp:3]: (performance) Variable 's' is assigned in constructor body. Consider performing initialization in initialization list.\n", errout.str()); checkInitializationListUsage("class Fred {\n" " std::vector v;\n" " Fred() { v = unknown; }\n" "};"); - ASSERT_EQUALS("[test.cpp:3]: (performance) Variable 'v' is assigned in constructor body. Consider to perform initalization in initialization list.\n", errout.str()); + ASSERT_EQUALS("[test.cpp:3]: (performance) Variable 'v' is assigned in constructor body. Consider performing initialization in initialization list.\n", errout.str()); checkInitializationListUsage("class C { std::string s; };\n" "class Fred {\n" " C c;\n" " Fred() { c = unknown; }\n" "};"); - ASSERT_EQUALS("[test.cpp:4]: (performance) Variable 'c' is assigned in constructor body. Consider to perform initalization in initialization list.\n", errout.str()); + ASSERT_EQUALS("[test.cpp:4]: (performance) Variable 'c' is assigned in constructor body. Consider performing initialization in initialization list.\n", errout.str()); checkInitializationListUsage("class C;\n" "class Fred {\n" " C c;\n" " Fred() { c = unknown; }\n" "};"); - ASSERT_EQUALS("[test.cpp:4]: (performance) Variable 'c' is assigned in constructor body. Consider to perform initalization in initialization list.\n", errout.str()); + ASSERT_EQUALS("[test.cpp:4]: (performance) Variable 'c' is assigned in constructor body. Consider performing initialization in initialization list.\n", errout.str()); checkInitializationListUsage("class C;\n" "class Fred {\n" @@ -5173,7 +5173,7 @@ private: checkInitializationListUsage("class C;\n" "class Fred {\n" " C a; int b;\n" - " Fred() : b(5) { a = b; }\n" // Don't issue a message here: You actually could move it to the initalization list, but it would cause problems if you change the order of the variable declarations. + " Fred() : b(5) { a = b; }\n" // Don't issue a message here: You actually could move it to the initialization list, but it would cause problems if you change the order of the variable declarations. "};"); ASSERT_EQUALS("", errout.str()); @@ -5201,7 +5201,7 @@ private: " std::string a;\n" " Fred() { a = foo(); }\n" "};"); - ASSERT_EQUALS("[test.cpp:3]: (performance) Variable 'a' is assigned in constructor body. Consider to perform initalization in initialization list.\n", errout.str()); + ASSERT_EQUALS("[test.cpp:3]: (performance) Variable 'a' is assigned in constructor body. Consider performing initialization in initialization list.\n", errout.str()); } };