QMimeType::type() was changed to name().

3 files changed, 22 insertions, 22 deletions

diff --git a/examples/mimetypeviewer/mimetypeviewer.cpp b/examples/mimetypeviewer/mimetypeviewer.cpp
index bc1f5d1..dfe01d5 100644
--- a/examples/mimetypeviewer/mimetypeviewer.cpp
+++ b/examples/mimetypeviewer/mimetypeviewer.cpp
@@ -27,32 +27,32 @@ void MimeTypeViewer::onOpenFileButtonClicked()
         return;
 
     ui->fileLineEdit->setText(file);
-    QMimeType mime = dataBase->findByFile(QFileInfo(file));
-    if (mime.isValid())
-        setMimeType(mime);
+    QMimeType mimeType = dataBase->findByFile(QFileInfo(file));
+    if (mimeType.isValid())
+        setMimeType(mimeType);
 }
 
-void MimeTypeViewer::updateTypes()
+void MimeTypeViewer::updateNameList()
 {
-    ui->listWidget->clear();
+    ui->nameList->clear();
     foreach (const QMimeType &mime, dataBase->mimeTypes()) {
-        ui->listWidget->addItem(mime.type());
+        ui->nameList->addItem(mime.name());
     }
-    ui->listWidget->sortItems();
+    ui->nameList->sortItems();
 }
 
-void MimeTypeViewer::setMimeType(const QMimeType &mime)
+void MimeTypeViewer::setMimeType(const QMimeType &mimeType)
 {
-    ui->mimeTypeLabel->setText(mime.type());
-    ui->aliasesLabel->setText(mime.aliases().join(", "));
-    ui->commentLabel->setText(mime.comment());
-    ui->localeCommentLabel->setText(mime.localeComment());
-    ui->genericIconNameLabel->setText(mime.genericIconName());
-
-    ui->globPatternsLabel->setText(mime.globPatterns().join(", "));
-    ui->subClassesOfLabel->setText(mime.subClassOf().join(", "));
-
-    ui->suffixesLabel->setText(mime.suffixes().join(", "));
-    ui->preferredSuffixLabel->setText(mime.preferredSuffix());
-    ui->filterStringLabel->setText(mime.filterString());
+    ui->mimeTypeLabel->setText(mimeType.name());
+    ui->aliasesLabel->setText(mimeType.aliases().join(", "));
+    ui->commentLabel->setText(mimeType.comment());
+    ui->localeCommentLabel->setText(mimeType.localeComment());
+    ui->genericIconNameLabel->setText(mimeType.genericIconName());
+
+    ui->globPatternsLabel->setText(mimeType.globPatterns().join(", "));
+    ui->subClassesOfLabel->setText(mimeType.subClassOf().join(", "));
+
+    ui->suffixesLabel->setText(mimeType.suffixes().join(", "));
+    ui->preferredSuffixLabel->setText(mimeType.preferredSuffix());
+    ui->filterStringLabel->setText(mimeType.filterString());
 }
diff --git a/examples/mimetypeviewer/mimetypeviewer.h b/examples/mimetypeviewer/mimetypeviewer.h
index 8e555c4..c70e8ae 100644
--- a/examples/mimetypeviewer/mimetypeviewer.h
+++ b/examples/mimetypeviewer/mimetypeviewer.h
@@ -27,7 +27,7 @@ private:
     Ui::MimeTypeViewer *ui;
     QMimeDatabase *dataBase;
 
-    void updateTypes();
+    void updateNameList();
     void setMimeType(const QMimeType &mime);
 };
 
diff --git a/examples/mimetypeviewer/mimetypeviewer.ui b/examples/mimetypeviewer/mimetypeviewer.ui
index 196b06f..ae707ef 100644
--- a/examples/mimetypeviewer/mimetypeviewer.ui
+++ b/examples/mimetypeviewer/mimetypeviewer.ui
@@ -21,7 +21,7 @@
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <item>
-       <widget class="QListWidget" name="listWidget"/>
+       <widget class="QListWidget" name="nameList"/>
       </item>
       <item>
        <widget class="QPushButton" name="addTypesButton">