From 5c80922489a68a6ab0786de1cc972291deabe1e0 Mon Sep 17 00:00:00 2001
From: IceN9ne
Date: Tue, 22 May 2018 08:37:08 -0400
Subject: Remove usages of Q_FOREACH. Fixes #2385

---
 src/modules/objects/KvsObject_wrapper.cpp | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'src/modules/objects')

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;
-- 
cgit v1.3.1-10-gc9f91