[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=26f5780

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

    Port KIcon to QIcon
---
 x-messenger-oauth2-prompt.cpp   | 4 ++--
 x-telepathy-password-prompt.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x-messenger-oauth2-prompt.cpp b/x-messenger-oauth2-prompt.cpp
index 27a25ff..5cd6966 100644
--- a/x-messenger-oauth2-prompt.cpp
+++ b/x-messenger-oauth2-prompt.cpp
@@ -18,7 +18,6 @@
 
 #include "x-messenger-oauth2-prompt.h"
 
-#include <KIcon>
 #include <KToolInvocation>
 #include <KWebView>
 #include <KWebPage>
@@ -27,6 +26,7 @@
 #include <QtGui/QBoxLayout>
 #include <QtGui/QLayout>
 #include <QtNetwork/QNetworkReply>
+#include <QIcon>
 #include <QUrl>
 #include <QUrlQuery>
 #include <QDebug>
@@ -71,8 +71,8 @@ XMessengerOAuth2Prompt::XMessengerOAuth2Prompt(QWidget* parent) :
     widget->setContentsMargins(0, 0, 0, 0);
 
     setMainWidget(widget);
-    setWindowIcon(KIcon(QLatin1String("telepathy-kde")));
     setButtons(Cancel);
+    setWindowIcon(QIcon::fromTheme(QLatin1String("telepathy-kde")));
 
     // connect progress bar
     connect(m_webView,
diff --git a/x-telepathy-password-prompt.cpp b/x-telepathy-password-prompt.cpp
index 1afeb75..39f782c 100644
--- a/x-telepathy-password-prompt.cpp
+++ b/x-telepathy-password-prompt.cpp
@@ -21,7 +21,7 @@
 
 #include <KTp/wallet-interface.h>
 
-#include <KIcon>
+#include <QIcon>
 #include <QDebug>
 
 XTelepathyPasswordPrompt::XTelepathyPasswordPrompt(const Tp::AccountPtr &account, KTp::WalletInterface *walletInterface, QWidget *parent)
@@ -31,11 +31,11 @@ XTelepathyPasswordPrompt::XTelepathyPasswordPrompt(const Tp::AccountPtr &account
     ui->setupUi(mainWidget());
 
     setAttribute(Qt::WA_ShowWithoutActivating);
-    setWindowIcon(KIcon(QLatin1String("telepathy-kde")));
+    setWindowIcon(QIcon::fromTheme(QLatin1String("telepathy-kde")));
 
     ui->accountName->setText(account->displayName());
-    ui->accountIcon->setPixmap(KIcon(QLatin1String("dialog-password")).pixmap(60, 60));
-    ui->title->setPixmap(KIcon(account->iconName()).pixmap(22, 22));
+    ui->accountIcon->setPixmap(QIcon::fromTheme(QLatin1String("dialog-password")).pixmap(60, 60));
+    ui->title->setPixmap(QIcon::fromTheme(account->iconName()).pixmap(22, 22));
     ui->passwordLineEdit->setFocus();
 
     if (walletInterface->isOpen()) {

-- 
ktp-auth-handler packaging