From ee26c3cb2f681e5b5bf65fbea14f2cec53b4224d Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 12 Sep 2011 16:41:14 +0200 Subject: Split qconnectivityglobal.h Split qconnectivityflobal into qbluetoothglobal.h and qnfcglobal.h like the other qt5 modules have it Change-Id: I16cfdd84411ac6da200872b3023c1c98778bb022 Reviewed-on: http://codereview.qt-project.org/4686 Reviewed-by: Qt Sanity Bot Reviewed-by: Alex --- src/bluetooth/qbluetooth.h | 2 +- src/bluetooth/qbluetoothaddress.h | 4 +- src/bluetooth/qbluetoothdevicediscoveryagent.h | 4 +- src/bluetooth/qbluetoothdeviceinfo.h | 4 +- src/bluetooth/qbluetoothglobal.h | 83 +++++++++++++++++++++++++ src/bluetooth/qbluetoothlocaldevice.h | 6 +- src/bluetooth/qbluetoothlocaldevice_p.h | 2 +- src/bluetooth/qbluetoothservicediscoveryagent.h | 4 +- src/bluetooth/qbluetoothserviceinfo.h | 6 +- src/bluetooth/qbluetoothsocket.h | 8 +-- src/bluetooth/qbluetoothtransfermanager.h | 4 +- src/bluetooth/qbluetoothtransferreply.h | 2 +- src/bluetooth/qbluetoothtransferreply_bluez_p.h | 2 +- src/bluetooth/qbluetoothtransferreply_p.h | 2 +- src/bluetooth/qbluetoothtransferrequest.h | 4 +- src/bluetooth/qbluetoothtransferrequest_p.h | 2 +- src/bluetooth/qbluetoothuuid.h | 4 +- src/bluetooth/ql2capserver.h | 4 +- src/bluetooth/ql2capserver_p.h | 2 +- src/bluetooth/qrfcommserver.h | 4 +- src/nfc/qdeclarativendefrecord.h | 6 +- src/nfc/qllcpserver.h | 4 +- src/nfc/qllcpserver_p.h | 2 +- src/nfc/qllcpsocket.h | 4 +- src/nfc/qllcpsocket_p.h | 2 +- src/nfc/qndeffilter.h | 4 +- src/nfc/qndefmessage.h | 4 +- src/nfc/qndefnfctextrecord.h | 4 +- src/nfc/qndefnfcurirecord.h | 4 +- src/nfc/qndefrecord.h | 4 +- src/nfc/qndefrecord_p.h | 2 +- src/nfc/qnearfieldmanager.h | 4 +- src/nfc/qnearfieldmanager_p.h | 2 +- src/nfc/qnearfieldtagtype1.h | 2 +- src/nfc/qnearfieldtagtype2.h | 2 +- src/nfc/qnearfieldtagtype3.h | 2 +- src/nfc/qnearfieldtagtype4.h | 2 +- src/nfc/qnearfieldtarget.h | 8 +-- src/nfc/qnearfieldtarget_p.h | 2 +- src/nfc/qnfcglobal.h | 83 +++++++++++++++++++++++++ src/nfc/qtlv_p.h | 2 +- src/qtconnectivityglobal.h | 83 ------------------------- 42 files changed, 234 insertions(+), 151 deletions(-) create mode 100644 src/bluetooth/qbluetoothglobal.h create mode 100644 src/nfc/qnfcglobal.h delete mode 100644 src/qtconnectivityglobal.h (limited to 'src') diff --git a/src/bluetooth/qbluetooth.h b/src/bluetooth/qbluetooth.h index f79c71a9..86870908 100644 --- a/src/bluetooth/qbluetooth.h +++ b/src/bluetooth/qbluetooth.h @@ -43,7 +43,7 @@ #ifndef QBLUETOOTH_H #define QBLUETOOTH_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" QT_BEGIN_HEADER diff --git a/src/bluetooth/qbluetoothaddress.h b/src/bluetooth/qbluetoothaddress.h index 1ba79bad..c3c26530 100644 --- a/src/bluetooth/qbluetoothaddress.h +++ b/src/bluetooth/qbluetoothaddress.h @@ -42,7 +42,7 @@ #ifndef QBLUETOOTHADDRESS_H #define QBLUETOOTHADDRESS_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include #include @@ -52,7 +52,7 @@ QT_BEGIN_HEADER class QBluetoothAddressPrivate; -class Q_CONNECTIVITY_EXPORT QBluetoothAddress +class Q_BLUETOOTH_EXPORT QBluetoothAddress { public: QBluetoothAddress(); diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.h b/src/bluetooth/qbluetoothdevicediscoveryagent.h index 9502e900..2e5e4bea 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent.h @@ -42,7 +42,7 @@ #ifndef QBLUETOOTHDEVICEDISCOVERYAGENT_H #define QBLUETOOTHDEVICEDISCOVERYAGENT_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include @@ -52,7 +52,7 @@ QT_BEGIN_HEADER class QBluetoothDeviceDiscoveryAgentPrivate; -class Q_CONNECTIVITY_EXPORT QBluetoothDeviceDiscoveryAgent : public QObject +class Q_BLUETOOTH_EXPORT QBluetoothDeviceDiscoveryAgent : public QObject { Q_OBJECT Q_PROPERTY(QBluetoothDeviceDiscoveryAgent::InquiryType inquiryType READ inquiryType WRITE setInquiryType) diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h index 2dc6212f..850414fb 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.h +++ b/src/bluetooth/qbluetoothdeviceinfo.h @@ -42,7 +42,7 @@ #ifndef QBLUETOOTHDEVICEINFO_H #define QBLUETOOTHDEVICEINFO_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include @@ -52,7 +52,7 @@ class QBluetoothDeviceInfoPrivate; class QBluetoothAddress; class QBluetoothUuid; -class Q_CONNECTIVITY_EXPORT QBluetoothDeviceInfo +class Q_BLUETOOTH_EXPORT QBluetoothDeviceInfo { public: enum MajorDeviceClass { diff --git a/src/bluetooth/qbluetoothglobal.h b/src/bluetooth/qbluetoothglobal.h new file mode 100644 index 00000000..02afa7bf --- /dev/null +++ b/src/bluetooth/qbluetoothglobal.h @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtConnectivity module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef QTBLUETOOTH_H +#define QTBLUETOOTH_H + +#include + +#if defined(Q_OS_WIN) +# if defined(QT_NODLL) +# undef QT_MAKEDLL +# undef QT_DLL +# elif defined(QT_MAKEDLL) +# if defined(QT_DLL) +# undef QT_DLL +# endif +# if defined(QT_BUILD_BT_LIB) +# define Q_BLUETOOTH_EXPORT Q_DECL_EXPORT +# else +# define Q_BLUETOOTH_EXPORT Q_DECL_IMPORT +# endif +# elif defined(QT_DLL) +# define Q_BLUETOOTH_EXPORT Q_DECL_EXPORT +# endif +#endif + +#if !defined(Q_BLUETOOTH_EXPORT) +# if defined(QT_SHARED) +# define Q_BLUETOOTH_EXPORT Q_DECL_EXPORT +# else +# define Q_BLUETOOTH_EXPORT +# endif +#endif + +#include +#if defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_MAKEDLL) +# define QM_AUTOTEST_EXPORT Q_DECL_EXPORT +#elif defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_DLL) +# define QM_AUTOTEST_EXPORT Q_DECL_IMPORT +#elif defined(QTM_BUILD_UNITTESTS) && !(defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_SHARED) +# define QM_AUTOTEST_EXPORT Q_DECL_EXPORT +#else +# define QM_AUTOTEST_EXPORT +#endif + +#endif // QTBLUETOOTH_H diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h index 41530819..d013cc8b 100644 --- a/src/bluetooth/qbluetoothlocaldevice.h +++ b/src/bluetooth/qbluetoothlocaldevice.h @@ -43,7 +43,7 @@ #ifndef QBLUETOOTHLOCALDEVICE_H #define QBLUETOOTHLOCALDEVICE_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include #include @@ -55,7 +55,7 @@ QT_BEGIN_HEADER class QBluetoothLocalDevicePrivate; -class Q_CONNECTIVITY_EXPORT QBluetoothHostInfo +class Q_BLUETOOTH_EXPORT QBluetoothHostInfo { public: QBluetoothHostInfo() { }; @@ -77,7 +77,7 @@ private: }; -class Q_CONNECTIVITY_EXPORT QBluetoothLocalDevice : public QObject +class Q_BLUETOOTH_EXPORT QBluetoothLocalDevice : public QObject { Q_OBJECT Q_ENUMS(Pairing) diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h index ae461907..6968e212 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.h +++ b/src/bluetooth/qbluetoothlocaldevice_p.h @@ -42,7 +42,7 @@ #ifndef QBLUETOOTHLOCALDEVICE_P_H #define QBLUETOOTHLOCALDEVICE_P_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include "qbluetoothlocaldevice.h" diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h index 042ef190..2f557db5 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent.h @@ -42,7 +42,7 @@ #ifndef QBLUETOOTHSERVICEDISCOVERYAGENT_H #define QBLUETOOTHSERVICEDISCOVERYAGENT_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include @@ -54,7 +54,7 @@ QT_BEGIN_HEADER class QBluetoothAddress; class QBluetoothServiceDiscoveryAgentPrivate; -class Q_CONNECTIVITY_EXPORT QBluetoothServiceDiscoveryAgent : public QObject +class Q_BLUETOOTH_EXPORT QBluetoothServiceDiscoveryAgent : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QBluetoothServiceDiscoveryAgent) diff --git a/src/bluetooth/qbluetoothserviceinfo.h b/src/bluetooth/qbluetoothserviceinfo.h index f05ed565..28e23fa0 100644 --- a/src/bluetooth/qbluetoothserviceinfo.h +++ b/src/bluetooth/qbluetoothserviceinfo.h @@ -42,7 +42,7 @@ #ifndef QBLUETOOTHSERVICEINFO_H #define QBLUETOOTHSERVICEINFO_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include @@ -57,7 +57,7 @@ QT_BEGIN_HEADER class QBluetoothServiceInfoPrivate; class QBluetoothDeviceInfo; -class Q_CONNECTIVITY_EXPORT QBluetoothServiceInfo +class Q_BLUETOOTH_EXPORT QBluetoothServiceInfo { public: enum AttributeId { @@ -140,7 +140,7 @@ public: bool unregisterService() const; protected: - friend Q_CONNECTIVITY_EXPORT QDebug operator<<(QDebug, const QBluetoothServiceInfo &); + friend Q_BLUETOOTH_EXPORT QDebug operator<<(QDebug, const QBluetoothServiceInfo &); protected: QBluetoothServiceInfoPrivate *d_ptr; diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h index 8afea8ad..25c50079 100644 --- a/src/bluetooth/qbluetoothsocket.h +++ b/src/bluetooth/qbluetoothsocket.h @@ -42,7 +42,7 @@ #ifndef QBLUETOOTHSOCKET_H #define QBLUETOOTHSOCKET_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include #include @@ -55,7 +55,7 @@ QT_BEGIN_HEADER class QBluetoothSocketPrivate; class QBluetoothServiceInfo; -class Q_CONNECTIVITY_EXPORT QBluetoothSocket : public QIODevice +class Q_BLUETOOTH_EXPORT QBluetoothSocket : public QIODevice { Q_OBJECT Q_DECLARE_PRIVATE(QBluetoothSocket) @@ -172,8 +172,8 @@ private: }; #ifndef QT_NO_DEBUG_STREAM -Q_CONNECTIVITY_EXPORT QDebug operator<<(QDebug, QBluetoothSocket::SocketError); -Q_CONNECTIVITY_EXPORT QDebug operator<<(QDebug, QBluetoothSocket::SocketState); +Q_BLUETOOTH_EXPORT QDebug operator<<(QDebug, QBluetoothSocket::SocketError); +Q_BLUETOOTH_EXPORT QDebug operator<<(QDebug, QBluetoothSocket::SocketState); #endif QT_END_HEADER diff --git a/src/bluetooth/qbluetoothtransfermanager.h b/src/bluetooth/qbluetoothtransfermanager.h index 099fa940..b8359ab8 100644 --- a/src/bluetooth/qbluetoothtransfermanager.h +++ b/src/bluetooth/qbluetoothtransfermanager.h @@ -42,7 +42,7 @@ #ifndef QBLUETOOTHTRANSFERMANAGER_H #define QBLUETOOTHTRANSFERMANAGER_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include #include @@ -55,7 +55,7 @@ class QBluetoothTransferReply; class QBluetoothTransferRequest; class QBluetoothTranferManagerPrivate; -class Q_CONNECTIVITY_EXPORT QBluetoothTransferManager : public QObject +class Q_BLUETOOTH_EXPORT QBluetoothTransferManager : public QObject { Q_OBJECT diff --git a/src/bluetooth/qbluetoothtransferreply.h b/src/bluetooth/qbluetoothtransferreply.h index c09be812..a3b12923 100644 --- a/src/bluetooth/qbluetoothtransferreply.h +++ b/src/bluetooth/qbluetoothtransferreply.h @@ -51,7 +51,7 @@ QT_BEGIN_HEADER class QBluetoothTransferReplyPrivate; -class Q_CONNECTIVITY_EXPORT QBluetoothTransferReply : public QObject +class Q_BLUETOOTH_EXPORT QBluetoothTransferReply : public QObject { Q_OBJECT diff --git a/src/bluetooth/qbluetoothtransferreply_bluez_p.h b/src/bluetooth/qbluetoothtransferreply_bluez_p.h index abc0b497..1682a8df 100644 --- a/src/bluetooth/qbluetoothtransferreply_bluez_p.h +++ b/src/bluetooth/qbluetoothtransferreply_bluez_p.h @@ -60,7 +60,7 @@ class OrgOpenobexClientInterface; class OrgOpenobexManagerInterface; class AgentAdaptor; -class Q_CONNECTIVITY_EXPORT QBluetoothTransferReplyBluez : public QBluetoothTransferReply +class Q_BLUETOOTH_EXPORT QBluetoothTransferReplyBluez : public QBluetoothTransferReply { Q_OBJECT diff --git a/src/bluetooth/qbluetoothtransferreply_p.h b/src/bluetooth/qbluetoothtransferreply_p.h index 2e0058d4..e05eca04 100644 --- a/src/bluetooth/qbluetoothtransferreply_p.h +++ b/src/bluetooth/qbluetoothtransferreply_p.h @@ -46,7 +46,7 @@ QT_BEGIN_HEADER -class Q_CONNECTIVITY_EXPORT QBluetoothTransferReplyPrivate +class Q_BLUETOOTH_EXPORT QBluetoothTransferReplyPrivate { public: QBluetoothTransferReplyPrivate(); diff --git a/src/bluetooth/qbluetoothtransferrequest.h b/src/bluetooth/qbluetoothtransferrequest.h index 43322b22..19896a4a 100644 --- a/src/bluetooth/qbluetoothtransferrequest.h +++ b/src/bluetooth/qbluetoothtransferrequest.h @@ -42,7 +42,7 @@ #ifndef QBLUETOOTHTRANSFERREQUEST_H #define QBLUETOOTHTRANSFERREQUEST_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include #include @@ -52,7 +52,7 @@ QT_BEGIN_HEADER class QBluetoothAddress; class QBluetoothTransferRequestPrivate; -class Q_CONNECTIVITY_EXPORT QBluetoothTransferRequest +class Q_BLUETOOTH_EXPORT QBluetoothTransferRequest { public: enum Attribute { diff --git a/src/bluetooth/qbluetoothtransferrequest_p.h b/src/bluetooth/qbluetoothtransferrequest_p.h index decf939c..cb014a8f 100644 --- a/src/bluetooth/qbluetoothtransferrequest_p.h +++ b/src/bluetooth/qbluetoothtransferrequest_p.h @@ -42,7 +42,7 @@ #ifndef QBLUETOOTHTRANSFERREQUESTPRIVATE_H #define QBLUETOOTHTRANSFERREQUESTPRIVATE_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include "qbluetoothtransferrequest.h" QT_BEGIN_HEADER diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h index 09e0db65..55fdcbd2 100644 --- a/src/bluetooth/qbluetoothuuid.h +++ b/src/bluetooth/qbluetoothuuid.h @@ -42,7 +42,7 @@ #ifndef QBLUETOOTHUUID_H #define QBLUETOOTHUUID_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include #include @@ -57,7 +57,7 @@ struct quint128 quint8 data[16]; }; -class Q_CONNECTIVITY_EXPORT QBluetoothUuid : public QUuid +class Q_BLUETOOTH_EXPORT QBluetoothUuid : public QUuid { public: enum ProtocolUuid { diff --git a/src/bluetooth/ql2capserver.h b/src/bluetooth/ql2capserver.h index 23155ef3..18655b38 100644 --- a/src/bluetooth/ql2capserver.h +++ b/src/bluetooth/ql2capserver.h @@ -42,7 +42,7 @@ #ifndef QL2CAPSERVER_H #define QL2CAPSERVER_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include @@ -55,7 +55,7 @@ QT_BEGIN_HEADER class QL2capServerPrivate; class QBluetoothSocket; -class Q_CONNECTIVITY_EXPORT QL2capServer : public QObject +class Q_BLUETOOTH_EXPORT QL2capServer : public QObject { Q_OBJECT diff --git a/src/bluetooth/ql2capserver_p.h b/src/bluetooth/ql2capserver_p.h index b8f056d8..d51139e4 100644 --- a/src/bluetooth/ql2capserver_p.h +++ b/src/bluetooth/ql2capserver_p.h @@ -42,7 +42,7 @@ #ifndef QL2CAPSERVER_P_H #define QL2CAPSERVER_P_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include #ifdef QT_SYMBIAN_BLUETOOTH diff --git a/src/bluetooth/qrfcommserver.h b/src/bluetooth/qrfcommserver.h index 87676649..1b104330 100644 --- a/src/bluetooth/qrfcommserver.h +++ b/src/bluetooth/qrfcommserver.h @@ -42,7 +42,7 @@ #ifndef QRFCOMMSERVER_H #define QRFCOMMSERVER_H -#include "../qtconnectivityglobal.h" +#include "qbluetoothglobal.h" #include @@ -55,7 +55,7 @@ QT_BEGIN_HEADER class QRfcommServerPrivate; class QBluetoothSocket; -class Q_CONNECTIVITY_EXPORT QRfcommServer : public QObject +class Q_BLUETOOTH_EXPORT QRfcommServer : public QObject { Q_OBJECT diff --git a/src/nfc/qdeclarativendefrecord.h b/src/nfc/qdeclarativendefrecord.h index 8448b196..612e1ca7 100644 --- a/src/nfc/qdeclarativendefrecord.h +++ b/src/nfc/qdeclarativendefrecord.h @@ -51,7 +51,7 @@ QT_BEGIN_HEADER class QDeclarativeNdefRecordPrivate; -class Q_CONNECTIVITY_EXPORT QDeclarativeNdefRecord : public QObject +class Q_NFC_EXPORT QDeclarativeNdefRecord : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeNdefRecord) @@ -75,11 +75,11 @@ private: QDeclarativeNdefRecordPrivate *d_ptr; }; -void Q_CONNECTIVITY_EXPORT qRegisterNdefRecordTypeHelper(const QMetaObject *metaObject, +void Q_NFC_EXPORT qRegisterNdefRecordTypeHelper(const QMetaObject *metaObject, QNdefRecord::TypeNameFormat typeNameFormat, const QByteArray &type); -Q_CONNECTIVITY_EXPORT QDeclarativeNdefRecord *qNewDeclarativeNdefRecordForNdefRecord(const QNdefRecord &record); +Q_NFC_EXPORT QDeclarativeNdefRecord *qNewDeclarativeNdefRecordForNdefRecord(const QNdefRecord &record); template bool qRegisterNdefRecordType(QNdefRecord::TypeNameFormat typeNameFormat, const QByteArray &type) diff --git a/src/nfc/qllcpserver.h b/src/nfc/qllcpserver.h index 7a43b237..fad019cf 100644 --- a/src/nfc/qllcpserver.h +++ b/src/nfc/qllcpserver.h @@ -42,7 +42,7 @@ #ifndef QLLCPSERVER_H #define QLLCPSERVER_H -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include @@ -52,7 +52,7 @@ QT_BEGIN_HEADER class QLlcpServerPrivate; -class Q_CONNECTIVITY_EXPORT QLlcpServer : public QObject +class Q_NFC_EXPORT QLlcpServer : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QLlcpServer) diff --git a/src/nfc/qllcpserver_p.h b/src/nfc/qllcpserver_p.h index e0a57ec3..1bd505fc 100644 --- a/src/nfc/qllcpserver_p.h +++ b/src/nfc/qllcpserver_p.h @@ -42,7 +42,7 @@ #ifndef QLLCPSERVER_P_H #define QLLCPSERVER_P_H -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include "qllcpserver.h" diff --git a/src/nfc/qllcpsocket.h b/src/nfc/qllcpsocket.h index 7e916b95..efdd9cf2 100644 --- a/src/nfc/qllcpsocket.h +++ b/src/nfc/qllcpsocket.h @@ -42,7 +42,7 @@ #ifndef QLLCPSOCKET_H #define QLLCPSOCKET_H -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include #include @@ -52,7 +52,7 @@ QT_BEGIN_HEADER class QNearFieldTarget; class QLlcpSocketPrivate; -class Q_CONNECTIVITY_EXPORT QLlcpSocket : public QIODevice +class Q_NFC_EXPORT QLlcpSocket : public QIODevice { Q_OBJECT Q_DECLARE_PRIVATE(QLlcpSocket) diff --git a/src/nfc/qllcpsocket_p.h b/src/nfc/qllcpsocket_p.h index 2dde2c1c..598361c4 100644 --- a/src/nfc/qllcpsocket_p.h +++ b/src/nfc/qllcpsocket_p.h @@ -42,7 +42,7 @@ #ifndef QLLCPSOCKET_P_H #define QLLCPSOCKET_P_H -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include "qllcpsocket.h" diff --git a/src/nfc/qndeffilter.h b/src/nfc/qndeffilter.h index 5cc92863..82344e43 100644 --- a/src/nfc/qndeffilter.h +++ b/src/nfc/qndeffilter.h @@ -42,7 +42,7 @@ #ifndef QNDEFFILTER_H #define QNDEFFILTER_H -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include @@ -51,7 +51,7 @@ QT_BEGIN_HEADER class QNdefFilterPrivate; -class Q_CONNECTIVITY_EXPORT QNdefFilter +class Q_NFC_EXPORT QNdefFilter { public: QNdefFilter(); diff --git a/src/nfc/qndefmessage.h b/src/nfc/qndefmessage.h index e6aef623..b4d11a9d 100644 --- a/src/nfc/qndefmessage.h +++ b/src/nfc/qndefmessage.h @@ -42,7 +42,7 @@ #ifndef QNDEFMESSAGE_H #define QNDEFMESSAGE_H -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include @@ -53,7 +53,7 @@ QT_BEGIN_HEADER -class Q_CONNECTIVITY_EXPORT QNdefMessage : public QList +class Q_NFC_EXPORT QNdefMessage : public QList { public: inline QNdefMessage() { } diff --git a/src/nfc/qndefnfctextrecord.h b/src/nfc/qndefnfctextrecord.h index 2333e3ff..fbd5e4af 100644 --- a/src/nfc/qndefnfctextrecord.h +++ b/src/nfc/qndefnfctextrecord.h @@ -42,13 +42,13 @@ #ifndef QNDEFNFCTEXTRECORD_H #define QNDEFNFCTEXTRECORD_H -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include QT_BEGIN_HEADER -class Q_CONNECTIVITY_EXPORT QNdefNfcTextRecord : public QNdefRecord +class Q_NFC_EXPORT QNdefNfcTextRecord : public QNdefRecord { public: Q_DECLARE_NDEF_RECORD(QNdefNfcTextRecord, QNdefRecord::NfcRtd, "T", QByteArray(1, char(0))) diff --git a/src/nfc/qndefnfcurirecord.h b/src/nfc/qndefnfcurirecord.h index 10bddff7..bd8ac124 100644 --- a/src/nfc/qndefnfcurirecord.h +++ b/src/nfc/qndefnfcurirecord.h @@ -42,7 +42,7 @@ #ifndef QNDEFNFCURIRECORD_H #define QNDEFNFCURIRECORD_H -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include @@ -50,7 +50,7 @@ QT_FORWARD_DECLARE_CLASS(QUrl) QT_BEGIN_HEADER -class Q_CONNECTIVITY_EXPORT QNdefNfcUriRecord : public QNdefRecord +class Q_NFC_EXPORT QNdefNfcUriRecord : public QNdefRecord { public: Q_DECLARE_NDEF_RECORD(QNdefNfcUriRecord, QNdefRecord::NfcRtd, "U", QByteArray(0, char(0))) diff --git a/src/nfc/qndefrecord.h b/src/nfc/qndefrecord.h index 31d0e94c..a1ab59b6 100644 --- a/src/nfc/qndefrecord.h +++ b/src/nfc/qndefrecord.h @@ -42,7 +42,7 @@ #ifndef QNDEFRECORD_H #define QNDEFRECORD_H -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include #include @@ -51,7 +51,7 @@ QT_BEGIN_HEADER class QNdefRecordPrivate; -class Q_CONNECTIVITY_EXPORT QNdefRecord +class Q_NFC_EXPORT QNdefRecord { public: enum TypeNameFormat { diff --git a/src/nfc/qndefrecord_p.h b/src/nfc/qndefrecord_p.h index ff279d68..4535296d 100644 --- a/src/nfc/qndefrecord_p.h +++ b/src/nfc/qndefrecord_p.h @@ -43,7 +43,7 @@ #ifndef QNDEFRECORD_P_H #define QNDEFRECORD_P_H -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include #include diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h index 9d3826de..1e065f0a 100644 --- a/src/nfc/qnearfieldmanager.h +++ b/src/nfc/qnearfieldmanager.h @@ -42,7 +42,7 @@ #ifndef QNEARFIELDMANAGER_H #define QNEARFIELDMANAGER_H -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include @@ -53,7 +53,7 @@ QT_BEGIN_HEADER class QNearFieldManagerPrivate; -class Q_CONNECTIVITY_EXPORT QNearFieldManager : public QObject +class Q_NFC_EXPORT QNearFieldManager : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QNearFieldManager) diff --git a/src/nfc/qnearfieldmanager_p.h b/src/nfc/qnearfieldmanager_p.h index 648a1978..0c811a1f 100644 --- a/src/nfc/qnearfieldmanager_p.h +++ b/src/nfc/qnearfieldmanager_p.h @@ -46,7 +46,7 @@ #include "qnearfieldtarget.h" #include "qndefrecord.h" -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include diff --git a/src/nfc/qnearfieldtagtype1.h b/src/nfc/qnearfieldtagtype1.h index f925fda3..df902387 100644 --- a/src/nfc/qnearfieldtagtype1.h +++ b/src/nfc/qnearfieldtagtype1.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER class QNearFieldTagType1Private; -class Q_CONNECTIVITY_EXPORT QNearFieldTagType1 : public QNearFieldTarget +class Q_NFC_EXPORT QNearFieldTagType1 : public QNearFieldTarget { Q_OBJECT diff --git a/src/nfc/qnearfieldtagtype2.h b/src/nfc/qnearfieldtagtype2.h index ad83fe8b..b991af1d 100644 --- a/src/nfc/qnearfieldtagtype2.h +++ b/src/nfc/qnearfieldtagtype2.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER class QNearFieldTagType2Private; -class Q_CONNECTIVITY_EXPORT QNearFieldTagType2 : public QNearFieldTarget +class Q_NFC_EXPORT QNearFieldTagType2 : public QNearFieldTarget { Q_OBJECT diff --git a/src/nfc/qnearfieldtagtype3.h b/src/nfc/qnearfieldtagtype3.h index 7ab9721d..1de30935 100644 --- a/src/nfc/qnearfieldtagtype3.h +++ b/src/nfc/qnearfieldtagtype3.h @@ -49,7 +49,7 @@ QT_BEGIN_HEADER -class Q_CONNECTIVITY_EXPORT QNearFieldTagType3 : public QNearFieldTarget +class Q_NFC_EXPORT QNearFieldTagType3 : public QNearFieldTarget { Q_OBJECT diff --git a/src/nfc/qnearfieldtagtype4.h b/src/nfc/qnearfieldtagtype4.h index d280580c..e01c8a0d 100644 --- a/src/nfc/qnearfieldtagtype4.h +++ b/src/nfc/qnearfieldtagtype4.h @@ -46,7 +46,7 @@ QT_BEGIN_HEADER -class Q_CONNECTIVITY_EXPORT QNearFieldTagType4 : public QNearFieldTarget +class Q_NFC_EXPORT QNearFieldTagType4 : public QNearFieldTarget { Q_OBJECT diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h index 7e081660..7d839fd8 100644 --- a/src/nfc/qnearfieldtarget.h +++ b/src/nfc/qnearfieldtarget.h @@ -43,7 +43,7 @@ #ifndef QNEARFIELDTARGET_H #define QNEARFIELDTARGET_H -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include #include @@ -58,7 +58,7 @@ QT_BEGIN_HEADER class QNdefMessage; class QNearFieldTargetPrivate; -class Q_CONNECTIVITY_EXPORT QNearFieldTarget : public QObject +class Q_NFC_EXPORT QNearFieldTarget : public QObject { Q_OBJECT @@ -96,7 +96,7 @@ public: }; class RequestIdPrivate; - class Q_CONNECTIVITY_EXPORT RequestId + class Q_NFC_EXPORT RequestId { public: RequestId(); @@ -160,7 +160,7 @@ private: QNearFieldTargetPrivate *d_ptr; }; -Q_CONNECTIVITY_EXPORT quint16 qNfcChecksum(const char * data, uint len); +Q_NFC_EXPORT quint16 qNfcChecksum(const char * data, uint len); Q_DECLARE_OPERATORS_FOR_FLAGS(QNearFieldTarget::AccessMethods) diff --git a/src/nfc/qnearfieldtarget_p.h b/src/nfc/qnearfieldtarget_p.h index d3d98c9b..72dab2df 100644 --- a/src/nfc/qnearfieldtarget_p.h +++ b/src/nfc/qnearfieldtarget_p.h @@ -42,7 +42,7 @@ #ifndef QNEARFIELDTARGET_P_H #define QNEARFIELDTARGET_P_H -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include "qnearfieldtarget.h" diff --git a/src/nfc/qnfcglobal.h b/src/nfc/qnfcglobal.h new file mode 100644 index 00000000..61f9a04a --- /dev/null +++ b/src/nfc/qnfcglobal.h @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtConnectivity module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef QTNFC_H +#define QTNFC_H + +#include + +#if defined(Q_OS_WIN) +# if defined(QT_NODLL) +# undef QT_MAKEDLL +# undef QT_DLL +# elif defined(QT_MAKEDLL) +# if defined(QT_DLL) +# undef QT_DLL +# endif +# if defined(QT_BUILD_BT_LIB) +# define Q_NFC_EXPORT Q_DECL_EXPORT +# else +# define Q_NFC_EXPORT Q_DECL_IMPORT +# endif +# elif defined(QT_DLL) +# define Q_NFC_EXPORT Q_DECL_EXPORT +# endif +#endif + +#if !defined(Q_NFC_EXPORT) +# if defined(QT_SHARED) +# define Q_NFC_EXPORT Q_DECL_EXPORT +# else +# define Q_NFC_EXPORT +# endif +#endif + +#include +#if defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_MAKEDLL) +# define QM_AUTOTEST_EXPORT Q_DECL_EXPORT +#elif defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_DLL) +# define QM_AUTOTEST_EXPORT Q_DECL_IMPORT +#elif defined(QTM_BUILD_UNITTESTS) && !(defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_SHARED) +# define QM_AUTOTEST_EXPORT Q_DECL_EXPORT +#else +# define QM_AUTOTEST_EXPORT +#endif + +#endif // QTNFC_H diff --git a/src/nfc/qtlv_p.h b/src/nfc/qtlv_p.h index a47d1a93..f4681952 100644 --- a/src/nfc/qtlv_p.h +++ b/src/nfc/qtlv_p.h @@ -42,7 +42,7 @@ #ifndef QTLV_P_H #define QTLV_P_H -#include "../qtconnectivityglobal.h" +#include "qnfcglobal.h" #include "qnearfieldtarget.h" diff --git a/src/qtconnectivityglobal.h b/src/qtconnectivityglobal.h deleted file mode 100644 index e556334a..00000000 --- a/src/qtconnectivityglobal.h +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtConnectivity module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QTCONNECTIVITY_H -#define QTCONNECTIVITY_H - -#include - -#if defined(Q_OS_WIN) -# if defined(QT_NODLL) -# undef QT_MAKEDLL -# undef QT_DLL -# elif defined(QT_MAKEDLL) -# if defined(QT_DLL) -# undef QT_DLL -# endif -# if defined(QT_BUILD_BT_LIB) -# define Q_CONNECTIVITY_EXPORT Q_DECL_EXPORT -# else -# define Q_CONNECTIVITY_EXPORT Q_DECL_IMPORT -# endif -# elif defined(QT_DLL) -# define Q_CONNECTIVITY_EXPORT Q_DECL_EXPORT -# endif -#endif - -#if !defined(Q_CONNECTIVITY_EXPORT) -# if defined(QT_SHARED) -# define Q_CONNECTIVITY_EXPORT Q_DECL_EXPORT -# else -# define Q_CONNECTIVITY_EXPORT -# endif -#endif - -#include -#if defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_MAKEDLL) -# define QM_AUTOTEST_EXPORT Q_DECL_EXPORT -#elif defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_DLL) -# define QM_AUTOTEST_EXPORT Q_DECL_IMPORT -#elif defined(QTM_BUILD_UNITTESTS) && !(defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_SHARED) -# define QM_AUTOTEST_EXPORT Q_DECL_EXPORT -#else -# define QM_AUTOTEST_EXPORT -#endif - -#endif // QTCONNECTIVITY_H -- cgit v1.2.3