diff options
author | Oleg Shparber <trollixx@gmail.com> | 2014-04-23 00:50:08 -0700 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-23 17:30:05 +0200 |
commit | 34b32040ec0e80108890c0f97bcdc85989200409 (patch) | |
tree | 889090e214d59ef7b20f938b2005a6c7379d6781 /src/bluetooth/qbluetoothdeviceinfo.cpp | |
parent | 347afa3ec58f82da2e4059c1241f3fdd8c5ad2e7 (diff) |
Fix coding style in QBluetooth
Affected: QBluetooth, QBluetoothAddress, QBluetoothDeviceDiscoveryAgent,
QBluetoothDeviceInfo, QBluetoothHostInfo, QBluetoothLocalDevice
Change-Id: Ia5af61f87eafecfba56b75fa61b81014cdd38960
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothdeviceinfo.cpp')
-rw-r--r-- | src/bluetooth/qbluetoothdeviceinfo.cpp | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/src/bluetooth/qbluetoothdeviceinfo.cpp b/src/bluetooth/qbluetoothdeviceinfo.cpp index f10ec133..408222bd 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.cpp +++ b/src/bluetooth/qbluetoothdeviceinfo.cpp @@ -216,7 +216,6 @@ QT_BEGIN_NAMESPACE \value HealthStepCounter A pedometer. */ - /*! \enum QBluetoothDeviceInfo::ServiceClass @@ -247,20 +246,22 @@ QT_BEGIN_NAMESPACE \value DataUnavailable No data is available. */ -QBluetoothDeviceInfoPrivate::QBluetoothDeviceInfoPrivate() - : valid(false), cached(false), rssi(1), - serviceClasses(QBluetoothDeviceInfo::NoService), - majorDeviceClass(QBluetoothDeviceInfo::MiscellaneousDevice), - minorDeviceClass(0), - serviceUuidsCompleteness(QBluetoothDeviceInfo::DataUnavailable) +QBluetoothDeviceInfoPrivate::QBluetoothDeviceInfoPrivate() : + valid(false), + cached(false), + rssi(1), + serviceClasses(QBluetoothDeviceInfo::NoService), + majorDeviceClass(QBluetoothDeviceInfo::MiscellaneousDevice), + minorDeviceClass(0), + serviceUuidsCompleteness(QBluetoothDeviceInfo::DataUnavailable) { } /*! Constructs an invalid QBluetoothDeviceInfo object. */ -QBluetoothDeviceInfo::QBluetoothDeviceInfo() -: d_ptr(new QBluetoothDeviceInfoPrivate) +QBluetoothDeviceInfo::QBluetoothDeviceInfo() : + d_ptr(new QBluetoothDeviceInfoPrivate) { } @@ -278,8 +279,9 @@ QBluetoothDeviceInfo::QBluetoothDeviceInfo() \row \li 13 - 23 \li 11 \li Service class. \endtable */ -QBluetoothDeviceInfo::QBluetoothDeviceInfo(const QBluetoothAddress &address, const QString &name, quint32 classOfDevice) -: d_ptr(new QBluetoothDeviceInfoPrivate) +QBluetoothDeviceInfo::QBluetoothDeviceInfo(const QBluetoothAddress &address, const QString &name, + quint32 classOfDevice) : + d_ptr(new QBluetoothDeviceInfoPrivate) { Q_D(QBluetoothDeviceInfo); @@ -300,8 +302,8 @@ QBluetoothDeviceInfo::QBluetoothDeviceInfo(const QBluetoothAddress &address, con /*! Constructs a QBluetoothDeviceInfo that is a copy of \a other. */ -QBluetoothDeviceInfo::QBluetoothDeviceInfo(const QBluetoothDeviceInfo &other) -: d_ptr(new QBluetoothDeviceInfoPrivate) +QBluetoothDeviceInfo::QBluetoothDeviceInfo(const QBluetoothDeviceInfo &other) : + d_ptr(new QBluetoothDeviceInfoPrivate) { *this = other; } @@ -323,6 +325,7 @@ bool QBluetoothDeviceInfo::isValid() const return d->valid; } + /*! Returns the signal strength when the device was last scanned */ @@ -370,29 +373,28 @@ bool QBluetoothDeviceInfo::operator==(const QBluetoothDeviceInfo &other) const { Q_D(const QBluetoothDeviceInfo); - if(d->cached != other.d_func()->cached) + if (d->cached != other.d_func()->cached) return false; - if(d->valid != other.d_func()->valid) + if (d->valid != other.d_func()->valid) return false; - if(d->majorDeviceClass != other.d_func()->majorDeviceClass) + if (d->majorDeviceClass != other.d_func()->majorDeviceClass) return false; - if(d->minorDeviceClass != other.d_func()->minorDeviceClass) + if (d->minorDeviceClass != other.d_func()->minorDeviceClass) return false; - if(d->serviceClasses != other.d_func()->serviceClasses) + if (d->serviceClasses != other.d_func()->serviceClasses) return false; - if(d->name != other.d_func()->name) + if (d->name != other.d_func()->name) return false; - if(d->address != other.d_func()->address) + if (d->address != other.d_func()->address) return false; - if(d->serviceUuidsCompleteness != other.d_func()->serviceUuidsCompleteness) + if (d->serviceUuidsCompleteness != other.d_func()->serviceUuidsCompleteness) return false; - if(d->serviceUuids.count() != other.d_func()->serviceUuids.count()) + if (d->serviceUuids.count() != other.d_func()->serviceUuids.count()) return false; - if(d->serviceUuids != other.d_func()->serviceUuids) + if (d->serviceUuids != other.d_func()->serviceUuids) return false; return true; - } /*! @@ -458,7 +460,8 @@ quint8 QBluetoothDeviceInfo::minorDeviceClass() const /*! Sets the list of service UUIDs to \a uuids and the completeness of the data to \a completeness. */ -void QBluetoothDeviceInfo::setServiceUuids(const QList<QBluetoothUuid> &uuids, DataCompleteness completeness) +void QBluetoothDeviceInfo::setServiceUuids(const QList<QBluetoothUuid> &uuids, + DataCompleteness completeness) { Q_D(QBluetoothDeviceInfo); |