[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=0d871da

The following commit has been merged in the master branch:
commit 0d871da5da04e9c0a0cbba717597fd09f5de3e06
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Mon Dec 26 15:27:17 2011 +0100

    Krazy: Use QWeakPointer when showing modal dialogs via exec(), typos
---
 global-presence-chooser.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index 935f582..de97aaf 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -227,13 +227,13 @@ bool GlobalPresenceChooser::event(QEvent *e)
         QStyleOptionComboBox opt;
         initStyleOption(&opt);
 
-        //get the subcontrol this event occured in
+        //get the subcontrol this event occurred in
         QStyle::SubControl sc = style()->hitTestComplexControl(QStyle::CC_ComboBox, &opt, me->pos(),
                                                                this);
 
         if (sc == QStyle::SC_ComboBoxArrow) {
             //if user pressed the combo arrow, pass it to parent
-            QComboBox::mousePressEvent(me);
+            QComboBox::mousePressEvent(me); // krazy:exclude=qclasses
         } else {
             //set combo editable if user click to any other parts
             setEditable(true);
@@ -252,7 +252,7 @@ bool GlobalPresenceChooser::event(QEvent *e)
         QStyleOptionComboBox opt;
         initStyleOption(&opt);
 
-        //get the subcontrol this event occured in
+        //get the subcontrol this event occurred in
         QStyle::SubControl sc = style()->hitTestComplexControl(QStyle::CC_ComboBox, &opt, me->pos(),
                                                                this);
 
@@ -290,15 +290,16 @@ bool GlobalPresenceChooser::event(QEvent *e)
         setEditable(false);
     }
 
-    return QComboBox::event(e);
+    return QComboBox::event(e); // krazy:exclude=qclasses
 }
 
 void GlobalPresenceChooser::onCurrentIndexChanged(int index)
 {
     //if they select the "configure item"
     if (index == count()-1) {
-        CustomPresenceDialog dialog(m_model, this);
-        dialog.exec();
+        QWeakPointer<CustomPresenceDialog> dialog = new CustomPresenceDialog(m_model, this);
+        dialog.data()->exec();
+        delete dialog.data();
         onPresenceChanged(m_globalPresence->currentPresence());
     } else if (index == count()-2) {
         KSharedConfigPtr config = KSharedConfig::openConfig(QLatin1String("ktelepathyrc"));

-- 
ktp-contact-list packaging