Merge branch 'pragma-once'

27 files changed, 40 insertions, 159 deletions

diff --git a/connection.h b/connection.h
index 27c8fde1..0e25d695 100644
--- a/connection.h
+++ b/connection.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_CONNECTION_H
-#define QMATRIXCLIENT_CONNECTION_H
+#pragma once
 
 #include <QtCore/QObject>
 #include <QtCore/QUrl>
@@ -84,13 +83,13 @@ namespace QMatrixClient
             void connectionError(QString error);
             void resolveError(QString error);
             //void jobError(BaseJob* job);
-            
+
         protected:
             /**
              * @brief Access the underlying ConnectionData class
              */
             ConnectionData* connectionData();
-            
+
             /**
              * @brief Find a (possibly new) Room object for the specified id
              * Use this method whenever you need to find a Room object in
@@ -106,7 +105,7 @@ namespace QMatrixClient
              * makes it possible for derived classes to have its own User class
              */
             virtual User* createUser(QString userId);
-            
+
             /**
              * makes it possible for derived classes to have its own Room class
              */
@@ -117,5 +116,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_CONNECTION_H
diff --git a/connectiondata.h b/connectiondata.h
index 5c8342d7..89e30e4d 100644
--- a/connectiondata.h
+++ b/connectiondata.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_CONNECTIONDATA_H
-#define QMATRIXCLIENT_CONNECTIONDATA_H
+#pragma once
 
 #include <QtCore/QUrl>
 
@@ -30,7 +29,7 @@ namespace QMatrixClient
         public:
             ConnectionData(QUrl baseUrl);
             virtual ~ConnectionData();
-            
+
             //bool isConnected() const;
             QString accessToken() const;
             QUrl baseUrl() const;
@@ -42,11 +41,9 @@ namespace QMatrixClient
 
             QString lastEvent() const;
             void setLastEvent( QString identifier );
-            
+
         private:
             class Private;
             Private* d;
     };
-}           
-
-#endif // QMATRIXCLIENT_CONNECTIONDATA_H
+}
diff --git a/events/event.h b/events/event.h
index 073cfe31..12b0ebd5 100644
--- a/events/event.h
+++ b/events/event.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_EVENT_H
-#define QMATRIXCLIENT_EVENT_H
+#pragma once
 
 #include <QtCore/QString>
 #include <QtCore/QDateTime>
@@ -110,5 +109,3 @@ namespace QMatrixClient
         return fallback;
     }
 }
-
-#endif // QMATRIXCLIENT_EVENT_H
diff --git a/events/receiptevent.h b/events/receiptevent.h
index add5e20f..5ca33f75 100644
--- a/events/receiptevent.h
+++ b/events/receiptevent.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_RECEIPTEVENT_H
-#define QMATRIXCLIENT_RECEIPTEVENT_H
+#pragma once
 
 #include "event.h"
 
@@ -55,5 +54,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_RECEIPTEVENT_H
diff --git a/events/roomaliasesevent.h b/events/roomaliasesevent.h
index 89ea63b8..8f638be2 100644
--- a/events/roomaliasesevent.h
+++ b/events/roomaliasesevent.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_ROOMALIASESEVENT_H
-#define QMATRIXCLIENT_ROOMALIASESEVENT_H
+#pragma once
 
 #include "event.h"
 
@@ -40,5 +39,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_ROOMALIASESEVENT_H
\ No newline at end of file
diff --git a/events/roomcanonicalaliasevent.h b/events/roomcanonicalaliasevent.h
index f3ab8e5a..87219be6 100644
--- a/events/roomcanonicalaliasevent.h
+++ b/events/roomcanonicalaliasevent.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_ROOMCANONICALALIASEVENT_H
-#define QMATRIXCLIENT_ROOMCANONICALALIASEVENT_H
+#pragma once
 
 #include "event.h"
 
@@ -38,5 +37,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_ROOMCANONICALALIASEVENT_H
\ No newline at end of file
diff --git a/events/roommemberevent.h b/events/roommemberevent.h
index e47013cb..f37cdc04 100644
--- a/events/roommemberevent.h
+++ b/events/roommemberevent.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_ROOMMEMBEREVENT_H
-#define QMATRIXCLIENT_ROOMMEMBEREVENT_H
+#pragma once
 
 #include <QtCore/QJsonObject>
 #include <QtCore/QUrl>
