diff --git a/lib/libconfigfile/configfile.cpp b/lib/libconfigfile/configfile.cpp index d567fee76..52830b3c0 100644 --- a/lib/libconfigfile/configfile.cpp +++ b/lib/libconfigfile/configfile.cpp @@ -95,7 +95,7 @@ bool CConfigFile::saveConfig(const char * const filename) if (configFile != NULL) { - for (ConfigDataMap::const_iterator it = configData.begin(); it != configData.end(); it++) + for (ConfigDataMap::const_iterator it = configData.begin(); it != configData.end(); ++it) { configFile << it->first << "=" << it->second << std::endl; } @@ -394,7 +394,7 @@ void CConfigFile::setInt32Vector(const std::string & key, const std::vectorsecond; diff --git a/lib/libnet/network_interfaces.cpp b/lib/libnet/network_interfaces.cpp index 3b87a0ee3..5a4bc14f0 100644 --- a/lib/libnet/network_interfaces.cpp +++ b/lib/libnet/network_interfaces.cpp @@ -56,7 +56,7 @@ bool write_file(const std::string filename, const std::list line) if (!out.is_open()) return false; - for (std::list::const_iterator it = line.begin(); it != line.end(); it++) + for (std::list::const_iterator it = line.begin(); it != line.end(); ++it) out << (*it) << std::endl; return true; @@ -64,7 +64,7 @@ bool write_file(const std::string filename, const std::list line) std::list::iterator add_attributes(const std::map attribute, std::list &line, std::list::iterator here) { - for (std::map::const_iterator it = attribute.begin(); it != attribute.end(); it++) + for (std::map::const_iterator it = attribute.begin(); it != attribute.end(); ++it) { std::ostringstream out; out << '\t' << (it -> first) << ' ' << (it -> second); @@ -112,7 +112,7 @@ bool write_interface(const std::string filename, const std::string name, const b if (!(in >> s)) { - it++; + ++it; continue; } @@ -135,22 +135,22 @@ bool write_interface(const std::string filename, const std::string name, const b } } if (advance) - it++; + ++it; } else - it++; + ++it; continue; } if (!(in >> s)) { - it++; + ++it; continue; } if (s != std::string(name)) { - it++; + ++it; continue; } } @@ -166,7 +166,7 @@ bool write_interface(const std::string filename, const std::string name, const b line.insert(it, "auto " + name); /* add attributes */ - it++; + ++it; it = add_attributes(attribute, line, it); /* remove current attributes */ @@ -176,13 +176,13 @@ bool write_interface(const std::string filename, const std::string name, const b if (!(in >> s)) /* retain empty lines */ { - it++; + ++it; continue; } if (s[0] == '#') /* retain comments */ { - it++; + ++it; continue; } @@ -328,7 +328,7 @@ bool getInetAttributes(const std::string name, bool &automatic_start, std::strin broadcast = ""; gateway = ""; - for (std::map::const_iterator it = attribute.begin(); it != attribute.end(); it++) + for (std::map::const_iterator it = attribute.begin(); it != attribute.end(); ++it) { if ((*it).first == "address") address = (*it).second; diff --git a/lib/libupnpclient/UPNPDevice.cpp b/lib/libupnpclient/UPNPDevice.cpp index 834f2ca8a..568f2c8d7 100644 --- a/lib/libupnpclient/UPNPDevice.cpp +++ b/lib/libupnpclient/UPNPDevice.cpp @@ -445,7 +445,7 @@ std::list CUPnPDevice::SendSOAP(std::string servicename, std::str std::list::iterator i; std::list empty; - for (i=services.begin(); i != services.end(); i++) + for (i=services.begin(); i != services.end(); ++i) { if (i->servicename == servicename) return i->SendSOAP(action, attribs); @@ -458,7 +458,7 @@ std::list CUPnPDevice::GetServices(void) std::list::iterator i; std::list result; - for (i=services.begin(); i != services.end(); i++) + for (i=services.begin(); i != services.end(); ++i) result.push_back(i->servicename); return result; } diff --git a/lib/libupnpclient/UPNPService.cpp b/lib/libupnpclient/UPNPService.cpp index 7944a8aa1..7e845aa27 100644 --- a/lib/libupnpclient/UPNPService.cpp +++ b/lib/libupnpclient/UPNPService.cpp @@ -67,7 +67,7 @@ std::list CUPnPService::SendSOAP(std::string action, std::list"; } else { post << ">"; - for (i = attribs.begin(); i != attribs.end(); i++) + for (i = attribs.begin(); i != attribs.end(); ++i) { if (i->second == "") post << "<" << i->first << "/>"; diff --git a/lib/libupnpclient/UPNPSocket.cpp b/lib/libupnpclient/UPNPSocket.cpp index b56e269f5..31f779a76 100644 --- a/lib/libupnpclient/UPNPSocket.cpp +++ b/lib/libupnpclient/UPNPSocket.cpp @@ -140,7 +140,7 @@ std::vector CUPnPSocket::Discover(std::string service) if (line.substr(0,7) == "http://") { std::vector::iterator i; - for (i=devices.begin(); i != devices.end(); i++) + for (i=devices.begin(); i != devices.end(); ++i) if (line == i->descurl) goto found; try diff --git a/lib/timerdclient/timerdclient.cpp b/lib/timerdclient/timerdclient.cpp index 8ad4e967d..28a3861ae 100644 --- a/lib/timerdclient/timerdclient.cpp +++ b/lib/timerdclient/timerdclient.cpp @@ -357,7 +357,7 @@ CTimerd::TimerList CTimerdClient::getOverlappingTimers(time_t& startTime, time_t getRecordingSafety(timerPre,timerPost); for (CTimerd::TimerList::iterator it = timerlist.begin(); - it != timerlist.end();it++) + it != timerlist.end();++it) { if(it->stopTime != 0 && stopTime != 0) { diff --git a/src/daemonc/remotecontrol.cpp b/src/daemonc/remotecontrol.cpp index fe1281711..06ba0b50d 100644 --- a/src/daemonc/remotecontrol.cpp +++ b/src/daemonc/remotecontrol.cpp @@ -483,7 +483,7 @@ void CRemoteControl::processAPIDnames() std::string temp(g_settings.pref_lang[i]); std::map::const_iterator it; - for(it = iso639.begin(); it != iso639.end(); it++) { + for(it = iso639.begin(); it != iso639.end(); ++it) { if(temp == it->second && strcasecmp(desc, it->first.c_str()) == 0) { /* remember first pref found index and pid*/ if(pref_found < 0) { @@ -590,7 +590,7 @@ void CRemoteControl::copySubChannelsToZapit(void) { CZapitClient::subServiceList zapitList; - for (CSubServiceListSorted::const_iterator e = subChannels.begin(); e != subChannels.end(); e++) + for (CSubServiceListSorted::const_iterator e = subChannels.begin(); e != subChannels.end(); ++e) zapitList.push_back(e->getAsZapitSubService()); g_Zapit->setSubServices(zapitList); diff --git a/src/driver/encoding.cpp b/src/driver/encoding.cpp index 519b10d89..b4c1c238f 100644 --- a/src/driver/encoding.cpp +++ b/src/driver/encoding.cpp @@ -27,7 +27,7 @@ std::string Latin1_to_UTF8(const std::string & s) { std::string r; - for (std::string::const_iterator it = s.begin(); it != s.end(); it++) + for (std::string::const_iterator it = s.begin(); it != s.end(); ++it) { unsigned char c = *it; if (c < 0x80) diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp index d1588a160..0ff7020d7 100644 --- a/src/driver/framebuffer.cpp +++ b/src/driver/framebuffer.cpp @@ -356,7 +356,7 @@ CFrameBuffer::~CFrameBuffer() { std::map::iterator it; - for(it = icon_cache.begin(); it != icon_cache.end(); it++) { + for(it = icon_cache.begin(); it != icon_cache.end(); ++it) { /* printf("FB: delete cached icon %s: %x\n", it->first.c_str(), (int) it->second.data); */ cs_free_uncached(it->second.data); } diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 1a24de254..1e982dc73 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -278,7 +278,7 @@ bool CRecordInstance::Update() GetPids(channel); FilterPids(apid_list); - for(it = apid_list.begin(); it != apid_list.end(); it++) { + for(it = apid_list.begin(); it != apid_list.end(); ++it) { bool found = false; for(unsigned int i = 0; i < numpids; i++) { if(apids[i] == it->apid) { @@ -497,7 +497,7 @@ void CRecordInstance::FilterPids(APIDList & apid_list) APIDDesc a = {apid_min, apid_min_idx, false}; apid_list.push_back(a); } - for(APIDList::iterator it = apid_list.begin(); it != apid_list.end(); it++) + for(APIDList::iterator it = apid_list.begin(); it != apid_list.end(); ++it) printf("Record APID 0x%X %d\n",it->apid, it->ac3); } } @@ -546,7 +546,7 @@ void CRecordInstance::FillMovieInfo(CZapitChannel * channel, APIDList & apid_lis EPG_AUDIO_PIDS audio_pids; APIDList::iterator it; for(unsigned int i= 0; i< allpids.APIDs.size(); i++) { - for(it = apid_list.begin(); it != apid_list.end(); it++) { + for(it = apid_list.begin(); it != apid_list.end(); ++it) { if(allpids.APIDs[i].pid == it->apid) { audio_pids.epgAudioPid = allpids.APIDs[i].pid; audio_pids.epgAudioPidName = g_RemoteControl->current_PIDs.APIDs[i].desc; diff --git a/src/driver/vcrcontrol.cpp b/src/driver/vcrcontrol.cpp index 5b212ab99..d0570cd82 100644 --- a/src/driver/vcrcontrol.cpp +++ b/src/driver/vcrcontrol.cpp @@ -235,7 +235,7 @@ void CVCRControl::CDevice::getAPIDs(const unsigned char _apidmode, APIDList & ap APIDDesc a = {apid_min, apid_min_idx, false}; apid_list.push_back(a); } - for(APIDList::iterator it = apid_list.begin(); it != apid_list.end(); it++) + for(APIDList::iterator it = apid_list.begin(); it != apid_list.end(); ++it) printf("Record APID 0x%X %d\n",it->apid, it->ac3); } @@ -399,7 +399,7 @@ std::string CVCRControl::CFileAndServerDevice::getCommandString(const CVCRComman APIDList apid_list; getAPIDs(apidmode,apid_list); apids_selected=""; - for(APIDList::iterator it = apid_list.begin(); it != apid_list.end(); it++) + for(APIDList::iterator it = apid_list.begin(); it != apid_list.end(); ++it) { if(it != apid_list.begin()) apids_selected += " "; @@ -532,7 +532,7 @@ bool CVCRControl::CFileDevice::Record(const t_channel_id channel_id, int mode, c APIDList apid_list; getAPIDs(apids_mode, apid_list); - for(APIDList::iterator it = apid_list.begin(); it != apid_list.end(); it++) { + for(APIDList::iterator it = apid_list.begin(); it != apid_list.end(); ++it) { apids[numpids++] = it->apid; transfer_pids(it->apid, EN_TYPE_AUDIO, it->ac3 ? 1 : 0); } @@ -666,7 +666,7 @@ bool CVCRControl::CFileDevice::Update(void) g_RemoteControl->current_PIDs = allpids; g_RemoteControl->processAPIDnames(); - for(it = apid_list.begin(); it != apid_list.end(); it++) { + for(it = apid_list.begin(); it != apid_list.end(); ++it) { bool found = false; for(unsigned int i = 0; i < rec_numpida; i++) { if(rec_apids[i] == it->apid) { @@ -926,7 +926,7 @@ std::string CVCRControl::CFileAndServerDevice::getMovieInfoString(const CVCRComm APIDList::iterator it; for(unsigned int i= 0; i< allpids.APIDs.size(); i++) { - for(it = apid_list.begin(); it != apid_list.end(); it++) { + for(it = apid_list.begin(); it != apid_list.end(); ++it) { if(allpids.APIDs[i].pid == it->apid) { audio_pids.epgAudioPid = allpids.APIDs[i].pid; audio_pids.epgAudioPidName = ZapitTools::UTF8_to_UTF8XML(g_RemoteControl->current_PIDs.APIDs[i].desc); diff --git a/src/eitd/SIevents.cpp b/src/eitd/SIevents.cpp index 6ed4282d3..195778508 100644 --- a/src/eitd/SIevents.cpp +++ b/src/eitd/SIevents.cpp @@ -275,7 +275,7 @@ int SIevent::saveXML2(FILE *file) const for (std::map::const_iterator i = langName.begin() ; i != langName.end() ; - i++) { + ++i) { if (i->second.length()) { fprintf(file, "\t\t\tfirst.c_str()); saveStringToXMLfile(file, i->second.c_str()); @@ -285,7 +285,7 @@ int SIevent::saveXML2(FILE *file) const for (std::map::const_iterator i = langText.begin() ; i != langText.end() ; - i++) { + ++i) { if (i->second.length()) { fprintf(file, "\t\t\tfirst.c_str()); saveStringToXMLfile(file, i->second.c_str()); @@ -305,7 +305,7 @@ int SIevent::saveXML2(FILE *file) const for (std::map::const_iterator i = langExtendedText.begin() ; i != langExtendedText.end() ; - i++) { + ++i) { if (i->second.length()) { fprintf(file, "\t\t\tfirst.c_str()); saveStringToXMLfile(file, i->second.c_str()); diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp index 393bb69b2..0e66df572 100644 --- a/src/eitd/sectionsd.cpp +++ b/src/eitd/sectionsd.cpp @@ -569,7 +569,7 @@ static void addNVODevent(const SIevent &evt) //TODO: Set Old Events to 0 if limit is reached... MySIeventsOrderFirstEndTimeServiceIDEventUniqueKey::iterator lastEvent = mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.end(); - lastEvent--; + --lastEvent; //preserve events of current channel readLockMessaging(); diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 1ec9642c0..d69841228 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -1243,7 +1243,7 @@ bool CAudioPlayerGui::openFilebrowser(void) m_Path = filebrowser.getCurrentDir(); CFileList::const_iterator files = filebrowser.getSelectedFiles().begin(); - for (; files != filebrowser.getSelectedFiles().end(); files++) + for (; files != filebrowser.getSelectedFiles().end(); ++files) { if (maxProgress > SHOW_FILE_LOAD_LIMIT) { @@ -1434,7 +1434,7 @@ bool CAudioPlayerGui::openSCbrowser(void) neutrino_msg_t msg; neutrino_msg_data_t data; g_RCInput->getMsg(&msg, &data, 0); - for (; (files != filebrowser.getSelectedFiles().end()) && (msg != CRCInput::RC_home); files++) + for (; (files != filebrowser.getSelectedFiles().end()) && (msg != CRCInput::RC_home); ++files) { //if (maxProgress > SHOW_FILE_LOAD_LIMIT) { @@ -2482,11 +2482,11 @@ void CAudioPlayerGui::removeFromPlaylist(long pos) // behind item to delete long p = 0; for (CTitle2Pos::iterator title=m_title2Pos.begin(); - title!=m_title2Pos.end(); title++) + title!=m_title2Pos.end(); ++title) { CPosList newList; for (CPosList::iterator posIt=title->second.begin(); - posIt!=title->second.end(); posIt++) + posIt!=title->second.end(); ++posIt) { p = *(posIt); if (*posIt > pos) @@ -2568,12 +2568,12 @@ void CAudioPlayerGui::selectTitle(unsigned char selectionChar) void CAudioPlayerGui::printSearchTree() { for (CTitle2Pos::iterator it=m_title2Pos.begin(); - it!=m_title2Pos.end(); it++) + it!=m_title2Pos.end(); ++it) { printf("key: %c\n",it->first); long pos=-1; for (CPosList::iterator it2=it->second.begin(); - it2!=it->second.end(); it2++) + it2!=it->second.end(); ++it2) { pos++; printf(" val: %ld ",*it2); @@ -2607,7 +2607,7 @@ void CAudioPlayerGui::buildSearchTree() long listPos = -1; for (CAudioPlayList::iterator it=m_playlist.begin(); - it!=m_playlist.end(); it++) + it!=m_playlist.end(); ++it) { // if (m_state == CAudioPlayerGui::PLAY) // usleep(10*1000); @@ -2779,7 +2779,7 @@ void CAudioPlayerGui::savePlaylist() playlistFile << "#EXTM3U" << std::endl; CAudioPlayList::const_iterator it; - for (it = m_playlist.begin(); it!=m_playlist.end(); it++) + for (it = m_playlist.begin(); it!=m_playlist.end(); ++it) { playlistFile << "#EXTINF:" << it->MetaData.total_time << "," << it->MetaData.artist << " - " << it->MetaData.title << std::endl; diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp index 6b076d86c..0b363dd76 100644 --- a/src/gui/bookmarkmanager.cpp +++ b/src/gui/bookmarkmanager.cpp @@ -163,7 +163,7 @@ void CBookmarkManager::writeBookmarkFile() { printf("CBookmarkManager: Writing bookmark file\n"); - for (std::vector::const_iterator it = bookmarks.begin(); it != bookmarks.end(); it++) + for (std::vector::const_iterator it = bookmarks.begin(); it != bookmarks.end(); ++it) { std::string tmp = bookmarkstring; tmp += "name"; diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index 8650ff7b3..5e84ab9f5 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -72,7 +72,7 @@ CBouquetList::CBouquetList(const char * const Name) CBouquetList::~CBouquetList() { - for (std::vector::iterator it = Bouquets.begin(); it != Bouquets.end(); it++) { + for (std::vector::iterator it = Bouquets.begin(); it != Bouquets.end(); ++it) { delete (*it); } Bouquets.clear(); diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 8b15b9173..c7ebbc6cb 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -361,7 +361,7 @@ void EpgPlus::ChannelEntry::init() EpgPlus::ChannelEntry::~ChannelEntry() { for (TCChannelEventEntries::iterator It = this->channelEventEntries.begin(); - It != this->channelEventEntries.end(); It++) { + It != this->channelEventEntries.end(); ++It) { delete *It; } this->channelEventEntries.clear(); @@ -527,7 +527,7 @@ void sectionsd_getEventsServiceKey(t_channel_id serviceUniqueKey, CChannelEventL void EpgPlus::createChannelEntries (int selectedChannelEntryIndex) { for (TChannelEntries::iterator It = this->displayedChannelEntries.begin(); - It != this->displayedChannelEntries.end(); It++) { + It != this->displayedChannelEntries.end(); ++It) { delete *It; } this->displayedChannelEntries.clear(); @@ -1163,7 +1163,7 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu } while (this->refreshAll); for (TChannelEntries::iterator It = this->displayedChannelEntries.begin(); - It != this->displayedChannelEntries.end(); It++) { + It != this->displayedChannelEntries.end(); ++It) { delete *It; } this->displayedChannelEntries.clear(); diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index ce1e11e78..5b39242d0 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -667,7 +667,7 @@ void CNeutrinoEventList::hide() CTimerd::CTimerEventTypes CNeutrinoEventList::isScheduled(t_channel_id channel_id, CChannelEvent * event, int * tID) { CTimerd::TimerList::iterator timer = timerlist.begin(); - for(; timer != timerlist.end(); timer++) { + for(; timer != timerlist.end(); ++timer) { if(timer->channel_id == channel_id && (timer->eventType == CTimerd::TIMER_ZAPTO || timer->eventType == CTimerd::TIMER_RECORD)) { if(timer->epgID == event->eventID) { if(timer->epg_starttime == event->startTime) { diff --git a/src/gui/nfs.cpp b/src/gui/nfs.cpp index 1d80c8371..9b797dd72 100644 --- a/src/gui/nfs.cpp +++ b/src/gui/nfs.cpp @@ -303,7 +303,7 @@ int CNFSUmountGui::menu() umountMenu.addIntroItems(); CFSMounter::getMountedFS(infos); for (CFSMounter::MountInfos::const_iterator it = infos.begin(); - it != infos.end();it++) + it != infos.end();++it) { if(it->type == "nfs" || it->type == "cifs" || it->type == "lufs") { diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp index fc2b32a84..ef2a7b248 100644 --- a/src/gui/osdlang_setup.cpp +++ b/src/gui/osdlang_setup.cpp @@ -202,7 +202,7 @@ void COsdLangSetup::showPrefMenu(CMenuWidget *prefMenu, CLangSelectNotifier *lan { CMenuOptionStringChooser * langSelect = new CMenuOptionStringChooser(LOCALE_AUDIOMENU_PREF_LANG, g_settings.pref_lang[i], true, langNotifier, CRCInput::convertDigitToKey(i+1), "", true); std::map::const_iterator it; - for(it = iso639rev.begin(); it != iso639rev.end(); it++) + for(it = iso639rev.begin(); it != iso639rev.end(); ++it) langSelect->addOption(it->first.c_str()); prefMenu->addItem(langSelect); @@ -215,7 +215,7 @@ void COsdLangSetup::showPrefMenu(CMenuWidget *prefMenu, CLangSelectNotifier *lan CMenuOptionStringChooser * langSelect = new CMenuOptionStringChooser(LOCALE_AUDIOMENU_PREF_SUBS, g_settings.pref_subs[i], true, NULL, CRCInput::convertDigitToKey(i+4), "", true); std::map::const_iterator it; - for(it = iso639rev.begin(); it != iso639rev.end(); it++) + for(it = iso639rev.begin(); it != iso639rev.end(); ++it) langSelect->addOption(it->first.c_str()); prefMenu->addItem(langSelect); @@ -246,7 +246,7 @@ bool CLangSelectNotifier::changeNotify(const neutrino_locale_t, void *) printf("setLanguages: %d: %s\n", i, g_settings.pref_lang[i]); std::string temp(g_settings.pref_lang[i]); - for(it = iso639.begin(); it != iso639.end(); it++) + for(it = iso639.begin(); it != iso639.end(); ++it) { if(temp == it->second) { diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp index f2c5694b2..700f076e8 100644 --- a/src/gui/pictureviewer.cpp +++ b/src/gui/pictureviewer.cpp @@ -393,7 +393,7 @@ int CPictureViewerGui::show() { Path = filebrowser.getCurrentDir(); CFileList::const_iterator files = filebrowser.getSelectedFiles().begin(); - for (; files != filebrowser.getSelectedFiles().end(); files++) + for (; files != filebrowser.getSelectedFiles().end(); ++files) { if (files->getType() == CFile::FILE_PICTURE) { diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp index bbc553907..063186016 100644 --- a/src/gui/plugins.cpp +++ b/src/gui/plugins.cpp @@ -601,7 +601,7 @@ void CPlugins::startPlugin(int number,int /*param*/) bool CPlugins::hasPlugin(CPlugins::p_type_t type) { for (std::vector::iterator it=plugin_list.begin(); - it!=plugin_list.end(); it++) + it!=plugin_list.end(); ++it) { if (it->type == type && !it->hide) return true; diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index d5401887c..bbe52bb48 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -418,7 +418,7 @@ void CTimerList::updateEvents(void) Timer->getTimerList (timerlist); //Remove last deleted event from List CTimerd::TimerList::iterator timer = timerlist.begin(); - for (; timer != timerlist.end(); timer++) + for (; timer != timerlist.end(); ++timer) { if (timer->eventID==skipEventID) { @@ -1218,7 +1218,7 @@ bool askUserOnTimerConflict(time_t announceTime, time_t stopTime) std::string timerbuf = g_Locale->getText(LOCALE_TIMERLIST_OVERLAPPING_TIMER); timerbuf += "\n"; for (CTimerd::TimerList::iterator it = overlappingTimers.begin(); - it != overlappingTimers.end(); it++) + it != overlappingTimers.end(); ++it) { timerbuf += CTimerList::convertTimerType2String(it->eventType); timerbuf += " ("; diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index 1995b9f70..6967371c4 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -527,7 +527,7 @@ void CUpnpBrowserGui::playnext(void) } #endif results=m_devices[m_selecteddevice].SendSOAP("urn:schemas-upnp-org:service:ContentDirectory:1", "Browse", attribs); - for (i=results.begin(); i!=results.end(); i++) + for (i=results.begin(); i!=results.end(); ++i) { if (i->first=="NumberReturned") { @@ -644,7 +644,7 @@ bool CUpnpBrowserGui::selectItem(std::string id) } #endif results=m_devices[m_selecteddevice].SendSOAP("urn:schemas-upnp-org:service:ContentDirectory:1", "Browse", attribs); - for (i=results.begin(); i!=results.end(); i++) + for (i=results.begin(); i!=results.end(); ++i) { if (i->first=="NumberReturned") { diff --git a/src/gui/widget/helpbox.cpp b/src/gui/widget/helpbox.cpp index 05f4d56e6..43a854915 100644 --- a/src/gui/widget/helpbox.cpp +++ b/src/gui/widget/helpbox.cpp @@ -48,10 +48,10 @@ Helpbox::Helpbox() Helpbox::~Helpbox() { for (ContentLines::iterator it = m_lines.begin(); - it != m_lines.end(); it++) + it != m_lines.end(); ++it) { for (std::vector::iterator it2 = it->begin(); - it2 != it->end(); it2++) + it2 != it->end(); ++it2) { delete *it2; } diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp index 2a3bdbaa9..f195f2deb 100644 --- a/src/gui/widget/hintbox.cpp +++ b/src/gui/widget/hintbox.cpp @@ -120,7 +120,7 @@ void CHintBox::init(const char * const Caption, const char * const Text, const i if (nw > width) width = nw; - for (std::vector::const_iterator it = line.begin(); it != line.end(); it++) + for (std::vector::const_iterator it = line.begin(); it != line.end(); ++it) { int w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(*it, true); // UTF-8 maxLineWidth = std::max(maxLineWidth, w); @@ -201,7 +201,7 @@ void CHintBox::refresh(void) int count = entries_per_page; int ypos = theight + (fheight >> 1); - for (std::vector::const_iterator it = line.begin() + (entries_per_page * current_page); ((it != line.end()) && (count > 0)); it++, count--) + for (std::vector::const_iterator it = line.begin() + (entries_per_page * current_page); ((it != line.end()) && (count > 0)); ++it, count--) window->RenderString(g_Font[SNeutrinoSettings::FONT_TYPE_MENU], textStartX, (ypos += fheight), width, *it, (CFBWindow::color_t)COL_MENUCONTENT, 0, true); // UTF-8 if (entries_per_page < line.size()) diff --git a/src/gui/widget/hintboxext.cpp b/src/gui/widget/hintboxext.cpp index da24aece3..2f79d92d4 100644 --- a/src/gui/widget/hintboxext.cpp +++ b/src/gui/widget/hintboxext.cpp @@ -85,10 +85,10 @@ CHintBoxExt::~CHintBoxExt(void) // content has been set using "m_message" so we are responsible to // delete it for (ContentLines::iterator it = m_lines.begin(); - it != m_lines.end(); it++) + it != m_lines.end(); ++it) { for (std::vector::iterator it2 = it->begin(); - it2 != it->end(); it2++) + it2 != it->end(); ++it2) { //(*it2)->print(); delete *it2; @@ -116,13 +116,13 @@ void CHintBoxExt::init(const neutrino_locale_t Caption, const int Width, const c int maxWidth = m_width > 0 ? m_width : 0; int maxOverallHeight = 0; m_startEntryOfPage.push_back(0); - for (ContentLines::iterator it = m_lines.begin(); it!=m_lines.end(); it++) + for (ContentLines::iterator it = m_lines.begin(); it!=m_lines.end(); ++it) { bool pagebreak = false; int maxHeight = 0; int lineWidth = 0; for (std::vector::iterator item = it->begin(); - item != it->end(); item++) { + item != it->end(); ++item) { if ((*item)->getHeight() > maxHeight) maxHeight = (*item)->getHeight(); lineWidth += (*item)->getWidth(); @@ -263,11 +263,11 @@ void CHintBoxExt::refresh(bool toround) for (ContentLines::iterator it = m_lines.begin() + m_startEntryOfPage[m_currentPage]; it != m_lines.begin() + m_startEntryOfPage[m_currentPage+1] - && it != m_lines.end(); it++) + && it != m_lines.end(); ++it) { int xPos = textStartX; int maxHeight = 0; - for (std::vector::iterator d = it->begin();d!=it->end();d++) + for (std::vector::iterator d = it->begin();d!=it->end();++d) { // (*d)->print(); // printf("\n"); diff --git a/src/gui/widget/stringinput_ext.cpp b/src/gui/widget/stringinput_ext.cpp index a29e528c0..ffb5e9ccd 100644 --- a/src/gui/widget/stringinput_ext.cpp +++ b/src/gui/widget/stringinput_ext.cpp @@ -81,7 +81,7 @@ void CExtendedInput::Init(void) CExtendedInput::~CExtendedInput() { - for (std::vector::iterator it = inputFields.begin(); it < inputFields.end(); it++) + for (std::vector::iterator it = inputFields.begin(); it < inputFields.end(); ++it) delete *it; } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 53e7892bd..5c86cccf9 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3837,7 +3837,7 @@ void CNeutrinoApp::SelectSubtitles() if (s->thisSubType == CZapitAbsSub::DVB) { CZapitDVBSub* sd = reinterpret_cast(s); std::map::const_iterator it; - for(it = iso639.begin(); it != iso639.end(); it++) { + for(it = iso639.begin(); it != iso639.end(); ++it) { if(temp == it->second && sd->ISO639_language_code == it->first) { printf("CNeutrinoApp::SelectSubtitles: found DVB %s, pid %x\n", sd->ISO639_language_code.c_str(), sd->pId); dvbsub_stop(); @@ -3852,7 +3852,7 @@ void CNeutrinoApp::SelectSubtitles() if (s->thisSubType == CZapitAbsSub::TTX) { CZapitTTXSub* sd = reinterpret_cast(s); std::map::const_iterator it; - for(it = iso639.begin(); it != iso639.end(); it++) { + for(it = iso639.begin(); it != iso639.end(); ++it) { if(temp == it->second && sd->ISO639_language_code == it->first) { int page = ((sd->teletext_magazine_number & 0xFF) << 8) | sd->teletext_page_number; printf("CNeutrinoApp::SelectSubtitles: found TTX %s, pid %x page %03X\n", sd->ISO639_language_code.c_str(), sd->pId, page); diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp index c2b451de7..beb762daa 100644 --- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp @@ -237,7 +237,7 @@ void CControlAPI::Execute(CyhookHandler *hh) { dprintf("Execute CGI : %s\n",filename.c_str()); for(CStringList::iterator it = hh->ParamList.begin() ; - it != hh->ParamList.end() ; it++) + it != hh->ParamList.end() ; ++it) dprintf(" Parameter %s : %s\n",it->first.c_str(), it->second.c_str()); } @@ -1206,7 +1206,7 @@ std::string CControlAPI::channelEPGformated(CyhookHandler *hh, int bouquetnr, t_ int i = 0; CChannelEventList::iterator eventIterator; bool isFirstLine = true; - for (eventIterator = NeutrinoAPI->eList.begin(); eventIterator != NeutrinoAPI->eList.end(); eventIterator++, i++) { + for (eventIterator = NeutrinoAPI->eList.begin(); eventIterator != NeutrinoAPI->eList.end(); ++eventIterator, i++) { if ((max != -1 && i >= max) || (stoptime != -1 && eventIterator->startTime >= stoptime)) break; std::string prog = ""; @@ -1414,7 +1414,7 @@ void CControlAPI::EpgCGI(CyhookHandler *hh) { sscanf(hh->ParamList["id"].c_str(), SCANF_CHANNEL_ID_TYPE, &channel_id); sectionsd_getEventsServiceKey(channel_id, NeutrinoAPI->eList); CChannelEventList::iterator eventIterator; - for (eventIterator = NeutrinoAPI->eList.begin(); eventIterator != NeutrinoAPI->eList.end(); eventIterator++) { + for (eventIterator = NeutrinoAPI->eList.begin(); eventIterator != NeutrinoAPI->eList.end(); ++eventIterator) { CShortEPGData epg; if (sectionsd_getEPGidShort(eventIterator->eventID, &epg)) { hh->printf("%llu %ld %d\n", eventIterator->eventID, eventIterator->startTime, eventIterator->duration); @@ -1581,11 +1581,11 @@ void CControlAPI::LCDAction(CyhookHandler *hh) //------------------------------------------------------------------------- void CControlAPI::SendEventList(CyhookHandler *hh, t_channel_id channel_id) { - int pos; + int pos = 0; sectionsd_getEventsServiceKey(channel_id, NeutrinoAPI->eList); CChannelEventList::iterator eventIterator; - for (eventIterator = NeutrinoAPI->eList.begin(); eventIterator != NeutrinoAPI->eList.end(); eventIterator++, pos++) + for (eventIterator = NeutrinoAPI->eList.begin(); eventIterator != NeutrinoAPI->eList.end(); ++eventIterator, pos++) hh->printf("%llu %ld %d %s\n", eventIterator->eventID, eventIterator->startTime, eventIterator->duration, eventIterator->description.c_str()); } @@ -1679,7 +1679,7 @@ void CControlAPI::SendAllCurrentVAPid(CyhookHandler *hh) if(eit_not_ok) { unsigned short i = 0; - for (CZapitClient::APIDList::iterator it = pids.APIDs.begin(); it!=pids.APIDs.end(); it++) + for (CZapitClient::APIDList::iterator it = pids.APIDs.begin(); it!=pids.APIDs.end(); ++it) { if(!(init_iso)) { @@ -1712,7 +1712,7 @@ void CControlAPI::SendTimers(CyhookHandler *hh) CTimerd::TimerList::iterator timer = timerlist.begin(); - for(; timer != timerlist.end(); timer++) + for(; timer != timerlist.end(); ++timer) { // Add Data char zAddData[22+1] = { 0 }; @@ -1814,7 +1814,7 @@ void CControlAPI::SendTimersXML(CyhookHandler *hh) // start timer list hh->WriteLn("\t\n"); - for(; timer != timerlist.end(); timer++) + for(; timer != timerlist.end(); ++timer) { hh->WriteLn("\t\t\n"); hh->printf("\t\t\t%s\n",(NeutrinoAPI->timerEventType2Str(timer->eventType)).c_str()); @@ -2322,7 +2322,7 @@ void CControlAPI::doNewTimer(CyhookHandler *hh) real_alarmTimeT -= pre; } - for(; timer != timerlist.end(); timer++) + for(; timer != timerlist.end(); ++timer) if(timer->alarmTime == real_alarmTimeT) { NeutrinoAPI->Timerd->removeTimerEvent(timer->eventID); @@ -2432,7 +2432,7 @@ void CControlAPI::changeBouquetCGI(CyhookHandler *hh) CZapitClient::BouquetChannelList BChannelList; NeutrinoAPI->Zapit->getBouquetChannels(selected - 1, BChannelList, CZapitClient::MODE_CURRENT, true); CZapitClient::BouquetChannelList::iterator channels = BChannelList.begin(); - for(; channels != BChannelList.end(); channels++) + for(; channels != BChannelList.end(); ++channels) { NeutrinoAPI->Zapit->removeChannelFromBouquet(selected - 1, channels->channel_id); } @@ -2613,7 +2613,7 @@ void CControlAPI::ConfigCGI(CyhookHandler *hh) { if (load) { // get and output list conf = Config->getConfigDataMap(); ConfigDataMap::iterator it, end, start; - for (start = conf.begin(), it=start, end = conf.end(); it != end; it++) { + for (start = conf.begin(), it=start, end = conf.end(); it != end; ++it) { std::string key = it->first; replace(key, ".", "_dot_"); replace(key, "-", "_bind_"); @@ -2629,7 +2629,7 @@ void CControlAPI::ConfigCGI(CyhookHandler *hh) { } } else { // set values and save list - for (CStringList::iterator it = hh->ParamList.begin(); it != hh->ParamList.end(); it++) { + for (CStringList::iterator it = hh->ParamList.begin(); it != hh->ParamList.end(); ++it) { std::string key = it->first; replace(key, "_dot_", "."); replace(key, "_bind_", "-"); diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp index dd2c794ef..7fe73c862 100644 --- a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp @@ -399,7 +399,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std: { CZapitClient::subServiceList subServiceList; - for (CSectionsdClient::NVODTimesList::iterator ni = nvod_list.begin(); ni != nvod_list.end(); ni++) + for (CSectionsdClient::NVODTimesList::iterator ni = nvod_list.begin(); ni != nvod_list.end(); ++ni) { CZapitClient::commandAddSubServices cmd; CEPGData epg; @@ -578,7 +578,7 @@ std::string CNeutrinoYParser::func_get_audio_pids_as_dropdown(CyhookHandler *, if(eit_not_ok) { unsigned short i = 0; - for (CZapitClient::APIDList::iterator it = pids.APIDs.begin(); it!=pids.APIDs.end(); it++) + for (CZapitClient::APIDList::iterator it = pids.APIDs.begin(); it!=pids.APIDs.end(); ++it) { if(!(init_iso)) { @@ -744,7 +744,7 @@ std::string CNeutrinoYParser::func_get_timer_list(CyhookHandler *, std::string int i = 1; char classname= 'a'; CTimerd::TimerList::iterator timer = timerlist.begin(); - for(; timer != timerlist.end();timer++) + for(; timer != timerlist.end();++timer) { classname = (i++&1)?'a':'b'; diff --git a/src/nhttpd/yhttpd_core/yhook.cpp b/src/nhttpd/yhttpd_core/yhook.cpp index 197da9cc1..eb2f9e76f 100644 --- a/src/nhttpd/yhttpd_core/yhook.cpp +++ b/src/nhttpd/yhttpd_core/yhook.cpp @@ -29,7 +29,7 @@ THandleStatus CyhookHandler::Hooks_SendResponse() { log_level_printf(4, "Response Hook-List Start\n"); THandleStatus _status = HANDLED_NONE; THookList::iterator i = HookList.begin(); - for (; i != HookList.end(); i++) { + for (; i != HookList.end(); ++i) { log_level_printf(4, "Response Hook-List (%s) Start\n", ((*i)->getHookName()).c_str()); // response Hook @@ -53,7 +53,7 @@ THandleStatus CyhookHandler::Hooks_PrepareResponse() { outType = checkOutput(); THandleStatus _status = HANDLED_NONE; THookList::iterator i = HookList.begin(); - for (; i != HookList.end(); i++) { + for (; i != HookList.end(); ++i) { log_level_printf(4, "PrepareResponse Hook-List (%s) Start\n", ((*i)->getHookName()).c_str()); // response Hook @@ -82,7 +82,7 @@ THandleStatus CyhookHandler::Hooks_ReadConfig(CConfigFile *Config, log_level_printf(4, "ReadConfig Hook-List Start\n"); THandleStatus _status = HANDLED_NONE; THookList::iterator i = HookList.begin(); - for (; i != HookList.end(); i++) { + for (; i != HookList.end(); ++i) { // log_level_printf(4,"ReadConfig Hook-List (%s) Start\n", ((*i)->getHookName()).c_str()); // response Hook _status = (*i)->Hook_ReadConfig(Config, ConfigList); @@ -101,7 +101,7 @@ THandleStatus CyhookHandler::Hooks_EndConnection() { log_level_printf(4, "EndConnection Hook-List Start\n"); THandleStatus _status = HANDLED_NONE; THookList::iterator i = HookList.begin(); - for (; i != HookList.end(); i++) { + for (; i != HookList.end(); ++i) { log_level_printf(4, "EndConnection Hook-List (%s) Start\n", ((*i)->getHookName()).c_str()); // response Hook @@ -123,7 +123,7 @@ THandleStatus CyhookHandler::Hooks_UploadSetFilename(std::string &Filename) { Filename.c_str()); THandleStatus _status = HANDLED_NONE; THookList::iterator i = HookList.begin(); - for (; i != HookList.end(); i++) { + for (; i != HookList.end(); ++i) { log_level_printf(4, "UploadSetFilename Hook-List (%s) Start\n", ((*i)->getHookName()).c_str()); // response Hook @@ -146,7 +146,7 @@ THandleStatus CyhookHandler::Hooks_UploadReady(const std::string& Filename) { Filename.c_str()); THandleStatus _status = HANDLED_NONE; THookList::iterator i = HookList.begin(); - for (; i != HookList.end(); i++) { + for (; i != HookList.end(); ++i) { log_level_printf(4, "UploadReady Hook-List (%s) Start\n", ((*i)->getHookName()).c_str()); // response Hook diff --git a/src/system/lastchannel.cpp b/src/system/lastchannel.cpp index e9c9ba568..8898d77b8 100644 --- a/src/system/lastchannel.cpp +++ b/src/system/lastchannel.cpp @@ -69,8 +69,8 @@ void CLastChannel::store (int channel, t_channel_id channel_id, bool /* forceSto /* remove this channel at other than 0 position */ if(this->lastChannels.size() > 1) { It = this->lastChannels.begin(); - It++; - for (; It != this->lastChannels.end() ; It++) { + ++It; + for (; It != this->lastChannels.end() ; ++It) { if (channel_id == It->channel_id) { this->lastChannels.erase(It); break; diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index f87eaef36..dfbb5384d 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -156,7 +156,7 @@ void* CTimerManager::timerThread(void *arg) pthread_mutex_lock(&tm_eventsMutex); CTimerEventMap::iterator pos = timerManager->events.begin(); - for(;pos != timerManager->events.end();pos++) + for(;pos != timerManager->events.end();++pos) { event = pos->second; dprintf("checking event: %03d\n",event->eventID); @@ -239,7 +239,7 @@ CTimerEvent* CTimerManager::getNextEvent() pthread_mutex_lock(&tm_eventsMutex); CTimerEvent *erg = events[0]; CTimerEventMap::iterator pos = events.begin(); - for(;pos!=events.end();pos++) + for(;pos!=events.end();++pos) { if(pos->second <= erg) { @@ -316,7 +316,7 @@ bool CTimerManager::listEvents(CTimerEventMap &Events) pthread_mutex_lock(&tm_eventsMutex); Events.clear(); - for (CTimerEventMap::iterator pos = events.begin(); pos != events.end(); pos++) + for (CTimerEventMap::iterator pos = events.begin(); pos != events.end(); ++pos) { pos->second->Refresh(); Events[pos->second->eventID] = pos->second; @@ -677,7 +677,7 @@ void CTimerManager::saveEventsToConfig() config.clear(); dprintf("save %d events to config ...\n", events.size()); CTimerEventMap::iterator pos = events.begin(); - for(;pos != events.end();pos++) + for(;pos != events.end();++pos) { CTimerEvent *event = pos->second; dprintf("event #%d\n",event->eventID); @@ -724,7 +724,7 @@ bool CTimerManager::shutdown() } CTimerEventMap::iterator pos = events.begin(); - for(;pos != events.end();pos++) + for(;pos != events.end();++pos) { CTimerEvent *event = pos->second; dprintf("shutdown: timer type %d state %d announceTime: %ld\n", event->eventType, event->eventState, event->announceTime); @@ -764,7 +764,7 @@ void CTimerManager::shutdownOnWakeup(int currEventID) pthread_mutex_lock(&tm_eventsMutex); CTimerEventMap::iterator pos = events.begin(); - for(;pos != events.end();pos++) + for(;pos != events.end();++pos) { CTimerEvent *event = pos->second; if((event->eventType == CTimerd::TIMER_RECORD || diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp index 1c12d6d58..847bd09d9 100644 --- a/src/zapit/src/bouquets.cpp +++ b/src/zapit/src/bouquets.cpp @@ -422,7 +422,7 @@ void CBouquetManager::makeRemainingChannelsBouquet(void) int j = CServiceManager::getInstance()->GetMaxNumber(true); /* FIXME temp debug */ printf("############## CBouquetManager::makeRemainingChannelsBouquet: numbers start at: tv %d radio %d ############\n", i, j); - for (vector::const_iterator it = Bouquets.begin(); it != Bouquets.end(); it++) { + for (vector::const_iterator it = Bouquets.begin(); it != Bouquets.end(); ++it) { renumChannels((*it)->tvChannels, i, (*it)->bUser ? NULL : (char *) (*it)->Name.c_str()); renumChannels((*it)->radioChannels, j, (*it)->bUser ? NULL : (char *) (*it)->Name.c_str()); } @@ -436,7 +436,7 @@ void CBouquetManager::makeRemainingChannelsBouquet(void) remainChannels = addBouquet((Bouquets.size() == 0) ? "All Channels" : "Other", false); // UTF-8 encoded remainChannels->bOther = true; - for (ZapitChannelList::const_iterator it = unusedChannels.begin(); it != unusedChannels.end(); it++) { + for (ZapitChannelList::const_iterator it = unusedChannels.begin(); it != unusedChannels.end(); ++it) { remainChannels->addService(*it); } @@ -464,7 +464,7 @@ CZapitBouquet* CBouquetManager::addBouquet(const std::string & name, bool ub, bo //printf("CBouquetManager::addBouquet: %s, user %s\n", name.c_str(), ub ? "YES" : "NO"); if(ub) { BouquetList::iterator it; - for(it = Bouquets.begin(); it != Bouquets.end(); it++) + for(it = Bouquets.begin(); it != Bouquets.end(); ++it) if(!(*it)->bUser) break; Bouquets.insert(it, newBouquet); diff --git a/src/zapit/src/channel.cpp b/src/zapit/src/channel.cpp index 3069ef7b5..991f978ce 100644 --- a/src/zapit/src/channel.cpp +++ b/src/zapit/src/channel.cpp @@ -106,7 +106,7 @@ int CZapitChannel::addAudioChannel(const unsigned short pid, const CZapitAudioCh { std::vector ::iterator aI; - for (aI = audioChannels.begin(); aI != audioChannels.end(); aI++) + for (aI = audioChannels.begin(); aI != audioChannels.end(); ++aI) if ((* aI)->pid == pid) { (* aI)->description = description; (* aI)->audioChannelType = audioChannelType; @@ -126,7 +126,7 @@ void CZapitChannel::resetPids(void) { std::vector::iterator aI; - for (aI = audioChannels.begin(); aI != audioChannels.end(); aI++) { + for (aI = audioChannels.begin(); aI != audioChannels.end(); ++aI) { delete *aI; } @@ -142,7 +142,7 @@ void CZapitChannel::resetPids(void) /*privatePid = 0;*/ pidsFlag = false; std::vector::iterator subI; - for (subI = channelSubs.begin(); subI != channelSubs.end(); subI++){ + for (subI = channelSubs.begin(); subI != channelSubs.end(); ++subI){ delete *subI; } channelSubs.clear(); @@ -189,7 +189,7 @@ void CZapitChannel::addTTXSubtitle(const unsigned int pid, const std::string lan printf("[subtitle] TTXSub: PID=0x%04x, lang=%3.3s, page=%1X%02X\n", pid, langCode.c_str(), mag_nr, page_number); std::vector::iterator subI; - for (subI=channelSubs.begin(); subI!=channelSubs.end();subI++){ + for (subI=channelSubs.begin(); subI!=channelSubs.end();++subI){ if ((*subI)->thisSubType==CZapitAbsSub::TTX){ tmpSub=reinterpret_cast(*subI); if (tmpSub->ISO639_language_code == langCode) { @@ -224,7 +224,7 @@ void CZapitChannel::addDVBSubtitle(const unsigned int pid, const std::string lan CZapitDVBSub* tmpSub = 0; std::vector::iterator subI; printf("[subtitles] DVBSub: PID=0x%04x, lang=%3.3s, cpageid=%04x, apageid=%04x\n", pid, langCode.c_str(), composition_page_id, ancillary_page_id); - for (subI=channelSubs.begin(); subI!=channelSubs.end();subI++){ + for (subI=channelSubs.begin(); subI!=channelSubs.end();++subI){ if ((*subI)->thisSubType==CZapitAbsSub::DVB){ tmpSub=reinterpret_cast(*subI); if (tmpSub->ISO639_language_code==langCode) { diff --git a/src/zapit/src/fastscan.cpp b/src/zapit/src/fastscan.cpp index 38115a80f..30d50d2df 100644 --- a/src/zapit/src/fastscan.cpp +++ b/src/zapit/src/fastscan.cpp @@ -506,12 +506,12 @@ bool CServiceScan::ParseFnt(unsigned short pid, unsigned short operator_id) } } std::map ::iterator sIt = fast_services_sat.begin(); - for(; sIt != fast_services_sat.end(); sIt++) + for(; sIt != fast_services_sat.end(); ++sIt) if(sIt->second == 0) sIt->second = satellitePosition; std::map ::iterator fIt = fast_services_freq.begin(); - for(; fIt != fast_services_freq.end(); fIt++) + for(; fIt != fast_services_freq.end(); ++fIt) if(fIt->second == 0) fIt->second = freq; } diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index 7e8f298e7..e8dc95d10 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -1003,7 +1003,7 @@ bool CFrontend::setInput(CZapitChannel * channel, bool nvod) return false; if (nvod) { - for (tpI = transponders.begin(); tpI != transponders.end(); tpI++) { + for (tpI = transponders.begin(); tpI != transponders.end(); ++tpI) { if ((ct & 0xFFFFFFFFULL) == (tpI->first & 0xFFFFFFFFULL)) break; } diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index 77c560543..7a33c2250 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -1073,7 +1073,7 @@ void CServiceManager::UpdateSatTransponders(t_satellite_position satellitePositi { pair::iterator,bool> ret; transponder_list_t & stransponders = satelliteTransponders[satellitePosition]; - for (transponder_list_t::iterator tI = transponders.begin(); tI != transponders.end(); tI++) { + for (transponder_list_t::iterator tI = transponders.begin(); tI != transponders.end(); ++tI) { for (stiterator stI = stransponders.begin(); stI != stransponders.end(); ++stI) { if (stI->second.compare(tI->second)) { stransponders.erase(stI); diff --git a/src/zapit/src/pzapit.cpp b/src/zapit/src/pzapit.cpp index 4ac72c5b4..73e06d5d9 100644 --- a/src/zapit/src/pzapit.cpp +++ b/src/zapit/src/pzapit.cpp @@ -615,7 +615,7 @@ int main (int argc, char** argv) zapit.getChannels(channels); std::vector::const_iterator ch_resp; - for (ch_resp = channels.begin(), channel = 1; ch_resp != channels.end(); ch_resp++, channel++) + for (ch_resp = channels.begin(), channel = 1; ch_resp != channels.end(); ch_resp++, ++channel) { if (!strcasecmp(ch_resp->name, channelName)) { @@ -641,7 +641,7 @@ int main (int argc, char** argv) zapit.getBouquets(bouquets, false); - for (b_resp = bouquets.begin(); b_resp != bouquets.end(); b_resp++) + for (b_resp = bouquets.begin(); b_resp != bouquets.end(); ++b_resp) std::cout << (b_resp->bouquet_nr + 1) << ": " << b_resp->name << std::endl; return 0; @@ -651,7 +651,7 @@ int main (int argc, char** argv) if (!channel) { std::vector::const_iterator ch_resp; - for (ch_resp = channels.begin(), channel = 1; ch_resp != channels.end(); ch_resp++, channel++) + for (ch_resp = channels.begin(), channel = 1; ch_resp != channels.end(); ch_resp++, ++channel) //std::cout << channel << ": " << ch_resp->name << ": " << ch_resp->channel_id<< std::endl; printf("%3d: %s (%04x)\n", channel, ch_resp->name, (short) (ch_resp->channel_id &0xFFFF)); return 0;