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/plugins/qmakeandroidsupport | |
parent | 6b805c217273b9d169aa7e8a78949e17179016bf (diff) | |
download | qt-creator-39a38d5679084b515276285c044d8a27e671adb1.tar.gz |
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/plugins/qmakeandroidsupport')
11 files changed, 11 insertions, 45 deletions
diff --git a/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h b/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h index b4d5dacc5c..f9959d556a 100644 --- a/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h +++ b/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDEXTRALIBRARYLISTMODEL_H -#define ANDROIDEXTRALIBRARYLISTMODEL_H +#pragma once #include <QAbstractItemModel> #include <QStringList> @@ -73,5 +72,3 @@ private: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // ANDROIDEXTRALIBRARYLISTMODEL_H diff --git a/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h b/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h index 9bb3ce1fe7..f870689439 100644 --- a/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h +++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDPACKAGEINSTALLATIONFACTORY_H -#define ANDROIDPACKAGEINSTALLATIONFACTORY_H +#pragma once #include <projectexplorer/buildstep.h> @@ -55,5 +54,3 @@ public: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // ANDROIDPACKAGEINSTALLATIONFACTORY_H diff --git a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h index ca1cfbb44f..c27d43aa4f 100644 --- a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h +++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDPACKAGEINSTALLATIONSTEP_H -#define ANDROIDPACKAGEINSTALLATIONSTEP_H +#pragma once #include <projectexplorer/buildstep.h> #include <projectexplorer/abstractprocessstep.h> @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // ANDROIDPACKAGEINSTALLATIONSTEP_H diff --git a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h index c2044cc1ad..25783a05cb 100644 --- a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h +++ b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDQMAKEBUILDCONFIGURATIONFACTORY_H -#define ANDROIDQMAKEBUILDCONFIGURATIONFACTORY_H +#pragma once #include <qmakeprojectmanager/qmakebuildconfiguration.h> @@ -65,6 +64,3 @@ private: } // namespace Internal } // namespace QmakeAndroidSupport - - -#endif // ANDROIDQMAKEBUILDCONFIGURATIONFACTORY_H diff --git a/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.h b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.h index eb6cd5bc41..feba63241f 100644 --- a/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.h +++ b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CREATEANDROIDMANIFESTWIZARD_H -#define CREATEANDROIDMANIFESTWIZARD_H +#pragma once #include <utils/fileutils.h> #include <utils/pathchooser.h> @@ -120,5 +119,3 @@ private: } //namespace QmakeAndroidSupport } //namespace Internal - -#endif // CREATEANDROIDMANIFESTWIZARD_H diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h index a3b56871c5..8367236ca0 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef QMAKEANDROIDBUILDAPKSTEP_H -#define QMAKEANDROIDBUILDAPKSTEP_H +#pragma once #include <android/androidbuildapkstep.h> @@ -90,5 +89,3 @@ private: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // QMAKEANDROIDBUILDAPKSTEP_H diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.h b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.h index b7c435c255..d7adbb111b 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEANDROIDBUILDAPKWIDGET_H -#define QMAKEANDROIDBUILDAPKWIDGET_H +#pragma once #include "androidextralibrarylistmodel.h" @@ -75,5 +74,3 @@ public: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // QMAKEANDROIDBUILDAPKWIDGET_H diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h index 95d06021ef..fcdd1270a2 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKE_ANDROIDRUNCONFIGURATION_H -#define QMAKE_ANDROIDRUNCONFIGURATION_H +#pragma once #include <android/androidrunconfiguration.h> @@ -69,5 +68,3 @@ private: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // QMAKE_ANDROIDRUNCONFIGURATION_H diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h index e11c6d4ea1..03c6702631 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKE_ANDROIDRUNFACTORIES_H -#define QMAKE_ANDROIDRUNFACTORIES_H +#pragma once #include <android/androidrunfactories.h> #include <projectexplorer/runconfiguration.h> @@ -70,5 +69,3 @@ private: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // ANDROIDRUNFACTORIES_H diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h index 1a9e4f69c3..52557f1881 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEANDROIDSUPPORT_H -#define QMAKEANDROIDSUPPORT_H +#pragma once #include <android/androidqtsupport.h> @@ -49,5 +48,3 @@ public: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // QMAKEANDROIDSUPPORT_H diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.h b/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.h index ba5fa5e98f..e2f8be83b2 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEANDROIDSUPPORTPLUGIN_H -#define QMAKEANDROIDSUPPORTPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -45,5 +44,3 @@ public: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // QMAKEANDROIDSUPPORTPLUGIN_H |