diff options
Diffstat (limited to 'src/dbus')
38 files changed, 102 insertions, 35 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index c50f0b6b9c..96a798ed66 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -27,9 +27,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 +47,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.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 b710bfd2aa..bd100639d1 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> 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 bd7014bdf9..7c3abc9cc7 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_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/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/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.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 b7de1b22e8..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) 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 e11fe573b5..9a95ab7ba3 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..73a410d94e 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> 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 |