diff options
Diffstat (limited to 'src/bluetoothsettings')
-rw-r--r-- | src/bluetoothsettings/bluetoothdevice.h | 3 | ||||
-rw-r--r-- | src/bluetoothsettings/bluez/bluetoothdevice_p.h | 2 | ||||
-rw-r--r-- | src/bluetoothsettings/discoverymodel.h | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/bluetoothsettings/bluetoothdevice.h b/src/bluetoothsettings/bluetoothdevice.h index 84d1615..8519044 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 = nullptr); + explicit BluetoothDevice(QObject *parent = Q_NULLPTR); bool powered() const; void setPowered(const bool& aPowered); QObject* deviceModel() const; @@ -50,7 +50,6 @@ public: Q_INVOKABLE void requestPairing(const QString& address); Q_INVOKABLE void requestConnect(const QString& address); Q_INVOKABLE void requestDisconnect(const QString& address); - Q_SIGNALS: void poweredChanged(); void scanningChanged(); diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.h b/src/bluetoothsettings/bluez/bluetoothdevice_p.h index 7c8a78a..84d1382 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 = nullptr); + explicit BluetoothDevicePrivate(const QString& address, QObject *parent = Q_NULLPTR); void connectDevice(); void disconnectDevice(); diff --git a/src/bluetoothsettings/discoverymodel.h b/src/bluetoothsettings/discoverymodel.h index e32ad9b..12554d7 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 = nullptr); + explicit BtDeviceItem(const QBluetoothDeviceInfo& id, QObject *parent = Q_NULLPTR); //The list of device type we want to show the icon enum DeviceType { Phone, @@ -90,7 +90,7 @@ class Q_DECL_EXPORT DiscoveryModel : public QAbstractListModel Q_OBJECT Q_ENUMS(DeviceType) public: - explicit DiscoveryModel(QObject *parent = nullptr); + explicit DiscoveryModel(QObject *parent = Q_NULLPTR); virtual ~DiscoveryModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; @@ -111,7 +111,6 @@ Q_SIGNALS: private Q_SLOTS: void deviceDiscovered(const QBluetoothDeviceInfo &device); - private: QList<BtDeviceItem*> m_items; QHash<int, QByteArray> m_roleNames; |