summaryrefslogtreecommitdiffstats
path: root/src/bluetoothsettings
diff options
context:
space:
mode:
authorRainer Keller <Rainer.Keller@qt.io>2016-10-24 15:52:03 +0200
committerRainer Keller <Rainer.Keller@qt.io>2016-10-31 07:55:17 +0000
commit197bed092d8d88446d3708cd393c8f9c3a8d0491 (patch)
tree48cebb3d757f10bc90f89b881003e98392afce90 /src/bluetoothsettings
parent57b15814c8865e517c43fe173c0ffcadf8557ade (diff)
Fix compile error: 0 is not allowed for pointer initialization anymore
Change-Id: Ic8b789a46dafd379fdd48279d6eb138f978e80a5 Reviewed-by: Risto Avila <risto.avila@qt.io> Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com> Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src/bluetoothsettings')
-rw-r--r--src/bluetoothsettings/bluetoothdevice.h2
-rw-r--r--src/bluetoothsettings/bluez/bluetoothdevice_p.h2
-rw-r--r--src/bluetoothsettings/discoverymodel.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/bluetoothsettings/bluetoothdevice.h b/src/bluetoothsettings/bluetoothdevice.h
index a38cde7..5a77d62 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 = Q_NULLPTR);
bool powered() const;
void setPowered(const bool& aPowered);
QObject* deviceModel() const;
diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.h b/src/bluetoothsettings/bluez/bluetoothdevice_p.h
index adc283b..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=0);
+ 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 d9678a3..61d0993 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 = 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=0);
+ explicit DiscoveryModel(QObject *parent = Q_NULLPTR);
virtual ~DiscoveryModel();
// from QAbstractItemModel
int rowCount(const QModelIndex & parent = QModelIndex()) const;