From a381170886290175198fe9d893e4c333eb750aae Mon Sep 17 00:00:00 2001
From: Zachary Blair <ack_blair@outlook.com>
Date: Wed, 26 Jun 2013 00:47:02 -0700
Subject: [PATCH] Fixed #4874 (Minor spelling corrections)

---
 gui/resultstree.cpp       | 2 +-
 lib/preprocessor.cpp      | 2 +-
 lib/symboldatabase.cpp    | 2 +-
 test/testother.cpp        | 4 ++--
 test/testpreprocessor.cpp | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
index efaba842d..8ee1bfc31 100644
--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@@ -998,7 +998,7 @@ void ResultsTree::RefreshFilePaths(QStandardItem *item)
                 if (!child) {
                     continue;
                 }
-                //Get childs's user data
+                //Get child's user data
                 QVariant child_userdata = child->data();
                 //Convert it to QVariantMap
                 QVariantMap child_data = child_userdata.toMap();
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index 06929c7e0..518b9ac00 100644
--- a/lib/preprocessor.cpp
+++ b/lib/preprocessor.cpp
@@ -2736,7 +2736,7 @@ void Preprocessor::validateCfgError(const std::string &cfg, const std::string &m
     loc.line = 1;
     loc.setfile(file0);
     locationList.push_back(loc);
-    ErrorLogger::ErrorMessage errmsg(locationList, Severity::information, "Skipping configuration '" + cfg + "' since the value of '" + macro + "' is unknown. Use -D if you want to check it. You can use -U to skip it explictly.", id, false);
+    ErrorLogger::ErrorMessage errmsg(locationList, Severity::information, "Skipping configuration '" + cfg + "' since the value of '" + macro + "' is unknown. Use -D if you want to check it. You can use -U to skip it explicitly.", id, false);
     _errorLogger->reportInfo(errmsg);
 }
 
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index a50d29c73..d1ac96f2b 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -1924,7 +1924,7 @@ void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *s
                 break;
         }
 
-        // count deafult arguments
+        // count default arguments
         for (const Token* tok = argDef->next(); tok && tok != argDef->link(); tok = tok->next()) {
             if (tok->str() == "=")
                 initArgCount++;
diff --git a/test/testother.cpp b/test/testother.cpp
index b02c47198..c0c8a7d8f 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -5371,7 +5371,7 @@ private:
         TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Memory pointed to by 'p' is freed twice.\n", "", errout.str());
 
         check(
-            "void MyFuction()\n"
+            "void MyFunction()\n"
             "{\n"
             "    char* data; data = new char[100];\n"
             "    try\n"
@@ -5393,7 +5393,7 @@ private:
         ASSERT_EQUALS("", errout.str());
 
         check(
-            "void MyFuction()\n"
+            "void MyFunction()\n"
             "{\n"
             "    char* data; data = new char[100];\n"
             "    try\n"
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
index b6d8eef86..f781cbe0f 100644
--- a/test/testpreprocessor.cpp
+++ b/test/testpreprocessor.cpp
@@ -3837,7 +3837,7 @@ private:
         settings.addEnabled("all");
         preprocessor.setFile0("test.c");
         ASSERT_EQUALS(false, preprocessor.validateCfg("int a=A;", "A"));
-        ASSERT_EQUALS("[test.c:1]: (information) Skipping configuration 'A' since the value of 'A' is unknown. Use -D if you want to check it. You can use -U to skip it explictly.\n", errout.str());
+        ASSERT_EQUALS("[test.c:1]: (information) Skipping configuration 'A' since the value of 'A' is unknown. Use -D if you want to check it. You can use -U to skip it explicitly.\n", errout.str());
     }
 
     void if_sizeof() { // #4071