diff options
Diffstat (limited to 'src')
59 files changed, 252 insertions, 275 deletions
diff --git a/src/kvilib/ext/KviAnimatedPixmapCache.cpp b/src/kvilib/ext/KviAnimatedPixmapCache.cpp index f283bb225..746b8118e 100644 --- a/src/kvilib/ext/KviAnimatedPixmapCache.cpp +++ b/src/kvilib/ext/KviAnimatedPixmapCache.cpp @@ -229,10 +229,10 @@ void KviAnimatedPixmapCache::timeoutEvent() i = m_timerData.erase(i); } - for(int i = 0; i < processed.size(); ++i) + for(auto i : processed) { // increase the frame index and emit the signal - processed.at(i)->nextFrame(true); + i->nextFrame(true); } // m_timerMutex.unlock(); diff --git a/src/kvilib/ext/KviCommandFormatter.cpp b/src/kvilib/ext/KviCommandFormatter.cpp index 47a60452b..2ce62246d 100644 --- a/src/kvilib/ext/KviCommandFormatter.cpp +++ b/src/kvilib/ext/KviCommandFormatter.cpp @@ -57,11 +57,11 @@ namespace KviCommandFormatter bool hasLeadingChars(QStringList & list, const QChar & c) { bool bGotIt = false; - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto & it : list) { - if((*it).length() < 1) + if(it.length() < 1) continue; - if((*it).at(0) == c) + if(it.at(0) == c) { // found at least one such leading char bGotIt = true; @@ -69,12 +69,12 @@ namespace KviCommandFormatter else { // we pretend this line to be empty - QString szTmp = *it; + QString szTmp = it; szTmp = szTmp.trimmed(); if(!szTmp.isEmpty()) return false; - *it = ""; // set it to empty also in the main buffer + it = ""; // set it to empty also in the main buffer } } return bGotIt; @@ -92,9 +92,9 @@ namespace KviCommandFormatter void trimLeading(QStringList & list) { - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto & it : list) { - (*it).remove(0, 1); + it.remove(0, 1); } } @@ -110,9 +110,9 @@ namespace KviCommandFormatter void addLeading(QStringList & list, const QChar & c) { - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto & it : list) { - (*it).prepend(c); + it.prepend(c); } } @@ -139,9 +139,9 @@ namespace KviCommandFormatter //szBuffer = list.join("\n"); join implementation sux :D // we WANT the last newline szBuffer = ""; - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto & it : list) { - szBuffer.append(*it); + szBuffer.append(it); szBuffer.append(QChar('\n')); } } @@ -202,9 +202,9 @@ namespace KviCommandFormatter //szBuffer = list.join("\n"); join implementation sux :D // we WANT the last newline szBuffer = ""; - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto & it : list) { - szBuffer.append(*it); + szBuffer.append(it); szBuffer.append(QChar('\n')); } } diff --git a/src/kvilib/ext/KviConfigurationFile.cpp b/src/kvilib/ext/KviConfigurationFile.cpp index bbb474fc7..ba016ba33 100644 --- a/src/kvilib/ext/KviConfigurationFile.cpp +++ b/src/kvilib/ext/KviConfigurationFile.cpp @@ -675,10 +675,10 @@ QList<int> KviConfigurationFile::readIntListEntry(const QString & szKey, const Q //qDebug("Got option list for group %s and key %s: %s",m_szGroup.latin1(),szKey.latin1(),p_str->latin1()); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto & it : sl) { bool bOk; - int iTmp = (*it).toInt(&bOk); + int iTmp = it.toInt(&bOk); if(bOk) ret.append(iTmp); } @@ -691,11 +691,11 @@ void KviConfigurationFile::writeEntry(const QString & szKey, const QList<int> & m_bDirty = true; KviConfigurationFileGroup * p_group = getCurrentGroup(); KviCString szData; - for(QList<int>::ConstIterator it = list.begin(); it != list.end(); ++it) + for(int it : list) { if(szData.hasData()) szData.append(','); - szData.append(KviCString::Format, "%d", *it); + szData.append(KviCString::Format, "%d", it); } //qDebug("Writing option list for group %s and key %s: %s",m_szGroup.latin1(),szKey.latin1(),szData.ptr()); diff --git a/src/kvilib/ext/KviMiscUtils.cpp b/src/kvilib/ext/KviMiscUtils.cpp index f7cd1a007..3a147ebe4 100644 --- a/src/kvilib/ext/KviMiscUtils.cpp +++ b/src/kvilib/ext/KviMiscUtils.cpp @@ -71,10 +71,10 @@ namespace KviMiscUtils if(sl.isEmpty()) return false; // must all be numbers - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto & it : sl) { bool bOk; - int i = (*it).toInt(&bOk); + int i = it.toInt(&bOk); if(!bOk) return false; if(i < 0) diff --git a/src/kvilib/ext/KviProxy.cpp b/src/kvilib/ext/KviProxy.cpp index 21fcc9c30..c5729c631 100644 --- a/src/kvilib/ext/KviProxy.cpp +++ b/src/kvilib/ext/KviProxy.cpp @@ -82,8 +82,8 @@ void KviProxy::setNamedProtocol(const char * proto) void KviProxy::getSupportedProtocolNames(QStringList & buf) { - for(int i = 0; i < 3; i++) - buf.append(QString(proxy_protocols_table[i])); + for(const auto & i : proxy_protocols_table) + buf.append(QString(i)); } void KviProxy::normalizeUserAndPass() diff --git a/src/kvilib/ext/KviStringConversion.cpp b/src/kvilib/ext/KviStringConversion.cpp index 5e5e6b0d1..cfbdf8acb 100644 --- a/src/kvilib/ext/KviStringConversion.cpp +++ b/src/kvilib/ext/KviStringConversion.cpp @@ -87,14 +87,14 @@ namespace KviStringConversion void encodePath(QStringList & buffer) { - for(QStringList::Iterator it = buffer.begin(); it != buffer.end(); ++it) - encodePath(*it); + for(auto & it : buffer) + encodePath(it); } void decodePath(QStringList & buffer) { - for(QStringList::Iterator it = buffer.begin(); it != buffer.end(); ++it) - decodePath(*it); + for(auto & it : buffer) + decodePath(it); } void toString(const bool bValue, QString & szBuffer) diff --git a/src/kvilib/file/KviFileUtils.cpp b/src/kvilib/file/KviFileUtils.cpp index a734715c7..ed1fef7f1 100644 --- a/src/kvilib/file/KviFileUtils.cpp +++ b/src/kvilib/file/KviFileUtils.cpp @@ -450,9 +450,9 @@ namespace KviFileUtils { QString szSrc(szPath); szPath = ""; - for(int i = 0; i < szSrc.length(); i++) + for(const auto & i : szSrc) { - QChar cur = szSrc[i]; + QChar cur = i; if(!(cur.isLetter() || cur.isDigit() || cur == ' ' || cur == '_' || cur == '.' || cur == '#' || cur == '%')) { if(cur.row() != 0) @@ -480,9 +480,9 @@ namespace KviFileUtils { QString szSrc(szPath); szPath = ""; - for(int i = 0; i < szSrc.length(); i++) + for(const auto & i : szSrc) { - QChar cur = szSrc[i]; + QChar cur = i; #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) if(cur.unicode() < 32 || cur == '<' || cur == '>' || cur == ':' || cur == '"' || cur == '/' || cur == '\\' || cur == '|' || cur == '?' || cur == '*') #else diff --git a/src/kvilib/locale/KviMessageCatalogue.cpp b/src/kvilib/locale/KviMessageCatalogue.cpp index f93840c7d..252ad2717 100644 --- a/src/kvilib/locale/KviMessageCatalogue.cpp +++ b/src/kvilib/locale/KviMessageCatalogue.cpp @@ -123,10 +123,10 @@ static int somePrimeNumbers[90] = { int kvi_getFirstBiggerPrime(int iNumber) { - for(int i = 0; i < 90; i++) + for(int somePrimeNumber : somePrimeNumbers) { - if(somePrimeNumbers[i] >= iNumber) - return somePrimeNumbers[i]; + if(somePrimeNumber >= iNumber) + return somePrimeNumber; } return 9973; //error! } diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp index ebc2b0ea3..6d7c2f81d 100644 --- a/src/kvirc/kernel/KviApplication.cpp +++ b/src/kvirc/kernel/KviApplication.cpp @@ -1909,16 +1909,13 @@ void KviApplication::buildRecentChannels() QString szChan, szNet; - for( - QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels).begin(); - it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels).end(); - ++it) + for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels)) { - if((*it).isEmpty()) + if(it.isEmpty()) continue; - szChan = (*it).section(KVI_RECENT_CHANNELS_SEPARATOR, 0, 0); - szNet = (*it).section(KVI_RECENT_CHANNELS_SEPARATOR, 1); + szChan = it.section(KVI_RECENT_CHANNELS_SEPARATOR, 0, 0); + szNet = it.section(KVI_RECENT_CHANNELS_SEPARATOR, 1); if(szNet.isEmpty()) continue; @@ -1976,11 +1973,11 @@ void KviApplication::fillRecentServersPopup(QMenu * pMenu) { // FIXME: #warning "MAYBE DISABLE THE SERVERS THAT WE ARE ALREADY CONNECTED TO ?" pMenu->clear(); - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) + for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers)) { - if(*it == "") + if(it == "") continue; - pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Server)), *it); + pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Server)), it); } } @@ -1989,18 +1986,18 @@ void KviApplication::fillRecentNicknamesPopup(QMenu * pMenu, KviConsoleWindow * pMenu->clear(); QAction * pAction; bool bAlreadyFound = false; - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames).end(); ++it) + for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames)) { - if(*it == "") + if(it == "") continue; - pAction = pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Nick)), *it); + pAction = pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Nick)), it); if(!pConsole->isConnected()) pAction->setEnabled(false); else { if(!bAlreadyFound) { - bool bIsCurrent = KviQString::equalCS(pConsole->connection()->currentNickName(), *it); + bool bIsCurrent = KviQString::equalCS(pConsole->connection()->currentNickName(), it); pAction->setEnabled(!bIsCurrent); if(bIsCurrent) bAlreadyFound = true; @@ -2016,15 +2013,15 @@ void KviApplication::fillRecentChannelsPopup(QMenu * pMenu, KviConsoleWindow * p QStringList * pList = recentChannelsForNetwork(pConsole->currentNetworkName()); if(pList) { - for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it) + for(auto & it : *pList) { - if(*it == "") + if(it == "") continue; // ? - pAction = pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Channel)), *it); + pAction = pMenu->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Channel)), it); if(!pConsole->isConnected()) pAction->setEnabled(false); else - pAction->setEnabled(!(pConsole->connection()->findChannel(*it))); + pAction->setEnabled(!(pConsole->connection()->findChannel(it))); } } } diff --git a/src/kvirc/kernel/KviApplication_filesystem.cpp b/src/kvirc/kernel/KviApplication_filesystem.cpp index cd2ff2364..451bf41aa 100644 --- a/src/kvirc/kernel/KviApplication_filesystem.cpp +++ b/src/kvirc/kernel/KviApplication_filesystem.cpp @@ -423,10 +423,9 @@ void KviApplication::getChannelDumpLogFileName(QString & szStr) bool KviApplication::findImageInImageSearchPath(QString & szRetPath, const QString & filename) { // first lookup the user defined paths - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).begin(); - it != KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).end(); ++it) + for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths)) { - szRetPath = *it; + szRetPath = it; KviQString::ensureLastCharIs(szRetPath, KVI_PATH_SEPARATOR_CHAR); szRetPath.append(filename); //qDebug("LOOK FOR %s",szRetPath.ptr()); diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp index e6ed00e3d..89dd35efa 100644 --- a/src/kvirc/kernel/KviIconManager.cpp +++ b/src/kvirc/kernel/KviIconManager.cpp @@ -1948,11 +1948,11 @@ void KviIconManager::clearCache() void KviIconManager::reloadImages() { clearCache(); - for(int i = 0; i < KviIconManager::IconCount; i++) + for(auto & m_smallIcon : m_smallIcons) { - if(m_smallIcons[i]) - delete m_smallIcons[i]; - m_smallIcons[i] = nullptr; + if(m_smallIcon) + delete m_smallIcon; + m_smallIcon = nullptr; } } diff --git a/src/kvirc/kernel/KviIrcUrl.cpp b/src/kvirc/kernel/KviIrcUrl.cpp index 6639eccd0..122f011e1 100644 --- a/src/kvirc/kernel/KviIrcUrl.cpp +++ b/src/kvirc/kernel/KviIrcUrl.cpp @@ -173,15 +173,15 @@ void KviIrcUrl::makeJoinCmd(const QStringList & chans, QString & szJoinCommand) if(chans.count() != 0) { - for(QStringList::ConstIterator it = chans.begin(); it != chans.end(); ++it) + for(const auto & chan : chans) { - szCurPass = (*it).section('?', 1); + szCurPass = chan.section('?', 1); if(szCurPass.isEmpty()) { if(!szChannels.isEmpty()) szChannels.append(","); - szCurChan = (*it).section('?', 0, 0); + szCurChan = chan.section('?', 0, 0); if(!(szCurChan[0] == '#' || szCurChan[0] == '&' || szCurChan[0] == '!')) szCurChan.prepend('#'); szChannels.append(szCurChan); @@ -190,7 +190,7 @@ void KviIrcUrl::makeJoinCmd(const QStringList & chans, QString & szJoinCommand) { if(!szProtectedChannels.isEmpty()) szProtectedChannels.append(","); - szCurChan = (*it).section('?', 0, 0); + szCurChan = chan.section('?', 0, 0); if(!(szCurChan[0] == '#' || szCurChan[0] == '&' || szCurChan[0] == '!')) szCurChan.prepend('#'); szProtectedChannels.append(szCurChan); diff --git a/src/kvirc/kernel/KviNotifyList.cpp b/src/kvirc/kernel/KviNotifyList.cpp index 84448c9cb..0691eaff3 100644 --- a/src/kvirc/kernel/KviNotifyList.cpp +++ b/src/kvirc/kernel/KviNotifyList.cpp @@ -1040,12 +1040,12 @@ bool KviStupidNotifyListManager::handleIsOn(KviIrcMessage * msg) // ok...check the users that have left irc now... QStringList sl = m_szLastIsOnMsg.isEmpty() ? QStringList() : m_szLastIsOnMsg.split(' ', QString::SkipEmptyParts); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto & it : sl) { - if(m_pConsole->notifyListView()->findEntry(*it)) + if(m_pConsole->notifyListView()->findEntry(it)) { // has just left irc - notifyOffLine(*it); + notifyOffLine(it); } // else has never been here... } @@ -1146,9 +1146,9 @@ void KviWatchNotifyListManager::buildRegUserDict() { notify = notify.trimmed(); QStringList sl = notify.split(' ', QString::SkipEmptyParts); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto & it : sl) { - m_pRegUserDict->replace(*it, new QString(u->name())); + m_pRegUserDict->replace(it, new QString(u->name())); } } ++it; diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp index bb5308eb5..6e8be48da 100644 --- a/src/kvirc/kernel/KviOptions.cpp +++ b/src/kvirc/kernel/KviOptions.cpp @@ -1087,13 +1087,13 @@ namespace KviTheme QDir d(szPicsPath); QStringList sl = d.entryList(QDir::nameFiltersFromString("kvi_bigicon_*.png"), QDir::Files); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); it++) + for(auto & it : sl) { - KviCachedPixmap * p = g_pIconManager->getPixmapWithCache(*it); + KviCachedPixmap * p = g_pIconManager->getPixmapWithCache(it); if(p) { QString szPixPath = szThemeDirPath; - szPixPath += *it; + szPixPath += it; if(!KviFileUtils::copyFile(p->path(), szPixPath)) { @@ -1390,13 +1390,13 @@ bool KviApplication::setOptionValue(const QString & optName, const QString & val szBuffer = szVal; } - for(int i = 0; i < KVI_NUM_PIXMAP_OPTIONS; i++) + for(auto & i : g_pixmapOptionsTable) { - if(KviQString::equalCI(optName, g_pixmapOptionsTable[i].name)) + if(KviQString::equalCI(optName, i.name)) { - if(!KviStringConversion::fromString(szBuffer, g_pixmapOptionsTable[i].option)) + if(!KviStringConversion::fromString(szBuffer, i.option)) return false; - optionResetUpdate(g_pixmapOptionsTable[i].flags); + optionResetUpdate(i.flags); return true; } } diff --git a/src/kvirc/kernel/KviTheme.cpp b/src/kvirc/kernel/KviTheme.cpp index f36187f8e..f51a8abe3 100644 --- a/src/kvirc/kernel/KviTheme.cpp +++ b/src/kvirc/kernel/KviTheme.cpp @@ -334,7 +334,7 @@ namespace KviTheme QDir d(szThemePath); QStringList sl = d.entryList(QDir::Dirs | QDir::NoDotAndDotDot); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) - slThemes.append(*it); + for(auto & it : sl) + slThemes.append(it); } }; diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp index 8c562a7f8..b8ce2558f 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp @@ -961,9 +961,9 @@ namespace KviKvsCoreFunctions goto leavenow; } - for(int i = 0; i < szFormat.size(); i++) + for(auto i : szFormat) { - ushort ch = szFormat.at(i).unicode(); + ushort ch = i.unicode(); iLength = 2; iVal = 0x8000000; cDiv = ' '; @@ -1126,7 +1126,7 @@ namespace KviKvsCoreFunctions //case 'Z': // TZ abbrev. // szFmtTime += default: - szFmtTime += szFormat.at(i); + szFmtTime += i; } if(iVal != 0x8000000) diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp index 8c5b0cb7a..674bb4c6b 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp @@ -411,13 +411,13 @@ namespace KviKvsCoreSimpleCommands QStringList slChans = szChans.split(",", QString::SkipEmptyParts); QString szChanTypes = KVSCSC_pConnection->serverInfo()->supportedChannelTypes(); - for(QStringList::Iterator it = slChans.begin(); it != slChans.end(); ++it) + for(auto & slChan : slChans) { - if(!(*it).isEmpty()) + if(!slChan.isEmpty()) { bool bFound = false; int id = 0; - QChar f = (*it)[0]; + QChar f = slChan[0]; while((id < szChanTypes.length()) && !bFound) { if(f == szChanTypes[id]) @@ -425,7 +425,7 @@ namespace KviKvsCoreSimpleCommands id++; } if(!bFound) - (*it).prepend("#"); + slChan.prepend("#"); } } diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp index b13558ae4..dc31ed177 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp @@ -844,9 +844,9 @@ namespace KviKvsCoreSimpleCommands if(!(KVSCSC_pConnection->sendFmtData("PART %s :%s", szEncodedChans.data(), szText.data()))) return KVSCSC_pContext->warningNoIrcConnection(); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); it++) + for(auto & it : sl) { - KviChannelWindow * ch = KVSCSC_pConnection->findChannel(*it); + KviChannelWindow * ch = KVSCSC_pConnection->findChannel(it); if(ch) { ch->partMessageSent(!KVSCSC_pSwitches->find('k', "keep"), !KVSCSC_pSwitches->find('s', "silent")); @@ -854,7 +854,7 @@ namespace KviKvsCoreSimpleCommands else { if(!KVSCSC_pSwitches->find('q', "quiet")) - KVSCSC_pContext->warning(__tr2qs_ctx("You don't appear to be on channel %s", "kvs"), (*it).toUtf8().data()); + KVSCSC_pContext->warning(__tr2qs_ctx("You don't appear to be on channel %s", "kvs"), it.toUtf8().data()); } } @@ -1090,9 +1090,8 @@ namespace KviKvsCoreSimpleCommands KviQueryWindow * query; QStringList sl = szTargets.split(",", QString::SkipEmptyParts); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); it++) + for(auto szNick : sl) { - QString szNick = *it; if(szNick.isEmpty()) KVSCSC_pContext->warning(__tr2qs_ctx("Empty target specified", "kvs")); else diff --git a/src/kvirc/kvs/event/KviKvsEventManager.cpp b/src/kvirc/kvs/event/KviKvsEventManager.cpp index 9b5e099b1..7f72aa96c 100644 --- a/src/kvirc/kvs/event/KviKvsEventManager.cpp +++ b/src/kvirc/kvs/event/KviKvsEventManager.cpp @@ -91,8 +91,8 @@ KviKvsEventManager * KviKvsEventManager::m_pInstance = nullptr; KviKvsEventManager::KviKvsEventManager() { m_pInstance = this; - for(int i = 0; i < KVI_KVS_NUM_RAW_EVENTS; i++) - m_rawEventTable[i] = nullptr; + for(auto & i : m_rawEventTable) + i = nullptr; } KviKvsEventManager::~KviKvsEventManager() @@ -273,14 +273,14 @@ bool KviKvsEventManager::removeModuleAppHandler(unsigned int uEvIdx, KviKvsModul void KviKvsEventManager::removeAllModuleAppHandlers(KviKvsModuleInterface * pIface) { KviKvsEventHandler * h; - for(unsigned int i = 0; i < KVI_KVS_NUM_APP_EVENTS; i++) + for(auto & i : m_appEventTable) { - if(!m_appEventTable[i].handlers()) + if(!i.handlers()) continue; KviPointerList<KviKvsEventHandler> l; l.setAutoDelete(false); - for(h = m_appEventTable[i].handlers()->first(); h; h = m_appEventTable[i].handlers()->next()) + for(h = i.handlers()->first(); h; h = i.handlers()->next()) { if(h->type() == KviKvsEventHandler::Module) { @@ -302,21 +302,21 @@ void KviKvsEventManager::removeAllModuleAppHandlers(KviKvsModuleInterface * pIfa // END COMPAT } for(h = l.first(); h; h = l.next()) - m_appEventTable[i].removeHandler(h); + i.removeHandler(h); } } void KviKvsEventManager::removeAllModuleRawHandlers(KviKvsModuleInterface * pIface) { KviKvsEventHandler * h; - for(unsigned int i = 0; i < KVI_KVS_NUM_RAW_EVENTS; i++) + for(auto & i : m_rawEventTable) { - if(!m_rawEventTable[i]) + if(!i) continue; KviPointerList<KviKvsEventHandler> l; l.setAutoDelete(false); - for(h = m_rawEventTable[i]->first(); h; h = m_rawEventTable[i]->next()) + for(h = i->first(); h; h = i->next()) { if(h->type() == KviKvsEventHandler::Module) { @@ -338,11 +338,11 @@ void KviKvsEventManager::removeAllModuleRawHandlers(KviKvsModuleInterface * pIfa // END COMPAT } for(h = l.first(); h; h = l.next()) - m_rawEventTable[i]->removeRef(h); - if(m_rawEventTable[i]->isEmpty()) + i->removeRef(h); + if(i->isEmpty()) { - delete m_rawEventTable[i]; - m_rawEventTable[i] = nullptr; + delete i; + i = nullptr; } } } @@ -433,22 +433,22 @@ void KviKvsEventManager::removeAllModuleHandlers(KviKvsModuleInterface * pIface) void KviKvsEventManager::removeAllScriptAppHandlers() { - for(size_t i = 0; i < KVI_KVS_NUM_APP_EVENTS; i++) + for(auto & i : m_appEventTable) { - m_appEventTable[i].clearScriptHandlers(); + i.clearScriptHandlers(); } } void KviKvsEventManager::removeAllScriptRawHandlers() { - for(size_t i = 0; i < KVI_KVS_NUM_RAW_EVENTS; i++) + for(auto & i : m_rawEventTable) { - if(m_rawEventTable[i]) + if(i) { KviPointerList<KviKvsEventHandler> dl; dl.setAutoDelete(false); KviKvsEventHandler * e; - for(e = m_rawEventTable[i]->first(); e; e = m_rawEventTable[i]->next()) + for(e = i->first(); e; e = i->next()) { if(e->type() == KviKvsEventHandler::Script) dl.append(e); @@ -456,13 +456,13 @@ void KviKvsEventManager::removeAllScriptRawHandlers() for(e = dl.first(); e; e = dl.next()) { - m_rawEventTable[i]->removeRef(e); + i->removeRef(e); } - if(m_rawEventTable[i]->isEmpty()) + if(i->isEmpty()) { - delete m_rawEventTable[i]; - m_rawEventTable[i] = nullptr; + delete i; + i = nullptr; } } } @@ -470,19 +470,19 @@ void KviKvsEventManager::removeAllScriptRawHandlers() void KviKvsEventManager::clearRawEvents() { - for(size_t i = 0; i < KVI_KVS_NUM_RAW_EVENTS; i++) + for(auto & i : m_rawEventTable) { - if(m_rawEventTable[i]) - delete m_rawEventTable[i]; - m_rawEventTable[i] = nullptr; + if(i) + delete i; + i = nullptr; } } void KviKvsEventManager::clearAppEvents() { - for(size_t i = 0; i < KVI_KVS_NUM_APP_EVENTS; i++) + for(auto & i : m_appEventTable) { - m_appEventTable[i].clear(); + i.clear(); } } diff --git a/src/kvirc/module/KviModuleManager.cpp b/src/kvirc/module/KviModuleManager.cpp index 7faa2c2d9..c9e3b0a49 100644 --- a/src/kvirc/module/KviModuleManager.cpp +++ b/src/kvirc/module/KviModuleManager.cpp @@ -68,9 +68,8 @@ void KviModuleManager::loadModulesByCaps(const QString & caps, const QString & d // FIXME: maybe check timestamps ? (old modules) QStringList sl = d.entryList(QDir::Files | QDir::Readable | QDir::NoSymLinks); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto modname : sl) { - QString modname = *it; KviQString::cutToLast(modname, KVI_PATH_SEPARATOR_CHAR); getModule(modname); } @@ -98,9 +97,9 @@ void KviModuleManager::completeModuleNames(const QString & path, const QString & // FIXME: maybe check timestamps ? (old modules) QStringList sl = d.entryList(QDir::Files | QDir::Readable | QDir::NoSymLinks); - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto & it : sl) { - QString * modname = new QString(*it); + QString * modname = new QString(it); KviQString::cutToLast(*modname, KVI_PATH_SEPARATOR_CHAR); KviQString::cutToFirst(*modname, "kvi"); if(KviQString::equalCIN(word, *modname, word.length())) diff --git a/src/kvirc/sparser/KviAntiSpam.cpp b/src/kvirc/sparser/KviAntiSpam.cpp index 2c301ac21..faa16bc90 100644 --- a/src/kvirc/sparser/KviAntiSpam.cpp +++ b/src/kvirc/sparser/KviAntiSpam.cpp @@ -104,12 +104,11 @@ bool kvi_mayBeSpam(KviCString * msg, KviCString & spamWord) { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords).begin(); - it != KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords).end(); ++it) + for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords)) { // FIXME : This is SLOOOOOOOOW (QString -> ascii translation!!) - const char * aux = (*it).toLatin1(); + const char * aux = it.toLatin1(); if(aux) { if(msg->findFirstIdx(aux, false) != -1) diff --git a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp index 716291f70..45aa7f5b4 100644 --- a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp @@ -1688,9 +1688,8 @@ void KviIrcServerParser::parseNumericWhoisChannels(KviIrcMessage * msg) QStringList sl = szChans.split(" ", QString::SkipEmptyParts); QString szChanList; - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto szCur : sl) { - QString szCur = *it; // deals with <flag>[#channel] and [##channel] int len = szCur.length(); int i = 0; diff --git a/src/kvirc/ui/KviChannelWindow.cpp b/src/kvirc/ui/KviChannelWindow.cpp index 10ad80230..5f1cf5350 100644 --- a/src/kvirc/ui/KviChannelWindow.cpp +++ b/src/kvirc/ui/KviChannelWindow.cpp @@ -174,9 +174,9 @@ KviChannelWindow::KviChannelWindow(KviConsoleWindow * lpConsole, const QString & szListModes = pServerInfo->supportedListModes(); szListModes.remove('b'); - for(int i = 0; i < szListModes.size(); ++i) + for(auto szListMode : szListModes) { - char cMode = szListModes.at(i).unicode(); + char cMode = szListMode.unicode(); QString szDescription = pServerInfo->getChannelModeDescription(cMode); if(szDescription.isEmpty()) szDescription = __tr2qs("Mode \"%1\" masks").arg(cMode); diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp index ab2afb54f..143195085 100644 --- a/src/kvirc/ui/KviConsoleWindow.cpp +++ b/src/kvirc/ui/KviConsoleWindow.cpp @@ -154,12 +154,9 @@ void KviConsoleWindow::recentUrlsChanged() { QString cur = m_pAddressEdit->currentText(); m_pAddressEdit->clear(); - for( - QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).begin(); - it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).end(); - ++it) + for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls)) { - m_pAddressEdit->addItem(*(g_pIconManager->getSmallIcon(KviIconManager::Url)), *it); + m_pAddressEdit->addItem(*(g_pIconManager->getSmallIcon(KviIconManager::Url)), it); } int i = m_pAddressEdit->findText(cur); @@ -233,20 +230,18 @@ void KviConsoleWindow::completeChannel(const QString & word, KviPointerList<QStr QStringList * pList = g_pApp->recentChannelsForNetwork(currentNetworkName()); if(pList) { - for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it) + for(auto & it : *pList) { - if(KviQString::equalCIN((*it), word, word.length())) - matches->append(new QString(*it)); + if(KviQString::equalCIN(it, word, word.length())) + matches->append(new QString(it)); } } } void KviConsoleWindow::completeServer(const QString & word, KviPointerList<QString> * matches) { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) + for(auto srv : KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers)) { - QString srv((*it)); - KviQString::cutToFirst(srv, '/'); while(srv.startsWith("/")) srv.remove(0, 1); @@ -645,28 +640,27 @@ int KviConsoleWindow::applyHighlighting(KviWindow * wnd, int type, const QString if(KVI_OPTION_BOOL(KviOption_boolUseWordHighlighting)) { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).begin(); - it != KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).end(); ++it) + for(auto & it : KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords)) { - if((*it).isEmpty()) + if(it.isEmpty()) continue; if(KVI_OPTION_BOOL(KviOption_boolUseFullWordHighlighting)) { - if(szStripMsg.contains(*it, cs)) - return triggerOnHighlight(wnd, type, nick, user, host, szMsg, *it); + if(szStripMsg.contains(it, cs)) + return triggerOnHighlight(wnd, type, nick, user, host, szMsg, it); } else { if(!szPattern.isEmpty()) rgxHlite.setPattern( - QString("(?:[%1]|\\s|^)%2(?:[%1]|\\s|$)").arg(QRegExp::escape(szPattern), QRegExp::escape(*it))); + QString("(?:[%1]|\\s|^)%2(?:[%1]|\\s|$)").arg(QRegExp::escape(szPattern), QRegExp::escape(it))); else rgxHlite.setPattern( - QString("(?:\\s|^)%1(?:\\s|$)").arg(QRegExp::escape(*it))); + QString("(?:\\s|^)%1(?:\\s|$)").arg(QRegExp::escape(it))); rgxHlite.setCaseSensitivity(cs); if(szStripMsg.contains(rgxHlite)) - return triggerOnHighlight(wnd, type, nick, user, host, szMsg, *it); + return triggerOnHighlight(wnd, type, nick, user, host, szMsg, it); } } } diff --git a/src/kvirc/ui/KviCustomToolBar.cpp b/src/kvirc/ui/KviCustomToolBar.cpp index 56361b695..3e78806ad 100644 --- a/src/kvirc/ui/KviCustomToolBar.cpp +++ b/src/kvirc/ui/KviCustomToolBar.cpp @@ -130,10 +130,10 @@ void KviCustomToolBar::beginCustomize() m_pFilteredChildren->setAutoDelete(true); // filter the events for all the children QList<QObject *> list = children(); - for(QList<QObject *>::Iterator it = list.begin(); it != list.end(); ++it) + for(auto & it : list) { - if((*it)->isWidgetType()) - filterChild(*it); + if(it->isWidgetType()) + filterChild(it); } } @@ -141,10 +141,10 @@ void KviCustomToolBar::endCustomize() { // stop filtering events QList<QObject *> list = children(); - for(QList<QObject *>::Iterator it = list.begin(); it != list.end(); ++it) + for(auto & it : list) { - if((*it)->isWidgetType()) - unfilterChild(*it); + if(it->isWidgetType()) + unfilterChild(it); } if(m_pFilteredChildren) diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp index d2fe07d6c..7ee0fa697 100644 --- a/src/kvirc/ui/KviInputEditor.cpp +++ b/src/kvirc/ui/KviInputEditor.cpp @@ -273,9 +273,8 @@ void KviInputEditor::dropEvent(QDropEvent * e) if(list.isEmpty()) return; - for(QList<QUrl>::Iterator it = list.begin(); it != list.end(); ++it) + for(auto url : list) { - QUrl url = *it; QString szPath = url.toLocalFile(); if(szPath.endsWith(KVI_FILEEXTENSION_SCRIPT, Qt::CaseInsensitive)) { diff --git a/src/kvirc/ui/KviIpEditor.cpp b/src/kvirc/ui/KviIpEditor.cpp index e0c4015c2..0e49e0596 100644 --- a/src/kvirc/ui/KviIpEditor.cpp +++ b/src/kvirc/ui/KviIpEditor.cpp @@ -90,11 +90,11 @@ KviIpEditor::AddressType KviIpEditor::addressType() const bool KviIpEditor::hasEmptyFields() const { bool bHasEF = false; - for(int i = 0; i < 8; i++) + for(auto i : m_pEdit) { - if(m_pEdit[i]) + if(i) { - if(m_pEdit[i]->text().isEmpty()) + if(i->text().isEmpty()) bHasEF = true; } } diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp index 41031ab71..e588a3698 100644 --- a/src/kvirc/ui/KviMainWindow.cpp +++ b/src/kvirc/ui/KviMainWindow.cpp @@ -254,9 +254,8 @@ void KviMainWindow::unregisterModuleExtensionToolBar(KviMexToolBar * t) void KviMainWindow::restoreModuleExtensionToolBars() { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).end(); ++it) + for(auto szEntry : KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars)) { - QString szEntry = *it; int idx = szEntry.indexOf(':'); if(idx != -1) { diff --git a/src/kvirc/ui/KviModeWidget.cpp b/src/kvirc/ui/KviModeWidget.cpp index ab7af4959..f95a75cfd 100644 --- a/src/kvirc/ui/KviModeWidget.cpp +++ b/src/kvirc/ui/KviModeWidget.cpp @@ -117,9 +117,9 @@ void KviModeWidget::editorReturnPressed() { // first part: parameterless modes QString szCurModes = szOldModes.count() ? szOldModes.at(0) : ""; - for(int j = 0; j < szSubstring.length(); ++j) + for(auto j : szSubstring) { - char cMode = szSubstring.at(j).unicode(); + char cMode = j.unicode(); if(!szCurModes.contains(cMode)) { // was not set, has to be inserted @@ -167,9 +167,9 @@ void KviModeWidget::editorReturnPressed() { // first part: parameterless modes QString szNewParameterLessModes = szNewModes.count() ? szNewModes.at(0) : ""; - for(int j = 0; j < szSubstring.length(); ++j) + for(auto j : szSubstring) { - char cMode = szSubstring.at(j).unicode(); + char cMode = j.unicode(); if(!szNewParameterLessModes.contains(cMode)) { // was set, has to be unset diff --git a/src/kvirc/ui/KviQueryWindow.cpp b/src/kvirc/ui/KviQueryWindow.cpp index 392e51bb5..35f6de933 100644 --- a/src/kvirc/ui/KviQueryWindow.cpp +++ b/src/kvirc/ui/KviQueryWindow.cpp @@ -771,12 +771,12 @@ void KviQueryWindow::pasteLastLog() bool bGzip; QString szFileName; - for(QStringList::Iterator it = logList.begin(); it != logList.end(); ++it) + for(auto & it : logList) { int iLogYear, iLogMonth, iLogDay; - szFileName = (*it); - QString szTmpName = (*it); + szFileName = it; + QString szTmpName = it; QFileInfo fi(szTmpName); bGzip = false; diff --git a/src/kvirc/ui/KviToolBar.cpp b/src/kvirc/ui/KviToolBar.cpp index 6d9c30a87..3b13f57f0 100644 --- a/src/kvirc/ui/KviToolBar.cpp +++ b/src/kvirc/ui/KviToolBar.cpp @@ -120,9 +120,9 @@ void KviToolBar::mousePressEvent(QMouseEvent * e) QAction * pTmp = nullptr; IconSizes iconSize; - for(uint i = 0; i < VALID_ICONSIZES_NUM; i++) + for(auto & valid_iconsize : valid_iconsizes) { - iconSize = valid_iconsizes[i]; + iconSize = valid_iconsize; pTmp = pIconSizeGroup->addAction(g_pToolBarIconSizesPopup->addAction(__tr2qs(iconSize.pcName))); pTmp->setData((uint)iconSize.uSize); @@ -138,9 +138,9 @@ void KviToolBar::mousePressEvent(QMouseEvent * e) pTmp = nullptr; ButtonStyles buttonStyle; - for(uint i = 0; i < VALID_BUTTONSTYLES_NUM; i++) + for(auto & valid_buttonstyle : valid_buttonstyles) { - buttonStyle = valid_buttonstyles[i]; + buttonStyle = valid_buttonstyle; pTmp = pButtonStyleGroup->addAction(g_pToolBarButtonStylePopup->addAction(__tr2qs(buttonStyle.pcName))); pTmp->setData((uint)buttonStyle.uStyle); diff --git a/src/kvirc/ui/KviTopicWidget.cpp b/src/kvirc/ui/KviTopicWidget.cpp index 56a80cc4f..a7d53c6d8 100644 --- a/src/kvirc/ui/KviTopicWidget.cpp +++ b/src/kvirc/ui/KviTopicWidget.cpp @@ -322,9 +322,9 @@ void KviTopicWidget::setTopic(const QString & topic) m_pLabel->setText(KviHtmlGenerator::convertToHtml(KviQString::toHtmlEscaped(m_szTopic))); bool bFound = false; - for(QStringList::Iterator it = g_pRecentTopicList->begin(); it != g_pRecentTopicList->end(); ++it) + for(auto & it : *g_pRecentTopicList) { - if(*it == m_szTopic) + if(it == m_szTopic) { bFound = true; break; @@ -641,8 +641,8 @@ void KviTopicWidget::historyClicked() m_pCompletionBox->installEventFilter(this); m_pCompletionBox->clear(); - for(QStringList::Iterator it = g_pRecentTopicList->begin(); it != g_pRecentTopicList->end(); ++it) - new KviTopicListBoxItem(m_pCompletionBox, *it); + for(auto & it : *g_pRecentTopicList) + new KviTopicListBoxItem(m_pCompletionBox, it); m_pCompletionBox->resize(m_pInput->width(), 6 * m_pCompletionBox->fontMetrics().height() + 20); QPoint point = m_pInput->mapToGlobal(QPoint(0, 0)); diff --git a/src/kvirc/ui/KviUserListView.cpp b/src/kvirc/ui/KviUserListView.cpp index f5d4e474e..09b339b7a 100644 --- a/src/kvirc/ui/KviUserListView.cpp +++ b/src/kvirc/ui/KviUserListView.cpp @@ -1411,9 +1411,9 @@ void KviUserListView::partAllButOne(const QString & szWhoNot) list.append(it.currentKey()); ++it; } - for(QStringList::Iterator it2 = list.begin(); it2 != list.end(); it2++) + for(auto & it2 : list) { - part(*it2); + part(it2); } } diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp index d43c07f3c..33fa5049e 100644 --- a/src/kvirc/ui/KviWindow.cpp +++ b/src/kvirc/ui/KviWindow.cpp @@ -489,8 +489,8 @@ void KviWindow::setProgress(int iProgress) void KviWindow::listWindowTypes() { outputNoFmt(KVI_OUT_SYSTEMMESSAGE, __tr2qs("List of window types available in this release of KVIrc:")); - for(int i = 0; i < KviWindow::TypeCount; i++) - outputNoFmt(KVI_OUT_SYSTEMMESSAGE, m_typeTable[i]); + for(auto & i : m_typeTable) + outputNoFmt(KVI_OUT_SYSTEMMESSAGE, i); } void KviWindow::getConfigGroupName(QString & szBuffer) diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp index 88a7b0fdd..5ffd5466c 100644 --- a/src/modules/addon/AddonFunctions.cpp +++ b/src/modules/addon/AddonFunctions.cpp @@ -91,9 +91,9 @@ namespace AddonFunctions return notAValidAddonPackage(szError); // make sure the default fields exist - for(int i = 0; i < 6; i++) + for(auto & check_field : check_fields) { - pValue = pInfoFields->find(check_fields[i]); + pValue = pInfoFields->find(check_field); if(!pValue) return notAValidAddonPackage(szError); } @@ -340,10 +340,8 @@ namespace AddonFunctions return false; } - for(QFileInfoList::Iterator it = ls.begin(); it != ls.end(); ++it) + for(auto & inf : ls) { - const QFileInfo & inf = *it; - if(inf.isDir()) { if(!pw.addDirectory(inf.absoluteFilePath(), QString("%1/").arg(inf.fileName()))) diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp index 6b96a0cf0..bc3ce94e2 100644 --- a/src/modules/addon/libkviaddon.cpp +++ b/src/modules/addon/libkviaddon.cpp @@ -730,9 +730,9 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c) KviFileUtils::makeDir(szTargetPath); - for(QStringList::Iterator it = lExpandedEntries.begin(); it != lExpandedEntries.end(); ++it) + for(auto & lExpandedEntrie : lExpandedEntries) { - QFileInfo inf(*it); + QFileInfo inf(lExpandedEntrie); if(!inf.exists()) { qDebug("ERROR: file %s doesn't exist, but it should...", inf.fileName().toUtf8().data()); @@ -743,9 +743,9 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c) g_pApp->getLocalKvircDirectory(szTargetPath, KviApplication::None, szEntry); if(!bQuiet) - c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Installing file '%1' into '%2'", "addon").arg(*it).arg(szTargetPath)); + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Installing file '%1' into '%2'", "addon").arg(lExpandedEntrie).arg(szTargetPath)); - KviFileUtils::copyFile(*it, szTargetPath); + KviFileUtils::copyFile(lExpandedEntrie, szTargetPath); a->addInstalledFile(szEntry); } diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.cpp b/src/modules/channelsjoin/ChannelsJoinDialog.cpp index 6e89eb6c0..6055c8703 100644 --- a/src/modules/channelsjoin/ChannelsJoinDialog.cpp +++ b/src/modules/channelsjoin/ChannelsJoinDialog.cpp @@ -209,10 +209,10 @@ void ChannelsJoinDialog::fillListView() hdr->setText(0, __tr2qs("Current Network")); hdr->setExpanded(true); - for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it) + for(auto & it : *pList) { chld = new QTreeWidgetItem(hdr, RecentChannelItem); - chld->setText(0, *it); + chld->setText(0, it); chld->setIcon(0, *(g_pIconManager->getSmallIcon(KviIconManager::Channel))); } hdr->sortChildren(0, Qt::AscendingOrder); @@ -234,9 +234,8 @@ void ChannelsJoinDialog::fillListView() for(QStringList * pChans = pDict->first(); pChans; pChans = pDict->next()) { - for(QStringList::Iterator it = pChans->begin(); it != pChans->end(); ++it) + for(auto chan : *pChans) { - QString chan = *it; if(hNoDuplicates.contains(chan.toLower())) continue; hNoDuplicates.insert(chan.toLower(), 1); diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index b48f14ce2..2fa80d575 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -1246,11 +1246,11 @@ KVIMODULEEXPORTFUNC void dccModuleCtcpDccParseRoutine(KviDccRequest * dcc) { dcc->szType.toUpper(); - for(int i = 0; i < KVI_NUM_KNOWN_DCC_TYPES; i++) + for(auto & i : dccParseProcTable) { - if(kvi_strEqualCS(dccParseProcTable[i].type, dcc->szType.ptr())) + if(kvi_strEqualCS(i.type, dcc->szType.ptr())) { - (dccParseProcTable[i].proc)(dcc); + (i.proc)(dcc); return; } } diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 0e813837f..bd36697f6 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -592,9 +592,9 @@ void KviKvsCallbackFileDialog::done(int code) KviKvsArray * a = new KviKvsArray(); QStringList sl = selectedFiles(); int idx = 0; - for(QStringList::Iterator it = sl.begin(); it != sl.end(); ++it) + for(auto & it : sl) { - a->set(idx, new KviKvsVariant(*it)); + a->set(idx, new KviKvsVariant(it)); idx++; } params.append(new KviKvsVariant(a)); diff --git a/src/modules/help/HelpIndex.cpp b/src/modules/help/HelpIndex.cpp index bd5d772be..2504d1dc8 100644 --- a/src/modules/help/HelpIndex.cpp +++ b/src/modules/help/HelpIndex.cpp @@ -349,18 +349,18 @@ void HelpIndex::readDocumentList() QStringList HelpIndex::query(const QStringList & terms, const QStringList & termSeq, const QStringList & seqWords) { QList<Term> termList; - for(QStringList::ConstIterator it = terms.begin(); it != terms.end(); ++it) + for(const auto & term : terms) { Entry * e = nullptr; - if((*it).contains(QLatin1Char('*'))) + if(term.contains(QLatin1Char('*'))) { - QVector<Document> wcts = setupDummyTerm(getWildcardTerms(*it)); + QVector<Document> wcts = setupDummyTerm(getWildcardTerms(term)); termList.append(Term(QLatin1String("dummy"), wcts.count(), wcts)); } - else if(dict[*it]) + else if(dict[term]) { - e = dict[*it]; - termList.append(Term(*it, e->documents.count(), e->documents)); + e = dict[term]; + termList.append(Term(term, e->documents.count(), e->documents)); } else { @@ -372,9 +372,9 @@ QStringList HelpIndex::query(const QStringList & terms, const QStringList & term qSort(termList); QVector<Document> minDocs = termList.takeFirst().documents; - for(QList<Term>::Iterator it = termList.begin(); it != termList.end(); ++it) + for(auto & it : termList) { - Term * t = &(*it); + Term * t = ⁢ QVector<Document> docs = t->documents; for(QVector<Document>::Iterator minDoc_it = minDocs.begin(); minDoc_it != minDocs.end();) { @@ -399,15 +399,15 @@ QStringList HelpIndex::query(const QStringList & terms, const QStringList & term qSort(minDocs); if(termSeq.isEmpty()) { - for(QVector<Document>::Iterator it = minDocs.begin(); it != minDocs.end(); ++it) - results << docList.at((int)(*it).docNumber); + for(auto & minDoc : minDocs) + results << docList.at((int)minDoc.docNumber); return results; } QString fileName; - for(QVector<Document>::Iterator it = minDocs.begin(); it != minDocs.end(); ++it) + for(auto & minDoc : minDocs) { - fileName = docList[(int)(*it).docNumber]; + fileName = docList[(int)minDoc.docNumber]; if(searchForPattern(termSeq, seqWords, fileName)) results << fileName; } @@ -531,13 +531,13 @@ QStringList HelpIndex::split(const QString & str) QVector<Document> HelpIndex::setupDummyTerm(const QStringList & terms) { QList<Term> termList; - for(QStringList::ConstIterator it = terms.begin(); it != terms.end(); ++it) + for(const auto & term : terms) { Entry * e = nullptr; - if(dict[*it]) + if(dict[term]) { - e = dict[*it]; - termList.append(Term(*it, e->documents.count(), e->documents)); + e = dict[term]; + termList.append(Term(term, e->documents.count(), e->documents)); } } QVector<Document> maxList(0); @@ -546,14 +546,14 @@ QVector<Document> HelpIndex::setupDummyTerm(const QStringList & terms) qSort(termList); maxList = termList.takeLast().documents; - for(QList<Term>::Iterator it = termList.begin(); it != termList.end(); ++it) + for(auto & it : termList) { - Term * t = &(*it); + Term * t = ⁢ QVector<Document> docs = t->documents; - for(QVector<Document>::iterator docIt = docs.begin(); docIt != docs.end(); ++docIt) + for(auto & doc : docs) { - if(maxList.indexOf(*docIt) == -1) - maxList.append(*docIt); + if(maxList.indexOf(doc) == -1) + maxList.append(doc); } } return maxList; diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp index 541ca1ca8..0f1803eca 100644 --- a/src/modules/help/HelpWindow.cpp +++ b/src/modules/help/HelpWindow.cpp @@ -249,9 +249,9 @@ void HelpWindow::startSearch() m_terms.clear(); bool isPhrase = false; QString s = ""; - for(int i = 0; i < (int)buf.length(); ++i) + for(const auto & i : buf) { - if(buf[i] == '\"') + if(i == '\"') { isPhrase = !isPhrase; s = s.simplified(); @@ -259,7 +259,7 @@ void HelpWindow::startSearch() m_terms << s; s = ""; } - else if(buf[i] == ' ' && !isPhrase) + else if(i == ' ' && !isPhrase) { s = s.simplified(); if(!s.isEmpty()) @@ -267,7 +267,7 @@ void HelpWindow::startSearch() s = ""; } else - s += buf[i]; + s += i; } if(!s.isEmpty()) m_terms << s; diff --git a/src/modules/http/HttpFileTransfer.cpp b/src/modules/http/HttpFileTransfer.cpp index 09b666b97..33ccd583e 100644 --- a/src/modules/http/HttpFileTransfer.cpp +++ b/src/modules/http/HttpFileTransfer.cpp @@ -396,10 +396,10 @@ void HttpFileTransfer::requestSent(const QStringList & requestHeaders) if(!m_bNoOutput) out->output(KVI_OUT_GENERICSTATUS, __tr2qs_ctx("[HTTP %d]: Request data sent:", "http"), id()); - for(QStringList::ConstIterator it = requestHeaders.begin(); it != requestHeaders.end(); ++it) + for(const auto & requestHeader : requestHeaders) { if(!m_bNoOutput) - out->output(KVI_OUT_GENERICSTATUS, "[HTTP %d]: %s", id(), (*it).toUtf8().data()); + out->output(KVI_OUT_GENERICSTATUS, "[HTTP %d]: %s", id(), requestHeader.toUtf8().data()); } m_lRequest = requestHeaders; diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp index 287c2c513..68d02d51f 100644 --- a/src/modules/logview/LogViewWindow.cpp +++ b/src/modules/logview/LogViewWindow.cpp @@ -425,16 +425,16 @@ void LogViewWindow::itemSelected(QTreeWidgetItem * it, QTreeWidgetItem *) QStringList lines = szText.split('\n'); bool bOk; int iMsgType; - for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it) + for(auto & line : lines) { - QString szNum = (*it).section(' ', 0, 0); + QString szNum = line.section(' ', 0, 0); iMsgType = szNum.toInt(&bOk); if(iMsgType < 0 || iMsgType > (KVI_NUM_MSGTYPE_OPTIONS - 1)) iMsgType = 0; if(bOk) - outputNoFmt(iMsgType, (*it).section(' ', 1), KviIrcView::NoRepaint | KviIrcView::NoTimestamp); + outputNoFmt(iMsgType, line.section(' ', 1), KviIrcView::NoRepaint | KviIrcView::NoTimestamp); else - outputNoFmt(0, *it, KviIrcView::NoRepaint | KviIrcView::NoTimestamp); + outputNoFmt(0, line, KviIrcView::NoRepaint | KviIrcView::NoTimestamp); } m_pIrcView->repaint(); } @@ -633,9 +633,9 @@ void LogViewWindow::createLog(LogFile * pLog, int iId, QString * pszFile) szLog += ".txt"; // Scan the file - for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it) + for(auto & line : lines) { - szTmp = (*it); + szTmp = line; szLine = KviControlCodes::stripControlBytes(szTmp); // Remove icons' code @@ -710,9 +710,9 @@ void LogViewWindow::createLog(LogFile * pLog, int iId, QString * pszFile) szOutputBuffer += "<h2>" + szTitle + "</h2>\n<h3>Date: " + szDate + "</h3>\n"; // Scan the file - for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it) + for(auto & line : lines) { - szTmp = (*it); + szTmp = line; // Find who has talked QString szTmpNick = szTmp.section(" ", 2, 2); diff --git a/src/modules/objects/KvsObject_colorDialog.cpp b/src/modules/objects/KvsObject_colorDialog.cpp index a13f29c20..43dcc3918 100644 --- a/src/modules/objects/KvsObject_colorDialog.cpp +++ b/src/modules/objects/KvsObject_colorDialog.cpp @@ -170,12 +170,12 @@ KVSO_CLASS_FUNCTION(colorDialog, setOptions) if(!widget()) return true; int colorDialogOption, sum = 0; - for(QStringList::Iterator it = szOptions.begin(); it != szOptions.end(); ++it) + for(auto & szOption : szOptions) { colorDialogOption = 0; for(unsigned int j = 0; j < option_num; j++) { - if(KviQString::equalCI((*it), option_tbl[j])) + if(KviQString::equalCI(szOption, option_tbl[j])) { colorDialogOption = option_cod[j]; break; @@ -184,7 +184,7 @@ KVSO_CLASS_FUNCTION(colorDialog, setOptions) if(colorDialogOption) sum = sum | colorDialogOption; else - c->warning(__tr2qs_ctx("Unknown szOptions '%Q'", "objects"), &(*it)); + c->warning(__tr2qs_ctx("Unknown szOptions '%Q'", "objects"), &szOption); } ((QColorDialog *)widget())->setOptions(QColorDialog::ColorDialogOptions(sum)); return true; diff --git a/src/modules/objects/KvsObject_hBox.cpp b/src/modules/objects/KvsObject_hBox.cpp index 7ee0e4f59..de7325f34 100644 --- a/src/modules/objects/KvsObject_hBox.cpp +++ b/src/modules/objects/KvsObject_hBox.cpp @@ -176,13 +176,13 @@ KVSO_CLASS_FUNCTION(hBox, setAlignment) return true; } int align, sum = 0; - for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it) + for(auto & it : alignment) { align = 0; for(unsigned int j = 0; j < align_num; j++) { - if(KviQString::equalCI((*it), align_tbl[j])) + if(KviQString::equalCI(it, align_tbl[j])) { align = align_cod[j]; break; @@ -191,7 +191,7 @@ KVSO_CLASS_FUNCTION(hBox, setAlignment) if(align) sum = sum | align; else - c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it)); + c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it); } ((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())), (Qt::Alignment)sum); return true; diff --git a/src/modules/objects/KvsObject_label.cpp b/src/modules/objects/KvsObject_label.cpp index 3c3baff78..6d9ebf848 100644 --- a/src/modules/objects/KvsObject_label.cpp +++ b/src/modules/objects/KvsObject_label.cpp @@ -245,13 +245,13 @@ KVSO_CLASS_FUNCTION(label, setAlignment) KVSO_PARAMETER("alignment", KVS_PT_STRINGLIST, KVS_PF_OPTIONAL, alignment) KVSO_PARAMETERS_END(c) int align, sum = 0; - for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it) + for(auto & it : alignment) { align = 0; for(unsigned int j = 0; j < align_num; j++) { - if(KviQString::equalCI((*it), align_tbl[j])) + if(KviQString::equalCI(it, align_tbl[j])) { align = align_cod[j]; break; @@ -260,7 +260,7 @@ KVSO_CLASS_FUNCTION(label, setAlignment) if(align) sum = sum | align; else - c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it)); + c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it); } ((QLabel *)widget())->setAlignment((Qt::Alignment)sum); return true; @@ -300,12 +300,12 @@ KVSO_CLASS_FUNCTION(label, setFrameStyle) if(!widget()) return true; int framestyle, sum = 0; - for(QStringList::Iterator it = style.begin(); it != style.end(); ++it) + for(auto & it : style) { framestyle = 0; for(unsigned int j = 0; j < align_num; j++) { - if(KviQString::equalCI((*it), frame_tbl[j])) + if(KviQString::equalCI(it, frame_tbl[j])) { framestyle = frame_cod[j]; break; @@ -314,7 +314,7 @@ KVSO_CLASS_FUNCTION(label, setFrameStyle) if(framestyle) sum = sum | framestyle; else - c->warning(__tr2qs_ctx("Unknown style '%Q'", "objects"), &(*it)); + c->warning(__tr2qs_ctx("Unknown style '%Q'", "objects"), &it); } ((QLabel *)widget())->setFrameStyle(sum); return true; diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp index bcc61fd1c..bc16dc8a7 100644 --- a/src/modules/objects/KvsObject_painter.cpp +++ b/src/modules/objects/KvsObject_painter.cpp @@ -1323,12 +1323,12 @@ KVSO_CLASS_FUNCTION(painter, drawText) int align, sum = 0; if(szAlignList.count()) { - for(QStringList::Iterator it = szAlignList.begin(); it != szAlignList.end(); ++it) + for(auto & it : szAlignList) { align = 0; for(unsigned int j = 0; j < align_num; j++) { - if(KviQString::equalCI((*it), align_tbl[j])) + if(KviQString::equalCI(it, align_tbl[j])) { align = align_cod[j]; break; @@ -1337,7 +1337,7 @@ KVSO_CLASS_FUNCTION(painter, drawText) if(align) sum = sum | align; else - c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &(*it)); + c->warning(__tr2qs_ctx("Unknown alignment '%Q'", "objects"), &it); } } QRect rect; diff --git a/src/modules/objects/KvsObject_vBox.cpp b/src/modules/objects/KvsObject_vBox.cpp index a8a17d282..76f750fc1 100644 --- a/src/modules/objects/KvsObject_vBox.cpp +++ b/src/modules/objects/KvsObject_vBox.cpp @@ -192,13 +192,13 @@ KVSO_CLASS_FUNCTION(vBox, setAlignment) } int align, sum = 0; - for(QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it) + for(auto & it : alignment) { align = 0; for(unsigned int j = 0; j < align_num; j++) { - if(KviQString::equalCI((*it), align_tbl[j])) + if(KviQString::equalCI(it, align_tbl[j])) { align = align_cod[j]; break; @@ -207,7 +207,7 @@ KVSO_CLASS_FUNCTION(vBox, setAlignment) if(align) sum = sum | align; else - c->warning(__tr2qs_ctx("Unknown alignment: '%Q'", "objects"), &(*it)); + c->warning(__tr2qs_ctx("Unknown alignment: '%Q'", "objects"), &it); } if(widget()) ((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())), (Qt::Alignment)sum); diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp index 7abc10e6e..89d07f0fe 100644 --- a/src/modules/objects/KvsObject_webView.cpp +++ b/src/modules/objects/KvsObject_webView.cpp @@ -821,12 +821,12 @@ KVSO_CLASS_FUNCTION(webView, findText) KVSO_PARAMETERS_END(c) int findflag = 0; int sum = 0; - for(QStringList::Iterator it = szFindFlag.begin(); it != szFindFlag.end(); ++it) + for(auto & it : szFindFlag) { findflag = 0; for(unsigned int j = 0; j < findflag_num; j++) { - if(KviQString::equalCI((*it), findflag_tbl[j])) + if(KviQString::equalCI(it, findflag_tbl[j])) { findflag = findflag_cod[j]; break; @@ -835,7 +835,7 @@ KVSO_CLASS_FUNCTION(webView, findText) if(findflag) sum = sum | findflag; else - c->warning(__tr2qs_ctx("Unknown findflag '%Q'", "objects"), &(*it)); + c->warning(__tr2qs_ctx("Unknown findflag '%Q'", "objects"), &it); } ((QWebView *)widget())->findText(szName, (QWebPage::FindFlags)findflag); return true; diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 99c348974..8d741cf65 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -518,9 +518,8 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c) QDir d(szPath); QStringList sl; sl = d.entryList(QDir::Files); - for(QStringList::Iterator it2 = sl.begin(); it2 != sl.end(); ++it2) + for(auto szName : sl) { - QString szName = *it2; szName.replace("--", "::"); if(szName != ".." && szName != ".") classdict->insert(szName.left(szName.length() - 4), &bFake); diff --git a/src/modules/objects/qthttp/qhttpauthenticator.cpp b/src/modules/objects/qthttp/qhttpauthenticator.cpp index 9cb7b8d6a..c6063c6c4 100644 --- a/src/modules/objects/qthttp/qhttpauthenticator.cpp +++ b/src/modules/objects/qthttp/qhttpauthenticator.cpp @@ -388,9 +388,8 @@ void QHttpAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray, */ QByteArray headerVal; - for(int i = 0; i < values.size(); ++i) + for(const auto & current : values) { - const QPair<QByteArray, QByteArray> & current = values.at(i); if(current.first.toLower() != search) continue; QByteArray str = current.second.toLower(); diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp index 50e2289d3..dd33758d8 100644 --- a/src/modules/options/OptionsWidget_textEncoding.cpp +++ b/src/modules/options/OptionsWidget_textEncoding.cpp @@ -117,9 +117,8 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent) i = 0; int iMatch = 0; - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) + for(auto szTmp : list) { - QString szTmp = *it; szTmp.replace("kvirc_", ""); szTmp.replace(".mo", ""); m_pForcedLocaleCombo->insertItem(m_pForcedLocaleCombo->count(), szTmp); diff --git a/src/modules/perl/libkviperl.cpp b/src/modules/perl/libkviperl.cpp index c4016abdd..2284e7214 100644 --- a/src/modules/perl/libkviperl.cpp +++ b/src/modules/perl/libkviperl.cpp @@ -457,8 +457,8 @@ static bool perl_kvs_cmd_begin(KviKvsModuleCommandCall * c) if(!ex.lWarnings.isEmpty()) { - for(QStringList::Iterator it = ex.lWarnings.begin(); it != ex.lWarnings.end(); ++it) - c->warning(*it); + for(auto & lWarning : ex.lWarnings) + c->warning(lWarning); } if(!ex.bExitOk) diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp index d0680d110..3f96bacc5 100644 --- a/src/modules/perlcore/libkviperlcore.cpp +++ b/src/modules/perlcore/libkviperlcore.cpp @@ -268,9 +268,8 @@ bool KviPerlInterpreter::execute( // set the args in the _ arry av_unshift(pArgs, (I32)args.count()); int idx = 0; - for(QStringList::Iterator it = args.begin(); it != args.end(); ++it) + for(auto tmp : args) { - QString tmp = *it; const char * val = tmp.toUtf8().data(); if(val) { diff --git a/src/modules/rijndael/Rijndael.cpp b/src/modules/rijndael/Rijndael.cpp index e708f6a91..b8b0fc6d9 100644 --- a/src/modules/rijndael/Rijndael.cpp +++ b/src/modules/rijndael/Rijndael.cpp @@ -989,9 +989,9 @@ void Rijndael::updateInitVector(UINT8 * initVector) else { // zero init vector - for(int i = 0; i < MAX_IV_SIZE; i++) + for(unsigned char & i : m_initVector) { - m_initVector[i] = 0; + i = 0; } } } diff --git a/src/modules/rijndael/UglyBase64.cpp b/src/modules/rijndael/UglyBase64.cpp index ec1248222..8c075d6e3 100644 --- a/src/modules/rijndael/UglyBase64.cpp +++ b/src/modules/rijndael/UglyBase64.cpp @@ -53,8 +53,8 @@ namespace UglyBase64 if(!didinit) { // initialize base64unmap - for(int i = 0; i < 255; ++i) - base64unmap[i] = 0; + for(char & i : base64unmap) + i = 0; for(int i = 0; i < 64; ++i) base64unmap[fake_base64[i]] = i; didinit = true; diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index 9404b5a26..44258827d 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -514,9 +514,9 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall * c) QList<QVariant> ds; - for(QStringList::Iterator it = parms.begin(); it != parms.end(); ++it) + for(auto & parm : parms) { - KviCString tmp = *it; + KviCString tmp = parm; if(tmp.isEmpty()) { @@ -605,9 +605,9 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall * c) QStringList csl(v.toStringList()); KviKvsArray * arry = new KviKvsArray(); int idx = 0; - for(QStringList::Iterator iter = csl.begin(); iter != csl.end(); ++iter) + for(auto & iter : csl) { - arry->set(idx, new KviKvsVariant(*iter)); + arry->set(idx, new KviKvsVariant(iter)); idx++; } c->returnValue()->setArray(arry); diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp index 90e5a3bdc..0f9b92de4 100644 --- a/src/modules/theme/ThemeFunctions.cpp +++ b/src/modules/theme/ThemeFunctions.cpp @@ -91,9 +91,9 @@ namespace ThemeFunctions return notAValidThemePackage(szError); // make sure the default fields exist - for(int i = 0; i < 6; i++) + for(auto & check_field : check_fields) { - pValue = pInfoFields->find(check_fields[i]); + pValue = pInfoFields->find(check_field); if(!pValue) return notAValidThemePackage(szError); } diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index 80b683e69..1fb53202a 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -469,8 +469,8 @@ void ConfigDialog::closeEvent(QCloseEvent *) ConfigDialog::~ConfigDialog() { - for(int i = 0; i < cbnum; i++) - delete cb[i]; + for(auto & i : cb) + delete i; g_pConfigDialog = nullptr; } |