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/android | |
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/android')
43 files changed, 43 insertions, 174 deletions
diff --git a/src/plugins/android/android_global.h b/src/plugins/android/android_global.h index 3be55983cd..1f79d86ebc 100644 --- a/src/plugins/android/android_global.h +++ b/src/plugins/android/android_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROID_GLOBAL_H -#define ANDROID_GLOBAL_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define ANDROID_EXPORT Q_DECL_IMPORT #endif - -#endif // ANDROID_GLOBAL_H diff --git a/src/plugins/android/androidanalyzesupport.h b/src/plugins/android/androidanalyzesupport.h index e272688a27..54460cdb1d 100644 --- a/src/plugins/android/androidanalyzesupport.h +++ b/src/plugins/android/androidanalyzesupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDANALYZESUPPORT_H -#define ANDROIDANALYZESUPPORT_H +#pragma once #include "androidrunconfiguration.h" #include <qmldebug/qmloutputparser.h> @@ -55,5 +54,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDANALYZESUPPORT_H diff --git a/src/plugins/android/androidbuildapkstep.h b/src/plugins/android/androidbuildapkstep.h index 42d446bd7c..302a5c714d 100644 --- a/src/plugins/android/androidbuildapkstep.h +++ b/src/plugins/android/androidbuildapkstep.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDBUILDAPKSTEP_H -#define ANDROIDBUILDAPKSTEP_H +#pragma once #include "android_global.h" #include <projectexplorer/abstractprocessstep.h> @@ -114,5 +113,3 @@ protected: }; } // namespace Android - -#endif // ANDROIDBUILDAPKSTEP_H diff --git a/src/plugins/android/androidbuildapkwidget.h b/src/plugins/android/androidbuildapkwidget.h index 52d765275e..42e3dc3c79 100644 --- a/src/plugins/android/androidbuildapkwidget.h +++ b/src/plugins/android/androidbuildapkwidget.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDBUILDAPKWIDGET_H -#define ANDROIDBUILDAPKWIDGET_H +#pragma once #include "android_global.h" @@ -76,5 +75,3 @@ private: }; } - -#endif // ANDROIDBUILDAPKWIDGET_H diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 740dafc9bd..85a1e15f8d 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDCONFIGURATIONS_H -#define ANDROIDCONFIGURATIONS_H +#pragma once #include "android_global.h" @@ -248,5 +247,3 @@ private: }; } // namespace Android - -#endif // ANDROIDCONFIGURATIONS_H diff --git a/src/plugins/android/androidconstants.h b/src/plugins/android/androidconstants.h index e9002b5e88..d51c40b13f 100644 --- a/src/plugins/android/androidconstants.h +++ b/src/plugins/android/androidconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDCONSTANTS_H -#define ANDROIDCONSTANTS_H +#pragma once #include <QtGlobal> @@ -71,5 +70,3 @@ const char ANDROID_EXTRA_LIBS[] = "AndroidExtraLibs"; } // namespace Constants; } // namespace Android - -#endif // ANDROIDCONSTANTS_H diff --git a/src/plugins/android/androidcreatekeystorecertificate.h b/src/plugins/android/androidcreatekeystorecertificate.h index eba9b73ea9..22030d2c24 100644 --- a/src/plugins/android/androidcreatekeystorecertificate.h +++ b/src/plugins/android/androidcreatekeystorecertificate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDCREATEKEYSTORECERTIFICATE_H -#define ANDROIDCREATEKEYSTORECERTIFICATE_H +#pragma once #include <utils/fileutils.h> @@ -73,5 +72,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDCREATEKEYSTORECERTIFICATE_H diff --git a/src/plugins/android/androiddebugsupport.h b/src/plugins/android/androiddebugsupport.h index cf46aa8069..368b66c11c 100644 --- a/src/plugins/android/androiddebugsupport.h +++ b/src/plugins/android/androiddebugsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEBUGSUPPORT_H -#define ANDROIDDEBUGSUPPORT_H +#pragma once #include "androidrunconfiguration.h" @@ -58,5 +57,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDDEBUGSUPPORT_H diff --git a/src/plugins/android/androiddeployconfiguration.h b/src/plugins/android/androiddeployconfiguration.h index d1cd85b054..8ce9191e6d 100644 --- a/src/plugins/android/androiddeployconfiguration.h +++ b/src/plugins/android/androiddeployconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEPLOYCONFIGURATION_H -#define ANDROIDDEPLOYCONFIGURATION_H +#pragma once #include <projectexplorer/deployconfiguration.h> @@ -65,5 +64,3 @@ public: } // namespace Internal } // namespace Android - -#endif // ANDROIDDEPLOYCONFIGURATION_H diff --git a/src/plugins/android/androiddeployqtstep.h b/src/plugins/android/androiddeployqtstep.h index acd0b9aa96..470b8a4115 100644 --- a/src/plugins/android/androiddeployqtstep.h +++ b/src/plugins/android/androiddeployqtstep.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEPLOYQTSTEP_H -#define ANDROIDDEPLOYQTSTEP_H +#pragma once #include "androidbuildapkstep.h" #include "androidconfigurations.h" @@ -143,5 +142,3 @@ private: } } // namespace Android - -#endif // ANDROIDDEPLOYQTSTEP_H diff --git a/src/plugins/android/androiddeployqtwidget.h b/src/plugins/android/androiddeployqtwidget.h index b8cc586e0b..81ae354676 100644 --- a/src/plugins/android/androiddeployqtwidget.h +++ b/src/plugins/android/androiddeployqtwidget.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEPLOYQTWIDGET_H -#define ANDROIDDEPLOYQTWIDGET_H +#pragma once #include <projectexplorer/buildstep.h> @@ -62,4 +61,3 @@ private: } } -#endif // ANDROIDDEPLOYQTWIDGET_H diff --git a/src/plugins/android/androiddevice.h b/src/plugins/android/androiddevice.h index 5ed6fb5804..364628d8b2 100644 --- a/src/plugins/android/androiddevice.h +++ b/src/plugins/android/androiddevice.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEVICE_H -#define ANDROIDDEVICE_H +#pragma once #include <projectexplorer/devicesupport/idevice.h> @@ -58,5 +57,3 @@ protected: } // namespace Internal } // namespace Android - -#endif // ANDROIDDEVICE_H diff --git a/src/plugins/android/androiddevicedialog.h b/src/plugins/android/androiddevicedialog.h index fa17aa5d56..39b9abcc7d 100644 --- a/src/plugins/android/androiddevicedialog.h +++ b/src/plugins/android/androiddevicedialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEVICEDIALOG_H -#define ANDROIDDEVICEDIALOG_H +#pragma once #include "androidconfigurations.h" @@ -83,5 +82,3 @@ private: } } - -#endif // ANDROIDDEVICEDIALOG_H diff --git a/src/plugins/android/androiddevicefactory.h b/src/plugins/android/androiddevicefactory.h index d57109615e..8d6dc109b8 100644 --- a/src/plugins/android/androiddevicefactory.h +++ b/src/plugins/android/androiddevicefactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEVICEFACTORY_H -#define ANDROIDDEVICEFACTORY_H +#pragma once #include <projectexplorer/devicesupport/idevicefactory.h> @@ -48,5 +47,3 @@ public: } // namespace Internal } // namespace Android - -#endif // ANDROIDDEVICEFACTORY_H diff --git a/src/plugins/android/androiderrormessage.h b/src/plugins/android/androiderrormessage.h index 133cc562bf..add3807b88 100644 --- a/src/plugins/android/androiderrormessage.h +++ b/src/plugins/android/androiderrormessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDERRORMESSAGE_H -#define ANDROIDERRORMESSAGE_H +#pragma once #include <QVariantList> #include <QCoreApplication> @@ -53,5 +52,3 @@ public: } // namespace Internal } // namespace Android - -#endif // ANDROIDERRORMESSAGE_H diff --git a/src/plugins/android/androidgdbserverkitinformation.h b/src/plugins/android/androidgdbserverkitinformation.h index 5a0122e8de..1aaadd4e3b 100644 --- a/src/plugins/android/androidgdbserverkitinformation.h +++ b/src/plugins/android/androidgdbserverkitinformation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDGDBSERVERKITINFORMATION_H -#define ANDROIDGDBSERVERKITINFORMATION_H +#pragma once #include <projectexplorer/kitinformation.h> #include <projectexplorer/kitconfigwidget.h> @@ -85,5 +84,3 @@ public: } // namespace Internal } // namespace Android - -#endif // ANDROIDGDBSERVERKITINFORMATION_H diff --git a/src/plugins/android/androidglobal.h b/src/plugins/android/androidglobal.h index c2de68148a..66c942c8f9 100644 --- a/src/plugins/android/androidglobal.h +++ b/src/plugins/android/androidglobal.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDGLOBAL_H -#define ANDROIDGLOBAL_H +#pragma once #include <utils/environment.h> @@ -74,5 +73,3 @@ public: }; } // namespace Android - -#endif // ANDROIDGLOBAL_H diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h index d2f03531c8..344a4330de 100644 --- a/src/plugins/android/androidmanager.h +++ b/src/plugins/android/androidmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDMANAGER_H -#define ANDROIDMANAGER_H +#pragma once #include "android_global.h" @@ -90,5 +89,3 @@ public: }; } // namespace Android - -#endif // ANDROIDMANAGER_H diff --git a/src/plugins/android/androidmanifestdocument.h b/src/plugins/android/androidmanifestdocument.h index aad62b8f9a..169047f051 100644 --- a/src/plugins/android/androidmanifestdocument.h +++ b/src/plugins/android/androidmanifestdocument.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDMANIFESTDOCUMENT_H -#define ANDROIDMANIFESTDOCUMENT_H +#pragma once #include <texteditor/textdocument.h> @@ -49,5 +48,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDMANIFESTDOCUMENT_H diff --git a/src/plugins/android/androidmanifesteditor.h b/src/plugins/android/androidmanifesteditor.h index a2c2956e32..32ed8476f0 100644 --- a/src/plugins/android/androidmanifesteditor.h +++ b/src/plugins/android/androidmanifesteditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDMANIFESTEDITOR_H -#define ANDROIDMANIFESTEDITOR_H +#pragma once #include "androidmanifestdocument.h" #include "androidmanifesteditorwidget.h" @@ -69,5 +68,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDMANIFESTEDITOR_H diff --git a/src/plugins/android/androidmanifesteditorfactory.h b/src/plugins/android/androidmanifesteditorfactory.h index 6ab7289877..a25e02cef5 100644 --- a/src/plugins/android/androidmanifesteditorfactory.h +++ b/src/plugins/android/androidmanifesteditorfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDMANIFESTEDITORFACTORY_H -#define ANDROIDMANIFESTEDITORFACTORY_H +#pragma once #include <coreplugin/editormanager/ieditorfactory.h> @@ -43,5 +42,3 @@ public: } // namespace Internal } // namespace Android - -#endif // ANDROIDMANIFESTEDITORFACTORY_H diff --git a/src/plugins/android/androidmanifesteditorwidget.h b/src/plugins/android/androidmanifesteditorwidget.h index 7581ca0939..8a0afa166f 100644 --- a/src/plugins/android/androidmanifesteditorwidget.h +++ b/src/plugins/android/androidmanifesteditorwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDMANIFESTEDITORWIDGET_H -#define ANDROIDMANIFESTEDITORWIDGET_H +#pragma once #include <texteditor/texteditor.h> @@ -191,6 +190,3 @@ private: }; } // namespace Internal } // namespace Android - - -#endif // ANDROIDMANIFESTEDITORWIDGET_H diff --git a/src/plugins/android/androidplugin.h b/src/plugins/android/androidplugin.h index afde90ccc9..6f2bbd7544 100644 --- a/src/plugins/android/androidplugin.h +++ b/src/plugins/android/androidplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDPLUGIN_H -#define ANDROIDPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -47,5 +46,3 @@ private slots: }; } // namespace Android - -#endif // ANDROIDPLUGIN_H diff --git a/src/plugins/android/androidpotentialkit.h b/src/plugins/android/androidpotentialkit.h index dbffe2c782..fe10550f4d 100644 --- a/src/plugins/android/androidpotentialkit.h +++ b/src/plugins/android/androidpotentialkit.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDPOTENTIALKIT_H -#define ANDROIDPOTENTIALKIT_H +#pragma once #include <projectexplorer/ipotentialkit.h> #include <utils/detailswidget.h> @@ -56,5 +55,3 @@ private slots: } } - -#endif // ANDROIDPOTENTIALKIT_H diff --git a/src/plugins/android/androidqtsupport.h b/src/plugins/android/androidqtsupport.h index b4c1e9d7d7..021e5d7cff 100644 --- a/src/plugins/android/androidqtsupport.h +++ b/src/plugins/android/androidqtsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDSUPPORT_H -#define ANDROIDSUPPORT_H +#pragma once #include "android_global.h" @@ -66,6 +65,3 @@ public: }; } // namespace Android - - -#endif // ANDROIDSUPPORT_H diff --git a/src/plugins/android/androidqtversion.h b/src/plugins/android/androidqtversion.h index 05df491ed2..865c31e65c 100644 --- a/src/plugins/android/androidqtversion.h +++ b/src/plugins/android/androidqtversion.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDQTVERSION_H -#define ANDROIDQTVERSION_H +#pragma once #include <qtsupport/baseqtversion.h> @@ -64,5 +63,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDQTVERSION_H diff --git a/src/plugins/android/androidqtversionfactory.h b/src/plugins/android/androidqtversionfactory.h index e75fa9b580..8f551b9b86 100644 --- a/src/plugins/android/androidqtversionfactory.h +++ b/src/plugins/android/androidqtversionfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDQTVERSIONFACTORY_H -#define ANDROIDQTVERSIONFACTORY_H +#pragma once #include <qtsupport/qtversionfactory.h> @@ -46,5 +45,3 @@ public: } // namespace Internal } // namespace Android - -#endif // ANDROIDQTVERSIONFACTORY_H diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h index ca895e2c0b..cfa54312d9 100644 --- a/src/plugins/android/androidrunconfiguration.h +++ b/src/plugins/android/androidrunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDRUNCONFIGURATION_H -#define ANDROIDRUNCONFIGURATION_H +#pragma once #include "android_global.h" @@ -47,5 +46,3 @@ protected: }; } // namespace Android - -#endif // ANDROIDRUNCONFIGURATION_H diff --git a/src/plugins/android/androidruncontrol.h b/src/plugins/android/androidruncontrol.h index 2ee21c3bcb..343164de49 100644 --- a/src/plugins/android/androidruncontrol.h +++ b/src/plugins/android/androidruncontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDRUNCONTROL_H -#define ANDROIDRUNCONTROL_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -59,5 +58,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDRUNCONTROL_H diff --git a/src/plugins/android/androidrunfactories.h b/src/plugins/android/androidrunfactories.h index 58362cf8c8..5556b44f48 100644 --- a/src/plugins/android/androidrunfactories.h +++ b/src/plugins/android/androidrunfactories.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDRUNFACTORIES_H -#define ANDROIDRUNFACTORIES_H +#pragma once #include "android_global.h" #include <projectexplorer/runconfiguration.h> @@ -55,5 +54,3 @@ public: } // namespace Internal } // namespace Android - -#endif // ANDROIDRUNFACTORIES_H diff --git a/src/plugins/android/androidrunnable.h b/src/plugins/android/androidrunnable.h index 453807c359..5f09a50355 100644 --- a/src/plugins/android/androidrunnable.h +++ b/src/plugins/android/androidrunnable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDRUNNABLE_H -#define ANDROIDRUNNABLE_H +#pragma once #include "android_global.h" #include <projectexplorer/runnables.h> @@ -54,5 +53,3 @@ inline bool operator==(const AndroidRunnable &r1, const AndroidRunnable &r2) } } // namespace Android - -#endif // ANDROIDRUNNABLE_H diff --git a/src/plugins/android/androidrunner.h b/src/plugins/android/androidrunner.h index 32f7418ad9..d32018c869 100644 --- a/src/plugins/android/androidrunner.h +++ b/src/plugins/android/androidrunner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDRUNNER_H -#define ANDROIDRUNNER_H +#pragma once #include "androidconfigurations.h" #include "androidrunnable.h" @@ -120,5 +119,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDRUNNER_H diff --git a/src/plugins/android/androidsettingspage.h b/src/plugins/android/androidsettingspage.h index 2f45863c71..1330721dbf 100644 --- a/src/plugins/android/androidsettingspage.h +++ b/src/plugins/android/androidsettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDSETTINGSPAGE_H -#define ANDROIDSETTINGSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDSETTINGSPAGE_H diff --git a/src/plugins/android/androidsettingswidget.h b/src/plugins/android/androidsettingswidget.h index 4e68c596ff..f39c7eaf52 100644 --- a/src/plugins/android/androidsettingswidget.h +++ b/src/plugins/android/androidsettingswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDSETTINGSWIDGET_H -#define ANDROIDSETTINGSWIDGET_H +#pragma once #include "androidconfigurations.h" @@ -124,5 +123,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDSETTINGSWIDGET_H diff --git a/src/plugins/android/androidsignaloperation.h b/src/plugins/android/androidsignaloperation.h index ae35d6cc6e..f31972e3fa 100644 --- a/src/plugins/android/androidsignaloperation.h +++ b/src/plugins/android/androidsignaloperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDSIGNALOPERATION_H -#define ANDROIDSIGNALOPERATION_H +#pragma once #include <projectexplorer/devicesupport/idevice.h> @@ -74,5 +73,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDSIGNALOPERATION_H diff --git a/src/plugins/android/androidtoolchain.h b/src/plugins/android/androidtoolchain.h index c1ecc9fde2..0f15f2db61 100644 --- a/src/plugins/android/androidtoolchain.h +++ b/src/plugins/android/androidtoolchain.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDTOOLCHAIN_H -#define ANDROIDTOOLCHAIN_H +#pragma once #include <projectexplorer/gcctoolchain.h> #include <projectexplorer/toolchainconfigwidget.h> @@ -124,5 +123,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDTOOLCHAIN_H diff --git a/src/plugins/android/avddialog.h b/src/plugins/android/avddialog.h index d4e6c355ac..6d98aa0124 100644 --- a/src/plugins/android/avddialog.h +++ b/src/plugins/android/avddialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef AVDDIALOG_H -#define AVDDIALOG_H +#pragma once #include "ui_addnewavddialog.h" @@ -62,5 +61,3 @@ private: }; } } - -#endif // AVDDIALOG_H diff --git a/src/plugins/android/certificatesmodel.h b/src/plugins/android/certificatesmodel.h index e77bc06c8d..57c0a6ab43 100644 --- a/src/plugins/android/certificatesmodel.h +++ b/src/plugins/android/certificatesmodel.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef CERTIFICATESMODEL_H -#define CERTIFICATESMODEL_H +#pragma once #include <QAbstractListModel> #include <QVector> @@ -50,5 +49,3 @@ private: } } - -#endif // CERTIFICATESMODEL_H diff --git a/src/plugins/android/javaautocompleter.h b/src/plugins/android/javaautocompleter.h index 6372d15695..ed088c033d 100644 --- a/src/plugins/android/javaautocompleter.h +++ b/src/plugins/android/javaautocompleter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JAVAAUTOCOMPLETER_H -#define JAVAAUTOCOMPLETER_H +#pragma once #include <texteditor/autocompleter.h> @@ -42,6 +41,3 @@ public: }; } } - - -#endif // JAVAAUTOCOMPLETER_H diff --git a/src/plugins/android/javacompletionassistprovider.h b/src/plugins/android/javacompletionassistprovider.h index 5e90bcf2fe..f58685250f 100644 --- a/src/plugins/android/javacompletionassistprovider.h +++ b/src/plugins/android/javacompletionassistprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JAVACOMPLETIONASSISTPROVIDER_H -#define JAVACOMPLETIONASSISTPROVIDER_H +#pragma once #include <texteditor/codeassist/completionassistprovider.h> @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace Android - -#endif // JAVACOMPLETIONASSISTPROVIDER_H diff --git a/src/plugins/android/javaeditor.h b/src/plugins/android/javaeditor.h index 6f176b784c..c442484daf 100644 --- a/src/plugins/android/javaeditor.h +++ b/src/plugins/android/javaeditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JAVAEDITOR_H -#define JAVAEDITOR_H +#pragma once #include <texteditor/texteditor.h> @@ -41,5 +40,3 @@ public: } // namespace Internal } // namespace Android - -#endif // JAVAEDITOR_H diff --git a/src/plugins/android/javaindenter.h b/src/plugins/android/javaindenter.h index 9be0b47a95..2b40851fd4 100644 --- a/src/plugins/android/javaindenter.h +++ b/src/plugins/android/javaindenter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JAVAINDENTER_H -#define JAVAINDENTER_H +#pragma once #include <texteditor/indenter.h> @@ -47,5 +46,3 @@ public: }; } // namespace Internal } // namespace Android - -#endif // JAVAINDENTER_H diff --git a/src/plugins/android/javaparser.h b/src/plugins/android/javaparser.h index 6a5d237985..642db44e23 100644 --- a/src/plugins/android/javaparser.h +++ b/src/plugins/android/javaparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JAVAPARSER_H -#define JAVAPARSER_H +#pragma once #include <projectexplorer/ioutputparser.h> #include <utils/fileutils.h> @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace Android - -#endif // JAVAPARSER_H |