summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeandro Melo <leandro.melo@nokia.com>2010-06-21 16:22:53 +0200
committerLeandro Melo <leandro.melo@nokia.com>2010-06-21 16:22:53 +0200
commitaf185d1e41662243a73f169cc2c560c8d317b5bc (patch)
tree51ff57a18a06746bd5da3880d8781e4eac21da81
parent15faf23e07dc206215841cb87e10a95d89ee0c25 (diff)
downloadqt-creator-af185d1e41662243a73f169cc2c560c8d317b5bc.tar.gz
Generic highlighter: Satisfying coverity checks.
-rw-r--r--src/plugins/texteditor/generichighlighter/highlighter.cpp2
-rw-r--r--src/plugins/texteditor/generichighlighter/itemdata.cpp4
-rw-r--r--src/plugins/texteditor/generichighlighter/itemdata.h6
-rw-r--r--src/plugins/texteditor/generichighlighter/specificrules.cpp3
4 files changed, 10 insertions, 5 deletions
diff --git a/src/plugins/texteditor/generichighlighter/highlighter.cpp b/src/plugins/texteditor/generichighlighter/highlighter.cpp
index 9ec1046431..00f51ade2b 100644
--- a/src/plugins/texteditor/generichighlighter/highlighter.cpp
+++ b/src/plugins/texteditor/generichighlighter/highlighter.cpp
@@ -65,7 +65,7 @@ Highlighter::Highlighter(QTextDocument *parent) :
Highlighter::~Highlighter()
{}
-Highlighter::BlockData::BlockData() : m_foldingIndentDelta(0)
+Highlighter::BlockData::BlockData() : m_foldingIndentDelta(0), m_originalObservableState(-1)
{}
Highlighter::BlockData::~BlockData()
diff --git a/src/plugins/texteditor/generichighlighter/itemdata.cpp b/src/plugins/texteditor/generichighlighter/itemdata.cpp
index 65f6b7f2a3..5ceda54629 100644
--- a/src/plugins/texteditor/generichighlighter/itemdata.cpp
+++ b/src/plugins/texteditor/generichighlighter/itemdata.cpp
@@ -34,9 +34,13 @@ using namespace TextEditor;
using namespace Internal;
ItemData::ItemData() :
+ m_italic(false),
m_italicSpecified(false),
+ m_bold(false),
m_boldSpecified(false),
+ m_underlined(false),
m_underlinedSpecified(false),
+ m_strikedOut(false),
m_strikedOutSpecified(false),
m_isCustomized(false)
{}
diff --git a/src/plugins/texteditor/generichighlighter/itemdata.h b/src/plugins/texteditor/generichighlighter/itemdata.h
index 57b1f1a9e7..913d5af7d0 100644
--- a/src/plugins/texteditor/generichighlighter/itemdata.h
+++ b/src/plugins/texteditor/generichighlighter/itemdata.h
@@ -69,9 +69,6 @@ public:
bool isCustomized() const;
private:
- QString m_style;
- QColor m_color;
- QColor m_selectionColor;
bool m_italic;
bool m_italicSpecified;
bool m_bold;
@@ -81,6 +78,9 @@ private:
bool m_strikedOut;
bool m_strikedOutSpecified;
bool m_isCustomized;
+ QString m_style;
+ QColor m_color;
+ QColor m_selectionColor;
};
} // namespace Internal
diff --git a/src/plugins/texteditor/generichighlighter/specificrules.cpp b/src/plugins/texteditor/generichighlighter/specificrules.cpp
index 8a43f65b70..3e17e1ec35 100644
--- a/src/plugins/texteditor/generichighlighter/specificrules.cpp
+++ b/src/plugins/texteditor/generichighlighter/specificrules.cpp
@@ -215,7 +215,8 @@ bool RegExprRule::doMatchSucceed(const QString &text,
// Keyword
KeywordRule::KeywordRule(const QSharedPointer<HighlightDefinition> &definition) :
- m_overrideGlobal(false)
+ m_overrideGlobal(false),
+ m_localCaseSensitivity(Qt::CaseSensitive)
{
setDefinition(definition);
}