From 0c315db8e9e82cb0c8f3501cf1efdddea0445659 Mon Sep 17 00:00:00 2001 From: uwolfer Date: Sun, 15 Apr 2007 13:02:19 +0000 Subject: [PATCH] Fix crash: fix wrong use of QMap's. Pointed out by Christian Ehrlicher. git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@654206 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kget/core/scheduler.cpp | 12 ++++++------ kget/ui/viewscontainer.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kget/core/scheduler.cpp b/kget/core/scheduler.cpp index c28105917..5c1a40d0f 100644 --- a/kget/core/scheduler.cpp +++ b/kget/core/scheduler.cpp @@ -133,15 +133,15 @@ void Scheduler::startDelayTimer(Job * job, int seconds) void Scheduler::stopDelayTimer(Job * job) { QMap::iterator it = m_activeTimers.begin(); - QMap::iterator itEnd = m_activeTimers.end(); - - for( ; it!=itEnd ; ++it ) + while (it != m_activeTimers.end()) { - if(it.value() == job) + QMap::iterator prev = it; + ++it; + if(prev.value() == job) { //A timer for this job has been found. Let's stop it. - killTimer(it.key()); - m_activeTimers.erase(it); + killTimer(prev.key()); + m_activeTimers.erase(prev); } } } diff --git a/kget/ui/viewscontainer.cpp b/kget/ui/viewscontainer.cpp index 8f7149aea..6d2222dde 100644 --- a/kget/ui/viewscontainer.cpp +++ b/kget/ui/viewscontainer.cpp @@ -110,15 +110,15 @@ void TransfersButton::addTransfer(TransferHandler * transfer) void TransfersButton::removeTransfer(TransferHandler * transfer) { QMap::iterator it = m_transfersMap.begin(); - QMap::iterator itEnd = m_transfersMap.end(); - - for( ; it!=itEnd ; ++it ) + while (it != m_transfersMap.end()) { - if(it.value() == transfer) + QMap::iterator prev = it; + ++it; + if (prev.value() == transfer) { - m_transfersMap.erase(it); + m_transfersMap.erase(prev); //Delete the QAction - delete(it.key()); + delete(prev.key()); } } -- 2.11.4.GIT