Moved mutators out of QMimeDatabase.

Moved both versions of QMimeDatabase::addMimeTypes() to QMimeDatabaseBuilder to keep the public API clean of mutators.

2 files changed, 7 insertions, 2 deletions

diff --git a/examples/mimetypeviewer/mimetypeviewer.cpp b/examples/mimetypeviewer/mimetypeviewer.cpp
index 8868614..07abc53 100644
--- a/examples/mimetypeviewer/mimetypeviewer.cpp
+++ b/examples/mimetypeviewer/mimetypeviewer.cpp
@@ -1,6 +1,8 @@
 #include "mimetypeviewer.h"
 #include "ui_mimetypeviewer.h"
 
+#include "../../src/qmimedatabase_p.h"
+
 #include <QFileDialog>
 #include <QMimeDatabase>
 #include <QDebug>
@@ -8,7 +10,8 @@
 MimeTypeViewer::MimeTypeViewer(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::MimeTypeViewer),
-    dataBase(new QMimeDatabase)
+    dataBase(new QMimeDatabase),
+    databaseBuilder(new QMimeDatabaseBuilder)
 {
     ui->setupUi(this);
     connect(ui->addTypesButton, SIGNAL(clicked()), SLOT(onAddTypesButtonClicked()));
@@ -23,7 +26,7 @@ MimeTypeViewer::~MimeTypeViewer()
 void MimeTypeViewer::addDatabase(const QString &file)
 {
     QString errorString;
-    if (!dataBase->addMimeTypes(file, &errorString))
+    if (!databaseBuilder->addMimeTypes(file, &errorString))
         qWarning() << "Can't add types from" << file << ":" << errorString;
 
     updateTypes();
diff --git a/examples/mimetypeviewer/mimetypeviewer.h b/examples/mimetypeviewer/mimetypeviewer.h
index 466c05c..10630b9 100644
--- a/examples/mimetypeviewer/mimetypeviewer.h
+++ b/examples/mimetypeviewer/mimetypeviewer.h
@@ -4,6 +4,7 @@
 #include <QWidget>
 
 class QMimeDatabase;
+class QMimeDatabaseBuilder;
 class QMimeType;
 
 namespace Ui {
@@ -27,6 +28,7 @@ public slots:
 private:
     Ui::MimeTypeViewer *ui;
     QMimeDatabase *dataBase;
+    QMimeDatabaseBuilder *databaseBuilder;
 
     void updateTypes();
     void setMimeType(const QMimeType &mime);