diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-04-27 23:16:05 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 04:25:18 +0200 |
| commit | 9c066e9107a8f9bf75064be1e9d25edbe218893f (patch) | |
| tree | 58ad8392e5ab321ff754b6845f3e807ed4b9265b | |
| parent | 7a135f8461e9212898c03bf0ca17714ab38d0f86 (diff) | |
| download | tdepim-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)
| -rw-r--r-- | kmail/kmsystemtray.cpp | 4 | ||||
| -rw-r--r-- | korganizer/korgac/alarmdialog.cpp | 6 | ||||
| -rw-r--r-- | kresources/caldav/resource.cpp | 1 | ||||
| -rw-r--r-- | kresources/carddav/resource.cpp | 1 |
4 files changed, 7 insertions, 5 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 */ diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index 1d0397197..363d6556f 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> |