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

TextEditor: Use direct interface for registerMimeTypeForLanguageId

Browse Source 
Change-Id: I6984173acf86e80175f9e2346315b5b226d6bde9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
hjk
2013-09-19 18:43:48 +02:00
parent 0479abdcd7
commit 9c2a7c7c76
4 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/cpptools/cpptoolssettings.cpp
View File

@@ -221,18 +221,10 @@ CppToolsSettings::CppToolsSettings(QObject *parent)
// mimetypes to be handled // mimetypes to be handled
TextEditorSettings::registerMimeTypeForLanguageId( TextEditorSettings::registerMimeTypeForLanguageId(Constants::C_SOURCE_MIMETYPE, Constants::CPP_SETTINGS_ID);
QLatin1String(Constants::C_SOURCE_MIMETYPE), TextEditorSettings::registerMimeTypeForLanguageId(Constants::C_HEADER_MIMETYPE, Constants::CPP_SETTINGS_ID);
Constants::CPP_SETTINGS_ID); TextEditorSettings::registerMimeTypeForLanguageId(Constants::CPP_SOURCE_MIMETYPE, Constants::CPP_SETTINGS_ID);
TextEditorSettings::registerMimeTypeForLanguageId( TextEditorSettings::registerMimeTypeForLanguageId(Constants::CPP_HEADER_MIMETYPE, Constants::CPP_SETTINGS_ID);
QLatin1String(Constants::C_HEADER_MIMETYPE),
Constants::CPP_SETTINGS_ID);
TextEditorSettings::registerMimeTypeForLanguageId(
QLatin1String(Constants::CPP_SOURCE_MIMETYPE),
Constants::CPP_SETTINGS_ID);
TextEditorSettings::registerMimeTypeForLanguageId(
QLatin1String(Constants::CPP_HEADER_MIMETYPE),
Constants::CPP_SETTINGS_ID);
} }
CppToolsSettings::~CppToolsSettings() CppToolsSettings::~CppToolsSettings()

24
src/plugins/qmljstools/qmljstoolssettings.cpp
View File

@@ -134,24 +134,12 @@ QmlJSToolsSettings::QmlJSToolsSettings(QObject *parent)
} }
// mimetypes to be handled // mimetypes to be handled
TextEditorSettings::registerMimeTypeForLanguageId( TextEditorSettings::registerMimeTypeForLanguageId(Constants::QML_MIMETYPE, Constants::QML_JS_SETTINGS_ID);
QLatin1String(Constants::QML_MIMETYPE), TextEditorSettings::registerMimeTypeForLanguageId(Constants::QBS_MIMETYPE, Constants::QML_JS_SETTINGS_ID);
Constants::QML_JS_SETTINGS_ID); TextEditorSettings::registerMimeTypeForLanguageId(Constants::QMLPROJECT_MIMETYPE, Constants::QML_JS_SETTINGS_ID);
TextEditorSettings::registerMimeTypeForLanguageId( TextEditorSettings::registerMimeTypeForLanguageId(Constants::QMLTYPES_MIMETYPE, Constants::QML_JS_SETTINGS_ID);
QLatin1String(Constants::QBS_MIMETYPE), TextEditorSettings::registerMimeTypeForLanguageId(Constants::JS_MIMETYPE, Constants::QML_JS_SETTINGS_ID);
Constants::QML_JS_SETTINGS_ID); TextEditorSettings::registerMimeTypeForLanguageId(Constants::JSON_MIMETYPE, Constants::QML_JS_SETTINGS_ID);
TextEditorSettings::registerMimeTypeForLanguageId(
QLatin1String(Constants::QMLPROJECT_MIMETYPE),
Constants::QML_JS_SETTINGS_ID);
TextEditorSettings::registerMimeTypeForLanguageId(
QLatin1String(Constants::QMLTYPES_MIMETYPE),
Constants::QML_JS_SETTINGS_ID);
TextEditorSettings::registerMimeTypeForLanguageId(
QLatin1String(Constants::JS_MIMETYPE),
Constants::QML_JS_SETTINGS_ID);
TextEditorSettings::registerMimeTypeForLanguageId(
QLatin1String(Constants::JSON_MIMETYPE),
Constants::QML_JS_SETTINGS_ID);
} }
QmlJSToolsSettings::~QmlJSToolsSettings() QmlJSToolsSettings::~QmlJSToolsSettings()

4
src/plugins/texteditor/texteditorsettings.cpp
View File

@@ -479,9 +479,9 @@ void TextEditorSettings::unregisterCodeStylePool(Core::Id languageId)
d->m_languageToCodeStylePool.remove(languageId); d->m_languageToCodeStylePool.remove(languageId);
} }
void TextEditorSettings::registerMimeTypeForLanguageId(const QString &mimeType, Core::Id languageId) void TextEditorSettings::registerMimeTypeForLanguageId(const char *mimeType, Core::Id languageId)
{ {
d->m_mimeTypeToLanguage.insert(mimeType, languageId); d->m_mimeTypeToLanguage.insert(QString::fromLatin1(mimeType), languageId);
} }
Core::Id TextEditorSettings::languageId(const QString &mimeType) Core::Id TextEditorSettings::languageId(const QString &mimeType)

2
src/plugins/texteditor/texteditorsettings.h
View File

@@ -101,7 +101,7 @@ public:
static void registerCodeStyle(Core::Id languageId, ICodeStylePreferences *prefs); static void registerCodeStyle(Core::Id languageId, ICodeStylePreferences *prefs);
static void unregisterCodeStyle(Core::Id languageId); static void unregisterCodeStyle(Core::Id languageId);
static void registerMimeTypeForLanguageId(const QString &mimeType, Core::Id languageId); static void registerMimeTypeForLanguageId(const char *mimeType, Core::Id languageId);
static Core::Id languageId(const QString &mimeType); static Core::Id languageId(const QString &mimeType);
signals: signals: