diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-19 16:08:13 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-20 21:37:42 +0100 |
| commit | d772307dab9e2a3ef99d924d23af8688bff592db (patch) | |
| tree | 6f70dd558700fd2c702e253264663c90a4166bbc /src/bluetooth | |
| parent | 9782c350820cef66463684a0cc0bce70037c26d8 (diff) | |
Use proper include syntax for public headers
This fixes all qmake warnings.
Change-Id: Ib103f0513ad0285ed55b45f7067742aaddd9cd58
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Diffstat (limited to 'src/bluetooth')
| -rw-r--r-- | src/bluetooth/qlowenergycharacteristicinfo.h | 6 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergycontroller.h | 11 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergydescriptorinfo.h | 6 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergyserviceinfo.h | 10 |
4 files changed, 14 insertions, 19 deletions
diff --git a/src/bluetooth/qlowenergycharacteristicinfo.h b/src/bluetooth/qlowenergycharacteristicinfo.h index 2e28e337..c3121253 100644 --- a/src/bluetooth/qlowenergycharacteristicinfo.h +++ b/src/bluetooth/qlowenergycharacteristicinfo.h @@ -41,10 +41,10 @@ #ifndef QLOWENERGYCHARACTERISTICINFO_H #define QLOWENERGYCHARACTERISTICINFO_H -#include "qbluetoothuuid.h" -#include "qlowenergydescriptorinfo.h" #include <QtCore/QSharedPointer> -#include <QObject> +#include <QtCore/QObject> +#include <QtBluetooth/QBluetoothUuid> +#include <QtBluetooth/QLowEnergyDescriptorInfo> QT_BEGIN_NAMESPACE diff --git a/src/bluetooth/qlowenergycontroller.h b/src/bluetooth/qlowenergycontroller.h index 432e6669..16f1bc55 100644 --- a/src/bluetooth/qlowenergycontroller.h +++ b/src/bluetooth/qlowenergycontroller.h @@ -41,13 +41,12 @@ #ifndef QLOWENERGYCONTROLLER_H #define QLOWENERGYCONTROLLER_H -#include <QtBluetooth/qbluetoothglobal.h> - -#include <QObject> -#include "qlowenergyserviceinfo.h" -#include "qlowenergycharacteristicinfo.h" -#include "qbluetoothaddress.h" +#include <QtCore/QObject> +#include <QtBluetooth/qbluetoothglobal.h> +#include <QtBluetooth/QBluetoothAddress> +#include <QtBluetooth/QLowEnergyCharacteristicInfo> +#include <QtBluetooth/QLowEnergyServiceInfo> QT_BEGIN_NAMESPACE diff --git a/src/bluetooth/qlowenergydescriptorinfo.h b/src/bluetooth/qlowenergydescriptorinfo.h index 14f2077c..c02cb5a8 100644 --- a/src/bluetooth/qlowenergydescriptorinfo.h +++ b/src/bluetooth/qlowenergydescriptorinfo.h @@ -42,14 +42,12 @@ #ifndef QLOWENERGYDESCRIPTORINFO_H #define QLOWENERGYDESCRIPTORINFO_H -#include "qbluetoothuuid.h" -#include <QtCore> -#include <QVariantMap> #include <QtCore/QSharedPointer> +#include <QtCore/QVariantMap> +#include <QtBluetooth/QBluetoothUuid> QT_BEGIN_NAMESPACE -class QBluetoothUuid; class QLowEnergyCharacteristicInfo; class QLowEnergyDescriptorInfoPrivate; diff --git a/src/bluetooth/qlowenergyserviceinfo.h b/src/bluetooth/qlowenergyserviceinfo.h index 745fb77f..08c5fde4 100644 --- a/src/bluetooth/qlowenergyserviceinfo.h +++ b/src/bluetooth/qlowenergyserviceinfo.h @@ -41,18 +41,16 @@ #ifndef QLOWENERGYSERVICEINFO_H #define QLOWENERGYSERVICEINFO_H -#include "qbluetoothuuid.h" -#include "qlowenergycharacteristicinfo.h" -#include "qbluetoothdevicediscoveryagent.h" -#include "qbluetoothaddress.h" #include <QtCore/QSharedPointer> +#include <QtBluetooth/QBluetoothAddress> +#include <QtBluetooth/QBluetoothDeviceInfo> +#include <QtBluetooth/QBluetoothUuid> +#include <QtBluetooth/QLowEnergyCharacteristicInfo> QT_BEGIN_NAMESPACE -class QBluetoothUuid; class QLowEnergyServiceInfoPrivate; class QBluetoothAddress; -class QBluetoothDeviceInfo; class Q_BLUETOOTH_EXPORT QLowEnergyServiceInfo { |