diff options
Diffstat (limited to 'src/plugins/cppeditor')
-rw-r--r-- | src/plugins/cppeditor/cppdocumentationcommenthelper.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppeditor.cpp | 8 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppeditor.h | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppeditordocument.h | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppelementevaluator.h | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppfollowsymbolundercursor.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppfollowsymbolundercursor.h | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cpphighlighter.cpp | 28 | ||||
-rw-r--r-- | src/plugins/cppeditor/cpphoverhandler.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppincludehierarchymodel.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cpplocalrenaming.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppuseselectionsupdater.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppvirtualfunctionproposalitem.h | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/fileandtokenactions_test.cpp | 2 |
14 files changed, 30 insertions, 30 deletions
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> |