From 0a856d538583744e7a122709fec8fd29e2d0688e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 28 Jun 2019 02:11:29 +0000 Subject: [PATCH] use single assignment in qDBusGenerateMetaObjectXml() Signed-off-by: Ivailo Monev --- src/dbus/qdbusxmlgenerator.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp index d11a7ad08..8b0372d75 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -233,12 +233,11 @@ QString qDBusGenerateMetaObjectXml(QString interface, const QMetaObject *mo, // generate the interface name from the meta object interface = qDBusInterfaceFromMetaObject(mo); - QString xml; int idx = mo->indexOfClassInfo(QCLASSINFO_DBUS_INTROSPECTION); if (idx >= mo->classInfoOffset()) return QString::fromUtf8(mo->classInfo(idx).value()); - else - xml = generateInterfaceXml(mo, flags, base->methodCount(), base->propertyCount()); + + QString xml = generateInterfaceXml(mo, flags, base->methodCount(), base->propertyCount()); if (xml.isEmpty()) return QString(); // don't add an empty interface @@ -281,12 +280,11 @@ QString qDBusGenerateMetaObjectXml(QString interface, const QMetaObject *mo, con } } - QString xml; int idx = mo->indexOfClassInfo(QCLASSINFO_DBUS_INTROSPECTION); if (idx >= mo->classInfoOffset()) return QString::fromUtf8(mo->classInfo(idx).value()); - else - xml = generateInterfaceXml(mo, flags, base->methodCount(), base->propertyCount()); + + QString xml = generateInterfaceXml(mo, flags, base->methodCount(), base->propertyCount()); if (xml.isEmpty()) return QString(); // don't add an empty interface