diff options
| -rw-r--r-- | conflictcheck.c | 18 | ||||
| -rw-r--r-- | conflictcheck.h | 6 | ||||
| -rw-r--r-- | epgsearchsvdrp.c | 6 | ||||
| -rw-r--r-- | mail.c | 22 | ||||
| -rw-r--r-- | menu_conflictcheck.c | 6 | ||||
| -rw-r--r-- | menu_dirselect.c | 2 | ||||
| -rw-r--r-- | menu_event.c | 2 | ||||
| -rw-r--r-- | templatefile.c | 10 | ||||
| -rw-r--r-- | uservars.c | 14 | ||||
| -rw-r--r-- | uservars.h | 4 |
10 files changed, 45 insertions, 45 deletions
diff --git a/conflictcheck.c b/conflictcheck.c index 48b3d4d..1d46fa5 100644 --- a/conflictcheck.c +++ b/conflictcheck.c @@ -219,7 +219,7 @@ void cConflictCheck::Check() { LogFile.Log(2,"result of conflict check for %s:", DAYDATETIME(checkTime->evaltime)); std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it; - for (it = checkTime->failedTimers.begin(); it != checkTime->failedTimers.end(); it++) + for (it = checkTime->failedTimers.begin(); it != checkTime->failedTimers.end(); ++it) LogFile.Log(2,"timer '%s' (%s, channel %s) failed", (*it)->timer->File(), DAYDATETIME((*it)->timer->StartTime()), CHANNELNAME((*it)->timer->Channel())); } } @@ -407,7 +407,7 @@ cList<cConflictCheckTime>* cConflictCheck::CreateConflictList(cList<cConflictChe { bool allTimersIgnored = true; std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it; - for (it = checkTime->failedTimers.begin(); it != checkTime->failedTimers.end(); it++) + for (it = checkTime->failedTimers.begin(); it != checkTime->failedTimers.end(); ++it) { numConflicts++; if (!(*it)->ignore) @@ -449,7 +449,7 @@ int cConflictCheck::ProcessCheckTime(cConflictCheckTime* checkTime) int Conflicts = 0; // detach all stopping timers from their devices std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it; - for (it = checkTime->stoppingTimers.begin(); it != checkTime->stoppingTimers.end(); it++) + for (it = checkTime->stoppingTimers.begin(); it != checkTime->stoppingTimers.end(); ++it) if ((*it) && (*it)->device >= 0) { LogFile.Log(3,"detach device %d from timer '%s' (%s, channel %s) at %s", ((*it)->device)+1, (*it)->timer->File(), DAYDATETIME((*it)->start), CHANNELNAME((*it)->timer->Channel()), DAYDATETIME(checkTime->evaltime)); @@ -466,7 +466,7 @@ int cConflictCheck::ProcessCheckTime(cConflictCheckTime* checkTime) LogFile.Log(3,"add pending timers"); // if we have pending timers add them to the current start list - for (it = pendingTimers.begin(); it != pendingTimers.end(); it++) + for (it = pendingTimers.begin(); it != pendingTimers.end(); ++it) { if ((*it) && (*it)->stop > checkTime->evaltime) checkTime->startingTimers.insert(*it); @@ -475,7 +475,7 @@ int cConflictCheck::ProcessCheckTime(cConflictCheckTime* checkTime) LogFile.Log(3,"attach starting timers"); // handle starting timers - for (it = checkTime->startingTimers.begin(); it != checkTime->startingTimers.end(); it++) + for (it = checkTime->startingTimers.begin(); it != checkTime->startingTimers.end(); ++it) { bool NeedsDetachReceivers = false; if (!(*it) || (*it)->device >= 0) continue; // already has a device @@ -486,7 +486,7 @@ int cConflictCheck::ProcessCheckTime(cConflictCheckTime* checkTime) { // disable running timers std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it2 = devices[device].recTimers.begin(); - for(; it2 != devices[device].recTimers.end(); it2++) + for(; it2 != devices[device].recTimers.end(); ++it2) { LogFile.Log(3,"stopping timer '%s' (%s, channel %s) at %s on device %d because of higher priority", (*it2)->timer->File(), DAYDATETIME((*it2)->start), CHANNELNAME((*it2)->timer->Channel()), DAYDATETIME(checkTime->evaltime), device+1); AddConflict((*it2), checkTime, pendingTimers); @@ -646,14 +646,14 @@ bool cConflictCheck::TimerInConflict(cTimer* timer) for(cConflictCheckTime* checkTime = failedList->First(); checkTime; checkTime = failedList->Next(checkTime)) { std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it; - for (it = checkTime->failedTimers.begin(); it != checkTime->failedTimers.end(); it++) + for (it = checkTime->failedTimers.begin(); it != checkTime->failedTimers.end(); ++it) { if (!(*it)->ignore) { std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it2; if ((*it)->concurrentTimers) { - for (it2 = (*it)->concurrentTimers->begin(); it2 != (*it)->concurrentTimers->end(); it2++) + for (it2 = (*it)->concurrentTimers->begin(); it2 != (*it)->concurrentTimers->end(); ++it2) { if ((*it2)->OrigTimer() == timer) return true; @@ -674,7 +674,7 @@ void cConflictCheck::EvaluateConflCheckCmd() { if (ct->ignore) continue; std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it; - for (it = ct->failedTimers.begin(); it != ct->failedTimers.end(); it++) + for (it = ct->failedTimers.begin(); it != ct->failedTimers.end(); ++it) if ((*it) && !(*it)->ignore) { string result = EPGSearchConfig.conflCheckCmd; diff --git a/conflictcheck.h b/conflictcheck.h index 6092936..fcc6dcb 100644 --- a/conflictcheck.h +++ b/conflictcheck.h @@ -104,7 +104,7 @@ class cConflictCheckDevice int Priority() const { int prio = -1; - for(std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it = recTimers.begin(); it != recTimers.end(); it++) + for(std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it = recTimers.begin(); it != recTimers.end(); ++it) prio = max(prio, (*it)->timer->Priority()); return prio; }; @@ -112,7 +112,7 @@ class cConflictCheckDevice bool Receiving() const { return !recTimers.empty(); } bool IsTunedTo (const cChannel* Channel) const { - for(std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it = recTimers.begin(); it != recTimers.end(); it++) + for(std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it = recTimers.begin(); it != recTimers.end(); ++it) if ((*it)->timer->Channel()->Source() == Channel->Source() && (*it)->timer->Channel()->Transponder() == Channel->Transponder()) return true; @@ -136,7 +136,7 @@ class cConflictCheckDevice cCamSlot *CamSlot(void) const { if (device) return device->CamSlot(); else return NULL;} int Ca() const { - for(std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it = recTimers.begin(); it != recTimers.end(); it++) + for(std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it = recTimers.begin(); it != recTimers.end(); ++it) return (*it)->timer->Channel()->Ca(); return 0; } diff --git a/epgsearchsvdrp.c b/epgsearchsvdrp.c index ff54136..6acf10e 100644 --- a/epgsearchsvdrp.c +++ b/epgsearchsvdrp.c @@ -621,7 +621,7 @@ cString cPluginEpgsearch::SVDRPCommand(const char *Command, const char *Option, { cString sBuffer(""); std::set<string>::iterator it; - for (it = cMenuDirSelect::directorySet.begin(); it != cMenuDirSelect::directorySet.end(); it++) + for (it = cMenuDirSelect::directorySet.begin(); it != cMenuDirSelect::directorySet.end(); ++it) { cString sOldBuffer = sBuffer; sBuffer = cString::sprintf("%s%s\n", *sOldBuffer, (*it).c_str()); @@ -1268,7 +1268,7 @@ cString cPluginEpgsearch::SVDRPCommand(const char *Command, const char *Option, std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it; std::ostringstream timerparts; - for (it = ct->failedTimers.begin(); it != ct->failedTimers.end(); it++) + for (it = ct->failedTimers.begin(); it != ct->failedTimers.end(); ++it) { if (relOnly && (*it)->ignore) continue; std::ostringstream timerpart; @@ -1278,7 +1278,7 @@ cString cPluginEpgsearch::SVDRPCommand(const char *Command, const char *Option, if ((*it)->concurrentTimers) { std::ostringstream cctimers; - for (itcc = (*it)->concurrentTimers->begin(); itcc != (*it)->concurrentTimers->end(); itcc++) + for (itcc = (*it)->concurrentTimers->begin(); itcc != (*it)->concurrentTimers->end(); ++itcc) cctimers << (cctimers.str().empty()?"":"#") << (*itcc)->origIndex+1; timerpart << cctimers.str(); } @@ -396,7 +396,7 @@ void cMailUpdateNotifier::SendUpdateNotifications() if (newTimers.empty()) newtimers = tr("No new timers were added."); std::set<cMailTimerNotification>::iterator itnt; - for (itnt = newTimers.begin(); itnt != newTimers.end(); itnt++) + for (itnt = newTimers.begin(); itnt != newTimers.end(); ++itnt) { string message = (*itnt).Format(templTimer); if (message != "") newtimers += message; @@ -407,7 +407,7 @@ void cMailUpdateNotifier::SendUpdateNotifications() if (modTimers.empty()) modtimers = tr("No timers were modified."); std::set<cMailTimerNotification>::iterator itmt; - for (itmt = modTimers.begin(); itmt != modTimers.end(); itmt++) + for (itmt = modTimers.begin(); itmt != modTimers.end(); ++itmt) { string message = (*itmt).Format(templTimer); if (message != "") modtimers += message; @@ -418,7 +418,7 @@ void cMailUpdateNotifier::SendUpdateNotifications() if (delTimers.empty()) deltimers = tr("No timers were deleted."); std::set<cMailDelTimerNotification>::iterator itdt; - for (itdt = delTimers.begin(); itdt != delTimers.end(); itdt++) + for (itdt = delTimers.begin(); itdt != delTimers.end(); ++itdt) { string message = (*itdt).Format(""); if (message != "") deltimers += message; @@ -429,7 +429,7 @@ void cMailUpdateNotifier::SendUpdateNotifications() if (announceEvents.empty()) announceevents = tr("No new events to announce."); std::set<cMailAnnounceEventNotification>::iterator itae; - for (itae = announceEvents.begin(); itae != announceEvents.end(); itae++) + for (itae = announceEvents.begin(); itae != announceEvents.end(); ++itae) { string message = (*itae).Format(templEvent); if (message != "") announceevents += message; @@ -471,13 +471,13 @@ void cMailUpdateNotifier::SendUpdateNotifications() else { // add current notifications to pending ones - for (itnt = newTimers.begin(); itnt != newTimers.end(); itnt++) + for (itnt = newTimers.begin(); itnt != newTimers.end(); ++itnt) PendingNotifications.Add(new cPendingNotification(0, itnt->eventID, itnt->channelID, -1)); - for (itmt = modTimers.begin(); itmt != modTimers.end(); itmt++) + for (itmt = modTimers.begin(); itmt != modTimers.end(); ++itmt) PendingNotifications.Add(new cPendingNotification(1, itmt->eventID, itmt->channelID, -1, itmt->timerMod)); - for (itdt = delTimers.begin(); itdt != delTimers.end(); itdt++) + for (itdt = delTimers.begin(); itdt != delTimers.end(); ++itdt) PendingNotifications.Add(new cPendingNotification(2, -1, itdt->channelID, itdt->start, -1, -1, itdt->formatted)); - for (itae = announceEvents.begin(); itae != announceEvents.end(); itae++) + for (itae = announceEvents.begin(); itae != announceEvents.end(); ++itae) PendingNotifications.Add(new cPendingNotification(3, itae->eventID, itae->channelID, -1, -1, itae->searchextID)); } PendingNotifications.Save(); @@ -486,7 +486,7 @@ void cMailUpdateNotifier::SendUpdateNotifications() modTimers.clear(); delTimers.clear(); // Add announced events to the "no announce" list - for (itae = announceEvents.begin(); itae != announceEvents.end(); itae++) + for (itae = announceEvents.begin(); itae != announceEvents.end(); ++itae) { cNoAnnounce* noAnnounce = new cNoAnnounce(itae->GetEvent()); if (noAnnounce && noAnnounce->Valid()) @@ -517,7 +517,7 @@ void cMailConflictNotifier::SendConflictNotifications(cConflictCheck& conflictCh { if (!ct || ct->ignore) continue; std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it; - for (it = ct->failedTimers.begin(); it != ct->failedTimers.end(); it++) + for (it = ct->failedTimers.begin(); it != ct->failedTimers.end(); ++it) if ((*it) && !(*it)->ignore && (*it)->Event()) { std::string channelID = *(*it)->Event()->ChannelID().ToString(); @@ -562,7 +562,7 @@ void cMailConflictNotifier::SendConflictNotifications(cConflictCheck& conflictCh string conflicttimers; std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it; - for (it = ct->failedTimers.begin(); it != ct->failedTimers.end(); it++) + for (it = ct->failedTimers.begin(); it != ct->failedTimers.end(); ++it) if (!(*it)->ignore && (*it)->Event()) { cMailTimerNotification M((*it)->Event()->EventID(), (*it)->Event()->ChannelID()); diff --git a/menu_conflictcheck.c b/menu_conflictcheck.c index e4aef28..66192e4 100644 --- a/menu_conflictcheck.c +++ b/menu_conflictcheck.c @@ -104,7 +104,7 @@ bool cMenuConflictCheck::BuildList() if (!showAll && ct->ignore) continue; Add(new cMenuConflictCheckItem(ct)); std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it; - for (it = ct->failedTimers.begin(); it != ct->failedTimers.end(); it++) + for (it = ct->failedTimers.begin(); it != ct->failedTimers.end(); ++it) if (!(*it)->ignore || showAll) Add(new cMenuConflictCheckItem(ct, *it)); } @@ -210,7 +210,7 @@ bool cMenuConflictCheckDetails::BuildList() std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it; if (timerObj->concurrentTimers) - for (it = timerObj->concurrentTimers->begin(); it != timerObj->concurrentTimers->end(); it++) + for (it = timerObj->concurrentTimers->begin(); it != timerObj->concurrentTimers->end(); ++it) { Add(new cMenuConflictCheckDetailsItem(*it)); if ((*it)->Event()) @@ -394,7 +394,7 @@ eOSState cMenuConflictCheckDetails::ProcessKey(eKeys Key) std::set<cConflictCheckTimerObj*,TimerObjSort>::iterator it; if (timerObj->concurrentTimers) { - for (it = timerObj->concurrentTimers->begin(); it != timerObj->concurrentTimers->end(); it++) + for (it = timerObj->concurrentTimers->begin(); it != timerObj->concurrentTimers->end(); ++it) { bool found = false; for(cTimer* checkT = Timers.First(); checkT; checkT = Timers.Next(checkT)) diff --git a/menu_dirselect.c b/menu_dirselect.c index 38d58cf..92a21f2 100644 --- a/menu_dirselect.c +++ b/menu_dirselect.c @@ -230,7 +230,7 @@ void cMenuDirSelect::Load() CreateDirSet(); std::set<string>::iterator it; - for (it = directorySet.begin(); it != directorySet.end(); it++) + for (it = directorySet.begin(); it != directorySet.end(); ++it) AddDistinct((*it).c_str()); Sort(); diff --git a/menu_event.c b/menu_event.c index 9a468e7..6e7c034 100644 --- a/menu_event.c +++ b/menu_event.c @@ -61,7 +61,7 @@ cEventObj* cMenuEventSearch::GetNext(const cEvent* Event) if (*i && (*i)->Event() == Event) { cEventObjects::iterator nexti = i; - nexti++; + ++nexti; return nexti != eventObjects.end() ? *nexti : NULL; } diff --git a/templatefile.c b/templatefile.c index 544078c..166f7bd 100644 --- a/templatefile.c +++ b/templatefile.c @@ -130,7 +130,7 @@ cTemplFile::cTemplFile() void cTemplFile::Reset() { std::set<cMenuTemplate*>::iterator it; - for (it = menuTemplates.begin(); it != menuTemplates.end(); it++) + for (it = menuTemplates.begin(); it != menuTemplates.end(); ++it) delete (*it); menuTemplates.clear(); } @@ -138,7 +138,7 @@ void cTemplFile::Reset() cMenuTemplate* cTemplFile::GetTemplateByName(const char* Name) { std::set<cMenuTemplate*>::iterator it; - for (it = menuTemplates.begin(); it != menuTemplates.end(); it++) + for (it = menuTemplates.begin(); it != menuTemplates.end(); ++it) if (!strcasecmp(Name, (*it)->Name())) return (*it); return NULL; } @@ -299,7 +299,7 @@ void cTemplFile::PrepareDefaultTemplates() SearchTemplates = new char*[CountSearchResultsTemplates()]; std::set<cMenuTemplate*>::iterator it; int Count = 0; - for (it = menuTemplates.begin(); it != menuTemplates.end(); it++) + for (it = menuTemplates.begin(); it != menuTemplates.end(); ++it) if (!strncasecmp("MenuSearchResults", (*it)->Name(), strlen("MenuSearchResults"))) { char* templateName = strdup((*it)->Name() + strlen("MenuSearchResults")); @@ -312,7 +312,7 @@ int cTemplFile::CountSearchResultsTemplates() { int Count = 0; std::set<cMenuTemplate*>::iterator it; - for (it = menuTemplates.begin(); it != menuTemplates.end(); it++) + for (it = menuTemplates.begin(); it != menuTemplates.end(); ++it) if (!strncasecmp("MenuSearchResults", (*it)->Name(), strlen("MenuSearchResults"))) Count++; return Count; } @@ -321,7 +321,7 @@ cMenuTemplate* cTemplFile::GetSearchTemplateByPos(int iPos) { int Count = 0; std::set<cMenuTemplate*>::iterator it; - for (it = menuTemplates.begin(); it != menuTemplates.end(); it++) + for (it = menuTemplates.begin(); it != menuTemplates.end(); ++it) if (!strncasecmp("MenuSearchResults", (*it)->Name(), strlen("MenuSearchResults"))) if(Count++ == iPos) return (*it); @@ -188,7 +188,7 @@ string cUserVar::EvaluateInternalVars(const string& Expr, const cEvent* e, bool if (expr.find('%') == string::npos) return expr; std::map<string, cInternalVar*>::iterator it; - for (it = UserVars.internalVars.begin(); it != UserVars.internalVars.end(); it++) + for (it = UserVars.internalVars.begin(); it != UserVars.internalVars.end(); ++it) { string varName = (it->second)->Name(); int varPos = 0; @@ -207,7 +207,7 @@ string cUserVar::EvaluateExtEPGVars(const string& Expr, const cEvent* e, bool es if (expr.find('%') == string::npos) return expr; std::map<string, cExtEPGVar*>::iterator evar; - for (evar = UserVars.extEPGVars.begin(); evar != UserVars.extEPGVars.end(); evar++) + for (evar = UserVars.extEPGVars.begin(); evar != UserVars.extEPGVars.end(); ++evar) { string varName = evar->second->Name(); int varPos = 0; @@ -226,7 +226,7 @@ string cUserVar::EvaluateUserVars(const string& Expr, const cEvent* e, bool esca if (expr.find('%') == string::npos) return expr; std::set<cUserVar*>::iterator it; - for (it = UserVars.userVars.begin(); it != UserVars.userVars.end(); it++) + for (it = UserVars.userVars.begin(); it != UserVars.userVars.end(); ++it) { string varName = (*it)->Name(); int varPos = 0; @@ -245,7 +245,7 @@ string cUserVar::EvaluateInternalTimerVars(const string& Expr, const cTimer* t) if (expr.find('%') == string::npos) return expr; std::map<string, cTimerVar*>::iterator tvar; - for (tvar = UserVars.internalTimerVars.begin(); tvar != UserVars.internalTimerVars.end(); tvar++) + for (tvar = UserVars.internalTimerVars.begin(); tvar != UserVars.internalTimerVars.end(); ++tvar) { string varName = tvar->second->Name(); int varPos = 0; @@ -264,7 +264,7 @@ string cUserVar::EvaluateInternalSearchVars(const string& Expr, const cSearchExt if (expr.find('%') == string::npos) return expr; std::map<string, cSearchVar*>::iterator svar; - for (svar = UserVars.internalSearchVars.begin(); svar != UserVars.internalSearchVars.end(); svar++) + for (svar = UserVars.internalSearchVars.begin(); svar != UserVars.internalSearchVars.end(); ++svar) { string varName = svar->second->Name(); int varPos = 0; @@ -289,7 +289,7 @@ bool cUserVar::DependsOnVar(cUserVar* var) if (!var) return false; if (usedVars.find(var) != usedVars.end()) return true; std::set<cUserVar*>::iterator it; - for (it = usedVars.begin(); it != usedVars.end(); it++) + for (it = usedVars.begin(); it != usedVars.end(); ++it) if ((*it)->DependsOnVar(var)) return true; return false; @@ -348,7 +348,7 @@ cUserVar* cUserVars::GetFromName(const string& varName, bool log) return ivar->second; std::set<cUserVar*>::iterator uvar; - for (uvar = userVars.begin(); uvar != userVars.end(); uvar++) + for (uvar = userVars.begin(); uvar != userVars.end(); ++uvar) if (EqualsNoCase((*uvar)->Name(), VarName)) return (*uvar); @@ -847,12 +847,12 @@ class cUserVars : public cList<cUserVar> { ~cUserVars() { std::map<string, cExtEPGVar*>::iterator evar; - for (evar = extEPGVars.begin(); evar != extEPGVars.end(); evar++) + for (evar = extEPGVars.begin(); evar != extEPGVars.end(); ++evar) delete evar->second; extEPGVars.clear(); std::set<cUserVar*>::iterator uvar; - for (uvar = userVars.begin(); uvar != userVars.end(); uvar++) + for (uvar = userVars.begin(); uvar != userVars.end(); ++uvar) delete (*uvar); userVars.clear(); } |