vcl/inc/win/salbmp.h | 5 +----
vcl/inc/win/salframe.h | 5 +----
vcl/inc/win/salinst.h | 5 +----
vcl/inc/win/salobj.h | 5 +----
vcl/inc/win/salprn.h | 5 +----
vcl/inc/win/salsys.h | 5 +----
vcl/inc/win/saltimer.h | 5 +----
vcl/inc/win/salvd.h | 6 +-----
vcl/inc/win/svsys.h | 5 +----
9 files changed, 9 insertions(+), 37 deletions(-)
New commits:
commit 7618c791a39e74b0f8291ff28f65df78cfa20301
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Nov 19 12:28:28 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sun Nov 19 09:14:51 2023 +0100
tdf#143148: Use pragma once instead of include guards in vcl/inc/win
Change-Id: I57db27a6cbd45ec9f1ae666a3b8da23bbf5c20de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159649
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index c83b1675331f..2edf291342cc 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_WIN_SALBMP_H
-#define INCLUDED_VCL_INC_WIN_SALBMP_H
+#pragma once
#include <tools/gen.hxx>
#include <win/wincomp.hxx>
@@ -93,6 +92,4 @@ public:
virtual const basegfx::SystemDependentDataHolder*
accessSystemDependentDataHolder() const override;
};
-#endif // INCLUDED_VCL_INC_WIN_SALBMP_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 66da5e3a976f..de72c089b57b 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_WIN_SALFRAME_H
-#define INCLUDED_VCL_INC_WIN_SALFRAME_H
+#pragma once
#include <sal/config.h>
@@ -160,6 +159,4 @@ namespace vcl_sal {
LONG nSymbol );
}
-#endif // INCLUDED_VCL_INC_WIN_SALFRAME_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h
index 7af6e007b562..9c6ca82d38bd 100644
--- a/vcl/inc/win/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_WIN_SALINST_H
-#define INCLUDED_VCL_INC_WIN_SALINST_H
+#pragma once
#include <sal/config.h>
@@ -86,6 +85,4 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, HWND
hWndParent, SalFrameSt
SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent );
HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, bool bAsChild );
-#endif // INCLUDED_VCL_INC_WIN_SALINST_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h
index e76c4787eb71..37bcf0317866 100644
--- a/vcl/inc/win/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_WIN_SALOBJ_H
-#define INCLUDED_VCL_INC_WIN_SALOBJ_H
+#pragma once
#include <salobj.hxx>
@@ -50,6 +49,4 @@ public:
virtual const SystemEnvData* GetSystemData() const override;
};
-#endif // INCLUDED_VCL_INC_WIN_SALOBJ_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h
index 2d02aa5b0e54..e1bbb665e29d 100644
--- a/vcl/inc/win/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_WIN_SALPRN_H
-#define INCLUDED_VCL_INC_WIN_SALPRN_H
+#pragma once
#include <salprn.hxx>
@@ -113,6 +112,4 @@ public:
bool isValid() const { return mbValid && mhDC; }
};
-#endif // INCLUDED_VCL_INC_WIN_SALPRN_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h
index cf1a6ecb4419..ae94bb9e1a5d 100644
--- a/vcl/inc/win/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_WIN_SALSYS_H
-#define INCLUDED_VCL_INC_WIN_SALSYS_H
+#pragma once
#include <salsys.hxx>
@@ -65,6 +64,4 @@ public:
sal_IntPtr /*LPRECT*/ );
};
-#endif // INCLUDED_VCL_INC_WIN_SALSYS_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/saltimer.h b/vcl/inc/win/saltimer.h
index a467de815d85..827c08ab8305 100644
--- a/vcl/inc/win/saltimer.h
+++ b/vcl/inc/win/saltimer.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_WIN_SALTIMER_H
-#define INCLUDED_VCL_INC_WIN_SALTIMER_H
+#pragma once
#include <saltimer.hxx>
@@ -81,6 +80,4 @@ inline bool WinSalTimer::GetForceRealTimer() const
return m_bForceRealTimer;
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h
index 7a776056c3a2..66833f99f18a 100644
--- a/vcl/inc/win/salvd.h
+++ b/vcl/inc/win/salvd.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_WIN_SALVD_H
-#define INCLUDED_VCL_INC_WIN_SALVD_H
+#pragma once
#include <sal/config.h>
#include <win/scoped_gdi.hxx>
@@ -64,7 +63,4 @@ public:
virtual tools::Long GetHeight() const override { return mnHeight; }
};
-
-#endif // INCLUDED_VCL_INC_WIN_SALVD_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/svsys.h b/vcl/inc/win/svsys.h
index 44cae93cf741..8a26bf6699e4 100644
--- a/vcl/inc/win/svsys.h
+++ b/vcl/inc/win/svsys.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_WIN_SVSYS_H
-#define INCLUDED_VCL_INC_WIN_SVSYS_H
+#pragma once
#ifdef _WIN32
#ifndef INCLUDED_PRE_POST_WIN_H
@@ -28,6 +27,4 @@
#endif
#endif
-#endif // INCLUDED_VCL_INC_WIN_SVSYS_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
