vcl/inc/unx/cairotextrender.hxx | 5 +----
vcl/inc/unx/cpdmgr.hxx | 6 +-----
vcl/inc/unx/cupsmgr.hxx | 5 +----
vcl/inc/unx/fc_fontoptions.hxx | 6 +-----
vcl/inc/unx/gendisp.hxx | 5 +----
vcl/inc/unx/genprn.h | 5 +----
vcl/inc/unx/gensys.h | 5 +----
vcl/inc/unx/gtk/gloactiongroup.h | 5 +----
vcl/inc/unx/gtk/glomenu.h | 5 +----
vcl/inc/unx/gtk/gtkinst.hxx | 5 +----
vcl/inc/unx/gtk/gtkobject.hxx | 6 +-----
vcl/inc/unx/gtk/gtksalmenu.hxx | 5 +----
vcl/inc/unx/gtk/gtksys.hxx | 6 ++----
vcl/inc/unx/gtk/hudawareness.h | 5 +----
vcl/inc/unx/helper.hxx | 6 +-----
vcl/inc/unx/i18n_cb.hxx | 6 ++----
vcl/inc/unx/i18n_ic.hxx | 5 +----
vcl/inc/unx/i18n_im.hxx | 5 +----
vcl/inc/unx/i18n_keysym.hxx | 5 +----
vcl/inc/unx/i18n_xkb.hxx | 5 +----
vcl/inc/unx/saldata.hxx | 5 +----
vcl/inc/unx/saldisp.hxx | 5 +----
vcl/inc/unx/salframe.h | 5 +----
vcl/inc/unx/salinst.h | 5 +----
vcl/inc/unx/salobj.h | 5 +----
vcl/inc/unx/saltimer.h | 5 +----
vcl/inc/unx/saltype.h | 5 ++---
vcl/inc/unx/salunx.h | 5 +----
vcl/inc/unx/salunxtime.h | 5 +----
vcl/inc/unx/salvd.h | 5 +----
vcl/inc/unx/sessioninhibitor.hxx | 5 +----
vcl/inc/unx/sm.hxx | 6 ++----
vcl/inc/unx/svsys.h | 6 ++----
vcl/inc/unx/wmadaptor.hxx | 5 +----
vcl/inc/unx/x11/x11gdiimpl.h | 5 +----
35 files changed, 40 insertions(+), 143 deletions(-)
New commits:
commit 76898eaf8fc665802c4fcdd129ec221d9019d4b9
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Nov 19 11:10:53 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Mon Nov 20 04:50:03 2023 +0100
tdf#143148: Use pragma once instead of include guards in vcl/inc/unx
Change-Id: I91ba6c5e49ed7e9ae8e946859ce5ed2169ae590a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159648
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx
index e262a9184b31..50848ed19fa6 100644
--- a/vcl/inc/unx/cairotextrender.hxx
+++ b/vcl/inc/unx/cairotextrender.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_CAIROTEXTRENDER_HXX
-#define INCLUDED_VCL_INC_UNX_CAIROTEXTRENDER_HXX
+#pragma once
#include <unx/freetypetextrender.hxx>
@@ -43,6 +42,4 @@ public:
virtual ~CairoTextRender();
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/cpdmgr.hxx b/vcl/inc/unx/cpdmgr.hxx
index 8e71d4c13015..2806f1d09b53 100644
--- a/vcl/inc/unx/cpdmgr.hxx
+++ b/vcl/inc/unx/cpdmgr.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_CPDMGR_HXX
-#define INCLUDED_VCL_INC_UNX_CPDMGR_HXX
+#pragma once
#include <config_dbus.h>
#include <config_gio.h>
@@ -120,7 +119,4 @@ public:
} // namespace psp
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-
diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx
index 096efdea6e77..fb172103bbd9 100644
--- a/vcl/inc/unx/cupsmgr.hxx
+++ b/vcl/inc/unx/cupsmgr.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_CUPSMGR_HXX
-#define INCLUDED_VCL_INC_UNX_CUPSMGR_HXX
+#pragma once
#include <printerinfomanager.hxx>
#include <osl/thread.h>
@@ -87,6 +86,4 @@ public:
} // namespace psp
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx
index 30411d5d0c60..73bcf3421bc5 100644
--- a/vcl/inc/unx/fc_fontoptions.hxx
+++ b/vcl/inc/unx/fc_fontoptions.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_FC_FONTOPTIONS_HXX
-#define INCLUDED_VCL_INC_UNX_FC_FONTOPTIONS_HXX
+#pragma once
#include <rtl/string.hxx>
#include <vcl/dllapi.h>
@@ -38,7 +37,4 @@ private:
FcPattern* mpPattern;
};
-
-#endif // INCLUDED_VCL_INC_UNX_FC_FONTOPTIONS_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gendisp.hxx b/vcl/inc/unx/gendisp.hxx
index a6188e27a16e..5ef7d445b25a 100644
--- a/vcl/inc/unx/gendisp.hxx
+++ b/vcl/inc/unx/gendisp.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
-#define INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
+#pragma once
#include <salwtype.hxx>
#include <vcl/dllapi.h>
@@ -50,6 +49,4 @@ public:
{ return m_pCapture; }
};
-#endif // INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h
index fc77250aea8b..d030c461439a 100644
--- a/vcl/inc/unx/genprn.h
+++ b/vcl/inc/unx/genprn.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_GENERIC_GENPRN_H
-#define INCLUDED_VCL_INC_GENERIC_GENPRN_H
+#pragma once
#include <jobdata.hxx>
#include <salprn.hxx>
@@ -77,6 +76,4 @@ public:
virtual void EndPage() override;
};
-#endif // INCLUDED_VCL_INC_GENERIC_GENPRN_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gensys.h b/vcl/inc/unx/gensys.h
index 6da0b17b8af9..ab240f05ec0a 100644
--- a/vcl/inc/unx/gensys.h
+++ b/vcl/inc/unx/gensys.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_GENERIC_GENSYS_H
-#define INCLUDED_VCL_INC_GENERIC_GENSYS_H
+#pragma once
#include <salsys.hxx>
#include <vector>
@@ -45,6 +44,4 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem
#endif
};
-#endif // INCLUDED_VCL_INC_GENERIC_GENSYS_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gloactiongroup.h b/vcl/inc/unx/gtk/gloactiongroup.h
index 4028f76dc52e..fb84122a608b 100644
--- a/vcl/inc/unx/gtk/gloactiongroup.h
+++ b/vcl/inc/unx/gtk/gloactiongroup.h
@@ -8,8 +8,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_INC_UNX_GTK_GLOACTIONGROUP_H
-#define INCLUDED_VCL_INC_UNX_GTK_GLOACTIONGROUP_H
+#pragma once
#include <glib-object.h>
#include <glib.h>
@@ -73,6 +72,4 @@ void g_lo_action_group_clear
(GLOActionGroup
G_END_DECLS
-#endif // INCLUDED_VCL_INC_UNX_GTK_GLOACTIONGROUP_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/glomenu.h b/vcl/inc/unx/gtk/glomenu.h
index a0150a845e3e..da41e9e4b8b1 100644
--- a/vcl/inc/unx/gtk/glomenu.h
+++ b/vcl/inc/unx/gtk/glomenu.h
@@ -8,8 +8,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_INC_UNX_GTK_GLOMENU_H
-#define INCLUDED_VCL_INC_UNX_GTK_GLOMENU_H
+#pragma once
#include <gio/gio.h>
@@ -132,6 +131,4 @@ void g_lo_menu_set_submenu_action_to_item_in_section
(GLOMenu
G_END_DECLS
-#endif // INCLUDED_VCL_INC_UNX_GTK_GLOMENU_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index a597e5be2436..1f9e328bb8d8 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKINST_HXX
-#define INCLUDED_VCL_INC_UNX_GTK_GTKINST_HXX
+#pragma once
#include <sal/config.h>
@@ -347,6 +346,4 @@ public:
GdkPixbuf* load_icon_by_name(const OUString& rIconName);
-#endif // INCLUDED_VCL_INC_UNX_GTK_GTKINST_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index b43f09e0bd30..63544f56f882 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX
-#define INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX
+#pragma once
#include <tools/solar.h>
#include <vcl/sysdata.hxx>
@@ -118,7 +117,4 @@ public:
virtual void Reparent(SalFrame* pFrame) override;
};
-
-#endif // INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 2b18466b3dbf..4157df9d3bf6 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
-#define INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
+#pragma once
#include <config_dbus.h>
#include <config_gio.h>
@@ -156,6 +155,4 @@ public:
bool mbVisible; // Item visibility.
};
-#endif // INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index d7e5bcaf5aa4..0dd756f7a7d9 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -6,8 +6,8 @@
* 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_VCL_INC_UNX_GTK_GTKSYS_HXX
-#define INCLUDED_VCL_INC_UNX_GTK_GTKSYS_HXX
+
+#pragma once
#include <unx/gensys.h>
#include <gtk/gtk.h>
@@ -44,6 +44,4 @@ public:
#endif
};
-#endif // INCLUDED_VCL_INC_UNX_GTK_GTKSYS_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/hudawareness.h b/vcl/inc/unx/gtk/hudawareness.h
index eb80e12fe4f3..6c9c015d6af7 100644
--- a/vcl/inc/unx/gtk/hudawareness.h
+++ b/vcl/inc/unx/gtk/hudawareness.h
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_INC_UNX_GTK_HUDAWARENESS_H
-#define INCLUDED_VCL_INC_UNX_GTK_HUDAWARENESS_H
+#pragma once
#include <gio/gio.h>
@@ -28,5 +27,3 @@ void hud_awareness_unregister
(GDBusCo
guint
awareness_id);
G_END_DECLS
-
-#endif // INCLUDED_VCL_INC_UNX_GTK_HUDAWARENESS_H
diff --git a/vcl/inc/unx/helper.hxx b/vcl/inc/unx/helper.hxx
index ac018b37419e..97da8339e37f 100644
--- a/vcl/inc/unx/helper.hxx
+++ b/vcl/inc/unx/helper.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_HELPER_HXX
-#define INCLUDED_VCL_INC_UNX_HELPER_HXX
+#pragma once
#include <vector>
@@ -48,7 +47,4 @@ OUString getOfficePath( whichOfficePath ePath );
} // namespace
-
-#endif // INCLUDED_VCL_INC_UNX_HELPER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index d6a505e0dc5e..4b498f387820 100644
--- a/vcl/inc/unx/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -16,8 +16,8 @@
* 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_VCL_INC_UNX_I18N_CB_HXX
-#define INCLUDED_VCL_INC_UNX_I18N_CB_HXX
+
+#pragma once
#include <X11/Xlib.h>
@@ -86,6 +86,4 @@ struct preedit_data_t
}
};
-#endif // INCLUDED_VCL_INC_UNX_I18N_CB_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index b556b8205e27..303b3fb2e497 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_I18N_IC_HXX
-#define INCLUDED_VCL_INC_UNX_I18N_IC_HXX
+#pragma once
#include "i18n_cb.hxx"
@@ -75,6 +74,4 @@ public:
~SalI18N_InputContext();
};
-#endif // INCLUDED_VCL_INC_UNX_I18N_IC_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx
index 7322c53e11f8..d283f54451f6 100644
--- a/vcl/inc/unx/i18n_im.hxx
+++ b/vcl/inc/unx/i18n_im.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_I18N_IM_HXX
-#define INCLUDED_VCL_INC_UNX_I18N_IM_HXX
+#pragma once
#include <X11/Xlib.h>
@@ -47,6 +46,4 @@ public:
~SalI18N_InputMethod();
};
-#endif // INCLUDED_VCL_INC_UNX_I18N_IM_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_keysym.hxx b/vcl/inc/unx/i18n_keysym.hxx
index a6c8d49a911d..ca4e25e982b7 100644
--- a/vcl/inc/unx/i18n_keysym.hxx
+++ b/vcl/inc/unx/i18n_keysym.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX
-#define INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX
+#pragma once
#include <X11/X.h>
@@ -62,6 +61,4 @@
sal_Unicode KeysymToUnicode(KeySym nKeySym);
-#endif // INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index b33ba085b8da..2fe971245822 100644
--- a/vcl/inc/unx/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_I18N_XKB_HXX
-#define INCLUDED_VCL_INC_UNX_I18N_XKB_HXX
+#pragma once
#include <X11/Xlib.h>
@@ -60,6 +59,4 @@ SalI18N_KeyboardExtension::GetEventBase() const
return mnEventBase;
}
-#endif // INCLUDED_VCL_INC_UNX_I18N_XKB_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index c32ce0d27792..0e5928cb451c 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_SALDATA_HXX
-#define INCLUDED_VCL_INC_UNX_SALDATA_HXX
+#pragma once
#include <X11/Xlib.h>
@@ -69,6 +68,4 @@ public:
X11SalData* GetX11SalData();
-#endif // INCLUDED_VCL_INC_UNX_SALDATA_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 44459c947334..0d642cb3862d 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_SALDISP_HXX
-#define INCLUDED_VCL_INC_UNX_SALDISP_HXX
+#pragma once
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -379,6 +378,4 @@ namespace vcl_sal {
}
}
-#endif // INCLUDED_VCL_INC_UNX_SALDISP_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 833fb5330b70..a6603f6777f3 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_SALFRAME_H
-#define INCLUDED_VCL_INC_UNX_SALFRAME_H
+#pragma once
#include <X11/Xlib.h>
@@ -264,6 +263,4 @@ public:
void setPendingSizeEvent();
};
-#endif // INCLUDED_VCL_INC_UNX_SALFRAME_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 89aa796acd3c..e8f24e255c91 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_SALINST_H
-#define INCLUDED_VCL_INC_UNX_SALINST_H
+#pragma once
#include <salinst.hxx>
#include <unx/geninst.h>
@@ -84,6 +83,4 @@ public:
virtual void AddToRecentDocumentList(const OUString& rFileUrl,
const OUString& rMimeType, const OUString& rDocumentService) override;
};
-#endif // INCLUDED_VCL_INC_UNX_SALINST_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 25a24b69c6b2..f14af351ebf9 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_SALOBJ_H
-#define INCLUDED_VCL_INC_UNX_SALOBJ_H
+#pragma once
#include <X11/Xlib.h>
@@ -85,6 +84,4 @@ public:
virtual const SystemEnvData* GetSystemData() const override;
};
-#endif // INCLUDED_VCL_INC_UNX_SALOBJ_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saltimer.h b/vcl/inc/unx/saltimer.h
index c8da2fcacade..a83401f5b95b 100644
--- a/vcl/inc/unx/saltimer.h
+++ b/vcl/inc/unx/saltimer.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_SALTIMER_H
-#define INCLUDED_VCL_INC_UNX_SALTIMER_H
+#pragma once
#include <saltimer.hxx>
@@ -35,6 +34,4 @@ public:
void Stop() override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saltype.h b/vcl/inc/unx/saltype.h
index e62bdd25e1e2..1fde4bd779be 100644
--- a/vcl/inc/unx/saltype.h
+++ b/vcl/inc/unx/saltype.h
@@ -6,8 +6,8 @@
* 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_VCL_INC_UNX_SALTYPE_H
-#define INCLUDED_VCL_INC_UNX_SALTYPE_H
+
+#pragma once
// an X11 screen index - this unpleasant construct is to allow
// us to cleanly separate the 'DisplayScreen' concept - as used
@@ -22,5 +22,4 @@ public:
bool operator!=(const SalX11Screen &rOther) const { return
rOther.mnXScreen != mnXScreen; }
};
-#endif // INCLUDED_VCL_INC_UNX_SALTYPE_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salunx.h b/vcl/inc/unx/salunx.h
index f8e36d15cd5c..a6333789982e 100644
--- a/vcl/inc/unx/salunx.h
+++ b/vcl/inc/unx/salunx.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_SALUNX_H
-#define INCLUDED_VCL_INC_UNX_SALUNX_H
+#pragma once
#include <tools/long.hxx>
@@ -27,6 +26,4 @@ inline tools::Long Divide(tools::Long nDividend, tools::Long
nDivisor)
return (nDividend + nDivisor / 2) / nDivisor;
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salunxtime.h b/vcl/inc/unx/salunxtime.h
index b56bc846374c..b1fe0d8102b6 100644
--- a/vcl/inc/unx/salunxtime.h
+++ b/vcl/inc/unx/salunxtime.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_SALUNXTIME_H
-#define INCLUDED_VCL_INC_UNX_SALUNXTIME_H
+#pragma once
#if defined LINUX || defined FREEBSD || \
defined NETBSD || defined OPENBSD || defined DRAGONFLY
@@ -71,6 +70,4 @@ inline timeval operator - ( const timeval &t1, const timeval
&t2 )
return t0;
}
-#endif // INCLUDED_VCL_INC_UNX_SALUNXTIME_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index 91b53b74f05d..f85d5363589d 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_SALVD_H
-#define INCLUDED_VCL_INC_UNX_SALVD_H
+#pragma once
#include <X11/Xlib.h>
@@ -80,6 +79,4 @@ public:
virtual tools::Long GetHeight() const override { return nDY_; }
};
-#endif // INCLUDED_VCL_INC_UNX_SALVD_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/sessioninhibitor.hxx b/vcl/inc/unx/sessioninhibitor.hxx
index 873685b234a7..ca4dc6a93acc 100644
--- a/vcl/inc/unx/sessioninhibitor.hxx
+++ b/vcl/inc/unx/sessioninhibitor.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_INC_UNX_SCREENSAVERINHIBITOR_HXX
-#define INCLUDED_VCL_INC_UNX_SCREENSAVERINHIBITOR_HXX
+#pragma once
#include <X11/Xlib.h>
#include <X11/Xmd.h>
@@ -75,6 +74,4 @@ private:
void inhibitDPMS(bool bInhibit, Display* pDisplay);
};
-#endif // INCLUDED_VCL_INC_UNX_SCREENSAVERINHIBITOR_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx
index 135e0d5efe71..16a3daff80d7 100644
--- a/vcl/inc/unx/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -16,8 +16,8 @@
* 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_VCL_INC_UNX_SM_HXX
-#define INCLUDED_VCL_INC_UNX_SM_HXX
+
+#pragma once
#include <sal/config.h>
@@ -74,6 +74,4 @@ public:
static const OString& getSessionID();
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/svsys.h b/vcl/inc/unx/svsys.h
index c65e7cc9e8c9..00aec18a340a 100644
--- a/vcl/inc/unx/svsys.h
+++ b/vcl/inc/unx/svsys.h
@@ -16,13 +16,11 @@
* 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_VCL_INC_UNX_SVSYS_H
-#define INCLUDED_VCL_INC_UNX_SVSYS_H
+
+#pragma once
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/XKBlib.h>
-#endif // INCLUDED_VCL_INC_UNX_SVSYS_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index afa3fa85c324..6d3ee56277c4 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNX_WMADAPTOR_HXX
-#define INCLUDED_VCL_INC_UNX_WMADAPTOR_HXX
+#pragma once
#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
@@ -290,6 +289,4 @@ public:
} // namespace
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11/x11gdiimpl.h b/vcl/inc/unx/x11/x11gdiimpl.h
index d740fb077c2e..f7c07a7e866a 100644
--- a/vcl/inc/unx/x11/x11gdiimpl.h
+++ b/vcl/inc/unx/x11/x11gdiimpl.h
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_INC_UNX_X11_X11GDIIMPL_HXX
-#define INCLUDED_VCL_INC_UNX_X11_X11GDIIMPL_HXX
+#pragma once
#include <sal/types.h>
@@ -21,6 +20,4 @@ public:
virtual void Flush(){};
};
-#endif // INCLUDED_VCL_INC_UNX_X11_X11GDIIMPL_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
