feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge ITextMark and BaseTextMark

Browse Source 
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>
This commit is contained in:
hjk
2014-07-19 11:27:28 +02:00
parent 53bfd5285d
commit cf8a614419
32 changed files with 265 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/texteditor/basetextdocument.h
View File

@@ -32,6 +32,7 @@
#include "texteditor_global.h"
#include "itexteditor.h"
#include "itexteditor.h"
#include <QList>
@@ -50,9 +51,10 @@ class Indenter;
class StorageSettings;
class SyntaxHighlighter;
class TabSettings;
class TextMark;
class TypingSettings;
typedef QList<ITextMark *> TextMarks;
typedef QList<TextMark *> TextMarks;
class TEXTEDITOR_EXPORT BaseTextDocument : public ITextEditorDocument
{
@@ -85,12 +87,12 @@ public:
QTextCursor unindent(const QTextCursor &cursor);
TextMarks marks() const;
bool addMark(ITextMark *mark);
bool addMark(TextMark *mark);
TextMarks marksAt(int line) const;
void removeMark(ITextMark *mark);
void updateMark(ITextMark *mark);
void moveMark(ITextMark *mark, int previousLine);
void removeMarkFromMarksCache(TextEditor::ITextMark *mark);
void removeMark(TextMark *mark);
void updateMark(TextMark *mark);
void moveMark(TextMark *mark, int previousLine);
void removeMarkFromMarksCache(TextEditor::TextMark *mark);
// IDocument implementation.
bool save(QString *errorString, const QString &fileName, bool autoSave);