From 7b2eb5b3a14dd198564658c143567b3eb7a879f6 Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Fri, 27 Nov 2020 00:58:48 +0100
Subject: Make it compile with QT_NO_KEYWORDS

---
 lib/connection.h   | 6 +++---
 lib/jobs/basejob.h | 8 ++++----
 lib/room.h         | 4 ++--
 lib/uriresolver.h  | 2 +-
 lib/user.h         | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/connection.h b/lib/connection.h
index 6517b909..07ae9f29 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -497,7 +497,7 @@ public:
         setUserFactory(defaultUserFactory<T>());
     }
 
-public slots:
+public Q_SLOTS:
     /** Set the homeserver base URL */
     void setHomeserver(const QUrl& baseUrl);
 
@@ -656,7 +656,7 @@ public slots:
      */
     virtual PostReceiptJob* postReceipt(Room* room, RoomEvent* event);
 
-signals:
+Q_SIGNALS:
     /**
      * @deprecated
      * This was a signal resulting from a successful resolveServer().
@@ -853,7 +853,7 @@ protected:
      */
     void onSyncSuccess(SyncData&& data, bool fromCache = false);
 
-protected slots:
+protected Q_SLOTS:
     void syncLoopIteration();
 
 private:
diff --git a/lib/jobs/basejob.h b/lib/jobs/basejob.h
index be2926be..5c054ed1 100644
--- a/lib/jobs/basejob.h
+++ b/lib/jobs/basejob.h
@@ -251,7 +251,7 @@ public:
         return dbg << j->objectName();
     }
 
-public slots:
+public Q_SLOTS:
     void initiate(ConnectionData* connData, bool inBackground);
 
     /**
@@ -263,7 +263,7 @@ public slots:
      */
     void abandon();
 
-signals:
+Q_SIGNALS:
     /** The job is about to send a network request */
     void aboutToSendRequest();
 
@@ -433,7 +433,7 @@ protected:
     // Job objects should only be deleted via QObject::deleteLater
     ~BaseJob() override;
 
-protected slots:
+protected Q_SLOTS:
     void timeout();
 
     /*! \brief Check the pending or received reply for upfront issues
@@ -456,7 +456,7 @@ protected slots:
      */
     virtual Status checkReply(const QNetworkReply *reply) const;
 
-private slots:
+private Q_SLOTS:
     void sendRequest();
     void gotReply();
 
diff --git a/lib/room.h b/lib/room.h
index f4d7eb70..7eee022c 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -547,7 +547,7 @@ public:
         return setState(EvT(std::forward<ArgTs>(args)...));
     }
 
-public slots:
+public Q_SLOTS:
     /** Check whether the room should be upgraded */
     void checkVersion();
 
@@ -611,7 +611,7 @@ public slots:
     void answerCall(const QString& callId, const QString& sdp);
     void hangupCall(const QString& callId);
 
-signals:
+Q_SIGNALS:
     /// Initial set of state events has been loaded
     /**
      * The initial set is what comes from the initial sync for the room.
diff --git a/lib/uriresolver.h b/lib/uriresolver.h
index 9b2ced9d..428ce04c 100644
--- a/lib/uriresolver.h
+++ b/lib/uriresolver.h
@@ -141,7 +141,7 @@ public:
         return UriResolverBase::visitResource(account, uri);
     }
 
-signals:
+Q_SIGNALS:
     /// An action on a user has been requested
     void userAction(Quotient::User* user, QString action);
 
diff --git a/lib/user.h b/lib/user.h
index a3b22480..19f57c30 100644
--- a/lib/user.h
+++ b/lib/user.h
@@ -122,7 +122,7 @@ public:
     QString avatarMediaId(const Room* room = nullptr) const;
     QUrl avatarUrl(const Room* room = nullptr) const;
 
-public slots:
+public Q_SLOTS:
     /// Set a new name in the global user profile
     void rename(const QString& newName);
     /// Set a new name for the user in one room
@@ -143,7 +143,7 @@ public slots:
     /// Check whether the user is in ignore list
     bool isIgnored() const;
 
-signals:
+Q_SIGNALS:
     void defaultNameChanged();
     void defaultAvatarChanged();
 
-- 
cgit v1.2.3