forked from qt-creator/qt-creator
Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
@@ -150,13 +150,13 @@ void PlainTextEditorWidget::configure()
|
||||
{
|
||||
Core::MimeType mimeType;
|
||||
if (file())
|
||||
mimeType = Core::ICore::instance()->mimeDatabase()->findByFile(file()->fileName());
|
||||
mimeType = Core::ICore::mimeDatabase()->findByFile(file()->fileName());
|
||||
configure(mimeType);
|
||||
}
|
||||
|
||||
void PlainTextEditorWidget::configure(const QString &mimeType)
|
||||
{
|
||||
configure(Core::ICore::instance()->mimeDatabase()->findByType(mimeType));
|
||||
configure(Core::ICore::mimeDatabase()->findByType(mimeType));
|
||||
}
|
||||
|
||||
void PlainTextEditorWidget::configure(const Core::MimeType &mimeType)
|
||||
@@ -221,7 +221,7 @@ QString PlainTextEditorWidget::findDefinitionId(const Core::MimeType &mimeType,
|
||||
if (definitionId.isEmpty()) {
|
||||
foreach (const QString &parent, mimeType.subClassesOf()) {
|
||||
const Core::MimeType &parentMimeType =
|
||||
Core::ICore::instance()->mimeDatabase()->findByType(parent);
|
||||
Core::ICore::mimeDatabase()->findByType(parent);
|
||||
definitionId = findDefinitionId(parentMimeType, considerParents);
|
||||
}
|
||||
}
|
||||
@@ -231,7 +231,7 @@ QString PlainTextEditorWidget::findDefinitionId(const Core::MimeType &mimeType,
|
||||
|
||||
void PlainTextEditorWidget::acceptMissingSyntaxDefinitionInfo()
|
||||
{
|
||||
Core::ICore::instance()->showOptionsDialog(QLatin1String(Constants::TEXT_EDITOR_SETTINGS_CATEGORY),
|
||||
Core::ICore::showOptionsDialog(QLatin1String(Constants::TEXT_EDITOR_SETTINGS_CATEGORY),
|
||||
QLatin1String(Constants::TEXT_EDITOR_HIGHLIGHTER_SETTINGS));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user