[qt] Replace Qt keywords with macros. JB#50171

Qt keywords are globally defined, and can clash with identifiers in non-Qt projects. Signed-off-by: Andrew Branson <andrew.branson@jolla.com>
sailfishos · Jun 12, 2020 · 1b03792 · 1b03792
1 parent de8bf75
commit 1b03792
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 31 deletions.
diff --git a/keepalive.pro b/keepalive.pro
@@ -1,6 +1,6 @@
 # -*- mode: sh -*-
 TEMPLATE = subdirs
-
+CONFIG += no_keywords
 SUBDIRS += lib
 SUBDIRS += plugin
 SUBDIRS += examples/backgroundactivity_periodic

diff --git a/lib/backgroundactivity.h b/lib/backgroundactivity.h
@@ -88,12 +88,12 @@ class BackgroundActivity: public QObject
 
     QString id() const;
 
-public slots:
+public Q_SLOTS:
     void wait();
     void run();
     void stop();
 
-signals:
+Q_SIGNALS:
     void waiting();
     void running();
     void stopped();

diff --git a/lib/backgroundactivity_p.cpp b/lib/backgroundactivity_p.cpp
@@ -257,16 +257,16 @@ BackgroundActivityPrivate::setState(BackgroundActivity::State new_state)
     }
 
     /* emit state transition signals */
-    emit pub->stateChanged();
+    Q_EMIT pub->stateChanged();
     switch (m_state) {
     case BackgroundActivity::Stopped:
-        emit pub->stopped();
+        Q_EMIT pub->stopped();
         break;
     case BackgroundActivity::Waiting:
-        emit pub->waiting();
+        Q_EMIT pub->waiting();
         break;
     case BackgroundActivity::Running:
-        emit pub->running();
+        Q_EMIT pub->running();
         break;
     }
 }
@@ -310,12 +310,12 @@ BackgroundActivityPrivate::setWakeup(BackgroundActivity::Frequency slot,
     }
 
     if (old_slot !=  m_wakeup_freq) {
-        emit pub->wakeupFrequencyChanged();
+        Q_EMIT pub->wakeupFrequencyChanged();
     }
 
     if (old_wakeup_range_min != m_wakeup_range_min ||
             old_wakeup_range_max != m_wakeup_range_max) {
-        emit pub->wakeupRangeChanged();
+        Q_EMIT pub->wakeupRangeChanged();
     }
 }
 

diff --git a/lib/backgroundactivity_p.h b/lib/backgroundactivity_p.h
@@ -67,7 +67,7 @@ class BackgroundActivityPrivate : public QObject
 
     QString id() const;
 
-private slots:
+private Q_SLOTS:
     void renewKeepalivePeriod();
     void keepalivePeriodReply(QDBusPendingCallWatcher *call);
 

diff --git a/lib/displayblanking.h b/lib/displayblanking.h
@@ -55,10 +55,10 @@ class DisplayBlanking: public QObject
     bool preventBlanking() const;
     Status status() const;
 
-public slots:
+public Q_SLOTS:
     void setPreventBlanking(bool);
 
-signals:
+Q_SIGNALS:
     void preventBlankingChanged();
     void statusChanged();
 

diff --git a/lib/displayblanking_p.cpp b/lib/displayblanking_p.cpp
@@ -155,7 +155,7 @@ void DisplayBlankingSingleton::updateDisplayStatus(const QString &status)
 
     if (newStatus != m_displayStatus) {
         m_displayStatus = newStatus;
-        emit displayStatusChanged();
+        Q_EMIT displayStatusChanged();
     }
 }
 

diff --git a/lib/displayblanking_p.h b/lib/displayblanking_p.h
@@ -58,7 +58,7 @@ class DisplayBlankingSingleton: public QObject
     void stopKeepalive();
     void evaluateKeepalive();
 
-private slots:
+private Q_SLOTS:
     void renewKeepalive();
     void updateDisplayStatus(const QString &status);
     void getDisplayStatusComplete(QDBusPendingCallWatcher *call);

diff --git a/lib/heartbeat.cpp b/lib/heartbeat.cpp
@@ -250,7 +250,7 @@ Heartbeat::wakeup(int fd)
     m_started = false;
 
     /* Then notify upper level logic */
