1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtDBus: make some constructors explicit

Browse Source 
This is a semi-automatic search, so I'm
reasonably sure that all the exported ones
have been caught.

Change-Id: I314d341ad0db4e9d4bbf353a9537c9422ad8a54b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2012-03-06 22:23:18 +01:00 committed by Qt by Nokia
parent 0ee9b6831a
commit 6c2695d677
14 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dbus/qdbusabstractadaptor.h
View File

@ -57,7 +57,7 @@ class Q_DBUS_EXPORT QDBusAbstractAdaptor: public QObject
{ {
Q_OBJECT Q_OBJECT
protected: protected:
QDBusAbstractAdaptor(QObject *parent); explicit QDBusAbstractAdaptor(QObject *parent);
public: public:
~QDBusAbstractAdaptor(); ~QDBusAbstractAdaptor();

8
src/dbus/qdbusabstractinterface.cpp
View File

@ -148,7 +148,7 @@ void QDBusAbstractInterfacePrivate::property(const QMetaProperty &mp, QVariant &
QDBusMessage reply = connection.call(msg, QDBus::Block, timeout); QDBusMessage reply = connection.call(msg, QDBus::Block, timeout);
if (reply.type() != QDBusMessage::ReplyMessage) { if (reply.type() != QDBusMessage::ReplyMessage) {
lastError = reply; lastError = QDBusError(reply);
where.clear(); where.clear();
return; return;
} }
@ -214,7 +214,7 @@ bool QDBusAbstractInterfacePrivate::setProperty(const QMetaProperty &mp, const Q
QDBusMessage reply = connection.call(msg, QDBus::Block, timeout); QDBusMessage reply = connection.call(msg, QDBus::Block, timeout);
if (reply.type() != QDBusMessage::ReplyMessage) { if (reply.type() != QDBusMessage::ReplyMessage) {
lastError = reply; lastError = QDBusError(reply);
return false; return false;
} }
return true; return true;
@ -467,7 +467,7 @@ QDBusMessage QDBusAbstractInterface::callWithArgumentList(QDBus::CallMode mode,
QDBusMessage reply = d->connection.call(msg, mode, d->timeout); QDBusMessage reply = d->connection.call(msg, mode, d->timeout);
if (thread() == QThread::currentThread()) if (thread() == QThread::currentThread())
d->lastError = reply; // will clear if reply isn't an error d->lastError = QDBusError(reply); // will clear if reply isn't an error
// ensure that there is at least one element // ensure that there is at least one element
if (reply.arguments().isEmpty()) if (reply.arguments().isEmpty())
@ -540,7 +540,7 @@ bool QDBusAbstractInterface::callWithCallback(const QString &method,
QDBusMessagePrivate::setParametersValidated(msg, true); QDBusMessagePrivate::setParametersValidated(msg, true);
msg.setArguments(args); msg.setArguments(args);
d->lastError = 0; d->lastError = QDBusError();
return d->connection.callWithCallback(msg, return d->connection.callWithCallback(msg,
receiver, receiver,
returnMethod, returnMethod,

2
src/dbus/qdbusconnection.h
View File

@ -127,7 +127,7 @@ public:
}; };
Q_DECLARE_FLAGS(ConnectionCapabilities, ConnectionCapability) Q_DECLARE_FLAGS(ConnectionCapabilities, ConnectionCapability)
QDBusConnection(const QString &name); explicit QDBusConnection(const QString &name);
QDBusConnection(const QDBusConnection &other); QDBusConnection(const QDBusConnection &other);
~QDBusConnection(); ~QDBusConnection();

4
src/dbus/qdbuserror.h
View File

@ -93,8 +93,8 @@ public:
#endif #endif
}; };
QDBusError(const DBusError *error = 0); explicit QDBusError(const DBusError *error = 0);
QDBusError(const QDBusMessage& msg); /*implicit*/ QDBusError(const QDBusMessage& msg);
QDBusError(ErrorType error, const QString &message); QDBusError(ErrorType error, const QString &message);
QDBusError(const QDBusError &other); QDBusError(const QDBusError &other);
QDBusError &operator=(const QDBusError &other); QDBusError &operator=(const QDBusError &other);

4
src/dbus/qdbusintegrator.cpp
View File

@ -1928,7 +1928,7 @@ QDBusMessage QDBusConnectionPrivate::sendWithReply(const QDBusMessage &message,
} }
QDBusMessage reply = pcall->replyMessage; QDBusMessage reply = pcall->replyMessage;
lastError = reply; // set or clear error lastError = QDBusError(reply); // set or clear error
delete pcall; delete pcall;
return reply; return reply;
@ -2368,7 +2368,7 @@ QDBusConnectionPrivate::findMetaObject(const QString &service, const QString &pa
// fetch the XML description // fetch the XML description
xml = reply.arguments().at(0).toString(); xml = reply.arguments().at(0).toString();
} else { } else {
error = reply; error = QDBusError(reply);
lastError = error; lastError = error;
if (reply.type() != QDBusMessage::ErrorMessage || error.type() != QDBusError::UnknownMethod) if (reply.type() != QDBusMessage::ErrorMessage || error.type() != QDBusError::UnknownMethod)
return 0; // error return 0; // error

2
src/dbus/qdbusinterface.cpp
View File

@ -316,7 +316,7 @@ int QDBusInterfacePrivate::metacall(QMetaObject::Call c, int id, void **argv)
} }
// done // done
lastError = reply; lastError = QDBusError(reply);
return -1; return -1;
} }
} }

