diff options
Diffstat (limited to 'src/dbus')
57 files changed, 255 insertions, 9 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 9ab3920..7c59808 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -20,7 +20,8 @@ unix { QtXml } win32 { - LIBS_PRIVATE += -lws2_32 \ + wince*:LIBS_PRIVATE += -lws2 + else:LIBS_PRIVATE += -lws2_32 \ -ladvapi32 \ -lnetapi32 \ -luser32 diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp index b5cbbf2..97b6cb6 100644 --- a/src/dbus/qdbus_symbols.cpp +++ b/src/dbus/qdbus_symbols.cpp @@ -44,6 +44,8 @@ #include <QtCore/qmutex.h> #include <private/qmutexpool_p.h> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE void *qdbus_resolve_me(const char *name); @@ -109,6 +111,8 @@ void *qdbus_resolve_me(const char *name) Q_DESTRUCTOR_FUNCTION(qdbus_unloadLibDBus) +#endif // QT_LINKED_LIBDBUS + QT_END_NAMESPACE -#endif +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h index 9ea05b2..5b6b5fb 100644 --- a/src/dbus/qdbus_symbols_p.h +++ b/src/dbus/qdbus_symbols_p.h @@ -57,6 +57,8 @@ #include <QtCore/qglobal.h> #include <dbus/dbus.h> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE #if !defined QT_LINKED_LIBDBUS @@ -196,6 +198,8 @@ DEFINEFUNC(void , dbus_free, (void *memory), (memory), ) /* dbus-message.h */ DEFINEFUNC(DBusMessage* , dbus_message_copy, (const DBusMessage *message), (message), return) +DEFINEFUNC(dbus_bool_t , dbus_message_get_auto_start, (DBusMessage *message), + (message), return) DEFINEFUNC(const char* , dbus_message_get_error_name, (DBusMessage *message), (message), return) DEFINEFUNC(const char* , dbus_message_get_interface, (DBusMessage *message), @@ -268,6 +272,9 @@ DEFINEFUNC(DBusMessage* , dbus_message_new_signal, (const char *path, (path, interface, name), return) DEFINEFUNC(DBusMessage* , dbus_message_ref, (DBusMessage *message), (message), return) +DEFINEFUNC(void , dbus_message_set_auto_start, (DBusMessage *message, + dbus_bool_t auto_start), + (message, auto_start), return) DEFINEFUNC(dbus_bool_t , dbus_message_set_destination, (DBusMessage *message, const char *destination), (message, destination), return) @@ -362,4 +369,5 @@ DEFINEFUNC(dbus_bool_t , dbus_threads_init_default, (), (), return) QT_END_NAMESPACE -#endif +#endif // QT_NO_DBUS +#endif // QDBUS_SYMBOLS_P_H diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp index 4f54570..98670d1 100644 --- a/src/dbus/qdbusabstractadaptor.cpp +++ b/src/dbus/qdbusabstractadaptor.cpp @@ -53,6 +53,8 @@ #include "qdbusabstractadaptor_p.h" #include "qdbusmetatype_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE QDBusAdaptorConnector *qDBusFindAdaptorConnector(QObject *obj) @@ -378,3 +380,5 @@ void QDBusAdaptorConnector::relaySignal(QObject * _t1, const QMetaObject * _t2, } QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusabstractadaptor.h b/src/dbus/qdbusabstractadaptor.h index ad40933..fa64aef 100644 --- a/src/dbus/qdbusabstractadaptor.h +++ b/src/dbus/qdbusabstractadaptor.h @@ -45,6 +45,8 @@ #include <QtCore/qobject.h> #include <QtDBus/qdbusmacros.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -73,4 +75,6 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS + #endif diff --git a/src/dbus/qdbusabstractadaptor_p.h b/src/dbus/qdbusabstractadaptor_p.h index 539f26c..312197f 100644 --- a/src/dbus/qdbusabstractadaptor_p.h +++ b/src/dbus/qdbusabstractadaptor_p.h @@ -67,6 +67,8 @@ #define QCLASSINFO_DBUS_INTERFACE "D-Bus Interface" #define QCLASSINFO_DBUS_INTROSPECTION "D-Bus Introspection" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QDBusAbstractAdaptor; @@ -132,4 +134,5 @@ extern QDBusAdaptorConnector *qDBusCreateAdaptorConnector(QObject *object); QT_END_NAMESPACE +#endif // QT_NO_DBUS #endif // QDBUSABSTRACTADAPTORPRIVATE_H diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 48ec3b6..1a7c417 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -51,6 +51,8 @@ #include <qdebug.h> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE static QDBusError checkIfValid(const QString &service, const QString &path, @@ -765,4 +767,6 @@ QDBusMessage QDBusAbstractInterface::internalConstCall(QDBus::CallMode mode, QT_END_NAMESPACE +#endif // QT_NO_DBUS + #include "moc_qdbusabstractinterface.cpp" diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h index 149fdd3..44f79a1 100644 --- a/src/dbus/qdbusabstractinterface.h +++ b/src/dbus/qdbusabstractinterface.h @@ -51,6 +51,8 @@ #include <QtDBus/qdbusextratypes.h> #include <QtDBus/qdbusconnection.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -159,4 +161,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusabstractinterface_p.h b/src/dbus/qdbusabstractinterface_p.h index 21e01b3..7e59ec7 100644 --- a/src/dbus/qdbusabstractinterface_p.h +++ b/src/dbus/qdbusabstractinterface_p.h @@ -62,6 +62,8 @@ #define ANNOTATION_NO_WAIT "org.freedesktop.DBus.Method.NoReply" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QDBusAbstractInterfacePrivate : public QObjectPrivate @@ -98,4 +100,5 @@ public: QT_END_NAMESPACE +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index 7defc9a..fbbc6a2 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -56,6 +56,8 @@ #include "qdbusmetatype_p.h" #include "qdbusutil_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE QDBusArgumentPrivate::~QDBusArgumentPrivate() @@ -1328,3 +1330,5 @@ QDBusArgument &operator<<(QDBusArgument &a, const QLineF &line) #endif QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 2c4b4ea..73558b6 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -53,6 +53,8 @@ #include <QtDBus/qdbusextratypes.h> #include <QtDBus/qdbusmacros.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -380,4 +382,5 @@ Q_DECLARE_METATYPE(QDBusArgument) QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusargument_p.h b/src/dbus/qdbusargument_p.h index faa68ca..c401e9b 100644 --- a/src/dbus/qdbusargument_p.h +++ b/src/dbus/qdbusargument_p.h @@ -56,6 +56,8 @@ #include <qdbusargument.h> #include "qdbus_symbols_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QDBusMarshaller; @@ -206,4 +208,5 @@ inline QDBusDemarshaller *QDBusArgumentPrivate::demarshaller() QT_END_NAMESPACE +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index abaa486..abb3224 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -54,6 +54,8 @@ #include "qdbusthreaddebug_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QDBusConnectionManager @@ -1048,3 +1050,5 @@ void QDBusConnectionPrivate::setBusService(const QDBusConnection &connection) */ QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index 6246cae..a8ca551 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -45,6 +45,8 @@ #include <QtDBus/qdbusmacros.h> #include <QtCore/qstring.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -181,4 +183,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 5a5fe9b..34bb6b3 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -71,6 +71,8 @@ #include <qdbusmessage.h> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QDBusMessage; @@ -331,4 +333,5 @@ extern QDBusMessage qDBusPropertyGetAll(const QDBusConnectionPrivate::ObjectTree QT_END_NAMESPACE +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusconnectioninterface.cpp b/src/dbus/qdbusconnectioninterface.cpp index b8e248a..c507ce7 100644 --- a/src/dbus/qdbusconnectioninterface.cpp +++ b/src/dbus/qdbusconnectioninterface.cpp @@ -51,6 +51,8 @@ #include "qdbus_symbols_p.h" // for the DBUS_* constants +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE /* @@ -413,3 +415,5 @@ void QDBusConnectionInterface::disconnectNotify(const char *signalName) */ QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h index c174192..1a020b7 100644 --- a/src/dbus/qdbusconnectioninterface.h +++ b/src/dbus/qdbusconnectioninterface.h @@ -47,6 +47,8 @@ #include <QtDBus/qdbusabstractinterface.h> #include <QtDBus/qdbusreply.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -126,4 +128,5 @@ Q_DECLARE_BUILTIN_METATYPE(QDBusConnectionInterface::RegisterServiceReply, UInt) QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbuscontext.cpp b/src/dbus/qdbuscontext.cpp index 13c696c..b9a660a 100644 --- a/src/dbus/qdbuscontext.cpp +++ b/src/dbus/qdbuscontext.cpp @@ -46,6 +46,8 @@ #include "qdbuscontext.h" #include "qdbuscontext_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE QDBusContextPrivate *QDBusContextPrivate::set(QObject *obj, QDBusContextPrivate *newContext) @@ -202,3 +204,5 @@ void QDBusContext::sendErrorReply(QDBusError::ErrorType type, const QString &msg } QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbuscontext.h b/src/dbus/qdbuscontext.h index efaa79f..13fbe4b 100644 --- a/src/dbus/qdbuscontext.h +++ b/src/dbus/qdbuscontext.h @@ -45,6 +45,8 @@ #include <QtCore/qstring.h> #include <QtDBus/qdbuserror.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -81,4 +83,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbuscontext_p.h b/src/dbus/qdbuscontext_p.h index 29c8975..94fe071 100644 --- a/src/dbus/qdbuscontext_p.h +++ b/src/dbus/qdbuscontext_p.h @@ -54,6 +54,10 @@ #ifndef QDBUSCONTEXT_P_H #define QDBUSCONTEXT_P_H +#include <QtCore/qglobal.h> + +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QDBusMessage; @@ -74,5 +78,6 @@ public: QT_END_NAMESPACE +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp index 50a5c73..f4b1523 100644 --- a/src/dbus/qdbuserror.cpp +++ b/src/dbus/qdbuserror.cpp @@ -48,6 +48,8 @@ #include "qdbusmessage.h" #include "qdbusmessage_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE /* @@ -363,4 +365,4 @@ QDebug operator<<(QDebug dbg, const QDBusError &msg) QT_END_NAMESPACE - +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h index 777a688..ff9d1df 100644 --- a/src/dbus/qdbuserror.h +++ b/src/dbus/qdbuserror.h @@ -45,6 +45,8 @@ #include <QtDBus/qdbusmacros.h> #include <QtCore/qstring.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER struct DBusError; @@ -120,4 +122,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusextratypes.cpp b/src/dbus/qdbusextratypes.cpp index e6ece92..0141c6c 100644 --- a/src/dbus/qdbusextratypes.cpp +++ b/src/dbus/qdbusextratypes.cpp @@ -42,6 +42,8 @@ #include "qdbusextratypes.h" #include "qdbusutil_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE void QDBusObjectPath::check() @@ -237,3 +239,4 @@ void QDBusSignature::check() QT_END_NAMESPACE +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 2303dc6..205baff 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -48,6 +48,8 @@ #include <QtCore/qstring.h> #include <QtDBus/qdbusmacros.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -187,4 +189,5 @@ Q_DECLARE_METATYPE(QList<QDBusSignature>) QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 6cb4924..b4598ae 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -64,6 +64,8 @@ #include "qdbusthreaddebug_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE static bool isDebugging; @@ -758,6 +760,7 @@ bool QDBusConnectionPrivate::activateCall(QObject* object, int flags, const QDBu if (!object) return false; +#ifndef QT_NO_PROPERTIES Q_ASSERT_X(QThread::currentThread() == object->thread(), "QDBusConnection: internal threading error", "function called for an object that is in another thread!!"); @@ -816,6 +819,8 @@ bool QDBusConnectionPrivate::activateCall(QObject* object, int flags, const QDBu deliverCall(object, flags, msg, cacheIt->metaTypes, cacheIt->slotIdx); return true; } +#endif // QT_NO_PROPERTIES + return false; } void QDBusConnectionPrivate::deliverCall(QObject *object, int /*flags*/, const QDBusMessage &msg, @@ -2327,3 +2332,5 @@ void QDBusConnectionPrivate::postEventToThread(int action, QObject *object, QEve } QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h index 2661713..02e60bc 100644 --- a/src/dbus/qdbusintegrator_p.h +++ b/src/dbus/qdbusintegrator_p.h @@ -69,6 +69,8 @@ #include "qdbusmessage.h" #include "qdbusconnection_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QDBusConnectionPrivate; @@ -157,4 +159,5 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDBusSlotCache) +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusinterface.cpp b/src/dbus/qdbusinterface.cpp index 56d5231..b989cab 100644 --- a/src/dbus/qdbusinterface.cpp +++ b/src/dbus/qdbusinterface.cpp @@ -49,6 +49,8 @@ #include "qdbusinterface_p.h" #include "qdbusconnection_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE static void copyArgument(void *to, int id, const QVariant &arg) @@ -322,3 +324,5 @@ int QDBusInterfacePrivate::metacall(QMetaObject::Call c, int id, void **argv) } QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h index 98d5e1b..02a9059 100644 --- a/src/dbus/qdbusinterface.h +++ b/src/dbus/qdbusinterface.h @@ -45,6 +45,8 @@ #include <QtDBus/qdbusabstractinterface.h> #include <QtDBus/qdbusconnection.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -76,4 +78,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusinterface_p.h b/src/dbus/qdbusinterface_p.h index 0fe6c02..53de522 100644 --- a/src/dbus/qdbusinterface_p.h +++ b/src/dbus/qdbusinterface_p.h @@ -58,6 +58,8 @@ #include "qdbusmetaobject_p.h" #include <qdbusinterface.h> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QDBusInterfacePrivate: public QDBusAbstractInterfacePrivate @@ -76,4 +78,5 @@ public: QT_END_NAMESPACE +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp index 42d895f..78abf94 100644 --- a/src/dbus/qdbusinternalfilters.cpp +++ b/src/dbus/qdbusinternalfilters.cpp @@ -57,6 +57,8 @@ #include "qdbusmessage_p.h" #include "qdbusutil_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE // defined in qdbusxmlgenerator.cpp @@ -85,7 +87,7 @@ static const char propertiesInterfaceXml[] = " <method name=\"GetAll\">\n" " <arg name=\"interface_name\" type=\"s\" direction=\"in\"/>\n" " <arg name=\"values\" type=\"a{sv}\" direction=\"out\"/>\n" - " <annotation name=\"com.trolltech.QtDBus.QtTypeName.Out0\" value=\"QVariantMap\"/>" + " <annotation name=\"com.trolltech.QtDBus.QtTypeName.Out0\" value=\"QVariantMap\"/>\n" " </method>\n" " </interface>\n"; @@ -497,3 +499,5 @@ QDBusMessage qDBusPropertyGetAll(const QDBusConnectionPrivate::ObjectTreeNode &n } QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusintrospection.cpp b/src/dbus/qdbusintrospection.cpp index c6c0787..74845d0 100644 --- a/src/dbus/qdbusintrospection.cpp +++ b/src/dbus/qdbusintrospection.cpp @@ -42,6 +42,8 @@ #include "qdbusintrospection_p.h" #include "qdbusxmlparser_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE /*! @@ -423,3 +425,5 @@ QDBusIntrospection::parseObjectTree(const QString &xml, const QString &service, } QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusmacros.h b/src/dbus/qdbusmacros.h index 144e44e..693a350 100644 --- a/src/dbus/qdbusmacros.h +++ b/src/dbus/qdbusmacros.h @@ -66,10 +66,13 @@ #endif // prevent syncqt complaints +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(DBus) QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp index 8ec328e..8b174a1 100644 --- a/src/dbus/qdbusmarshaller.cpp +++ b/src/dbus/qdbusmarshaller.cpp @@ -43,6 +43,8 @@ #include "qdbusmetatype_p.h" #include "qdbusutil_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE static void qIterAppend(DBusMessageIter *it, QByteArray *ba, int type, const void *arg) @@ -514,7 +516,7 @@ bool QDBusMarshaller::appendCrossMarshalling(QDBusDemarshaller *demarshaller) void* data; q_dbus_message_iter_get_fixed_array(&sub,&data,&len); - char signature[2] = { element, 0 }; + char signature[2] = { char(element), 0 }; q_dbus_message_iter_open_container(&iterator, DBUS_TYPE_ARRAY, signature, &sub); q_dbus_message_iter_append_fixed_array(&sub, element, &data, len); q_dbus_message_iter_close_container(&iterator, &sub); @@ -548,3 +550,5 @@ bool QDBusMarshaller::appendCrossMarshalling(QDBusDemarshaller *demarshaller) } QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp index 83b5503..d838e37 100644 --- a/src/dbus/qdbusmessage.cpp +++ b/src/dbus/qdbusmessage.cpp @@ -53,6 +53,8 @@ #include "qdbusconnection_p.h" #include "qdbusutil_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE static inline const char *data(const QByteArray &arr) @@ -63,7 +65,7 @@ static inline const char *data(const QByteArray &arr) QDBusMessagePrivate::QDBusMessagePrivate() : msg(0), reply(0), type(DBUS_MESSAGE_TYPE_INVALID), timeout(-1), localReply(0), ref(1), delayedReply(false), localMessage(false), - parametersValidated(false) + parametersValidated(false), autoStartService(true) { } @@ -129,6 +131,7 @@ DBusMessage *QDBusMessagePrivate::toDBusMessage(const QDBusMessage &message, QDB msg = q_dbus_message_new_method_call(data(d_ptr->service.toUtf8()), d_ptr->path.toUtf8(), data(d_ptr->interface.toUtf8()), d_ptr->name.toUtf8()); + q_dbus_message_set_auto_start( msg, d_ptr->autoStartService ); break; case DBUS_MESSAGE_TYPE_METHOD_RETURN: msg = q_dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); @@ -644,6 +647,45 @@ bool QDBusMessage::isDelayedReply() const } /*! + Sets the auto start flag to \a enable. This flag only makes sense + for method call messages, where it tells the D-Bus server to + either auto start the service responsible for the service name, or + not to auto start it. + + By default this flag is true, i.e. a service is autostarted. + This means: + + When the service that this method call is sent to is already + running, the method call is sent to it. If the service is not + running yet, the D-Bus daemon is requested to autostart the + service that is assigned to this service name. This is + handled by .service files that are placed in a directory known + to the D-Bus server. These files then each contain a service + name and the path to a program that should be executed when + this service name is requested. + + \since 4.7 +*/ +void QDBusMessage::setAutoStartService(bool enable) +{ + d_ptr->autoStartService = enable; +} + +/*! + Returns the auto start flag, as set by setAutoStartService(). By default, this + flag is true, which means QtDBus will auto start a service, if it is + not running already. + + \sa setAutoStartService() + + \since 4.7 +*/ +bool QDBusMessage::autoStartService() const +{ + return d_ptr->autoStartService; +} + +/*! Sets the arguments that are going to be sent over D-Bus to \a arguments. Those will be the arguments to a method call or the parameters in the signal. @@ -759,3 +801,4 @@ QDebug operator<<(QDebug dbg, const QDBusMessage &msg) QT_END_NAMESPACE +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index 1a85983..f2e64b9 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.h @@ -47,6 +47,8 @@ #include <QtCore/qlist.h> #include <QtCore/qvariant.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -104,6 +106,9 @@ public: void setDelayedReply(bool enable) const; bool isDelayedReply() const; + void setAutoStartService(bool enable); + bool autoStartService() const; + void setArguments(const QList<QVariant> &arguments); QList<QVariant> arguments() const; @@ -122,5 +127,6 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusmessage_p.h b/src/dbus/qdbusmessage_p.h index 6bf5448..867a660 100644 --- a/src/dbus/qdbusmessage_p.h +++ b/src/dbus/qdbusmessage_p.h @@ -59,6 +59,8 @@ struct DBusMessage; +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QDBusConnectionPrivate; @@ -85,6 +87,7 @@ public: mutable uint delayedReply : 1; uint localMessage : 1; mutable uint parametersValidated : 1; + uint autoStartService : 1; static void setParametersValidated(QDBusMessage &msg, bool enable) { msg.d_ptr->parametersValidated = enable; } @@ -101,4 +104,5 @@ public: QT_END_NAMESPACE +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index 295b1ae..bde8997 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -53,6 +53,8 @@ #include "qdbusintrospection_p.h" #include "qdbusabstractinterface_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QDBusMetaObjectGenerator @@ -677,3 +679,4 @@ int QDBusMetaObject::propertyMetaType(int id) const QT_END_NAMESPACE +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp index 7f60cf2..cb377cb 100644 --- a/src/dbus/qdbusmetatype.cpp +++ b/src/dbus/qdbusmetatype.cpp @@ -54,6 +54,8 @@ #include "qdbusmetatype_p.h" #include "qdbusargument_p.h" +#ifndef QT_NO_DBUS + Q_DECLARE_METATYPE(QList<bool>) Q_DECLARE_METATYPE(QList<short>) Q_DECLARE_METATYPE(QList<ushort>) @@ -462,3 +464,5 @@ const char *QDBusMetaType::typeToSignature(int type) } QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusmetatype.h b/src/dbus/qdbusmetatype.h index f72d2c5..b487e23 100644 --- a/src/dbus/qdbusmetatype.h +++ b/src/dbus/qdbusmetatype.h @@ -45,6 +45,8 @@ #include "QtCore/qmetatype.h" #include <QtDBus/qdbusargument.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -94,4 +96,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusmisc.cpp b/src/dbus/qdbusmisc.cpp index e10534e..dff4dad 100644 --- a/src/dbus/qdbusmisc.cpp +++ b/src/dbus/qdbusmisc.cpp @@ -50,6 +50,8 @@ #include "qdbusmetatype_p.h" #include "qdbusabstractadaptor_p.h" // for QCLASSINFO_DBUS_* +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE bool qDBusCheckAsyncTag(const char *tag) @@ -195,3 +197,5 @@ int qDBusParametersForMethod(const QMetaMethod &mm, QList<int>& metaTypes) } QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp index 3db5d9f..dac7a92 100644 --- a/src/dbus/qdbuspendingcall.cpp +++ b/src/dbus/qdbuspendingcall.cpp @@ -48,6 +48,8 @@ #include "qcoreevent.h" #include <private/qobject_p.h> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE /*! @@ -513,4 +515,6 @@ void QDBusPendingCallWatcher::waitForFinished() } QT_END_NAMESPACE +#endif // QT_NO_DBUS + #include "moc_qdbuspendingcall.cpp" diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h index e8c7d4a..ca0eaaa 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -49,6 +49,8 @@ #include <QtDBus/qdbusmacros.h> #include <QtDBus/qdbusmessage.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -119,4 +121,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbuspendingcall_p.h b/src/dbus/qdbuspendingcall_p.h index 641c397..f1f6dc2 100644 --- a/src/dbus/qdbuspendingcall_p.h +++ b/src/dbus/qdbuspendingcall_p.h @@ -61,6 +61,8 @@ #include "qdbusmessage.h" #include "qdbus_symbols_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QDBusPendingCall; @@ -122,4 +124,5 @@ Q_SIGNALS: QT_END_NAMESPACE +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbuspendingreply.cpp b/src/dbus/qdbuspendingreply.cpp index b492660..40cf6e3 100644 --- a/src/dbus/qdbuspendingreply.cpp +++ b/src/dbus/qdbuspendingreply.cpp @@ -43,6 +43,8 @@ #include "qdbuspendingcall_p.h" #include "qdbusmetatype.h" +#ifndef QT_NO_DBUS + /*! \class QDBusPendingReply \inmodule QtDBus @@ -275,3 +277,4 @@ void QDBusPendingReplyData::setMetaTypes(int count, const int *types) d->checkReceivedSignature(); } +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index 958c8d5..4757115 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -47,6 +47,8 @@ #include <QtDBus/qdbusargument.h> #include <QtDBus/qdbuspendingcall.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -211,4 +213,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusreply.cpp b/src/dbus/qdbusreply.cpp index 257d1b6..81b5d0a 100644 --- a/src/dbus/qdbusreply.cpp +++ b/src/dbus/qdbusreply.cpp @@ -44,6 +44,8 @@ #include "qdbusmetatype_p.h" #include <QDebug> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE /*! @@ -242,3 +244,5 @@ void qDBusReplyFill(const QDBusMessage &reply, QDBusError &error, QVariant &data } QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index 092ffcb..fbe7459 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -51,6 +51,8 @@ #include <QtDBus/qdbusextratypes.h> #include <QtDBus/qdbuspendingreply.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -193,4 +195,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index 8f9323a..2377795 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -42,12 +42,14 @@ #include "qdbusserver.h" #include "qdbusconnection_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE /*! \class QDBusServer \inmodule QtDBus - \since 4.2 + \internal \brief The QDBusServer class provides peer-to-peer communication between processes on the same computer. @@ -119,3 +121,5 @@ QString QDBusServer::address() const */ QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusserver.h b/src/dbus/qdbusserver.h index 12c910d..90d40f5 100644 --- a/src/dbus/qdbusserver.h +++ b/src/dbus/qdbusserver.h @@ -45,6 +45,8 @@ #include <QtCore/qstring.h> #include <QtDBus/qdbusmacros.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -77,4 +79,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusservicewatcher.cpp b/src/dbus/qdbusservicewatcher.cpp index 3d5bc0b..426c3b0 100644 --- a/src/dbus/qdbusservicewatcher.cpp +++ b/src/dbus/qdbusservicewatcher.cpp @@ -47,6 +47,8 @@ #include <private/qobject_p.h> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC_WITH_ARGS(QString, busService, (QLatin1String(DBUS_SERVICE_DBUS))) @@ -374,4 +376,6 @@ void QDBusServiceWatcher::setConnection(const QDBusConnection &connection) QT_END_NAMESPACE +#endif // QT_NO_DBUS + #include "moc_qdbusservicewatcher.cpp" diff --git a/src/dbus/qdbusservicewatcher.h b/src/dbus/qdbusservicewatcher.h index 5f2934a..c7609a8 100644 --- a/src/dbus/qdbusservicewatcher.h +++ b/src/dbus/qdbusservicewatcher.h @@ -45,6 +45,8 @@ #include <QtCore/qobject.h> #include <QtDBus/qdbusmacros.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -100,4 +102,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS #endif // QDBUSSERVICEWATCHER_H diff --git a/src/dbus/qdbusthreaddebug_p.h b/src/dbus/qdbusthreaddebug_p.h index 2748dcd..e8d90c5 100644 --- a/src/dbus/qdbusthreaddebug_p.h +++ b/src/dbus/qdbusthreaddebug_p.h @@ -52,6 +52,10 @@ // We mean it. // +#include <QtCore/qglobal.h> + +#ifndef QT_NO_DBUS + #if !defined(QDBUS_THREAD_DEBUG) && defined(QT_BUILD_INTERNAL) # define QDBUS_THREAD_DEBUG 1 #endif @@ -227,4 +231,5 @@ struct QDBusWatchAndTimeoutLocker: QDBusMutexLocker # define SEM_RELEASE(action, sem) sem.release() #endif +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp index 33017fe..2fcdc73 100644 --- a/src/dbus/qdbusutil.cpp +++ b/src/dbus/qdbusutil.cpp @@ -47,6 +47,8 @@ #include "qdbusargument.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE static inline bool isValidCharacterNoDash(const QChar &c) @@ -466,3 +468,5 @@ namespace QDBusUtil } // namespace QDBusUtil QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h index 710acac..8a1846a 100644 --- a/src/dbus/qdbusutil_p.h +++ b/src/dbus/qdbusutil_p.h @@ -59,6 +59,8 @@ #include <QtDBus/qdbusmacros.h> #include <QtDBus/qdbuserror.h> +#ifndef QT_NO_DBUS + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -157,4 +159,5 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp index 81eaa33..463ac73 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -49,6 +49,8 @@ #include "qdbusmetatype.h" #include "qdbusutil_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE extern QDBUS_EXPORT QString qDBusGenerateMetaObjectXml(QString interface, const QMetaObject *mo, @@ -158,7 +160,7 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method // do we need to describe this argument? if (QDBusMetaType::signatureToType(typeName) == QVariant::Invalid) xml += QString::fromLatin1(" <annotation name=\"com.trolltech.QtDBus.QtTypeName.Out0\" value=\"%1\"/>\n") - .arg(typeNameToXml(mm.typeName())); + .arg(typeNameToXml(QVariant::typeToName(QVariant::Type(typeId)))); } else continue; } @@ -302,3 +304,5 @@ QString qDBusGenerateMetaObjectXml(QString interface, const QMetaObject *mo, con #endif QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusxmlparser.cpp b/src/dbus/qdbusxmlparser.cpp index ac8109f..05e2b11d 100644 --- a/src/dbus/qdbusxmlparser.cpp +++ b/src/dbus/qdbusxmlparser.cpp @@ -50,6 +50,8 @@ #include <QtCore/qvariant.h> #include <QtCore/qtextstream.h> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE static QDBusIntrospection::Annotations @@ -367,3 +369,5 @@ QDBusXmlParser::objectTree() const } QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/dbus/qdbusxmlparser_p.h b/src/dbus/qdbusxmlparser_p.h index 9144d35..9d58e2a 100644 --- a/src/dbus/qdbusxmlparser_p.h +++ b/src/dbus/qdbusxmlparser_p.h @@ -58,6 +58,8 @@ #include <qdbusmacros.h> #include "qdbusintrospection_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE /*! @@ -82,4 +84,5 @@ public: QT_END_NAMESPACE +#endif // QT_NO_DBUS #endif |