@@ -46,5 +45,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_ROOMMEMBEREVENT_H
diff --git a/events/roommessageevent.h b/events/roommessageevent.h
index 591b2df9..67789ef7 100644
--- a/events/roommessageevent.h
+++ b/events/roommessageevent.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_ROOMMESSAGEEVENT_H
-#define QMATRIXCLIENT_ROOMMESSAGEEVENT_H
+#pragma once
 
 #include <QtCore/QUrl>
 #include <QtCore/QMimeType>
@@ -42,7 +41,7 @@ namespace QMatrixClient
         public:
             RoomMessageEvent();
             virtual ~RoomMessageEvent();
-            
+
             QString userId() const;
             MessageEventType msgtype() const;
 
@@ -57,9 +56,9 @@ namespace QMatrixClient
             QString body() const;
 
             MessageEventContent::Base* content() const;
-        
+
             static RoomMessageEvent* fromJson( const QJsonObject& obj );
-            
+
         private:
             class Private;
             Private* d;
@@ -145,5 +144,3 @@ namespace QMatrixClient
         using AudioContent = ThumbnailedContent<AudioInfo>;
     }
 }
-
-#endif // QMATRIXCLIENT_ROOMMESSAGEEVENT_H
diff --git a/events/roomnameevent.h b/events/roomnameevent.h
index 436a1dd4..0997ad9c 100644
--- a/events/roomnameevent.h
+++ b/events/roomnameevent.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

 

-#ifndef QMATRIXCLIENT_ROOMNAMEEVENT_H

-#define QMATRIXCLIENT_ROOMNAMEEVENT_H

+#pragma once

 

 #include "event.h"

 

@@ -40,5 +39,3 @@ private:
 };

 

 }

-

-#endif // QMATRIXCLIENT_ROOMNAMEEVENT_H

diff --git a/events/roomtopicevent.h b/events/roomtopicevent.h
index f4d87eef..d4347953 100644
--- a/events/roomtopicevent.h
+++ b/events/roomtopicevent.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_ROOMTOPICEVENT_H
-#define QMATRIXCLIENT_ROOMTOPICEVENT_H
+#pragma once
 
 #include <QtCore/QJsonObject>
 
@@ -40,5 +39,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_ROOMTOPICEVENT_H
diff --git a/events/typingevent.h b/events/typingevent.h
index 2625dc66..5a8b045c 100644
--- a/events/typingevent.h
+++ b/events/typingevent.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_TYPINGEVENT_H
-#define QMATRIXCLIENT_TYPINGEVENT_H
+#pragma once
 
 #include <QtCore/QStringList>
 
@@ -40,5 +39,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_TYPINGEVENT_H
diff --git a/events/unknownevent.h b/events/unknownevent.h
index 58493095..51f2c4be 100644
--- a/events/unknownevent.h
+++ b/events/unknownevent.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_UNKNOWNEVENT_H
-#define QMATRIXCLIENT_UNKNOWNEVENT_H
+#pragma once
 
 #include "event.h"
 
@@ -39,5 +38,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_UNKNOWNEVENT_H
\ No newline at end of file
diff --git a/jobs/basejob.h b/jobs/basejob.h
index b356eb7e..55267def 100644
--- a/jobs/basejob.h
+++ b/jobs/basejob.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_BASEJOB_H
-#define QMATRIXCLIENT_BASEJOB_H
+#pragma once
 
 #include <QtCore/QObject>
 #include <QtCore/QJsonDocument>
@@ -229,5 +228,3 @@ namespace QMatrixClient
             QScopedPointer<Private> d;
     };
 }
