Using pragma once in header files.

ios/src/app_delegate.h

@@ -21,6 +21,8 @@
  * the two.
  */
 
+#pragma once
+
 #import <UIKit/UIKit.h>
 #import <qt_app_delegate.h>
 

ios/src/doc_view_controller.h

@@ -21,6 +21,8 @@
  * the two.
  */
 
+#pragma once
+
 #import <UIKit/UIKit.h>
 
 @interface DocViewController : UIViewController <UIDocumentInteractionControllerDelegate>

ios/src/ios_file_opener.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _IOS_FILE_OPENER_H_
-#define _IOS_FILE_OPENER_H_
+#pragma once
 
 #include <QtCore/QtGlobal>
 
@@ -38,5 +37,3 @@
 @end
 
 #endif /* Q_OS_IOS */
-
-#endif /* _IOS_FILE_OPENER_H_ */

ios/src/qt_app_delegate.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef QTAPPDELEGATECINTERFACE_H
-#define QTAPPDELEGATECINTERFACE_H
+#pragma once
 
 #include "src/qml_interaction/interaction_zfo_file.h"
 
@@ -33,5 +32,3 @@
  * @param[in] interactionZfoFile Pointer to InteractionZfoFile object.
  */
 void QtAppDelegateInitialize(InteractionZfoFile *interactionZfoFile);
-
-#endif // QTAPPDELEGATECINTERFACE_H

ios/src/send_email_controller.h

@@ -21,6 +21,8 @@
  * the two.
  */
 
+#pragma once
+
 #import <UIKit/UIKit.h>
 #import <MessageUI/MessageUI.h>
 #import <MessageUI/MFMailComposeViewController.h>

ios/src/url_opener.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _URL_OPENER_H_
-#define _URL_OPENER_H_
+#pragma once
 
 #include <QObject>
 #include <QString>
@@ -64,5 +63,3 @@ public:
 	void createEmail(const QString &bodyText, const QString &to,
 	    const QString &subject, const QStringList &filePaths);
 };
-
-#endif /* _URL_OPENER_H_ */

src/common.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _COMMON_H_
-#define _COMMON_H_
+#pragma once
 
 /* HTML INFO MACRO */
 #define divStart "<div>"
@@ -30,5 +29,3 @@
 	(QString("<div><strong>") + (title) + ": </strong>" + (value) + \
 	"</div>")
 #define divEnd "</div>"
-
-#endif /* _COMMON_H_ */

src/crypto/crypto.h

@@ -21,9 +21,7 @@
  * the two.
  */
 
-
-#ifndef _CRYPTO_H_
-#define _CRYPTO_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -49,5 +47,3 @@ int extract_cms_data(const void *cms, const size_t cms_length,
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
-
-#endif /* _CRYPTO_H_ */

src/dialogues/dialogues.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _DIALOGUES_H_
-#define _DIALOGUES_H_
+#pragma once
 
 #include <QObject>
 
@@ -138,5 +137,3 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Dialogues::Buttons)
 Q_DECLARE_METATYPE(Dialogues::EchoMode)
 Q_DECLARE_METATYPE(Dialogues::Icon)
 Q_DECLARE_METATYPE(Dialogues::Button)
-
-#endif /* _DIALOGUES_H_ */

src/dialogues/qml_dialogue_helper.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _QML_DIALOGUE_HELPER_H_
-#define _QML_DIALOGUE_HELPER_H_
+#pragma once
 
 #include <QObject>
 #include <QString>
@@ -114,5 +113,3 @@ signals:
 	 */
 	void closed(int button, int customButton);
 };
-
-#endif /* _QML_DIALOGUE_HELPER_H_ */

src/dialogues/qml_input_dialogue.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _QML_INPUT_DIALOGUE_H_
-#define _QML_INPUT_DIALOGUE_H_
+#pragma once
 
 #include <QEventLoop>
 #include <QObject>
@@ -99,5 +98,3 @@ private:
 	static
 	QObject *s_dlgTextInput; /*!< Persistent text input dialogue. */
 };
-
-#endif /* _QML_INPUT_DIALOGUE_H_ */

