[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=ca30310

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

    Port KDialog to QDialog
---
 x-messenger-oauth2-prompt.cpp   | 8 +++++---
 x-messenger-oauth2-prompt.h     | 6 +++---
 x-telepathy-password-prompt.cpp | 9 +++++++--
 x-telepathy-password-prompt.h   | 4 ++--
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/x-messenger-oauth2-prompt.cpp b/x-messenger-oauth2-prompt.cpp
index 5cd6966..e9792a0 100644
--- a/x-messenger-oauth2-prompt.cpp
+++ b/x-messenger-oauth2-prompt.cpp
@@ -30,6 +30,7 @@
 #include <QUrl>
 #include <QUrlQuery>
 #include <QDebug>
+#include <QDialogButtonBox>
 
 #include <QtWebKit/QWebSettings>
 #include <QtWebKit/QWebFrame>
@@ -50,7 +51,7 @@ const QLatin1String accessTokenParameter("access_token");
 const QLatin1String refreshTokenParameter("refresh_token");
 
 XMessengerOAuth2Prompt::XMessengerOAuth2Prompt(QWidget* parent) :
-    KDialog(parent),
+    QDialog(parent),
     m_webView(new KWebView()),
     m_ProgressBar(new QProgressBar()),
     m_loginPageLoaded(false)
@@ -70,10 +71,11 @@ XMessengerOAuth2Prompt::XMessengerOAuth2Prompt(QWidget* parent) :
     widget->setLayout(layout);
     widget->setContentsMargins(0, 0, 0, 0);
 
-    setMainWidget(widget);
-    setButtons(Cancel);
     setWindowIcon(QIcon::fromTheme(QLatin1String("telepathy-kde")));
 
+    QDialogButtonBox *dbb = new QDialogButtonBox(QDialogButtonBox::Cancel, this);
+    connect(dbb, SIGNAL(rejected()), this, SIGNAL(rejected()));
+
     // connect progress bar
     connect(m_webView,
             SIGNAL(loadFinished(bool)),
diff --git a/x-messenger-oauth2-prompt.h b/x-messenger-oauth2-prompt.h
index 16bb035..5e7d452 100644
--- a/x-messenger-oauth2-prompt.h
+++ b/x-messenger-oauth2-prompt.h
@@ -19,13 +19,13 @@
 #ifndef X_MESSENGER_OAUTH2_PROMPT_H
 #define X_MESSENGER_OAUTH2_PROMPT_H
 
-#include <KDialog>
+#include <QDialog>
 
-class QProgressBar;
 class KWebView;
+class QProgressBar;
 class QNetworkReply;
 
-class XMessengerOAuth2Prompt : public KDialog
+class XMessengerOAuth2Prompt : public QDialog
 {
     Q_OBJECT
 
diff --git a/x-telepathy-password-prompt.cpp b/x-telepathy-password-prompt.cpp
index 39f782c..07b7cf1 100644
--- a/x-telepathy-password-prompt.cpp
+++ b/x-telepathy-password-prompt.cpp
@@ -23,12 +23,13 @@
 
 #include <QIcon>
 #include <QDebug>
+#include <QtWidgets/QDialogButtonBox>
 
 XTelepathyPasswordPrompt::XTelepathyPasswordPrompt(const Tp::AccountPtr &account, KTp::WalletInterface *walletInterface, QWidget *parent)
-    : KDialog(parent),
+    : QDialog(parent),
       ui(new Ui::XTelepathyPasswordPrompt)
 {
-    ui->setupUi(mainWidget());
+    ui->setupUi(this);
 
     setAttribute(Qt::WA_ShowWithoutActivating);
     setWindowIcon(QIcon::fromTheme(QLatin1String("telepathy-kde")));
@@ -46,6 +47,10 @@ XTelepathyPasswordPrompt::XTelepathyPasswordPrompt(const Tp::AccountPtr &account
     } else {
         ui->savePassword->setDisabled(true);
     }
+
+    QDialogButtonBox *dbb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    connect(dbb, SIGNAL(accepted()), this, SLOT(accept()));
+    connect(dbb, SIGNAL(rejected()), this, SLOT(reject()));
 }
 
 XTelepathyPasswordPrompt::~XTelepathyPasswordPrompt()
diff --git a/x-telepathy-password-prompt.h b/x-telepathy-password-prompt.h
index 76d9993..fa8c1ce 100644
--- a/x-telepathy-password-prompt.h
+++ b/x-telepathy-password-prompt.h
@@ -19,7 +19,7 @@
 #ifndef PASSWORDPROMPT_H
 #define PASSWORDPROMPT_H
 
-#include <KDialog>
+#include <QDialog>
 
 #include <TelepathyQt/Account>
 
@@ -33,7 +33,7 @@ namespace KTp
     class WalletInterface;
 }
 
-class XTelepathyPasswordPrompt : public KDialog
+class XTelepathyPasswordPrompt : public QDialog
 {
     Q_OBJECT
 

-- 
ktp-auth-handler packaging