-
-#endif // QMATRIXCLIENT_BASEJOB_H
diff --git a/jobs/checkauthmethods.h b/jobs/checkauthmethods.h
index e6aeba69..f6eb978a 100644
--- a/jobs/checkauthmethods.h
+++ b/jobs/checkauthmethods.h
@@ -16,30 +16,27 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_CHECKAUTHMETHODS_H
-#define QMATRIXCLIENT_CHECKAUTHMETHODS_H
+#pragma once
 
 #include "basejob.h"
 
 namespace QMatrixClient
 {
     class ConnectionData;
-    
+
     class CheckAuthMethods : public BaseJob
     {
         public:
             CheckAuthMethods(ConnectionData* connection);
             virtual ~CheckAuthMethods();
-            
+
             QString session();
-            
+
         protected:
             Status parseJson(const QJsonDocument& data) override;
-            
+
         private:
             class Private;
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_CHECKAUTHMETHODS_H
diff --git a/jobs/joinroomjob.h b/jobs/joinroomjob.h
index c1eebbef..a69843ed 100644
--- a/jobs/joinroomjob.h
+++ b/jobs/joinroomjob.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_JOINROOMJOB_H
-#define QMATRIXCLIENT_JOINROOMJOB_H
+#pragma once
 
 #include "basejob.h"
 
@@ -41,5 +40,3 @@ namespace QMatrixClient
                 Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_JOINROOMJOB_H
diff --git a/jobs/leaveroomjob.h b/jobs/leaveroomjob.h
index 492233f6..4a62810f 100644
--- a/jobs/leaveroomjob.h
+++ b/jobs/leaveroomjob.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_LEAVEROOMJOB_H
-#define QMATRIXCLIENT_LEAVEROOMJOB_H
+#pragma once
 
 #include "basejob.h"
 
@@ -33,5 +32,3 @@ namespace QMatrixClient
             virtual ~LeaveRoomJob();
     };
 }
-
-#endif // QMATRIXCLIENT_LEAVEROOMJOB_H
diff --git a/jobs/mediathumbnailjob.h b/jobs/mediathumbnailjob.h
index 15bec9a1..cf1e9afb 100644
--- a/jobs/mediathumbnailjob.h
+++ b/jobs/mediathumbnailjob.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_MEDIATHUMBNAILJOB_H
-#define QMATRIXCLIENT_MEDIATHUMBNAILJOB_H
+#pragma once
 
 #include "basejob.h"
 
@@ -44,5 +43,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_MEDIATHUMBNAILJOB_H
diff --git a/jobs/passwordlogin.h b/jobs/passwordlogin.h
index 156865a3..c1291389 100644
--- a/jobs/passwordlogin.h
+++ b/jobs/passwordlogin.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_PASSWORDLOGIN_H
-#define QMATRIXCLIENT_PASSWORDLOGIN_H
+#pragma once
 
 #include "basejob.h"
 
@@ -43,5 +42,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_PASSWORDLOGIN_H
diff --git a/jobs/postmessagejob.h b/jobs/postmessagejob.h
index 9d52ae8d..2e1989fd 100644
--- a/jobs/postmessagejob.h
+++ b/jobs/postmessagejob.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_POSTMESSAGEJOB_H
-#define QMATRIXCLIENT_POSTMESSAGEJOB_H
+#pragma once
 
 #include "basejob.h"
 
@@ -40,5 +39,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_POSTMESSAGEJOB_H
diff --git a/jobs/postreceiptjob.h b/jobs/postreceiptjob.h
index dfdd1fac..c0002dc0 100644
--- a/jobs/postreceiptjob.h
+++ b/jobs/postreceiptjob.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_POSTRECEIPTJOB_H
-#define QMATRIXCLIENT_POSTRECEIPTJOB_H
+#pragma once
 
 #include "basejob.h"
 
@@ -30,5 +29,3 @@ namespace QMatrixClient
             virtual ~PostReceiptJob();
     };
 }
-
-#endif // QMATRIXCLIENT_POSTRECEIPTJOB_H
diff --git a/jobs/roommessagesjob.h b/jobs/roommessagesjob.h
index 227ffac2..348217cc 100644
--- a/jobs/roommessagesjob.h
+++ b/jobs/roommessagesjob.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_ROOMMESSAGESJOB_H
-#define QMATRIXCLIENT_ROOMMESSAGESJOB_H
+#pragma once
 
 #include "basejob.h"
 
@@ -47,5 +46,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_ROOMMESSAGESJOB_H
diff --git a/jobs/syncjob.h b/jobs/syncjob.h
index e7b23d16..be1d4776 100644
--- a/jobs/syncjob.h
+++ b/jobs/syncjob.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_SYNCJOB_H
-#define QMATRIXCLIENT_SYNCJOB_H
+#pragma once
 
 #include "basejob.h"
 
