diff options
author | hjk <qtc-committer@nokia.com> | 2011-09-16 13:10:06 +0200 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2011-09-19 08:56:31 +0200 |
commit | dbe1653775f19fc35cd19f50294951711a713f58 (patch) | |
tree | d58db205d0e962755811d73bda40fb8377002d86 /src/plugins/coreplugin/mimetypesettings.cpp | |
parent | b3bb5d700ec5367b05cac50b8d5222455441f384 (diff) | |
download | qt-creator-dbe1653775f19fc35cd19f50294951711a713f58.tar.gz |
more style
Change-Id: Iecd6819a5376beced5413f134d3026fb889a13b1
Reviewed-on: http://codereview.qt-project.org/5115
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/coreplugin/mimetypesettings.cpp')
-rw-r--r-- | src/plugins/coreplugin/mimetypesettings.cpp | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp index aada1ab344..63351cbb57 100644 --- a/src/plugins/coreplugin/mimetypesettings.cpp +++ b/src/plugins/coreplugin/mimetypesettings.cpp @@ -548,11 +548,13 @@ void MimeTypeSettingsPrivate::resetMimeTypes() // MimeTypeSettingsPage MimeTypeSettings::MimeTypeSettings(QObject *parent) : IOptionsPage(parent) - , m_d(new MimeTypeSettingsPrivate) + , d(new MimeTypeSettingsPrivate) {} MimeTypeSettings::~MimeTypeSettings() -{} +{ + delete d; +} QString MimeTypeSettings::id() const { @@ -581,43 +583,43 @@ QIcon MimeTypeSettings::categoryIcon() const bool MimeTypeSettings::matches(const QString &s) const { - return m_d->m_keywords.contains(s, Qt::CaseInsensitive); + return d->m_keywords.contains(s, Qt::CaseInsensitive); } QWidget *MimeTypeSettings::createPage(QWidget *parent) { QWidget *w = new QWidget(parent); - m_d->configureUi(w); + d->configureUi(w); return w; } void MimeTypeSettings::apply() { - if (!m_d->m_modifiedMimeTypes.isEmpty()) { + if (!d->m_modifiedMimeTypes.isEmpty()) { const QModelIndex &modelIndex = - m_d->m_ui.mimeTypesTableView->selectionModel()->currentIndex(); + d->m_ui.mimeTypesTableView->selectionModel()->currentIndex(); if (modelIndex.isValid()) { - if (m_d->m_mimeForPatternSync == modelIndex.row()) - m_d->syncMimePattern(); - if (m_d->m_mimeForMagicSync == modelIndex.row()) - m_d->syncMimeMagic(); + if (d->m_mimeForPatternSync == modelIndex.row()) + d->syncMimePattern(); + if (d->m_mimeForMagicSync == modelIndex.row()) + d->syncMimeMagic(); } - m_d->clearSyncData(); + d->clearSyncData(); } - if (!m_d->m_persist) - m_d->m_persist = true; + if (!d->m_persist) + d->m_persist = true; } void MimeTypeSettings::finish() { - if (m_d->m_persist) { - if (m_d->m_reset) + if (d->m_persist) { + if (d->m_reset) ICore::instance()->mimeDatabase()->clearUserModifiedMimeTypes(); else - m_d->updateMimeDatabase(); + d->updateMimeDatabase(); } - m_d->resetState(); + d->resetState(); } } // Internal |