Remove usages of Q_FOREACH. Fixes #2385

4 files changed, 9 insertions, 15 deletions

diff --git a/src/modules/objects/KvsObject_wrapper.cpp b/src/modules/objects/KvsObject_wrapper.cpp
index 1131aa4c2..2c7763a1b 100644
--- a/src/modules/objects/KvsObject_wrapper.cpp
+++ b/src/modules/objects/KvsObject_wrapper.cpp
@@ -285,19 +285,16 @@ QWidget * KvsObject_wrapper::findTopLevelWidgetToWrap(const QString & szClass, c
 	if(list.isEmpty())
 		return nullptr;
 
-	Q_FOREACH(QWidget * w, list)
+	for(QWidget * w : list)
 	{
-		//qDebug("TLW: %s::%s (look for %s::%s)",w->metaObject()->className(),w->objectName().toUtf8().data(),szClass.toUtf8().data(),szName.toUtf8().data());
-		if(
-		    (
-		        szClass.isEmpty() || KviQString::equalCI(w->metaObject()->className(), szClass))
+		if((szClass.isEmpty() || KviQString::equalCI(w->metaObject()->className(), szClass))
 		    && (szName.isEmpty() || KviQString::equalCI(w->objectName(), szName)))
 			return w;
 	}
 
 	if(bRecursive)
 	{
-		Q_FOREACH(QWidget * w, list)
+		for(QWidget * w : list)
 		{
 			w = findWidgetToWrap(szClass, szName, w, bRecursive);
 			if(w)
@@ -314,22 +311,20 @@ QWidget * KvsObject_wrapper::findWidgetToWrap(const QString & szClass, const QSt
 	if(list.isEmpty())
 		return nullptr;
 
-	Q_FOREACH(QObject * obj, list)
+	for(QObject * obj : list)
 	{
 		if(!obj->isWidgetType())
 			continue;
 
 		QWidget * w = (QWidget *)obj;
-		if(
-		    (
-		        szClass.isEmpty() || KviQString::equalCI(w->metaObject()->className(), szClass))
+		if((szClass.isEmpty() || KviQString::equalCI(w->metaObject()->className(), szClass))
 		    && (szName.isEmpty() || KviQString::equalCI(w->objectName(), szName)))
 			return w;
 	}
 
 	if(bRecursive)
 	{
-		Q_FOREACH(QObject * obj, list)
+		for(QObject * obj : list)
 		{
 			if(!obj->isWidgetType())
 				continue;
diff --git a/src/modules/package/libkvipackage.cpp b/src/modules/package/libkvipackage.cpp
index 678df3230..1ba20c593 100644
--- a/src/modules/package/libkvipackage.cpp
+++ b/src/modules/package/libkvipackage.cpp
@@ -154,7 +154,7 @@ static bool package_kvs_fnc_info(KviKvsModuleFunctionCall * c)
 
 	QStringList sl = KviFileUtils::getFileListing(szUnpackPath);
 
-	Q_FOREACH(QString fn, sl)
+	for(const auto & fn : sl)
 		pFilesArray->append(new KviKvsVariant(fn));
 
 	// delete the random tmp dir
diff --git a/src/modules/spellchecker/libkvispellchecker.cpp b/src/modules/spellchecker/libkvispellchecker.cpp
index b02561bca..abb6a52f2 100644
--- a/src/modules/spellchecker/libkvispellchecker.cpp
+++ b/src/modules/spellchecker/libkvispellchecker.cpp
@@ -142,8 +142,7 @@ static bool spellchecker_kvs_suggestions(KviKvsModuleFunctionCall * c)
 
 	KviKvsArray * pArray = new KviKvsArray();
 
-	QList<QString> lSuggestions = hAllSuggestions.keys();
-	Q_FOREACH(QString szSuggestion, lSuggestions)
+	for(const auto & szSuggestion : hAllSuggestions.keys())
 		pArray->append(new KviKvsVariant(szSuggestion));
 
 	c->returnValue()->setArray(pArray);
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index c2ea476f0..4f500a4e6 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -322,7 +322,7 @@ static bool theme_kvs_cmd_pack(KviKvsModuleCommandCall * c)
 	KviPointerList<KviThemeInfo> lThemeInfoList;
 	lThemeInfoList.setAutoDelete(true);
 
-	Q_FOREACH(QString szTheme, lThemeList)
+	for(const auto & szTheme : lThemeList)
 	{
 		KviThemeInfo * pInfo = new KviThemeInfo();
 		if(!pInfo->load(szTheme, KviThemeInfo::External))