diff options
author | hjk <hjk121@nokiamail.com> | 2014-09-26 09:14:03 +0200 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2014-09-26 10:12:51 +0200 |
commit | 953cdb971fd110da2c4a30a53350c5628f8deb71 (patch) | |
tree | 73889be3ac6a1e8f2a61da0d6b01ef9686b69033 /src | |
parent | 4edc6896ad311b0043ada37d82d7c52b38ad85f2 (diff) | |
download | qt-creator-953cdb971fd110da2c4a30a53350c5628f8deb71.tar.gz |
TextEditor: More BaseText* -> Text* renamings
*Document* and *Layout* classes, all basetext* files
Change-Id: I1c6e376733a434fcb5c7f19c6210dfa031eeafde
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src')
142 files changed, 417 insertions, 420 deletions
diff --git a/src/plugins/analyzerbase/analyzerutils.cpp b/src/plugins/analyzerbase/analyzerutils.cpp index b9a22bb415..7429c58ca4 100644 --- a/src/plugins/analyzerbase/analyzerutils.cpp +++ b/src/plugins/analyzerbase/analyzerutils.cpp @@ -32,7 +32,7 @@ #include "analyzerconstants.h" #include <cpptools/cppmodelmanager.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <utils/qtcassert.h> diff --git a/src/plugins/android/androidmanifestdocument.h b/src/plugins/android/androidmanifestdocument.h index cfd46237a0..86e0333b30 100644 --- a/src/plugins/android/androidmanifestdocument.h +++ b/src/plugins/android/androidmanifestdocument.h @@ -30,7 +30,7 @@ #ifndef ANDROIDMANIFESTDOCUMENT_H #define ANDROIDMANIFESTDOCUMENT_H -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> namespace Android { namespace Internal { diff --git a/src/plugins/android/androidmanifesteditor.h b/src/plugins/android/androidmanifesteditor.h index d419e9f13d..ee017264c8 100644 --- a/src/plugins/android/androidmanifesteditor.h +++ b/src/plugins/android/androidmanifesteditor.h @@ -34,7 +34,7 @@ #include "androidmanifesteditorwidget.h" #include <coreplugin/editormanager/ieditor.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> QT_BEGIN_NAMESPACE class QToolBar; diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp index 11f90fdae0..b31529c6f6 100644 --- a/src/plugins/android/androidmanifesteditorwidget.cpp +++ b/src/plugins/android/androidmanifesteditorwidget.cpp @@ -47,7 +47,7 @@ #include <projectexplorer/kitinformation.h> #include <texteditor/texteditoractionhandler.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <utils/algorithm.h> #include <QLineEdit> diff --git a/src/plugins/android/androidmanifesteditorwidget.h b/src/plugins/android/androidmanifesteditorwidget.h index b7c8b5e2cb..30dc7480e6 100644 --- a/src/plugins/android/androidmanifesteditorwidget.h +++ b/src/plugins/android/androidmanifesteditorwidget.h @@ -30,7 +30,7 @@ #ifndef ANDROIDMANIFESTEDITORWIDGET_H #define ANDROIDMANIFESTEDITORWIDGET_H -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <QAbstractListModel> #include <QStackedWidget> diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp index 4e22f01b56..0358660e6c 100644 --- a/src/plugins/android/javaeditor.cpp +++ b/src/plugins/android/javaeditor.cpp @@ -33,8 +33,8 @@ #include "androidconstants.h" #include "javacompletionassistprovider.h" -#include <texteditor/basetextdocument.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/textdocument.h> +#include <texteditor/texteditor.h> #include <utils/uncommentselection.h> #include <coreplugin/editormanager/ieditorfactory.h> diff --git a/src/plugins/android/javaeditor.h b/src/plugins/android/javaeditor.h index e70a9f89a8..a583b9fe20 100644 --- a/src/plugins/android/javaeditor.h +++ b/src/plugins/android/javaeditor.h @@ -30,7 +30,7 @@ #ifndef JAVAEDITOR_H #define JAVAEDITOR_H -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> namespace Android { namespace Internal { diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index 661dd63c42..073f525d0c 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -45,9 +45,9 @@ #include <coreplugin/icore.h> #include <coreplugin/messagemanager.h> #include <diffeditor/differ.h> -#include <texteditor/basetextdocument.h> -#include <texteditor/basetextdocumentlayout.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/textdocument.h> +#include <texteditor/textdocumentlayout.h> +#include <texteditor/texteditor.h> #include <texteditor/texteditorconstants.h> #include <utils/fileutils.h> #include <utils/QtConcurrentTools> @@ -288,7 +288,7 @@ void BeautifierPlugin::formatCurrentFileContinue(QObject *watcher) if (const TextBlockUserData *userdata = static_cast<TextBlockUserData *>(block.userData())) { if (userdata->folded()) { foldedBlocks << block.blockNumber(); - BaseTextDocumentLayout::doFoldOrUnfold(block, true); + TextDocumentLayout::doFoldOrUnfold(block, true); } } block = block.next(); @@ -386,7 +386,7 @@ void BeautifierPlugin::formatCurrentFileContinue(QObject *watcher) for (int i = 0; i < total; ++i) { QTextBlock block = doc->findBlockByNumber(qMax(0, foldedBlocks.at(i))); if (block.isValid()) - BaseTextDocumentLayout::doFoldOrUnfold(block, false); + TextDocumentLayout::doFoldOrUnfold(block, false); } textEditor->document()->setModified(true); diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp index a2b9cfd713..199e196dcd 100644 --- a/src/plugins/beautifier/clangformat/clangformat.cpp +++ b/src/plugins/beautifier/clangformat/clangformat.cpp @@ -47,7 +47,7 @@ #include <coreplugin/icore.h> #include <coreplugin/idocument.h> #include <cppeditor/cppeditorconstants.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <QAction> #include <QMenu> diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index 57f6d68d42..78b2d241d3 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -39,7 +39,7 @@ #include <coreplugin/actionmanager/command.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/session.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <utils/tooltip/tooltip.h> #include <utils/tooltip/tipcontents.h> #include <utils/qtcassert.h> diff --git a/src/plugins/bookmarks/bookmarkmanager.h b/src/plugins/bookmarks/bookmarkmanager.h index c390bdfe31..232282b2fd 100644 --- a/src/plugins/bookmarks/bookmarkmanager.h +++ b/src/plugins/bookmarks/bookmarkmanager.h @@ -34,7 +34,7 @@ #include <coreplugin/icontext.h> #include <coreplugin/inavigationwidgetfactory.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <QAbstractItemModel> #include <QMultiMap> diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp index 8187492cd1..4221c726cc 100644 --- a/src/plugins/bookmarks/bookmarksplugin.cpp +++ b/src/plugins/bookmarks/bookmarksplugin.cpp @@ -40,7 +40,7 @@ #include <coreplugin/actionmanager/command.h> #include <coreplugin/id.h> #include <extensionsystem/pluginmanager.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/texteditorconstants.h> #include <QtPlugin> diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp index ec7855b0ac..840adf2118 100644 --- a/src/plugins/clangcodemodel/clangcompletion.cpp +++ b/src/plugins/clangcodemodel/clangcompletion.cpp @@ -46,7 +46,7 @@ #include <cpptools/cppmodelmanager.h> #include <cpptools/cppworkingcopy.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/convenience.h> #include <texteditor/codeassist/genericproposalmodel.h> #include <texteditor/codeassist/assistproposalitem.h> diff --git a/src/plugins/clangcodemodel/test/completiontesthelper.cpp b/src/plugins/clangcodemodel/test/completiontesthelper.cpp index 9f087b75d6..65fa4ba7a3 100644 --- a/src/plugins/clangcodemodel/test/completiontesthelper.cpp +++ b/src/plugins/clangcodemodel/test/completiontesthelper.cpp @@ -36,8 +36,8 @@ #include <cpptools/cppcompletionassist.h> -#include <texteditor/basetextdocument.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/textdocument.h> +#include <texteditor/texteditor.h> #include <texteditor/codeassist/iassistproposal.h> #include <texteditor/codeassist/genericproposalmodel.h> diff --git a/src/plugins/clangcodemodel/test/completiontesthelper.h b/src/plugins/clangcodemodel/test/completiontesthelper.h index ebdc60ddec..424924b591 100644 --- a/src/plugins/clangcodemodel/test/completiontesthelper.h +++ b/src/plugins/clangcodemodel/test/completiontesthelper.h @@ -36,7 +36,7 @@ #include <QObject> #include <QTextDocument> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <cplusplus/CppDocument.h> namespace TextEditor { class IAssistProposal; } diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp index 564d614063..cd59f359a8 100644 --- a/src/plugins/classview/classviewmanager.cpp +++ b/src/plugins/classview/classviewmanager.cpp @@ -41,7 +41,7 @@ #include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <QThread> #include <QMutex> diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp index 677a86d5ee..241624c805 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp @@ -71,7 +71,7 @@ CMakeEditor::CMakeEditor() void CMakeEditor::finalizeInitialization() { connect(document(), &IDocument::changed, [this]() { - TextDocument *document = textDocument(); + BaseTextDocument *document = textDocument(); if (!document->isModified()) return; InfoBar *infoBar = document->infoBar(); diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.h b/src/plugins/cmakeprojectmanager/cmakeeditor.h index 0890dc6f0b..954a093d7a 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.h +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.h @@ -30,8 +30,8 @@ #ifndef CMAKEEDITOR_H #define CMAKEEDITOR_H -#include <texteditor/basetextdocument.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/textdocument.h> +#include <texteditor/texteditor.h> namespace CMakeProjectManager { namespace Internal { diff --git a/src/plugins/coreplugin/textdocument.cpp b/src/plugins/coreplugin/textdocument.cpp index 276e3a0ee1..35e5196803 100644 --- a/src/plugins/coreplugin/textdocument.cpp +++ b/src/plugins/coreplugin/textdocument.cpp @@ -48,10 +48,10 @@ enum { debug = 0 }; namespace Core { namespace Internal { -class BaseTextDocumentPrivate +class TextDocumentPrivate { public: - BaseTextDocumentPrivate() : m_readResult(Utils::TextFileFormat::ReadSuccess) {} + TextDocumentPrivate() : m_readResult(Utils::TextFileFormat::ReadSuccess) {} Utils::TextFileFormat m_format; Utils::TextFileFormat::ReadResult m_readResult; @@ -61,7 +61,7 @@ public: } // namespace Internal BaseTextDocument::BaseTextDocument(QObject *parent) : - IDocument(parent), d(new Internal::BaseTextDocumentPrivate) + IDocument(parent), d(new Internal::TextDocumentPrivate) { setCodec(Core::EditorManager::defaultTextCodec()); } diff --git a/src/plugins/coreplugin/textdocument.h b/src/plugins/coreplugin/textdocument.h index c9cea26bde..d6fa33f4ef 100644 --- a/src/plugins/coreplugin/textdocument.h +++ b/src/plugins/coreplugin/textdocument.h @@ -36,7 +36,7 @@ namespace Core { -namespace Internal { class BaseTextDocumentPrivate; } +namespace Internal { class TextDocumentPrivate; } class CORE_EXPORT BaseTextDocument : public IDocument { @@ -64,7 +64,7 @@ public: bool write(const QString &fileName, const Utils::TextFileFormat &format, const QString &data, QString *errorMessage) const; private: - Internal::BaseTextDocumentPrivate *d; + Internal::TextDocumentPrivate *d; }; } // namespace Core diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index 277c6379de..210b1ad88f 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -50,7 +50,7 @@ #include <coreplugin/messagemanager.h> #include <utils/qtcassert.h> #include <utils/fileutils.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <QtPlugin> #include <QDebug> diff --git a/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp b/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp index 82b14fa25c..d3f8e84f55 100644 --- a/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp +++ b/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp @@ -33,7 +33,7 @@ #include <cpptools/cpptoolssettings.h> #include <cpptools/doxygengenerator.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <QDebug> #include <QKeyEvent> diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 2f3170161b..7f64a26f10 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -58,8 +58,8 @@ #include <cpptools/cppworkingcopy.h> #include <cpptools/symbolfinder.h> -#include <texteditor/basetextdocument.h> -#include <texteditor/basetextdocumentlayout.h> +#include <texteditor/textdocument.h> +#include <texteditor/textdocumentlayout.h> #include <texteditor/codeassist/assistproposalitem.h> #include <texteditor/codeassist/genericproposalmodel.h> #include <texteditor/codeassist/genericproposal.h> @@ -706,7 +706,7 @@ void CppEditorWidget::onFunctionDeclDefLinkFound(QSharedPointer<FunctionDeclDefL d->m_declDefLink = link; IDocument *targetDocument = DocumentModel::documentForFilePath( d->m_declDefLink->targetFile->fileName()); if (textDocument() != targetDocument) { - if (auto textDocument = qobject_cast<TextDocument *>(targetDocument)) + if (auto textDocument = qobject_cast<BaseTextDocument *>(targetDocument)) connect(textDocument, SIGNAL(contentsChanged()), this, SLOT(abortDeclDefLink())); } @@ -741,7 +741,7 @@ void CppEditorWidget::abortDeclDefLink() IDocument *targetDocument = DocumentModel::documentForFilePath(d->m_declDefLink->targetFile->fileName()); if (textDocument() != targetDocument) { - if (auto textDocument = qobject_cast<TextDocument *>(targetDocument)) + if (auto textDocument = qobject_cast<BaseTextDocument *>(targetDocument)) disconnect(textDocument, SIGNAL(contentsChanged()), this, SLOT(abortDeclDefLink())); } diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h index ae6170c011..b5950ab4a0 100644 --- a/src/plugins/cppeditor/cppeditor.h +++ b/src/plugins/cppeditor/cppeditor.h @@ -32,7 +32,7 @@ #include "cppfunctiondecldeflink.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <QScopedPointer> diff --git a/src/plugins/cppeditor/cppeditordocument.h b/src/plugins/cppeditor/cppeditordocument.h index 64249a4fed..db1311dfbb 100644 --- a/src/plugins/cppeditor/cppeditordocument.h +++ b/src/plugins/cppeditor/cppeditordocument.h @@ -36,7 +36,7 @@ #include <cpptools/cppsemanticinfo.h> #include <cpptools/editordocumenthandle.h> -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <QMutex> #include <QTimer> diff --git a/src/plugins/cppeditor/cppelementevaluator.h b/src/plugins/cppeditor/cppelementevaluator.h index 1eede15a81..7bf41fdced 100644 --- a/src/plugins/cppeditor/cppelementevaluator.h +++ b/src/plugins/cppeditor/cppelementevaluator.h @@ -31,7 +31,7 @@ #define CPPELEMENTEVALUATOR_H #include <cpptools/symbolfinder.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/helpitem.h> #include <QString> diff --git a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp index 3ab538124b..abe3e94d30 100644 --- a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp +++ b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp @@ -42,7 +42,7 @@ #include <cpptools/functionutils.h> #include <cpptools/cpptoolsreuse.h> #include <cpptools/symbolfinder.h> -#include <texteditor/basetextdocumentlayout.h> +#include <texteditor/textdocumentlayout.h> #include <utils/qtcassert.h> #include <QList> diff --git a/src/plugins/cppeditor/cppfollowsymbolundercursor.h b/src/plugins/cppeditor/cppfollowsymbolundercursor.h index 4dec46914a..dc08f4c321 100644 --- a/src/plugins/cppeditor/cppfollowsymbolundercursor.h +++ b/src/plugins/cppeditor/cppfollowsymbolundercursor.h @@ -32,7 +32,7 @@ #define CPPFOLLOWSYMBOLUNDERCURSOR_H #include <cplusplus/CppDocument.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> QT_BEGIN_NAMESPACE class QTextCursor; diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp index d7b23b15e7..4e3d231947 100644 --- a/src/plugins/cppeditor/cpphighlighter.cpp +++ b/src/plugins/cppeditor/cpphighlighter.cpp @@ -32,7 +32,7 @@ #include <cpptools/cppdoxygen.h> #include <cpptools/cpptoolsreuse.h> -#include <texteditor/basetextdocumentlayout.h> +#include <texteditor/textdocumentlayout.h> #include <cplusplus/SimpleLexer.h> #include <cplusplus/Lexer.h> @@ -89,7 +89,7 @@ void CppHighlighter::highlightBlock(const QString &text) initialLexerState &= ~0x80; // discard newline expected bit int foldingIndent = initialBraceDepth; - if (TextBlockUserData *userData = BaseTextDocumentLayout::testUserData(currentBlock())) { + if (TextBlockUserData *userData = TextDocumentLayout::testUserData(currentBlock())) { userData->setFoldingIndent(0); userData->setFoldingStartIncluded(false); userData->setFoldingEndIncluded(false); @@ -97,7 +97,7 @@ void CppHighlighter::highlightBlock(const QString &text) if (tokens.isEmpty()) { setCurrentBlockState((braceDepth << 8) | lexerState); - BaseTextDocumentLayout::clearParentheses(currentBlock()); + TextDocumentLayout::clearParentheses(currentBlock()); if (text.length()) {// the empty line can still contain whitespace if (initialLexerState == T_COMMENT) highlightLine(text, 0, text.length(), formatForCategory(CppCommentFormat)); @@ -106,7 +106,7 @@ void CppHighlighter::highlightBlock(const QString &text) else setFormat(0, text.length(), formatForCategory(CppVisualWhitespace)); } - BaseTextDocumentLayout::setFoldingIndent(currentBlock(), foldingIndent); + TextDocumentLayout::setFoldingIndent(currentBlock(), foldingIndent); return; } @@ -144,7 +144,7 @@ void CppHighlighter::highlightBlock(const QString &text) // as if it were inside the folding block if (tk.utf16charsBegin() == firstNonSpace) { ++foldingIndent; - BaseTextDocumentLayout::userData(currentBlock())->setFoldingStartIncluded(true); + TextDocumentLayout::userData(currentBlock())->setFoldingStartIncluded(true); } } } else if (tk.is(T_RPAREN) || tk.is(T_RBRACE) || tk.is(T_RBRACKET)) { @@ -155,7 +155,7 @@ void CppHighlighter::highlightBlock(const QString &text) if (braceDepth < foldingIndent) { // unless we are at the end of the block, we reduce the folding indent if (i == tokens.size()-1 || tokens.at(i+1).is(T_SEMICOLON)) - BaseTextDocumentLayout::userData(currentBlock())->setFoldingEndIncluded(true); + TextDocumentLayout::userData(currentBlock())->setFoldingEndIncluded(true); else foldingIndent = qMin(braceDepth, foldingIndent); } @@ -207,7 +207,7 @@ void CppHighlighter::highlightBlock(const QString &text) --braceDepth; // unless we are at the end of the block, we reduce the folding indent if (i == tokens.size()-1) - BaseTextDocumentLayout::userData(currentBlock())->setFoldingEndIncluded(true); + TextDocumentLayout::userData(currentBlock())->setFoldingEndIncluded(true); else foldingIndent = qMin(braceDepth, foldingIndent); const int tokenEnd = tk.utf16charsBegin() + tk.utf16chars() - 1; @@ -248,17 +248,17 @@ void CppHighlighter::highlightBlock(const QString &text) } } - BaseTextDocumentLayout::setParentheses(currentBlock(), parentheses); + TextDocumentLayout::setParentheses(currentBlock(), parentheses); // if the block is ifdefed out, we only store the parentheses, but // do not adjust the brace depth. - if (BaseTextDocumentLayout::ifdefedOut(currentBlock())) { + if (TextDocumentLayout::ifdefedOut(currentBlock())) { braceDepth = initialBraceDepth; foldingIndent = initialBraceDepth; } - BaseTextDocumentLayout::setFoldingIndent(currentBlock(), foldingIndent); + TextDocumentLayout::setFoldingIndent(currentBlock(), foldingIndent); // optimization: if only the brace depth changes, we adjust subsequent blocks // to have QSyntaxHighlighter stop the rehighlighting @@ -267,13 +267,13 @@ void CppHighlighter::highlightBlock(const QString &text) int oldState = currentState & 0xff; int oldBraceDepth = currentState >> 8; if (oldState == tokenize.state() && oldBraceDepth != braceDepth) { - BaseTextDocumentLayout::FoldValidator foldValidor; - foldValidor.setup(qobject_cast<BaseTextDocumentLayout *>(document()->documentLayout())); + TextDocumentLayout::FoldValidator foldValidor; + foldValidor.setup(qobject_cast<TextDocumentLayout *>(document()->documentLayout())); int delta = braceDepth - oldBraceDepth; QTextBlock block = currentBlock().next(); while (block.isValid() && block.userState() != -1) { - BaseTextDocumentLayout::changeBraceDepth(block, delta); - BaseTextDocumentLayout::changeFoldingIndent(block, delta); + TextDocumentLayout::changeBraceDepth(block, delta); + TextDocumentLayout::changeFoldingIndent(block, delta); foldValidor.process(block); block = block.next(); } diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp index c93b7af7e1..0fc0eaeef0 100644 --- a/src/plugins/cppeditor/cpphoverhandler.cpp +++ b/src/plugins/cppeditor/cpphoverhandler.cpp @@ -33,7 +33,7 @@ #include "cppelementevaluator.h" #include <coreplugin/helpmanager.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <utils/qtcassert.h> diff --git a/src/plugins/cppeditor/cppincludehierarchymodel.cpp b/src/plugins/cppeditor/cppincludehierarchymodel.cpp index 12299f8628..5e415f86a5 100644 --- a/src/plugins/cppeditor/cppincludehierarchymodel.cpp +++ b/src/plugins/cppeditor/cppincludehierarchymodel.cpp @@ -35,7 +35,7 @@ #include <cpptools/builtineditordocumentparser.h> #include <cpptools/cppmodelmanager.h> #include <cpptools/editordocumenthandle.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <cplusplus/CppDocument.h> diff --git a/src/plugins/cppeditor/cpplocalrenaming.cpp b/src/plugins/cppeditor/cpplocalrenaming.cpp index 4eabf49f3d..f606cb45a0 100644 --- a/src/plugins/cppeditor/cpplocalrenaming.cpp +++ b/src/plugins/cppeditor/cpplocalrenaming.cpp @@ -29,7 +29,7 @@ #include "cpplocalrenaming.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/fontsettings.h> #include <utils/qtcassert.h> diff --git a/src/plugins/cppeditor/cppuseselectionsupdater.cpp b/src/plugins/cppeditor/cppuseselectionsupdater.cpp index a6ba70d05c..93a42c6832 100644 --- a/src/plugins/cppeditor/cppuseselectionsupdater.cpp +++ b/src/plugins/cppeditor/cppuseselectionsupdater.cpp @@ -35,7 +35,7 @@ #include <cpptools/cpplocalsymbols.h> #include <cpptools/cppmodelmanager.h> #include <cpptools/cpptoolsreuse.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/convenience.h> #include <texteditor/fontsettings.h> diff --git a/src/plugins/cppeditor/cppvirtualfunctionproposalitem.h b/src/plugins/cppeditor/cppvirtualfunctionproposalitem.h index a2c48b6314..711656149a 100644 --- a/src/plugins/cppeditor/cppvirtualfunctionproposalitem.h +++ b/src/plugins/cppeditor/cppvirtualfunctionproposalitem.h @@ -30,7 +30,7 @@ #ifndef CPPVIRTUALFUNCTIONPROPOSALITEM_H #define CPPVIRTUALFUNCTIONPROPOSALITEM_H -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/codeassist/assistproposalitem.h> namespace CppEditor { diff --git a/src/plugins/cppeditor/fileandtokenactions_test.cpp b/src/plugins/cppeditor/fileandtokenactions_test.cpp index 91a6573849..c78fb52436 100644 --- a/src/plugins/cppeditor/fileandtokenactions_test.cpp +++ b/src/plugins/cppeditor/fileandtokenactions_test.cpp @@ -41,7 +41,7 @@ #include <cpptools/cppworkingcopy.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <extensionsystem/pluginmanager.h> #include <cplusplus/CppDocument.h> diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.h b/src/plugins/cpptools/baseeditordocumentprocessor.h index 95571f902b..f51d70e404 100644 --- a/src/plugins/cpptools/baseeditordocumentprocessor.h +++ b/src/plugins/cpptools/baseeditordocumentprocessor.h @@ -34,7 +34,7 @@ #include "cppsemanticinfo.h" #include "cpptools_global.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <cplusplus/CppDocument.h> diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.cpp b/src/plugins/cpptools/builtineditordocumentprocessor.cpp index 3b3dd5f2bc..477509450e 100644 --- a/src/plugins/cpptools/builtineditordocumentprocessor.cpp +++ b/src/plugins/cpptools/builtineditordocumentprocessor.cpp @@ -36,7 +36,7 @@ #include "cpptoolsreuse.h" #include "cppworkingcopy.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/convenience.h> #include <cplusplus/CppDocument.h> diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp index 41400c5bf3..6a2bdcd3af 100644 --- a/src/plugins/cpptools/cppcodeformatter.cpp +++ b/src/plugins/cpptools/cppcodeformatter.cpp @@ -29,7 +29,7 @@ #include "cppcodeformatter.h" -#include <texteditor/basetextdocumentlayout.h> +#include <texteditor/textdocumentlayout.h> #include <cplusplus/Lexer.h> #include <utils/qtcassert.h> @@ -1090,7 +1090,7 @@ int CodeFormatter::tokenizeBlock(const QTextBlock &block, bool *endedJoined) *endedJoined = tokenize.endedJoined(); const int lexerState = tokenize.state(); - BaseTextDocumentLayout::setLexerState(block, lexerState); + TextDocumentLayout::setLexerState(block, lexerState); return lexerState; } @@ -1143,7 +1143,7 @@ void QtStyleCodeFormatter::setCodeStyleSettings(const CppCodeStyleSettings &sett void QtStyleCodeFormatter::saveBlockData(QTextBlock *block, const BlockData &data) const { - TextBlockUserData *userData = BaseTextDocumentLayout::userData(*block); + TextBlockUserData *userData = TextDocumentLayout::userData(*block); CppCodeFormatterData *cppData = static_cast<CppCodeFormatterData *>(userData->codeFormatterData()); if (!cppData) { cppData = new CppCodeFormatterData; @@ -1154,7 +1154,7 @@ void QtStyleCodeFormatter::saveBlockData(QTextBlock *block, const BlockData &dat bool QtStyleCodeFormatter::loadBlockData(const QTextBlock &block, BlockData *data) const { - TextBlockUserData *userData = BaseTextDocumentLayout::testUserData(block); + TextBlockUserData *userData = TextDocumentLayout::testUserData(block); if (!userData) return false; CppCodeFormatterData *cppData = static_cast<CppCodeFormatterData *>(userData->codeFormatterData()); @@ -1167,12 +1167,12 @@ bool QtStyleCodeFormatter::loadBlockData(const QTextBlock &block, BlockData *dat void QtStyleCodeFormatter::saveLexerState(QTextBlock *block, int state) const { - BaseTextDocumentLayout::setLexerState(*block, state); + TextDocumentLayout::setLexerState(*block, state); } int QtStyleCodeFormatter::loadLexerState(const QTextBlock &block) const { - return BaseTextDocumentLayout::lexerState(block); + return TextDocumentLayout::lexerState(block); } void QtStyleCodeFormatter::addContinuationIndent(int *paddingDepth) const diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp index 5acb27f046..64922367aa 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/src/plugins/cpptools/cppcompletion_test.cpp @@ -34,7 +34,7 @@ #include <texteditor/codeassist/iassistproposal.h> #include <texteditor/convenience.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <utils/changeset.h> #include <utils/fileutils.h> diff --git a/src/plugins/cpptools/cppcompletionassist.h b/src/plugins/cpptools/cppcompletionassist.h index a03405987b..4bb0edfa3d 100644 --- a/src/plugins/cpptools/cppcompletionassist.h +++ b/src/plugins/cpptools/cppcompletionassist.h @@ -38,7 +38,7 @@ #include <cplusplus/Symbol.h> #include <cplusplus/TypeOfExpression.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/codeassist/genericproposalmodel.h> #include <texteditor/codeassist/assistinterface.h> #include <texteditor/codeassist/iassistprocessor.h> diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h index 0769a23e30..88734bc6ec 100644 --- a/src/plugins/cpptools/cppmodelmanager.h +++ b/src/plugins/cpptools/cppmodelmanager.h @@ -35,7 +35,7 @@ #include "cppprojects.h" #include <projectexplorer/project.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <cplusplus/CppDocument.h> #include <cplusplus/cppmodelmanagerbase.h> diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp index b922727983..8d63937e98 100644 --- a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp +++ b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp @@ -34,7 +34,7 @@ #include <coreplugin/coreconstants.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/plaintexteditorfactory.h> #include <utils/fileutils.h> diff --git a/src/plugins/cpptools/cppsourceprocessor_test.cpp b/src/plugins/cpptools/cppsourceprocessor_test.cpp index 9be1d9848b..1fc2abb7e0 100644 --- a/src/plugins/cpptools/cppsourceprocessor_test.cpp +++ b/src/plugins/cpptools/cppsourceprocessor_test.cpp @@ -36,7 +36,7 @@ #include "cpptoolstestcase.h" #include "editordocumenthandle.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <cplusplus/CppDocument.h> #include <utils/fileutils.h> diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp index e88e1b4697..910d19fa71 100644 --- a/src/plugins/cpptools/cpptoolstestcase.cpp +++ b/src/plugins/cpptools/cpptoolstestcase.cpp @@ -30,7 +30,7 @@ #include "cpptoolstestcase.h" #include <coreplugin/editormanager/editormanager.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/codeassist/iassistproposal.h> #include <texteditor/codeassist/iassistproposalmodel.h> diff --git a/src/plugins/cpptools/semantichighlighter.h b/src/plugins/cpptools/semantichighlighter.h index 6ba7659e96..b738d51ac6 100644 --- a/src/plugins/cpptools/semantichighlighter.h +++ b/src/plugins/cpptools/semantichighlighter.h @@ -33,7 +33,7 @@ #include "cppsemanticinfo.h" #include "cpptools_global.h" -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <texteditor/semantichighlighter.h> #include <QFutureWatcher> diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 8ee8a6b8a5..66de1d5c50 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -55,7 +55,7 @@ #include <coreplugin/icore.h> #include <projectexplorer/taskhub.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <utils/synchronousprocess.h> #include <utils/qtcprocess.h> diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index c2e0181eea..7c86043dd9 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -57,7 +57,7 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/taskhub.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <utils/savedaction.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 848073f68e..6fb32830a5 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -98,7 +98,7 @@ #include <projectexplorer/session.h> #include <projectexplorer/target.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/fontsettings.h> #include <texteditor/texteditorsettings.h> diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index 8612c353d7..7c72d8df61 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -40,7 +40,7 @@ #include <coreplugin/icore.h> #include <coreplugin/coreconstants.h> #include <coreplugin/editormanager/documentmodel.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <utils/tooltip/tooltip.h> #include <utils/tooltip/tipcontents.h> diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp index b784c9d1a5..029519da0a 100644 --- a/src/plugins/debugger/disassembleragent.cpp +++ b/src/plugins/debugger/disassembleragent.cpp @@ -42,8 +42,8 @@ #include <coreplugin/icore.h> #include <coreplugin/mimedatabase.h> -#include <texteditor/basetextdocument.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/textdocument.h> +#include <texteditor/texteditor.h> #include <utils/qtcassert.h> @@ -117,7 +117,7 @@ DisassemblerAgentPrivate::DisassemblerAgentPrivate() resetLocationScheduled(false) { locationMark.setIcon(debuggerCore()->locationMarkIcon()); - locationMark.setPriority(TextEditor::TextMark::HighPriority); + locationMark.setPriority(TextMark::HighPriority); } DisassemblerAgentPrivate::~DisassemblerAgentPrivate() diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index efc57a7054..83cb3ae217 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -67,7 +67,7 @@ #include <projectexplorer/devicesupport/deviceprocess.h> #include <projectexplorer/itaskhandler.h> #include <projectexplorer/taskhub.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <utils/algorithm.h> #include <utils/hostosinfo.h> #include <utils/qtcassert.h> diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index ffe070e308..771fac59b1 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -54,7 +54,7 @@ #include <utils/savedaction.h> #include <utils/qtcprocess.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <coreplugin/idocument.h> #include <coreplugin/icore.h> diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index 61b5c0a4ba..17eb578e42 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -48,7 +48,7 @@ #include <utils/qtcassert.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <coreplugin/idocument.h> #include <coreplugin/icore.h> diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 8113c88e79..f9ae7a9ff3 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -35,7 +35,7 @@ #include <debugger/watchhandler.h> #include <utils/qtcassert.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <qmljseditor/qmljseditorconstants.h> #include <cppeditor/cppeditorconstants.h> #include <qmljs/consolemanagerinterface.h> diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index c77aafb659..93ee96fb6b 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -53,8 +53,8 @@ #include <utils/qtcassert.h> -#include <texteditor/basetextdocument.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/textdocument.h> +#include <texteditor/texteditor.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/helpmanager.h> #include <coreplugin/icore.h> diff --git a/src/plugins/debugger/qml/qmllivetextpreview.h b/src/plugins/debugger/qml/qmllivetextpreview.h index 13a295bb2c..55b6820b5b 100644 --- a/src/plugins/debugger/qml/qmllivetextpreview.h +++ b/src/plugins/debugger/qml/qmllivetextpreview.h @@ -30,7 +30,7 @@ #ifndef QMLLIVETEXTPREVIEW_H #define QMLLIVETEXTPREVIEW_H -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <qmljs/qmljsdocument.h> namespace Core { class IEditor; } diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp index 650911b395..ca1ce39f02 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp +++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp @@ -39,7 +39,7 @@ #include <debugger/debuggeractions.h> #include <utils/qtcassert.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <qmljs/consolemanagerinterface.h> diff --git a/src/plugins/debugger/sourceagent.cpp b/src/plugins/debugger/sourceagent.cpp index 7d2b6b2ead..f5c1639992 100644 --- a/src/plugins/debugger/sourceagent.cpp +++ b/src/plugins/debugger/sourceagent.cpp @@ -34,7 +34,7 @@ #include "debuggercore.h" #include "stackhandler.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/textmark.h> #include <cppeditor/cppeditorconstants.h> diff --git a/src/plugins/debugger/sourceutils.cpp b/src/plugins/debugger/sourceutils.cpp index ed36b289f6..bb29a2ca5f 100644 --- a/src/plugins/debugger/sourceutils.cpp +++ b/src/plugins/debugger/sourceutils.cpp @@ -32,7 +32,7 @@ #include "watchdata.h" #include "watchutils.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <cpptools/abstracteditorsupport.h> #include <cpptools/cppprojectfile.h> #include <cpptools/cppmodelmanager.h> diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp index be12d55b19..eb45f1285d 100644 --- a/src/plugins/designer/formwindoweditor.cpp +++ b/src/plugins/designer/formwindoweditor.cpp @@ -33,7 +33,7 @@ #include "resourcehandler.h" #include <coreplugin/coreconstants.h> -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <utils/qtcassert.h> diff --git a/src/plugins/designer/formwindoweditor.h b/src/plugins/designer/formwindoweditor.h index af0c84d6c7..079bf3d22c 100644 --- a/src/plugins/designer/formwindoweditor.h +++ b/src/plugins/designer/formwindoweditor.h @@ -32,7 +32,7 @@ #include "designer_export.h" #include <coreplugin/editormanager/ieditor.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> namespace Designer { diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h index 2bbba069d0..c6d46652c3 100644 --- a/src/plugins/designer/formwindowfile.h +++ b/src/plugins/designer/formwindowfile.h @@ -30,7 +30,7 @@ #ifndef FORMWINDOWFILE_H #define FORMWINDOWFILE_H -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <QPointer> diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index ff5b6b9773..0665291ad6 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/src/plugins/designer/qtcreatorintegration.cpp @@ -41,7 +41,7 @@ #include <cpptools/symbolfinder.h> #include <cplusplus/Overview.h> #include <coreplugin/icore.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/session.h> #include <utils/qtcassert.h> diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index 1ed0562aeb..56ade3bd50 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -38,7 +38,7 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/minisplitter.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/texteditorsettings.h> #include <texteditor/displaysettings.h> #include <texteditor/marginsettings.h> diff --git a/src/plugins/diffeditor/selectabletexteditorwidget.cpp b/src/plugins/diffeditor/selectabletexteditorwidget.cpp index 29fad396f0..e24f19d76d 100644 --- a/src/plugins/diffeditor/selectabletexteditorwidget.cpp +++ b/src/plugins/diffeditor/selectabletexteditorwidget.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "selectabletexteditorwidget.h" -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <QPainter> #include <QTextBlock> diff --git a/src/plugins/diffeditor/selectabletexteditorwidget.h b/src/plugins/diffeditor/selectabletexteditorwidget.h index bb80934b0d..68cade0cf9 100644 --- a/src/plugins/diffeditor/selectabletexteditorwidget.h +++ b/src/plugins/diffeditor/selectabletexteditorwidget.h @@ -31,7 +31,7 @@ #define SELECTABLETEXTEDITORWIDGET_H #include "diffeditor_global.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> namespace DiffEditor { diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index 48740f47f0..40a94d2fb2 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp @@ -44,11 +44,11 @@ #include <QTextCodec> #include <QMessageBox> -#include <texteditor/basetexteditor.h> -#include <texteditor/basetextdocumentlayout.h> +#include <texteditor/texteditor.h> +#include <texteditor/textdocumentlayout.h> #include <texteditor/highlighterfactory.h> #include <texteditor/syntaxhighlighter.h> -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <texteditor/texteditorsettings.h> #include <texteditor/fontsettings.h> #include <texteditor/displaysettings.h> @@ -363,7 +363,7 @@ bool SideDiffEditorWidget::selectionVisible(int blockNumber) const bool SideDiffEditorWidget::replacementVisible(int blockNumber) const { return isChunkLine(blockNumber) || (isFileLine(blockNumber) - && TextEditor::BaseTextDocumentLayout::isFolded( + && TextEditor::TextDocumentLayout::isFolded( document()->findBlockByNumber(blockNumber))); } @@ -531,7 +531,7 @@ void SideDiffEditorWidget::paintSeparator(QPainter &painter, const int replacementTextWidth = fontMetrics().width(replacementText) + 24; int x = replacementTextWidth + offset.x(); if (x < document()->documentMargin() - || !TextEditor::BaseTextDocumentLayout::isFolded(block)) { + || !TextEditor::TextDocumentLayout::isFolded(block)) { x = document()->documentMargin(); } const QString elidedText = fontMetrics().elidedText(text, diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp index 9bb0ebe789..2e384a27fc 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp @@ -43,11 +43,11 @@ #include <QTextCodec> #include <QMessageBox> -#include <texteditor/basetexteditor.h> -#include <texteditor/basetextdocumentlayout.h> +#include <texteditor/texteditor.h> +#include <texteditor/textdocumentlayout.h> #include <texteditor/highlighterfactory.h> #include <texteditor/syntaxhighlighter.h> -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <texteditor/texteditorsettings.h> #include <texteditor/fontsettings.h> #include <texteditor/displaysettings.h> diff --git a/src/plugins/emacskeys/emacskeysplugin.cpp b/src/plugins/emacskeys/emacskeysplugin.cpp index 2b173b59f5..e9eed25c2b 100644 --- a/src/plugins/emacskeys/emacskeysplugin.cpp +++ b/src/plugins/emacskeys/emacskeysplugin.cpp @@ -39,7 +39,7 @@ #include <coreplugin/coreconstants.h> #include <utils/qtcassert.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <QAction> #include <QPlainTextEdit> diff --git a/src/plugins/fakevim/fakevim_test.cpp b/src/plugins/fakevim/fakevim_test.cpp index d9ae5ac79f..6a202d7436 100644 --- a/src/plugins/fakevim/fakevim_test.cpp +++ b/src/plugins/fakevim/fakevim_test.cpp @@ -36,7 +36,7 @@ #include "fakevimhandler.h" #include <coreplugin/editormanager/editormanager.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <QtTest> #include <QTextEdit> diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index c03ef0575b..0f70cccd1f 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -56,8 +56,8 @@ #include <projectexplorer/projectexplorerconstants.h> -#include <texteditor/basetextdocumentlayout.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/textdocumentlayout.h> +#include <texteditor/texteditor.h> #include <texteditor/textmark.h> #include <texteditor/texteditorconstants.h> #include <texteditor/typingsettings.h> @@ -1568,7 +1568,7 @@ void FakeVimPluginPrivate::foldToggle(int depth) QTC_ASSERT(handler != 0, return); QTextBlock block = handler->textCursor().block(); - fold(depth, !BaseTextDocumentLayout::isFolded(block)); + fold(depth, !TextDocumentLayout::isFolded(block)); } void FakeVimPluginPrivate::foldAll(bool fold) @@ -1578,13 +1578,13 @@ void FakeVimPluginPrivate::foldAll(bool fold) QTC_ASSERT(editor != 0, return); QTextDocument *doc = editor->document(); - BaseTextDocumentLayout *documentLayout = - qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout()); + TextDocumentLayout *documentLayout = + qobject_cast<TextDocumentLayout*>(doc->documentLayout()); QTC_ASSERT(documentLayout != 0, return); QTextBlock block = editor->document()->firstBlock(); while (block.isValid()) { - BaseTextDocumentLayout::doFoldOrUnfold(block, !fold); + TextDocumentLayout::doFoldOrUnfold(block, !fold); block = block.next(); } @@ -1601,25 +1601,25 @@ void FakeVimPluginPrivate::fold(int depth, bool fold) QTC_ASSERT(editor != 0, return); QTextDocument *doc = editor->document(); - BaseTextDocumentLayout *documentLayout = - qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout()); + TextDocumentLayout *documentLayout = + qobject_cast<TextDocumentLayout*>(doc->documentLayout()); QTC_ASSERT(documentLayout != 0, return); QTextBlock block = handler->textCursor().block(); - int indent = BaseTextDocumentLayout::foldingIndent(block); + int indent = TextDocumentLayout::foldingIndent(block); if (fold) { - if (BaseTextDocumentLayout::isFolded(block)) { - while (block.isValid() && (BaseTextDocumentLayout::foldingIndent(block) >= indent + if (TextDocumentLayout::isFolded(block)) { + while (block.isValid() && (TextDocumentLayout::foldingIndent(block) >= indent || !block.isVisible())) { block = block.previous(); } } - if (BaseTextDocumentLayout::canFold(block)) + if (TextDocumentLayout::canFold(block)) ++indent; while (depth != 0 && block.isValid()) { - const int indent2 = BaseTextDocumentLayout::foldingIndent(block); - if (BaseTextDocumentLayout::canFold(block) && indent2 < indent) { - BaseTextDocumentLayout::doFoldOrUnfold(block, false); + const int indent2 = TextDocumentLayout::foldingIndent(block); + if (TextDocumentLayout::canFold(block) && indent2 < indent) { + TextDocumentLayout::doFoldOrUnfold(block, false); if (depth > 0) --depth; indent = indent2; @@ -1627,21 +1627,21 @@ void FakeVimPluginPrivate::fold(int depth, bool fold) block = block.previous(); } } else { - if (BaseTextDocumentLayout::isFolded(block)) { + if (TextDocumentLayout::isFolded(block)) { if (depth < 0) { // recursively open fold while (depth < 0 && block.isValid() - && BaseTextDocumentLayout::foldingIndent(block) >= indent) { - if (BaseTextDocumentLayout::canFold(block)) { - BaseTextDocumentLayout::doFoldOrUnfold(block, true); + && TextDocumentLayout::foldingIndent(block) >= indent) { + if (TextDocumentLayout::canFold(block)) { + TextDocumentLayout::doFoldOrUnfold(block, true); if (depth > 0) --depth; } block = block.next(); } } else { - if (BaseTextDocumentLayout::canFold(block)) { - BaseTextDocumentLayout::doFoldOrUnfold(block, true); + if (TextDocumentLayout::canFold(block)) { + TextDocumentLayout::doFoldOrUnfold(block, true); if (depth > 0) --depth; } @@ -1667,10 +1667,10 @@ void FakeVimPluginPrivate::foldGoTo(int count, bool current) int repeat = count; block = block.next(); QTextBlock prevBlock = block; - int indent = BaseTextDocumentLayout::foldingIndent(block); + int indent = TextDocumentLayout::foldingIndent(block); block = block.next(); while (block.isValid()) { - int newIndent = BaseTextDocumentLayout::foldingIndent(block); + int newIndent = TextDocumentLayout::foldingIndent(block); if (current ? indent > newIndent : indent < newIndent) { if (prevBlock.isVisible()) { pos = prevBlock.position(); @@ -1687,10 +1687,10 @@ void FakeVimPluginPrivate::foldGoTo(int count, bool current) } } else if (count < 0) { int repeat = -count; - int indent = BaseTextDocumentLayout::foldingIndent(block); + int indent = TextDocumentLayout::foldingIndent(block); block = block.previous(); while (block.isValid()) { - int newIndent = BaseTextDocumentLayout::foldingIndent(block); + int newIndent = TextDocumentLayout::foldingIndent(block); if (current ? indent > newIndent : indent < newIndent) { while (block.isValid() && !block.isVisible()) block = block.previous(); @@ -1876,10 +1876,8 @@ void FakeVimPluginPrivate::setUseFakeVimInternal(bool on) // Context(FAKEVIM_CONTEXT)); resetCommandBuffer(); foreach (IEditor *editor, m_editorToHandler.keys()) { - if (TextDocument *textDocument = - qobject_cast<TextDocument *>(editor->document())) { + if (TextDocument *textDocument = qobject_cast<TextDocument *>(editor->document())) m_editorToHandler[editor]->restoreWidget(textDocument->tabSettings().m_tabSize); - } } } } diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.h b/src/plugins/genericprojectmanager/genericprojectfileseditor.h index 9c98a03ae9..ec947ef006 100644 --- a/src/plugins/genericprojectmanager/genericprojectfileseditor.h +++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.h @@ -30,7 +30,7 @@ #ifndef GENERICPROJECTFILESEDITOR_H #define GENERICPROJECTFILESEDITOR_H -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> namespace GenericProjectManager { namespace Internal { diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index 4121baaf2a..03cb8260df 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -40,7 +40,7 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> #include <vcsbase/vcsoutputwindow.h> -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <QFileInfo> #include <QRegExp> diff --git a/src/plugins/glsleditor/glsleditor.h b/src/plugins/glsleditor/glsleditor.h index d596860983..2da6181aea 100644 --- a/src/plugins/glsleditor/glsleditor.h +++ b/src/plugins/glsleditor/glsleditor.h @@ -30,7 +30,7 @@ #ifndef GLSLEDITOR_H #define GLSLEDITOR_H -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> namespace GlslEditor { namespace Internal { diff --git a/src/plugins/glsleditor/glslhighlighter.cpp b/src/plugins/glsleditor/glslhighlighter.cpp index a61ad1ee9d..0df18032a6 100644 --- a/src/plugins/glsleditor/glslhighlighter.cpp +++ b/src/plugins/glsleditor/glslhighlighter.cpp @@ -30,8 +30,8 @@ #include "glsleditor.h" #include <glsl/glsllexer.h> #include <glsl/glslparser.h> -#include <texteditor/basetextdocumentlayout.h> -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocumentlayout.h> +#include <texteditor/textdocument.h> #include <QDebug> @@ -93,7 +93,7 @@ void GlslHighlighter::highlightBlock(const QString &text) state = lex.state(); // refresh the state int foldingIndent = initialBraceDepth; - if (TextBlockUserData *userData = BaseTextDocumentLayout::testUserData(currentBlock())) { + if (TextBlockUserData *userData = TextDocumentLayout::testUserData(currentBlock())) { userData->setFoldingIndent(0); userData->setFoldingStartIncluded(false); userData->setFoldingEndIncluded(false); @@ -101,10 +101,10 @@ void GlslHighlighter::highlightBlock(const QString &text) if (tokens.isEmpty()) { setCurrentBlockState(previousState); - BaseTextDocumentLayout::clearParentheses(currentBlock()); + TextDocumentLayout::clearParentheses(currentBlock()); if (text.length()) // the empty line can still contain whitespace setFormat(0, text.length(), formatForCategory(GLSLVisualWhitespace)); - BaseTextDocumentLayout::setFoldingIndent(currentBlock(), foldingIndent); + TextDocumentLayout::setFoldingIndent(currentBlock(), foldingIndent); return; } @@ -140,7 +140,7 @@ void GlslHighlighter::highlightBlock(const QString &text) // as if it were inside the folding block if (tk.begin() == firstNonSpace) { ++foldingIndent; - BaseTextDocumentLayout::userData(currentBlock())->setFoldingStartIncluded(true); + TextDocumentLayout::userData(currentBlock())->setFoldingStartIncluded(true); } } } else if (tk.is(GLSL::Parser::T_RIGHT_PAREN) || tk.is(GLSL::Parser::T_RIGHT_BRACE) || tk.is(GLSL::Parser::T_RIGHT_BRACKET)) { @@ -151,7 +151,7 @@ void GlslHighlighter::highlightBlock(const QString &text) if (braceDepth < foldingIndent) { // unless we are at the end of the block, we reduce the folding indent if (i == tokens.size()-1 || tokens.at(i+1).is(GLSL::Parser::T_SEMICOLON)) - BaseTextDocumentLayout::userData(currentBlock())->setFoldingEndIncluded(true); + TextDocumentLayout::userData(currentBlock())->setFoldingEndIncluded(true); else foldingIndent = qMin(braceDepth, foldingIndent); } @@ -184,7 +184,7 @@ void GlslHighlighter::highlightBlock(const QString &text) --braceDepth; // unless we are at the end of the block, we reduce the folding indent if (i == tokens.size()-1) - BaseTextDocumentLayout::userData(currentBlock())->setFoldingEndIncluded(true); + TextDocumentLayout::userData(currentBlock())->setFoldingEndIncluded(true); else foldingIndent = qMin(braceDepth, foldingIndent); const int tokenEnd = tk.begin() + tk.length - 1; @@ -217,17 +217,17 @@ void GlslHighlighter::highlightBlock(const QString &text) ++braceDepth; } - BaseTextDocumentLayout::setParentheses(currentBlock(), parentheses); + TextDocumentLayout::setParentheses(currentBlock(), parentheses); // if the block is ifdefed out, we only store the parentheses, but // do not adjust the brace depth. - if (BaseTextDocumentLayout::ifdefedOut(currentBlock())) { + if (TextDocumentLayout::ifdefedOut(currentBlock())) { braceDepth = initialBraceDepth; foldingIndent = initialBraceDepth; } - BaseTextDocumentLayout::setFoldingIndent(currentBlock(), foldingIndent); + TextDocumentLayout::setFoldingIndent(currentBlock(), foldingIndent); // optimization: if only the brace depth changes, we adjust subsequent blocks // to have QSyntaxHighlighter stop the rehighlighting @@ -239,8 +239,8 @@ void GlslHighlighter::highlightBlock(const QString &text) int delta = braceDepth - oldBraceDepth; QTextBlock block = currentBlock().next(); while (block.isValid() && block.userState() != -1) { - BaseTextDocumentLayout::changeBraceDepth(block, delta); - BaseTextDocumentLayout::changeFoldingIndent(block, delta); + TextDocumentLayout::changeBraceDepth(block, delta); + TextDocumentLayout::changeFoldingIndent(block, delta); block = block.next(); } } diff --git a/src/plugins/glsleditor/glslhoverhandler.cpp b/src/plugins/glsleditor/glslhoverhandler.cpp index 197d297c8d..c38bf6b73d 100644 --- a/src/plugins/glsleditor/glslhoverhandler.cpp +++ b/src/plugins/glsleditor/glslhoverhandler.cpp @@ -35,7 +35,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/helpmanager.h> #include <extensionsystem/pluginmanager.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> using namespace Core; diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp index 54b4134df1..9b6db70dd3 100644 --- a/src/plugins/macros/texteditormacrohandler.cpp +++ b/src/plugins/macros/texteditormacrohandler.cpp @@ -31,7 +31,7 @@ #include "macroevent.h" #include "macro.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/texteditorconstants.h> #include <coreplugin/icore.h> diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp index 47e47fdd2d..8cf5262657 100644 --- a/src/plugins/projectexplorer/allprojectsfind.cpp +++ b/src/plugins/projectexplorer/allprojectsfind.cpp @@ -34,7 +34,7 @@ #include "projectexplorer.h" #include "editorconfiguration.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <utils/filesearch.h> #include <utils/algorithm.h> diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp index df36682313..ec668dec2c 100644 --- a/src/plugins/projectexplorer/editorconfiguration.cpp +++ b/src/plugins/projectexplorer/editorconfiguration.cpp @@ -37,7 +37,7 @@ #include <coreplugin/id.h> #include <coreplugin/icore.h> #include <coreplugin/editormanager/editormanager.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/texteditorsettings.h> #include <texteditor/simplecodestylepreferences.h> #include <texteditor/typingsettings.h> diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index 9766f8742e..09a1a0ffe2 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -42,7 +42,7 @@ #include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/modemanager.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <utils/algorithm.h> #include <utils/stylehelper.h> diff --git a/src/plugins/pythoneditor/pythoneditor.cpp b/src/plugins/pythoneditor/pythoneditor.cpp index e3580863b5..6e35ed87b0 100644 --- a/src/plugins/pythoneditor/pythoneditor.cpp +++ b/src/plugins/pythoneditor/pythoneditor.cpp @@ -35,7 +35,7 @@ #include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditorconstants.h> -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <utils/qtcassert.h> diff --git a/src/plugins/pythoneditor/pythoneditor.h b/src/plugins/pythoneditor/pythoneditor.h index 33f2c4f952..a663dc0de0 100644 --- a/src/plugins/pythoneditor/pythoneditor.h +++ b/src/plugins/pythoneditor/pythoneditor.h @@ -30,7 +30,7 @@ #ifndef PYTHONEDITOR_EDITOR_H #define PYTHONEDITOR_EDITOR_H -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> namespace PythonEditor { namespace Internal { diff --git a/src/plugins/pythoneditor/tools/pythonhighlighter.cpp b/src/plugins/pythoneditor/tools/pythonhighlighter.cpp index 125bceca02..7f74d868f3 100644 --- a/src/plugins/pythoneditor/tools/pythonhighlighter.cpp +++ b/src/plugins/pythoneditor/tools/pythonhighlighter.cpp @@ -40,7 +40,7 @@ #include "pythonhighlighter.h" #include "lexical/pythonscanner.h" -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <texteditor/texteditorconstants.h> namespace PythonEditor { diff --git a/src/plugins/qmakeprojectmanager/profileeditor.h b/src/plugins/qmakeprojectmanager/profileeditor.h index 57796571fb..19a1ff7b69 100644 --- a/src/plugins/qmakeprojectmanager/profileeditor.h +++ b/src/plugins/qmakeprojectmanager/profileeditor.h @@ -30,7 +30,7 @@ #ifndef PROFILEEDITOR_H #define PROFILEEDITOR_H -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> namespace QmakeProjectManager { namespace Internal { diff --git a/src/plugins/qmakeprojectmanager/profilehoverhandler.cpp b/src/plugins/qmakeprojectmanager/profilehoverhandler.cpp index d93de8ff4f..e2bd138aa0 100644 --- a/src/plugins/qmakeprojectmanager/profilehoverhandler.cpp +++ b/src/plugins/qmakeprojectmanager/profilehoverhandler.cpp @@ -34,7 +34,7 @@ #include <coreplugin/helpmanager.h> #include <coreplugin/editormanager/ieditor.h> #include <extensionsystem/pluginmanager.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <utils/htmldocextractor.h> #include <QTextBlock> diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp index 9e89f0af82..2ca6f3dfca 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp @@ -45,7 +45,7 @@ #include <projectexplorer/session.h> #include <projectexplorer/target.h> #include <utils/qtcassert.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <QDir> #include <QFileInfo> diff --git a/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h index 24aa6864bc..1f9e8d7eb8 100644 --- a/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h +++ b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h @@ -34,7 +34,7 @@ #include "qmldesignercorelib_global.h" #include "plaintexteditmodifier.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <QStringList> diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 27ad698e74..98735e57f6 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -59,7 +59,7 @@ #include <extensionsystem/pluginmanager.h> -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <texteditor/fontsettings.h> #include <texteditor/tabsettings.h> #include <texteditor/texteditorconstants.h> diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h index 77da8fbc30..cce54dc4b5 100644 --- a/src/plugins/qmljseditor/qmljseditor.h +++ b/src/plugins/qmljseditor/qmljseditor.h @@ -34,7 +34,7 @@ #include <qmljs/qmljsscanner.h> #include <qmljstools/qmljssemanticinfo.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/quickfix.h> #include <texteditor/texteditorconstants.h> #include <utils/uncommentselection.h> diff --git a/src/plugins/qmljseditor/qmljseditordocument.h b/src/plugins/qmljseditor/qmljseditordocument.h index 9748b80577..884712fc2d 100644 --- a/src/plugins/qmljseditor/qmljseditordocument.h +++ b/src/plugins/qmljseditor/qmljseditordocument.h @@ -34,7 +34,7 @@ #include <qmljs/qmljsdocument.h> #include <qmljstools/qmljssemanticinfo.h> -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <QTextLayout> diff --git a/src/plugins/qmljseditor/qmljshighlighter.cpp b/src/plugins/qmljseditor/qmljshighlighter.cpp index b710b7dd39..6b819a0e0b 100644 --- a/src/plugins/qmljseditor/qmljshighlighter.cpp +++ b/src/plugins/qmljseditor/qmljshighlighter.cpp @@ -289,7 +289,7 @@ int QmlJSHighlighter::onBlockStart() m_braceDepth = 0; m_foldingIndent = 0; m_inMultilineComment = false; - if (TextBlockUserData *userData = BaseTextDocumentLayout::testUserData(currentBlock())) { + if (TextBlockUserData *userData = TextDocumentLayout::testUserData(currentBlock())) { userData->setFoldingIndent(0); userData->setFoldingStartIncluded(false); userData->setFoldingEndIncluded(false); @@ -310,8 +310,8 @@ int QmlJSHighlighter::onBlockStart() void QmlJSHighlighter::onBlockEnd(int state) { setCurrentBlockState((m_braceDepth << 8) | state); - BaseTextDocumentLayout::setParentheses(currentBlock(), m_currentBlockParentheses); - BaseTextDocumentLayout::setFoldingIndent(currentBlock(), m_foldingIndent); + TextDocumentLayout::setParentheses(currentBlock(), m_currentBlockParentheses); + TextDocumentLayout::setFoldingIndent(currentBlock(), m_foldingIndent); } void QmlJSHighlighter::onOpeningParenthesis(QChar parenthesis, int pos, bool atStart) @@ -321,7 +321,7 @@ void QmlJSHighlighter::onOpeningParenthesis(QChar parenthesis, int pos, bool atS // if a folding block opens at the beginning of a line, treat the entire line // as if it were inside the folding block if (atStart) - BaseTextDocumentLayout::userData(currentBlock())->setFoldingStartIncluded(true); + TextDocumentLayout::userData(currentBlock())->setFoldingStartIncluded(true); } m_currentBlockParentheses.push_back(Parenthesis(Parenthesis::Opened, parenthesis, pos)); } @@ -331,7 +331,7 @@ void QmlJSHighlighter::onClosingParenthesis(QChar parenthesis, int pos, bool atE if (parenthesis == QLatin1Char('}') || parenthesis == QLatin1Char(']') || parenthesis == QLatin1Char('-')) { --m_braceDepth; if (atEnd) - BaseTextDocumentLayout::userData(currentBlock())->setFoldingEndIncluded(true); + TextDocumentLayout::userData(currentBlock())->setFoldingEndIncluded(true); else m_foldingIndent = qMin(m_braceDepth, m_foldingIndent); // folding indent is the minimum brace depth of a block } diff --git a/src/plugins/qmljseditor/qmljshighlighter.h b/src/plugins/qmljseditor/qmljshighlighter.h index 8979ce34b5..edb282744e 100644 --- a/src/plugins/qmljseditor/qmljshighlighter.h +++ b/src/plugins/qmljseditor/qmljshighlighter.h @@ -34,7 +34,7 @@ #include <qmljs/qmljsscanner.h> -#include <texteditor/basetextdocumentlayout.h> +#include <texteditor/textdocumentlayout.h> #include <texteditor/syntaxhighlighter.h> namespace QmlJSEditor { diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp index 60c55352a2..487f737b67 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.cpp +++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp @@ -45,7 +45,7 @@ #include <qmljs/parser/qmljsastfwd_p.h> #include <qmljs/qmljsutils.h> #include <qmljs/qmljsqrcparser.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/helpitem.h> #include <utils/tooltip/tooltip.h> #include <utils/tooltip/tipcontents.h> diff --git a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp index cdf21d7209..5e57d057e6 100644 --- a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp +++ b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp @@ -42,7 +42,7 @@ #include <qmljs/parser/qmljsastvisitor_p.h> #include <qmljs/qmljsstaticanalysismessage.h> #include <texteditor/syntaxhighlighter.h> -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <texteditor/texteditorconstants.h> #include <texteditor/fontsettings.h> #include <utils/algorithm.h> diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp index 45d13bb49e..1640ffb046 100644 --- a/src/plugins/qmljseditor/quicktoolbar.cpp +++ b/src/plugins/qmljseditor/quicktoolbar.cpp @@ -43,7 +43,7 @@ #include <qmljs/qmljsscopebuilder.h> #include <qmljs/qmljsevaluate.h> #include <qmljs/qmljsutils.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/tabsettings.h> #include <coreplugin/icore.h> diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index 5849c913ff..31b00169c1 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -48,7 +48,7 @@ #include <qtsupport/qmldumptool.h> #include <qtsupport/qtkitinformation.h> #include <qtsupport/qtsupportconstants.h> -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <utils/hostosinfo.h> #include <QDir> diff --git a/src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp b/src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp index 4ee95337cd..d7466fb4f9 100644 --- a/src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp +++ b/src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp @@ -47,7 +47,7 @@ CreatorCodeFormatter::CreatorCodeFormatter(const TextEditor::TabSettings &tabSet void CreatorCodeFormatter::saveBlockData(QTextBlock *block, const BlockData &data) const { - TextBlockUserData *userData = BaseTextDocumentLayout::userData(*block); + TextBlockUserData *userData = TextDocumentLayout::userData(*block); QmlJSCodeFormatterData *cppData = static_cast<QmlJSCodeFormatterData *>(userData->codeFormatterData()); if (!cppData) { cppData = new QmlJSCodeFormatterData; @@ -58,7 +58,7 @@ void CreatorCodeFormatter::saveBlockData(QTextBlock *block, const BlockData &dat bool CreatorCodeFormatter::loadBlockData(const QTextBlock &block, BlockData *data) const { - TextBlockUserData *userData = BaseTextDocumentLayout::testUserData(block); + TextBlockUserData *userData = TextDocumentLayout::testUserData(block); if (!userData) return false; QmlJSCodeFormatterData *cppData = static_cast<QmlJSCodeFormatterData *>(userData->codeFormatterData()); @@ -71,10 +71,10 @@ bool CreatorCodeFormatter::loadBlockData(const QTextBlock &block, BlockData *dat void CreatorCodeFormatter::saveLexerState(QTextBlock *block, int state) const { - BaseTextDocumentLayout::setLexerState(*block, state); + TextDocumentLayout::setLexerState(*block, state); } int CreatorCodeFormatter::loadLexerState(const QTextBlock &block) const { - return BaseTextDocumentLayout::lexerState(block); + return TextDocumentLayout::lexerState(block); } diff --git a/src/plugins/qmljstools/qmljsqtstylecodeformatter.h b/src/plugins/qmljstools/qmljsqtstylecodeformatter.h index 87df015ae0..244b50a60b 100644 --- a/src/plugins/qmljstools/qmljsqtstylecodeformatter.h +++ b/src/plugins/qmljstools/qmljsqtstylecodeformatter.h @@ -32,7 +32,7 @@ #include "qmljstools_global.h" -#include <texteditor/basetextdocumentlayout.h> +#include <texteditor/textdocumentlayout.h> #include <qmljs/qmljscodeformatter.h> namespace TextEditor { class TabSettings; } diff --git a/src/plugins/qmljstools/qmljsrefactoringchanges.cpp b/src/plugins/qmljstools/qmljsrefactoringchanges.cpp index 971e926e96..011e92cc9b 100644 --- a/src/plugins/qmljstools/qmljsrefactoringchanges.cpp +++ b/src/plugins/qmljstools/qmljsrefactoringchanges.cpp @@ -33,7 +33,7 @@ #include "qmljsindenter.h" #include <qmljs/parser/qmljsast_p.h> -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <texteditor/tabsettings.h> #include <projectexplorer/editorconfiguration.h> diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 9528f3595d..4fbb675bd6 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -51,7 +51,7 @@ #include <projectexplorer/session.h> #include <projectexplorer/kitinformation.h> #include <projectexplorer/localapplicationrunconfiguration.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <coreplugin/coreconstants.h> #include <coreplugin/editormanager/editormanager.h> diff --git a/src/plugins/qnx/bardescriptoreditor.cpp b/src/plugins/qnx/bardescriptoreditor.cpp index dee7b4fae8..94a59bded3 100644 --- a/src/plugins/qnx/bardescriptoreditor.cpp +++ b/src/plugins/qnx/bardescriptoreditor.cpp @@ -39,7 +39,7 @@ #include <projectexplorer/task.h> #include <projectexplorer/taskhub.h> #include <texteditor/texteditorconstants.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/tabsettings.h> #include <utils/linecolumnlabel.h> #include <utils/qtcassert.h> diff --git a/src/plugins/qnx/bardescriptoreditorwidget.cpp b/src/plugins/qnx/bardescriptoreditorwidget.cpp index d38586848a..bcbd234b53 100644 --- a/src/plugins/qnx/bardescriptoreditorwidget.cpp +++ b/src/plugins/qnx/bardescriptoreditorwidget.cpp @@ -47,8 +47,8 @@ #include <projectexplorer/propertiespanel.h> #include <projectexplorer/task.h> #include <projectexplorer/taskhub.h> -#include <texteditor/basetextdocument.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/textdocument.h> +#include <texteditor/texteditor.h> #include <texteditor/texteditorconstants.h> #include <texteditor/normalindenter.h> #include <utils/qtcassert.h> diff --git a/src/plugins/texteditor/autocompleter.cpp b/src/plugins/texteditor/autocompleter.cpp index d2c9a95db0..2bd0dada6c 100644 --- a/src/plugins/texteditor/autocompleter.cpp +++ b/src/plugins/texteditor/autocompleter.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "autocompleter.h" -#include "basetextdocumentlayout.h" +#include "textdocumentlayout.h" #include "tabsettings.h" #include <QDebug> @@ -89,8 +89,8 @@ void AutoCompleter::countBrackets(QTextCursor cursor, cursor.setPosition(from); QTextBlock block = cursor.block(); while (block.isValid() && block.position() < end) { - TextEditor::Parentheses parenList = TextEditor::BaseTextDocumentLayout::parentheses(block); - if (!parenList.isEmpty() && !TextEditor::BaseTextDocumentLayout::ifdefedOut(block)) { + TextEditor::Parentheses parenList = TextEditor::TextDocumentLayout::parentheses(block); + if (!parenList.isEmpty() && !TextEditor::TextDocumentLayout::ifdefedOut(block)) { for (int i = 0; i < parenList.count(); ++i) { TextEditor::Parenthesis paren = parenList.at(i); int position = block.position() + paren.pos; @@ -273,7 +273,7 @@ int AutoCompleter::paragraphSeparatorAboutToBeInserted(QTextCursor &cursor, // verify that we indeed do have an extra opening brace in the document QTextBlock block = cursor.block(); const QString textFromCusror = block.text().mid(cursor.positionInBlock()).trimmed(); - int braceDepth = BaseTextDocumentLayout::braceDepth(doc->lastBlock()); + int braceDepth = TextDocumentLayout::braceDepth(doc->lastBlock()); if (braceDepth <= 0 && (textFromCusror.isEmpty() || textFromCusror.at(0) != QLatin1Char('}'))) return 0; // braces are all balanced or worse, no need to do anything and separator inserted not between '{' and '}' diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 7879788568..6dea2efafc 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -37,7 +37,7 @@ #include <coreplugin/dialogs/readonlyfilesdialog.h> #include <coreplugin/documentmanager.h> #include <coreplugin/find/ifindsupport.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/refactoringchanges.h> #include <utils/stylehelper.h> #include <utils/qtcassert.h> diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp index 7a46d5fb11..c4c0457aa7 100644 --- a/src/plugins/texteditor/basehoverhandler.cpp +++ b/src/plugins/texteditor/basehoverhandler.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "basehoverhandler.h" -#include "basetexteditor.h" +#include "texteditor.h" #include <coreplugin/icore.h> #include <utils/tooltip/tooltip.h> diff --git a/src/plugins/texteditor/circularclipboardassist.cpp b/src/plugins/texteditor/circularclipboardassist.cpp index 711215dd34..15f6d699da 100644 --- a/src/plugins/texteditor/circularclipboardassist.cpp +++ b/src/plugins/texteditor/circularclipboardassist.cpp @@ -34,7 +34,7 @@ #include "codeassist/assistproposalitem.h" #include "codeassist/genericproposalmodel.h" #include "codeassist/genericproposal.h" -#include "basetexteditor.h" +#include "texteditor.h" #include "circularclipboard.h" #include <coreplugin/coreconstants.h> diff --git a/src/plugins/texteditor/codeassist/assistproposalitem.cpp b/src/plugins/texteditor/codeassist/assistproposalitem.cpp index 5477d73a58..125f1b630c 100644 --- a/src/plugins/texteditor/codeassist/assistproposalitem.cpp +++ b/src/plugins/texteditor/codeassist/assistproposalitem.cpp @@ -29,7 +29,7 @@ #include "assistproposalitem.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/quickfix.h> #include <QTextCursor> diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp index 8e62ba2e02..cf2088b8a7 100644 --- a/src/plugins/texteditor/codeassist/codeassistant.cpp +++ b/src/plugins/texteditor/codeassist/codeassistant.cpp @@ -37,7 +37,7 @@ #include "assistproposalitem.h" #include "runner.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <texteditor/texteditorsettings.h> #include <texteditor/completionsettings.h> #include <coreplugin/editormanager/editormanager.h> diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp index 07dc2f8167..1b16b7b848 100644 --- a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp +++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp @@ -35,7 +35,7 @@ #include <texteditor/codeassist/genericproposalmodel.h> #include <texteditor/completionsettings.h> #include <texteditor/texteditorsettings.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> namespace TextEditor { diff --git a/src/plugins/texteditor/codecselector.cpp b/src/plugins/texteditor/codecselector.cpp index 0e3a0f887a..468a8cfaec 100644 --- a/src/plugins/texteditor/codecselector.cpp +++ b/src/plugins/texteditor/codecselector.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "codecselector.h" -#include "basetextdocument.h" +#include "textdocument.h" #include <utils/algorithm.h> #include <utils/itemviews.h> diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp index 43a4b7ce40..3f5320bf70 100644 --- a/src/plugins/texteditor/findincurrentfile.cpp +++ b/src/plugins/texteditor/findincurrentfile.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "findincurrentfile.h" -#include "basetexteditor.h" +#include "texteditor.h" #include <utils/filesearch.h> #include <coreplugin/icore.h> diff --git a/src/plugins/texteditor/findinopenfiles.cpp b/src/plugins/texteditor/findinopenfiles.cpp index dd1995e58c..52d3843c1f 100644 --- a/src/plugins/texteditor/findinopenfiles.cpp +++ b/src/plugins/texteditor/findinopenfiles.cpp @@ -28,8 +28,8 @@ ****************************************************************************/ #include "findinopenfiles.h" -#include "basetextdocument.h" -#include "basetexteditor.h" +#include "textdocument.h" +#include "texteditor.h" #include <utils/filesearch.h> #include <coreplugin/icore.h> diff --git a/src/plugins/texteditor/generichighlighter/highlighter.cpp b/src/plugins/texteditor/generichighlighter/highlighter.cpp index 30abec11f7..889c91510c 100644 --- a/src/plugins/texteditor/generichighlighter/highlighter.cpp +++ b/src/plugins/texteditor/generichighlighter/highlighter.cpp @@ -69,7 +69,7 @@ public: HighlighterCodeFormatterData *formatterData(const QTextBlock &block) { HighlighterCodeFormatterData *data = 0; - if (TextBlockUserData *userData = BaseTextDocumentLayout::userData(block)) { + if (TextBlockUserData *userData = TextDocumentLayout::userData(block)) { data = static_cast<HighlighterCodeFormatterData *>(userData->codeFormatterData()); if (!data) { data = new HighlighterCodeFormatterData; @@ -564,7 +564,7 @@ int Highlighter::computeState(const int observableState) const void Highlighter::applyRegionBasedFolding() const { int folding = 0; - TextBlockUserData *currentBlockUserData = BaseTextDocumentLayout::userData(currentBlock()); + TextBlockUserData *currentBlockUserData = TextDocumentLayout::userData(currentBlock()); HighlighterCodeFormatterData *data = formatterData(currentBlock()); HighlighterCodeFormatterData *previousData = formatterData(currentBlock().previous()); if (previousData) { @@ -574,7 +574,7 @@ void Highlighter::applyRegionBasedFolding() const if (data->m_foldingIndentDelta > 0) currentBlockUserData->setFoldingStartIncluded(true); else - BaseTextDocumentLayout::userData(currentBlock().previous())->setFoldingEndIncluded(false); + TextDocumentLayout::userData(currentBlock().previous())->setFoldingEndIncluded(false); data->m_foldingIndentDelta = 0; } } @@ -584,7 +584,7 @@ void Highlighter::applyRegionBasedFolding() const void Highlighter::applyIndentationBasedFolding(const QString &text) const { - TextBlockUserData *data = BaseTextDocumentLayout::userData(currentBlock()); + TextBlockUserData *data = TextDocumentLayout::userData(currentBlock()); data->setFoldingEndIncluded(true); // If this line is empty, check its neighbours. They all might be part of the same block. diff --git a/src/plugins/texteditor/generichighlighter/highlighter.h b/src/plugins/texteditor/generichighlighter/highlighter.h index 856310ee8c..5cf089cfa8 100644 --- a/src/plugins/texteditor/generichighlighter/highlighter.h +++ b/src/plugins/texteditor/generichighlighter/highlighter.h @@ -33,7 +33,7 @@ #include "context.h" // Yes, this is correct. These are found somewhere else when building the autotest. -#include <basetextdocumentlayout.h> +#include <textdocumentlayout.h> #include <syntaxhighlighter.h> #include <QString> diff --git a/src/plugins/texteditor/linenumberfilter.cpp b/src/plugins/texteditor/linenumberfilter.cpp index d62ca62804..d891751d52 100644 --- a/src/plugins/texteditor/linenumberfilter.cpp +++ b/src/plugins/texteditor/linenumberfilter.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "linenumberfilter.h" -#include "basetexteditor.h" +#include "texteditor.h" #include <coreplugin/coreconstants.h> #include <coreplugin/editormanager/editormanager.h> diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp index 78b4e0800c..e877dcb06a 100644 --- a/src/plugins/texteditor/plaintexteditorfactory.cpp +++ b/src/plugins/texteditor/plaintexteditorfactory.cpp @@ -28,8 +28,8 @@ ****************************************************************************/ #include "plaintexteditorfactory.h" -#include "basetexteditor.h" -#include "basetextdocument.h" +#include "texteditor.h" +#include "textdocument.h" #include "normalindenter.h" #include "texteditoractionhandler.h" #include "texteditorconstants.h" diff --git a/src/plugins/texteditor/plaintexteditorfactory.h b/src/plugins/texteditor/plaintexteditorfactory.h index 8a90f1fc81..2d9ef20a2e 100644 --- a/src/plugins/texteditor/plaintexteditorfactory.h +++ b/src/plugins/texteditor/plaintexteditorfactory.h @@ -30,7 +30,7 @@ #ifndef PLAINTEXTEDITORFACTORY_H #define PLAINTEXTEDITORFACTORY_H -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> namespace TextEditor { diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp index d50495d1b8..d3fe397206 100644 --- a/src/plugins/texteditor/refactoringchanges.cpp +++ b/src/plugins/texteditor/refactoringchanges.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "refactoringchanges.h" -#include "basetexteditor.h" +#include "texteditor.h" #include <coreplugin/icore.h> #include <coreplugin/dialogs/readonlyfilesdialog.h> diff --git a/src/plugins/texteditor/refactoroverlay.cpp b/src/plugins/texteditor/refactoroverlay.cpp index b61ea726e3..64dd458b27 100644 --- a/src/plugins/texteditor/refactoroverlay.cpp +++ b/src/plugins/texteditor/refactoroverlay.cpp @@ -28,8 +28,8 @@ ****************************************************************************/ #include "refactoroverlay.h" -#include "basetextdocumentlayout.h" -#include "basetexteditor.h" +#include "textdocumentlayout.h" +#include "texteditor.h" #include <QPainter> @@ -52,7 +52,7 @@ void RefactorOverlay::paint(QPainter *painter, const QRect &clip) paintMarker(m_markers.at(i), painter, clip); } - if (BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(m_editor->document()->documentLayout())) + if (TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(m_editor->document()->documentLayout())) documentLayout->setRequiredWidth(m_maxWidth); } diff --git a/src/plugins/texteditor/snippets/snippeteditor.cpp b/src/plugins/texteditor/snippets/snippeteditor.cpp index bfe9b9c93c..42216125d4 100644 --- a/src/plugins/texteditor/snippets/snippeteditor.cpp +++ b/src/plugins/texteditor/snippets/snippeteditor.cpp @@ -29,7 +29,7 @@ #include "snippeteditor.h" -#include <texteditor/basetextdocument.h> +#include <texteditor/textdocument.h> #include <texteditor/texteditorconstants.h> #include <texteditor/texteditorsettings.h> #include <utils/qtcassert.h> diff --git a/src/plugins/texteditor/snippets/snippeteditor.h b/src/plugins/texteditor/snippets/snippeteditor.h index 21f6f7bcbb..51701b84dd 100644 --- a/src/plugins/texteditor/snippets/snippeteditor.h +++ b/src/plugins/texteditor/snippets/snippeteditor.h @@ -31,7 +31,7 @@ #define SNIPPETEDITOR_H #include <texteditor/texteditor_global.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> namespace TextEditor { diff --git a/src/plugins/texteditor/syntaxhighlighter.cpp b/src/plugins/texteditor/syntaxhighlighter.cpp index 807ff8ba28..79bab51a29 100644 --- a/src/plugins/texteditor/syntaxhighlighter.cpp +++ b/src/plugins/texteditor/syntaxhighlighter.cpp @@ -28,8 +28,8 @@ ****************************************************************************/ #include "syntaxhighlighter.h" -#include "basetextdocument.h" -#include "basetextdocumentlayout.h" +#include "textdocument.h" +#include "textdocumentlayout.h" #include "texteditorsettings.h" #include "fontsettings.h" @@ -79,7 +79,7 @@ public: QTextBlock currentBlock; bool rehighlightPending; bool inReformatBlocks; - BaseTextDocumentLayout::FoldValidator foldValidator; + TextDocumentLayout::FoldValidator foldValidator; QVector<QTextCharFormat> formats; QVector<TextEditor::TextStyle> formatCategories; }; @@ -327,7 +327,7 @@ void SyntaxHighlighter::setDocument(QTextDocument *doc) this, SLOT(_q_reformatBlocks(int,int,int))); d->rehighlightPending = true; QTimer::singleShot(0, this, SLOT(_q_delayedRehighlight())); - d->foldValidator.setup(qobject_cast<BaseTextDocumentLayout *>(doc->documentLayout())); + d->foldValidator.setup(qobject_cast<TextDocumentLayout *>(doc->documentLayout())); } } diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/textdocument.cpp index a49219342a..c72b16329f 100644 --- a/src/plugins/texteditor/basetextdocument.cpp +++ b/src/plugins/texteditor/textdocument.cpp @@ -27,10 +27,8 @@ ** ****************************************************************************/ -#include "basetextdocument.h" +#include "textdocument.h" -#include "basetextdocumentlayout.h" -#include "basetexteditor.h" #include "convenience.h" #include "extraencodingsettings.h" #include "fontsettings.h" @@ -38,6 +36,8 @@ #include "storagesettings.h" #include "syntaxhighlighter.h" #include "tabsettings.h" +#include "textdocumentlayout.h" +#include "texteditor.h" #include "texteditorconstants.h" #include "typingsettings.h" #include <texteditor/generichighlighter/highlighter.h> @@ -159,7 +159,7 @@ QTextCursor TextDocumentPrivate::indentOrUnindent(const QTextCursor &textCursor, void TextDocumentPrivate::resetRevisions() { - BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(m_document.documentLayout()); + TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(m_document.documentLayout()); QTC_ASSERT(documentLayout, return); documentLayout->lastSaveRevision = m_document.revision(); @@ -169,7 +169,7 @@ void TextDocumentPrivate::resetRevisions() void TextDocumentPrivate::updateRevisions() { - BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(m_document.documentLayout()); + TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(m_document.documentLayout()); QTC_ASSERT(documentLayout, return); int oldLastSaveRevision = documentLayout->lastSaveRevision; documentLayout->lastSaveRevision = m_document.revision(); @@ -210,7 +210,7 @@ TextDocument::TextDocument(Id id) | QTextOption::AddSpaceForLineAndParagraphSeparators ); d->m_document.setDefaultTextOption(opt); - d->m_document.setDocumentLayout(new BaseTextDocumentLayout(&d->m_document)); + d->m_document.setDocumentLayout(new TextDocumentLayout(&d->m_document)); if (id.isValid()) setId(id); @@ -362,7 +362,7 @@ void TextDocument::setIndenter(Indenter *indenter) { // clear out existing code formatter data for (QTextBlock it = document()->begin(); it.isValid(); it = it.next()) { - TextBlockUserData *userData = BaseTextDocumentLayout::testUserData(it); + TextBlockUserData *userData = TextDocumentLayout::testUserData(it); if (userData) userData->setCodeFormatterData(0); } @@ -579,8 +579,8 @@ bool TextDocument::open(QString *errorString, const QString &fileName, const QSt d->m_document.setUndoRedoEnabled(true); interface.reportFinished(); } - BaseTextDocumentLayout *documentLayout = - qobject_cast<BaseTextDocumentLayout*>(d->m_document.documentLayout()); + TextDocumentLayout *documentLayout = + qobject_cast<TextDocumentLayout*>(d->m_document.documentLayout()); QTC_ASSERT(documentLayout, return true); documentLayout->lastSaveRevision = d->m_autoSaveRevision = d->m_document.revision(); d->updateRevisions(); @@ -601,8 +601,8 @@ bool TextDocument::reload(QString *errorString, QTextCodec *codec) bool TextDocument::reload(QString *errorString) { emit aboutToReload(); - BaseTextDocumentLayout *documentLayout = - qobject_cast<BaseTextDocumentLayout*>(d->m_document.documentLayout()); + TextDocumentLayout *documentLayout = + qobject_cast<TextDocumentLayout*>(d->m_document.documentLayout()); TextMarks marks; if (documentLayout) marks = documentLayout->documentClosing(); // removes text marks non-permanently @@ -664,7 +664,7 @@ void TextDocument::cleanWhitespace(const QTextCursor &cursor) void TextDocument::cleanWhitespace(QTextCursor &cursor, bool cleanIndentation, bool inEntireDocument) { - BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(d->m_document.documentLayout()); + TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(d->m_document.documentLayout()); Q_ASSERT(cursor.visualNavigation() == false); QTextBlock block = d->m_document.findBlock(cursor.selectionStart()); @@ -720,12 +720,12 @@ bool TextDocument::addMark(TextMark *mark) return false; QTC_ASSERT(mark->lineNumber() >= 1, return false); int blockNumber = mark->lineNumber() - 1; - auto documentLayout = qobject_cast<BaseTextDocumentLayout*>(d->m_document.documentLayout()); + auto documentLayout = qobject_cast<TextDocumentLayout*>(d->m_document.documentLayout()); QTC_ASSERT(documentLayout, return false); QTextBlock block = d->m_document.findBlockByNumber(blockNumber); if (block.isValid()) { - TextBlockUserData *userData = BaseTextDocumentLayout::userData(block); + TextBlockUserData *userData = TextDocumentLayout::userData(block); userData->addMark(mark); d->m_marksCache.append(mark); mark->updateLineNumber(blockNumber + 1); @@ -755,7 +755,7 @@ TextMarks TextDocument::marksAt(int line) const QTextBlock block = d->m_document.findBlockByNumber(blockNumber); if (block.isValid()) { - if (TextBlockUserData *userData = BaseTextDocumentLayout::testUserData(block)) + if (TextBlockUserData *userData = TextDocumentLayout::testUserData(block)) return userData->marks(); } return TextMarks(); @@ -763,7 +763,7 @@ TextMarks TextDocument::marksAt(int line) const void TextDocument::removeMarkFromMarksCache(TextMark *mark) { - auto documentLayout = qobject_cast<BaseTextDocumentLayout*>(d->m_document.documentLayout()); + auto documentLayout = qobject_cast<TextDocumentLayout*>(d->m_document.documentLayout()); QTC_ASSERT(documentLayout, return); d->m_marksCache.removeAll(mark); @@ -816,7 +816,7 @@ void TextDocument::removeMark(TextMark *mark) void TextDocument::updateMark(TextMark *mark) { Q_UNUSED(mark) - auto documentLayout = qobject_cast<BaseTextDocumentLayout*>(d->m_document.documentLayout()); + auto documentLayout = qobject_cast<TextDocumentLayout*>(d->m_document.documentLayout()); QTC_ASSERT(documentLayout, return); documentLayout->requestUpdate(); } @@ -824,7 +824,7 @@ void TextDocument::updateMark(TextMark *mark) void TextDocument::moveMark(TextMark *mark, int previousLine) { QTextBlock block = d->m_document.findBlockByNumber(previousLine - 1); - if (TextBlockUserData *data = BaseTextDocumentLayout::testUserData(block)) { + if (TextBlockUserData *data = TextDocumentLayout::testUserData(block)) { if (!data->removeMark(mark)) qDebug() << "Could not find mark" << mark << "on line" << previousLine; } diff --git a/src/plugins/texteditor/basetextdocument.h b/src/plugins/texteditor/textdocument.h index 55ba153982..55ba153982 100644 --- a/src/plugins/texteditor/basetextdocument.h +++ b/src/plugins/texteditor/textdocument.h diff --git a/src/plugins/texteditor/basetextdocumentlayout.cpp b/src/plugins/texteditor/textdocumentlayout.cpp index 012193303a..01cc3a0cae 100644 --- a/src/plugins/texteditor/basetextdocumentlayout.cpp +++ b/src/plugins/texteditor/textdocumentlayout.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "basetextdocumentlayout.h" +#include "textdocumentlayout.h" #include <utils/qtcassert.h> #include <QDebug> @@ -66,10 +66,10 @@ int TextBlockUserData::braceDepthDelta() const TextBlockUserData::MatchType TextBlockUserData::checkOpenParenthesis(QTextCursor *cursor, QChar c) { QTextBlock block = cursor->block(); - if (!BaseTextDocumentLayout::hasParentheses(block) || BaseTextDocumentLayout::ifdefedOut(block)) + if (!TextDocumentLayout::hasParentheses(block) || TextDocumentLayout::ifdefedOut(block)) return NoMatch; - Parentheses parenList = BaseTextDocumentLayout::parentheses(block); + Parentheses parenList = TextDocumentLayout::parentheses(block); Parenthesis openParen, closedParen; QTextBlock closedParenParag = block; @@ -96,9 +96,9 @@ TextBlockUserData::MatchType TextBlockUserData::checkOpenParenthesis(QTextCursor closedParenParag = closedParenParag.next(); if (!closedParenParag.isValid()) return NoMatch; - if (BaseTextDocumentLayout::hasParentheses(closedParenParag) - && !BaseTextDocumentLayout::ifdefedOut(closedParenParag)) { - parenList = BaseTextDocumentLayout::parentheses(closedParenParag); + if (TextDocumentLayout::hasParentheses(closedParenParag) + && !TextDocumentLayout::ifdefedOut(closedParenParag)) { + parenList = TextDocumentLayout::parentheses(closedParenParag); break; } } @@ -135,10 +135,10 @@ TextBlockUserData::MatchType TextBlockUserData::checkOpenParenthesis(QTextCursor TextBlockUserData::MatchType TextBlockUserData::checkClosedParenthesis(QTextCursor *cursor, QChar c) { QTextBlock block = cursor->block(); - if (!BaseTextDocumentLayout::hasParentheses(block) || BaseTextDocumentLayout::ifdefedOut(block)) + if (!TextDocumentLayout::hasParentheses(block) || TextDocumentLayout::ifdefedOut(block)) return NoMatch; - Parentheses parenList = BaseTextDocumentLayout::parentheses(block); + Parentheses parenList = TextDocumentLayout::parentheses(block); Parenthesis openParen, closedParen; QTextBlock openParenParag = block; @@ -166,9 +166,9 @@ TextBlockUserData::MatchType TextBlockUserData::checkClosedParenthesis(QTextCurs if (!openParenParag.isValid()) return NoMatch; - if (BaseTextDocumentLayout::hasParentheses(openParenParag) - && !BaseTextDocumentLayout::ifdefedOut(openParenParag)) { - parenList = BaseTextDocumentLayout::parentheses(openParenParag); + if (TextDocumentLayout::hasParentheses(openParenParag) + && !TextDocumentLayout::ifdefedOut(openParenParag)) { + parenList = TextDocumentLayout::parentheses(openParenParag); break; } } @@ -207,8 +207,8 @@ bool TextBlockUserData::findPreviousOpenParenthesis(QTextCursor *cursor, bool se int position = cursor->position(); int ignore = 0; while (block.isValid()) { - Parentheses parenList = BaseTextDocumentLayout::parentheses(block); - if (!parenList.isEmpty() && !BaseTextDocumentLayout::ifdefedOut(block)) { + Parentheses parenList = TextDocumentLayout::parentheses(block); + if (!parenList.isEmpty() && !TextDocumentLayout::ifdefedOut(block)) { for (int i = parenList.count()-1; i >= 0; --i) { Parenthesis paren = parenList.at(i); if (block == cursor->block() && @@ -237,8 +237,8 @@ bool TextBlockUserData::findPreviousBlockOpenParenthesis(QTextCursor *cursor, bo int position = cursor->position(); int ignore = 0; while (block.isValid()) { - Parentheses parenList = BaseTextDocumentLayout::parentheses(block); - if (!parenList.isEmpty() && !BaseTextDocumentLayout::ifdefedOut(block)) { + Parentheses parenList = TextDocumentLayout::parentheses(block); + if (!parenList.isEmpty() && !TextDocumentLayout::ifdefedOut(block)) { for (int i = parenList.count()-1; i >= 0; --i) { Parenthesis paren = parenList.at(i); if (paren.chr != QLatin1Char('{') && paren.chr != QLatin1Char('}') @@ -271,8 +271,8 @@ bool TextBlockUserData::findNextClosingParenthesis(QTextCursor *cursor, bool sel int position = cursor->position(); int ignore = 0; while (block.isValid()) { - Parentheses parenList = BaseTextDocumentLayout::parentheses(block); - if (!parenList.isEmpty() && !BaseTextDocumentLayout::ifdefedOut(block)) { + Parentheses parenList = TextDocumentLayout::parentheses(block); + if (!parenList.isEmpty() && !TextDocumentLayout::ifdefedOut(block)) { for (int i = 0; i < parenList.count(); ++i) { Parenthesis paren = parenList.at(i); if (block == cursor->block() && @@ -299,8 +299,8 @@ bool TextBlockUserData::findNextBlockClosingParenthesis(QTextCursor *cursor) int position = cursor->position(); int ignore = 0; while (block.isValid()) { - Parentheses parenList = BaseTextDocumentLayout::parentheses(block); - if (!parenList.isEmpty() && !BaseTextDocumentLayout::ifdefedOut(block)) { + Parentheses parenList = TextDocumentLayout::parentheses(block); + if (!parenList.isEmpty() && !TextDocumentLayout::ifdefedOut(block)) { for (int i = 0; i < parenList.count(); ++i) { Parenthesis paren = parenList.at(i); if (paren.chr != QLatin1Char('{') && paren.chr != QLatin1Char('}') @@ -329,12 +329,12 @@ TextBlockUserData::MatchType TextBlockUserData::matchCursorBackward(QTextCursor cursor->clearSelection(); const QTextBlock block = cursor->block(); - if (!BaseTextDocumentLayout::hasParentheses(block) || BaseTextDocumentLayout::ifdefedOut(block)) + if (!TextDocumentLayout::hasParentheses(block) || TextDocumentLayout::ifdefedOut(block)) return NoMatch; const int relPos = cursor->position() - block.position(); - Parentheses parentheses = BaseTextDocumentLayout::parentheses(block); + Parentheses parentheses = TextDocumentLayout::parentheses(block); const Parentheses::const_iterator cend = parentheses.constEnd(); for (Parentheses::const_iterator it = parentheses.constBegin();it != cend; ++it) { const Parenthesis &paren = *it; @@ -351,12 +351,12 @@ TextBlockUserData::MatchType TextBlockUserData::matchCursorForward(QTextCursor * cursor->clearSelection(); const QTextBlock block = cursor->block(); - if (!BaseTextDocumentLayout::hasParentheses(block) || BaseTextDocumentLayout::ifdefedOut(block)) + if (!TextDocumentLayout::hasParentheses(block) || TextDocumentLayout::ifdefedOut(block)) return NoMatch; const int relPos = cursor->position() - block.position(); - Parentheses parentheses = BaseTextDocumentLayout::parentheses(block); + Parentheses parentheses = TextDocumentLayout::parentheses(block); const Parentheses::const_iterator cend = parentheses.constEnd(); for (Parentheses::const_iterator it = parentheses.constBegin();it != cend; ++it) { const Parenthesis &paren = *it; @@ -387,7 +387,7 @@ void TextBlockUserData::addMark(TextMark *mark) } -BaseTextDocumentLayout::BaseTextDocumentLayout(QTextDocument *doc) +TextDocumentLayout::TextDocumentLayout(QTextDocument *doc) : QPlainTextDocumentLayout(doc), lastSaveRevision(0), hasMarks(false), @@ -395,12 +395,12 @@ BaseTextDocumentLayout::BaseTextDocumentLayout(QTextDocument *doc) m_requiredWidth(0) {} -BaseTextDocumentLayout::~BaseTextDocumentLayout() +TextDocumentLayout::~TextDocumentLayout() { documentClosing(); } -void BaseTextDocumentLayout::setParentheses(const QTextBlock &block, const Parentheses &parentheses) +void TextDocumentLayout::setParentheses(const QTextBlock &block, const Parentheses &parentheses) { if (parentheses.isEmpty()) { if (TextBlockUserData *userData = testUserData(block)) @@ -410,47 +410,47 @@ void BaseTextDocumentLayout::setParentheses(const QTextBlock &block, const Paren } } -Parentheses BaseTextDocumentLayout::parentheses(const QTextBlock &block) +Parentheses TextDocumentLayout::parentheses(const QTextBlock &block) { if (TextBlockUserData *userData = testUserData(block)) return userData->parentheses(); return Parentheses(); } -bool BaseTextDocumentLayout::hasParentheses(const QTextBlock &block) +bool TextDocumentLayout::hasParentheses(const QTextBlock &block) { if (TextBlockUserData *userData = testUserData(block)) return userData->hasParentheses(); return false; } -bool BaseTextDocumentLayout::setIfdefedOut(const QTextBlock &block) +bool TextDocumentLayout::setIfdefedOut(const QTextBlock &block) { return userData(block)->setIfdefedOut(); } -bool BaseTextDocumentLayout::clearIfdefedOut(const QTextBlock &block) +bool TextDocumentLayout::clearIfdefedOut(const QTextBlock &block) { if (TextBlockUserData *userData = testUserData(block)) return userData->clearIfdefedOut(); return false; } -bool BaseTextDocumentLayout::ifdefedOut(const QTextBlock &block) +bool TextDocumentLayout::ifdefedOut(const QTextBlock &block) { if (TextBlockUserData *userData = testUserData(block)) return userData->ifdefedOut(); return false; } -int BaseTextDocumentLayout::braceDepthDelta(const QTextBlock &block) +int TextDocumentLayout::braceDepthDelta(const QTextBlock &block) { if (TextBlockUserData *userData = testUserData(block)) return userData->braceDepthDelta(); return 0; } -int BaseTextDocumentLayout::braceDepth(const QTextBlock &block) +int TextDocumentLayout::braceDepth(const QTextBlock &block) { int state = block.userState(); if (state == -1) @@ -458,7 +458,7 @@ int BaseTextDocumentLayout::braceDepth(const QTextBlock &block) return state >> 8; } -void BaseTextDocumentLayout::setBraceDepth(QTextBlock &block, int depth) +void TextDocumentLayout::setBraceDepth(QTextBlock &block, int depth) { int state = block.userState(); if (state == -1) @@ -467,13 +467,13 @@ void BaseTextDocumentLayout::setBraceDepth(QTextBlock &block, int depth) block.setUserState((depth << 8) | state); } -void BaseTextDocumentLayout::changeBraceDepth(QTextBlock &block, int delta) +void TextDocumentLayout::changeBraceDepth(QTextBlock &block, int delta) { if (delta) setBraceDepth(block, braceDepth(block) + delta); } -void BaseTextDocumentLayout::setLexerState(const QTextBlock &block, int state) +void TextDocumentLayout::setLexerState(const QTextBlock &block, int state) { if (state == 0) { if (TextBlockUserData *userData = testUserData(block)) @@ -483,14 +483,14 @@ void BaseTextDocumentLayout::setLexerState(const QTextBlock &block, int state) } } -int BaseTextDocumentLayout::lexerState(const QTextBlock &block) +int TextDocumentLayout::lexerState(const QTextBlock &block) { if (TextBlockUserData *userData = testUserData(block)) return userData->lexerState(); return 0; } -void BaseTextDocumentLayout::setFoldingIndent(const QTextBlock &block, int indent) +void TextDocumentLayout::setFoldingIndent(const QTextBlock &block, int indent) { if (indent == 0) { if (TextBlockUserData *userData = testUserData(block)) @@ -500,32 +500,32 @@ void BaseTextDocumentLayout::setFoldingIndent(const QTextBlock &block, int inden } } -int BaseTextDocumentLayout::foldingIndent(const QTextBlock &block) +int TextDocumentLayout::foldingIndent(const QTextBlock &block) { if (TextBlockUserData *userData = testUserData(block)) return userData->foldingIndent(); return 0; } -void BaseTextDocumentLayout::changeFoldingIndent(QTextBlock &block, int delta) +void TextDocumentLayout::changeFoldingIndent(QTextBlock &block, int delta) { if (delta) setFoldingIndent(block, foldingIndent(block) + delta); } -bool BaseTextDocumentLayout::canFold(const QTextBlock &block) +bool TextDocumentLayout::canFold(const QTextBlock &block) { return (block.next().isValid() && foldingIndent(block.next()) > foldingIndent(block)); } -bool BaseTextDocumentLayout::isFolded(const QTextBlock &block) +bool TextDocumentLayout::isFolded(const QTextBlock &block) { if (TextBlockUserData *userData = testUserData(block)) return userData->folded(); return false; } -void BaseTextDocumentLayout::setFolded(const QTextBlock &block, bool folded) +void TextDocumentLayout::setFolded(const QTextBlock &block, bool folded) { if (folded) userData(block)->setFolded(true); @@ -533,12 +533,12 @@ void BaseTextDocumentLayout::setFolded(const QTextBlock &block, bool folded) return userData->setFolded(false); } -void BaseTextDocumentLayout::requestExtraAreaUpdate() +void TextDocumentLayout::requestExtraAreaUpdate() { emit updateExtraArea(); } -void BaseTextDocumentLayout::doFoldOrUnfold(const QTextBlock& block, bool unfold) +void TextDocumentLayout::doFoldOrUnfold(const QTextBlock& block, bool unfold) { if (!canFold(block)) return; @@ -562,7 +562,7 @@ void BaseTextDocumentLayout::doFoldOrUnfold(const QTextBlock& block, bool unfold setFolded(block, !unfold); } -void BaseTextDocumentLayout::setRequiredWidth(int width) +void TextDocumentLayout::setRequiredWidth(int width) { int oldw = m_requiredWidth; m_requiredWidth = width; @@ -572,14 +572,14 @@ void BaseTextDocumentLayout::setRequiredWidth(int width) } -QSizeF BaseTextDocumentLayout::documentSize() const +QSizeF TextDocumentLayout::documentSize() const { QSizeF size = QPlainTextDocumentLayout::documentSize(); size.setWidth(qMax((qreal)m_requiredWidth, size.width())); return size; } -TextMarks BaseTextDocumentLayout::documentClosing() +TextMarks TextDocumentLayout::documentClosing() { TextMarks marks; QTextBlock block = document()->begin(); @@ -591,13 +591,13 @@ TextMarks BaseTextDocumentLayout::documentClosing() return marks; } -void BaseTextDocumentLayout::documentReloaded(TextMarks marks, TextDocument *baseTextDocument) +void TextDocumentLayout::documentReloaded(TextMarks marks, TextDocument *baseTextDocument) { foreach (TextMark *mark, marks) { int blockNumber = mark->lineNumber() - 1; QTextBlock block = document()->findBlockByNumber(blockNumber); if (block.isValid()) { - TextBlockUserData *userData = BaseTextDocumentLayout::userData(block); + TextBlockUserData *userData = TextDocumentLayout::userData(block); userData->addMark(mark); mark->setBaseTextDocument(baseTextDocument); mark->updateBlock(block); @@ -610,7 +610,7 @@ void BaseTextDocumentLayout::documentReloaded(TextMarks marks, TextDocument *bas requestUpdate(); } -void BaseTextDocumentLayout::updateMarksLineNumber() +void TextDocumentLayout::updateMarksLineNumber() { // Note: the breakpointmanger deletes breakpoint marks and readds them // if it doesn't agree with our updating @@ -625,31 +625,31 @@ void BaseTextDocumentLayout::updateMarksLineNumber() } } -void BaseTextDocumentLayout::updateMarksBlock(const QTextBlock &block) +void TextDocumentLayout::updateMarksBlock(const QTextBlock &block) { if (const TextBlockUserData *userData = testUserData(block)) foreach (TextMark *mrk, userData->marks()) mrk->updateBlock(block); } -BaseTextDocumentLayout::FoldValidator::FoldValidator() +TextDocumentLayout::FoldValidator::FoldValidator() : m_layout(0) , m_requestDocUpdate(false) , m_insideFold(0) {} -void BaseTextDocumentLayout::FoldValidator::setup(BaseTextDocumentLayout *layout) +void TextDocumentLayout::FoldValidator::setup(TextDocumentLayout *layout) { m_layout = layout; } -void BaseTextDocumentLayout::FoldValidator::reset() +void TextDocumentLayout::FoldValidator::reset() { m_insideFold = 0; m_requestDocUpdate = false; } -void BaseTextDocumentLayout::FoldValidator::process(QTextBlock block) +void TextDocumentLayout::FoldValidator::process(QTextBlock block) { if (!m_layout) return; @@ -658,20 +658,20 @@ void BaseTextDocumentLayout::FoldValidator::process(QTextBlock block) if (!previous.isValid()) return; - if ((BaseTextDocumentLayout::isFolded(previous) - && !BaseTextDocumentLayout::canFold(previous)) - || (!BaseTextDocumentLayout::isFolded(previous) - && BaseTextDocumentLayout::canFold(previous) + if ((TextDocumentLayout::isFolded(previous) + && !TextDocumentLayout::canFold(previous)) + || (!TextDocumentLayout::isFolded(previous) + && TextDocumentLayout::canFold(previous) && !block.isVisible())) { - BaseTextDocumentLayout::setFolded(previous, !BaseTextDocumentLayout::isFolded(previous)); + TextDocumentLayout::setFolded(previous, !TextDocumentLayout::isFolded(previous)); } - if (BaseTextDocumentLayout::isFolded(previous) && !m_insideFold) - m_insideFold = BaseTextDocumentLayout::foldingIndent(block); + if (TextDocumentLayout::isFolded(previous) && !m_insideFold) + m_insideFold = TextDocumentLayout::foldingIndent(block); bool toggleVisibility = false; if (m_insideFold) { - if (BaseTextDocumentLayout::foldingIndent(block) >= m_insideFold) { + if (TextDocumentLayout::foldingIndent(block) >= m_insideFold) { if (block.isVisible()) toggleVisibility = true; } else { @@ -690,7 +690,7 @@ void BaseTextDocumentLayout::FoldValidator::process(QTextBlock block) } } -void BaseTextDocumentLayout::FoldValidator::finalize() +void TextDocumentLayout::FoldValidator::finalize() { if (m_requestDocUpdate && m_layout) { m_layout->requestUpdate(); diff --git a/src/plugins/texteditor/basetextdocumentlayout.h b/src/plugins/texteditor/textdocumentlayout.h index 928c55d66b..142d29716f 100644 --- a/src/plugins/texteditor/basetextdocumentlayout.h +++ b/src/plugins/texteditor/textdocumentlayout.h @@ -32,7 +32,7 @@ #include "texteditor_global.h" -#include "basetexteditor.h" +#include "texteditor.h" #include "textmark.h" #include <QTextBlockUserData> @@ -148,13 +148,13 @@ private: }; -class TEXTEDITOR_EXPORT BaseTextDocumentLayout : public QPlainTextDocumentLayout +class TEXTEDITOR_EXPORT TextDocumentLayout : public QPlainTextDocumentLayout { Q_OBJECT public: - BaseTextDocumentLayout(QTextDocument *doc); - ~BaseTextDocumentLayout(); + TextDocumentLayout(QTextDocument *doc); + ~TextDocumentLayout(); static void setParentheses(const QTextBlock &block, const Parentheses &parentheses); static void clearParentheses(const QTextBlock &block) { setParentheses(block, Parentheses());} @@ -182,13 +182,13 @@ public: public: FoldValidator(); - void setup(BaseTextDocumentLayout *layout); + void setup(TextDocumentLayout *layout); void reset(); void process(QTextBlock block); void finalize(); private: - BaseTextDocumentLayout *m_layout; + TextDocumentLayout *m_layout; bool m_requestDocUpdate; int m_insideFold; }; diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 494a9fc6f7..62b443666d 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -27,28 +27,27 @@ ** ****************************************************************************/ -#include "basetexteditor.h" -#include "basetexteditor_p.h" +#include "texteditor.h" +#include "texteditor_p.h" -#include "basetextdocument.h" -#include "basetextdocumentlayout.h" +#include "autocompleter.h" #include "behaviorsettings.h" +#include "circularclipboard.h" +#include "circularclipboardassist.h" #include "codecselector.h" #include "completionsettings.h" -#include "snippets/snippet.h" -#include "tabsettings.h" -#include "typingsettings.h" +#include "convenience.h" +#include "highlighterutils.h" #include "icodestylepreferences.h" -#include "syntaxhighlighter.h" #include "indenter.h" -#include "autocompleter.h" -#include "convenience.h" -#include "texteditorsettings.h" +#include "snippets/snippet.h" +#include "syntaxhighlighter.h" +#include "tabsettings.h" +#include "textdocument.h" +#include "textdocumentlayout.h" #include "texteditoroverlay.h" -#include "circularclipboard.h" -#include "circularclipboardassist.h" -#include "highlighterutils.h" -#include "basetexteditor.h" +#include "texteditorsettings.h" +#include "typingsettings.h" #include <texteditor/codeassist/codeassistant.h> #include <texteditor/codeassist/assistinterface.h> @@ -979,14 +978,14 @@ bool BaseTextEditorWidget::open(QString *errorString, const QString &fileName, c void BaseTextEditorWidgetPrivate::foldLicenseHeader() { QTextDocument *doc = q->document(); - BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout()); + TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(doc->documentLayout()); QTC_ASSERT(documentLayout, return); QTextBlock block = doc->firstBlock(); while (block.isValid() && block.isVisible()) { QString text = block.text(); - if (BaseTextDocumentLayout::canFold(block) && block.next().isVisible()) { + if (TextDocumentLayout::canFold(block) && block.next().isVisible()) { if (text.trimmed().startsWith(QLatin1String("/*"))) { - BaseTextDocumentLayout::doFoldOrUnfold(block, false); + TextDocumentLayout::doFoldOrUnfold(block, false); moveCursorVisible(); documentLayout->requestUpdate(); documentLayout->emitDocumentSizeChanged(); @@ -1016,7 +1015,7 @@ void BaseTextEditorWidgetPrivate::editorContentsChange(int position, int charsRe m_contentsChanged = true; QTextDocument *doc = q->document(); - BaseTextDocumentLayout *documentLayout = static_cast<BaseTextDocumentLayout*>(doc->documentLayout()); + TextDocumentLayout *documentLayout = static_cast<TextDocumentLayout*>(doc->documentLayout()); const QTextBlock posBlock = doc->findBlock(position); // Keep the line numbers and the block information for the text marks updated @@ -2605,13 +2604,13 @@ bool BaseTextEditorWidget::restoreState(const QByteArray &state) foreach (int blockNumber, collapsedBlocks) { QTextBlock block = doc->findBlockByNumber(qMax(0, blockNumber)); if (block.isValid()) { - BaseTextDocumentLayout::doFoldOrUnfold(block, false); + TextDocumentLayout::doFoldOrUnfold(block, false); layoutChanged = true; } } if (layoutChanged) { - BaseTextDocumentLayout *documentLayout = - qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout()); + TextDocumentLayout *documentLayout = + qobject_cast<TextDocumentLayout*>(doc->documentLayout()); QTC_ASSERT(documentLayout, return false); documentLayout->requestUpdate(); documentLayout->emitDocumentSizeChanged(); @@ -2829,13 +2828,13 @@ void BaseTextEditorWidgetPrivate::setupDocumentSignals() q->QPlainTextEdit::setDocument(doc); q->setCursorWidth(2); // Applies to the document layout - BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout()); + TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(doc->documentLayout()); QTC_CHECK(documentLayout); QObject::connect(documentLayout, &QPlainTextDocumentLayout::updateBlock, this, &BaseTextEditorWidgetPrivate::slotUpdateBlockNotify); - QObject::connect(documentLayout, &BaseTextDocumentLayout::updateExtraArea, + QObject::connect(documentLayout, &TextDocumentLayout::updateExtraArea, m_extraArea, static_cast<void (QWidget::*)()>(&QWidget::update)); QObject::connect(q, &BaseTextEditorWidget::requestBlockUpdate, @@ -3465,7 +3464,7 @@ void BaseTextEditorWidget::paintEvent(QPaintEvent *e) QPainter painter(viewport()); QTextDocument *doc = document(); - BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout()); + TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(doc->documentLayout()); QTC_ASSERT(documentLayout, return); QTextBlock textCursorBlock = textCursor().block(); @@ -3595,7 +3594,7 @@ void BaseTextEditorWidget::paintEvent(QPaintEvent *e) QRectF r = blockBoundingRect(blockIDO).translated(offsetIDO); if (r.bottom() >= er.top() && r.top() <= er.bottom()) { - if (BaseTextDocumentLayout::ifdefedOut(blockIDO)) { + if (TextDocumentLayout::ifdefedOut(blockIDO)) { QRectF rr = r; rr.setRight(viewportRect.width() - offset.x()); if (lineX > 0) @@ -3723,7 +3722,7 @@ void BaseTextEditorWidget::paintEvent(QPaintEvent *e) QTextLayout *layout = block.layout(); QTextOption option = layout->textOption(); - if (suppressSyntaxInIfdefedOutBlock && BaseTextDocumentLayout::ifdefedOut(block)) { + if (suppressSyntaxInIfdefedOutBlock && TextDocumentLayout::ifdefedOut(block)) { option.setFlags(option.flags() | QTextOption::SuppressColors); painter.setPen(ifdefedOutFormat.foreground().color()); } else { @@ -4040,7 +4039,7 @@ void BaseTextEditorWidget::paintEvent(QPaintEvent *e) painter.setRenderHint(QPainter::Antialiasing, false); painter.translate(-.5, -.5); - if (TextBlockUserData *nextBlockUserData = BaseTextDocumentLayout::testUserData(nextBlock)) { + if (TextBlockUserData *nextBlockUserData = TextDocumentLayout::testUserData(nextBlock)) { if (nextBlockUserData->foldingStartIncluded()) replacement.prepend(nextBlock.text().trimmed().left(1)); } @@ -4049,7 +4048,7 @@ void BaseTextEditorWidget::paintEvent(QPaintEvent *e) if (!block.isValid()) block = doc->lastBlock(); - if (TextBlockUserData *blockUserData = BaseTextDocumentLayout::testUserData(block)) { + if (TextBlockUserData *blockUserData = TextDocumentLayout::testUserData(block)) { if (blockUserData->foldingEndIncluded()) { QString right = block.text().trimmed(); if (right.endsWith(QLatin1Char(';'))) { @@ -4181,7 +4180,7 @@ QWidget *BaseTextEditorWidget::extraArea() const int BaseTextEditorWidget::extraAreaWidth(int *markWidthPtr) const { - BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(document()->documentLayout()); + TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(document()->documentLayout()); if (!documentLayout) return 0; @@ -4264,7 +4263,7 @@ static void drawRectBox(QPainter *painter, const QRect &rect, bool start, bool e void BaseTextEditorWidget::extraAreaPaintEvent(QPaintEvent *e) { QTextDocument *doc = document(); - BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout()); + TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(doc->documentLayout()); QTC_ASSERT(documentLayout, return); int selStart = textCursor().selectionStart(); @@ -4365,10 +4364,10 @@ void BaseTextEditorWidget::extraAreaPaintEvent(QPaintEvent *e) // } } - TextBlockUserData *nextBlockUserData = BaseTextDocumentLayout::testUserData(nextBlock); + TextBlockUserData *nextBlockUserData = TextDocumentLayout::testUserData(nextBlock); bool drawBox = nextBlockUserData - && BaseTextDocumentLayout::foldingIndent(block) < nextBlockUserData->foldingIndent(); + && TextDocumentLayout::foldingIndent(block) < nextBlockUserData->foldingIndent(); @@ -5086,16 +5085,16 @@ void BaseTextEditorWidget::ensureCursorVisible() { QTextBlock block = textCursor().block(); if (!block.isVisible()) { - BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(document()->documentLayout()); + TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(document()->documentLayout()); QTC_ASSERT(documentLayout, return); // Open all parent folds of current line. - int indent = BaseTextDocumentLayout::foldingIndent(block); + int indent = TextDocumentLayout::foldingIndent(block); block = block.previous(); while (block.isValid()) { - const int indent2 = BaseTextDocumentLayout::foldingIndent(block); - if (BaseTextDocumentLayout::canFold(block) && indent2 < indent) { - BaseTextDocumentLayout::doFoldOrUnfold(block, /* unfold = */ true); + const int indent2 = TextDocumentLayout::foldingIndent(block); + if (TextDocumentLayout::canFold(block) && indent2 < indent) { + TextDocumentLayout::doFoldOrUnfold(block, /* unfold = */ true); if (block.isVisible()) break; indent = indent2; @@ -5111,10 +5110,10 @@ void BaseTextEditorWidget::ensureCursorVisible() void BaseTextEditorWidgetPrivate::toggleBlockVisible(const QTextBlock &block) { - auto documentLayout = qobject_cast<BaseTextDocumentLayout*>(q->document()->documentLayout()); + auto documentLayout = qobject_cast<TextDocumentLayout*>(q->document()->documentLayout()); QTC_ASSERT(documentLayout, return); - BaseTextDocumentLayout::doFoldOrUnfold(block, BaseTextDocumentLayout::isFolded(block)); + TextDocumentLayout::doFoldOrUnfold(block, TextDocumentLayout::isFolded(block)); documentLayout->requestUpdate(); documentLayout->emitDocumentSizeChanged(); } @@ -5636,23 +5635,23 @@ void BaseTextEditorWidgetPrivate::_q_highlightBlocks() block = q->document()->findBlockByNumber(extraAreaHighlightFoldedBlockNumber); if (block.isValid() && block.next().isValid() - && BaseTextDocumentLayout::foldingIndent(block.next()) - > BaseTextDocumentLayout::foldingIndent(block)) + && TextDocumentLayout::foldingIndent(block.next()) + > TextDocumentLayout::foldingIndent(block)) block = block.next(); } QTextBlock closeBlock = block; while (block.isValid()) { - int foldingIndent = BaseTextDocumentLayout::foldingIndent(block); + int foldingIndent = TextDocumentLayout::foldingIndent(block); - while (block.previous().isValid() && BaseTextDocumentLayout::foldingIndent(block) >= foldingIndent) + while (block.previous().isValid() && TextDocumentLayout::foldingIndent(block) >= foldingIndent) block = block.previous(); - int nextIndent = BaseTextDocumentLayout::foldingIndent(block); + int nextIndent = TextDocumentLayout::foldingIndent(block); if (nextIndent == foldingIndent) break; highlightBlocksInfo.open.prepend(block.blockNumber()); while (closeBlock.next().isValid() - && BaseTextDocumentLayout::foldingIndent(closeBlock.next()) >= foldingIndent ) + && TextDocumentLayout::foldingIndent(closeBlock.next()) >= foldingIndent ) closeBlock = closeBlock.next(); highlightBlocksInfo.close.append(closeBlock.blockNumber()); int indent = qMin(visualIndent(block), visualIndent(closeBlock)); @@ -5850,7 +5849,7 @@ QString BaseTextEditorWidget::extraSelectionTooltip(int pos) const void BaseTextEditorWidget::setIfdefedOutBlocks(const QList<BlockRange> &blocks) { QTextDocument *doc = document(); - BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout()); + TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(doc->documentLayout()); QTC_ASSERT(documentLayout, return); bool needUpdate = false; @@ -5866,18 +5865,18 @@ void BaseTextEditorWidget::setIfdefedOutBlocks(const QList<BlockRange> &blocks) const BlockRange &range = blocks.at(rangeNumber); if (block.position() >= range.first() && ((block.position() + block.length() - 1) <= range.last() || !range.last())) - set = BaseTextDocumentLayout::setIfdefedOut(block); + set = TextDocumentLayout::setIfdefedOut(block); else - cleared = BaseTextDocumentLayout::clearIfdefedOut(block); + cleared = TextDocumentLayout::clearIfdefedOut(block); if (block.contains(range.last())) ++rangeNumber; } else { - cleared = BaseTextDocumentLayout::clearIfdefedOut(block); + cleared = TextDocumentLayout::clearIfdefedOut(block); } if (cleared || set) { needUpdate = true; - int delta = BaseTextDocumentLayout::braceDepthDelta(block); + int delta = TextDocumentLayout::braceDepthDelta(block); if (cleared) braceDepthDelta += delta; else if (set) @@ -5885,8 +5884,8 @@ void BaseTextEditorWidget::setIfdefedOutBlocks(const QList<BlockRange> &blocks) } if (braceDepthDelta) { - BaseTextDocumentLayout::changeBraceDepth(block,braceDepthDelta); - BaseTextDocumentLayout::changeFoldingIndent(block, braceDepthDelta); // ### C++ only, refactor! + TextDocumentLayout::changeBraceDepth(block,braceDepthDelta); + TextDocumentLayout::changeFoldingIndent(block, braceDepthDelta); // ### C++ only, refactor! } block = block.next(); @@ -6166,17 +6165,17 @@ void BaseTextEditorWidget::setExtraEncodingSettings(const ExtraEncodingSettings void BaseTextEditorWidget::fold() { QTextDocument *doc = document(); - BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout()); + TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(doc->documentLayout()); QTC_ASSERT(documentLayout, return); QTextBlock block = textCursor().block(); - if (!(BaseTextDocumentLayout::canFold(block) && block.next().isVisible())) { + if (!(TextDocumentLayout::canFold(block) && block.next().isVisible())) { // find the closest previous block which can fold - int indent = BaseTextDocumentLayout::foldingIndent(block); - while (block.isValid() && (BaseTextDocumentLayout::foldingIndent(block) >= indent || !block.isVisible())) + int indent = TextDocumentLayout::foldingIndent(block); + while (block.isValid() && (TextDocumentLayout::foldingIndent(block) >= indent || !block.isVisible())) block = block.previous(); } if (block.isValid()) { - BaseTextDocumentLayout::doFoldOrUnfold(block, false); + TextDocumentLayout::doFoldOrUnfold(block, false); d->moveCursorVisible(); documentLayout->requestUpdate(); documentLayout->emitDocumentSizeChanged(); @@ -6186,12 +6185,12 @@ void BaseTextEditorWidget::fold() void BaseTextEditorWidget::unfold() { QTextDocument *doc = document(); - BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout()); + TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(doc->documentLayout()); QTC_ASSERT(documentLayout, return); QTextBlock block = textCursor().block(); while (block.isValid() && !block.isVisible()) block = block.previous(); - BaseTextDocumentLayout::doFoldOrUnfold(block, true); + TextDocumentLayout::doFoldOrUnfold(block, true); d->moveCursorVisible(); documentLayout->requestUpdate(); documentLayout->emitDocumentSizeChanged(); @@ -6200,13 +6199,13 @@ void BaseTextEditorWidget::unfold() void BaseTextEditorWidget::unfoldAll() { QTextDocument *doc = document(); - BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout()); + TextDocumentLayout *documentLayout = qobject_cast<TextDocumentLayout*>(doc->documentLayout()); QTC_ASSERT(documentLayout, return); QTextBlock block = doc->firstBlock(); bool makeVisible = true; while (block.isValid()) { - if (block.isVisible() && BaseTextDocumentLayout::canFold(block) && block.next().isVisible()) { + if (block.isVisible() && TextDocumentLayout::canFold(block) && block.next().isVisible()) { makeVisible = false; break; } @@ -6216,8 +6215,8 @@ void BaseTextEditorWidget::unfoldAll() block = doc->firstBlock(); while (block.isValid()) { - if (BaseTextDocumentLayout::canFold(block)) - BaseTextDocumentLayout::doFoldOrUnfold(block, makeVisible); + if (TextDocumentLayout::canFold(block)) + TextDocumentLayout::doFoldOrUnfold(block, makeVisible); block = block.next(); } @@ -7341,4 +7340,4 @@ BaseTextEditor *BaseTextEditorFactory::createEditorHelper(const BaseTextDocument } // namespace TextEditor -#include "basetexteditor.moc" +#include "texteditor.moc" diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/texteditor.h index 0aac1f39eb..df98bcd5b6 100644 --- a/src/plugins/texteditor/basetexteditor.h +++ b/src/plugins/texteditor/texteditor.h @@ -30,7 +30,7 @@ #ifndef BASETEXTEDITOR_H #define BASETEXTEDITOR_H -#include "basetextdocument.h" +#include "textdocument.h" #include "codeassist/assistenums.h" #include "texteditor_global.h" diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro index 618b2f7947..62586fd1cc 100644 --- a/src/plugins/texteditor/texteditor.pro +++ b/src/plugins/texteditor/texteditor.pro @@ -6,8 +6,8 @@ include(../../qtcreatorplugin.pri) SOURCES += texteditorplugin.cpp \ textfilewizard.cpp \ plaintexteditorfactory.cpp \ - basetextdocument.cpp \ - basetexteditor.cpp \ + textdocument.cpp \ + texteditor.cpp \ behaviorsettings.cpp \ behaviorsettingspage.cpp \ texteditoractionhandler.cpp \ @@ -29,7 +29,7 @@ SOURCES += texteditorplugin.cpp \ colorschemeedit.cpp \ texteditoroverlay.cpp \ texteditoroptionspage.cpp \ - basetextdocumentlayout.cpp \ + textdocumentlayout.cpp \ completionsettings.cpp \ normalindenter.cpp \ indenter.cpp \ @@ -106,11 +106,11 @@ SOURCES += texteditorplugin.cpp \ HEADERS += texteditorplugin.h \ textfilewizard.h \ plaintexteditorfactory.h \ - basetexteditor_p.h \ - basetextdocument.h \ + texteditor_p.h \ + textdocument.h \ behaviorsettings.h \ behaviorsettingspage.h \ - basetexteditor.h \ + texteditor.h \ texteditoractionhandler.h \ fontsettingspage.h \ texteditorconstants.h \ @@ -131,7 +131,7 @@ HEADERS += texteditorplugin.h \ colorschemeedit.h \ texteditoroverlay.h \ texteditoroptionspage.h \ - basetextdocumentlayout.h \ + textdocumentlayout.h \ completionsettings.h \ normalindenter.h \ indenter.h \ @@ -229,6 +229,6 @@ FORMS += \ RESOURCES += texteditor.qrc equals(TEST, 1) { -SOURCES += basetexteditor_test.cpp +SOURCES += texteditor_test.cpp } diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs index 02a6b1b57c..b41bc6820d 100644 --- a/src/plugins/texteditor/texteditor.qbs +++ b/src/plugins/texteditor/texteditor.qbs @@ -21,13 +21,6 @@ QtcPlugin { "basefilefind_p.h", "basehoverhandler.cpp", "basehoverhandler.h", - "basetextdocument.cpp", - "basetextdocument.h", - "basetextdocumentlayout.cpp", - "basetextdocumentlayout.h", - "basetexteditor.cpp", - "basetexteditor.h", - "basetexteditor_p.h", "behaviorsettings.cpp", "behaviorsettings.h", "behaviorsettingspage.cpp", @@ -119,8 +112,15 @@ QtcPlugin { "tabsettingswidget.cpp", "tabsettingswidget.h", "tabsettingswidget.ui", + "textdocument.cpp", + "textdocument.h", + "textdocumentlayout.cpp", + "textdocumentlayout.h", + "texteditor.cpp", + "texteditor.h", "texteditor.qrc", "texteditor_global.h", + "texteditor_p.h", "texteditoractionhandler.cpp", "texteditoractionhandler.h", "texteditorconstants.cpp", @@ -261,7 +261,7 @@ QtcPlugin { name: "Tests" condition: project.testsEnabled files: [ - "basetexteditor_test.cpp", + "texteditor_test.cpp", ] } } diff --git a/src/plugins/texteditor/basetexteditor_p.h b/src/plugins/texteditor/texteditor_p.h index 9028cc02f7..b543c43d57 100644 --- a/src/plugins/texteditor/basetexteditor_p.h +++ b/src/plugins/texteditor/texteditor_p.h @@ -30,7 +30,7 @@ #ifndef BASETEXTEDITOR_P_H #define BASETEXTEDITOR_P_H -#include "basetexteditor.h" +#include "texteditor.h" #include "behaviorsettings.h" #include "displaysettings.h" #include "marginsettings.h" diff --git a/src/plugins/texteditor/basetexteditor_test.cpp b/src/plugins/texteditor/texteditor_test.cpp index 6f3616cd50..d5757800a3 100644 --- a/src/plugins/texteditor/basetexteditor_test.cpp +++ b/src/plugins/texteditor/texteditor_test.cpp @@ -37,7 +37,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/coreconstants.h> -#include "basetexteditor.h" +#include "texteditor.h" #include "texteditorplugin.h" using namespace TextEditor; diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index ac475740b8..3fe04f3fec 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -29,7 +29,7 @@ #include "texteditoractionhandler.h" -#include "basetexteditor.h" +#include "texteditor.h" #include "displaysettings.h" #include "linenumberfilter.h" #include "texteditorconstants.h" diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp index 812cd65463..9664e99c82 100644 --- a/src/plugins/texteditor/texteditoroverlay.cpp +++ b/src/plugins/texteditor/texteditoroverlay.cpp @@ -28,7 +28,7 @@ ****************************************************************************/ #include "texteditoroverlay.h" -#include "basetexteditor.h" +#include "texteditor.h" #include "snippets/snippet.h" #include <QDebug> diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp index 5a989890ed..77e3529d22 100644 --- a/src/plugins/texteditor/texteditorplugin.cpp +++ b/src/plugins/texteditor/texteditorplugin.cpp @@ -29,7 +29,7 @@ #include "texteditorplugin.h" -#include "basetexteditor.h" +#include "texteditor.h" #include "findincurrentfile.h" #include "findinfiles.h" #include "findinopenfiles.h" diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index 2a5e98eeb1..ee2075c456 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -29,7 +29,7 @@ #include "texteditorsettings.h" -#include "basetexteditor.h" +#include "texteditor.h" #include "behaviorsettings.h" #include "behaviorsettingspage.h" #include "completionsettings.h" diff --git a/src/plugins/texteditor/textmark.cpp b/src/plugins/texteditor/textmark.cpp index 1c4f039b6f..e36bc03968 100644 --- a/src/plugins/texteditor/textmark.cpp +++ b/src/plugins/texteditor/textmark.cpp @@ -28,9 +28,9 @@ ****************************************************************************/ #include "textmark.h" -#include "basetextdocument.h" +#include "textdocument.h" #include "textmarkregistry.h" -#include "basetexteditor.h" +#include "texteditor.h" #include "texteditorplugin.h" #include <coreplugin/editormanager/editormanager.h> diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 81f6036a26..ff6daa7644 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -57,7 +57,7 @@ #include <cplusplus/LookupContext.h> #include <cplusplus/Overview.h> #include <extensionsystem/iplugin.h> -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <utils/qtcassert.h> #include <utils/fancymainwindow.h> diff --git a/src/plugins/vcsbase/basevcseditorfactory.h b/src/plugins/vcsbase/basevcseditorfactory.h index 2798bb51a8..86d3e8ed55 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.h +++ b/src/plugins/vcsbase/basevcseditorfactory.h @@ -33,7 +33,7 @@ #include "vcsbase_global.h" #include "vcsbaseeditor.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> namespace VcsBase { diff --git a/src/plugins/vcsbase/diffhighlighter.cpp b/src/plugins/vcsbase/diffhighlighter.cpp index 780308de5c..ad80f1ae5c 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; diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index de0fa2b528..ed961c514e 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -43,8 +43,8 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/project.h> #include <projectexplorer/session.h> -#include <texteditor/basetextdocument.h> -#include <texteditor/basetextdocumentlayout.h> +#include <texteditor/textdocument.h> +#include <texteditor/textdocumentlayout.h> #include <utils/qtcassert.h> #include <QDebug> @@ -1109,7 +1109,7 @@ void VcsBaseEditorWidget::jumpToChangeFromDiff(QTextCursor cursor) const QChar deletionIndicator = QLatin1Char('-'); // find nearest change hunk QTextBlock block = cursor.block(); - if (BaseTextDocumentLayout::foldingIndent(block) <= 1) + if (TextDocumentLayout::foldingIndent(block) <= 1) /* We are in a diff header, do not jump anywhere. DiffHighlighter sets the foldingIndent for us. */ return; for ( ; block.isValid() ; block = block.previous()) { @@ -1148,7 +1148,7 @@ DiffChunk VcsBaseEditorWidget::diffChunk(QTextCursor cursor) const QTC_ASSERT(hasDiff(), return rc); // Search back for start of chunk. QTextBlock block = cursor.block(); - if (block.isValid() && BaseTextDocumentLayout::foldingIndent(block) <= 1) + if (block.isValid() && TextDocumentLayout::foldingIndent(block) <= 1) /* We are in a diff header, not in a chunk! DiffHighlighter sets the foldingIndent for us. */ return rc; diff --git a/src/plugins/vcsbase/vcsbaseeditor.h b/src/plugins/vcsbase/vcsbaseeditor.h index eafc9e8f84..96e7f53cdf 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.h +++ b/src/plugins/vcsbase/vcsbaseeditor.h @@ -32,7 +32,7 @@ #include "vcsbase_global.h" -#include <texteditor/basetexteditor.h> +#include <texteditor/texteditor.h> #include <QSet> |