summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qlowenergyservice.cpp
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-07-22 11:59:27 +0200
committerAlex Blasche <alexander.blasche@digia.com>2014-07-23 15:28:49 +0200
commit199bd8306541c3987cc4aae7d7f93af31717d3b5 (patch)
tree004d9a1a034d0abc39145b79d9c4b9edda4e6502 /src/bluetooth/qlowenergyservice.cpp
parent58d1b5bdffc25f4ff22dcd00f0572c9c4fac3f88 (diff)
Detect secondary services and display service type in lowenergyscanner
QLowEnergyService::ServiceState was converted to a flag because a primary and secondary service can be included by other services. Change-Id: I425ce8e3f39ee07cccee2763b57a049a624f6178 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Diffstat (limited to 'src/bluetooth/qlowenergyservice.cpp')
-rw-r--r--src/bluetooth/qlowenergyservice.cpp14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/bluetooth/qlowenergyservice.cpp b/src/bluetooth/qlowenergyservice.cpp
index 11485183..0bc9dc55 100644
--- a/src/bluetooth/qlowenergyservice.cpp
+++ b/src/bluetooth/qlowenergyservice.cpp
@@ -51,6 +51,18 @@
QT_BEGIN_NAMESPACE
/*!
+ \enum QBluetoothDeviceInfo::ServiceType
+
+ This enum describes the type of the service.
+
+ \value PrimaryService The service is a top-level/primary service.
+ If this type flag is not set the service is considered
+ to be a secondary service. Each service may be included
+ by another service which is indicated by \l IncludedService.
+ \value IncludedService The service is included by another service.
+*/
+
+/*!
\internal
QLowEnergyControllerPrivate creates instances of this class.
@@ -92,7 +104,7 @@ QLowEnergyService::ServiceState QLowEnergyService::state() const
return d_ptr->state;
}
-QLowEnergyService::ServiceType QLowEnergyService::type() const
+QLowEnergyService::ServiceTypes QLowEnergyService::type() const
{
return d_ptr->type;
}