From 48af5733bcd959146ac157a3c4759c8d89ccc465 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Thu, 6 Oct 2016 08:37:41 +0200 Subject: clean up public headers If this project is treated as a Qt module, it didn't build without these fixes because QT_NO_KEYWORDS and -Werror=zero-as-null-pointer-constant are enforced. Change-Id: Ie3ab8597b338478a5a34ed49d176ce9a647b1e0e Reviewed-by: Laszlo Agocs Reviewed-by: Teemu Holappa Reviewed-by: Samuli Piippo Reviewed-by: Andy Nichols --- src/networksettings/qnetworksettingsaddressmodel.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/networksettings/qnetworksettingsaddressmodel.h') diff --git a/src/networksettings/qnetworksettingsaddressmodel.h b/src/networksettings/qnetworksettingsaddressmodel.h index 5164fc4..e6ceb16 100644 --- a/src/networksettings/qnetworksettingsaddressmodel.h +++ b/src/networksettings/qnetworksettingsaddressmodel.h @@ -36,15 +36,15 @@ 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 = nullptr); + explicit QNetworkSettingsAddressModel(const QStringList &strings, QObject *parent = nullptr); Q_INVOKABLE void append(const QString& address); Q_INVOKABLE void remove(int index); Q_INVOKABLE void resetChanges(); void setStringList(const QStringList &addresses); int count() const; -signals: +Q_SIGNALS: void countChanged(); private: QStringList m_addresses; -- cgit v1.2.3