diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-10-06 08:37:41 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-11-16 11:54:55 +0000 |
commit | 48af5733bcd959146ac157a3c4759c8d89ccc465 (patch) | |
tree | 435177130f0cb39290fc0e89bf2885624c24eb58 /src/networksettings/qnetworksettingsservicemodel.h | |
parent | 2b6766f09ad53f1cf2ba7cfe95976b4322c2e8fd (diff) |
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 <laszlo.agocs@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/networksettings/qnetworksettingsservicemodel.h')
-rw-r--r-- | src/networksettings/qnetworksettingsservicemodel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h index 0cf1601..a540ff5 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 = nullptr); virtual ~QNetworkSettingsServiceModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; @@ -68,13 +68,13 @@ 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 = nullptr); virtual ~QNetworkSettingsServiceFilter(); bool filterAcceptsRow( int source_row, const QModelIndex& source_parent ) const override; QNetworkSettingsType::Types type() const; void setType(QNetworkSettingsType::Types type); Q_INVOKABLE QVariant itemFromRow(const int row) const; -signals: +Q_SIGNALS: void typeChanged(); private: QNetworkSettingsType::Types m_type; |