diff options
author | Kevin Funk <kevin.funk.ford@kdab.com> | 2017-09-25 18:58:45 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-25 18:03:47 +0000 |
commit | fdfbb84f150710f7446f86a04d0f5574fbf6737f (patch) | |
tree | 1d6b187865c3fd68892c23f57d52263eb6baf7eb | |
parent | ff88937e26c9ff60dd38f281f3ca15c69001d900 (diff) |
repc: Fix warnings in generated code
Fixes:
.moc/../rep_model_merged.h:272:11: warning: field 'm_tracks' will be initialized after field 'm_currentTrack' [-Wreorder]
, m_tracks(model1)
^
Change-Id: If1dca7a180c27ba02642bdd96fe182d96894d0d7
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
-rw-r--r-- | tools/repc/repcodegenerator.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/tools/repc/repcodegenerator.cpp b/tools/repc/repcodegenerator.cpp index c34c284..4464bdf 100644 --- a/tools/repc/repcodegenerator.cpp +++ b/tools/repc/repcodegenerator.cpp @@ -824,26 +824,24 @@ void RepCodeGenerator::generateClass(Mode mode, QTextStream &out, const ASTClass } } - if (mode == SIMPLE_SOURCE) - { - //Next output data members + out << "" << endl; + out << "private:" << endl; + + //Next output data members + if (mode == SIMPLE_SOURCE) { + Q_FOREACH (const ASTModel &model, astClass.models) + out << " QScopedPointer<QAbstractItemModel> m_" << model.name << ";" << endl; + if (!astClass.properties.isEmpty()) { - out << "" << endl; - out << "private:" << endl; Q_FOREACH (const ASTProperty &property, astClass.properties) { out << " " << property.type << " " << "_" << property.name << ";" << endl; } } - Q_FOREACH (const ASTModel &model, astClass.models) - out << " QScopedPointer<QAbstractItemModel> m_" << model.name << ";" << endl; - } - - out << "" << endl; - out << "private:" << endl; - if (mode == REPLICA) { + } else if (mode == REPLICA) { Q_FOREACH (const ASTModel &model, astClass.models) out << " QScopedPointer<QAbstractItemModelReplica> m_" << model.name << ";" << endl; } + out << " friend class QT_PREPEND_NAMESPACE(QRemoteObjectNode);" << endl; out << "};" << endl; |