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: [PATCH] GCC 4.7 fix. This partially resolves bug report 958. Thanks
 to David C. Rankin. (cherry picked from commit
 c94de3afa90f38fab67604732a4540b768a007b8)

---
 kmail/kmsystemtray.cpp            | 4 ++--
 korganizer/korgac/alarmdialog.cpp | 6 +++---
 kresources/caldav/resource.cpp    | 1 +
 kresources/carddav/resource.cpp   | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index edcf3eb3..ce59b4e1 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 */
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index 1d039719..363d6556 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -498,9 +498,9 @@ void AlarmDialog::eventNotification()
     found = true;
     item->mNotified = true;
     Alarm::List alarms = incidence->alarms();
-    Alarm::List::ConstIterator it;
-    for ( it = alarms.begin(); it != alarms.end(); ++it ) {
-      Alarm *alarm = *it;
+    Alarm::List::ConstIterator c_it;
+    for ( c_it = alarms.begin(); c_it != alarms.end(); ++c_it ) {
+      Alarm *alarm = *c_it;
       // FIXME: Check whether this should be done for all multiple alarms
       if (alarm->type() == Alarm::Procedure) {
         // FIXME: Add a message box asking whether the procedure should really be executed
diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp
index cf36ae48..0ec3ceb6 100644
--- a/kresources/caldav/resource.cpp
+++ b/kresources/caldav/resource.cpp
@@ -15,6 +15,7 @@
  ========================================================================*/
 
 #include <string.h>
+#include <unistd.h>
 
 #include <tqurl.h>
 #include <tqmessagebox.h>
diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp
index 8d7ad025..f416a64b 100644
--- a/kresources/carddav/resource.cpp
+++ b/kresources/carddav/resource.cpp
@@ -14,6 +14,7 @@
  ========================================================================*/
 
 #include <string.h>
+#include <unistd.h>
 
 #include <tqurl.h>
 #include <tqmessagebox.h>