Git commit 5873bc9d963ca8d3bfa7b9fe7400f8a0fdf95b84 by Damien Caliste.
Committed on 20/09/2018 at 08:33.
Pushed by dcaliste into branch 'master'.

Move to use QUrlQuery in favor of deprecated queryItemValue() from QUrl

Some more deprecation upgrades:
There is now in Qt a dedicated class for queries in urls, so accessors from
QUrl have been moved to this dedicated class.

Reviewed By: leinir

Differential Revision: https://phabricator.kde.org/D15231

M  +4    -2    components/Global.cpp
M  +17   -14   components/impl/TextDocumentImpl.cpp
M  +2    -1    sheets/dialogs/LinkDialog.cpp

https://commits.kde.org/calligra/5873bc9d963ca8d3bfa7b9fe7400f8a0fdf95b84

diff --git a/components/Global.cpp b/components/Global.cpp
index 9c6d8f29d64..8c51ab3dd28 100644
--- a/components/Global.cpp
+++ b/components/Global.cpp
@@ -25,6 +25,7 @@
 #include <QDebug>
 =

 #include <QUrl>
+#include <QUrlQuery>
 #include <QMimeDatabase>
 #include <QPluginLoader>
 =

@@ -52,10 +53,11 @@ void Global::loadPlugins()
 int Global::documentType(const QUrl& document)
 {
     int result =3D DocumentType::Unknown;
+    const QUrlQuery query(document);
 =

     // First, check if the URL gives us specific information on this topic=
 (such as asking for a new file)
-    if(document.hasQueryItem("mimetype")) {
-        QString mime =3D document.queryItemValue("mimetype");
+    if(query.hasQueryItem("mimetype")) {
+        QString mime =3D query.queryItemValue("mimetype");
         if(mime =3D=3D WORDS_MIME_TYPE) {
             result =3D DocumentType::TextDocument;
         }
diff --git a/components/impl/TextDocumentImpl.cpp b/components/impl/TextDoc=
umentImpl.cpp
index 4c445257f90..68eb719a3bd 100644
--- a/components/impl/TextDocumentImpl.cpp
+++ b/components/impl/TextDocumentImpl.cpp
@@ -43,6 +43,7 @@
 #include <QTextLayout>
 #include <QDebug>
 #include <QPointer>
+#include <QUrlQuery>
 =

 #include "ComponentsKoCanvasController.h"
 #include <libs/textlayout/KoTextShapeData.h>
@@ -189,35 +190,37 @@ bool TextDocumentImpl::load(const QUrl& url)
 =

     bool retval =3D false;
     if (url.scheme() =3D=3D QStringLiteral("newfile")) {
+        QUrlQuery query(url);
+
         d->document->initEmpty();
         KWPageStyle style =3D d->document->pageManager()->defaultPageStyle=
();
         Q_ASSERT(style.isValid());
 =

         KoColumns columns;
-        columns.count =3D url.queryItemValue("columncount").toInt();
-        columns.gapWidth =3D url.queryItemValue("columngap").toDouble();
+        columns.count =3D query.queryItemValue("columncount").toInt();
+        columns.gapWidth =3D query.queryItemValue("columngap").toDouble();
         style.setColumns(columns);
 =

         KoPageLayout layout =3D style.pageLayout();
-        layout.format =3D KoPageFormat::formatFromString(url.queryItemValu=
e("pageformat"));
-        layout.orientation =3D (KoPageFormat::Orientation)url.queryItemVal=
ue("pageorientation").toInt();
-        layout.height =3D MM_TO_POINT(url.queryItemValue("height").toDoubl=
e());
-        layout.width =3D MM_TO_POINT(url.queryItemValue("width").toDouble(=
));
-        if (url.queryItemValue("facingpages").toInt() =3D=3D 1) {
-            layout.bindingSide =3D MM_TO_POINT(url.queryItemValue("leftmar=
gin").toDouble());
-            layout.pageEdge =3D MM_TO_POINT(url.queryItemValue("rightmargi=
n").toDouble());
+        layout.format =3D KoPageFormat::formatFromString(query.queryItemVa=
lue("pageformat"));
+        layout.orientation =3D (KoPageFormat::Orientation)query.queryItemV=
alue("pageorientation").toInt();
+        layout.height =3D MM_TO_POINT(query.queryItemValue("height").toDou=
ble());
+        layout.width =3D MM_TO_POINT(query.queryItemValue("width").toDoubl=
e());
+        if (query.queryItemValue("facingpages").toInt() =3D=3D 1) {
+            layout.bindingSide =3D MM_TO_POINT(query.queryItemValue("leftm=
argin").toDouble());
+            layout.pageEdge =3D MM_TO_POINT(query.queryItemValue("rightmar=
gin").toDouble());
             layout.leftMargin =3D layout.rightMargin =3D -1;
         }
         else {
             layout.bindingSide =3D layout.pageEdge =3D -1;
-            layout.leftMargin =3D MM_TO_POINT(url.queryItemValue("leftmarg=
in").toDouble());
-            layout.rightMargin =3D MM_TO_POINT(url.queryItemValue("rightma=
rgin").toDouble());
+            layout.leftMargin =3D MM_TO_POINT(query.queryItemValue("leftma=
rgin").toDouble());
+            layout.rightMargin =3D MM_TO_POINT(query.queryItemValue("right=
margin").toDouble());
         }
-        layout.topMargin =3D MM_TO_POINT(url.queryItemValue("topmargin").t=
oDouble());
-        layout.bottomMargin =3D MM_TO_POINT(url.queryItemValue("bottommarg=
in").toDouble());
+        layout.topMargin =3D MM_TO_POINT(query.queryItemValue("topmargin")=
.toDouble());
+        layout.bottomMargin =3D MM_TO_POINT(query.queryItemValue("bottomma=
rgin").toDouble());
         style.setPageLayout(layout);
 =

-        d->document->setUnit(KoUnit::fromSymbol(url.queryItemValue("unit")=
));
+        d->document->setUnit(KoUnit::fromSymbol(query.queryItemValue("unit=
")));
         d->document->relayout();
         retval =3D true;
     }
diff --git a/sheets/dialogs/LinkDialog.cpp b/sheets/dialogs/LinkDialog.cpp
index 76ed166f6c5..50c94e4dcbc 100644
--- a/sheets/dialogs/LinkDialog.cpp
+++ b/sheets/dialogs/LinkDialog.cpp
@@ -34,6 +34,7 @@
 =

 #include <QLabel>
 #include <QUrl>
+#include <QUrlQuery>
 #include <QVBoxLayout>
 =

 #include <kcombobox.h>
@@ -272,7 +273,7 @@ void LinkDialog::setLink(const QString& link)
         QUrl url(link);
         if (url.isValid()) {
             d->mailLink->setText(url.toString(QUrl::RemoveScheme | QUrl::R=
emoveQuery));
-            d->mailSubject->setText(url.queryItemValue("subject"));
+            d->mailSubject->setText(QUrlQuery(url).queryItemValue("subject=
"));
         } else {
             d->mailLink->setText(link.mid(7));
         }