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

8
src/plugins/texteditor/generichighlighter/highlighter.cpp
View File

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