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 | |
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')
-rw-r--r-- | src/timedatesettings/systemtime.h | 6 | ||||
-rw-r--r-- | src/timedatesettings/timezonefiltermodel.h | 2 | ||||
-rw-r--r-- | src/timedatesettings/timezonemodel.h | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/timedatesettings/systemtime.h b/src/timedatesettings/systemtime.h index 178e6a6..6003238 100644 --- a/src/timedatesettings/systemtime.h +++ b/src/timedatesettings/systemtime.h @@ -41,7 +41,7 @@ class Q_DECL_EXPORT SystemTime : public QObject Q_PROPERTY(bool ntp READ ntp WRITE setNtp NOTIFY ntpChanged) Q_PROPERTY(QDateTime time READ time WRITE setTime NOTIFY timeChanged) public: - explicit SystemTime(QObject *parent = 0); + explicit SystemTime(QObject *parent = nullptr); bool ntp() const; void setNtp(const bool aNtp); void setTime(const QDateTime& aTime); @@ -49,13 +49,11 @@ public: QDateTime time() const; void setTimeZone(const QString& aTimeZone); -signals: +Q_SIGNALS: void timeZoneChanged(); void ntpChanged(); void timeChanged(); -public slots: - protected: SystemTimePrivate *d_ptr; diff --git a/src/timedatesettings/timezonefiltermodel.h b/src/timedatesettings/timezonefiltermodel.h index 164f8c0..9585801 100644 --- a/src/timedatesettings/timezonefiltermodel.h +++ b/src/timedatesettings/timezonefiltermodel.h @@ -42,7 +42,7 @@ public: QString filter() const; void setFilter(const QString& aFilter); Q_INVOKABLE QVariant itemFromRow(const int row) const; -signals: +Q_SIGNALS: void filterChanged(); private: QString m_filter; 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: |