lib: Use pragma once

9 files changed, 19 insertions, 46 deletions

diff --git a/src/vte/vte.h b/src/vte/vte.h
index 85d267b7..1d7cb1b8 100644
--- a/src/vte/vte.h
+++ b/src/vte/vte.h
@@ -4,7 +4,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __VTE_VTE_H__
-#define __VTE_VTE_H__
+#pragma once
 
 #include <glib.h>
 
@@ -36,5 +35,3 @@
 #endif /* !VTE_DISABLE_DEPRECATED */
 
 #undef __VTE_VTE_H_INSIDE__
-
-#endif /* __VTE_VTE_H__ */
diff --git a/src/vte/vtedeprecated.h b/src/vte/vtedeprecated.h
index e13debf3..27e37199 100644
--- a/src/vte/vtedeprecated.h
+++ b/src/vte/vtedeprecated.h
@@ -4,7 +4,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,13 +16,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#pragma once
+
 #if !defined (__VTE_VTE_H_INSIDE__) && !defined (VTE_COMPILATION)
 #error "Only <vte/vte.h> can be included directly."
 #endif
 
-#ifndef __VTE_DEPRECATED_H__
-#define __VTE_DEPRECATED_H__
-
 #include "vteterminal.h"
 #include "vtepty.h"
 #include "vtemacros.h"
@@ -166,5 +165,3 @@ gboolean vte_get_encoding_supported(const char *encoding) _VTE_CXX_NOEXCEPT;
 G_END_DECLS
 
 #undef _VTE_DEPRECATED
-
-#endif /* !__VTE_DEPRECATED__H__ */
diff --git a/src/vte/vteenums.h b/src/vte/vteenums.h
index fac22520..777c37f5 100644
--- a/src/vte/vteenums.h
+++ b/src/vte/vteenums.h
@@ -4,7 +4,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __VTE_VTE_ENUMS_H__
-#define __VTE_VTE_ENUMS_H__
+#pragma once
 
 #if !defined (__VTE_VTE_H_INSIDE__) && !defined (VTE_COMPILATION)
 #error "Only <vte/vte.h> can be included directly."
@@ -197,5 +196,3 @@ typedef enum /*< skip >*/ {
 } VteFeatureFlags;
 
 G_END_DECLS
-
-#endif /* __VTE_VTE_ENUMS_H__ */
diff --git a/src/vte/vteglobals.h b/src/vte/vteglobals.h
index cf7957b5..553b7b24 100644
--- a/src/vte/vteglobals.h
+++ b/src/vte/vteglobals.h
@@ -4,7 +4,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __VTE_VTE_GLOBALS_H__
-#define __VTE_VTE_GLOBALS_H__
+#pragma once
 
 #include <glib.h>
 
@@ -42,5 +41,3 @@ _VTE_PUBLIC
 void vte_set_test_flags(guint64 flags) _VTE_CXX_NOEXCEPT;
 
 G_END_DECLS
-
-#endif /* __VTE_VTE_GLOBALS_H__ */
diff --git a/src/vte/vtemacros.h b/src/vte/vtemacros.h
index d2a98ecc..4e21ff04 100644
--- a/src/vte/vtemacros.h
+++ b/src/vte/vtemacros.h
@@ -4,7 +4,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __VTE_VTE_MACROS_H__
-#define __VTE_VTE_MACROS_H__
+#pragma once
 
 #if !defined (__VTE_VTE_H_INSIDE__) && !defined (VTE_COMPILATION)
 #error "Only <vte/vte.h> can be included directly."
@@ -49,5 +48,3 @@
 #ifndef _VTE_CXX_NOEXCEPT
 #define _VTE_CXX_NOEXCEPT
 #endif
-
-#endif /* __VTE_VTE_MACROS_H__ */
diff --git a/src/vte/vtepty.h b/src/vte/vtepty.h
index 5d1fb38f..838ff22c 100644
--- a/src/vte/vtepty.h
+++ b/src/vte/vtepty.h
@@ -4,7 +4,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __VTE_VTE_PTY_H__
-#define __VTE_VTE_PTY_H__
+#pragma once
 
 #if !defined (__VTE_VTE_H_INSIDE__) && !defined (VTE_COMPILATION)
 #error "Only <vte/vte.h> can be included directly."
@@ -134,5 +133,3 @@ gboolean vte_pty_spawn_finish(VtePty *pty,
                               GError **error) _VTE_CXX_NOEXCEPT _VTE_GNUC_NONNULL(1) _VTE_GNUC_NONNULL(2);
 
 G_END_DECLS
-
-#endif /* __VTE_VTE_PTY_H__ */
diff --git a/src/vte/vteregex.h b/src/vte/vteregex.h
index e6f073a3..61ebbc24 100644
--- a/src/vte/vteregex.h
+++ b/src/vte/vteregex.h
@@ -4,7 +4,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VTE_VTE_REGEX_H__
-#define __VTE_VTE_REGEX_H__
+#pragma once
 
 #if !defined (__VTE_VTE_H_INSIDE__) && !defined (VTE_COMPILATION)
 #error "Only <vte/vte.h> can be included directly."
@@ -77,5 +76,3 @@ char *vte_regex_substitute(VteRegex *regex,
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(VteRegex, vte_regex_unref)
 
 G_END_DECLS
-
-#endif /* __VTE_VTE_REGEX_H__ */
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
index d5e96535..a255dede 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -4,7 +4,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __VTE_VTE_TERMINAL_H__
-#define __VTE_VTE_TERMINAL_H__
+#pragma once
 
 #if !defined (__VTE_VTE_H_INSIDE__) && !defined (VTE_COMPILATION)
 #error "Only <vte/vte.h> can be included directly."
@@ -516,5 +515,3 @@ gboolean vte_terminal_get_enable_sixel(VteTerminal *terminal) _VTE_CXX_NOEXCEPT
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(VteTerminal, g_object_unref)
 
 G_END_DECLS
-
-#endif /* __VTE_VTE_TERMINAL_H__ */
diff --git a/src/vte/vteversion.h.in b/src/vte/vteversion.h.in
index 9291666f..09f97f51 100644
--- a/src/vte/vteversion.h.in
+++ b/src/vte/vteversion.h.in
@@ -4,7 +4,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __VTE_VTE_VERSION_H__
-#define __VTE_VTE_VERSION_H__
+#pragma once
 
 #if !defined (__VTE_VTE_H_INSIDE__) && !defined (VTE_COMPILATION)
 #error "Only <vte/vte.h> can be included directly."
@@ -85,5 +84,3 @@ _VTE_PUBLIC
 guint vte_get_micro_version (void) _VTE_CXX_NOEXCEPT G_GNUC_CONST;
 
 G_END_DECLS
-
-#endif /* __VTE_VTE_VERSION_H__ */