configmgr/source/config_map.hxx | 5 +----
embedserv/source/embed/guid.hxx | 6 +-----
emfio/inc/emfreader.hxx | 6 +-----
emfio/inc/mtftools.hxx | 6 +-----
helpcompiler/inc/HelpCompiler.hxx | 5 +----
helpcompiler/inc/HelpLinker.hxx | 6 +-----
helpcompiler/source/LuceneHelper.hxx | 6 +-----
7 files changed, 7 insertions(+), 33 deletions(-)
New commits:
commit 0d8d0fb8932652f182c46805d5cf3ae7f6ebadd5
Author: Uday Sharma <itsud...@gmail.com>
AuthorDate: Sat Feb 11 23:04:38 2023 +0530
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Thu Mar 16 09:25:32 2023 +0000
tdf#143148: Use pragma once instead of include guards
Change-Id: I6898acbf7c6c9de45bbfa6a32202acf302f92caa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146822
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
diff --git a/configmgr/source/config_map.hxx b/configmgr/source/config_map.hxx
index 5d2990d5a0d8..46a553cdde39 100644
--- a/configmgr/source/config_map.hxx
+++ b/configmgr/source/config_map.hxx
@@ -6,8 +6,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef CONFIG_MAP_HXX
-#define CONFIG_MAP_HXX
+#pragma once
#include <map>
#include <rtl/ustring.hxx>
@@ -32,6 +31,4 @@ template <class T> struct config_map : public
std::map<OUString, T, LengthConten
{
};
-#endif // CONFIG_MAP_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/embed/guid.hxx b/embedserv/source/embed/guid.hxx
index 2cbf28b5b93a..9e1d8006ebda 100644
--- a/embedserv/source/embed/guid.hxx
+++ b/embedserv/source/embed/guid.hxx
@@ -16,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#ifndef INCLUDED_EMBEDSERV_SOURCE_EMBED_GUID_HXX
-#define INCLUDED_EMBEDSERV_SOURCE_EMBED_GUID_HXX
+#pragma once
#include <sal/config.h>
@@ -34,6 +32,4 @@ std::u16string_view getServiceNameFromGUID_Impl(GUID const*);
wchar_t const* getStorageTypeFromGUID_Impl(GUID const* guid);
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/emfio/inc/emfreader.hxx b/emfio/inc/emfreader.hxx
index a09ad6fa2c20..4893a45733af 100644
--- a/emfio/inc/emfreader.hxx
+++ b/emfio/inc/emfreader.hxx
@@ -16,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#ifndef INCLUDED_EMFIO_INC_EMFREADER_HXX
-#define INCLUDED_EMFIO_INC_EMFREADER_HXX
+#pragma once
#include "mtftools.hxx"
@@ -63,6 +61,4 @@ namespace emfio
};
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx
index 26e2d8cca088..b2237736869b 100644
--- a/emfio/inc/mtftools.hxx
+++ b/emfio/inc/mtftools.hxx
@@ -16,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#ifndef INCLUDED_EMFIO_INC_MTFTOOLS_HXX
-#define INCLUDED_EMFIO_INC_MTFTOOLS_HXX
+#pragma once
#include <config_options.h>
#include <basegfx/utils/b2dclipstate.hxx>
@@ -838,6 +836,4 @@ namespace emfio
};
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/helpcompiler/inc/HelpCompiler.hxx
b/helpcompiler/inc/HelpCompiler.hxx
index c66e705ae222..04562e9c41a7 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -16,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#ifndef INCLUDED_HELPCOMPILER_INC_HELPCOMPILER_HXX
-#define INCLUDED_HELPCOMPILER_INC_HELPCOMPILER_HXX
+#pragma once
#include <sal/config.h>
@@ -212,5 +210,4 @@ inline char tocharlower(char c)
rtl::toAsciiLowerCase(static_cast<unsigned char>(c)));
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx
index 5087e47ae08d..9645f7c4c67c 100644
--- a/helpcompiler/inc/HelpLinker.hxx
+++ b/helpcompiler/inc/HelpLinker.hxx
@@ -16,9 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#ifndef INCLUDED_HELPCOMPILER_INC_HELPLINKER_HXX
-#define INCLUDED_HELPCOMPILER_INC_HELPLINKER_HXX
+#pragma once
#include <memory>
#include <vector>
@@ -88,6 +86,4 @@ private:
const std::string& jarfileB, const std::string& titleB );
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/helpcompiler/source/LuceneHelper.hxx
b/helpcompiler/source/LuceneHelper.hxx
index 781f30bba416..6e8208b1b20e 100644
--- a/helpcompiler/source/LuceneHelper.hxx
+++ b/helpcompiler/source/LuceneHelper.hxx
@@ -6,9 +6,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-
-#ifndef INCLUDED_HELPCOMPILER_SOURCE_LUCENEHELPER_HXX
-#define INCLUDED_HELPCOMPILER_SOURCE_LUCENEHELPER_HXX
+#pragma once
#if defined(__GNUC__)
#pragma GCC visibility push(default)
@@ -26,6 +24,4 @@
std::vector<TCHAR> OUStringToTCHARVec(OUString const& rStr);
OUString TCHARArrayToOUString(TCHAR const* str);
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
