aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/vcsbase/diffhighlighter.cpp
diff options
context:
space:
mode:
authorhjk <[email protected]>2014-09-26 09:14:03 +0200
committerhjk <[email protected]>2014-09-26 10:12:51 +0200
commit953cdb971fd110da2c4a30a53350c5628f8deb71 (patch)
tree73889be3ac6a1e8f2a61da0d6b01ef9686b69033 /src/plugins/vcsbase/diffhighlighter.cpp
parent4edc6896ad311b0043ada37d82d7c52b38ad85f2 (diff)
TextEditor: More BaseText* -> Text* renamings
*Document* and *Layout* classes, all basetext* files Change-Id: I1c6e376733a434fcb5c7f19c6210dfa031eeafde Reviewed-by: Eike Ziller <[email protected]>
Diffstat (limited to 'src/plugins/vcsbase/diffhighlighter.cpp')
-rw-r--r--src/plugins/vcsbase/diffhighlighter.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/vcsbase/diffhighlighter.cpp b/src/plugins/vcsbase/diffhighlighter.cpp
index 780308de5c2..ad80f1ae5c3 100644
--- a/src/plugins/vcsbase/diffhighlighter.cpp
+++ b/src/plugins/vcsbase/diffhighlighter.cpp
@@ -29,7 +29,7 @@
#include "diffhighlighter.h"
-#include <texteditor/basetextdocumentlayout.h>
+#include <texteditor/textdocumentlayout.h>
#include <utils/qtcassert.h>
@@ -210,9 +210,9 @@ void DiffHighlighter::highlightBlock(const QString &text)
// codefolding:
TextEditor::TextBlockUserData *data =
- TextEditor::BaseTextDocumentLayout::userData(currentBlock());
+ TextEditor::TextDocumentLayout::userData(currentBlock());
QTC_ASSERT(data, return; );
- if (!TextEditor::BaseTextDocumentLayout::testUserData(currentBlock().previous()))
+ if (!TextEditor::TextDocumentLayout::testUserData(currentBlock().previous()))
d->m_foldingState = Internal::StartOfFile;
switch (d->m_foldingState) {
@@ -221,29 +221,29 @@ void DiffHighlighter::highlightBlock(const QString &text)
switch (format) {
case Internal::DiffFileFormat:
d->m_foldingState = Internal::File;
- TextEditor::BaseTextDocumentLayout::setFoldingIndent(currentBlock(), BASE_LEVEL);
+ TextEditor::TextDocumentLayout::setFoldingIndent(currentBlock(), BASE_LEVEL);
break;
case Internal::DiffLocationFormat:
d->m_foldingState = Internal::Location;
- TextEditor::BaseTextDocumentLayout::setFoldingIndent(currentBlock(), FILE_LEVEL);
+ TextEditor::TextDocumentLayout::setFoldingIndent(currentBlock(), FILE_LEVEL);
break;
default:
d->m_foldingState = Internal::Header;
- TextEditor::BaseTextDocumentLayout::setFoldingIndent(currentBlock(), BASE_LEVEL);
+ TextEditor::TextDocumentLayout::setFoldingIndent(currentBlock(), BASE_LEVEL);
break;
}
break;
case Internal::File:
switch (format) {
case Internal::DiffFileFormat:
- TextEditor::BaseTextDocumentLayout::setFoldingIndent(currentBlock(), FILE_LEVEL);
+ TextEditor::TextDocumentLayout::setFoldingIndent(currentBlock(), FILE_LEVEL);
break;
case Internal::DiffLocationFormat:
d->m_foldingState = Internal::Location;
- TextEditor::BaseTextDocumentLayout::setFoldingIndent(currentBlock(), FILE_LEVEL);
+ TextEditor::TextDocumentLayout::setFoldingIndent(currentBlock(), FILE_LEVEL);
break;
default:
- TextEditor::BaseTextDocumentLayout::setFoldingIndent(currentBlock(), FILE_LEVEL);
+ TextEditor::TextDocumentLayout::setFoldingIndent(currentBlock(), FILE_LEVEL);
break;
}
break;
@@ -251,13 +251,13 @@ void DiffHighlighter::highlightBlock(const QString &text)
switch (format) {
case Internal::DiffFileFormat:
d->m_foldingState = Internal::File;
- TextEditor::BaseTextDocumentLayout::setFoldingIndent(currentBlock(), BASE_LEVEL);
+ TextEditor::TextDocumentLayout::setFoldingIndent(currentBlock(), BASE_LEVEL);
break;
case Internal::DiffLocationFormat:
- TextEditor::BaseTextDocumentLayout::setFoldingIndent(currentBlock(), FILE_LEVEL);
+ TextEditor::TextDocumentLayout::setFoldingIndent(currentBlock(), FILE_LEVEL);
break;
default:
- TextEditor::BaseTextDocumentLayout::setFoldingIndent(currentBlock(), LOCATION_LEVEL);
+ TextEditor::TextDocumentLayout::setFoldingIndent(currentBlock(), LOCATION_LEVEL);
break;
}
break;