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

Move BaseTextDocument::documentClosing to BaseTextDocumentLayout

Browse Source 
Centralizing mark handling

Change-Id: Ie29c15d97aa171fbf3516d4242fe3f962091477a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Daniel Teske
2012-02-15 13:39:10 +01:00
parent c44d65d3c6
commit 45850c23f2
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/texteditor/basetextdocument.cpp
View File

@@ -97,7 +97,6 @@ BaseTextDocument::BaseTextDocument() : d(new BaseTextDocumentPrivate(this))
BaseTextDocument::~BaseTextDocument() BaseTextDocument::~BaseTextDocument()
{ {
documentClosing();
delete d->m_document; delete d->m_document;
d->m_document = 0; d->m_document = 0;
delete d; delete d;
@@ -377,7 +376,10 @@ bool BaseTextDocument::reload(QString *errorString, QTextCodec *codec)
bool BaseTextDocument::reload(QString *errorString) bool BaseTextDocument::reload(QString *errorString)
{ {
emit aboutToReload(); emit aboutToReload();
documentClosing(); // removes text marks non-permanently BaseTextDocumentLayout *documentLayout =
qobject_cast<BaseTextDocumentLayout*>(d->m_document->documentLayout());
if (documentLayout)
documentLayout->documentClosing(); // removes text marks non-permanently
if (!open(errorString, d->m_fileName, d->m_fileName)) if (!open(errorString, d->m_fileName, d->m_fileName))
return false; return false;
@@ -471,16 +473,6 @@ void BaseTextDocument::ensureFinalNewLine(QTextCursor& cursor)
} }
} }
void BaseTextDocument::documentClosing()
{
QTextBlock block = d->m_document->begin();
while (block.isValid()) {
if (TextBlockUserData *data = static_cast<TextBlockUserData *>(block.userData()))
data->documentClosing();
block = block.next();
}
}
bool BaseTextDocument::hasHighlightWarning() const bool BaseTextDocument::hasHighlightWarning() const
{ {
return d->m_hasHighlightWarning; return d->m_hasHighlightWarning;

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

@@ -110,7 +110,6 @@ signals:
private: private:
void cleanWhitespace(QTextCursor &cursor, bool cleanIndentation, bool inEntireDocument); void cleanWhitespace(QTextCursor &cursor, bool cleanIndentation, bool inEntireDocument);
void ensureFinalNewLine(QTextCursor &cursor); void ensureFinalNewLine(QTextCursor &cursor);
void documentClosing();
BaseTextDocumentPrivate *d; BaseTextDocumentPrivate *d;
}; };

12
src/plugins/texteditor/basetextdocumentlayout.cpp
View File

@@ -516,6 +516,7 @@ BaseTextDocumentLayout::BaseTextDocumentLayout(QTextDocument *doc)
BaseTextDocumentLayout::~BaseTextDocumentLayout() BaseTextDocumentLayout::~BaseTextDocumentLayout()
{ {
documentClosing();
} }
void BaseTextDocumentLayout::setParentheses(const QTextBlock &block, const Parentheses &parentheses) void BaseTextDocumentLayout::setParentheses(const QTextBlock &block, const Parentheses &parentheses)
@@ -699,6 +700,17 @@ QSizeF BaseTextDocumentLayout::documentSize() const
return size; return size;
} }
void BaseTextDocumentLayout::documentClosing()
{
QTextBlock block = document()->begin();
while (block.isValid()) {
if (TextBlockUserData *data = static_cast<TextBlockUserData *>(block.userData()))
data->documentClosing();
block = block.next();
}
}
void BaseTextDocumentLayout::updateMarksLineNumber() void BaseTextDocumentLayout::updateMarksLineNumber()
{ {
QTextBlock block = document()->begin(); QTextBlock block = document()->begin();

1
src/plugins/texteditor/basetextdocumentlayout.h
View File

@@ -214,6 +214,7 @@ public:
QSizeF documentSize() const; QSizeF documentSize() const;
void documentClosing();
void updateMarksLineNumber(); void updateMarksLineNumber();
void updateMarksBlock(const QTextBlock &block); void updateMarksBlock(const QTextBlock &block);
}; };