From dcbe844e291b7efa9ea7eaf280186ce97df075b2 Mon Sep 17 00:00:00 2001 From: George Bateman Date: Sun, 13 Sep 2020 12:12:01 +0000 Subject: tdf#124176 Use #pragma once in desktop This commit was carried out by a Python script, source of which is at https://bugs.documentfoundation.org/show_bug.cgi?id=124176#c97. Change-Id: I26f01467d2a572a51c7ace76628d4a8f96f249a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102553 Tested-by: Jenkins Reviewed-by: Julien Nabet --- desktop/inc/app.hxx | 5 +---- desktop/inc/bitmaps.hlst | 5 +---- desktop/inc/dp_misc.h | 5 +---- desktop/inc/dp_shared.hxx | 5 +---- desktop/inc/lib/init.hxx | 5 +---- desktop/inc/migration.hxx | 4 +--- desktop/inc/strings.hrc | 5 +---- desktop/inc/strings.hxx | 5 +---- 8 files changed, 8 insertions(+), 31 deletions(-) (limited to 'desktop/inc') diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 5b388493e0b1..26e4691ab53c 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_INC_APP_HXX -#define INCLUDED_DESKTOP_INC_APP_HXX +#pragma once #include #include @@ -178,6 +177,4 @@ OUString ReplaceStringHookProc(const OUString& rStr); } -#endif // INCLUDED_DESKTOP_INC_APP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/bitmaps.hlst b/desktop/inc/bitmaps.hlst index 7a166d5e0807..04c1edd59941 100644 --- a/desktop/inc/bitmaps.hlst +++ b/desktop/inc/bitmaps.hlst @@ -7,14 +7,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_DESKTOP_INC_BITMAPS_HRC -#define INCLUDED_DESKTOP_INC_BITMAPS_HRC +#pragma once #define RID_BMP_WARNING "desktop/res/caution_16.png" #define RID_BMP_LOCKED "desktop/res/lock_16.png" #define RID_BMP_SHARED "desktop/res/shared_16.png" #define RID_BMP_EXTENSION "desktop/res/extension_32.png" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/desktop/inc/dp_misc.h b/desktop/inc/dp_misc.h index 204132210249..2953cd53cfde 100644 --- a/desktop/inc/dp_misc.h +++ b/desktop/inc/dp_misc.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_INC_DP_MISC_H -#define INCLUDED_DESKTOP_INC_DP_MISC_H +#pragma once #include #include @@ -150,6 +149,4 @@ void disposeBridges( } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/dp_shared.hxx b/desktop/inc/dp_shared.hxx index b4f86e44556f..121bfd430fb5 100644 --- a/desktop/inc/dp_shared.hxx +++ b/desktop/inc/dp_shared.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX +#pragma once #include #include @@ -39,6 +38,4 @@ inline OUString DpResId(const char* pId) return Translate::get(pId, dp::DeploymentLocale::get()); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index 69dd6103a5bd..a71ecae79f83 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_DESKTOP_INC_LIB_INIT_HXX -#define INCLUDED_DESKTOP_INC_LIB_INIT_HXX +#pragma once #include #include @@ -184,6 +183,4 @@ namespace desktop { DESKTOP_DLLPUBLIC std::vector jsonToPropertyValuesVector(const char* pJSON); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/migration.hxx b/desktop/inc/migration.hxx index e193407236a0..e28b8f9a55d3 100644 --- a/desktop/inc/migration.hxx +++ b/desktop/inc/migration.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_INC_MIGRATION_HXX -#define INCLUDED_DESKTOP_INC_MIGRATION_HXX +#pragma once namespace desktop { @@ -28,6 +27,5 @@ public: static void migrateSettingsIfNecessary(); }; } -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/strings.hrc b/desktop/inc/strings.hrc index 3953c73ff60b..dd263a54c163 100644 --- a/desktop/inc/strings.hrc +++ b/desktop/inc/strings.hrc @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_STRINGS_HRC -#define INCLUDED_VCL_INC_STRINGS_HRC +#pragma once #define NC_(Context, String) reinterpret_cast(Context "\004" u8##String) @@ -191,6 +190,4 @@ "If this does not apply, delete the lock file at:") #define RID_STR_UNOPKG_ERROR NC_("RID_STR_UNOPKG_ERROR", "ERROR: ") -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/strings.hxx b/desktop/inc/strings.hxx index f89a3028cafe..54b668b1b803 100644 --- a/desktop/inc/strings.hxx +++ b/desktop/inc/strings.hxx @@ -7,11 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_DESKTOP_INC_STRINGS_HRC -#define INCLUDED_DESKTOP_INC_STRINGS_HRC +#pragma once #define RID_APPTITLE "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ -- cgit