-    emit timeout();
+    Q_EMIT timeout();
 
 cleanup:
     if (!keep_going) {

diff --git a/lib/heartbeat.h b/lib/heartbeat.h
@@ -57,10 +57,10 @@ class Heartbeat : public QObject
 
     void disconnect();
 
-signals:
+Q_SIGNALS:
     void timeout();
 
-private slots:
+private Q_SLOTS:
     void retryConnect();
     void wakeup(int fd);
     void wait();

diff --git a/plugin/declarativebackgroundactivity.cpp b/plugin/declarativebackgroundactivity.cpp
@@ -70,7 +70,7 @@ void DeclarativeKeepAlive::setEnabled(bool enabled)
             mBackgroundActivity->run();
         else
             mBackgroundActivity->stop();
-        emit enabledChanged();
+        Q_EMIT enabledChanged();
     }
 }
 
@@ -217,7 +217,7 @@ void DeclarativeBackgroundJob::setTriggeredOnEnable(bool triggeredOnEnable)
 {
     if (triggeredOnEnable != mTriggeredOnEnable) {
         mTriggeredOnEnable = triggeredOnEnable;
-        emit triggeredOnEnableChanged();
+        Q_EMIT triggeredOnEnableChanged();
         scheduleUpdate();
     }
 }
@@ -236,7 +236,7 @@ void DeclarativeBackgroundJob::setEnabled(bool enabled)
 {
     if (enabled != mEnabled) {
         mEnabled = enabled;
-        emit enabledChanged();
+        Q_EMIT enabledChanged();
         scheduleUpdate();
     }
 }
@@ -255,7 +255,7 @@ void DeclarativeBackgroundJob::setFrequency(Frequency frequency)
 {
     if (frequency != mFrequency) {
         mFrequency = frequency;
-        emit frequencyChanged();
+        Q_EMIT frequencyChanged();
         scheduleUpdate();
     }
 }
@@ -269,7 +269,7 @@ void DeclarativeBackgroundJob::setMinimumWait(int minimum)
 {
     if (minimum != mMinimum) {
         mMinimum = minimum;
-        emit minimumWaitChanged();
+        Q_EMIT minimumWaitChanged();
         scheduleUpdate();
     }
 }
@@ -283,7 +283,7 @@ void DeclarativeBackgroundJob::setMaximumWait(int maximum)
 {
     if (maximum != mMaximum) {
         mMaximum = maximum;
-        emit maximumWaitChanged();
+        Q_EMIT maximumWaitChanged();
         scheduleUpdate();
     }
 }
@@ -360,12 +360,12 @@ void DeclarativeBackgroundJob::classBegin()
 void DeclarativeBackgroundJob::stateChanged()
 {
     if (mBackgroundActivity->isRunning()) {
-        emit triggered();
-        emit runningChanged();
+        Q_EMIT triggered();
+        Q_EMIT runningChanged();
     }
 
     if (mPreviousState == BackgroundActivity::Running)
-        emit runningChanged();
+        Q_EMIT runningChanged();
 
     mPreviousState = mBackgroundActivity->state();
 }

diff --git a/plugin/declarativebackgroundactivity.h b/plugin/declarativebackgroundactivity.h
@@ -48,7 +48,7 @@ class DeclarativeKeepAlive : public QObject
     bool enabled() const;
     void setEnabled(bool enabled);
 
-signals:
+Q_SIGNALS:
     void enabledChanged();
 
 private:
@@ -115,25 +115,25 @@ class DeclarativeBackgroundJob : public QObject, public QQmlParserStatus
     void classBegin();
     void componentComplete();
 
-signals:
+Q_SIGNALS:
     void triggeredOnEnableChanged();
     void enabledChanged();
     void runningChanged();
     void frequencyChanged();
     void minimumWaitChanged();
     void maximumWaitChanged();
 
-signals:
+Q_SIGNALS:
     void triggered();
 
-public slots:
+public Q_SLOTS:
     void begin();
     void finished();
 
 protected:
     bool event(QEvent *event);
 
-private slots:
+private Q_SLOTS:
     void stateChanged();
     void update();