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

TextEditor: More BaseText* -> Text* renamings

Browse Source 
*Document* and *Layout* classes, all basetext* files

Change-Id: I1c6e376733a434fcb5c7f19c6210dfa031eeafde
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-09-26 09:14:03 +02:00
parent 4edc6896ad
commit 953cdb971f
146 changed files with 424 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/vcsbase/diffhighlighter.cpp
View File

@@ -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;