summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-04-27 23:16:05 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-06-03 04:25:18 +0200
commit9c066e9107a8f9bf75064be1e9d25edbe218893f (patch)
tree58ad8392e5ab321ff754b6845f3e807ed4b9265b /kmail
parent7a135f8461e9212898c03bf0ca17714ab38d0f86 (diff)
downloadtdepim-9c066e9107a8f9bf75064be1e9d25edbe218893f.tar.gz
tdepim-9c066e9107a8f9bf75064be1e9d25edbe218893f.zip
GCC 4.7 fix.
This partially resolves bug report 958. Thanks to David C. Rankin. (cherry picked from commit c94de3afa90f38fab67604732a4540b768a007b8)
Diffstat (limited to 'kmail')
-rw-r--r--kmail/kmsystemtray.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index edcf3eb32..ce59b4e12 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -482,9 +482,9 @@ void KMSystemTray::updateNewMessages()
/** The number of unread messages in that folder */
int unread = fldr->countUnread();
- TQMap<TQGuardedPtr<KMFolder>, int>::Iterator it =
+ TQMap<TQGuardedPtr<KMFolder>, int>::Iterator unread_it =
mFoldersWithUnread.find(fldr);
- bool unmapped = (it == mFoldersWithUnread.end());
+ bool unmapped = (unread_it == mFoldersWithUnread.end());
/** If the folder is not mapped yet, increment count by numUnread
in folder */