diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-07-03 16:18:03 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@digia.com> | 2014-07-15 20:39:40 +0200 |
commit | c39189a922ce7057b410eba12e80abac589712cf (patch) | |
tree | 338815352496d1b1e2d0234f8fd81488e6dc84c5 /examples/bluetooth/lowenergyscanner/characteristicinfo.h | |
parent | 4a52ec355e2b2541d1867f785ef58c8c483b7316 (diff) |
Port lowenergyscanner example to new API
Some minor improvements have been incorporated too but the focus is on
the port. More code and UI cleanups are required.
Change-Id: I56f226b8418b78190d498df04d67686220a3644e
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Diffstat (limited to 'examples/bluetooth/lowenergyscanner/characteristicinfo.h')
-rw-r--r-- | examples/bluetooth/lowenergyscanner/characteristicinfo.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/examples/bluetooth/lowenergyscanner/characteristicinfo.h b/examples/bluetooth/lowenergyscanner/characteristicinfo.h index 7f746960..d06c962e 100644 --- a/examples/bluetooth/lowenergyscanner/characteristicinfo.h +++ b/examples/bluetooth/lowenergyscanner/characteristicinfo.h @@ -1,6 +1,7 @@ /*************************************************************************** ** ** Copyright (C) 2013 BlackBerry Limited. All rights reserved. +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtBluetooth module of the Qt Toolkit. @@ -42,7 +43,7 @@ #define CHARACTERISTICINFO_H #include <QObject> #include <QString> -#include <qlowenergycharacteristicinfo.h> +#include <QtBluetooth/QLowEnergyCharacteristic> class CharacteristicInfo: public QObject { @@ -55,20 +56,20 @@ class CharacteristicInfo: public QObject public: CharacteristicInfo(); - CharacteristicInfo(const QLowEnergyCharacteristicInfo &characteristic); - void setCharacteristic(const QLowEnergyCharacteristicInfo &characteristic); + CharacteristicInfo(const QLowEnergyCharacteristic &characteristic); + void setCharacteristic(const QLowEnergyCharacteristic &characteristic); QString getName() const; QString getUuid() const; QString getValue() const; QString getHandle() const; QString getPermission() const; - QLowEnergyCharacteristicInfo getCharacteristic() const; + QLowEnergyCharacteristic getCharacteristic() const; Q_SIGNALS: void characteristicChanged(); private: - QLowEnergyCharacteristicInfo m_characteristic; + QLowEnergyCharacteristic m_characteristic; }; #endif // CHARACTERISTICINFO_H |