Merge comment and localeComment.

This means comment() now returns a translated string.
There's no use case for "a comment in english", and if one really wants
that, he can use comment("en_US").

2 files changed, 15 insertions, 30 deletions

diff --git a/examples/mimetypeviewer/mimetypeviewer.cpp b/examples/mimetypeviewer/mimetypeviewer.cpp
index 3af5df4..bce2f9c 100644
--- a/examples/mimetypeviewer/mimetypeviewer.cpp
+++ b/examples/mimetypeviewer/mimetypeviewer.cpp
@@ -45,7 +45,6 @@ void MimeTypeViewer::setMimeType(const QMimeType &mimeType)
 {
     ui->mimeTypeLabel->setText(mimeType.name());
     ui->commentLabel->setText(mimeType.comment());
-    ui->localeCommentLabel->setText(mimeType.localeComment());
     ui->genericIconNameLabel->setText(mimeType.genericIconName());
     ui->iconNameLabel->setText(mimeType.iconName());
 
diff --git a/examples/mimetypeviewer/mimetypeviewer.ui b/examples/mimetypeviewer/mimetypeviewer.ui
index 98816bc..317ab38 100644
--- a/examples/mimetypeviewer/mimetypeviewer.ui
+++ b/examples/mimetypeviewer/mimetypeviewer.ui
@@ -97,125 +97,111 @@
     </widget>
    </item>
    <item row="4" column="0">
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>Localized comment:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="QLabel" name="localeCommentLabel">
-     <property name="text">
-      <string>&lt;&gt;</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0">
     <widget class="QLabel" name="label_6">
      <property name="text">
       <string>Generic icon name:</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
+   <item row="4" column="1">
     <widget class="QLabel" name="genericIconNameLabel">
      <property name="text">
       <string>&lt;&gt;</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
+   <item row="5" column="0">
     <widget class="QLabel" name="label_7">
      <property name="text">
       <string>Icon name:</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="1">
+   <item row="5" column="1">
     <widget class="QLabel" name="iconNameLabel">
      <property name="text">
       <string>&lt;&gt;</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="0">
+   <item row="6" column="0">
     <widget class="QLabel" name="label_8">
      <property name="text">
       <string>Glob patterns:</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="1">
+   <item row="6" column="1">
     <widget class="QLabel" name="globPatternsLabel">
      <property name="text">
       <string>&lt;&gt;</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="0">
+   <item row="7" column="0">
     <widget class="QLabel" name="label_9">
      <property name="text">
       <string>Direct SubClass of:</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="1">
+   <item row="7" column="1">
     <widget class="QLabel" name="parentMimeTypesLabel">
      <property name="text">
       <string>&lt;&gt;</string>
      </property>
     </widget>
    </item>
-   <item row="9" column="0">
+   <item row="8" column="0">
     <widget class="QLabel" name="label_allParents">
      <property name="text">
       <string>SubClass of:</string>
      </property>
     </widget>
    </item>
-   <item row="9" column="1">
+   <item row="8" column="1">
     <widget class="QLabel" name="allParentMimeTypesLabel">
      <property name="text">
       <string>&lt;&gt;</string>
      </property>
     </widget>
    </item>
-   <item row="10" column="0">
+   <item row="9" column="0">
     <widget class="QLabel" name="label_10">
      <property name="text">
       <string>Suffixes:</string>
      </property>
     </widget>
    </item>
-   <item row="10" column="1">
+   <item row="9" column="1">
     <widget class="QLabel" name="suffixesLabel">
      <property name="text">
       <string>&lt;&gt;</string>
      </property>
     </widget>
    </item>
-   <item row="11" column="0">
+   <item row="10" column="0">
     <widget class="QLabel" name="label_11">
      <property name="text">
       <string>Preferred suffix:</string>
      </property>
     </widget>
    </item>
-   <item row="11" column="1">
+   <item row="10" column="1">
     <widget class="QLabel" name="preferredSuffixLabel">
      <property name="text">
       <string>&lt;&gt;</string>
      </property>
     </widget>
    </item>
-   <item row="12" column="0">
+   <item row="11" column="0">
     <widget class="QLabel" name="label_12">
      <property name="text">
       <string>Filter string:</string>
      </property>
     </widget>
    </item>
-   <item row="12" column="1">
+   <item row="11" column="1">
     <widget class="QLabel" name="filterStringLabel">
      <property name="text">
       <string>&lt;&gt;</string>