[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=4378dac

The following commit has been merged in the master branch:
commit 4378dac29b2b98c36bc98ad30d45d91344f18671
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Sun Mar 20 22:32:17 2011 +0100

    Fix a crash. More like a workaround really though..
---
 contact-delegate-overlay.cpp | 65 ++++++++++++++++++++++++--------------------
 contact-delegate-overlay.h   |  1 +
 main-widget.cpp              |  4 +--
 3 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/contact-delegate-overlay.cpp b/contact-delegate-overlay.cpp
index 6b130f2..d56b36d 100644
--- a/contact-delegate-overlay.cpp
+++ b/contact-delegate-overlay.cpp
@@ -103,6 +103,11 @@ AbstractWidgetDelegateOverlay::AbstractWidgetDelegateOverlay(QObject* parent)
 {
 }
 
+AbstractWidgetDelegateOverlay::~AbstractWidgetDelegateOverlay()
+{
+
+}
+
 void AbstractWidgetDelegateOverlay::setActive(bool active)
 {
     if (active) {
@@ -177,7 +182,6 @@ void AbstractWidgetDelegateOverlay::slotEntered(const QModelIndex& index)
     hide();
 
     if (index.isValid() && checkIndex(index)) {
-        //QTimer::singleShot(500, this, SLOT(slotWidgetAboutToShow(index)));
 //         QTimer::singleShot(500, m_widget, SLOT(show()));
         m_widget->show();
         emit overlayActivated(index);
@@ -219,38 +223,38 @@ void AbstractWidgetDelegateOverlay::viewportLeaveEvent(QObject*, QEvent*)
 
 bool AbstractWidgetDelegateOverlay::eventFilter(QObject* obj, QEvent* event)
 {
-    if (m_widget && obj == m_widget->parent()) {  // events on view's viewport
+    if (m_widget && obj == m_widget) {
         switch (event->type()) {
-        case QEvent::Leave:
-            viewportLeaveEvent(obj, event);
-            break;
-        case QEvent::MouseMove:
-            if (m_mouseButtonPressedOnWidget) {
-                // Don't forward mouse move events to the viewport,
-                // otherwise a rubberband selection will be shown when
-                // clicking on the selection toggle and moving the mouse
-                // above the viewport.
-                return true;
-            }
-            break;
-        case QEvent::MouseButtonRelease:
-            m_mouseButtonPressedOnWidget = false;
-            break;
-        default:
-            break;
+            case QEvent::MouseButtonPress:
+                if (static_cast<QMouseEvent*>(event)->buttons() & Qt::LeftButton) {
+                    m_mouseButtonPressedOnWidget = true;
+                }
+                break;
+            case QEvent::MouseButtonRelease:
+                m_mouseButtonPressedOnWidget = false;
+                break;
+            default:
+                break;
         }
-    } else if (obj == m_widget) {
+    } else {   // events on view's viewport
         switch (event->type()) {
-        case QEvent::MouseButtonPress:
-            if (static_cast<QMouseEvent*>(event)->buttons() & Qt::LeftButton) {
-                m_mouseButtonPressedOnWidget = true;
-            }
-            break;
-        case QEvent::MouseButtonRelease:
-            m_mouseButtonPressedOnWidget = false;
-            break;
-        default:
-            break;
+            case QEvent::Leave:
+                viewportLeaveEvent(obj, event);
+                break;
+            case QEvent::MouseMove:
+                if (m_mouseButtonPressedOnWidget) {
+                    // Don't forward mouse move events to the viewport,
+                    // otherwise a rubberband selection will be shown when
+                    // clicking on the selection toggle and moving the mouse
+                    // above the viewport.
+                    return true;
+                }
+                break;
+            case QEvent::MouseButtonRelease:
+                m_mouseButtonPressedOnWidget = false;
+                break;
+            default:
+                break;
         }
     }
 
@@ -335,6 +339,7 @@ void ContactDelegateOverlayContainer::removeOverlay(ContactDelegateOverlay* over
     overlay->setActive(false);
     overlay->setDelegate(0);
     m_overlays.removeAll(overlay);
+    QObject::disconnect(overlay, 0, asDelegate(), 0);
 }
 
 void ContactDelegateOverlayContainer::setAllOverlaysActive(bool active)
diff --git a/contact-delegate-overlay.h b/contact-delegate-overlay.h
index 3be2bbc..5c5e295 100644
--- a/contact-delegate-overlay.h
+++ b/contact-delegate-overlay.h
@@ -93,6 +93,7 @@ public:
      *  Per default it will be shown when the cursor enters an index and hidden when left.
      *  Reimplement slotEntered() and mouseMove() for more fine grained control. */
     AbstractWidgetDelegateOverlay(QObject* parent);
+    virtual ~AbstractWidgetDelegateOverlay();
 
     /** If active is true, this will call createWidget(), initialize the widget for use,
      *  and setup connections for the virtual slots.
diff --git a/main-widget.cpp b/main-widget.cpp
index 0f5c374..1b64258 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -386,11 +386,11 @@ void MainWidget::showMessageToUser(const QString& text, const MainWidget::System
 
 void MainWidget::addOverlayButtons()
 {
-    TextChannelContactOverlay*  textOverlay = new TextChannelContactOverlay(this);
+    TextChannelContactOverlay*  textOverlay  = new TextChannelContactOverlay(this);
     AudioChannelContactOverlay* audioOverlay = new AudioChannelContactOverlay(this);
     VideoChannelContactOverlay* videoOverlay = new VideoChannelContactOverlay(this);
 
-    FileTransferContactOverlay* fileOverlay = new FileTransferContactOverlay(this);
+    FileTransferContactOverlay* fileOverlay  = new FileTransferContactOverlay(this);
 
     m_delegate->installOverlay(textOverlay);
     m_delegate->installOverlay(audioOverlay);

-- 
ktp-contact-list packaging