Remove usages of Q_FOREACH. Fixes #2385

diff --git a/src/kvilib/file/KviFileUtils.cpp b/src/kvilib/file/KviFileUtils.cpp
index d7ecb4dd3be2d30b61817557b81df25dd5827b24..283bdc5016c9597a571c50befd09dc6b0a4a2a7a 100644 (file)
--- a/src/kvilib/file/KviFileUtils.cpp
+++ b/src/kvilib/file/KviFileUtils.cpp
@@ -200,7 +200,7 @@ namespace KviFileUtils
 
                QFileInfoList lFileInfo = d.entryInfoList(QDir::Files | QDir::Dirs | QDir::Hidden | QDir::System | QDir::NoDotAndDotDot);
 
-               foreach(QFileInfo inf, lFileInfo)
+               for(const auto & inf : lFileInfo)
                {
                        // just to be sure check that we're not deleting ..
                        if(KviQString::equalCS(inf.fileName(), "..") || KviQString::equalCS(inf.fileName(), "."))
@@ -448,7 +448,7 @@ namespace KviFileUtils
 
                QFileInfoList fl = d.entryInfoList(QStringList(), QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot, QDir::Name);
 
-               Q_FOREACH(QFileInfo inf, fl)
+               for(const auto & inf : fl)
                {
                        QString szName = szPrefix.isEmpty() ? inf.fileName() : QString("%1" KVI_PATH_SEPARATOR "%2").arg(szPrefix).arg(inf.fileName());
                        if(inf.isDir())

diff --git a/src/kvirc/kvs/KviKvsAliasManager.cpp b/src/kvirc/kvs/KviKvsAliasManager.cpp
index 87f9c60f423bd06acbf48744ece1bb531005c2e8..ed53b4605cf74177ee294f83a2277575017a01a8 100644 (file)
--- a/src/kvirc/kvs/KviKvsAliasManager.cpp
+++ b/src/kvirc/kvs/KviKvsAliasManager.cpp
@@ -74,7 +74,7 @@ bool KviKvsAliasManager::removeNamespace(const QString & szName)
        if(lKill.isEmpty())
                return false;
 
-       Q_FOREACH(QString szKill, lKill)
+       for(auto & szKill : lKill)
                remove(szKill);
 
        return true;

diff --git a/src/modules/objects/KvsObject_wrapper.cpp b/src/modules/objects/KvsObject_wrapper.cpp
index 1131aa4c29bdf84729946f7441041c75c7f8e6da..2c7763a1bcaeb549861dcd05734e76c207ed04b5 100644 (file)
--- 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 678df3230cc244ecbd83b048d4756e5986e42e9f..1ba20c593517fac6b4c3b492525f85a6bd06ddc8 100644 (file)
--- 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 b02561bca06251f364e408d252ff93a993c01811..abb6a52f2c1ca695f59fc425c694be9606803aa7 100644 (file)
--- 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 c2ea476f021e954d5fe745cc57bbfdfee172971f..4f500a4e630ebdd62ff71e673ff8413f72fa1529 100644 (file)
--- 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))