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/systemtime.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/systemtime.h')
| -rw-r--r-- | src/timedatesettings/systemtime.h | 6 |
1 files changed, 2 insertions, 4 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; |