diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-11-15 11:53:19 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-11-15 12:01:14 +0000 |
| commit | cef09e6345d245b47eb115d438f6e367503d57f6 (patch) | |
| tree | 7e969fe749885d8bed3721b7d0ae0816382dc614 | |
| parent | 265107c6df0d89b138ab1a1e77de705223b01b8b (diff) | |
Do not accidentally generate <::5.7
C/C++ uses <: as a digraph (for an opening bracket), so
templateName<::namespaceName::className> would generate errors.
(adapted from d7398f7f482d7a318d75f183758ee9bb37980b1a)
Change-Id: I421c4cf5adf4934ababaef7cb38ba0f94bda49bd
Task-number: QTBUG-53719
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| -rw-r--r-- | tools/qscxmlc/scxmlcppdumper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp index a48a6b6..46ee774 100644 --- a/tools/qscxmlc/scxmlcppdumper.cpp +++ b/tools/qscxmlc/scxmlcppdumper.cpp @@ -398,7 +398,7 @@ protected: QStringList lines; for (int i = 0, ei = node->invokes.size(); i != ei; ++i) { Invoke *invoke = node->invokes.at(i); - QString line = QStringLiteral("new QScxmlInvokeScxmlFactory<%1>(").arg(scxmlClassName(invoke->content.data())); + QString line = QStringLiteral("new QScxmlInvokeScxmlFactory< %1 >(").arg(scxmlClassName(invoke->content.data())); line += QStringLiteral("%1, ").arg(Builder::createContext(QStringLiteral("invoke"))); line += QStringLiteral("%1, ").arg(addString(invoke->id)); line += QStringLiteral("%1, ").arg(addString(node->id + QStringLiteral(".session-"))); @@ -646,7 +646,7 @@ private: result += QStringLiteral("{ ") + elements.join(QStringLiteral(", ")) + QStringLiteral(" }"); } } else { - result += QStringLiteral("%1<%2>()").arg(baseType, elementType); + result += QStringLiteral("%1< %2 >()").arg(baseType, elementType); if (!elements.isEmpty()) { result += QStringLiteral(" << ") + elements.join(QStringLiteral(" << ")); } @@ -723,7 +723,7 @@ private: dm << QStringLiteral("bool handle(QScxmlEvent *event, QScxmlStateMachine *stateMachine) Q_DECL_OVERRIDE {"); if (m_qtMode) { dm << QStringLiteral(" if (event->originType() != QStringLiteral(\"qt:signal\")) { return true; }") - << QStringLiteral(" %1 *m = static_cast<%1 *>(stateMachine);").arg(clazz.className); + << QStringLiteral(" %1 *m = static_cast< %1 * >(stateMachine);").arg(clazz.className); foreach (const QString &signalName, m_signalNames) { dm << QStringLiteral(" if (event->name() == %1) { emit m->%2(event->data()); return false; }") .arg(qba(signalName), mangleIdentifier(signalName)); @@ -1487,7 +1487,7 @@ void CppDumper::writeImplBody(const ClassDump &clazz) cpp << clazz.className << l("::") << clazz.className << l("(QObject *parent)") << endl << QStringLiteral(" : QScxmlStateMachine(parent)") << endl << QStringLiteral(" , data(new Data(*this))") << endl - << QStringLiteral("{ qRegisterMetaType<%1 *>(); data->init(); }").arg(clazz.className) << endl + << QStringLiteral("{ qRegisterMetaType< %1 * >(); data->init(); }").arg(clazz.className) << endl << endl; cpp << clazz.className << l("::~") << clazz.className << l("()") << endl << l("{ delete data; }") << endl |