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

TextEditor: More BaseText* -> Text* renamings

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

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

2
src/plugins/qmljseditor/qmljseditor.cpp
View File

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

2
src/plugins/qmljseditor/qmljseditor.h
View File

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

2
src/plugins/qmljseditor/qmljseditordocument.h
View File

@@ -34,7 +34,7 @@
#include <qmljs/qmljsdocument.h>
#include <qmljstools/qmljssemanticinfo.h>
#include <texteditor/basetextdocument.h>
#include <texteditor/textdocument.h>
#include <QTextLayout>

10
src/plugins/qmljseditor/qmljshighlighter.cpp
View File

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

2
src/plugins/qmljseditor/qmljshighlighter.h
View File

@@ -34,7 +34,7 @@
#include <qmljs/qmljsscanner.h>
#include <texteditor/basetextdocumentlayout.h>
#include <texteditor/textdocumentlayout.h>
#include <texteditor/syntaxhighlighter.h>
namespace QmlJSEditor {

2
src/plugins/qmljseditor/qmljshoverhandler.cpp
View File

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

2
src/plugins/qmljseditor/qmljssemantichighlighter.cpp
View File

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

2
src/plugins/qmljseditor/quicktoolbar.cpp
View File

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