[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/animations
From:       Hugo Pereira Da Costa <hugo.pereira () free ! fr>
Date:       2010-03-29 0:17:10
Message-ID: 20100329001710.B519EAC883 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1108467 by hpereiradacosta:

Backport r1108456
avoid double deletion of animationData while unregistering widget


 M  +2 -7      oxygendatamap.h  


--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/animations/oxygendatamap.h #1108466:1108467
@@ -79,12 +79,7 @@
             if( key == lastKey_ )
             {
 
-                if( lastValue_ )
-                {
-                    lastValue_.data()->deleteLater();
-                    lastValue_.clear();
-                }
-
+                if( lastValue_ ) lastValue_.clear();
                 lastKey_ = NULL;
 
             }
@@ -94,7 +89,7 @@
             if( iter == QMap<Key, Value>::end() ) return;
 
             // delete value from map if found
-            if( iter.value() ) iter.value().data()->deleteLater();
+            if( iter.value() ) delete iter.value().data();
             QMap<Key, Value>::erase( iter );
 
             return;
[prev in list] [next in list] [prev in thread] [next in thread]