diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 16:19:29 +0200 |
---|---|---|
committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 19:22:48 +0200 |
commit | d236fe2214340164bec4f34cb27dea4a634ee0de (patch) | |
tree | cda4ebbcc91717b37e5a2dbccb9ee46c2a1d3885 /src/dbus/qdbusconnection_p.h | |
parent | 2b17b0235b70f89d15d3b91a14c3297d38377f94 (diff) | |
parent | cbc883da6910b3357a4e03d0e2dfa841da1a03e8 (diff) |
Merge master into api_changes
Conflicts:
src/corelib/global/qisenum.h
src/dbus/qdbusconnection_p.h
src/widgets/kernel/qwidget.cpp
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
Change-Id: I85102515d5fec835832cc20ffdc5c1ba578bd01d
Diffstat (limited to 'src/dbus/qdbusconnection_p.h')
-rw-r--r-- | src/dbus/qdbusconnection_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index caeb116b31..fb53f3efba 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -126,7 +126,7 @@ public: QString service, path, signature; QObject* obj; int midx; - QList<int> params; + QVector<int> params; QStringList argumentMatch; QByteArray matchRule; }; @@ -243,7 +243,7 @@ private: void sendError(const QDBusMessage &msg, QDBusError::ErrorType code); void deliverCall(QObject *object, int flags, const QDBusMessage &msg, - const QList<int> &metaTypes, int slotIdx); + const QVector<int> &metaTypes, int slotIdx); bool isServiceRegisteredByThread(const QString &serviceName) const; @@ -311,7 +311,7 @@ public: public: // static methods - static int findSlot(QObject *obj, const QByteArray &normalizedName, QList<int>& params); + static int findSlot(QObject *obj, const QByteArray &normalizedName, QVector<int> ¶ms); static bool prepareHook(QDBusConnectionPrivate::SignalHook &hook, QString &key, const QString &service, const QString &path, const QString &interface, const QString &name, @@ -323,7 +323,7 @@ public: int idx, const QList<int> &metaTypes, const QDBusMessage &msg); static QDBusCallDeliveryEvent *prepareReply(QDBusConnectionPrivate *target, QObject *object, - int idx, const QList<int> &metaTypes, + int idx, const QVector<int> &metaTypes, const QDBusMessage &msg); static void processFinishedCall(QDBusPendingCallPrivate *call); @@ -337,9 +337,9 @@ public: }; // in qdbusmisc.cpp -extern int qDBusParametersForMethod(const QMetaMethod &mm, QList<int>& metaTypes); +extern int qDBusParametersForMethod(const QMetaMethod &mm, QVector<int> &metaTypes); #endif // QT_BOOTSTRAPPED -extern int qDBusParametersForMethod(const QList<QByteArray> ¶meters, QList<int>& metaTypes); +extern int qDBusParametersForMethod(const QList<QByteArray> ¶meters, QVector<int>& metaTypes); extern bool qDBusCheckAsyncTag(const char *tag); #ifndef QT_BOOTSTRAPPED extern bool qDBusInterfaceInObject(QObject *obj, const QString &interface_name); |