summaryrefslogtreecommitdiff
path: root/src/plugins/texteditor
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@theqtcompany.com>2015-08-31 16:28:26 +0200
committerMarco Bubke <marco.bubke@theqtcompany.com>2015-08-31 14:59:16 +0000
commitb278dc87ca8662ff98aeabc03ed4293021aab955 (patch)
tree4589ec81eb345979f52fd1fc7a293d4b0ea177d1 /src/plugins/texteditor
parent8dfa9a5dab144797e446b09979be98642403259a (diff)
downloadqt-creator-b278dc87ca8662ff98aeabc03ed4293021aab955.tar.gz
Clang: Add diagnostics
Diagnostics are now moved to the clang backend process. Fixits are supported too. Change-Id: I20faacf466bbf78dec479220c3d7b336a47bc453 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src/plugins/texteditor')
-rw-r--r--src/plugins/texteditor/fontsettings.cpp2
-rw-r--r--src/plugins/texteditor/textmark.cpp14
-rw-r--r--src/plugins/texteditor/textmark.h2
3 files changed, 17 insertions, 1 deletions
diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp
index daf50dc565..ef8933ac62 100644
--- a/src/plugins/texteditor/fontsettings.cpp
+++ b/src/plugins/texteditor/fontsettings.cpp
@@ -170,7 +170,7 @@ QTextCharFormat FontSettings::toTextCharFormat(TextStyle category) const
}
if (category == C_OCCURRENCES_UNUSED) {
- tf.setUnderlineStyle(QTextCharFormat::WaveUnderline);
+ tf.setUnderlineStyle(QTextCharFormat::SingleUnderline);
tf.setUnderlineColor(f.foreground());
tf.setToolTip(QCoreApplication::translate("FontSettings_C_OCCURRENCES_UNUSED",
"Unused variable"));
diff --git a/src/plugins/texteditor/textmark.cpp b/src/plugins/texteditor/textmark.cpp
index 7525c1a990..e3a692e735 100644
--- a/src/plugins/texteditor/textmark.cpp
+++ b/src/plugins/texteditor/textmark.cpp
@@ -65,6 +65,20 @@ TextMark::~TextMark()
m_baseTextDocument = 0;
}
+TextMark::TextMark(TextMark &&other)
+ : m_baseTextDocument(std::move(other.m_baseTextDocument)),
+ m_fileName(std::move(other.m_fileName)),
+ m_lineNumber(std::move(other.m_lineNumber)),
+ m_priority(std::move(other.m_priority)),
+ m_visible(std::move(other.m_visible)),
+ m_icon(std::move(other.m_icon)),
+ m_color(std::move(other.m_color)),
+ m_category(std::move(other.m_category)),
+ m_widthFactor(std::move(other.m_widthFactor))
+{
+ other.m_baseTextDocument = nullptr;
+}
+
QString TextMark::fileName() const
{
return m_fileName;
diff --git a/src/plugins/texteditor/textmark.h b/src/plugins/texteditor/textmark.h
index 0d68ae3232..468196138d 100644
--- a/src/plugins/texteditor/textmark.h
+++ b/src/plugins/texteditor/textmark.h
@@ -57,6 +57,8 @@ public:
TextMark(const QString &fileName, int lineNumber, Core::Id category);
virtual ~TextMark();
+ TextMark(TextMark &&other);
+
// determine order on markers on the same line.
enum Priority
{