diff options
Diffstat (limited to 'src/bluetoothsettings')
-rw-r--r-- | src/bluetoothsettings/bluetoothdevice.h | 7 | ||||
-rw-r--r-- | src/bluetoothsettings/bluez/bluetoothdevice_p.h | 2 | ||||
-rw-r--r-- | src/bluetoothsettings/discoverymodel.h | 11 |
3 files changed, 11 insertions, 9 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 diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.h b/src/bluetoothsettings/bluez/bluetoothdevice_p.h index adc283b..7c8a78a 100644 --- a/src/bluetoothsettings/bluez/bluetoothdevice_p.h +++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.h @@ -36,7 +36,7 @@ class OrgBluezDevice1Interface; class BluetoothDevicePrivate : public QObject { public: - explicit BluetoothDevicePrivate(const QString& address, QObject *parent=0); + explicit BluetoothDevicePrivate(const QString& address, QObject *parent = nullptr); void connectDevice(); void disconnectDevice(); diff --git a/src/bluetoothsettings/discoverymodel.h b/src/bluetoothsettings/discoverymodel.h index d9678a3..e32ad9b 100644 --- a/src/bluetoothsettings/discoverymodel.h +++ b/src/bluetoothsettings/discoverymodel.h @@ -44,7 +44,7 @@ class Q_DECL_EXPORT BtDeviceItem : public QObject Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged) Q_PROPERTY(DeviceType type READ type CONSTANT) public: - explicit BtDeviceItem(const QBluetoothDeviceInfo& id, QObject *parent=0); + explicit BtDeviceItem(const QBluetoothDeviceInfo& id, QObject *parent = nullptr); //The list of device type we want to show the icon enum DeviceType { Phone, @@ -65,7 +65,7 @@ public: bool connected() const; void setConnected(bool aConnected); -signals: +Q_SIGNALS: void connectedChanged(); protected: @@ -90,7 +90,7 @@ class Q_DECL_EXPORT DiscoveryModel : public QAbstractListModel Q_OBJECT Q_ENUMS(DeviceType) public: - explicit DiscoveryModel(QObject *parent=0); + explicit DiscoveryModel(QObject *parent = nullptr); virtual ~DiscoveryModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; @@ -106,11 +106,12 @@ public: Connected }; -signals: +Q_SIGNALS: void scanFinished(); -private slots: +private Q_SLOTS: void deviceDiscovered(const QBluetoothDeviceInfo &device); + private: QList<BtDeviceItem*> m_items; QHash<int, QByteArray> m_roleNames; |