From 9c066e9107a8f9bf75064be1e9d25edbe218893f Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Fri, 27 Apr 2012 23:16:05 -0500
Subject: GCC 4.7 fix. This partially resolves bug report 958. Thanks to David
 C. Rankin. (cherry picked from commit
 c94de3afa90f38fab67604732a4540b768a007b8)

---
 kmail/kmsystemtray.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kmail')

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 */
-- 
cgit v1.2.1