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

List:       kde-commits
Subject:    branches/KDE/4.1/kdeedu/marble
From:       Jens-Michael Hoffmann <jensmh () gmx ! de>
Date:       2008-07-20 19:01:23
Message-ID: 1216580483.425944.25050.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 835537 by jmhoffmann:

    Fix regression caused by fix for bug 162681:
    Use deleteAfter to delete active jobs also in
    ~HttpDownloadManager.



 M  +8 -0      ChangeLog  
 M  +5 -1      src/lib/HttpDownloadManager.cpp  


--- branches/KDE/4.1/kdeedu/marble/ChangeLog #835536:835537
@@ -1,3 +1,11 @@
+2008-07-20  Jens-Michael Hoffmann  <jensmh@gmx.de>
+
+    * src/lib/HttpDownloadManager.cpp:
+
+    Fix regression caused by fix for bug 162681:
+    Use deleteAfter to delete active jobs also in
+    ~HttpDownloadManager.
+
 2008-07-19  Jens-Michael Hoffmann  <jensmh@gmx.de>
 
     * src/lib/HttpFetchFile.cpp:
--- branches/KDE/4.1/kdeedu/marble/src/lib/HttpDownloadManager.cpp #835536:835537
@@ -44,7 +44,11 @@
     qDeleteAll ( m_jobQueue );
     m_jobQueue.clear();
 
-    qDeleteAll ( m_activatedJobList );
+    QList<HttpJob*>::const_iterator pos = m_activatedJobList.begin();
+    QList<HttpJob*>::const_iterator const end = m_activatedJobList.begin();
+    for (; pos != end; ++pos ) {
+        (*pos)->deleteLater();
+    }
     m_activatedJobList.clear();
 
     qDeleteAll ( m_jobBlackList );
[prev in list] [next in list] [prev in thread] [next in thread]