Merge branch 'pragma-once'

10 files changed, 15 insertions, 45 deletions

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