diff options
Diffstat (limited to 'src/dbus')
44 files changed, 123 insertions, 103 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index fa67fc17ef..43050dcea2 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -1,17 +1,11 @@ TARGET = QtDBus QT = core-private -CONFIG += link_pkgconfig MODULE_CONFIG = dbusadaptors dbusinterfaces -!contains(QT_LIBS_DBUS, .*dbus-1.*) { - win32:CONFIG(debug, debug|release):QT_LIBS_DBUS += -ldbus-1d - else:QT_LIBS_DBUS += -ldbus-1 -} - DEFINES += DBUS_API_SUBJECT_TO_CHANGE -QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS -contains(QT_CONFIG, dbus-linked) { - LIBS_PRIVATE += $$QT_LIBS_DBUS +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS +qtConfig(dbus-linked) { + QMAKE_USE_PRIVATE += dbus DEFINES += QT_LINKED_LIBDBUS } @@ -27,9 +21,9 @@ DEFINES += QT_NO_FOREACH QMAKE_DOCS = $$PWD/doc/qtdbus.qdocconf -PUB_HEADERS = qdbusargument.h \ +PUB_HEADERS = qtdbusglobal.h \ + qdbusargument.h \ qdbusconnectioninterface.h \ - qdbusmacros.h \ qdbuserror.h \ qdbusextratypes.h \ qdbusmessage.h \ @@ -47,6 +41,7 @@ PUB_HEADERS = qdbusargument.h \ qdbusservicewatcher.h \ qdbusunixfiledescriptor.h HEADERS += $$PUB_HEADERS \ + qtdbusglobal_p.h \ qdbusconnection_p.h \ qdbusconnectionmanager_p.h \ qdbusmessage_p.h \ diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h index fbeea61c95..cfc0e12046 100644 --- a/src/dbus/qdbus_symbols_p.h +++ b/src/dbus/qdbus_symbols_p.h @@ -53,7 +53,7 @@ #ifndef QDBUS_SYMBOLS_P_H #define QDBUS_SYMBOLS_P_H -#include <QtCore/qglobal.h> +#include <QtDBus/private/qtdbusglobal_p.h> #ifndef QT_NO_DBUS diff --git a/src/dbus/qdbusabstractadaptor.h b/src/dbus/qdbusabstractadaptor.h index e506458d33..f86d939fae 100644 --- a/src/dbus/qdbusabstractadaptor.h +++ b/src/dbus/qdbusabstractadaptor.h @@ -40,8 +40,8 @@ #ifndef QDBUSABSTRACTADAPTOR_H #define QDBUSABSTRACTADAPTOR_H +#include <QtDBus/qtdbusglobal.h> #include <QtCore/qobject.h> -#include <QtDBus/qdbusmacros.h> #ifndef QT_NO_DBUS diff --git a/src/dbus/qdbusabstractadaptor_p.h b/src/dbus/qdbusabstractadaptor_p.h index e99e35766d..ed28777734 100644 --- a/src/dbus/qdbusabstractadaptor_p.h +++ b/src/dbus/qdbusabstractadaptor_p.h @@ -52,6 +52,7 @@ #ifndef QDBUSABSTRACTADAPTOR_P_H #define QDBUSABSTRACTADAPTOR_P_H +#include <QtDBus/private/qtdbusglobal_p.h> #include <qdbusabstractadaptor.h> #include <QtCore/qobject.h> diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h index 32c33f19f2..f859c5ee7d 100644 --- a/src/dbus/qdbusabstractinterface.h +++ b/src/dbus/qdbusabstractinterface.h @@ -40,6 +40,7 @@ #ifndef QDBUSABSTRACTINTERFACE_H #define QDBUSABSTRACTINTERFACE_H +#include <QtDBus/qtdbusglobal.h> #include <QtCore/qstring.h> #include <QtCore/qvariant.h> #include <QtCore/qlist.h> diff --git a/src/dbus/qdbusabstractinterface_p.h b/src/dbus/qdbusabstractinterface_p.h index ba555d5862..8e45bae88b 100644 --- a/src/dbus/qdbusabstractinterface_p.h +++ b/src/dbus/qdbusabstractinterface_p.h @@ -53,6 +53,7 @@ #ifndef QDBUSABSTRACTINTERFACE_P_H #define QDBUSABSTRACTINTERFACE_P_H +#include <QtDBus/private/qtdbusglobal_p.h> #include <qdbusabstractinterface.h> #include <qdbusconnection.h> #include <qdbuserror.h> diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 85469fbc3d..5342a79227 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -40,6 +40,7 @@ #ifndef QDBUSARGUMENT_H #define QDBUSARGUMENT_H +#include <QtDBus/qtdbusglobal.h> #include <QtCore/qbytearray.h> #include <QtCore/qhash.h> #include <QtCore/qglobal.h> @@ -49,7 +50,6 @@ #include <QtCore/qstringlist.h> #include <QtCore/qvariant.h> #include <QtDBus/qdbusextratypes.h> -#include <QtDBus/qdbusmacros.h> #ifndef QT_NO_DBUS diff --git a/src/dbus/qdbusargument_p.h b/src/dbus/qdbusargument_p.h index ca0a2cde13..559f8b1186 100644 --- a/src/dbus/qdbusargument_p.h +++ b/src/dbus/qdbusargument_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtDBus/private/qtdbusglobal_p.h> #include <qdbusargument.h> #include "qdbusunixfiledescriptor.h" #include "qdbus_symbols_p.h" diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index da7557d7e8..f95cc3a15d 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -69,10 +69,6 @@ QT_BEGIN_NAMESPACE -#ifdef Q_OS_WIN -static void preventDllUnload(); -#endif - Q_GLOBAL_STATIC(QDBusConnectionManager, _q_manager) struct QDBusConnectionManager::ConnectionRequestData @@ -143,10 +139,6 @@ QDBusConnectionManager::QDBusConnectionManager() this, &QDBusConnectionManager::createServer, Qt::BlockingQueuedConnection); moveToThread(this); // ugly, don't do this in other projects -#ifdef Q_OS_WIN - // prevent the library from being unloaded on Windows. See comments in the function. - preventDllUnload(); -#endif defaultBuses[0] = defaultBuses[1] = Q_NULLPTR; start(); } @@ -1270,31 +1262,4 @@ QByteArray QDBusConnection::localMachineId() QT_END_NAMESPACE -#ifdef Q_OS_WIN -# include <qt_windows.h> - -QT_BEGIN_NAMESPACE -static void preventDllUnload() -{ - // Thread termination is really wacky on Windows. For some reason we don't - // understand, exiting from the thread may try to unload the DLL. Since the - // QDBusConnectionManager thread runs until the DLL is unloaded, we've got - // a deadlock: the main thread is waiting for the manager thread to exit, - // but the manager thread is attempting to acquire a lock to unload the DLL. - // - // We work around the issue by preventing the unload from happening in the - // first place. - // - // For this trick, see - // https://blogs.msdn.microsoft.com/oldnewthing/20131105-00/?p=2733 - - static HMODULE self; - GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | - GET_MODULE_HANDLE_EX_FLAG_PIN, - reinterpret_cast<const wchar_t *>(&self), // any address in this DLL - &self); -} -QT_END_NAMESPACE -#endif - #endif // QT_NO_DBUS diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index d7ba55b3eb..d9a894b637 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -41,7 +41,7 @@ #ifndef QDBUSCONNECTION_H #define QDBUSCONNECTION_H -#include <QtDBus/qdbusmacros.h> +#include <QtDBus/qtdbusglobal.h> #include <QtCore/qobjectdefs.h> #include <QtCore/qstring.h> diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index ef8946f9e8..a63e976f99 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -53,6 +53,7 @@ #ifndef QDBUSCONNECTION_P_H #define QDBUSCONNECTION_P_H +#include <QtDBus/private/qtdbusglobal_p.h> #include <qdbuserror.h> #include <qdbusconnection.h> @@ -279,7 +280,7 @@ public slots: void socketWrite(int); void objectDestroyed(QObject *o); void relaySignal(QObject *obj, const QMetaObject *, int signalId, const QVariantList &args); - void addSignalHook(const QString &key, const SignalHook &hook); + bool addSignalHook(const QString &key, const SignalHook &hook); bool removeSignalHook(const QString &key, const SignalHook &hook); private slots: @@ -292,7 +293,7 @@ signals: void dispatchStatusChanged(); void spyHooksFinished(const QDBusMessage &msg); void messageNeedsSending(QDBusPendingCallPrivate *pcall, void *msg, int timeout = -1); - void signalNeedsConnecting(const QString &key, const QDBusConnectionPrivate::SignalHook &hook); + bool signalNeedsConnecting(const QString &key, const QDBusConnectionPrivate::SignalHook &hook); bool signalNeedsDisconnecting(const QString &key, const QDBusConnectionPrivate::SignalHook &hook); void serviceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner); void callWithCallbackFailed(const QDBusError &error, const QDBusMessage &message); diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h index 862bbbc0cd..7b694a1f96 100644 --- a/src/dbus/qdbusconnectioninterface.h +++ b/src/dbus/qdbusconnectioninterface.h @@ -40,6 +40,7 @@ #ifndef QDBUSCONNECTIONINTERFACE_H #define QDBUSCONNECTIONINTERFACE_H +#include <QtDBus/qtdbusglobal.h> #include <QtCore/qstringlist.h> #include <QtDBus/qdbusabstractinterface.h> diff --git a/src/dbus/qdbusconnectionmanager_p.h b/src/dbus/qdbusconnectionmanager_p.h index 5e85f86f9f..1c7dea811d 100644 --- a/src/dbus/qdbusconnectionmanager_p.h +++ b/src/dbus/qdbusconnectionmanager_p.h @@ -53,6 +53,7 @@ #ifndef QDBUSCONNECTIONMANAGER_P_H #define QDBUSCONNECTIONMANAGER_P_H +#include <QtDBus/private/qtdbusglobal_p.h> #include "qdbusconnection_p.h" #include "private/qthread_p.h" diff --git a/src/dbus/qdbuscontext.h b/src/dbus/qdbuscontext.h index 9af6ff52ed..fedfcbd98e 100644 --- a/src/dbus/qdbuscontext.h +++ b/src/dbus/qdbuscontext.h @@ -40,6 +40,7 @@ #ifndef QDBUSCONTEXT_H #define QDBUSCONTEXT_H +#include <QtDBus/qtdbusglobal.h> #include <QtCore/qstring.h> #include <QtDBus/qdbuserror.h> diff --git a/src/dbus/qdbuscontext_p.h b/src/dbus/qdbuscontext_p.h index 00c749fbc8..087ded8b4f 100644 --- a/src/dbus/qdbuscontext_p.h +++ b/src/dbus/qdbuscontext_p.h @@ -52,7 +52,7 @@ #ifndef QDBUSCONTEXT_P_H #define QDBUSCONTEXT_P_H -#include <QtCore/qglobal.h> +#include <QtDBus/private/qtdbusglobal_p.h> #ifndef QT_NO_DBUS diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h index 6bb1e2241f..c264f62b7d 100644 --- a/src/dbus/qdbuserror.h +++ b/src/dbus/qdbuserror.h @@ -40,7 +40,7 @@ #ifndef QDBUSERROR_H #define QDBUSERROR_H -#include <QtDBus/qdbusmacros.h> +#include <QtDBus/qtdbusglobal.h> #include <QtCore/qstring.h> #ifndef QT_NO_DBUS diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index b65bfc1e9b..12961e2702 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -42,9 +42,9 @@ // define some useful types for D-BUS +#include <QtDBus/qtdbusglobal.h> #include <QtCore/qvariant.h> #include <QtCore/qstring.h> -#include <QtDBus/qdbusmacros.h> #if QT_DEPRECATED_SINCE(5, 6) #include <QtCore/qhash.h> #endif diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index d9e7720a06..c63fb05e74 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -2200,20 +2200,16 @@ bool QDBusConnectionPrivate::connectSignal(const QString &service, // check the slot QDBusConnectionPrivate::SignalHook hook; QString key; - QString name2 = name; - if (name2.isNull()) - name2.detach(); hook.signature = signature; if (!prepareHook(hook, key, service, path, interface, name, argumentMatch, receiver, slot, 0, false)) return false; // don't connect Q_ASSERT(thread() != QThread::currentThread()); - emit signalNeedsConnecting(key, hook); - return true; + return emit signalNeedsConnecting(key, hook); } -void QDBusConnectionPrivate::addSignalHook(const QString &key, const SignalHook &hook) +bool QDBusConnectionPrivate::addSignalHook(const QString &key, const SignalHook &hook) { QDBusWriteLocker locker(ConnectAction, this); @@ -2229,7 +2225,7 @@ void QDBusConnectionPrivate::addSignalHook(const QString &key, const SignalHook entry.midx == hook.midx && entry.argumentMatch == hook.argumentMatch) { // no need to compare the parameters if it's the same slot - return; // already there + return false; // already there } } @@ -2241,7 +2237,7 @@ void QDBusConnectionPrivate::addSignalHook(const QString &key, const SignalHook if (mit != matchRefCounts.end()) { // Match already present mit.value() = mit.value() + 1; - return; + return true; } matchRefCounts.insert(hook.matchRule, 1); @@ -2268,6 +2264,7 @@ void QDBusConnectionPrivate::addSignalHook(const QString &key, const SignalHook } } } + return true; } bool QDBusConnectionPrivate::disconnectSignal(const QString &service, diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h index 470baeb692..85a067da1e 100644 --- a/src/dbus/qdbusintegrator_p.h +++ b/src/dbus/qdbusintegrator_p.h @@ -53,6 +53,7 @@ #ifndef QDBUSINTEGRATOR_P_H #define QDBUSINTEGRATOR_P_H +#include <QtDBus/private/qtdbusglobal_p.h> #include "qdbus_symbols_p.h" #include "qcoreevent.h" diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h index 9db2cb9ce8..b6c2693400 100644 --- a/src/dbus/qdbusinterface.h +++ b/src/dbus/qdbusinterface.h @@ -40,6 +40,7 @@ #ifndef QDBUSINTERFACE_H #define QDBUSINTERFACE_H +#include <QtDBus/qtdbusglobal.h> #include <QtDBus/qdbusabstractinterface.h> #include <QtDBus/qdbusconnection.h> diff --git a/src/dbus/qdbusinterface_p.h b/src/dbus/qdbusinterface_p.h index f35916502b..b726925306 100644 --- a/src/dbus/qdbusinterface_p.h +++ b/src/dbus/qdbusinterface_p.h @@ -52,6 +52,7 @@ #ifndef QDBUSINTERFACE_P_H #define QDBUSINTERFACE_P_H +#include <QtDBus/private/qtdbusglobal_p.h> #include "qdbusabstractinterface_p.h" #include "qdbusmetaobject_p.h" #include <qdbusinterface.h> diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp index ad6b06da23..03e04bb2f5 100644 --- a/src/dbus/qdbusinternalfilters.cpp +++ b/src/dbus/qdbusinternalfilters.cpp @@ -116,8 +116,7 @@ static QString generateSubObjectXml(QObject *object) for ( ; it != end; ++it) { QString name = (*it)->objectName(); if (!name.isEmpty() && QDBusUtil::isValidPartOfObjectPath(name)) - retval += QString::fromLatin1(" <node name=\"%1\"/>\n") - .arg(name); + retval += QLatin1String(" <node name=\"") + name + QLatin1String("\"/>\n"); } return retval; } @@ -192,8 +191,7 @@ QString qDBusIntrospectObject(const QDBusConnectionPrivate::ObjectTreeNode &node node.children.constEnd(); for ( ; it != end; ++it) if (it->obj || !it->children.isEmpty()) - xml_data += QString::fromLatin1(" <node name=\"%1\"/>\n") - .arg(it->name); + xml_data += QLatin1String(" <node name=\"") + it->name + QLatin1String("\"/>\n"); } xml_data += QLatin1String("</node>\n"); diff --git a/src/dbus/qdbusintrospection_p.h b/src/dbus/qdbusintrospection_p.h index 2b02a71156..e60900b162 100644 --- a/src/dbus/qdbusintrospection_p.h +++ b/src/dbus/qdbusintrospection_p.h @@ -51,13 +51,13 @@ // We mean it. // +#include <QtDBus/private/qtdbusglobal_p.h> #include <QtCore/qstring.h> #include <QtCore/qvector.h> #include <QtCore/qstringlist.h> #include <QtCore/qmap.h> #include <QtCore/qpair.h> #include <QtCore/qshareddata.h> -#include "qdbusmacros.h" #ifndef QT_NO_DBUS diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp index 7ba7c79808..4ea6cefff6 100644 --- a/src/dbus/qdbusmarshaller.cpp +++ b/src/dbus/qdbusmarshaller.cpp @@ -318,7 +318,7 @@ void QDBusMarshaller::open(QDBusMarshaller &sub, int code, const char *signature case DBUS_TYPE_ARRAY: *ba += char(code); *ba += signature; - // fall through + Q_FALLTHROUGH(); case DBUS_TYPE_DICT_ENTRY: sub.closeCode = 0; @@ -495,9 +495,9 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg) return true; default: - ; // fall through + ; } - // fall through + Q_FALLTHROUGH(); case DBUS_TYPE_STRUCT: case DBUS_STRUCT_BEGIN_CHAR: @@ -513,7 +513,7 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg) append(qvariant_cast<QDBusUnixFileDescriptor>(arg)); return true; } - // fall through + Q_FALLTHROUGH(); default: qWarning("QDBusMarshaller::appendVariantInternal: Found unknown D-BUS type '%s'", diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index 570dd0b736..9f4a98b855 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.h @@ -40,7 +40,7 @@ #ifndef QDBUSMESSAGE_H #define QDBUSMESSAGE_H -#include <QtDBus/qdbusmacros.h> +#include <QtDBus/qtdbusglobal.h> #include <QtDBus/qdbuserror.h> #include <QtCore/qlist.h> #include <QtCore/qvariant.h> diff --git a/src/dbus/qdbusmessage_p.h b/src/dbus/qdbusmessage_p.h index 31a333f9fb..4b84b3f0cc 100644 --- a/src/dbus/qdbusmessage_p.h +++ b/src/dbus/qdbusmessage_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtDBus/private/qtdbusglobal_p.h> #include <qatomic.h> #include <qstring.h> #include <qdbusmessage.h> diff --git a/src/dbus/qdbusmetaobject_p.h b/src/dbus/qdbusmetaobject_p.h index c785849826..599358634b 100644 --- a/src/dbus/qdbusmetaobject_p.h +++ b/src/dbus/qdbusmetaobject_p.h @@ -37,6 +37,9 @@ ** ****************************************************************************/ +#ifndef QDBUSMETAOBJECT_P_H +#define QDBUSMETAOBJECT_P_H + // // W A R N I N G // ------------- @@ -49,11 +52,8 @@ // // -#ifndef QDBUSMETAOBJECT_P_H -#define QDBUSMETAOBJECT_P_H - +#include <QtDBus/private/qtdbusglobal_p.h> #include <QtCore/qmetaobject.h> -#include <qdbusmacros.h> #ifndef QT_NO_DBUS diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp index 59a71ade3e..fb2b407997 100644 --- a/src/dbus/qdbusmetatype.cpp +++ b/src/dbus/qdbusmetatype.cpp @@ -373,7 +373,7 @@ int QDBusMetaType::signatureToType(const char *signature) return qMetaTypeId<QList<QDBusSignature> >(); } - // fall through + Q_FALLTHROUGH(); default: return QMetaType::UnknownType; } diff --git a/src/dbus/qdbusmetatype.h b/src/dbus/qdbusmetatype.h index 8b314da78c..9f3d9019d7 100644 --- a/src/dbus/qdbusmetatype.h +++ b/src/dbus/qdbusmetatype.h @@ -40,6 +40,7 @@ #ifndef QDBUSMETATYPE_H #define QDBUSMETATYPE_H +#include <QtDBus/qtdbusglobal.h> #include "QtCore/qmetatype.h" #include <QtDBus/qdbusargument.h> diff --git a/src/dbus/qdbusmetatype_p.h b/src/dbus/qdbusmetatype_p.h index 3bfe18729e..1aa11552df 100644 --- a/src/dbus/qdbusmetatype_p.h +++ b/src/dbus/qdbusmetatype_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtDBus/private/qtdbusglobal_p.h> #include <qdbusmetatype.h> #include <qdbusmessage.h> diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h index a89103f242..1e4c6ebfd2 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -40,13 +40,11 @@ #ifndef QDBUSPENDINGCALL_H #define QDBUSPENDINGCALL_H -#include <QtCore/qglobal.h> +#include <QtDBus/qtdbusglobal.h> +#include <QtDBus/qdbusmessage.h> #include <QtCore/qobject.h> #include <QtCore/qshareddata.h> -#include <QtDBus/qdbusmacros.h> -#include <QtDBus/qdbusmessage.h> - #ifndef QT_NO_DBUS QT_BEGIN_NAMESPACE diff --git a/src/dbus/qdbuspendingcall_p.h b/src/dbus/qdbuspendingcall_p.h index d6c2ef2114..10f189ae43 100644 --- a/src/dbus/qdbuspendingcall_p.h +++ b/src/dbus/qdbuspendingcall_p.h @@ -53,6 +53,7 @@ #ifndef QDBUSPENDINGCALL_P_H #define QDBUSPENDINGCALL_P_H +#include <QtDBus/private/qtdbusglobal_p.h> #include <qshareddata.h> #include <qpointer.h> #include <qvector.h> diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index 1ee658c0c8..786eab2120 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -40,8 +40,7 @@ #ifndef QDBUSPENDINGREPLY_H #define QDBUSPENDINGREPLY_H -#include <QtCore/qglobal.h> -#include <QtDBus/qdbusmacros.h> +#include <QtDBus/qtdbusglobal.h> #include <QtDBus/qdbusargument.h> #include <QtDBus/qdbuspendingcall.h> diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index 897e9452eb..b6a454d240 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -40,10 +40,9 @@ #ifndef QDBUSREPLY_H #define QDBUSREPLY_H -#include <QtCore/qglobal.h> +#include <QtDBus/qtdbusglobal.h> #include <QtCore/qvariant.h> -#include <QtDBus/qdbusmacros.h> #include <QtDBus/qdbusmessage.h> #include <QtDBus/qdbuserror.h> #include <QtDBus/qdbusextratypes.h> diff --git a/src/dbus/qdbusserver.h b/src/dbus/qdbusserver.h index 0844229256..ac4dfcb67f 100644 --- a/src/dbus/qdbusserver.h +++ b/src/dbus/qdbusserver.h @@ -40,9 +40,9 @@ #ifndef QDBUSSERVER_H #define QDBUSSERVER_H +#include <QtDBus/qtdbusglobal.h> #include <QtCore/qobject.h> #include <QtCore/qstring.h> -#include <QtDBus/qdbusmacros.h> #ifndef QT_NO_DBUS diff --git a/src/dbus/qdbusservicewatcher.h b/src/dbus/qdbusservicewatcher.h index a785c89761..77573beb5d 100644 --- a/src/dbus/qdbusservicewatcher.h +++ b/src/dbus/qdbusservicewatcher.h @@ -40,8 +40,7 @@ #ifndef QDBUSSERVICEWATCHER_H #define QDBUSSERVICEWATCHER_H -#include <QtCore/qobject.h> -#include <QtDBus/qdbusmacros.h> +#include <QtDBus/qtdbusglobal.h> #if !defined(QT_NO_DBUS) && !defined(QT_NO_QOBJECT) @@ -63,6 +62,7 @@ public: WatchForOwnerChange = 0x03 }; Q_DECLARE_FLAGS(WatchMode, WatchModeFlag) + Q_FLAG(WatchMode) explicit QDBusServiceWatcher(QObject *parent = Q_NULLPTR); QDBusServiceWatcher(const QString &service, const QDBusConnection &connection, diff --git a/src/dbus/qdbusthreaddebug_p.h b/src/dbus/qdbusthreaddebug_p.h index a94621b8d6..866e777be6 100644 --- a/src/dbus/qdbusthreaddebug_p.h +++ b/src/dbus/qdbusthreaddebug_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtDBus/private/qtdbusglobal_p.h> #ifndef QT_NO_DBUS diff --git a/src/dbus/qdbusunixfiledescriptor.h b/src/dbus/qdbusunixfiledescriptor.h index 05a5617ddc..ed3209ceda 100644 --- a/src/dbus/qdbusunixfiledescriptor.h +++ b/src/dbus/qdbusunixfiledescriptor.h @@ -41,8 +41,8 @@ #ifndef QDBUSUNIXFILEDESCRIPTOR_H #define QDBUSUNIXFILEDESCRIPTOR_H +#include <QtDBus/qtdbusglobal.h> #include <QtCore/qshareddata.h> -#include <QtDBus/qdbusmacros.h> #ifndef QT_NO_DBUS diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h index 4331fdb1d1..931a374ad9 100644 --- a/src/dbus/qdbusutil_p.h +++ b/src/dbus/qdbusutil_p.h @@ -52,12 +52,11 @@ #ifndef QDBUSUTIL_P_H #define QDBUSUTIL_P_H +#include <QtDBus/private/qtdbusglobal_p.h> +#include <QtDBus/qdbuserror.h> #include <QtCore/qstring.h> #include <QtCore/qvariant.h> -#include <QtDBus/qdbusmacros.h> -#include <QtDBus/qdbuserror.h> - #include "qdbus_symbols_p.h" #ifndef QT_NO_DBUS diff --git a/src/dbus/qdbusvirtualobject.h b/src/dbus/qdbusvirtualobject.h index 8eb4c73f57..1a96d900b4 100644 --- a/src/dbus/qdbusvirtualobject.h +++ b/src/dbus/qdbusvirtualobject.h @@ -40,7 +40,7 @@ #ifndef QDBUSVIRTUALOBJECT_H #define QDBUSVIRTUALOBJECT_H -#include <QtDBus/qdbusmacros.h> +#include <QtDBus/qtdbusglobal.h> #include <QtCore/qstring.h> #include <QtCore/qobject.h> @@ -52,7 +52,6 @@ QT_BEGIN_NAMESPACE class QDBusMessage; class QDBusConnection; -class QDBusVirtualObjectPrivate; class Q_DBUS_EXPORT QDBusVirtualObject : public QObject { Q_OBJECT @@ -64,7 +63,6 @@ public: virtual bool handleMessage(const QDBusMessage &message, const QDBusConnection &connection) = 0; private: - Q_DECLARE_PRIVATE(QDBusVirtualObject) Q_DISABLE_COPY(QDBusVirtualObject) }; diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp index 7e7ce9a7e6..d239a69f73 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -59,10 +59,10 @@ static inline QString typeNameToXml(const char *typeName) { // ### copied from qtextdocument.cpp // ### move this into Qt Core at some point - QString plain = QLatin1String(typeName); + const QLatin1String plain(typeName); QString rich; - rich.reserve(int(plain.length() * 1.1)); - for (int i = 0; i < plain.length(); ++i) { + rich.reserve(int(plain.size() * 1.1)); + for (int i = 0; i < plain.size(); ++i) { if (plain.at(i) == QLatin1Char('<')) rich += QLatin1String("<"); else if (plain.at(i) == QLatin1Char('>')) diff --git a/src/dbus/qdbusxmlparser_p.h b/src/dbus/qdbusxmlparser_p.h index 0ba04440c4..7db2d12df4 100644 --- a/src/dbus/qdbusxmlparser_p.h +++ b/src/dbus/qdbusxmlparser_p.h @@ -51,8 +51,8 @@ // We mean it. // +#include <QtDBus/private/qtdbusglobal_p.h> #include <QtCore/qmap.h> -#include <qdbusmacros.h> #include "qdbusintrospection_p.h" #ifndef QT_NO_DBUS diff --git a/src/dbus/qdbusmacros.h b/src/dbus/qtdbusglobal.h index 0b4fdb2cf0..633cc352bb 100644 --- a/src/dbus/qdbusmacros.h +++ b/src/dbus/qtdbusglobal.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QDBUSMACROS_H -#define QDBUSMACROS_H +#ifndef QTDBUSGLOBAL_H +#define QTDBUSGLOBAL_H #include <QtCore/qglobal.h> #include <QtCore/qmetatype.h> diff --git a/src/dbus/qtdbusglobal_p.h b/src/dbus/qtdbusglobal_p.h new file mode 100644 index 0000000000..c2788f5c23 --- /dev/null +++ b/src/dbus/qtdbusglobal_p.h @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtDBus module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTDBUSGLOBAL_P_H +#define QTDBUSGLOBAL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtDBus/qtdbusglobal.h> +#include <QtCore/private/qglobal_p.h> + +#endif // QTDBUSGLOBAL_P_H |