From e39b0fd86150ac885e71387c44518699f9782421 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 1 Feb 2018 08:29:38 +0100 Subject: [PATCH] [Misc] wrong disconnect fixed --- src/controls/QskDirtyItemFilter.cpp | 9 ++------- src/controls/QskDirtyItemFilter.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/controls/QskDirtyItemFilter.cpp b/src/controls/QskDirtyItemFilter.cpp index 8fadd973..d5045133 100644 --- a/src/controls/QskDirtyItemFilter.cpp +++ b/src/controls/QskDirtyItemFilter.cpp @@ -81,7 +81,8 @@ void QskDirtyItemFilter::addWindow( QQuickWindow* window ) window, [ this, window ] { beforeSynchronizing( window ); }, Qt::DirectConnection ); - connect( window, &QObject::destroyed, this, &QskDirtyItemFilter::cleanUp ); + connect( window, &QObject::destroyed, + this, [ this, window ] { m_windows.remove( window ); } ); } void QskDirtyItemFilter::beforeSynchronizing( QQuickWindow* window ) @@ -112,12 +113,6 @@ void QskDirtyItemFilter::resetBlockedDirty() this, &QskDirtyItemFilter::resetBlockedDirty ); } -void QskDirtyItemFilter::cleanUp( QObject* window ) -{ - disconnect( window ); - m_windows.remove( window ); -} - void QskDirtyItemFilter::filterDirtyList( QQuickWindow* window, bool ( *isBlocked )( const QQuickItem* ) ) { diff --git a/src/controls/QskDirtyItemFilter.h b/src/controls/QskDirtyItemFilter.h index ab636cfa..d5e6156e 100644 --- a/src/controls/QskDirtyItemFilter.h +++ b/src/controls/QskDirtyItemFilter.h @@ -30,7 +30,6 @@ public: private: void beforeSynchronizing( QQuickWindow* ); void resetBlockedDirty(); - void cleanUp( QObject* ); QSet< QObject* > m_windows; };