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

Merge BaseTextEditorWidget::editorDocument() and ::baseTextDocument()

Browse Source 
Doesn't really make sense to have the additional IDocument *editorDocument()
method.

Change-Id: I0a7420eb1afaa76f63c3f7e9c4b373acf624ffb9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2013-12-12 15:07:54 +01:00
parent e035ae6df1
commit 1adab4c4cc
24 changed files with 53 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/texteditor/plaintexteditor.cpp
View File

@@ -71,7 +71,7 @@ PlainTextEditorWidget::PlainTextEditorWidget(QWidget *parent)
m_commentDefinition.clearCommentStyles();
// If configure() is called immediately the whole document is considered modified
connect(editorDocument(), SIGNAL(changed()), this, SLOT(configure()), Qt::QueuedConnection);
connect(baseTextDocument(), SIGNAL(changed()), this, SLOT(configure()), Qt::QueuedConnection);
connect(Manager::instance(), SIGNAL(mimeTypesRegistered()), this, SLOT(configure()));
}
@@ -107,8 +107,8 @@ void PlainTextEditorWidget::setTabSettings(const TextEditor::TabSettings &ts)
void PlainTextEditorWidget::configure()
{
MimeType mimeType;
if (editorDocument())
mimeType = MimeDatabase::findByFile(editorDocument()->filePath());
if (baseTextDocument())
mimeType = MimeDatabase::findByFile(baseTextDocument()->filePath());
configure(mimeType);
}
@@ -147,8 +147,8 @@ void PlainTextEditorWidget::configure(const MimeType &mimeType)
setCodeFoldingSupported(true);
}
} else if (editorDocument()) {
const QString &fileName = editorDocument()->filePath();
} else if (baseTextDocument()) {
const QString &fileName = baseTextDocument()->filePath();
if (TextEditorSettings::highlighterSettings().isIgnoredFilePattern(fileName))
m_isMissingSyntaxDefinition = false;
}