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/timedatesettings/timezonemodel.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/timedatesettings/timezonemodel.h')
| -rw-r--r-- | src/timedatesettings/timezonemodel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/timedatesettings/timezonemodel.h b/src/timedatesettings/timezonemodel.h index efa0e22..e8f15bf 100644 --- a/src/timedatesettings/timezonemodel.h +++ b/src/timedatesettings/timezonemodel.h @@ -41,7 +41,7 @@ class TimezoneItem : public QObject Q_PROPERTY(QString name READ name CONSTANT) Q_PROPERTY(QString country READ country CONSTANT) public: - explicit TimezoneItem(const QByteArray& id, QObject *parent=0); + explicit TimezoneItem(const QByteArray& id, QObject *parent = nullptr); QString name() const; QString country() const; QString id() const; @@ -57,7 +57,7 @@ class Q_DECL_EXPORT TimezoneModel : public QAbstractListModel Q_OBJECT public: - explicit TimezoneModel(QObject *parent=0); + explicit TimezoneModel(QObject *parent = nullptr); virtual ~TimezoneModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; @@ -72,7 +72,7 @@ public: static void generateModel(TimezoneModel* model); -private slots: +private Q_SLOTS: void addNewItem(QObject* item); private: |