Introducing QMimeProviderBase:

- move the xml parsing code to QMimeXmlProvider
- provide freedesktop.org.xml to the qmime code using a .qrc file for now
- look for mime.cache files in QMimeBinaryProvider using QStandardPaths
 (no parsing yet)

2 files changed, 2 insertions, 28 deletions

diff --git a/examples/mimetypeviewer/mimetypeviewer.cpp b/examples/mimetypeviewer/mimetypeviewer.cpp
index 07abc53..bc1f5d1 100644
--- a/examples/mimetypeviewer/mimetypeviewer.cpp
+++ b/examples/mimetypeviewer/mimetypeviewer.cpp
@@ -1,8 +1,6 @@
 #include "mimetypeviewer.h"
 #include "ui_mimetypeviewer.h"
 
-#include "../../src/qmimedatabase_p.h"
-
 #include <QFileDialog>
 #include <QMimeDatabase>
 #include <QDebug>
@@ -10,11 +8,10 @@
 MimeTypeViewer::MimeTypeViewer(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::MimeTypeViewer),
-    dataBase(new QMimeDatabase),
-    databaseBuilder(new QMimeDatabaseBuilder)
+    dataBase(new QMimeDatabase)
 {
     ui->setupUi(this);
-    connect(ui->addTypesButton, SIGNAL(clicked()), SLOT(onAddTypesButtonClicked()));
+    ui->addTypesButton->hide(); // hack
     connect(ui->openFileButton, SIGNAL(clicked()), SLOT(onOpenFileButtonClicked()));
 }
 
@@ -23,26 +20,6 @@ MimeTypeViewer::~MimeTypeViewer()
     delete ui;
 }
 
-void MimeTypeViewer::addDatabase(const QString &file)
-{
-    QString errorString;
-    if (!databaseBuilder->addMimeTypes(file, &errorString))
-        qWarning() << "Can't add types from" << file << ":" << errorString;
-
-    updateTypes();
-}
-
-void MimeTypeViewer::onAddTypesButtonClicked()
-{
-    QString file = QFileDialog::getOpenFileName(this, tr("Select database"),
-                                                QLatin1String("../../../qmime"),
-                                                tr("shared-mime-db (*.org.xml)"));
-    if (file.isEmpty())
-        return;
-
-    addDatabase(file);
-}
-
 void MimeTypeViewer::onOpenFileButtonClicked()
 {
     QString file = QFileDialog::getOpenFileName(this, tr("Select file"));
diff --git a/examples/mimetypeviewer/mimetypeviewer.h b/examples/mimetypeviewer/mimetypeviewer.h
index 10630b9..8e555c4 100644
--- a/examples/mimetypeviewer/mimetypeviewer.h
+++ b/examples/mimetypeviewer/mimetypeviewer.h
@@ -4,7 +4,6 @@
 #include <QWidget>
 
 class QMimeDatabase;
-class QMimeDatabaseBuilder;
 class QMimeType;
 
 namespace Ui {
@@ -22,13 +21,11 @@ public:
     void addDatabase(const QString &file);
 
 public slots:
-    void onAddTypesButtonClicked();
     void onOpenFileButtonClicked();
 
 private:
     Ui::MimeTypeViewer *ui;
     QMimeDatabase *dataBase;
-    QMimeDatabaseBuilder *databaseBuilder;
 
     void updateTypes();
     void setMimeType(const QMimeType &mime);