diff options
| author | hjk <hjk121@nokiamail.com> | 2014-07-19 11:27:28 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-07-23 10:38:31 +0200 |
| commit | cf8a614419fe07912ca959410cebf995a5ff9b4d (patch) | |
| tree | f98c0cb436d2fcaf127e12e981e1ab4b6b17bd1e /src/plugins/projectexplorer/task.h | |
| parent | 53bfd5285de2633f560ed5a2c5d5bd42b78a1c99 (diff) | |
Merge ITextMark and BaseTextMark
Turns out we don't even need two-phase initialization,
by transparently postponing registration until we get
a non-empty file name, either at constuction, or at
file name change times.
Change-Id: I3e87e47c820066e6707e946fc474ab9c1993e61f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/projectexplorer/task.h')
| -rw-r--r-- | src/plugins/projectexplorer/task.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/projectexplorer/task.h b/src/plugins/projectexplorer/task.h index c51a48df88..5e8c3dec91 100644 --- a/src/plugins/projectexplorer/task.h +++ b/src/plugins/projectexplorer/task.h @@ -33,11 +33,11 @@ #include "projectexplorer_export.h" #include <coreplugin/id.h> -#include <texteditor/basetextmark.h> +#include <texteditor/textmark.h> #include <utils/fileutils.h> +#include <QIcon> #include <QMetaType> - #include <QTextLayout> namespace ProjectExplorer { @@ -71,7 +71,7 @@ public: int movedLine; // contains a line number if the line was moved in the editor Core::Id category; QIcon icon; - void addMark(TextEditor::BaseTextMark *mark); + void addMark(TextEditor::TextMark *mark); // Having a QList<QTextLayout::FormatRange> in Task isn't that great // It would be cleaner to split up the text into @@ -84,7 +84,7 @@ public: QList<QTextLayout::FormatRange> formats; private: - QSharedPointer<TextEditor::BaseTextMark> m_mark; + QSharedPointer<TextEditor::TextMark> m_mark; static unsigned int s_nextId; }; |