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/timedatesettings/timezonemodel.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/timedatesettings/timezonemodel.h') 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: -- cgit v1.2.3