summaryrefslogtreecommitdiffstats
path: root/src/networksettings/qnetworksettings.h
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/networksettings/qnetworksettings.h
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/networksettings/qnetworksettings.h')
-rw-r--r--src/networksettings/qnetworksettings.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/networksettings/qnetworksettings.h b/src/networksettings/qnetworksettings.h
index e5dbbc5..a507729 100644
--- a/src/networksettings/qnetworksettings.h
+++ b/src/networksettings/qnetworksettings.h
@@ -43,13 +43,13 @@ class Q_DECL_EXPORT QNetworkSettingsState : public QObject
public:
enum States {Idle, Failure, Association, Configuration, Ready, Disconnect, Online, Undefined};
- explicit QNetworkSettingsState(States state, QObject *parent = 0)
+ explicit QNetworkSettingsState(States state, QObject *parent = Q_NULLPTR)
: QObject(parent)
{
m_state = state;
}
- explicit QNetworkSettingsState(QObject *parent = 0)
+ explicit QNetworkSettingsState(QObject *parent = Q_NULLPTR)
: QObject(parent)
{
m_state = Undefined;
@@ -85,13 +85,13 @@ public:
Unknown
};
- explicit QNetworkSettingsType(Types type, QObject *parent = 0)
+ explicit QNetworkSettingsType(Types type, QObject *parent = Q_NULLPTR)
: QObject(parent)
{
m_type = type;
}
- explicit QNetworkSettingsType(QObject *parent = 0)
+ explicit QNetworkSettingsType(QObject *parent = Q_NULLPTR)
: QObject(parent)
{
m_type = Unknown;
@@ -124,7 +124,7 @@ class Q_DECL_EXPORT QNetworkSettingsIPv4 : public QObject
Q_PROPERTY(QString mask READ mask WRITE setMask NOTIFY maskChanged)
public:
- explicit QNetworkSettingsIPv4(QObject *parent = 0)
+ explicit QNetworkSettingsIPv4(QObject *parent = Q_NULLPTR)
: QObject(parent)
{
@@ -192,7 +192,7 @@ class Q_DECL_EXPORT QNetworkSettingsIPv6 : public QObject
Q_PROPERTY(int prefixLength READ prefixLength WRITE setPrefixLength NOTIFY prefixLengthChanged)
public:
- explicit QNetworkSettingsIPv6(QObject *parent = 0)
+ explicit QNetworkSettingsIPv6(QObject *parent = Q_NULLPTR)
: QObject(parent)
{
@@ -270,7 +270,7 @@ public:
Q_PROPERTY(QAbstractItemModel* excludes READ excludes NOTIFY excludesChanged)
Q_PROPERTY(MethodType method READ method WRITE setMethod NOTIFY methodChanged)
- explicit QNetworkSettingsProxy(QObject *parent=NULL)
+ explicit QNetworkSettingsProxy(QObject *parent = Q_NULLPTR)
: QObject(parent)
{
@@ -341,7 +341,7 @@ class Q_DECL_EXPORT QNetworkSettingsWireless : public QObject
Q_PROPERTY(bool hidden READ hidden NOTIFY hiddenChanged)
Q_PROPERTY(bool isOutOfRange READ outOfRange WRITE setOutOfRange NOTIFY outOfRangeChanged)
public:
- explicit QNetworkSettingsWireless(QObject* parent = 0) :
+ explicit QNetworkSettingsWireless(QObject* parent = Q_NULLPTR) :
QObject(parent) {
}