@@ -102,7 +101,7 @@ namespace QMatrixClient
             SyncJob(ConnectionData* connection, QString since = {}, QString filter = {},
                     int timeout = -1, QString presence = {});
             virtual ~SyncJob();
-            
+
             SyncData& roomData();
             QString nextBatch() const;
 
@@ -114,5 +113,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_SYNCJOB_H
diff --git a/joinstate.h b/joinstate.h
index e7175b2b..348ca8a6 100644
--- a/joinstate.h
+++ b/joinstate.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_JOINSTATE_H
-#define QMATRIXCLIENT_JOINSTATE_H
+#pragma once
 
 namespace QMatrixClient
 {
@@ -28,5 +27,3 @@ namespace QMatrixClient
         Leave
     };
 }
-
-#endif // QMATRIXCLIENT_JOINSTATE_H
\ No newline at end of file
diff --git a/kcoreaddons_export.h b/kcoreaddons_export.h
deleted file mode 100644
index 00c13059..00000000
--- a/kcoreaddons_export.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-#ifndef KCOREADDONS_EXPORT_H
-#define KCOREADDONS_EXPORT_H
-
-#ifdef KCOREADDONS_STATIC_DEFINE
-#  define KCOREADDONS_EXPORT
-#  define KCOREADDONS_NO_EXPORT
-#else
-#  ifndef KCOREADDONS_EXPORT
-#    ifdef KF5CoreAddons_EXPORTS
-        /* We are building this library */
-#      define KCOREADDONS_EXPORT __attribute__((visibility("default")))
-#    else
-        /* We are using this library */
-#      define KCOREADDONS_EXPORT __attribute__((visibility("default")))
-#    endif
-#  endif
-
-#  ifndef KCOREADDONS_NO_EXPORT
-#    define KCOREADDONS_NO_EXPORT __attribute__((visibility("hidden")))
-#  endif
-#endif
-
-#ifndef KCOREADDONS_DEPRECATED
-#  define KCOREADDONS_DEPRECATED __attribute__ ((__deprecated__))
-#endif
-
-#ifndef KCOREADDONS_DEPRECATED_EXPORT
-#  define KCOREADDONS_DEPRECATED_EXPORT KCOREADDONS_EXPORT KCOREADDONS_DEPRECATED
-#endif
-
-#ifndef KCOREADDONS_DEPRECATED_NO_EXPORT
-#  define KCOREADDONS_DEPRECATED_NO_EXPORT KCOREADDONS_NO_EXPORT KCOREADDONS_DEPRECATED
-#endif
-
-#define DEFINE_NO_DEPRECATED 0
-#if DEFINE_NO_DEPRECATED
-# define KCOREADDONS_NO_DEPRECATED
-#endif
-
-#endif
diff --git a/room.h b/room.h
index fb3212e9..637c93f2 100644
--- a/room.h
+++ b/room.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_ROOM_H
-#define QMATRIXCLIENT_ROOM_H
+#pragma once
 
 #include <QtCore/QList>
 #include <QtCore/QStringList>
@@ -136,5 +135,3 @@ namespace QMatrixClient
             void setLastReadEvent(User* user, QString eventId);
     };
 }
-
-#endif // QMATRIXCLIENT_ROOM_H
diff --git a/state.h b/state.h
index 79566eba..b059ea92 100644
--- a/state.h
+++ b/state.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_STATE_H
-#define QMATRIXCLIENT_STATE_H
+#pragma once
 
 #include <QtCore/QString>
 #include <QtCore/QJsonObject>
@@ -46,5 +45,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_STATE_H
\ No newline at end of file
diff --git a/user.h b/user.h
index 33a89e0b..2cb20b57 100644
--- a/user.h
+++ b/user.h
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef QMATRIXCLIENT_USER_H
-#define QMATRIXCLIENT_USER_H
+#pragma once
 
 #include <QtCore/QString>
 #include <QtCore/QObject>
@@ -64,5 +63,3 @@ namespace QMatrixClient
             Private* d;
     };
 }
-
-#endif // QMATRIXCLIENT_USER_H