chore: Prefer c++11 range for to Qt macros

As of Qt 5.7, `foreach` and `Q_FOREACH` macros are deprecated, and
C++11 range-based for loops are preferred.

Co-authored-by: Jean-Christophe Fillion-Robin <[email protected]>

Author: 2 people

examples/PyLauncher/main.cpp

@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
   }
   PythonQtScriptingConsole console(NULL, mainContext);
 
-  Q_FOREACH(QString file, files) {
+  for (QString file : files) {
     mainContext.evalFile(file);
   }
   if (showConsole || console.hadError()) {

generator/abstractmetalang.cpp

@@ -437,7 +437,7 @@ class AbstractMetaFunction : public AbstractMetaAttributes
     // true if one or more of the arguments are of QtJambiObject subclasses
     bool argumentsHaveNativeId() const
     {
-        foreach (const AbstractMetaArgument *arg, m_arguments) {
+        for (const AbstractMetaArgument* arg : m_arguments) {
             if (arg->type()->hasNativeId())
                 return true;
         }

generator/abstractmetalang.h

@@ -63,7 +63,7 @@ void Generator::generate()
 
     m_classes.sort();
 
-    foreach (AbstractMetaClass *cls, m_classes) {
+    for (AbstractMetaClass* cls : m_classes) {
         if (!shouldGenerate(cls))
             continue;
 
@@ -87,7 +87,7 @@ void Generator::printClasses()
     AbstractMetaClassList classes = m_classes;
     classes.sort();
 
-    foreach (AbstractMetaClass *cls, classes) {
+    for (AbstractMetaClass* cls : classes) {
         if (!shouldGenerate(cls))
             continue;
         write(s, cls);
@@ -127,10 +127,10 @@ bool Generator::hasDefaultConstructor(const AbstractMetaType *type)
     QString full_name = type->typeEntry()->qualifiedTargetLangName();
     QString class_name = type->typeEntry()->targetLangName();
 
-    foreach (const AbstractMetaClass *java_class, m_classes) {
+    for (const AbstractMetaClass* java_class : m_classes) {
         if (java_class->typeEntry()->qualifiedTargetLangName() == full_name) {
             AbstractMetaFunctionList functions = java_class->functions();
-            foreach (const AbstractMetaFunction *function, functions) {
+            for (const AbstractMetaFunction* function : functions) {
                 if (function->arguments().size() == 0 && function->name() == class_name)
                     return true;
             }

generator/generator.cpp

@@ -331,7 +331,7 @@ void Binder::declare_symbol(SimpleDeclarationAST *node, InitDeclaratorAST *init_
       fun->setVariadics (decl_cc.isVariadics ());
 
       // ... and the signature
-      foreach (DeclaratorCompiler::Parameter p, decl_cc.parameters())
+      for (DeclaratorCompiler::Parameter p : decl_cc.parameters())
         {
           ArgumentModelItem arg = model()->create<ArgumentModelItem>();
           arg->setType(qualifyType(p.type, _M_context));
@@ -361,8 +361,9 @@ void Binder::declare_symbol(SimpleDeclarationAST *node, InitDeclaratorAST *init_
         {
           typeInfo.setFunctionPointer (true);
           decl_cc.run (init_declarator->declarator);
-          foreach (DeclaratorCompiler::Parameter p, decl_cc.parameters())
+          for (DeclaratorCompiler::Parameter p : decl_cc.parameters()) {
             typeInfo.addArgument(p.type);
+          }
         }
 
       var->setType(qualifyType(typeInfo, _M_context));
@@ -426,7 +427,7 @@ void Binder::visitFunctionDefinition(FunctionDefinitionAST *node)
     }
 
   decl_cc.run(declarator);
-  foreach (DeclaratorCompiler::Parameter p, decl_cc.parameters()) {
+  for (DeclaratorCompiler::Parameter p : decl_cc.parameters()) {
     if (p.type.isRvalueReference()) {
       //warnHere();
       //std::cerr << "** Skipping function with rvalue reference parameter: "
@@ -481,7 +482,7 @@ void Binder::visitFunctionDefinition(FunctionDefinitionAST *node)
   }
   _M_current_function->setVariadics (decl_cc.isVariadics ());
 
-  foreach (DeclaratorCompiler::Parameter p, decl_cc.parameters())
+  for (DeclaratorCompiler::Parameter p : decl_cc.parameters())
     {
       ArgumentModelItem arg = model()->create<ArgumentModelItem>();
 
@@ -650,8 +651,9 @@ void Binder::visitTypedef(TypedefAST *node)
         {
           typeInfo.setFunctionPointer (true);
           decl_cc.run (init_declarator->declarator);
-          foreach (DeclaratorCompiler::Parameter p, decl_cc.parameters())
+          for (DeclaratorCompiler::Parameter p : decl_cc.parameters()) {
             typeInfo.addArgument(p.type);
+          }
         }
 
       ScopeModelItem scope = currentScope();
@@ -1029,7 +1031,7 @@ TypeInfo Binder::qualifyType(const TypeInfo &type, const QStringList &context) c
 
           if (ClassModelItem klass = scope.dynamicCast<_ClassModelItem> ())
             {
-              foreach (QString base, klass->baseClasses ())
+              for (QString base : klass->baseClasses())
                 {
                   QStringList ctx = context;
                   ctx.removeLast();

generator/parser/binder.cpp

@@ -212,7 +212,7 @@ QString TypeInfo::toString(bool parsable) const
       tmp += QLatin1String(")");
     }
 
-  foreach (QString elt, arrayElements ())
+  for (QString elt : this->arrayElements())
     {
       tmp += QLatin1String ("[");
       tmp += elt;
@@ -400,7 +400,7 @@ FunctionModelItem _ScopeModelItem::declaredFunction(FunctionModelItem item)
 {
   FunctionList function_list = findFunctions(item->name());
 
-  foreach (FunctionModelItem fun, function_list)
+  for (FunctionModelItem fun : function_list)
     {
       if (fun->isSimilar(item))
         return fun;

generator/parser/codemodel.cpp

@@ -145,7 +145,7 @@ void PriGenerator::generate()
         }
 
         file.stream << "HEADERS += \\\n";
-        foreach (const QString &entry, list) {
+        for (const QString& entry : list) {
           file.stream << "           $$PWD/" << entry << " \\\n";
         }
 
@@ -156,7 +156,7 @@ void PriGenerator::generate()
         if (compact) {
           list = compactFiles(list, ".cpp", m_out_dir + "/generated_cpp/" + folder, folder); 
         }
-        foreach (const QString &entry, list) {
+        for (const QString& entry : list) {
             file.stream << "           $$PWD/" << entry << " \\\n";
         }
         file.stream << "           $$PWD/" << folder << "_init.cpp\n";

generator/prigenerator.cpp

@@ -56,7 +56,7 @@ static QStringList getOperatorCodes(const AbstractMetaClass* cls) {
   QSet<QString> operatorCodes;
   AbstractMetaFunctionList returned;
   AbstractMetaFunctionList functions = cls->functions();
-  foreach (AbstractMetaFunction *function, functions) {
+  for (AbstractMetaFunction* function : functions) {
     if (function->originalName().startsWith("operator")) {
       QString op = function->originalName().mid(8);
       operatorCodes.insert(op);
@@ -182,7 +182,7 @@ static void addListRegistration(AbstractMetaType::shared_pointer type, QSet<QStr
 
     /*
     QString debugStr;
-    Q_FOREACH(AbstractMetaType* arg, args) {
+    for (AbstractMetaType* arg : args) {
       debugStr += QString(arg->typeEntry()->isEnum()?"ENUM ":"") + arg->typeEntry()->qualifiedCppName() + ",";
       if (arg->typeEntry()->qualifiedCppName() == "QPair") {
         debugStr += "(" + arg->instantiations().at(0)->typeEntry()->qualifiedCppName() + ",";
@@ -238,7 +238,7 @@ void SetupGenerator::generate()
     while (pack.hasNext()) {
       pack.next();
       QList<const AbstractMetaClass*> list = pack.value();
-      foreach (const AbstractMetaClass *cls, list) {
+      for (const AbstractMetaClass* cls : list) {
         if (cls->typeEntry()->isPolymorphicBase()) {
           classes_with_polymorphic_id.append((AbstractMetaClass*)cls);
         }
@@ -325,7 +325,7 @@ void SetupGenerator::generate()
       // declare individual class creation functions
       s << "void PythonQt_init_" << initName << "(PyObject* module) {" << endl;
 
-      foreach (const AbstractMetaClass *cls, list) {
+      for (const AbstractMetaClass* cls : list) {
         if (cls->qualifiedCppName().contains("Ssl")) {
           s << "#ifndef QT_NO_SSL"  << endl;
         }
@@ -376,7 +376,7 @@ void SetupGenerator::generate()
         }
       }
       s << endl;
-      foreach (QString handler, polymorphicHandlers) {
+      for (QString handler : polymorphicHandlers) {
         s << "PythonQt::self()->addPolymorphicHandler(\""<< handler << "\", polymorphichandler_" << handler << ");" << endl;
       }
       s << endl;
@@ -407,14 +407,14 @@ QStringList SetupGenerator::writePolymorphicHandler(QTextStream &s, const QStrin
                                                     const AbstractMetaClassList &polybase, QList<const AbstractMetaClass*>& allClasses)
 {
   QStringList handlers;
-  foreach (AbstractMetaClass *cls, polybase) {
+  for (AbstractMetaClass* cls : polybase) {
     const ComplexTypeEntry *centry = cls->typeEntry();
     if (!centry->isPolymorphicBase())
       continue;
     bool isGraphicsItem = (cls->qualifiedCppName()=="QGraphicsItem");
 
     bool first = true;
-    foreach (const AbstractMetaClass *clazz, allClasses) {
+    for (const AbstractMetaClass* clazz : allClasses) {
       bool inherits = false;
       if (isGraphicsItem) {
         const AbstractMetaClass *currentClazz = clazz;

generator/setupgenerator.cpp

@@ -88,7 +88,7 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
 
   IncludeList list = meta_class->typeEntry()->extraIncludes();
   std::sort(list.begin(), list.end());
-  foreach (const Include &inc, list) {
+  for (const Include& inc : list) {
     ShellGenerator::writeInclude(s, inc);
   }  
   s << endl;
@@ -122,7 +122,7 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
     s << "}" << endl;
 
     AbstractMetaFunctionList virtualsForShell = getVirtualFunctionsForShell(meta_class);
-    foreach (const AbstractMetaFunction *fun, virtualsForShell) {
+    for (const AbstractMetaFunction* fun : virtualsForShell) {
       bool hasReturnValue = !fun->type().isNull();
       writeFunctionSignature(s, fun, meta_class, QString(),
         Option(ShowStatic | UnderscoreSpaces | UseIndexedName),
@@ -234,7 +234,7 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
   if (meta_class->generateShellClass() || !meta_class->isAbstract()) {
 
     // write constructors
-    foreach (const AbstractMetaFunction *ctor, ctors) {
+    for (const AbstractMetaFunction* ctor : ctors) {
       if (ctor->isAbstract() || (!meta_class->generateShellClass() && !ctor->isPublic())) { continue; }
 
       s << meta_class->qualifiedCppName() << "* ";
@@ -382,7 +382,7 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
 void ShellImplGenerator::writeInjectedCode(QTextStream &s, const AbstractMetaClass *meta_class)
 {
   CodeSnipList code_snips = meta_class->typeEntry()->codeSnips();
-  foreach (const CodeSnip &cs, code_snips) {
+  for (const CodeSnip& cs : code_snips) {
     if (cs.language == TypeSystem::PyWrapperCode) {
       s << cs.code() << endl;
     }

generator/shellimplgenerator.cpp

@@ -1341,7 +1341,8 @@ bool Handler::startElement(const QString &, const QString &n,
 
                 if (rc.action == ReferenceCount::Invalid) {
                     m_error = "unrecognized value for action attribute. supported actions:";
-                    foreach (QString action, actions.keys())
+                    QStringList actionKeys = actions.keys();
+                    for (QString action : actionKeys)
                         m_error += " " + action;
                 }
 
@@ -1654,8 +1655,8 @@ ContainerTypeEntry *TypeDatabase::findContainerType(const QString &name)
 
 PrimitiveTypeEntry *TypeDatabase::findTargetLangPrimitiveType(const QString &java_name)
 {
-    foreach (QList<TypeEntry *> entries, m_entries.values()) {
-        foreach (TypeEntry *e, entries) {
+    for (QList<TypeEntry*> entries : m_entries.values()) {
+        for (TypeEntry* e : entries) {
             if (e && e->isPrimitive()) {
                 PrimitiveTypeEntry *pe = static_cast<PrimitiveTypeEntry *>(e);
                 if (pe->targetLangName() == java_name && pe->preferredConversion())
@@ -1800,7 +1801,7 @@ bool TypeDatabase::isClassRejected(const QString &class_name)
     if (!m_rebuild_classes.isEmpty())
         return !m_rebuild_classes.contains(class_name);
 
-    foreach (const TypeRejection &r, m_rejections)
+    for (const TypeRejection& r : m_rejections)
         if (r.class_name == class_name && r.function_name == "*" && r.field_name == "*" && r.enum_name == "*") {
             return true;
         }
@@ -1809,7 +1810,7 @@ bool TypeDatabase::isClassRejected(const QString &class_name)
 
 bool TypeDatabase::isEnumRejected(const QString &class_name, const QString &enum_name)
 {
-    foreach (const TypeRejection &r, m_rejections) {
+    for (const TypeRejection& r : m_rejections) {
         if (r.enum_name == enum_name
             && (r.class_name == class_name || r.class_name == "*")) {
             return true;
@@ -1821,7 +1822,7 @@ bool TypeDatabase::isEnumRejected(const QString &class_name, const QString &enum
 
 bool TypeDatabase::isFunctionRejected(const QString &class_name, const QString &function_name)
 {
-    foreach (const TypeRejection &r, m_rejections)
+    for (const TypeRejection& r : m_rejections)
         if (r.function_name == function_name &&
             (r.class_name == class_name || r.class_name == "*"))
             return true;
@@ -1831,7 +1832,7 @@ bool TypeDatabase::isFunctionRejected(const QString &class_name, const QString &
 
 bool TypeDatabase::isFieldRejected(const QString &class_name, const QString &field_name)
 {
-    foreach (const TypeRejection &r, m_rejections)
+    for (const TypeRejection& r : m_rejections)
         if (r.field_name == field_name &&
             (r.class_name == class_name || r.class_name == "*"))
             return true;
@@ -1991,7 +1992,7 @@ QString FunctionModification::toString() const
     if (modifiers & Writable) str += QLatin1String("writable");
 
     if (modifiers & CodeInjection) {
-        foreach (CodeSnip s, snips) {
+        for (CodeSnip s : snips) {
             str += QLatin1String("\n//code injection:\n");
             str += s.code();
         }