2
src/dbus/qdbuspendingcall.cpp
View File

@ -377,7 +377,7 @@ QDBusError QDBusPendingCall::error() const
{ {
if (d) { if (d) {
QMutexLocker locker(&d->mutex); QMutexLocker locker(&d->mutex);
return d->replyMessage; return QDBusError(d->replyMessage);
} }
// not connected, return an error // not connected, return an error

2
src/dbus/qdbuspendingcall.h
View File

@ -99,7 +99,7 @@ class Q_DBUS_EXPORT QDBusPendingCallWatcher: public QObject, public QDBusPending
{ {
Q_OBJECT Q_OBJECT
public: public:
QDBusPendingCallWatcher(const QDBusPendingCall &call, QObject *parent = 0); explicit QDBusPendingCallWatcher(const QDBusPendingCall &call, QObject *parent = 0);
~QDBusPendingCallWatcher(); ~QDBusPendingCallWatcher();
#ifdef Q_QDOC #ifdef Q_QDOC

2
src/dbus/qdbuspendingcall_p.h
View File

@ -125,7 +125,7 @@ public:
if (replyMessage.type() == QDBusMessage::ReplyMessage) if (replyMessage.type() == QDBusMessage::ReplyMessage)
emit reply(replyMessage); emit reply(replyMessage);
else else
emit error(replyMessage, sentMessage); emit error(QDBusError(replyMessage), sentMessage);
emit finished(); emit finished();
} }

4
src/dbus/qdbuspendingreply.h
View File

@ -132,9 +132,9 @@ public:
inline QDBusPendingReply(const QDBusPendingReply &other) inline QDBusPendingReply(const QDBusPendingReply &other)
: QDBusPendingReplyData(other) : QDBusPendingReplyData(other)
{ } { }
inline QDBusPendingReply(const QDBusPendingCall &call) inline /*implicit*/ QDBusPendingReply(const QDBusPendingCall &call) // required by qdbusxml2cpp-generated code
{ *this = call; } { *this = call; }
inline QDBusPendingReply(const QDBusMessage &message) inline /*implicit*/ QDBusPendingReply(const QDBusMessage &message)
{ *this = message; } { *this = message; }
inline QDBusPendingReply &operator=(const QDBusPendingReply &other) inline QDBusPendingReply &operator=(const QDBusPendingReply &other)
{ assign(other); return *this; } { assign(other); return *this; }

2
src/dbus/qdbusreply.cpp
View File

@ -186,7 +186,7 @@ QT_BEGIN_NAMESPACE
*/ */
void qDBusReplyFill(const QDBusMessage &reply, QDBusError &error, QVariant &data) void qDBusReplyFill(const QDBusMessage &reply, QDBusError &error, QVariant &data)
{ {
error = reply; error = QDBusError(reply);
if (error.isValid()) { if (error.isValid()) {
data = QVariant(); // clear it data = QVariant(); // clear it

2
src/dbus/qdbusreply.h
View File

@ -152,7 +152,7 @@ public:
} }
inline QDBusReply& operator=(const QDBusMessage &reply) inline QDBusReply& operator=(const QDBusMessage &reply)
{ {
m_error = reply; m_error = QDBusError(reply);
return *this; return *this;
} }
inline QDBusReply(const QDBusError &dbusError = QDBusError()) inline QDBusReply(const QDBusError &dbusError = QDBusError())

2
src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
View File

@ -516,7 +516,7 @@ void QNetworkManagerEngine::activationFinished(QDBusPendingCallWatcher *watcher)
{ {
QMutexLocker locker(&mutex); QMutexLocker locker(&mutex);
QDBusPendingReply<QDBusObjectPath> reply = *watcher; QDBusPendingReply<QDBusObjectPath> reply(*watcher);
if (!reply.isError()) { if (!reply.isError()) {
QDBusObjectPath result = reply.value(); QDBusObjectPath result = reply.value();

38
tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp
View File

@ -474,77 +474,77 @@ void tst_QDBusPendingReply::multipleTypes()
void tst_QDBusPendingReply::synchronousSimpleTypes() void tst_QDBusPendingReply::synchronousSimpleTypes()
{ {
QDBusPendingReply<bool> rbool = iface->call("retrieveBool"); QDBusPendingReply<bool> rbool(iface->call("retrieveBool"));
rbool.waitForFinished(); rbool.waitForFinished();
QVERIFY(rbool.isFinished()); QVERIFY(rbool.isFinished());
QCOMPARE(rbool.argumentAt<0>(), adaptor->retrieveBool()); QCOMPARE(rbool.argumentAt<0>(), adaptor->retrieveBool());
QDBusPendingReply<uchar> ruchar = iface->call("retrieveUChar"); QDBusPendingReply<uchar> ruchar(iface->call("retrieveUChar"));
ruchar.waitForFinished(); ruchar.waitForFinished();
QVERIFY(ruchar.isFinished()); QVERIFY(ruchar.isFinished());
QCOMPARE(ruchar.argumentAt<0>(), adaptor->retrieveUChar()); QCOMPARE(ruchar.argumentAt<0>(), adaptor->retrieveUChar());
QDBusPendingReply<short> rshort = iface->call("retrieveShort"); QDBusPendingReply<short> rshort(iface->call("retrieveShort"));
rshort.waitForFinished(); rshort.waitForFinished();
QVERIFY(rshort.isFinished()); QVERIFY(rshort.isFinished());
QCOMPARE(rshort.argumentAt<0>(), adaptor->retrieveShort()); QCOMPARE(rshort.argumentAt<0>(), adaptor->retrieveShort());
QDBusPendingReply<ushort> rushort = iface->call("retrieveUShort"); QDBusPendingReply<ushort> rushort(iface->call("retrieveUShort"));
rushort.waitForFinished(); rushort.waitForFinished();
QVERIFY(rushort.isFinished()); QVERIFY(rushort.isFinished());
QCOMPARE(rushort.argumentAt<0>(), adaptor->retrieveUShort()); QCOMPARE(rushort.argumentAt<0>(), adaptor->retrieveUShort());
QDBusPendingReply<int> rint = iface->call("retrieveInt"); QDBusPendingReply<int> rint(iface->call("retrieveInt"));
rint.waitForFinished(); rint.waitForFinished();
QVERIFY(rint.isFinished()); QVERIFY(rint.isFinished());
QCOMPARE(rint.argumentAt<0>(), adaptor->retrieveInt()); QCOMPARE(rint.argumentAt<0>(), adaptor->retrieveInt());
QDBusPendingReply<uint> ruint = iface->call("retrieveUInt"); QDBusPendingReply<uint> ruint(iface->call("retrieveUInt"));
ruint.waitForFinished(); ruint.waitForFinished();
QVERIFY(ruint.isFinished()); QVERIFY(ruint.isFinished());
QCOMPARE(ruint.argumentAt<0>(), adaptor->retrieveUInt()); QCOMPARE(ruint.argumentAt<0>(), adaptor->retrieveUInt());
QDBusPendingReply<qlonglong> rqlonglong = iface->call("retrieveLongLong"); QDBusPendingReply<qlonglong> rqlonglong(iface->call("retrieveLongLong"));
rqlonglong.waitForFinished(); rqlonglong.waitForFinished();
QVERIFY(rqlonglong.isFinished()); QVERIFY(rqlonglong.isFinished());
QCOMPARE(rqlonglong.argumentAt<0>(), adaptor->retrieveLongLong()); QCOMPARE(rqlonglong.argumentAt<0>(), adaptor->retrieveLongLong());
QDBusPendingReply<qulonglong> rqulonglong = iface->call("retrieveULongLong"); QDBusPendingReply<qulonglong> rqulonglong(iface->call("retrieveULongLong"));
rqulonglong.waitForFinished(); rqulonglong.waitForFinished();
QVERIFY(rqulonglong.isFinished()); QVERIFY(rqulonglong.isFinished());
QCOMPARE(rqulonglong.argumentAt<0>(), adaptor->retrieveULongLong()); QCOMPARE(rqulonglong.argumentAt<0>(), adaptor->retrieveULongLong());
QDBusPendingReply<double> rdouble = iface->call("retrieveDouble"); QDBusPendingReply<double> rdouble(iface->call("retrieveDouble"));
rdouble.waitForFinished(); rdouble.waitForFinished();
QVERIFY(rdouble.isFinished()); QVERIFY(rdouble.isFinished());
QCOMPARE(rdouble.argumentAt<0>(), adaptor->retrieveDouble()); QCOMPARE(rdouble.argumentAt<0>(), adaptor->retrieveDouble());
QDBusPendingReply<QString> rstring = iface->call("retrieveString"); QDBusPendingReply<QString> rstring(iface->call("retrieveString"));
rstring.waitForFinished(); rstring.waitForFinished();
QVERIFY(rstring.isFinished()); QVERIFY(rstring.isFinished());
QCOMPARE(rstring.argumentAt<0>(), adaptor->retrieveString()); QCOMPARE(rstring.argumentAt<0>(), adaptor->retrieveString());
QDBusPendingReply<QDBusObjectPath> robjectpath = iface->call("retrieveObjectPath"); QDBusPendingReply<QDBusObjectPath> robjectpath(iface->call("retrieveObjectPath"));
robjectpath.waitForFinished(); robjectpath.waitForFinished();
QVERIFY(robjectpath.isFinished()); QVERIFY(robjectpath.isFinished());
QCOMPARE(robjectpath.argumentAt<0>().path(), adaptor->retrieveObjectPath().path()); QCOMPARE(robjectpath.argumentAt<0>().path(), adaptor->retrieveObjectPath().path());
QDBusPendingReply<QDBusSignature> rsignature = iface->call("retrieveSignature"); QDBusPendingReply<QDBusSignature> rsignature(iface->call("retrieveSignature"));
rsignature.waitForFinished(); rsignature.waitForFinished();
QVERIFY(rsignature.isFinished()); QVERIFY(rsignature.isFinished());
QCOMPARE(rsignature.argumentAt<0>().signature(), adaptor->retrieveSignature().signature()); QCOMPARE(rsignature.argumentAt<0>().signature(), adaptor->retrieveSignature().signature());
QDBusPendingReply<QDBusVariant> rdbusvariant = iface->call("retrieveVariant"); QDBusPendingReply<QDBusVariant> rdbusvariant(iface->call("retrieveVariant"));
rdbusvariant.waitForFinished(); rdbusvariant.waitForFinished();
QVERIFY(rdbusvariant.isFinished()); QVERIFY(rdbusvariant.isFinished());
QCOMPARE(rdbusvariant.argumentAt<0>().variant(), adaptor->retrieveVariant().variant()); QCOMPARE(rdbusvariant.argumentAt<0>().variant(), adaptor->retrieveVariant().variant());
QDBusPendingReply<QByteArray> rbytearray = iface->call("retrieveByteArray"); QDBusPendingReply<QByteArray> rbytearray(iface->call("retrieveByteArray"));
rbytearray.waitForFinished(); rbytearray.waitForFinished();
QVERIFY(rbytearray.isFinished()); QVERIFY(rbytearray.isFinished());
QCOMPARE(rbytearray.argumentAt<0>(), adaptor->retrieveByteArray()); QCOMPARE(rbytearray.argumentAt<0>(), adaptor->retrieveByteArray());
QDBusPendingReply<QStringList> rstringlist = iface->call("retrieveStringList"); QDBusPendingReply<QStringList> rstringlist(iface->call("retrieveStringList"));
rstringlist.waitForFinished(); rstringlist.waitForFinished();
QVERIFY(rstringlist.isFinished()); QVERIFY(rstringlist.isFinished());
QCOMPARE(rstringlist.argumentAt<0>(), adaptor->retrieveStringList()); QCOMPARE(rstringlist.argumentAt<0>(), adaptor->retrieveStringList());
@ -559,28 +559,28 @@ void tst_QDBusPendingReply::errors()
{ {
QDBusError error; QDBusError error;
QDBusPendingReply<> rvoid = iface->asyncCall("sendError"); QDBusPendingReply<> rvoid(iface->asyncCall("sendError"));
rvoid.waitForFinished(); rvoid.waitForFinished();
QVERIFY(rvoid.isFinished()); QVERIFY(rvoid.isFinished());
QVERIFY(rvoid.isError()); QVERIFY(rvoid.isError());
error = rvoid.error(); error = rvoid.error();
VERIFY_ERROR(error); VERIFY_ERROR(error);
QDBusPendingReply<int> rint = iface->asyncCall("sendError"); QDBusPendingReply<int> rint(iface->asyncCall("sendError"));
rint.waitForFinished(); rint.waitForFinished();
QVERIFY(rint.isFinished()); QVERIFY(rint.isFinished());
QVERIFY(rint.isError()); QVERIFY(rint.isError());
error = rint.error(); error = rint.error();
VERIFY_ERROR(error); VERIFY_ERROR(error);
QDBusPendingReply<int,int> rintint = iface->asyncCall("sendError"); QDBusPendingReply<int,int> rintint(iface->asyncCall("sendError"));
rintint.waitForFinished(); rintint.waitForFinished();
QVERIFY(rintint.isFinished()); QVERIFY(rintint.isFinished());
QVERIFY(rintint.isError()); QVERIFY(rintint.isError());
error = rintint.error(); error = rintint.error();
VERIFY_ERROR(error); VERIFY_ERROR(error);
QDBusPendingReply<QString> rstring = iface->asyncCall("sendError"); QDBusPendingReply<QString> rstring(iface->asyncCall("sendError"));
rstring.waitForFinished(); rstring.waitForFinished();
QVERIFY(rstring.isFinished()); QVERIFY(rstring.isFinished());
QVERIFY(rstring.isError()); QVERIFY(rstring.isError());