QOAuth1 constructor refactorv5.8.0-alpha1

Added the client credentials pair to the private implementation
constructor.  QOAuth1 constructors now are calling the main
constructor instead of the base class.

Change-Id: I9cc697a4f63ec4cda0c10488db5a99a15117780a
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>

2 files changed, 20 insertions, 14 deletions

diff --git a/src/oauth/qoauth1.cpp b/src/oauth/qoauth1.cpp
index 3ccb238..4251c3e 100644
--- a/src/oauth/qoauth1.cpp
+++ b/src/oauth/qoauth1.cpp
@@ -72,8 +72,10 @@ const QString Key::oauthTokenSecret =        QStringLiteral("oauth_token_secret"
 const QString Key::oauthVerifier =           QStringLiteral("oauth_verifier");
 const QString Key::oauthVersion =            QStringLiteral("oauth_version");
 
-QOAuth1Private::QOAuth1Private(QNetworkAccessManager *networkAccessManager)
-    : QAbstractOAuthPrivate(networkAccessManager)
+QOAuth1Private::QOAuth1Private(const QPair<QString, QString> &clientCredentials,
+                               QNetworkAccessManager *networkAccessManager) :
+    QAbstractOAuthPrivate(networkAccessManager),
+    clientCredentials(clientCredentials)
 {
     qRegisterMetaType<QNetworkReply::NetworkError>("QNetworkReply::NetworkError");
 }
@@ -236,27 +238,28 @@ void QOAuth1Private::_q_tokensReceived(const QVariantMap &tokens)
     case QAbstractOAuth::Status::RefreshingToken:
         break;
     }
-
 }
 
-QOAuth1::QOAuth1(QObject *parent)
-    : QAbstractOAuth(*new QOAuth1Private, parent)
+QOAuth1::QOAuth1(QObject *parent) :
+    QOAuth1(nullptr,
+            parent)
 {}
 
-QOAuth1::QOAuth1(QNetworkAccessManager *manager, QObject *parent)
-    : QAbstractOAuth(*new QOAuth1Private(manager), parent)
+QOAuth1::QOAuth1(QNetworkAccessManager *manager, QObject *parent) :
+    QOAuth1(QString(),
+            QString(),
+            manager,
+            parent)
 {}
 
 QOAuth1::QOAuth1(const QString &clientIdentifier,
                  const QString &clientSharedSecret,
                  QNetworkAccessManager *manager,
                  QObject *parent)
-    : QAbstractOAuth(*new QOAuth1Private(manager), parent)
-{
-    Q_D(QOAuth1);
-    d->clientCredentials.first = clientIdentifier;
-    d->clientCredentials.second = clientSharedSecret;
-}
+    : QAbstractOAuth(*new QOAuth1Private(qMakePair(clientIdentifier, clientSharedSecret),
+                                         manager),
+                     parent)
+{}
 
 QOAuth1::~QOAuth1()
 {}
diff --git a/src/oauth/qoauth1_p.h b/src/oauth/qoauth1_p.h
index 167aed2..e1bed46 100644
--- a/src/oauth/qoauth1_p.h
+++ b/src/oauth/qoauth1_p.h
@@ -59,7 +59,9 @@
 #include <QtNetworkAuth/qoauthglobal.h>
 
 #include <QtCore/qurl.h>
+#include <QtCore/qpair.h>
 #include <QtCore/qobject.h>
+#include <QtCore/qstring.h>
 
 #include <QtNetwork/qnetworkreply.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
@@ -71,7 +73,8 @@ class QOAuth1Private : public QAbstractOAuthPrivate
     Q_DECLARE_PUBLIC(QOAuth1)
 
 public:
-    QOAuth1Private(QNetworkAccessManager *networkAccessManager = nullptr);
+    QOAuth1Private(const QPair<QString, QString> &clientCredentials,
+                   QNetworkAccessManager *networkAccessManager = nullptr);
 
     void appendCommonHeaders(QVariantMap *headers);
     void appendSignature(QAbstractOAuth::Stage stage,