Fix deprecation warnings about using QMultiMap methods on QMap

Use QMap::insert() instead QMultiMap::unite() in the tests.
In the module itself, change the parameter type to a QMultiMap
since apparently duplicate keys are expected.

Although possibly a pre-existing bug, to be on the safe side we change
QMap::insert to QMultiMap::replace.

Fixes
qoauth1signature.cpp: In member function ‘QList<QString> QOAuth1Signature::keys() const’:
qoauth1signature.cpp:344:37: warning: ‘QList<T> QMap<K, V>::uniqueKeys() const [with Key = QString; T = QVariant]’ is deprecated: Use QMultiMap for maps storing multiple values with the same key. [-Wdeprecated-declarations]
qoauth1.cpp: In member function ‘void QOAuth1Private::appendSignature(QAbstractOAuth::Stage, QVariantMap*, const QUrl&, QNetworkAccessManager::Operation, QVariantMap)’:
qoauth1.cpp:147:75: warning: ‘QMap<K, V>& QMap<K, V>::unite(const QMap<K, V>&) [with Key = QString; T = QVariant]’ is deprecated: Use QMultiMap for maps storing multiple values with the same key. [-Wdeprecated-declarations]
qoauth1.cpp: In member function ‘void QOAuth1::setup(QNetworkRequest*, const QVariantMap&, QNetworkAccessManager::Operation)’:
qoauth1.cpp:766:81: warning: ‘QMap<K, V>& QMap<K, V>::unite(const QMap<K, V>&) [with Key = QString; T = QVariant]’ is deprecated: Use QMultiMap for maps storing multiple values with the same key. [-Wdeprecated-declarations]
         const auto parameters = QVariantMap(oauthParams).unite(signingParameters);
qoauth1.cpp: In member function ‘void QOAuth1::setup(QNetworkRequest*, const QVariantMap&, const QByteArray&)’:
qoauth1.cpp:806:81: warning: ‘QMap<K, V>& QMap<K, V>::unite(const QMap<K, V>&) [with Key = QString; T = QVariant]’ is deprecated: Use QMultiMap for maps storing multiple values with the same key. [-Wdeprecated-declarations]
         const auto parameters = QVariantMap(oauthParams).unite(signingParameters);

Change-Id: Iaec7850335a188a6b198a672d220b01edc2c10ea
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/tests/auto/oauth1/tst_oauth1.cpp b/tests/auto/oauth1/tst_oauth1.cpp
index c76ba8f..b68491b 100644
--- a/tests/auto/oauth1/tst_oauth1.cpp
+++ b/tests/auto/oauth1/tst_oauth1.cpp
@@ -468,7 +468,8 @@ void tst_OAuth1::getToken()
     QCOMPARE(oauthHeaders["oauth_version"], "1.0");
     QString expectedSignature;
     {
-        QVariantMap modifiedHeaders = oauthHeaders.unite(parameters);
+        QVariantMap modifiedHeaders = oauthHeaders;
+        modifiedHeaders.insert(parameters);
         modifiedHeaders.remove("oauth_signature");
         QOAuth1Signature signature(url,
                                    clientCredentials.second,
@@ -592,11 +593,13 @@ void tst_OAuth1::prepareRequestSignature()
     // verify the signature
     const auto sigString = QUrl::fromPercentEncoding(authArgs.take(oauthSignature)
                                                      .toByteArray()).toUtf8();
+
+    authArgs.insert(extraParams);
     QOAuth1Signature signature(request.url(),
                                consumerSecret,
                                accessKeySecret,
                                QOAuth1Signature::HttpRequestMethod::Custom,
-                               authArgs.unite(extraParams));
+                               authArgs);
     signature.setCustomMethodString(operation);
     const auto signatureData = signature.hmacSha1();
     QCOMPARE(signatureData.toBase64(), sigString);