[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=a725501

The following commit has been merged in the master branch:
commit a725501a308c29ece0f33a5d881717fbb4411ee1
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Aug 6 13:07:20 2014 +0200

    Port KDialog to QDialog
---
 src/KCMTelepathyAccounts/account-edit-widget.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index e885ad0..cc76933 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -37,6 +37,7 @@
 #include <QtCore/QList>
 #include <QtGui/QCheckBox>
 
+#include <QDialog>
 
 class AccountEditWidget::Private
 {
@@ -213,18 +214,18 @@ void AccountEditWidget::onAdvancedClicked()
         return;
     }
 
-    QWeakPointer<KDialog> dialog = new KDialog(this);
+    QPointer<QDialog> dialog = new QDialog(this);
     dialog.data()->setWindowTitle(i18n("Advanced Options"));
 
     AbstractAccountParametersWidget *advancedWidget;
     advancedWidget = d->accountUi->advancedOptionsWidget(d->parameterModel,
                                                          dialog.data());
-    dialog.data()->setMainWidget(advancedWidget);
+//     dialog.data()->setMainWidget(advancedWidget);
 
     // loop until the entered values are ok or the user cancels the dialog
 
     while (true) {
-        if (dialog.data()->exec() == KDialog::Accepted) {
+        if (dialog.data()->exec() == QDialog::Accepted) {
             advancedWidget->submit();
             // validate the parameter values
             if (!advancedWidget->validateParameterValues()) {

-- 
ktp-accounts-kcm packaging