diff options
| -rw-r--r-- | src/remoteobjects/qremoteobjectpacket.cpp | 6 | ||||
| -rw-r--r-- | tools/repc/cppcodegenerator.cpp | 2 | ||||
| -rw-r--r-- | tools/repc/utils.cpp | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/remoteobjects/qremoteobjectpacket.cpp b/src/remoteobjects/qremoteobjectpacket.cpp index f1e9318..5f52fb6 100644 --- a/src/remoteobjects/qremoteobjectpacket.cpp +++ b/src/remoteobjects/qremoteobjectpacket.cpp @@ -365,7 +365,7 @@ static bool checkForEnumsInSource(const QMetaObject *meta, const QRemoteObjectSo { if (source->m_object->inherits(meta->className())) return true; - for (const auto child : source->m_children) { + for (const auto &child : source->m_children) { if (child->m_object && checkForEnumsInSource(meta, child)) return true; } @@ -399,7 +399,7 @@ static void serializeGadgets(QDataStream &ds, const QSet<const QMetaObject *> &g // Determine how to handle the enums found QSet<QMetaEnum> qtEnums; QSet<const QMetaObject *> dynamicEnumMetaObjects; - for (const auto metaEnum : enums) { + for (const auto &metaEnum : enums) { auto const metaObject = metaEnum.enclosingMetaObject(); if (gadgets.contains(metaObject)) // Part of a gadget will we serialize continue; @@ -415,7 +415,7 @@ static void serializeGadgets(QDataStream &ds, const QSet<const QMetaObject *> &g dynamicEnumMetaObjects.insert(metaEnum.enclosingMetaObject()); } ds << quint32(qtEnums.size()); - for (const auto metaEnum : qtEnums) { + for (const auto &metaEnum : qtEnums) { QByteArray enumName(metaEnum.scope()); enumName.append("::", 2).append(metaEnum.name()); ds << enumName; diff --git a/tools/repc/cppcodegenerator.cpp b/tools/repc/cppcodegenerator.cpp index c82acbb..afbe400 100644 --- a/tools/repc/cppcodegenerator.cpp +++ b/tools/repc/cppcodegenerator.cpp @@ -43,7 +43,7 @@ CppCodeGenerator::CppCodeGenerator(QIODevice *outputDevice) void CppCodeGenerator::generate(const QJsonArray &classList, bool alwaysGenerateClass /* = false */) { - for (const QJsonValue &cdef : classList) + for (const QJsonValue cdef : classList) m_outputDevice->write(generateClass(cdef, alwaysGenerateClass)); m_outputDevice->write("\n"); diff --git a/tools/repc/utils.cpp b/tools/repc/utils.cpp index 5327343..31714d0 100644 --- a/tools/repc/utils.cpp +++ b/tools/repc/utils.cpp @@ -122,7 +122,7 @@ static QByteArray join(const QVector<QByteArray> &array, const QByteArray &separ static QVector<QByteArray> generateProperties(const QJsonArray &properties, bool isPod=false) { QVector<QByteArray> ret; - for (const QJsonValue &prop : properties) { + for (const QJsonValue prop : properties) { if (!isPod && !_Contains(prop, "notify") && !_Bool(prop, "constant")) { qWarning() << "Skipping property" << _String(prop, "name") << "because it is non-notifiable & non-constant"; continue; // skip non-notifiable properties @@ -140,10 +140,10 @@ static QVector<QByteArray> generateProperties(const QJsonArray &properties, bool static QByteArray generateFunctions(const QByteArray &type, const QJsonArray &functions) { QByteArray ret; - for (const QJsonValue &func : functions) { + for (const QJsonValue func : functions) { ret += type + "(" + _Bytes(func, "returnType") + " " + _Bytes(func, "name") + "("; const auto arguments = _Array(func, "arguments"); - for (const QJsonValue &arg : arguments) + for (const QJsonValue arg : arguments) ret += _Bytes(arg, "type") + " " + _Bytes(arg, "name") + ", "; if (arguments.count()) ret.chop(2); @@ -225,7 +225,7 @@ QByteArray generateClass(const QJsonValue &cls, bool alwaysGenerateClass) static QVector<PODAttribute> propertyList2PODAttributes(const QJsonArray &list) { QVector<PODAttribute> ret; - for (const QJsonValue &prop : list) + for (const QJsonValue prop : list) ret.push_back(PODAttribute(_String(prop, "type"), _String(prop, "name"))); return ret; } @@ -233,7 +233,7 @@ static QVector<PODAttribute> propertyList2PODAttributes(const QJsonArray &list) QVector<ASTProperty> propertyList2AstProperties(const QJsonArray &list) { QVector<ASTProperty> ret; - for (const QJsonValue &property : list) { + for (const QJsonValue property : list) { if (!_Contains(property, "notify") && !_Bool(property, "constant")) { qWarning() << "Skipping property" << _String(property, "name") << "because it is non-notifiable & non-constant"; continue; // skip non-notifiable properties @@ -254,12 +254,12 @@ QVector<ASTProperty> propertyList2AstProperties(const QJsonArray &list) QVector<ASTFunction> functionList2AstFunctionList(const QJsonArray &list) { QVector<ASTFunction> ret; - for (const QJsonValue &function : list) { + for (const QJsonValue function : list) { ASTFunction func; func.name = _String(function, "name"); func.returnType = _String(function, "returnType"); const auto arguments = _Array(function, "arguments"); - for (const QJsonValue &arg : arguments) + for (const QJsonValue arg : arguments) func.params.push_back(ASTDeclaration(_String(arg, "type"), _String(arg, "name"))); ret.push_back(func); } @@ -269,7 +269,7 @@ QVector<ASTFunction> functionList2AstFunctionList(const QJsonArray &list) AST classList2AST(const QJsonArray &classes) { AST ret; - for (const QJsonValue &cls : classes) { + for (const QJsonValue cls : classes) { if (_Empty(cls, "signals") && _Empty(cls, "slots")) { POD pod; pod.name = _String(cls, "className"); |