[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=35034c6

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

    Port KTabWidget to QTabWidget
---
 src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
index 89ce537..e17dacf 100644
--- a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
+++ b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <KTabWidget>
 #include <QtGui/QHBoxLayout>
 #include <KLocalizedString>
 
+#include <QTabWidget>
 #include "generic-advanced-options-widget.h"
 
 class GenericAdvancedOptionsWidget::Private
@@ -30,7 +30,7 @@ public:
     Private()
     {
     }
-    KTabWidget *tabWidget;
+    QTabWidget *tabWidget;
     QList<AbstractAccountParametersWidget*> widgets;
 };
 
@@ -39,11 +39,11 @@ GenericAdvancedOptionsWidget::GenericAdvancedOptionsWidget(ParameterEditModel *p
  : AbstractAccountParametersWidget(parameterModel, parent),
    d(new Private)
 {
-    d->tabWidget = new KTabWidget();
+    d->tabWidget = new QTabWidget();
     QHBoxLayout *layout = new QHBoxLayout(this);
     layout->addWidget(d->tabWidget);
 
-    d->tabWidget->setTabBarHidden(true);
+    d->tabWidget->tabBar()->hide();
 }
 
 GenericAdvancedOptionsWidget::~GenericAdvancedOptionsWidget()
@@ -65,7 +65,7 @@ bool GenericAdvancedOptionsWidget::validateParameterValues()
 
 void GenericAdvancedOptionsWidget::setTabBarHidden(bool hidden)
 {
-    d->tabWidget->setTabBarHidden(hidden);
+    d->tabWidget->tabBar()->setHidden(hidden);
 }
 
 void GenericAdvancedOptionsWidget::submit()
@@ -79,7 +79,7 @@ void GenericAdvancedOptionsWidget::submit()
 void GenericAdvancedOptionsWidget::addTab(AbstractAccountParametersWidget* tab, const QString& label)
 {
     if (d->tabWidget->count() == 1) {
-        d->tabWidget->setTabBarHidden(false);
+        d->tabWidget->tabBar()->show();
     }
 
     d->tabWidget->addTab(tab, label);

-- 
ktp-accounts-kcm packaging