← Back to branch summary

~bzoltan/kubuntu-packaging/decouple_cmake_plugin

« back to all changes in this revision

Viewing changes to src/plugins/coreplugin/mimetypesettings.cpp

  • Committer: Timo Jyrinki
  • Date: 2013-11-15 12:25:23 UTC
  • mfrom: (1.1.28)
  • Revision ID: timo.jyrinki@canonical.com-20131115122523-i2kyamsu4gs2mu1m
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/coreplugin/mimetypesettings.cpp
28
28
****************************************************************************/
29
29
 
30
30
#include "coreconstants.h"
31
 
#include "editormanager.h"
32
31
#include "icore.h"
33
 
#include "ieditorfactory.h"
34
 
#include "iexternaleditor.h"
35
32
#include "mimedatabase.h"
36
33
#include "mimetypemagicdialog.h"
37
34
#include "mimetypesettings.h"
38
35
#include "ui_mimetypesettingspage.h"
 
36
#include <coreplugin/editormanager/editormanager.h>
 
37
#include <coreplugin/editormanager/ieditorfactory.h>
 
38
#include <coreplugin/editormanager/iexternaleditor.h>
39
39
 
40
40
#include <QAbstractTableModel>
41
41
#include <QCoreApplication>
126
126
 
127
127
void MimeTypeSettingsModel::load()
128
128
{
129
 
    m_mimeTypes = ICore::mimeDatabase()->mimeTypes();
 
129
    m_mimeTypes = MimeDatabase::mimeTypes();
130
130
    qSort(m_mimeTypes.begin(), m_mimeTypes.end(), MimeTypeComp());
131
131
    m_knownPatterns = QSet<QString>::fromList(
132
 
        MimeDatabase::fromGlobPatterns(ICore::mimeDatabase()->globPatterns()));
 
132
        MimeDatabase::fromGlobPatterns(MimeDatabase::globPatterns()));
133
133
 
134
134
    foreach (const MimeType &mimeType, m_mimeTypes) {
135
135
        QString value;
240
240
    static const QChar kSemiColon;
241
241
 
242
242
    QString m_keywords;
243
 
    MimeDatabase *m_mimeDatabase;
244
243
    MimeTypeSettingsModel *m_model;
245
244
    QSortFilterProxyModel *m_filterModel;
246
245
    int m_mimeForPatternSync;
255
254
const QChar MimeTypeSettingsPrivate::kSemiColon(QLatin1Char(';'));
256
255
 
257
256
MimeTypeSettingsPrivate::MimeTypeSettingsPrivate()
258
 
    : m_mimeDatabase(ICore::mimeDatabase())
259
 
    , m_model(new MimeTypeSettingsModel(this))
 
257
    : m_model(new MimeTypeSettingsModel(this))
260
258
    , m_filterModel(new QSortFilterProxyModel(this))
261
259
    , m_mimeForPatternSync(-1)
262
260
    , m_mimeForMagicSync(-1)
529
527
    m_modifiedMimeTypes.erase(std::unique(m_modifiedMimeTypes.begin(), m_modifiedMimeTypes.end()),
530
528
                              m_modifiedMimeTypes.end());
531
529
 
532
 
    MimeDatabase *db = ICore::mimeDatabase();
533
530
    QList<MimeType> allModified;
534
531
    foreach (int index, m_modifiedMimeTypes) {
535
532
        const MimeType &mimeType = m_model->m_mimeTypes.at(index);
536
 
        db->setGlobPatterns(mimeType.type(), mimeType.globPatterns());
537
 
        db->setMagicMatchers(mimeType.type(), mimeType.magicMatchers());
 
533
        MimeDatabase::setGlobPatterns(mimeType.type(), mimeType.globPatterns());
 
534
        MimeDatabase::setMagicMatchers(mimeType.type(), mimeType.magicMatchers());
538
535
        allModified.append(mimeType);
539
536
    }
540
 
    db->writeUserModifiedMimeTypes(allModified);
 
537
    MimeDatabase::writeUserModifiedMimeTypes(allModified);
541
538
}
542
539
 
543
540
void MimeTypeSettingsPrivate::resetState()
623
620
{
624
621
    if (d->m_persist) {
625
622
        if (d->m_reset)
626
 
            ICore::mimeDatabase()->clearUserModifiedMimeTypes();
 
623
            MimeDatabase::clearUserModifiedMimeTypes();
627
624
        else
628
625
            d->updateMimeDatabase();
629
626
    }