summaryrefslogtreecommitdiff
path: root/src/plugins/texteditor/textmark.cpp
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2016-07-19 11:58:15 +0200
committerhjk <hjk@qt.io>2016-07-19 10:45:23 +0000
commit6edfb669081231cc0fd7ddaad83fe83b48aa77a7 (patch)
tree5c4301e8e6ab19a914e24a25461388209232402f /src/plugins/texteditor/textmark.cpp
parent36e12b75e0c8d907665c975a9b283ed0cf61b59d (diff)
downloadqt-creator-6edfb669081231cc0fd7ddaad83fe83b48aa77a7.tar.gz
TextEditor: Enable tooltips for textmarks
Adjust bookmark code, add tooltips for clang diagnostics. Change-Id: I489d499f5431fcb29f27611d4350298acb30baac Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/texteditor/textmark.cpp')
-rw-r--r--src/plugins/texteditor/textmark.cpp23
1 files changed, 9 insertions, 14 deletions
diff --git a/src/plugins/texteditor/textmark.cpp b/src/plugins/texteditor/textmark.cpp
index 77cd0a831e..5f879e8760 100644
--- a/src/plugins/texteditor/textmark.cpp
+++ b/src/plugins/texteditor/textmark.cpp
@@ -60,20 +60,6 @@ TextMark::~TextMark()
m_baseTextDocument = 0;
}
-TextMark::TextMark(TextMark &&other) Q_DECL_NOEXCEPT
- : 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;
@@ -212,6 +198,15 @@ void TextMark::setBaseTextDocument(TextDocument *baseTextDocument)
m_baseTextDocument = baseTextDocument;
}
+QString TextMark::toolTip() const
+{
+ return m_toolTip;
+}
+
+void TextMark::setToolTip(const QString &toolTip)
+{
+ m_toolTip = toolTip;
+}
TextMarkRegistry::TextMarkRegistry(QObject *parent)
: QObject(parent)