Skip to content

Commit b2711e7

Browse files
FelixPetriconimrbean-bremen
FelixPetriconi
authored and
mrbean-bremen
committed
Replace foreach macro with range based for loop
1 parent 53c7a73 commit b2711e7

File tree

10 files changed

+154
-153
lines changed

10 files changed

+154
-153
lines changed

‎generator/abstractmetabuilder.cpp‎

Lines changed: 52 additions & 52 deletions
Large diffs are not rendered by default.

‎generator/abstractmetalang.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ AbstractMetaType *AbstractMetaType::copy() const
5353
cpy->setConstant(isConstant());
5454
cpy->setReference(isReference());
5555
cpy->setIndirections(indirections());
56-
cpy->setInstantiations(instantiations());
56+
cpy->setInstantiations(instantiations());
5757
cpy->setArrayElementCount(arrayElementCount());
5858
cpy->setOriginalTypeDescription(originalTypeDescription());
5959
cpy->setOriginalTemplateType(originalTemplateType() ? originalTemplateType()->copy() : 0);
@@ -840,17 +840,17 @@ AbstractMetaFunctionList AbstractMetaClass::queryFunctionsByName(const QString &
840840

841841
QString AbstractMetaClass::getDefaultNonZeroFunction() const
842842
{
843-
foreach(const AbstractMetaFunction* fun, queryFunctionsByName("isEmpty")) {
843+
for (const AbstractMetaFunction* fun : queryFunctionsByName("isEmpty")) {
844844
if (fun->actualMinimumArgumentCount()==0 && fun->isPublic()) {
845845
return "isEmpty";
846846
}
847847
}
848-
foreach(const AbstractMetaFunction* fun, queryFunctionsByName("isValid")) {
848+
for (const AbstractMetaFunction* fun : queryFunctionsByName("isValid")) {
849849
if (fun->actualMinimumArgumentCount() == 0 && fun->isPublic()) {
850850
return "isValid";
851851
}
852852
}
853-
foreach(const AbstractMetaFunction* fun, queryFunctionsByName("isNull")) {
853+
for (const AbstractMetaFunction* fun : queryFunctionsByName("isNull")) {
854854
if (fun->actualMinimumArgumentCount() == 0 && fun->isPublic()) {
855855
return "isNull";
856856
}

‎generator/asttoxml.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,22 +73,22 @@ void astToXML(QString name) {
7373

7474
QFile outputFile;
7575
if (!outputFile.open(stdout, QIODevice::WriteOnly))
76-
{
77-
return;
78-
}
76+
{
77+
return;
78+
}
7979

8080
QXmlStreamWriter s( &outputFile);
8181
s.setAutoFormatting( true );
8282

8383
s.writeStartElement("code");
8484

8585
QHash<QString, NamespaceModelItem> namespaceMap = dom->namespaceMap();
86-
foreach (NamespaceModelItem item, namespaceMap.values()) {
86+
for (NamespaceModelItem item : namespaceMap.values()) {
8787
writeOutNamespace(s, item);
8888
}
8989

9090
QHash<QString, ClassModelItem> typeMap = dom->classMap();
91-
foreach (ClassModelItem item, typeMap.values()) {
91+
for (ClassModelItem item : typeMap.values()) {
9292
writeOutClass(s, item);
9393
}
9494
s.writeEndElement();
@@ -100,17 +100,17 @@ void writeOutNamespace(QXmlStreamWriter &s, NamespaceModelItem &item) {
100100
s.writeAttribute("name", item->name());
101101

102102
QHash<QString, NamespaceModelItem> namespaceMap = item->namespaceMap();
103-
foreach (NamespaceModelItem namespaceItem, namespaceMap.values()) {
103+
for (NamespaceModelItem namespaceItem : namespaceMap.values()) {
104104
writeOutNamespace(s, namespaceItem);
105105
}
106106

107107
QHash<QString, ClassModelItem> typeMap = item->classMap();
108-
foreach (ClassModelItem classItem, typeMap.values()) {
108+
for (ClassModelItem classItem : typeMap.values()) {
109109
writeOutClass(s, classItem);
110110
}
111111

112112
QHash<QString, EnumModelItem> enumMap = item->enumMap();
113-
foreach (EnumModelItem enumItem, enumMap.values()) {
113+
for (EnumModelItem enumItem : enumMap.values()) {
114114
writeOutEnum(s, enumItem);
115115
}
116116

@@ -160,17 +160,17 @@ void writeOutClass(QXmlStreamWriter &s, ClassModelItem &item) {
160160
s.writeAttribute("name", qualified_name);
161161

162162
QHash<QString, EnumModelItem> enumMap = item->enumMap();
163-
foreach (EnumModelItem enumItem, enumMap.values()) {
163+
for (EnumModelItem enumItem : enumMap.values()) {
164164
writeOutEnum(s, enumItem);
165165
}
166166

167167
QHash<QString, FunctionModelItem> functionMap = item->functionMap();
168-
foreach (FunctionModelItem funcItem, functionMap.values()) {
168+
for (FunctionModelItem funcItem : functionMap.values()) {
169169
writeOutFunction(s, funcItem);
170170
}
171171

172172
QHash<QString, ClassModelItem> typeMap = item->classMap();
173-
foreach (ClassModelItem classItem, typeMap.values()) {
173+
for (ClassModelItem classItem : typeMap.values()) {
174174
writeOutClass(s, classItem);
175175
}
176176
s.writeEndElement();

‎generator/parser/rpp/preprocessor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class PreprocessorPrivate
6262

6363
void initPP(pp &proc)
6464
{
65-
foreach(QString path, includePaths)
65+
for (QString path : includePaths)
6666
proc.push_include_path(path.toStdString());
6767
}
6868
};

‎generator/prigenerator.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static QString combineIncludes(const QString& text) {
7272
QStringList lines = text.split('\n');
7373
QSet<QString> includes;
7474
QString result;
75-
foreach(QString line, lines) {
75+
for (QString line : lines) {
7676
if (line.startsWith("#include")) {
7777
includes.insert(line);
7878
} else if (line.startsWith("#") && line.contains("PYTHONQTWRAPPER_")) {

‎generator/setupgenerator.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static QStringList getOperatorCodes(const AbstractMetaClass* cls) {
6565
}
6666
}
6767
QSet<QString> r;
68-
foreach(QString op, operatorCodes.toList()) {
68+
for (QString op : operatorCodes.toList()) {
6969
if (op == ">" || op == "<" || op == ">=" || op == "<=" || op == "==" || op == "!=") {
7070
r.insert("PythonQt::Type_RichCompare");
7171
} else if (op == "+") {
@@ -111,10 +111,10 @@ static QStringList getOperatorCodes(const AbstractMetaClass* cls) {
111111

112112
{
113113
CodeSnipList code_snips = cls->typeEntry()->codeSnips();
114-
foreach(const CodeSnip &cs, code_snips) {
114+
for (const CodeSnip &cs : code_snips) {
115115
if (cs.language == TypeSystem::PyWrapperOperators) {
116116
QStringList values = cs.code().split(" ", QString::SkipEmptyParts);
117-
foreach(QString value, values) {
117+
for (QString value : values) {
118118
r.insert(value);
119119
}
120120
}
@@ -284,7 +284,7 @@ void SetupGenerator::generate()
284284

285285
QSet<QString> listRegistration;
286286
QSet<QString> snips;
287-
foreach(const AbstractMetaClass *cls, list) {
287+
for (const AbstractMetaClass *cls : list) {
288288
Q_FOREACH(const AbstractMetaFunction* func, cls->functions()) {
289289
if (func->type() && func->type()->isContainer()) {
290290
addListRegistration(func->type(), listRegistration);
@@ -298,7 +298,7 @@ void SetupGenerator::generate()
298298
{
299299
while (cls) {
300300
CodeSnipList code_snips = cls->typeEntry()->codeSnips();
301-
foreach(const CodeSnip &cs, code_snips) {
301+
for (const CodeSnip &cs : code_snips) {
302302
if (cs.language == TypeSystem::PyInitSource) {
303303
snips.insert(cs.code());
304304
}
@@ -308,7 +308,7 @@ void SetupGenerator::generate()
308308
}
309309
}
310310

311-
foreach(QString snip, snips) {
311+
for (QString snip : snips) {
312312
s << snip;
313313
}
314314
s << endl;
@@ -335,7 +335,7 @@ void SetupGenerator::generate()
335335
const AbstractMetaClass* theclass = cls;
336336
while (theclass) {
337337
CodeSnipList code_snips = theclass->typeEntry()->codeSnips();
338-
foreach(const CodeSnip &cs, code_snips) {
338+
for (const CodeSnip &cs : code_snips) {
339339
if (cs.language == TypeSystem::PySetWrapperFunc) {
340340
setInstanceFunc = cs.code();
341341
break;
@@ -358,7 +358,7 @@ void SetupGenerator::generate()
358358
QString baseName = cls->baseClass()?cls->baseClass()->qualifiedCppName():"";
359359
s << "PythonQt::priv()->registerCPPClass(\""<< cls->qualifiedCppName() << "\", \"" << baseName << "\", \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ", module, " << operatorCodes <<");" << endl;
360360
}
361-
foreach(AbstractMetaClass* interface, cls->interfaces()) {
361+
for (AbstractMetaClass* interface : cls->interfaces()) {
362362
// the interface might be our own class... (e.g. QPaintDevice)
363363
if (interface->qualifiedCppName() != cls->qualifiedCppName()) {
364364
s << "PythonQt::self()->addParentClass(\""<< cls->qualifiedCppName() << "\", \"" << interface->qualifiedCppName() << "\",PythonQtUpcastingOffset<" << cls->qualifiedCppName() <<","<<interface->qualifiedCppName()<<">());" << endl;
@@ -408,7 +408,7 @@ QStringList SetupGenerator::writePolymorphicHandler(QTextStream &s, const QStrin
408408
if (isGraphicsItem) {
409409
const AbstractMetaClass *currentClazz = clazz;
410410
while (!inherits && currentClazz) {
411-
foreach(AbstractMetaClass* interfaze, currentClazz->interfaces()) {
411+
for (AbstractMetaClass* interfaze : currentClazz->interfaces()) {
412412
if (interfaze->qualifiedCppName()=="QGraphicsItem") {
413413
inherits = true;
414414
break;

‎generator/shellgenerator.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ bool function_sorter(AbstractMetaFunction *a, AbstractMetaFunction *b);
285285

286286
bool ShellGenerator::functionHasNonConstReferences(const AbstractMetaFunction* function)
287287
{
288-
foreach(const AbstractMetaArgument* arg, function->arguments())
288+
for (const AbstractMetaArgument* arg : function->arguments())
289289
{
290290
if (!arg->type()->isConstant() && arg->type()->isReference()) {
291291
QString s;
@@ -323,15 +323,15 @@ AbstractMetaFunctionList ShellGenerator::getFunctionsToWrap(const AbstractMetaCl
323323
| AbstractMetaClass::NotRemovedFromTargetLang | AbstractMetaClass::ClassImplements
324324
);
325325
QSet<AbstractMetaFunction*> set1 = QSet<AbstractMetaFunction*>::fromList(functions);
326-
foreach(AbstractMetaFunction* func, functions2) {
326+
for (AbstractMetaFunction* func : functions2) {
327327
set1.insert(func);
328328
}
329329

330330
AbstractMetaFunctionList resultFunctions;
331331

332332
bool hasPromoter = meta_class->typeEntry()->shouldCreatePromoter();
333333

334-
foreach(AbstractMetaFunction* func, set1.toList()) {
334+
for (AbstractMetaFunction* func : set1.toList()) {
335335
if (func->implementingClass()==meta_class) {
336336
if (hasPromoter || func->wasPublic()) {
337337
resultFunctions << func;
@@ -356,7 +356,7 @@ AbstractMetaFunctionList ShellGenerator::getProtectedFunctionsThatNeedPromotion(
356356
{
357357
AbstractMetaFunctionList functions;
358358
AbstractMetaFunctionList functions1 = getFunctionsToWrap(meta_class);
359-
foreach(AbstractMetaFunction* func, functions1) {
359+
for (AbstractMetaFunction* func : functions1) {
360360
if (func->wasProtected() || func->isVirtual()) {
361361
functions << func;
362362
}

0 commit comments

Comments
 (0)