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>

17 files changed, 46 insertions, 46 deletions

diff --git a/src/bluetoothsettings/bluetoothdevice.h b/src/bluetoothsettings/bluetoothdevice.h
index 5a77d62..8519044 100644
--- a/src/bluetoothsettings/bluetoothdevice.h
+++ b/src/bluetoothsettings/bluetoothdevice.h
@@ -50,11 +50,11 @@ public:
     Q_INVOKABLE void requestPairing(const QString& address);
     Q_INVOKABLE void requestConnect(const QString& address);
     Q_INVOKABLE void requestDisconnect(const QString& address);
-signals:
+Q_SIGNALS:
     void poweredChanged();
     void scanningChanged();
 
-public slots:
+public Q_SLOTS:
     void deviceStateChanged(QBluetoothLocalDevice::HostMode state);
     void scanFinished();
     //These are not yet signaled
diff --git a/src/bluetoothsettings/discoverymodel.h b/src/bluetoothsettings/discoverymodel.h
index 61d0993..12554d7 100644
--- a/src/bluetoothsettings/discoverymodel.h
+++ b/src/bluetoothsettings/discoverymodel.h
@@ -65,7 +65,7 @@ public:
     bool connected() const;
     void setConnected(bool aConnected);
 
-signals:
+Q_SIGNALS:
     void connectedChanged();
 
 protected:
@@ -106,10 +106,10 @@ public:
         Connected
     };
 
-signals:
+Q_SIGNALS:
     void scanFinished();
 
-private slots:
+private Q_SLOTS:
     void deviceDiscovered(const QBluetoothDeviceInfo &device);
 private:
     QList<BtDeviceItem*> m_items;
diff --git a/src/displaysettings/displaysettings.h b/src/displaysettings/displaysettings.h
index 04cd3fd..1874357 100644
--- a/src/displaysettings/displaysettings.h
+++ b/src/displaysettings/displaysettings.h
@@ -54,7 +54,7 @@ public Q_SLOTS:
     void setPhysicalScreenSizeInch(int inches);
     void setPhysicalScreenSizeOverride(bool enable);
 
-signals:
+Q_SIGNALS:
     void displayBrightnessChanged(int newValue);
     void physicalScreenSizeInchChanged(int newInches);
     void physicalScreenSizeOverrideChanged(bool newValue);
diff --git a/src/localesettings/localefiltermodel.h b/src/localesettings/localefiltermodel.h
index c885dd3..6c839e4 100644
--- a/src/localesettings/localefiltermodel.h
+++ b/src/localesettings/localefiltermodel.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/localesettings/localemodel.h b/src/localesettings/localemodel.h
index fe4289a..4fb00a0 100644
--- a/src/localesettings/localemodel.h
+++ b/src/localesettings/localemodel.h
@@ -74,10 +74,10 @@ public:
 
     static void generateModel(LocaleModel* model);
 
-signals:
+Q_SIGNALS:
     void addItem(LocaleItem* item);
 
-private slots:
+private Q_SLOTS:
     void addNewItem(QObject* item);
     void modelReady();
 
diff --git a/src/localesettings/systemlocale.h b/src/localesettings/systemlocale.h
index a0cccec..075d397 100644
--- a/src/localesettings/systemlocale.h
+++ b/src/localesettings/systemlocale.h
@@ -41,9 +41,9 @@ public:
     explicit SystemLocale(QObject *parent = Q_NULLPTR);
     QString locale() const;
     void setLocale(const QString& aLocale);
-signals:
+Q_SIGNALS:
     void localeChanged();
-public slots:
+public Q_SLOTS:
 
 protected:
     SystemLocalePrivate *d_ptr;
diff --git a/src/networksettings/qnetworksettings.h b/src/networksettings/qnetworksettings.h
index a507729..31561f4 100644
--- a/src/networksettings/qnetworksettings.h
+++ b/src/networksettings/qnetworksettings.h
@@ -61,10 +61,10 @@ public:
 
     void setState(const States state) {
         m_state = state;
-        emit stateChanged();
+        Q_EMIT stateChanged();
     }
 
-signals:
+Q_SIGNALS:
     void stateChanged();
 
 private:
