From 197bed092d8d88446d3708cd393c8f9c3a8d0491 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Mon, 24 Oct 2016 15:52:03 +0200 Subject: Fix compile error: 0 is not allowed for pointer initialization anymore Change-Id: Ic8b789a46dafd379fdd48279d6eb138f978e80a5 Reviewed-by: Risto Avila Reviewed-by: Kimmo Ollila Reviewed-by: Teemu Holappa Reviewed-by: Samuli Piippo --- .../connman/qnetworksettingsinterface_p.h | 2 +- src/networksettings/connman/qnetworksettingsservice_p.h | 2 +- .../connman/qnetworksettingsuseragent_p.h | 2 +- src/networksettings/qnetworksettings.h | 16 ++++++++-------- src/networksettings/qnetworksettingsaddressmodel.h | 4 ++-- src/networksettings/qnetworksettingsinterface.h | 2 +- src/networksettings/qnetworksettingsinterfacemodel.h | 2 +- src/networksettings/qnetworksettingsmanager.h | 2 +- src/networksettings/qnetworksettingsservice.h | 2 +- src/networksettings/qnetworksettingsservicemodel.h | 4 ++-- src/networksettings/qnetworksettingsuseragent.h | 2 +- .../wpasupplicant/qnetworksettingsservice_p.h | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/networksettings') diff --git a/src/networksettings/connman/qnetworksettingsinterface_p.h b/src/networksettings/connman/qnetworksettingsinterface_p.h index 275e751..eabe610 100644 --- a/src/networksettings/connman/qnetworksettingsinterface_p.h +++ b/src/networksettings/connman/qnetworksettingsinterface_p.h @@ -66,7 +66,7 @@ class ConnmanSettingsInterface : public QNetworkSettingsInterface { Q_OBJECT public: - ConnmanSettingsInterface(const QString& path, const QVariantMap& properties, QObject *parent=0) + ConnmanSettingsInterface(const QString& path, const QVariantMap& properties, QObject *parent = Q_NULLPTR) :QNetworkSettingsInterface(parent) { if (d_ptr) diff --git a/src/networksettings/connman/qnetworksettingsservice_p.h b/src/networksettings/connman/qnetworksettingsservice_p.h index 942a871..22cde5d 100644 --- a/src/networksettings/connman/qnetworksettingsservice_p.h +++ b/src/networksettings/connman/qnetworksettingsservice_p.h @@ -40,7 +40,7 @@ class QNetworkSettingsServicePrivate : public QObject Q_OBJECT Q_DECLARE_PUBLIC(QNetworkSettingsService) public: - QNetworkSettingsServicePrivate(const QString& aPath, QNetworkSettingsService *parent=0); + QNetworkSettingsServicePrivate(const QString& aPath, QNetworkSettingsService *parent = Q_NULLPTR); QNetworkSettingsService *q_ptr; private slots: diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.h b/src/networksettings/connman/qnetworksettingsuseragent_p.h index e05525b..ff8c1d0 100644 --- a/src/networksettings/connman/qnetworksettingsuseragent_p.h +++ b/src/networksettings/connman/qnetworksettingsuseragent_p.h @@ -50,7 +50,7 @@ class QNetworkSettingsUserAgentPrivate : public QDBusAbstractAdaptor Q_CLASSINFO("D-Bus Interface", "net.connman.Agent") Q_DECLARE_PUBLIC(QNetworkSettingsUserAgent) public: - QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent *parent=0); + QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent *parent = Q_NULLPTR); void setUserCredentials(const QString& aUsername, const QString& aPassword); void cancel(); void release(); 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) { } diff --git a/src/networksettings/qnetworksettingsaddressmodel.h b/src/networksettings/qnetworksettingsaddressmodel.h index 5164fc4..280a288 100644 --- a/src/networksettings/qnetworksettingsaddressmodel.h +++ b/src/networksettings/qnetworksettingsaddressmodel.h @@ -36,8 +36,8 @@ class Q_DECL_EXPORT QNetworkSettingsAddressModel : public QStringListModel Q_OBJECT Q_PROPERTY(int count READ count NOTIFY countChanged) public: - explicit QNetworkSettingsAddressModel(QObject *parent = 0); - explicit QNetworkSettingsAddressModel(const QStringList &strings, QObject *parent = 0); + explicit QNetworkSettingsAddressModel(QObject *parent = Q_NULLPTR); + explicit QNetworkSettingsAddressModel(const QStringList &strings, QObject *parent = Q_NULLPTR); Q_INVOKABLE void append(const QString& address); Q_INVOKABLE void remove(int index); Q_INVOKABLE void resetChanges(); diff --git a/src/networksettings/qnetworksettingsinterface.h b/src/networksettings/qnetworksettingsinterface.h index 385d1ed..4d39dfc 100644 --- a/src/networksettings/qnetworksettingsinterface.h +++ b/src/networksettings/qnetworksettingsinterface.h @@ -42,7 +42,7 @@ class Q_DECL_EXPORT QNetworkSettingsInterface : public QObject { Q_PROPERTY(bool powered READ powered WRITE setPowered NOTIFY poweredChanged) public: - explicit QNetworkSettingsInterface(QObject* parent=0); + explicit QNetworkSettingsInterface(QObject* parent = Q_NULLPTR); QString name() const; QNetworkSettingsState::States state(); QNetworkSettingsType::Types type(); diff --git a/src/networksettings/qnetworksettingsinterfacemodel.h b/src/networksettings/qnetworksettingsinterfacemodel.h index 7282657..2fc74bc 100644 --- a/src/networksettings/qnetworksettingsinterfacemodel.h +++ b/src/networksettings/qnetworksettingsinterfacemodel.h @@ -39,7 +39,7 @@ class Q_DECL_EXPORT QNetworkSettingsInterfaceModel : public QAbstractListModel Q_OBJECT public: - explicit QNetworkSettingsInterfaceModel(QObject *parent=0); + explicit QNetworkSettingsInterfaceModel(QObject *parent = Q_NULLPTR); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const; diff --git a/src/networksettings/qnetworksettingsmanager.h b/src/networksettings/qnetworksettingsmanager.h index 5d2ad13..79918e2 100644 --- a/src/networksettings/qnetworksettingsmanager.h +++ b/src/networksettings/qnetworksettingsmanager.h @@ -46,7 +46,7 @@ class Q_DECL_EXPORT QNetworkSettingsManager : public QObject Q_PROPERTY(QNetworkSettingsUserAgent* userAgent READ getUserAgent CONSTANT) public: - explicit QNetworkSettingsManager(QObject* parent = 0); + explicit QNetworkSettingsManager(QObject* parent = Q_NULLPTR); QAbstractItemModel* services(); QAbstractItemModel* interfaces(); void setUserAgent(QNetworkSettingsUserAgent *agent); diff --git a/src/networksettings/qnetworksettingsservice.h b/src/networksettings/qnetworksettingsservice.h index 44c433a..89973a8 100644 --- a/src/networksettings/qnetworksettingsservice.h +++ b/src/networksettings/qnetworksettingsservice.h @@ -49,7 +49,7 @@ class Q_DECL_EXPORT QNetworkSettingsService : public QObject Q_PROPERTY(QAbstractItemModel* domains READ domains NOTIFY domainsChanged) Q_PROPERTY(QAbstractItemModel* nameservers READ nameservers NOTIFY nameserversChanged) public: - explicit QNetworkSettingsService(const QString& aServiceId, QObject* parent = 0); + explicit QNetworkSettingsService(const QString& aServiceId, QObject* parent = Q_NULLPTR); QString id() const; QString name() const; diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h index 0cf1601..e1fdf90 100644 --- a/src/networksettings/qnetworksettingsservicemodel.h +++ b/src/networksettings/qnetworksettingsservicemodel.h @@ -37,7 +37,7 @@ class Q_DECL_EXPORT QNetworkSettingsServiceModel : public QAbstractListModel { Q_OBJECT public: - explicit QNetworkSettingsServiceModel(QObject *parent=0); + explicit QNetworkSettingsServiceModel(QObject *parent = Q_NULLPTR); virtual ~QNetworkSettingsServiceModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; @@ -68,7 +68,7 @@ class QNetworkSettingsServiceFilter : public QSortFilterProxyModel Q_OBJECT Q_PROPERTY(QNetworkSettingsType::Types type READ type WRITE setType NOTIFY typeChanged) public: - explicit QNetworkSettingsServiceFilter(QObject* parent=0); + explicit QNetworkSettingsServiceFilter(QObject* parent = Q_NULLPTR); virtual ~QNetworkSettingsServiceFilter(); bool filterAcceptsRow( int source_row, const QModelIndex& source_parent ) const override; QNetworkSettingsType::Types type() const; diff --git a/src/networksettings/qnetworksettingsuseragent.h b/src/networksettings/qnetworksettingsuseragent.h index ff4c030..7a91524 100644 --- a/src/networksettings/qnetworksettingsuseragent.h +++ b/src/networksettings/qnetworksettingsuseragent.h @@ -37,7 +37,7 @@ class Q_DECL_EXPORT QNetworkSettingsUserAgent : public QObject { Q_OBJECT public: - explicit QNetworkSettingsUserAgent(QObject *parent = 0); + explicit QNetworkSettingsUserAgent(QObject *parent = Q_NULLPTR); Q_INVOKABLE void setUserCredentials(const QString& username, const QString& passphrase); Q_INVOKABLE void cancelInput(); QString passPhrase() const; diff --git a/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h index 3920f61..6ed6d5a 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h +++ b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h @@ -40,7 +40,7 @@ class QNetworkSettingsServicePrivate : public QObject Q_OBJECT Q_DECLARE_PUBLIC(QNetworkSettingsService) public: - QNetworkSettingsServicePrivate(const QString& aServiceId, QNetworkSettingsService *parent=0); + QNetworkSettingsServicePrivate(const QString& aServiceId, QNetworkSettingsService *parent = Q_NULLPTR); void setManager(QNetworkSettingsManagerPrivate *manager); QNetworkSettingsService *q_ptr; @@ -70,7 +70,7 @@ class WpaSupplicantService : public QNetworkSettingsService { Q_OBJECT public: - explicit WpaSupplicantService(QNetworkSettingsManagerPrivate* manager, QObject* parent=0); + explicit WpaSupplicantService(QNetworkSettingsManagerPrivate* manager, QObject* parent = Q_NULLPTR); void setId(const QString& aId); void setName(const QString& aName); void setFlags(const QString& aFlags); -- cgit v1.2.3