diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2015-03-17 13:19:50 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2015-03-25 10:11:51 +0000 |
| commit | c885efb3cd3835bfd565575a450235cc8a7983a9 (patch) | |
| tree | d2bc976b10ba29eeb5b1900bff49432dd8c7e90c /src | |
| parent | 91feefd7d952d1e3a6b6e985afe34e2d726b2e38 (diff) | |
Skip non-exported slots early when creating a XML interface description.
This will prevent unnecessary warnings about unknown types for signals
or slots that are not even exported to the D-Bus.
Change-Id: Iecda5beca5ebe6665a193245fe1c2578156f6abe
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus/qdbusxmlgenerator.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp index 8794292146..243440f48b 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -137,6 +137,12 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method !(flags & (QDBusConnection::ExportScriptableInvokables | QDBusConnection::ExportNonScriptableInvokables)))) continue; // we're not exporting any slots or invokables + // we want to skip non-scriptable stuff as early as possible to avoid bogus warning + // for methods that are not being exported at all + bool isScriptable = mm.attributes() & QMetaMethod::Scriptable; + if (!isScriptable && !(flags & (isSignal ? QDBusConnection::ExportNonScriptableSignals : QDBusConnection::ExportNonScriptableInvokables | QDBusConnection::ExportNonScriptableSlots))) + continue; + QString xml = QString::fromLatin1(" <%1 name=\"%2\">\n") .arg(isSignal ? QLatin1String("signal") : QLatin1String("method")) .arg(QString::fromLatin1(mm.name())); @@ -179,7 +185,6 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method continue; // cloned signal? int j; - bool isScriptable = mm.attributes() & QMetaMethod::Scriptable; for (j = 1; j < types.count(); ++j) { // input parameter for a slot or output for a signal if (types.at(j) == QDBusMetaTypeId::message()) { |