@@ -104,10 +104,10 @@ public:
 
     void setType(const Types type) {
         m_type = type;
-        emit typeChanged();
+        Q_EMIT typeChanged();
     }
 
-signals:
+Q_SIGNALS:
     void typeChanged();
 
 private:
@@ -137,7 +137,7 @@ public:
     }
     void setAddress(const QString& adderess) {
         m_address = adderess;
-        emit addressChanged();
+        Q_EMIT addressChanged();
     }
 
     QString gateway() const {
@@ -146,7 +146,7 @@ public:
 
     void setGateway(const QString& gateway) {
         m_gateway = gateway;
-        emit gatewayChanged();
+        Q_EMIT gatewayChanged();
     }
 
     MethodType method() const {
@@ -155,7 +155,7 @@ public:
 
     void setMethod(const MethodType method) {
         m_method = method;
-        emit methodChanged();
+        Q_EMIT methodChanged();
     }
 
     QString mask() const {
@@ -164,10 +164,10 @@ public:
 
     void setMask(const QString& mask) {
         m_mask = mask;
-        emit maskChanged();
+        Q_EMIT maskChanged();
     }
 
-signals:
+Q_SIGNALS:
     void addressChanged();
     void gatewayChanged();
     void methodChanged();
@@ -206,7 +206,7 @@ public:
     }
     void setAddress(const QString& adderess) {
         m_address = adderess;
-        emit addressChanged();
+        Q_EMIT addressChanged();
     }
 
     QString gateway() const {
@@ -215,7 +215,7 @@ public:
 
     void setGateway(const QString& gateway) {
         m_gateway = gateway;
-        emit gatewayChanged();
+        Q_EMIT gatewayChanged();
     }
 
     MethodType method() const {
@@ -224,7 +224,7 @@ public:
 
     void setMethod(const MethodType method) {
         m_method = method;
-        emit methodChanged();
+        Q_EMIT methodChanged();
     }
 
     PrivacyType privacy() const {
@@ -233,7 +233,7 @@ public:
 
     void setPrivacy(const PrivacyType privacy) {
         m_privacy = privacy;
-        emit privacyChanged();
+        Q_EMIT privacyChanged();
     }
 
     int prefixLength() const {
@@ -242,10 +242,10 @@ public:
 
     void setPrefixLength(const int& prefixLength) {
         m_prefixLength = prefixLength;
-        emit prefixLengthChanged();
+        Q_EMIT prefixLengthChanged();
     }
 
-signals:
+Q_SIGNALS:
     void addressChanged();
     void gatewayChanged();
     void methodChanged();
@@ -284,7 +284,7 @@ public:
 
     void setUrl(const QUrl& url) {
         m_url = url;
-        emit urlChanged();
+        Q_EMIT urlChanged();
     }
 
     QAbstractItemModel* servers(void) {
@@ -293,7 +293,7 @@ public:
 
     void setServers(const QStringList& servers) {
         m_servers.setStringList(servers);
-        emit serversChanged();
+        Q_EMIT serversChanged();
     }
 
     QStringList servers() const {
@@ -310,7 +310,7 @@ public:
 
     void setExcludes(const QStringList& excludes) {
         m_excludes.setStringList(excludes);
-        emit excludesChanged();
+        Q_EMIT excludesChanged();
     }
 
     MethodType method(void) const {
@@ -319,10 +319,10 @@ public:
 
     void setMethod(const MethodType& method) {
         m_method = method;
-        emit methodChanged();
+        Q_EMIT methodChanged();
     }
 
-signals:
+Q_SIGNALS:
     void urlChanged();
     void serversChanged();
     void excludesChanged();
@@ -360,7 +360,7 @@ public:
 
     void setHidden(const bool hidden) {
         m_hidden = hidden;
-        emit hiddenChanged();
+        Q_EMIT hiddenChanged();
     }
 
     int signalStrength() const {
@@ -369,7 +369,7 @@ public:
 
     void setSignalStrength(const int signalStrength) {
         m_signalStrength = signalStrength;
-        emit signalStrengthChanged();
+        Q_EMIT signalStrengthChanged();
     }
 
     void setSecurity(const SecurityFlags security) {
@@ -383,14 +383,14 @@ public:
 
     void setOutOfRange(const bool aOutOfRange) {
         m_isOutOfRange = aOutOfRange;
-        emit outOfRangeChanged();
+        Q_EMIT outOfRangeChanged();
     }
 
     bool outOfRange() const {
         return m_isOutOfRange;
     }
 
-signals:
+Q_SIGNALS:
     void hiddenChanged();
     void signalStrengthChanged();
     void passwordChanged();
diff --git a/src/networksettings/qnetworksettingsaddressmodel.h b/src/networksettings/qnetworksettingsaddressmodel.h
index 280a288..16d601d 100644
--- a/src/networksettings/qnetworksettingsaddressmodel.h
+++ b/src/networksettings/qnetworksettingsaddressmodel.h
@@ -44,7 +44,7 @@ public:
     void setStringList(const QStringList &addresses);
     int count() const;
 
-signals:
+Q_SIGNALS:
     void countChanged();
 private:
     QStringList m_addresses;
diff --git a/src/networksettings/qnetworksettingsinterface.h b/src/networksettings/qnetworksettingsinterface.h
index 4d39dfc..a87626d 100644
--- a/src/networksettings/qnetworksettingsinterface.h
+++ b/src/networksettings/qnetworksettingsinterface.h
@@ -50,7 +50,7 @@ public:
     void setPowered(const bool powered);
     Q_INVOKABLE void scanServices();
 
-signals:
+Q_SIGNALS:
     void nameChanged();
     void stateChanged();
     void typeChanged();
diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h
index e1fdf90..3770775 100644
--- a/src/networksettings/qnetworksettingsservicemodel.h
+++ b/src/networksettings/qnetworksettingsservicemodel.h
@@ -74,7 +74,7 @@ public:
     QNetworkSettingsType::Types type() const;
     void setType(QNetworkSettingsType::Types type);
     Q_INVOKABLE QVariant itemFromRow(const int row) const;
-signals:
+Q_SIGNALS:
     void typeChanged();
 private:
     QNetworkSettingsType::Types m_type;
diff --git a/src/networksettings/qnetworksettingsuseragent.h b/src/networksettings/qnetworksettingsuseragent.h
index 7a91524..89b4d18 100644
--- a/src/networksettings/qnetworksettingsuseragent.h
+++ b/src/networksettings/qnetworksettingsuseragent.h
@@ -43,7 +43,7 @@ public:
     QString passPhrase() const;
     QString userName() const;
 
-signals:
+Q_SIGNALS:
     void showUserCredentialsInput();
     void error();
     void ready(bool cancel);
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h b/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h
index 0cce23a..74ef765 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h
+++ b/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h
@@ -46,7 +46,7 @@ public:
     void setManager(QNetworkSettingsManagerPrivate *manager);
     void scan();
 
-signals:
+Q_SIGNALS:
 
 protected:
     QString m_name;
diff --git a/src/networksettings/wpasupplicant/qwificontroller_p.h b/src/networksettings/wpasupplicant/qwificontroller_p.h
index 0bb4c9a..a228fb5 100644
--- a/src/networksettings/wpasupplicant/qwificontroller_p.h
+++ b/src/networksettings/wpasupplicant/qwificontroller_p.h
@@ -96,7 +96,7 @@ public:
     bool resetSupplicantSocket();
     QWifiSupplicant *supplicant() const { return m_supplicant; }
 
-signals:
+Q_SIGNALS:
     void backendStateChanged(BackendState backendState);
     void dhcpRequestFinished(const QString &status);
     void raiseError(const QString &error);
diff --git a/src/networksettings/wpasupplicant/qwifisupplicant_p.h b/src/networksettings/wpasupplicant/qwifisupplicant_p.h
index 713ab6d..5f6b31c 100644
--- a/src/networksettings/wpasupplicant/qwifisupplicant_p.h
+++ b/src/networksettings/wpasupplicant/qwifisupplicant_p.h
@@ -57,7 +57,7 @@ public:
     bool sendCommand(const QString &command, QByteArray *reply);
     static QString decodeSsid(const QString &encoded);
 
-signals:
+Q_SIGNALS:
     void raiseError(const QString& error);
 
 protected:
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: