[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=e57730b

The following commit has been merged in the master branch:
commit e57730b0e2e991f14372d92a9e1ce22109be2d47
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Thu Aug 21 16:06:32 2014 +0200

    Port KUrl to QUrl
---
 x-messenger-oauth2-prompt.cpp          | 13 +++++++------
 x-telepathy-sso-facebook-operation.cpp | 23 +++++++++++++----------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/x-messenger-oauth2-prompt.cpp b/x-messenger-oauth2-prompt.cpp
index 8c1792f..27a25ff 100644
--- a/x-messenger-oauth2-prompt.cpp
+++ b/x-messenger-oauth2-prompt.cpp
@@ -18,7 +18,6 @@
 
 #include "x-messenger-oauth2-prompt.h"
 
-#include <KUrl>
 #include <KIcon>
 #include <KToolInvocation>
 #include <KWebView>
@@ -28,6 +27,8 @@
 #include <QtGui/QBoxLayout>
 #include <QtGui/QLayout>
 #include <QtNetwork/QNetworkReply>
+#include <QUrl>
+#include <QUrlQuery>
 #include <QDebug>
 
 #include <QtWebKit/QWebSettings>
@@ -108,8 +109,8 @@ XMessengerOAuth2Prompt::XMessengerOAuth2Prompt(QWidget* parent) :
             SLOT(onUnsupportedContent(QNetworkReply*)));
 
     // start loading the login URL
-    KUrl url(QString(authorizeRequest).arg(msnClientID).arg(scopes).arg(redirectUri));
-    m_webView->load(url.url());
+    QUrl url(QString(authorizeRequest).arg(msnClientID).arg(scopes).arg(redirectUri));
+    m_webView->load(url);
 }
 
 XMessengerOAuth2Prompt::~XMessengerOAuth2Prompt()
@@ -179,8 +180,8 @@ void XMessengerOAuth2Prompt::onUnsupportedContent(QNetworkReply* reply)
 
 void XMessengerOAuth2Prompt::extractCode(const QUrl &url)
 {
-    QString code = url.queryItemValue(codeParameter);
     qDebug() << url;
+    QString code = QUrlQuery(url).queryItemValue(codeParameter);
 
     if (code.isEmpty()) {
         // Could not find the access token
@@ -191,8 +192,8 @@ void XMessengerOAuth2Prompt::extractCode(const QUrl &url)
     qDebug() << "Code found:" << code;
 
     // start loading the login URL
-    KUrl tokenUrl(QString(tokenRequest).arg(msnClientID).arg(redirectUri).arg(code));
-    m_webView->load(tokenUrl.url());
+    QUrl tokenUrl(QString(tokenRequest).arg(msnClientID).arg(redirectUri).arg(code));
+    m_webView->load(tokenUrl);
 }
 
 
diff --git a/x-telepathy-sso-facebook-operation.cpp b/x-telepathy-sso-facebook-operation.cpp
index 82c47b6..a4a9dc9 100644
--- a/x-telepathy-sso-facebook-operation.cpp
+++ b/x-telepathy-sso-facebook-operation.cpp
@@ -26,8 +26,9 @@
 
 #include <Accounts/Account>
 
-#include <KUrl>
 #include <QDebug>
+#include <QUrlQuery>
+#include <QUrl>
 
 #include "getcredentialsjob.h"
 
@@ -77,23 +78,25 @@ void XTelepathySSOFacebookOperation::onNewChallenge(const QByteArray& challengeD
 
 void XTelepathySSOFacebookOperation::gotCredentials(KJob *kJob)
 {
-    KUrl fbRequestUrl;
-    KUrl fbResponseUrl;
     qDebug();
+    QUrl fbRequestUrl;
 
     fbRequestUrl.setQuery(m_challengeData);
+    QUrlQuery fbRequestQuery(fbRequestUrl);
+    QUrlQuery fbResponseQuery;
+
     qDebug() << fbRequestQuery.queryItemValue("version");
 
     GetCredentialsJob *job = qobject_cast< GetCredentialsJob* >(kJob);
     QVariantMap credentialsData = job->credentialsData();
-    fbResponseUrl.addQueryItem("method", fbRequestUrl.queryItemValue("method"));
-    fbResponseUrl.addQueryItem("nonce", fbRequestUrl.queryItemValue("nonce"));
-    fbResponseUrl.addQueryItem("access_token", credentialsData["AccessToken"].toString());
-    fbResponseUrl.addQueryItem("api_key", credentialsData["ClientId"].toString());
-    fbResponseUrl.addQueryItem("call_id", "0");
-    fbResponseUrl.addQueryItem("v", "1.0");
+    fbResponseQuery.addQueryItem("method", fbRequestQuery.queryItemValue("method"));
+    fbResponseQuery.addQueryItem("nonce", fbRequestQuery.queryItemValue("nonce"));
+    fbResponseQuery.addQueryItem("access_token", credentialsData["AccessToken"].toString());
+    fbResponseQuery.addQueryItem("api_key", credentialsData["ClientId"].toString());
+    fbResponseQuery.addQueryItem("call_id", "0");
+    fbResponseQuery.addQueryItem("v", "1.0");
 
     //.mid(1) trims leading '?' char
-    m_saslIface->Respond(fbResponseUrl.query().mid(1).toUtf8());
     qDebug() << fbResponseQuery.query().mid(1);
+    m_saslIface->Respond(fbResponseQuery.query().mid(1).toUtf8());
 }

-- 
ktp-auth-handler packaging