diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-01 11:38:11 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-18 13:20:12 +0200 |
commit | d018e53d751a02a8224395aae5e9cb84438ab0e3 (patch) | |
tree | 81147db89e0607c6cd3656279af85bfac2f5f978 /src/qdbus/qdbusviewer/qdbusviewer.cpp | |
parent | a159a59cbc52cc1ccd9eca34badb942de7583499 (diff) |
Adapt to Qt5 meta-object changes
QMetamethod::signature() is now called methodSignature(), and it
returns a QByteArray.
The new function QMetaMethod::isValid() should be used to check
whether a method is valid, rather than relying on signature() to
return a 0 pointer as before.
Change-Id: Ifc163497293213177ef80a4ea8e4e5577513f52a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/qdbus/qdbusviewer/qdbusviewer.cpp')
-rw-r--r-- | src/qdbus/qdbusviewer/qdbusviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp index 8eb4fc5a0..a80d4cf22 100644 --- a/src/qdbus/qdbusviewer/qdbusviewer.cpp +++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp @@ -257,12 +257,12 @@ void QDBusViewer::callMethod(const BusSignature &sig) // find the method QMetaMethod method; for (int i = 0; i < mo->methodCount(); ++i) { - const QString signature = QString::fromLatin1(mo->method(i).signature()); + const QString signature = QString::fromLatin1(mo->method(i).methodSignature()); if (signature.startsWith(sig.mName) && signature.at(sig.mName.length()) == QLatin1Char('(')) if (getDbusSignature(mo->method(i)) == sig.mTypeSig) method = mo->method(i); } - if (!method.signature()) { + if (!method.isValid()) { QMessageBox::warning(this, tr("Unable to find method"), tr("Unable to find method %1 on path %2 in interface %3").arg( sig.mName).arg(sig.mPath).arg(sig.mInterface)); |