diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2017-08-21 14:20:25 +0200 |
---|---|---|
committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-08-30 13:33:12 +0000 |
commit | 36997810d9fec492635152be89efaa55208e224a (patch) | |
tree | 00743718f23b3d3a794c56e392a496bf166902cc | |
parent | 8f1bd6c6c017a0e28160c5325d1c5c86a3e16384 (diff) | |
download | qtconnectivity-36997810d9fec492635152be89efaa55208e224a.tar.gz |
Rename qbluetoothglobal.h to qtbluetoothglobal.h
... and deprecate the former. By doing so we get the header
file in line with other modules - see qtnetworkglobal.h for
example.
The include is not used in the examples so it is removed
there.
Change-Id: Ie6267738d4a45e45a0350d458a40654d8a952f4a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
29 files changed, 29 insertions, 27 deletions
diff --git a/examples/bluetooth/btfiletransfer/progress.h b/examples/bluetooth/btfiletransfer/progress.h index b71009b7..8a30ff94 100644 --- a/examples/bluetooth/btfiletransfer/progress.h +++ b/examples/bluetooth/btfiletransfer/progress.h @@ -42,7 +42,6 @@ #define PROGRESS_H #include <QDialog> -#include <qbluetoothglobal.h> #include <QTime> QT_FORWARD_DECLARE_CLASS(QBluetoothTransferReply) diff --git a/examples/bluetooth/btscanner/device.h b/examples/bluetooth/btscanner/device.h index 9e5c59f6..f5b3a715 100644 --- a/examples/bluetooth/btscanner/device.h +++ b/examples/bluetooth/btscanner/device.h @@ -43,7 +43,6 @@ #include "ui_device.h" -#include <qbluetoothglobal.h> #include <qbluetoothlocaldevice.h> #include <QDialog> diff --git a/examples/bluetooth/btscanner/service.h b/examples/bluetooth/btscanner/service.h index 5b47d11a..871d975b 100644 --- a/examples/bluetooth/btscanner/service.h +++ b/examples/bluetooth/btscanner/service.h @@ -43,7 +43,6 @@ #include "ui_service.h" -#include <qbluetoothglobal.h> #include <QDialog> QT_FORWARD_DECLARE_CLASS(QBluetoothAddress) diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp index 0275c435..765a0d1c 100644 --- a/examples/bluetooth/lowenergyscanner/device.cpp +++ b/examples/bluetooth/lowenergyscanner/device.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "device.h" + #include <qbluetoothaddress.h> #include <qbluetoothdevicediscoveryagent.h> #include <qbluetoothlocaldevice.h> diff --git a/examples/bluetooth/lowenergyscanner/device.h b/examples/bluetooth/lowenergyscanner/device.h index 331d4458..1dc10300 100644 --- a/examples/bluetooth/lowenergyscanner/device.h +++ b/examples/bluetooth/lowenergyscanner/device.h @@ -41,7 +41,6 @@ #ifndef DEVICE_H #define DEVICE_H -#include <qbluetoothglobal.h> #include <qbluetoothlocaldevice.h> #include <QObject> #include <QVariant> diff --git a/src/bluetooth/android/jni_android.cpp b/src/bluetooth/android/jni_android.cpp index 68e291e5..176416c8 100644 --- a/src/bluetooth/android/jni_android.cpp +++ b/src/bluetooth/android/jni_android.cpp @@ -41,7 +41,7 @@ #include <jni.h> #include <android/log.h> #include <QtCore/QLoggingCategory> -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include "android/jni_android_p.h" #include "android/androidbroadcastreceiver_p.h" #include "android/serveracceptancethread_p.h" diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index b0e78d39..8dd748c7 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -6,7 +6,7 @@ QMAKE_DOCS = $$PWD/doc/qtbluetooth.qdocconf OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator PUBLIC_HEADERS += \ - qbluetoothglobal.h \ + qtbluetoothglobal.h \ qbluetoothaddress.h\ qbluetoothhostinfo.h \ qbluetoothuuid.h\ diff --git a/src/bluetooth/qbluetooth.h b/src/bluetooth/qbluetooth.h index 82136eca..df763147 100644 --- a/src/bluetooth/qbluetooth.h +++ b/src/bluetooth/qbluetooth.h @@ -40,7 +40,7 @@ #ifndef QBLUETOOTH_H #define QBLUETOOTH_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/bluetooth/qbluetoothaddress.h b/src/bluetooth/qbluetoothaddress.h index de2d4240..e3750d21 100644 --- a/src/bluetooth/qbluetoothaddress.h +++ b/src/bluetooth/qbluetoothaddress.h @@ -40,7 +40,7 @@ #ifndef QBLUETOOTHADDRESS_H #define QBLUETOOTHADDRESS_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtCore/QByteArray> #include <QtCore/QString> diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.h b/src/bluetooth/qbluetoothdevicediscoveryagent.h index 17827656..62050282 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent.h @@ -40,7 +40,7 @@ #ifndef QBLUETOOTHDEVICEDISCOVERYAGENT_H #define QBLUETOOTHDEVICEDISCOVERYAGENT_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtCore/QObject> #include <QtBluetooth/QBluetoothDeviceInfo> diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h index 5ff17e1c..33cd40b7 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.h +++ b/src/bluetooth/qbluetoothdeviceinfo.h @@ -40,7 +40,7 @@ #ifndef QBLUETOOTHDEVICEINFO_H #define QBLUETOOTHDEVICEINFO_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtCore/qstring.h> #include <QtCore/qmetatype.h> diff --git a/src/bluetooth/qbluetoothhostinfo.h b/src/bluetooth/qbluetoothhostinfo.h index e92bdb5c..42dfcaab 100644 --- a/src/bluetooth/qbluetoothhostinfo.h +++ b/src/bluetooth/qbluetoothhostinfo.h @@ -40,7 +40,7 @@ #ifndef QBLUETOOTHHOSTINFO_H #define QBLUETOOTHHOSTINFO_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtBluetooth/QBluetoothAddress> QT_BEGIN_NAMESPACE diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h index 49de25ae..9363a116 100644 --- a/src/bluetooth/qbluetoothlocaldevice.h +++ b/src/bluetooth/qbluetoothlocaldevice.h @@ -40,7 +40,7 @@ #ifndef QBLUETOOTHLOCALDEVICE_H #define QBLUETOOTHLOCALDEVICE_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtCore/QObject> #include <QtCore/QList> diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h index acd88083..a52b683c 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.h +++ b/src/bluetooth/qbluetoothlocaldevice_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include "qbluetoothlocaldevice.h" diff --git a/src/bluetooth/qbluetoothserver.h b/src/bluetooth/qbluetoothserver.h index 568ca3d9..e6e4a68f 100644 --- a/src/bluetooth/qbluetoothserver.h +++ b/src/bluetooth/qbluetoothserver.h @@ -41,7 +41,7 @@ #ifndef QBLUETOOTHSERVER_H #define QBLUETOOTHSERVER_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtCore/QObject> diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h index ba0b91b8..12df37a8 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent.h @@ -40,7 +40,7 @@ #ifndef QBLUETOOTHSERVICEDISCOVERYAGENT_H #define QBLUETOOTHSERVICEDISCOVERYAGENT_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtCore/QObject> diff --git a/src/bluetooth/qbluetoothserviceinfo.h b/src/bluetooth/qbluetoothserviceinfo.h index 38cddfb6..cc4041e2 100644 --- a/src/bluetooth/qbluetoothserviceinfo.h +++ b/src/bluetooth/qbluetoothserviceinfo.h @@ -40,7 +40,7 @@ #ifndef QBLUETOOTHSERVICEINFO_H #define QBLUETOOTHSERVICEINFO_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtBluetooth/QBluetoothUuid> #include <QtBluetooth/QBluetoothAddress> diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h index 2b1bd3cf..bbcecbf4 100644 --- a/src/bluetooth/qbluetoothsocket.h +++ b/src/bluetooth/qbluetoothsocket.h @@ -40,7 +40,7 @@ #ifndef QBLUETOOTHSOCKET_H #define QBLUETOOTHSOCKET_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtBluetooth/qbluetooth.h> #include <QtBluetooth/qbluetoothaddress.h> diff --git a/src/bluetooth/qbluetoothtransfermanager.h b/src/bluetooth/qbluetoothtransfermanager.h index d1171588..756fe54f 100644 --- a/src/bluetooth/qbluetoothtransfermanager.h +++ b/src/bluetooth/qbluetoothtransfermanager.h @@ -40,7 +40,7 @@ #ifndef QBLUETOOTHTRANSFERMANAGER_H #define QBLUETOOTHTRANSFERMANAGER_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtBluetooth/QBluetoothAddress> #include <QtCore/QObject> diff --git a/src/bluetooth/qbluetoothtransferrequest.h b/src/bluetooth/qbluetoothtransferrequest.h index 006f1ced..5485a0d9 100644 --- a/src/bluetooth/qbluetoothtransferrequest.h +++ b/src/bluetooth/qbluetoothtransferrequest.h @@ -40,7 +40,7 @@ #ifndef QBLUETOOTHTRANSFERREQUEST_H #define QBLUETOOTHTRANSFERREQUEST_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtBluetooth/QBluetoothAddress> #include <QtCore/QtGlobal> diff --git a/src/bluetooth/qbluetoothtransferrequest_p.h b/src/bluetooth/qbluetoothtransferrequest_p.h index d8b2e55d..410a9709 100644 --- a/src/bluetooth/qbluetoothtransferrequest_p.h +++ b/src/bluetooth/qbluetoothtransferrequest_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include "qbluetoothtransferrequest.h" QT_BEGIN_NAMESPACE diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h index fb301c37..2a2ce138 100644 --- a/src/bluetooth/qbluetoothuuid.h +++ b/src/bluetooth/qbluetoothuuid.h @@ -40,7 +40,7 @@ #ifndef QBLUETOOTHUUID_H #define QBLUETOOTHUUID_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtCore/QtGlobal> #include <QtCore/QMetaType> diff --git a/src/bluetooth/qlowenergyadvertisingdata.h b/src/bluetooth/qlowenergyadvertisingdata.h index 904c5c2b..0fc55adb 100644 --- a/src/bluetooth/qlowenergyadvertisingdata.h +++ b/src/bluetooth/qlowenergyadvertisingdata.h @@ -40,7 +40,7 @@ #ifndef QLOWENERGYADVERTISINGDATA_H #define QLOWENERGYADVERTISINGDATA_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtBluetooth/qbluetoothuuid.h> #include <QtCore/qshareddata.h> diff --git a/src/bluetooth/qlowenergyadvertisingparameters.h b/src/bluetooth/qlowenergyadvertisingparameters.h index 547e5798..055026e6 100644 --- a/src/bluetooth/qlowenergyadvertisingparameters.h +++ b/src/bluetooth/qlowenergyadvertisingparameters.h @@ -40,7 +40,7 @@ #ifndef QLOWENERGYADVERTISINGPARAMETERS_H #define QLOWENERGYADVERTISINGPARAMETERS_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtBluetooth/qbluetoothaddress.h> #include <QtBluetooth/qlowenergycontroller.h> #include <QtCore/qlist.h> diff --git a/src/bluetooth/qlowenergyconnectionparameters.h b/src/bluetooth/qlowenergyconnectionparameters.h index 9a3896c3..c765763f 100644 --- a/src/bluetooth/qlowenergyconnectionparameters.h +++ b/src/bluetooth/qlowenergyconnectionparameters.h @@ -40,7 +40,7 @@ #ifndef QLOWENERGYCONNECTIONPARAMETERS_H #define QLOWENERGYCONNECTIONPARAMETERS_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtCore/qmetatype.h> #include <QtCore/qshareddata.h> diff --git a/src/bluetooth/qlowenergyservicedata.h b/src/bluetooth/qlowenergyservicedata.h index 48f7fe89..4d553267 100644 --- a/src/bluetooth/qlowenergyservicedata.h +++ b/src/bluetooth/qlowenergyservicedata.h @@ -40,7 +40,7 @@ #ifndef QLOWENERGYSERVICEDATA_H #define QLOWENERGYSERVICEDATA_H -#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/qtbluetoothglobal.h> #include <QtCore/qshareddata.h> QT_BEGIN_NAMESPACE diff --git a/src/bluetooth/qbluetoothglobal.h b/src/bluetooth/qtbluetoothglobal.h index 45867e94..40b6d3d2 100644 --- a/src/bluetooth/qbluetoothglobal.h +++ b/src/bluetooth/qtbluetoothglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtBluetooth module of the Qt Toolkit. diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h index a3cfdcf2..0aa134f5 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h @@ -60,7 +60,7 @@ #include <qbluetoothservicediscoveryagent.h> #include <qbluetoothdevicediscoveryagent.h> -#include <qbluetoothglobal.h> +#include <qtbluetoothglobal.h> #include "qdeclarativebluetoothservice_p.h" diff --git a/sync.profile b/sync.profile index 64dac6e3..df55ddb3 100644 --- a/sync.profile +++ b/sync.profile @@ -4,6 +4,11 @@ ); %moduleheaders = ( # restrict the module headers to those found in relative path ); +%deprecatedheaders = ( + "QtBluetooth" => { + "qbluetoothglobal.h" => "QtBluetooth/qtbluetoothglobal.h" + } +); @ignore_for_include_check = ( |