GCC 4.7 fix.

This partially resolves bug report 958.
Thanks to David C. Rankin.
(cherry picked from commit c94de3afa9)

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 */

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;
+    Alarm::List::ConstIterator c_it;
-    for ( it = alarms.begin(); it != alarms.end(); ++it ) {
+    for ( c_it = alarms.begin(); c_it != alarms.end(); ++c_it ) {
-      Alarm *alarm = *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

kresources/caldav/resource.cpp

@@ -15,6 +15,7 @@
  ========================================================================*/
 
 #include <string.h>
+#include <unistd.h>
 
 #include <tqurl.h>
 #include <tqmessagebox.h>

kresources/carddav/resource.cpp

@@ -14,6 +14,7 @@
  ========================================================================*/
 
 #include <string.h>
+#include <unistd.h>
 
 #include <tqurl.h>
 #include <tqmessagebox.h>