Apply clang-tidy: modernize-loop-convert

25 files changed, 89 insertions, 96 deletions

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 = &it;
 		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 = &it;
 		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;
 }