diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-10-06 08:37:41 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-11-16 11:54:55 +0000 |
| commit | 48af5733bcd959146ac157a3c4759c8d89ccc465 (patch) | |
| tree | 435177130f0cb39290fc0e89bf2885624c24eb58 /src/bluetoothsettings/bluetoothdevice.h | |
| parent | 2b6766f09ad53f1cf2ba7cfe95976b4322c2e8fd (diff) | |
clean up public headers
If this project is treated as a Qt module, it didn't build without these
fixes because QT_NO_KEYWORDS and -Werror=zero-as-null-pointer-constant
are enforced.
Change-Id: Ie3ab8597b338478a5a34ed49d176ce9a647b1e0e
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/bluetoothsettings/bluetoothdevice.h')
| -rw-r--r-- | src/bluetoothsettings/bluetoothdevice.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bluetoothsettings/bluetoothdevice.h b/src/bluetoothsettings/bluetoothdevice.h index a38cde7..84d1615 100644 --- a/src/bluetoothsettings/bluetoothdevice.h +++ b/src/bluetoothsettings/bluetoothdevice.h @@ -41,7 +41,7 @@ class Q_DECL_EXPORT BluetoothDevice : public QObject Q_PROPERTY(bool powered READ powered WRITE setPowered NOTIFY poweredChanged) Q_PROPERTY(QObject* deviceModel READ deviceModel CONSTANT) public: - explicit BluetoothDevice(QObject *parent = 0); + explicit BluetoothDevice(QObject *parent = nullptr); bool powered() const; void setPowered(const bool& aPowered); QObject* deviceModel() const; @@ -50,11 +50,12 @@ public: Q_INVOKABLE void requestPairing(const QString& address); Q_INVOKABLE void requestConnect(const QString& address); Q_INVOKABLE void requestDisconnect(const QString& address); -signals: + +Q_SIGNALS: void poweredChanged(); void scanningChanged(); -public slots: +public Q_SLOTS: void deviceStateChanged(QBluetoothLocalDevice::HostMode state); void scanFinished(); //These are not yet signaled |