src/dialogues/qml_message_dialogue.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _QML_MESSAGE_DIALOGUE_H_
-#define _QML_MESSAGE_DIALOGUE_H_
+#pragma once
 
 #include <QEventLoop>
 #include <QObject>
@@ -73,5 +72,3 @@ private:
 	bool m_alreadyReturned; /*!< True if dialogue closed before loop start. */
 	QEventLoop m_loop; /*!< Loop used for action blocking. */
 };
-
-#endif /* _QML_MESSAGE_DIALOGUE_H_ */

src/dialogues/widget_input_dialogue.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _WIDGET_INPUT_DIALOGUE_H_
-#define _WIDGET_INPUT_DIALOGUE_H_
+#pragma once
 
 #include <QInputDialog>
 #include <QLineEdit>
@@ -89,5 +88,3 @@ private:
 	QPushButton *m_pasteButton; /*!< Convenience pointer to paste button. */
 	QObject *m_textField; /*!< Text field receiving the paste command. */
 };
-
-#endif /* _WIDGET_INPUT_DIALOGUE_H_ */

src/dialogues/widget_message_dialogue.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _WIDGET_MESSAGE_DIALOGUE_H_
-#define _WIDGET_MESSAGE_DIALOGUE_H_
+#pragma once
 
 #include <QMessageBox>
 #include <QString>
@@ -78,5 +77,3 @@ public:
 	void errorMessage(enum QMessageBox::Icon icon, const QString &title,
 	    const QString &text, const QString &infoText);
 };
-
-#endif /* _WIDGET_MESSAGE_DIALOGUE_H_ */

src/isds/isds_conversion.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _ISDS_CONVERSION_H_
-#define _ISDS_CONVERSION_H_
+#pragma once
 
 #include <QCoreApplication> // Q_DECLARE_TR_FUNCTIONS
 #include <QString>
@@ -76,5 +75,3 @@ public:
 	static
 	QString dmStatusToText(int status);
 };
-
-#endif /* _ISDS_CONVERSION_H_ */

src/locker.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _LOCKER_H_
-#define _LOCKER_H_
+#pragma once
 
 #include <QObject>
 #include <QTimer>
@@ -102,5 +101,3 @@ private:
 	                                   * be ignored.
 	                                   */
 };
-
-#endif /* _LOCKER_H_ */

src/models/databoxmodel.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _DATABOXMODEL_H_
-#define _DATABOXMODEL_H_
+#pragma once
 
 #include <QAbstractListModel>
 #include <QObject>
@@ -335,5 +334,3 @@ private:
 /* QML passes its arguments via QVariant. */
 Q_DECLARE_METATYPE(DataboxListModel)
 Q_DECLARE_METATYPE(DataboxListModel::Roles)
-
-#endif /* _DATABOXMODEL_H_ */

src/models/list_sort_filter_proxy_model.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _LIST_SORT_FILTER_PROXY_MODEL_H_
-#define _LIST_SORT_FILTER_PROXY_MODEL_H_
+#pragma once
 
 #include <QList>
 #include <QSortFilterProxyModel>
@@ -131,5 +130,3 @@ private:
 
 /* QML passes its arguments via QVariant. */
 Q_DECLARE_METATYPE(ListSortFilterProxyModel)
-
-#endif /* _LIST_SORT_FILTER_PROXY_MODEL_H_ */

src/os_android.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _OS_ANDROID_H_
-#define _OS_ANDROID_H_
+#pragma once
 
 #include <QObject>
 
@@ -70,5 +69,3 @@ public slots:
 private:
 	InteractionZfoFile &m_inter; /*!< QML interaction object. */
 };
-
-#endif /* _OS_ANDROID_H_ */

src/qml_interaction/interaction_filesystem.h

@@ -21,8 +21,7 @@
  * the two.
  */
 
-#ifndef _INTERACTION_FILESYSTEM_H_
-#define _INTERACTION_FILESYSTEM_H_
+#pragma once
 
 #include <QObject>
 #include <QString>
@@ -98,5 +97,3 @@ public:
 /* QML passes its arguments via QVariant. */
 Q_DECLARE_METATYPE(InteractionFilesystem)
 Q_DECLARE_METATYPE(InteractionFilesystem::Location)
-
-#endif /* _INTERACTION_FILESYSTEM_H_ */