diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2016-09-20 12:40:45 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2016-09-20 12:27:32 +0000 |
| commit | 7be7316aeec7eb3e63dde518ae021988c6ad93b6 (patch) | |
| tree | bc983cc9bc7c0c89a8ec5a2763906ce8f63b69ab /libqdb | |
| parent | e1c4c11d29240d6c7862d0a85484015ebd632288 (diff) | |
Make forward declarations namespace aware
When Qt is built to be located in a namespace, forward declarations of
Qt don't work unless they are wrapped inside QT_BEGIN_NAMESPACE and
QT_END_NAMESPACE.
Overloading the >> operators also need to be wrapped.
Change-Id: Ie4e569a1d4f0844c50cc84ecc876160563926ddb
Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
Diffstat (limited to 'libqdb')
| -rw-r--r-- | libqdb/interruptsignalhandler.h | 3 | ||||
| -rw-r--r-- | libqdb/protocol/qdbmessage.h | 10 | ||||
| -rw-r--r-- | libqdb/protocol/qdbtransport.h | 4 | ||||
| -rw-r--r-- | libqdb/usb/usbconnection.h | 4 |
4 files changed, 16 insertions, 5 deletions
diff --git a/libqdb/interruptsignalhandler.h b/libqdb/interruptsignalhandler.h index 54272a2..9f2a163 100644 --- a/libqdb/interruptsignalhandler.h +++ b/libqdb/interruptsignalhandler.h @@ -24,7 +24,10 @@ #include <QtCore/qobject.h> #ifdef Q_OS_UNIX +QT_BEGIN_NAMESPACE class QSocketNotifier; +QT_END_NAMESPACE + #include <memory> #include <signal.h> diff --git a/libqdb/protocol/qdbmessage.h b/libqdb/protocol/qdbmessage.h index 6def63a..99c57bb 100644 --- a/libqdb/protocol/qdbmessage.h +++ b/libqdb/protocol/qdbmessage.h @@ -26,7 +26,9 @@ #include <stdint.h> +QT_BEGIN_NAMESPACE class QDataStream; +QT_END_NAMESPACE using StreamId = uint32_t; @@ -72,9 +74,11 @@ private: }; Q_DECLARE_METATYPE(QdbMessage::CommandType) -QDebug &operator<<(QDebug &stream, const QdbMessage &message); +QT_BEGIN_NAMESPACE +QDebug &operator<<(QDebug &stream, const ::QdbMessage &message); -QDataStream &operator<<(QDataStream &stream, const QdbMessage &message); -QDataStream &operator>>(QDataStream &stream, QdbMessage &message); +QDataStream &operator<<(QDataStream &stream, const ::QdbMessage &message); +QDataStream &operator>>(QDataStream &stream, ::QdbMessage &message); +QT_END_NAMESPACE #endif // QDBMESSAGE_H diff --git a/libqdb/protocol/qdbtransport.h b/libqdb/protocol/qdbtransport.h index 1fe91e4..de5720a 100644 --- a/libqdb/protocol/qdbtransport.h +++ b/libqdb/protocol/qdbtransport.h @@ -24,10 +24,12 @@ #include "protocol/qdbmessage.h" #include <QtCore/qobject.h> +QT_BEGIN_NAMESPACE +class QIODevice; +QT_END_NAMESPACE #include <memory> -class QIODevice; class QdbTransport : public QObject { diff --git a/libqdb/usb/usbconnection.h b/libqdb/usb/usbconnection.h index bdf2670..87c10d5 100644 --- a/libqdb/usb/usbconnection.h +++ b/libqdb/usb/usbconnection.h @@ -27,8 +27,10 @@ class UsbConnectionReader; #include <QtCore/qbytearray.h> #include <QtCore/qiodevice.h> -class QThread; #include <QtCore/qqueue.h> +QT_BEGIN_NAMESPACE +class QThread; +QT_END_NAMESPACE #include <memory> |