summaryrefslogtreecommitdiffstats
path: root/examples/mimetypeviewer
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2012-01-28 12:57:00 +0100
committerWolf-Michael Bolle <wolf-michael.bolle@nokia.com>2012-01-30 13:13:29 +0100
commit845cf3b231a325d94ca7eee8d95068782e60b11b (patch)
treecbfd305718c55800c4c3e5b9573b7328e2b92892 /examples/mimetypeviewer
parent52bfdb8b99d59164a93a9cc398eaaa925f4855fc (diff)
QMimeType API: allParentMimeTypes -> allAncestors.
Suggested by Lars. Change-Id: Ibaef47854fcf06fb39e7cc9a987557940f5bbe66 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>
Diffstat (limited to 'examples/mimetypeviewer')
-rw-r--r--examples/mimetypeviewer/mimetypeviewer.cpp2
-rw-r--r--examples/mimetypeviewer/mimetypeviewer.ui2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/mimetypeviewer/mimetypeviewer.cpp b/examples/mimetypeviewer/mimetypeviewer.cpp
index 10341e5..370e3b0 100644
--- a/examples/mimetypeviewer/mimetypeviewer.cpp
+++ b/examples/mimetypeviewer/mimetypeviewer.cpp
@@ -50,7 +50,7 @@ void MimeTypeViewer::setMimeType(const QMimeType &mimeType)
ui->globPatternsLabel->setText(mimeType.globPatterns().join(", "));
ui->parentMimeTypesLabel->setText(mimeType.parentMimeTypes().join(", "));
- ui->allParentMimeTypesLabel->setText(mimeType.allParentMimeTypes().join(", "));
+ ui->allAncestorsLabel->setText(mimeType.allAncestors().join(", "));
ui->suffixesLabel->setText(mimeType.suffixes().join(", "));
ui->preferredSuffixLabel->setText(mimeType.preferredSuffix());
diff --git a/examples/mimetypeviewer/mimetypeviewer.ui b/examples/mimetypeviewer/mimetypeviewer.ui
index 317ab38..085986b 100644
--- a/examples/mimetypeviewer/mimetypeviewer.ui
+++ b/examples/mimetypeviewer/mimetypeviewer.ui
@@ -160,7 +160,7 @@
</widget>
</item>
<item row="8" column="1">
- <widget class="QLabel" name="allParentMimeTypesLabel">
+ <widget class="QLabel" name="allAncestorsLabel">
<property name="text">
<string>&lt;&gt;</string>
</property>