[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=51c6980

The following commit has been merged in the master branch:
commit 51c698026bbb42df7047fd2fdd0f3233dc394407
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Sat Sep 29 03:26:11 2012 +0530

    Fix as per review request
    
    REVIEW: 106354
---
 KTp/Widgets/notificationconfigdialog.cpp | 17 +++--------------
 KTp/Widgets/notificationconfigdialog.h   |  4 +---
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/KTp/Widgets/notificationconfigdialog.cpp b/KTp/Widgets/notificationconfigdialog.cpp
index 512a1db..17c2986 100644
--- a/KTp/Widgets/notificationconfigdialog.cpp
+++ b/KTp/Widgets/notificationconfigdialog.cpp
@@ -43,7 +43,7 @@ KTp::NotificationConfigDialog::NotificationConfigDialog(const Tp::ContactPtr &co
     setCaption(i18n("Configure notifications for %1", m_contact.data()->alias()));
     setAttribute(Qt::WA_DeleteOnClose);
     setButtons(KDialog::Apply | KDialog::Cancel | KDialog::Default );
-    enableApply(false);
+    enableButtonApply(false);
 
     QWidget *centralWidget = new QWidget(this);
     QVBoxLayout *vboxLayout = new QVBoxLayout(centralWidget);
@@ -72,7 +72,7 @@ KTp::NotificationConfigDialog::NotificationConfigDialog(const Tp::ContactPtr &co
     connect(this, SIGNAL(defaultClicked()),
             SLOT(defaults()));
     connect(m_notifyWidget, SIGNAL(changed(bool)),
-            SLOT(enableApply(bool)));
+            SLOT(enableButtonApply(bool)));
 }
 
 KTp::NotificationConfigDialog::~NotificationConfigDialog()
@@ -84,7 +84,7 @@ void KTp::NotificationConfigDialog::saveConfig()
     m_notifyWidget->save();
 }
 
-void KTp::NotificationConfigDialog::updateNotifyWidget(int selection)
+void KTp::NotificationConfigDialog::updateNotifyWidget(const int selection)
 {
     if (selection == 0) {
         m_notifyWidget->setApplication(QLatin1String("ktelepathy"),
@@ -99,12 +99,6 @@ void KTp::NotificationConfigDialog::updateNotifyWidget(int selection)
     m_currentSelection = selection;
 }
 
-void KTp::NotificationConfigDialog::show()
-{
-    m_notifyWidget->show();
-    setVisible(true);
-}
-
 void KTp::NotificationConfigDialog::defaults()
 {
     KSharedConfigPtr config = KSharedConfig::openConfig(QLatin1String("ktelepathy.notifyrc"));
@@ -136,8 +130,3 @@ void KTp::NotificationConfigDialog::defaults()
     }
     updateNotifyWidget(m_currentSelection);
 }
-
-void KTp::NotificationConfigDialog::enableApply(bool state)
-{
-        enableButtonApply(state);
-}
diff --git a/KTp/Widgets/notificationconfigdialog.h b/KTp/Widgets/notificationconfigdialog.h
index 0c7fe34..0ed1bc1 100644
--- a/KTp/Widgets/notificationconfigdialog.h
+++ b/KTp/Widgets/notificationconfigdialog.h
@@ -36,16 +36,14 @@ class KTP_EXPORT NotificationConfigDialog : public KDialog
 public:
     explicit NotificationConfigDialog(const Tp::ContactPtr &contact, QWidget *parent=0);
     ~NotificationConfigDialog();
-    void show();
 private:
     KNotifyConfigWidget *m_notifyWidget;
     Tp::ContactPtr m_contact;
     int m_currentSelection;
 private Q_SLOTS:
     void saveConfig();
-    void updateNotifyWidget(int);
+    void updateNotifyWidget(const int selection);
     void defaults();
-    void enableApply(bool);
 };
 
 }

-- 
ktp-common-internals packaging