Gen. highlighter: Fix spelling

7 files changed, 26 insertions, 26 deletions

diff --git a/src/plugins/texteditor/generichighlighter/dynamicrule.cpp b/src/plugins/texteditor/generichighlighter/dynamicrule.cpp
index 6808bd4913..1f80e0dbc9 100644
--- a/src/plugins/texteditor/generichighlighter/dynamicrule.cpp
+++ b/src/plugins/texteditor/generichighlighter/dynamicrule.cpp
@@ -52,7 +52,7 @@ bool DynamicRule::isActive() const
 void DynamicRule::replaceExpressions(const QStringList &captures)
 {
     doReplaceExpressions(captures);
-    updateDynamicRules(childs(), captures);
+    updateDynamicRules(children(), captures);
 }
 
 namespace TextEditor {
diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp
index 522eab16c3..ea355775b4 100644
--- a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp
+++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp
@@ -273,7 +273,7 @@ void HighlightDefinitionHandler::itemDataElementStarted(const QXmlAttributes &at
     itemData->setItalic(atts.value(kItalic));
     itemData->setBold(atts.value(kBold));
     itemData->setUnderlined(atts.value(kUnderline));
-    itemData->setStrikedOut(atts.value(kStrikeout));
+    itemData->setStrikeOut(atts.value(kStrikeout));
 }
 
 void HighlightDefinitionHandler::commentElementStarted(const QXmlAttributes &atts) const
diff --git a/src/plugins/texteditor/generichighlighter/highlighter.cpp b/src/plugins/texteditor/generichighlighter/highlighter.cpp
index 361582ec83..5783285277 100644
--- a/src/plugins/texteditor/generichighlighter/highlighter.cpp
+++ b/src/plugins/texteditor/generichighlighter/highlighter.cpp
@@ -260,8 +260,8 @@ void Highlighter::iterateThroughRules(const QString &text,
                 createWillContinueBlock();
                 progress->setWillContinueLine(false);
             } else {
-                if (rule->hasChild())
-                    iterateThroughRules(text, length, progress, true, rule->childs());
+                if (rule->hasChildren())
+                    iterateThroughRules(text, length, progress, true, rule->children());
 
                 if (!rule->context().isEmpty() && contextChangeRequired(rule->context())) {
                     m_currentCaptures = progress->captures();
@@ -406,8 +406,8 @@ void Highlighter::applyFormat(int offset,
                     format.setFontWeight(toFontWeight(itemData->isBold()));
                 if (itemData->isUnderlinedSpecified())
                     format.setFontUnderline(itemData->isUnderlined());
-                if (itemData->isStrikedOutSpecified())
-                    format.setFontStrikeOut(itemData->isStrikedOut());
+                if (itemData->isStrikeOutSpecified())
+                    format.setFontStrikeOut(itemData->isStrikeOut());
             }
 
             setFormat(offset, count, format);
diff --git a/src/plugins/texteditor/generichighlighter/itemdata.cpp b/src/plugins/texteditor/generichighlighter/itemdata.cpp
index c5f809e506..dcd94a94fc 100644
--- a/src/plugins/texteditor/generichighlighter/itemdata.cpp
+++ b/src/plugins/texteditor/generichighlighter/itemdata.cpp
@@ -45,7 +45,7 @@ ItemData::ItemData() :
     m_underlined(false),
     m_underlinedSpecified(false),
     m_strikedOut(false),
-    m_strikedOutSpecified(false),
+    m_strikeOutSpecified(false),
     m_isCustomized(false)
 {}
 
@@ -122,20 +122,20 @@ bool ItemData::isUnderlined() const
 bool ItemData::isUnderlinedSpecified() const
 { return m_underlinedSpecified; }
 
-void ItemData::setStrikedOut(const QString &striked)
+void ItemData::setStrikeOut(const QString &strike)
 {
-    if (!striked.isEmpty()) {
-        m_strikedOut = toBool(striked);
-        m_strikedOutSpecified = true;
+    if (!strike.isEmpty()) {
+        m_strikedOut = toBool(strike);
+        m_strikeOutSpecified = true;
         m_isCustomized = true;
     }
 }
 
-bool ItemData::isStrikedOut() const
+bool ItemData::isStrikeOut() const
 { return m_strikedOut; }
 
-bool ItemData::isStrikedOutSpecified() const
-{ return m_strikedOutSpecified; }
+bool ItemData::isStrikeOutSpecified() const
+{ return m_strikeOutSpecified; }
 
 bool ItemData::isCustomized() const
 { return m_isCustomized; }
diff --git a/src/plugins/texteditor/generichighlighter/itemdata.h b/src/plugins/texteditor/generichighlighter/itemdata.h
index 5a10503717..e6470416ee 100644
--- a/src/plugins/texteditor/generichighlighter/itemdata.h
+++ b/src/plugins/texteditor/generichighlighter/itemdata.h
@@ -66,9 +66,9 @@ public:
     bool isUnderlined() const;
     bool isUnderlinedSpecified() const;
 
-    void setStrikedOut(const QString &striked);
-    bool isStrikedOut() const;
-    bool isStrikedOutSpecified() const;
+    void setStrikeOut(const QString &strike);
+    bool isStrikeOut() const;
+    bool isStrikeOutSpecified() const;
 
     bool isCustomized() const;
 
@@ -80,7 +80,7 @@ private:
     bool m_underlined;
     bool m_underlinedSpecified;
     bool m_strikedOut;
-    bool m_strikedOutSpecified;
+    bool m_strikeOutSpecified;
     bool m_isCustomized;
     QString m_style;
     QColor m_color;
diff --git a/src/plugins/texteditor/generichighlighter/rule.cpp b/src/plugins/texteditor/generichighlighter/rule.cpp
index 0c7e9bc182..c62168f8bf 100644
--- a/src/plugins/texteditor/generichighlighter/rule.cpp
+++ b/src/plugins/texteditor/generichighlighter/rule.cpp
@@ -120,13 +120,13 @@ int Rule::column() const
 { return m_column; }
 
 void Rule::addChild(const QSharedPointer<Rule> &rule)
-{ m_childRules.append(rule); }
+{ m_children.append(rule); }
 
-bool Rule::hasChild() const
-{ return !m_childRules.isEmpty(); }
+bool Rule::hasChildren() const
+{ return !m_children.isEmpty(); }
 
-const QList<QSharedPointer<Rule> > &Rule::childs() const
-{ return m_childRules; }
+const QList<QSharedPointer<Rule> > &Rule::children() const
+{ return m_children; }
 
 void Rule::setDefinition(const QSharedPointer<HighlightDefinition> &definition)
 { m_definition = definition; }
diff --git a/src/plugins/texteditor/generichighlighter/rule.h b/src/plugins/texteditor/generichighlighter/rule.h
index a14850ccf9..41f895eedf 100644
--- a/src/plugins/texteditor/generichighlighter/rule.h
+++ b/src/plugins/texteditor/generichighlighter/rule.h
@@ -72,8 +72,8 @@ public:
     int column() const;
 
     void addChild(const QSharedPointer<Rule> &rule);
-    const QList<QSharedPointer<Rule> > &childs() const;
-    bool hasChild() const;
+    const QList<QSharedPointer<Rule> > &children() const;
+    bool hasChildren() const;
 
     void setDefinition(const QSharedPointer<HighlightDefinition> &definition);
     const QSharedPointer<HighlightDefinition> &definition() const;
@@ -155,7 +155,7 @@ private:
     int m_column;
     bool m_consumesNonSpace;
 
-    QList<QSharedPointer<Rule> > m_childRules;
+    QList<QSharedPointer<Rule> > m_children;
 
     // Rules are represented within contexts. However, they have their own definition because
     // of externally included rules.