From 5c1fe471a785875fcf7f8daeddaecd9d2b965da1 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 20 Dec 2019 13:32:49 +0100 Subject: [PATCH] Port QSet::toList to QSet::values (toList() is deprecated) --- mobile/components/documentitem.cpp | 2 +- shell/shell.cpp | 2 +- ui/pageview.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/components/documentitem.cpp b/mobile/components/documentitem.cpp index fd17198c6..b3f02d8d2 100644 --- a/mobile/components/documentitem.cpp +++ b/mobile/components/documentitem.cpp @@ -158,7 +158,7 @@ QVariantList DocumentItem::bookmarkedPages() const Okular::DocumentViewport viewport(bookmark.url().fragment()); pages << viewport.pageNumber; } - list = pages.toList(); + list = pages.values(); std::sort(list.begin(), list.end()); QVariantList variantList; diff --git a/shell/shell.cpp b/shell/shell.cpp index fe994dab5..5a7113fa7 100644 --- a/shell/shell.cpp +++ b/shell/shell.cpp @@ -467,7 +467,7 @@ void Shell::fileOpen() } namePatterns.prepend( i18n("All files (*)") ); - namePatterns.prepend( i18n("All supported files (%1)", globPatterns.toList().join( QLatin1Char(' ') ) ) ); + namePatterns.prepend( i18n("All supported files (%1)", globPatterns.values().join( QLatin1Char(' ') ) ) ); dlg->setNameFilters( namePatterns ); dlg->setWindowTitle( i18n("Open Document") ); diff --git a/ui/pageview.cpp b/ui/pageview.cpp index 598468ea6..4e5a1d0d7 100644 --- a/ui/pageview.cpp +++ b/ui/pageview.cpp @@ -950,7 +950,7 @@ QString PageViewPrivate::selectedText() const return QString(); QString text; - QList< int > selpages = pagesWithTextSelection.toList(); + QList< int > selpages = pagesWithTextSelection.values(); std::sort(selpages.begin(), selpages.end()); const Okular::Page * pg = nullptr; if ( selpages.count() == 1 )