diff options
| author | hjk <hjk121@nokiamail.com> | 2013-08-30 16:38:57 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-09-03 11:41:45 +0200 |
| commit | a37589d431844a64031d3044787c15f8dddace45 (patch) | |
| tree | 4e4d2e07f31278b5606e779707697e65185cbc64 /src/plugins/cpptools/cppfilesettingspage.cpp | |
| parent | 1226400af3da68f355f298935bc13807f257d224 (diff) | |
Apply 'static' pattern to MimeDatabase
Also adjust and streamline using and surrounding code.
Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/cpptools/cppfilesettingspage.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppfilesettingspage.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index fcc5f28861..e11cfdf55e 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -93,9 +93,8 @@ void CppFileSettings::fromSettings(QSettings *s) bool CppFileSettings::applySuffixesToMimeDB() { - Core::MimeDatabase *mdb = Core::ICore::mimeDatabase(); - return mdb->setPreferredSuffix(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE), sourceSuffix) - && mdb->setPreferredSuffix(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE), headerSuffix); + return Core::MimeDatabase::setPreferredSuffix(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE), sourceSuffix) + && Core::MimeDatabase::setPreferredSuffix(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE), headerSuffix); } bool CppFileSettings::equals(const CppFileSettings &rhs) const @@ -226,13 +225,12 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) : m_ui(new Internal::Ui::CppFileSettingsPage) { m_ui->setupUi(this); - const Core::MimeDatabase *mdb = Core::ICore::mimeDatabase(); // populate suffix combos - if (const Core::MimeType sourceMt = mdb->findByType(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE))) + if (const Core::MimeType sourceMt = Core::MimeDatabase::findByType(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE))) foreach (const QString &suffix, sourceMt.suffixes()) m_ui->sourceSuffixComboBox->addItem(suffix); - if (const Core::MimeType headerMt = mdb->findByType(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE))) + if (const Core::MimeType headerMt = Core::MimeDatabase::findByType(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE))) foreach (const QString &suffix, headerMt.suffixes()) m_ui->headerSuffixComboBox->addItem(suffix); m_ui->licenseTemplatePathChooser->setExpectedKind(Utils::PathChooser::File); |