diff options
author | Rainer Keller <Rainer.Keller@qt.io> | 2016-10-24 15:52:03 +0200 |
---|---|---|
committer | Rainer Keller <Rainer.Keller@qt.io> | 2016-10-31 07:55:17 +0000 |
commit | 197bed092d8d88446d3708cd393c8f9c3a8d0491 (patch) | |
tree | 48cebb3d757f10bc90f89b881003e98392afce90 /src/bluetoothsettings/discoverymodel.h | |
parent | 57b15814c8865e517c43fe173c0ffcadf8557ade (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/discoverymodel.h')
-rw-r--r-- | src/bluetoothsettings/discoverymodel.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; |