diff options
author | hjk <hjk@theqtcompany.com> | 2016-03-18 07:55:01 +0100 |
---|---|---|
committer | hjk <hjk@theqtcompany.com> | 2016-03-30 15:20:19 +0000 |
commit | 39a38d5679084b515276285c044d8a27e671adb1 (patch) | |
tree | 8f72b00aa4a7db53eb8e193119033edf1ae9b0e4 /src/shared/proparser | |
parent | 6b805c217273b9d169aa7e8a78949e17179016bf (diff) |
Wholesale conversion to #pragma once
Kudos to cgmb and https://github.com/cgmb/guardonce
Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/shared/proparser')
-rw-r--r-- | src/shared/proparser/ioutils.h | 5 | ||||
-rw-r--r-- | src/shared/proparser/profileevaluator.h | 5 | ||||
-rw-r--r-- | src/shared/proparser/proitems.h | 5 | ||||
-rw-r--r-- | src/shared/proparser/prowriter.h | 5 | ||||
-rw-r--r-- | src/shared/proparser/qmake_global.h | 5 | ||||
-rw-r--r-- | src/shared/proparser/qmakeevaluator.h | 5 | ||||
-rw-r--r-- | src/shared/proparser/qmakeevaluator_p.h | 5 | ||||
-rw-r--r-- | src/shared/proparser/qmakeglobals.h | 5 | ||||
-rw-r--r-- | src/shared/proparser/qmakeparser.h | 5 | ||||
-rw-r--r-- | src/shared/proparser/qmakevfs.h | 5 |
10 files changed, 10 insertions, 40 deletions
diff --git a/src/shared/proparser/ioutils.h b/src/shared/proparser/ioutils.h index 3bade494dfc..f4fd79f32dd 100644 --- a/src/shared/proparser/ioutils.h +++ b/src/shared/proparser/ioutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOUTILS_H -#define IOUTILS_H +#pragma once #include <qstring.h> @@ -64,5 +63,3 @@ public: } // namespace ProFileEvaluatorInternal QT_END_NAMESPACE - -#endif // IOUTILS_H diff --git a/src/shared/proparser/profileevaluator.h b/src/shared/proparser/profileevaluator.h index f49097e6703..27b26081b0d 100644 --- a/src/shared/proparser/profileevaluator.h +++ b/src/shared/proparser/profileevaluator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROFILEEVALUATOR_H -#define PROFILEEVALUATOR_H +#pragma once #include "qmake_global.h" #include "qmakeglobals.h" @@ -96,5 +95,3 @@ private: }; QT_END_NAMESPACE - -#endif // PROFILEEVALUATOR_H diff --git a/src/shared/proparser/proitems.h b/src/shared/proparser/proitems.h index 4515eafc7bc..d6bc4fe1cbf 100644 --- a/src/shared/proparser/proitems.h +++ b/src/shared/proparser/proitems.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROITEMS_H -#define PROITEMS_H +#pragma once #include "qmake_global.h" @@ -387,5 +386,3 @@ struct ProFunctionDefs { }; QT_END_NAMESPACE - -#endif // PROITEMS_H diff --git a/src/shared/proparser/prowriter.h b/src/shared/proparser/prowriter.h index cd100ffc985..808884837b3 100644 --- a/src/shared/proparser/prowriter.h +++ b/src/shared/proparser/prowriter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROWRITER_H -#define PROWRITER_H +#pragma once #include "qmake_global.h" #include <QStringList> @@ -70,5 +69,3 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(ProWriter::PutFlags) } // namespace Internal } // namespace QmakeProjectManager - -#endif // PROWRITER_H diff --git a/src/shared/proparser/qmake_global.h b/src/shared/proparser/qmake_global.h index af422118b6c..8dd38443097 100644 --- a/src/shared/proparser/qmake_global.h +++ b/src/shared/proparser/qmake_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKE_GLOBAL_H -#define QMAKE_GLOBAL_H +#pragma once #include <qglobal.h> @@ -51,5 +50,3 @@ #ifdef PROEVALUATOR_FULL # define PROEVALUATOR_DEBUG #endif - -#endif diff --git a/src/shared/proparser/qmakeevaluator.h b/src/shared/proparser/qmakeevaluator.h index 9394686283b..7bb673cb897 100644 --- a/src/shared/proparser/qmakeevaluator.h +++ b/src/shared/proparser/qmakeevaluator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEEVALUATOR_H -#define QMAKEEVALUATOR_H +#pragma once #if defined(PROEVALUATOR_FULL) && defined(PROEVALUATOR_THREAD_SAFE) # error PROEVALUATOR_FULL is incompatible with PROEVALUATOR_THREAD_SAFE due to cache() implementation @@ -310,5 +309,3 @@ Q_DECLARE_TYPEINFO(QMakeEvaluator::Location, Q_PRIMITIVE_TYPE); Q_DECLARE_OPERATORS_FOR_FLAGS(QMakeEvaluator::LoadFlags) QT_END_NAMESPACE - -#endif // QMAKEEVALUATOR_H diff --git a/src/shared/proparser/qmakeevaluator_p.h b/src/shared/proparser/qmakeevaluator_p.h index 66f6f138df6..91c3922106d 100644 --- a/src/shared/proparser/qmakeevaluator_p.h +++ b/src/shared/proparser/qmakeevaluator_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEEVALUATOR_P_H -#define QMAKEEVALUATOR_P_H +#pragma once #include "proitems.h" @@ -90,5 +89,3 @@ extern QMakeStatics statics; } QT_END_NAMESPACE - -#endif // QMAKEEVALUATOR_P_H diff --git a/src/shared/proparser/qmakeglobals.h b/src/shared/proparser/qmakeglobals.h index bd6fe2ead3f..33a5bdb8318 100644 --- a/src/shared/proparser/qmakeglobals.h +++ b/src/shared/proparser/qmakeglobals.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEGLOBALS_H -#define QMAKEGLOBALS_H +#pragma once #include "qmake_global.h" #include "proitems.h" @@ -159,5 +158,3 @@ private: }; QT_END_NAMESPACE - -#endif // QMAKEGLOBALS_H diff --git a/src/shared/proparser/qmakeparser.h b/src/shared/proparser/qmakeparser.h index 1da02716257..d44523d0248 100644 --- a/src/shared/proparser/qmakeparser.h +++ b/src/shared/proparser/qmakeparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEPARSER_H -#define QMAKEPARSER_H +#pragma once #include "qmake_global.h" #include "proitems.h" @@ -226,5 +225,3 @@ Q_DECLARE_TYPEINFO(QMakeParser::Context, Q_PRIMITIVE_TYPE); #endif QT_END_NAMESPACE - -#endif // PROFILEPARSER_H diff --git a/src/shared/proparser/qmakevfs.h b/src/shared/proparser/qmakevfs.h index 18762d836c0..8c387fe29d5 100644 --- a/src/shared/proparser/qmakevfs.h +++ b/src/shared/proparser/qmakevfs.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEVFS_H -#define QMAKEVFS_H +#pragma once #include "qmake_global.h" @@ -65,5 +64,3 @@ private: }; QT_END_NAMESPACE - -#endif // QMAKEVFS_H |