diff options
| author | Rainer Keller <Rainer.Keller@qt.io> | 2016-10-24 15:54:18 +0200 |
|---|---|---|
| committer | Rainer Keller <Rainer.Keller@qt.io> | 2016-10-31 07:55:37 +0000 |
| commit | c3007c5ecc24c43bb37e909298c73a3780bde1f9 (patch) | |
| tree | ab13c596103d59ca46a4abb44badcab3039d15e0 /src/timedatesettings | |
| parent | 197bed092d8d88446d3708cd393c8f9c3a8d0491 (diff) | |
Fix compile error: No Qt keywords allowed in header files
Change-Id: I79dc9af286e6eca13524d29c478cac79e5d76707
Reviewed-by: Risto Avila <risto.avila@qt.io>
Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src/timedatesettings')
| -rw-r--r-- | src/timedatesettings/systemtime.h | 4 | ||||
| -rw-r--r-- | src/timedatesettings/timezonefiltermodel.h | 2 | ||||
| -rw-r--r-- | src/timedatesettings/timezonemodel.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/timedatesettings/systemtime.h b/src/timedatesettings/systemtime.h index 8ccd52e..f7ad593 100644 --- a/src/timedatesettings/systemtime.h +++ b/src/timedatesettings/systemtime.h @@ -49,12 +49,12 @@ public: QDateTime time() const; void setTimeZone(const QString& aTimeZone); -signals: +Q_SIGNALS: void timeZoneChanged(); void ntpChanged(); void timeChanged(); -public slots: +public Q_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 0714317..485fd17 100644 --- a/src/timedatesettings/timezonemodel.h +++ b/src/timedatesettings/timezonemodel.h @@ -72,7 +72,7 @@ public: static void generateModel(TimezoneModel* model); -private slots: +private Q_SLOTS: void addNewItem(QObject* item); private: |