summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kmail/kmsystemtray.cpp4
-rw-r--r--korganizer/korgac/alarmdialog.cpp6
-rw-r--r--kresources/caldav/resource.cpp1
-rw-r--r--kresources/carddav/resource.cpp1
4 files changed, 7 insertions, 5 deletions
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 3a1ab1ab5..001453a83 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 bf9c29a2e..9f711d609 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 cf36ae48d..0ec3ceb6f 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 8d7ad0251..f416a64ba 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>