From cfa9dd4c035912d2c3f8abde04225f483024a53c Mon Sep 17 00:00:00 2001 From: Tobias Hunger <tobias.hunger@theqtcompany.com> Date: Wed, 27 Jan 2016 10:14:00 +0100 Subject: [PATCH] CMake: Use pragma once consistently Change-Id: Id164dea5e7047b87c3d11c53ebd044d567129e9c Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> --- src/plugins/cmakeprojectmanager/cmake_global.h | 4 +--- src/plugins/cmakeprojectmanager/cmakeautocompleter.h | 4 +--- src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h | 4 +--- src/plugins/cmakeprojectmanager/cmakebuildinfo.h | 4 +--- src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.h | 4 +--- src/plugins/cmakeprojectmanager/cmakebuildstep.h | 4 +--- src/plugins/cmakeprojectmanager/cmakecbpparser.h | 4 +--- src/plugins/cmakeprojectmanager/cmakeeditor.h | 4 +--- src/plugins/cmakeprojectmanager/cmakefile.h | 4 +--- src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h | 4 +--- src/plugins/cmakeprojectmanager/cmakeindenter.h | 4 +--- src/plugins/cmakeprojectmanager/cmakekitconfigwidget.h | 4 +--- src/plugins/cmakeprojectmanager/cmakekitinformation.h | 4 +--- src/plugins/cmakeprojectmanager/cmakelocatorfilter.h | 4 +--- src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h | 4 +--- src/plugins/cmakeprojectmanager/cmakeparser.h | 4 +--- .../cmakeprojectmanager/cmakepreloadcachekitconfigwidget.h | 4 +--- .../cmakeprojectmanager/cmakepreloadcachekitinformation.h | 4 +--- src/plugins/cmakeprojectmanager/cmakeproject.h | 4 +--- src/plugins/cmakeprojectmanager/cmakeprojectconstants.h | 4 +--- src/plugins/cmakeprojectmanager/cmakeprojectmanager.h | 4 +--- src/plugins/cmakeprojectmanager/cmakeprojectnodes.h | 4 +--- src/plugins/cmakeprojectmanager/cmakeprojectplugin.h | 4 +--- src/plugins/cmakeprojectmanager/cmakerunconfiguration.h | 4 +--- src/plugins/cmakeprojectmanager/cmakesettingspage.h | 4 +--- src/plugins/cmakeprojectmanager/cmaketool.h | 4 +--- src/plugins/cmakeprojectmanager/cmaketoolmanager.h | 4 +--- src/plugins/cmakeprojectmanager/generatorinfo.h | 4 +--- 28 files changed, 28 insertions(+), 84 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmake_global.h b/src/plugins/cmakeprojectmanager/cmake_global.h index 372449c882..ac4240b016 100644 --- a/src/plugins/cmakeprojectmanager/cmake_global.h +++ b/src/plugins/cmakeprojectmanager/cmake_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKE_GLOBAL_H -#define CMAKE_GLOBAL_H +#pragma once #include <QtGlobal> @@ -34,4 +33,3 @@ # define CMAKE_EXPORT Q_DECL_IMPORT #endif -#endif // CMAKE_GLOBAL_H diff --git a/src/plugins/cmakeprojectmanager/cmakeautocompleter.h b/src/plugins/cmakeprojectmanager/cmakeautocompleter.h index f7f302c047..7083510c79 100644 --- a/src/plugins/cmakeprojectmanager/cmakeautocompleter.h +++ b/src/plugins/cmakeprojectmanager/cmakeautocompleter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEAUTOCOMPLETER_H -#define CMAKEAUTOCOMPLETER_H +#pragma once #include "cmake_global.h" @@ -49,4 +48,3 @@ public: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKEAUTOCOMPLETER_H diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h index 4d8ae52386..7ef481a1a2 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEBUILDCONFIGURATION_H -#define CMAKEBUILDCONFIGURATION_H +#pragma once #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/abi.h> @@ -106,4 +105,3 @@ private: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKEBUILDCONFIGURATION_H diff --git a/src/plugins/cmakeprojectmanager/cmakebuildinfo.h b/src/plugins/cmakeprojectmanager/cmakebuildinfo.h index c80256289e..0e038d50ae 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildinfo.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildinfo.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEBUILDINFO_H -#define CMAKEBUILDINFO_H +#pragma once #include "cmakebuildconfiguration.h" @@ -63,4 +62,3 @@ public: } // namespace CMakeProjectManager -#endif // CMAKEBUILDINFO_H diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.h b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.h index 40afaaf096..569b9b2f76 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEBUILDSETTINGSWIDGET_H -#define CMAKEBUILDSETTINGSWIDGET_H +#pragma once #include <projectexplorer/namedwidget.h> @@ -54,4 +53,3 @@ private: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKEBUILDSETTINGSWIDGET_H diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h index 0b66289448..43e5e95e4f 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEBUILDSTEP_H -#define CMAKEBUILDSTEP_H +#pragma once #include <projectexplorer/abstractprocessstep.h> @@ -154,4 +153,3 @@ public: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKEBUILDSTEP_H diff --git a/src/plugins/cmakeprojectmanager/cmakecbpparser.h b/src/plugins/cmakeprojectmanager/cmakecbpparser.h index a6caaa7332..d16b0a364a 100644 --- a/src/plugins/cmakeprojectmanager/cmakecbpparser.h +++ b/src/plugins/cmakeprojectmanager/cmakecbpparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKECBPPARSER_H -#define CMAKECBPPARSER_H +#pragma once #include "cmakeproject.h" @@ -86,4 +85,3 @@ private: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKECBPPARSER_H diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.h b/src/plugins/cmakeprojectmanager/cmakeeditor.h index f17f7c6f49..a4bdb8e671 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.h +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEEDITOR_H -#define CMAKEEDITOR_H +#pragma once #include <texteditor/textdocument.h> #include <texteditor/texteditor.h> @@ -59,4 +58,3 @@ public: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKEEDITOR_H diff --git a/src/plugins/cmakeprojectmanager/cmakefile.h b/src/plugins/cmakeprojectmanager/cmakefile.h index f5759b2f7b..f6c847ac83 100644 --- a/src/plugins/cmakeprojectmanager/cmakefile.h +++ b/src/plugins/cmakeprojectmanager/cmakefile.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEFILE_H -#define CMAKEFILE_H +#pragma once #include <coreplugin/idocument.h> @@ -51,4 +50,3 @@ public: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKEFILE_H diff --git a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h index 435833f4f9..17fe688827 100644 --- a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h +++ b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEFILECOMPLETIONASSIST_H -#define CMAKEFILECOMPLETIONASSIST_H +#pragma once #include <texteditor/codeassist/completionassistprovider.h> #include <texteditor/codeassist/keywordscompletionassist.h> @@ -57,4 +56,3 @@ public: } // Internal } // CMakeProjectManager -#endif // CMAKEFILECOMPLETIONASSIST_H diff --git a/src/plugins/cmakeprojectmanager/cmakeindenter.h b/src/plugins/cmakeprojectmanager/cmakeindenter.h index 674e0c87b3..2df197b58b 100644 --- a/src/plugins/cmakeprojectmanager/cmakeindenter.h +++ b/src/plugins/cmakeprojectmanager/cmakeindenter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEINDENTER_H -#define CMAKEINDENTER_H +#pragma once #include "cmake_global.h" @@ -43,4 +42,3 @@ public: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKEINDENTER_H diff --git a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.h b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.h index 7ae0c90cfa..f1683e5da9 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.h +++ b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEKITCONFIGWIDGET_H -#define CMAKEKITCONFIGWIDGET_H +#pragma once #include <projectexplorer/kitconfigwidget.h> @@ -74,4 +73,3 @@ private: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKEKITCONFIGWIDGET_H diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.h b/src/plugins/cmakeprojectmanager/cmakekitinformation.h index 59f8a66851..f9ab1dbf86 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.h +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEKITINFORMATION_H -#define CMAKEKITINFORMATION_H +#pragma once #include "cmake_global.h" @@ -57,4 +56,3 @@ public: } // namespace CMakeProjectManager -#endif // CMAKEKITINFORMATION_H diff --git a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h index 9e885a8fa2..1e8a627335 100644 --- a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h +++ b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKELOCATORFILTER_H -#define CMAKELOCATORFILTER_H +#pragma once #include <coreplugin/locator/ilocatorfilter.h> @@ -55,4 +54,3 @@ private: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKELOCATORFILTER_H diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h index e98664ef93..1aace5004b 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEOPENPROJECTWIZARD_H -#define CMAKEOPENPROJECTWIZARD_H +#pragma once #include "cmakebuildconfiguration.h" #include "cmakebuildinfo.h" @@ -193,4 +192,3 @@ private: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKEOPENPROJECTWIZARD_H diff --git a/src/plugins/cmakeprojectmanager/cmakeparser.h b/src/plugins/cmakeprojectmanager/cmakeparser.h index 67213db408..39bf84d526 100644 --- a/src/plugins/cmakeprojectmanager/cmakeparser.h +++ b/src/plugins/cmakeprojectmanager/cmakeparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEPARSER_H -#define CMAKEPARSER_H +#pragma once #include <projectexplorer/ioutputparser.h> #include <projectexplorer/task.h> @@ -54,4 +53,3 @@ private: } // namespace CMakeProjectManager } // namespace Internal -#endif // CMAKEPARSER_H diff --git a/src/plugins/cmakeprojectmanager/cmakepreloadcachekitconfigwidget.h b/src/plugins/cmakeprojectmanager/cmakepreloadcachekitconfigwidget.h index 16df174a2d..f294ddeab2 100644 --- a/src/plugins/cmakeprojectmanager/cmakepreloadcachekitconfigwidget.h +++ b/src/plugins/cmakeprojectmanager/cmakepreloadcachekitconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEPRELOADCACHEKITCONFIGWIDGET_H -#define CMAKEPRELOADCACHEKITCONFIGWIDGET_H +#pragma once #include <projectexplorer/kitconfigwidget.h> @@ -60,4 +59,3 @@ private: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKEPRELOADCACHEKITCONFIGWIDGET_H diff --git a/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.h b/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.h index e137d96b6a..328f7d8d28 100644 --- a/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.h +++ b/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEPRELOADCACHEKITINFORMATION_H -#define CMAKEPRELOADCACHEKITINFORMATION_H +#pragma once #include "cmake_global.h" @@ -54,4 +53,3 @@ public: } // namespace CMakeProjectManager -#endif // CMAKEPRELOADCACHEKITINFORMATION_H diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h index 8a24547c4a..4e2ca1e7c8 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.h +++ b/src/plugins/cmakeprojectmanager/cmakeproject.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEPROJECT_H -#define CMAKEPROJECT_H +#pragma once #include "cmake_global.h" #include "cmakeprojectnodes.h" @@ -151,4 +150,3 @@ private: } // namespace CMakeProjectManager -#endif // CMAKEPROJECT_H diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h index a92272cd11..5fc20bafd3 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEPROJECTCONSTANTS_H -#define CMAKEPROJECTCONSTANTS_H +#pragma once namespace CMakeProjectManager { namespace Constants { @@ -52,4 +51,3 @@ const char CMAKE_SETTINGSPAGE_ID[] = "Z.CMake"; } // namespace Constants } // namespace CMakeProjectManager -#endif // CMAKEPROJECTCONSTANTS_H diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h index d83aa0d7d0..c4b1beae36 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEPROJECTMANAGER_H -#define CMAKEPROJECTMANAGER_H +#pragma once #include <projectexplorer/iprojectmanager.h> @@ -70,4 +69,3 @@ private: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKEPROJECTMANAGER_H diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h index 468e6c0adb..641c6825c9 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEPROJECTNODES_H -#define CMAKEPROJECTNODES_H +#pragma once #include <projectexplorer/projectnodes.h> @@ -44,4 +43,3 @@ public: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKEPROJECTNODES_H diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h index 374b72a613..9fe5028d79 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKEPROJECTPLUGIN_H -#define CMAKEPROJECTPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -56,4 +55,3 @@ private slots: } // namespace Internal } // namespace CMakeProject -#endif // CMAKEPROJECTPLUGIN_H diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h index af531daac2..573f51c197 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKERUNCONFIGURATION_H -#define CMAKERUNCONFIGURATION_H +#pragma once #include <projectexplorer/runnables.h> #include <utils/environment.h> @@ -109,4 +108,3 @@ private: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKERUNCONFIGURATION_H diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.h b/src/plugins/cmakeprojectmanager/cmakesettingspage.h index 72f7b4cbcc..f9932e9d3d 100644 --- a/src/plugins/cmakeprojectmanager/cmakesettingspage.h +++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKESETTINGSPAGE_H -#define CMAKESETTINGSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> #include <utils/pathchooser.h> @@ -56,4 +55,3 @@ private: } // namespace Internal } // namespace CMakeProjectManager -#endif // CMAKESETTINGSPAGE_H diff --git a/src/plugins/cmakeprojectmanager/cmaketool.h b/src/plugins/cmakeprojectmanager/cmaketool.h index 4b1905a8ac..74bf23086b 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.h +++ b/src/plugins/cmakeprojectmanager/cmaketool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKETOOL_H -#define CMAKETOOL_H +#pragma once #include "cmake_global.h" @@ -109,4 +108,3 @@ private: } // namespace CMakeProjectManager -#endif // CMAKETOOL_H diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.h b/src/plugins/cmakeprojectmanager/cmaketoolmanager.h index b898c048a4..346df0739a 100644 --- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.h +++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKETOOLMANAGER_H -#define CMAKETOOLMANAGER_H +#pragma once #include "cmake_global.h" #include "cmaketool.h" @@ -81,4 +80,3 @@ private: } // namespace CMakeProjectManager -#endif // CMAKETOOLMANAGER_H diff --git a/src/plugins/cmakeprojectmanager/generatorinfo.h b/src/plugins/cmakeprojectmanager/generatorinfo.h index 1105c10c24..2f87ef02d5 100644 --- a/src/plugins/cmakeprojectmanager/generatorinfo.h +++ b/src/plugins/cmakeprojectmanager/generatorinfo.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMAKE_GENERATORINFO_H -#define CMAKE_GENERATORINFO_H +#pragma once #include "cmakeprojectmanager.h" @@ -63,4 +62,3 @@ private: Q_DECLARE_METATYPE(CMakeProjectManager::Internal::GeneratorInfo) -#endif // CMAKE_GENERATORINFO_H -- GitLab