[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=117d373

The following commit has been merged in the master branch:
commit 117d37383550bcdde76e4db3ad9b758b54a3591a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Oct 6 21:26:57 2011 +0100

    Make CustomPresenceDialog slightly more sane
---
 dialogs/custom-presence-dialog.cpp | 26 ++++++++++++--------------
 dialogs/custom-presence-dialog.h   |  8 +++-----
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/dialogs/custom-presence-dialog.cpp b/dialogs/custom-presence-dialog.cpp
index 4c0ca3f..238eef0 100644
--- a/dialogs/custom-presence-dialog.cpp
+++ b/dialogs/custom-presence-dialog.cpp
@@ -33,19 +33,18 @@
 
 #include <TelepathyQt4/Presence>	
 
-customPresenceDialog::customPresenceDialog(QWidget* parent)
-  : QWidget(parent)
+CustomPresenceDialog::CustomPresenceDialog(QWidget* parent)
+  : KDialog(parent)
 {
     setupDialog();
 }
 
-void customPresenceDialog::setupDialog()
+void CustomPresenceDialog::setupDialog()
 {
-    KDialog *dialog = new KDialog(this);
-    dialog->setCaption(i18n("Edit Custom Messages"));
-    dialog->setButtons(KDialog::Close);
+    setCaption(i18n("Edit Custom Messages"));
+    setButtons(KDialog::Close);
  
-    QWidget *mainDialogWidget = new QWidget(dialog);
+    QWidget *mainDialogWidget = new QWidget(this);
     m_listWidget = new QListWidget(mainDialogWidget);
     m_statusMessage = new KComboBox(true, mainDialogWidget);
     m_statusMessage->setTrapReturnKey(false);
@@ -74,9 +73,8 @@ void customPresenceDialog::setupDialog()
     hLayout->addLayout(vLayout2);
     vLayout->addLayout(hLayout);
 
-    dialog->setMainWidget(mainDialogWidget);
-    dialog->show();
-    
+    setMainWidget(mainDialogWidget);
+
     KSharedConfigPtr config = KSharedConfig::openConfig("telepathy-kde-contactlistrc");
     m_presenceGroup = new KConfigGroup( config, "Custom Presence List" );
     int presenceIcon;
@@ -90,7 +88,7 @@ void customPresenceDialog::setupDialog()
     connect(m_statusMessage, SIGNAL(returnPressed()), SLOT(addCustomPresence()));
 }
 
-void customPresenceDialog::addCustomPresence()
+void CustomPresenceDialog::addCustomPresence()
 {
     int presenceIndex = m_statusMessage->currentIndex();
     QString uniquePresenceString = m_statusMessage->currentText() + "_" + QString::number(m_statusMessage->currentIndex());
@@ -100,7 +98,7 @@ void customPresenceDialog::addCustomPresence()
     emit configChanged();
 }
 
-void customPresenceDialog::removeCustomPresence()
+void CustomPresenceDialog::removeCustomPresence()
 {
    int index = indexForIcon(KIcon(m_listWidget->currentItem()->icon()));
    if(index == -1) {
@@ -113,7 +111,7 @@ void customPresenceDialog::removeCustomPresence()
    }
 }
 
-KIcon customPresenceDialog::iconForIndex(int index)
+KIcon CustomPresenceDialog::iconForIndex(int index)
 {
     QString iconName;
 
@@ -132,7 +130,7 @@ KIcon customPresenceDialog::iconForIndex(int index)
     return KIcon(iconName);
 }
 
-int customPresenceDialog::indexForIcon(KIcon icon)
+int CustomPresenceDialog::indexForIcon(KIcon icon)
 {
     if (icon.name() == QLatin1String("user-online")) {
       return 0;
diff --git a/dialogs/custom-presence-dialog.h b/dialogs/custom-presence-dialog.h
index 4ec5f7d..df7e5fe 100644
--- a/dialogs/custom-presence-dialog.h
+++ b/dialogs/custom-presence-dialog.h
@@ -21,11 +21,9 @@
 #ifndef CUSTOM_PRESENCE_DIALOG_H
 #define CUSTOM_PRESENCE_DIALOG_H
 
-//Qt includes
-#include <QWidget>
-
 //KDE includes
 #include <KComboBox>
+#include <KDialog>
 
 //Forward declrare classes
 class KIcon;
@@ -33,12 +31,12 @@ class QListWidget;
 class KConfig;
 class KConfigGroup;
 
-class customPresenceDialog : public QWidget
+class CustomPresenceDialog : public KDialog
 {
   Q_OBJECT
 
 public:
-    explicit customPresenceDialog(QWidget *parent = 0);
+    explicit CustomPresenceDialog(QWidget *parent = 0);
 
 public Q_SLOTS:
     ///Adds a custom presence to the config file

-- 
ktp-contact-list packaging