From 5cbd847c842da04cf0dc82106f084c09f1c4e350 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Wed, 16 Oct 2024 13:17:21 +0200 Subject: [PATCH] Prefer using pragma once Similar to what we did in mutter Part-of: --- src/calendar-server/calendar-debug.h | 5 +---- src/calendar-server/calendar-sources.h | 5 +---- src/gtkactionmuxer.h | 5 +---- src/gtkactionobservable.h | 5 +---- src/gtkactionobserver.h | 5 +---- src/hotplug-sniffer/hotplug-mimetypes.h | 5 +---- src/hotplug-sniffer/shell-mime-sniffer.h | 5 +---- src/shell-app-cache-private.h | 6 ++---- src/shell-app-private.h | 5 +---- src/shell-app-system-private.h | 5 +---- src/shell-app-system.h | 5 +---- src/shell-app-usage.h | 5 +---- src/shell-app.h | 5 +---- src/shell-camera-monitor.h | 5 +---- src/shell-global-private.h | 5 +---- src/shell-global.h | 5 +---- src/shell-glsl-effect.h | 5 +---- src/shell-invert-lightness-effect.h | 5 +---- src/shell-keyring-prompt.h | 5 +---- src/shell-mount-operation.h | 5 +---- src/shell-network-agent.h | 5 +---- src/shell-perf-log.h | 5 +---- src/shell-polkit-authentication-agent.h | 1 - src/shell-screenshot.h | 5 +---- src/shell-secure-text-buffer.h | 5 +---- src/shell-square-bin.h | 6 ++---- src/shell-stack.h | 5 +---- src/shell-tray-icon-private.h | 5 +---- src/shell-tray-icon.h | 5 +---- src/shell-tray-manager.h | 5 +---- src/shell-util.h | 5 +---- src/shell-window-preview-layout.h | 5 +---- src/shell-window-preview.h | 5 +---- src/shell-window-tracker-private.h | 5 +---- src/shell-window-tracker.h | 5 +---- src/shell-wm-private.h | 5 +---- src/shell-wm.h | 5 +---- src/shell-workspace-background.h | 5 +---- src/st/croco/cr-additional-sel.h | 6 +----- src/st/croco/cr-attr-sel.h | 5 +---- src/st/croco/cr-cascade.h | 5 +---- src/st/croco/cr-declaration.h | 5 +---- src/st/croco/cr-doc-handler.h | 5 +---- src/st/croco/cr-enc-handler.h | 5 +---- src/st/croco/cr-fonts.h | 5 +---- src/st/croco/cr-input.h | 6 +----- src/st/croco/cr-num.h | 6 +----- src/st/croco/cr-om-parser.h | 5 +---- src/st/croco/cr-parser.h | 5 +---- src/st/croco/cr-parsing-location.h | 6 ++---- src/st/croco/cr-prop-list.h | 5 +---- src/st/croco/cr-pseudo.h | 5 +---- src/st/croco/cr-rgb.h | 5 +---- src/st/croco/cr-selector.h | 5 +---- src/st/croco/cr-simple-sel.h | 6 +----- src/st/croco/cr-statement.h | 5 +---- src/st/croco/cr-string.h | 5 +---- src/st/croco/cr-stylesheet.h | 5 +---- src/st/croco/cr-term.h | 5 +---- src/st/croco/cr-tknzr.h | 5 +---- src/st/croco/cr-token.h | 5 +---- src/st/croco/cr-utils.h | 5 +---- src/st/croco/libcroco.h | 5 +---- src/st/st-adjustment.h | 5 +---- src/st/st-bin.h | 5 +---- src/st/st-border-image.h | 5 +---- src/st/st-box-layout.h | 5 +---- src/st/st-button.h | 5 +---- src/st/st-clipboard.h | 5 +---- src/st/st-drawing-area.h | 5 +---- src/st/st-entry.h | 4 +--- src/st/st-focus-manager.h | 5 +---- src/st/st-generic-accessible.h | 5 +---- src/st/st-icon-cache.h | 5 +---- src/st/st-icon-colors.h | 5 +---- src/st/st-icon.h | 5 +---- src/st/st-image-content.h | 5 +---- src/st/st-label.h | 4 +--- src/st/st-password-entry.h | 6 +----- src/st/st-private.h | 5 +---- src/st/st-scroll-bar.h | 5 +---- src/st/st-scroll-view-fade.h | 5 +---- src/st/st-scrollable.h | 5 +---- src/st/st-settings.h | 5 +---- src/st/st-shadow.h | 5 +---- src/st/st-texture-cache.h | 5 +---- src/st/st-theme-context.h | 5 +---- src/st/st-theme-node-private.h | 5 +---- src/st/st-theme-node-transition.h | 5 +---- src/st/st-theme-node.h | 5 +---- src/st/st-theme-private.h | 5 +---- src/st/st-theme.h | 5 +---- src/st/st-types.h | 6 ++---- src/st/st-widget-accessible.h | 5 +---- src/st/st-widget.h | 5 +---- src/tray/na-tray-child.h | 5 +---- src/tray/na-tray-manager.h | 5 +---- src/tray/na-xembed.h | 7 ++----- 98 files changed, 102 insertions(+), 393 deletions(-) diff --git a/src/calendar-server/calendar-debug.h b/src/calendar-server/calendar-debug.h index 39befd744..db3c0d981 100644 --- a/src/calendar-server/calendar-debug.h +++ b/src/calendar-server/calendar-debug.h @@ -18,8 +18,7 @@ * Mark McLoughlin */ -#ifndef __CALENDAR_DEBUG_H__ -#define __CALENDAR_DEBUG_H__ +#pragma once #include @@ -46,5 +45,3 @@ G_BEGIN_DECLS #endif /* CALENDAR_ENABLE_DEBUG */ G_END_DECLS - -#endif /* __CALENDAR_DEBUG_H__ */ diff --git a/src/calendar-server/calendar-sources.h b/src/calendar-server/calendar-sources.h index 1ffc8ad01..97520f7d8 100644 --- a/src/calendar-server/calendar-sources.h +++ b/src/calendar-server/calendar-sources.h @@ -21,8 +21,7 @@ * Christian Kellner */ -#ifndef __CALENDAR_SOURCES_H__ -#define __CALENDAR_SOURCES_H__ +#pragma once #include @@ -60,5 +59,3 @@ void print_debug (const gchar *str, ...) G_GNUC_PRINTF (1, 2); G_END_DECLS - -#endif /* __CALENDAR_SOURCES_H__ */ diff --git a/src/gtkactionmuxer.h b/src/gtkactionmuxer.h index d71abf48d..8e9dfecca 100644 --- a/src/gtkactionmuxer.h +++ b/src/gtkactionmuxer.h @@ -17,8 +17,7 @@ * Author: Ryan Lortie */ -#ifndef __GTK_ACTION_MUXER_H__ -#define __GTK_ACTION_MUXER_H__ +#pragma once #include @@ -60,5 +59,3 @@ gchar * gtk_print_action_and_target (const g GVariant *target); G_END_DECLS - -#endif /* __GTK_ACTION_MUXER_H__ */ diff --git a/src/gtkactionobservable.h b/src/gtkactionobservable.h index aa1514b3c..c754bb9fe 100644 --- a/src/gtkactionobservable.h +++ b/src/gtkactionobservable.h @@ -17,8 +17,7 @@ * Authors: Ryan Lortie */ -#ifndef __GTK_ACTION_OBSERVABLE_H__ -#define __GTK_ACTION_OBSERVABLE_H__ +#pragma once #include "gtkactionobserver.h" @@ -56,5 +55,3 @@ void gtk_action_observable_unregister_observer (GtkActi GtkActionObserver *observer); G_END_DECLS - -#endif /* __GTK_ACTION_OBSERVABLE_H__ */ diff --git a/src/gtkactionobserver.h b/src/gtkactionobserver.h index a4e9659c2..1f861671a 100644 --- a/src/gtkactionobserver.h +++ b/src/gtkactionobserver.h @@ -17,8 +17,7 @@ * Authors: Ryan Lortie */ -#ifndef __GTK_ACTION_OBSERVER_H__ -#define __GTK_ACTION_OBSERVER_H__ +#pragma once #include @@ -87,5 +86,3 @@ void gtk_action_observer_primary_accel_changed (GtkActi const gchar *action_and_target); G_END_DECLS - -#endif /* __GTK_ACTION_OBSERVER_H__ */ diff --git a/src/hotplug-sniffer/hotplug-mimetypes.h b/src/hotplug-sniffer/hotplug-mimetypes.h index b03402007..9e1e94463 100644 --- a/src/hotplug-sniffer/hotplug-mimetypes.h +++ b/src/hotplug-sniffer/hotplug-mimetypes.h @@ -1,7 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __HOTPLUG_MIMETYPES_H__ -#define __HOTPLUG_MIMETYPES_H__ +#pragma once #include @@ -137,5 +136,3 @@ G_GNUC_UNUSED static const gchar *audio_mimetypes[] = { "audio/x-xm", NULL }; - -#endif /* __HOTPLUG_MIMETYPES_H__ */ diff --git a/src/hotplug-sniffer/shell-mime-sniffer.h b/src/hotplug-sniffer/shell-mime-sniffer.h index 3936eef14..640d49194 100644 --- a/src/hotplug-sniffer/shell-mime-sniffer.h +++ b/src/hotplug-sniffer/shell-mime-sniffer.h @@ -19,8 +19,7 @@ * */ -#ifndef __SHELL_MIME_SNIFFER_H__ -#define __SHELL_MIME_SNIFFER_H__ +#pragma once #include #include @@ -42,5 +41,3 @@ gchar ** shell_mime_sniffer_sniff_finish (ShellMimeSniffer *self, GError **error); G_END_DECLS - -#endif /* __SHELL_MIME_SNIFFER_H__ */ diff --git a/src/shell-app-cache-private.h b/src/shell-app-cache-private.h index b73094ab1..6afdd3445 100644 --- a/src/shell-app-cache-private.h +++ b/src/shell-app-cache-private.h @@ -1,6 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_APP_CACHE_PRIVATE_H__ -#define __SHELL_APP_CACHE_PRIVATE_H__ + +#pragma once #include #include @@ -15,5 +15,3 @@ GDesktopAppInfo *shell_app_cache_get_info (ShellAppCache *cache, const char *id); char *shell_app_cache_translate_folder (ShellAppCache *cache, const char *name); - -#endif /* __SHELL_APP_CACHE_PRIVATE_H__ */ diff --git a/src/shell-app-private.h b/src/shell-app-private.h index b1786b319..772a2ae87 100644 --- a/src/shell-app-private.h +++ b/src/shell-app-private.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_APP_PRIVATE_H__ -#define __SHELL_APP_PRIVATE_H__ +#pragma once #include "shell-app.h" #include "shell-app-system.h" @@ -20,5 +19,3 @@ void _shell_app_add_window (ShellApp *app, MetaWindow *window); void _shell_app_remove_window (ShellApp *app, MetaWindow *window); G_END_DECLS - -#endif /* __SHELL_APP_PRIVATE_H__ */ diff --git a/src/shell-app-system-private.h b/src/shell-app-system-private.h index 975d563de..624ed1ab2 100644 --- a/src/shell-app-system-private.h +++ b/src/shell-app-system-private.h @@ -1,9 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_APP_SYSTEM_PRIVATE_H__ -#define __SHELL_APP_SYSTEM_PRIVATE_H__ +#pragma once #include "shell-app-system.h" void _shell_app_system_notify_app_state_changed (ShellAppSystem *self, ShellApp *app); - -#endif diff --git a/src/shell-app-system.h b/src/shell-app-system.h index 8719dbcf2..675b1df0d 100644 --- a/src/shell-app-system.h +++ b/src/shell-app-system.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_APP_SYSTEM_H__ -#define __SHELL_APP_SYSTEM_H__ +#pragma once #include #include @@ -28,5 +27,3 @@ GSList *shell_app_system_get_running (ShellAppSystem *sel char ***shell_app_system_search (const char *search_string); GList *shell_app_system_get_installed (ShellAppSystem *self); - -#endif /* __SHELL_APP_SYSTEM_H__ */ diff --git a/src/shell-app-usage.h b/src/shell-app-usage.h index 4b0e1691a..9475b6044 100644 --- a/src/shell-app-usage.h +++ b/src/shell-app-usage.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_APP_USAGE_H__ -#define __SHELL_APP_USAGE_H__ +#pragma once #include "shell-app.h" #include "shell-window-tracker.h" @@ -19,5 +18,3 @@ int shell_app_usage_compare (ShellAppUsage *self, const char *id_b); G_END_DECLS - -#endif /* __SHELL_APP_USAGE_H__ */ diff --git a/src/shell-app.h b/src/shell-app.h index a3e087eae..aa67847b2 100644 --- a/src/shell-app.h +++ b/src/shell-app.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_APP_H__ -#define __SHELL_APP_H__ +#pragma once #include #include @@ -92,5 +91,3 @@ void shell_app_update_app_actions (ShellApp *app, MetaWindow *window); gboolean shell_app_get_busy (ShellApp *app); G_END_DECLS - -#endif /* __SHELL_APP_H__ */ diff --git a/src/shell-camera-monitor.h b/src/shell-camera-monitor.h index 9f9811686..558e3c463 100644 --- a/src/shell-camera-monitor.h +++ b/src/shell-camera-monitor.h @@ -19,8 +19,7 @@ * 02111-1307, USA. */ -#ifndef __SHELL_CAMERA_MONITOR_H__ -#define __SHELL_CAMERA_MONITOR_H__ +#pragma once #include @@ -31,5 +30,3 @@ G_DECLARE_FINAL_TYPE (ShellCameraMonitor, shell_camera_monitor, SHELL, CAMERA_MONITOR, GObject) G_END_DECLS - -#endif /* __SHELL_CAMERA_MONITOR_H__ */ diff --git a/src/shell-global-private.h b/src/shell-global-private.h index 8ba211898..59a3ecc8d 100644 --- a/src/shell-global-private.h +++ b/src/shell-global-private.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_GLOBAL_PRIVATE_H__ -#define __SHELL_GLOBAL_PRIVATE_H__ +#pragma once #include "shell-global.h" @@ -22,5 +21,3 @@ ShellAppCache * shell_global_get_app_cache (ShellGlobal *global); void _shell_global_locate_pointer (ShellGlobal *global); void _shell_global_notify_shutdown (ShellGlobal *global); - -#endif /* __SHELL_GLOBAL_PRIVATE_H__ */ diff --git a/src/shell-global.h b/src/shell-global.h index 839933023..715764a49 100644 --- a/src/shell-global.h +++ b/src/shell-global.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_GLOBAL_H__ -#define __SHELL_GLOBAL_H__ +#pragma once #include #include @@ -100,5 +99,3 @@ ShellAppSystem * shell_global_get_app_system (ShellGlobal *global); ShellAppUsage * shell_global_get_app_usage (ShellGlobal *global); G_END_DECLS - -#endif /* __SHELL_GLOBAL_H__ */ diff --git a/src/shell-glsl-effect.h b/src/shell-glsl-effect.h index d6d687b76..10b70e13c 100644 --- a/src/shell-glsl-effect.h +++ b/src/shell-glsl-effect.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_GLSL_EFFECT_H__ -#define __SHELL_GLSL_EFFECT_H__ +#pragma once #include "st.h" @@ -57,5 +56,3 @@ void shell_glsl_effect_set_uniform_matrix (ShellGLSLEffect *effect, int dimensions, int total_count, const float *value); - -#endif /* __SHELL_GLSL_EFFECT_H__ */ diff --git a/src/shell-invert-lightness-effect.h b/src/shell-invert-lightness-effect.h index 3d7cf3a6d..534014071 100644 --- a/src/shell-invert-lightness-effect.h +++ b/src/shell-invert-lightness-effect.h @@ -18,8 +18,7 @@ * Author: * Joseph Scheuhammer */ -#ifndef __SHELL_INVERT_LIGHTNESS_EFFECT_H__ -#define __SHELL_INVERT_LIGHTNESS_EFFECT_H__ +#pragma once #include @@ -37,5 +36,3 @@ GType shell_invert_lightness_effect_get_type (void) G_GNUC_CONST; ClutterEffect *shell_invert_lightness_effect_new (void); G_END_DECLS - -#endif /* __SHELL_INVERT_LIGHTNESS_EFFECT_H__ */ diff --git a/src/shell-keyring-prompt.h b/src/shell-keyring-prompt.h index fcacf4c57..f217310bc 100644 --- a/src/shell-keyring-prompt.h +++ b/src/shell-keyring-prompt.h @@ -20,8 +20,7 @@ Author: Stef Walter */ -#ifndef __SHELL_KEYRING_PROMPT_H__ -#define __SHELL_KEYRING_PROMPT_H__ +#pragma once #include #include @@ -53,5 +52,3 @@ gboolean shell_keyring_prompt_complete (ShellKeyringProm void shell_keyring_prompt_cancel (ShellKeyringPrompt *self); G_END_DECLS - -#endif /* __SHELL_KEYRING_PROMPT_H__ */ diff --git a/src/shell-mount-operation.h b/src/shell-mount-operation.h index c4019a5f0..cc74e1a63 100644 --- a/src/shell-mount-operation.h +++ b/src/shell-mount-operation.h @@ -19,8 +19,7 @@ * */ -#ifndef __SHELL_MOUNT_OPERATION_H__ -#define __SHELL_MOUNT_OPERATION_H__ +#pragma once #include @@ -37,5 +36,3 @@ gchar ** shell_mount_operation_get_show_processes_choices (ShellMountOperation * gchar * shell_mount_operation_get_show_processes_message (ShellMountOperation *self); G_END_DECLS - -#endif /* __SHELL_MOUNT_OPERATION_H__ */ diff --git a/src/shell-network-agent.h b/src/shell-network-agent.h index 0ffde0274..05da23dcb 100644 --- a/src/shell-network-agent.h +++ b/src/shell-network-agent.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_NETWORK_AGENT_H__ -#define __SHELL_NETWORK_AGENT_H__ +#pragma once #include #include @@ -69,5 +68,3 @@ NMVpnPluginInfo *shell_network_agent_search_vpn_plugin_finish (ShellNetworkAge #define SHELL_KEYRING_SK_TAG "setting-key" G_END_DECLS - -#endif /* __SHELL_NETWORK_AGENT_H__ */ diff --git a/src/shell-perf-log.h b/src/shell-perf-log.h index 45d07a591..b85eb0adb 100644 --- a/src/shell-perf-log.h +++ b/src/shell-perf-log.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_PERF_LOG_H__ -#define __SHELL_PERF_LOG_H__ +#pragma once #include #include @@ -71,5 +70,3 @@ gboolean shell_perf_log_dump_log (ShellPerfLog *perf_log, GError **error); G_END_DECLS - -#endif /* __SHELL_PERF_LOG_H__ */ diff --git a/src/shell-polkit-authentication-agent.h b/src/shell-polkit-authentication-agent.h index 4f1474956..e4fccda98 100644 --- a/src/shell-polkit-authentication-agent.h +++ b/src/shell-polkit-authentication-agent.h @@ -32,4 +32,3 @@ void shell_polkit_authentication_agent_register (Shel void shell_polkit_authentication_agent_unregister (ShellPolkitAuthenticationAgent *agent); G_END_DECLS - diff --git a/src/shell-screenshot.h b/src/shell-screenshot.h index 609ffef2a..248d34fea 100644 --- a/src/shell-screenshot.h +++ b/src/shell-screenshot.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_SCREENSHOT_H__ -#define __SHELL_SCREENSHOT_H__ +#pragma once #include @@ -88,5 +87,3 @@ void shell_screenshot_composite_to_stream (CoglTexture *texture, gpointer user_data); GdkPixbuf *shell_screenshot_composite_to_stream_finish (GAsyncResult *result, GError **error); - -#endif /* ___SHELL_SCREENSHOT_H__ */ diff --git a/src/shell-secure-text-buffer.h b/src/shell-secure-text-buffer.h index 6685b72ad..f5b68a29b 100644 --- a/src/shell-secure-text-buffer.h +++ b/src/shell-secure-text-buffer.h @@ -21,8 +21,7 @@ Author: Stef Walter */ -#ifndef __SHELL_SECURE_TEXT_BUFFER_H__ -#define __SHELL_SECURE_TEXT_BUFFER_H__ +#pragma once #include @@ -35,5 +34,3 @@ G_DECLARE_FINAL_TYPE (ShellSecureTextBuffer, shell_secure_text_buffer, ClutterTextBuffer * shell_secure_text_buffer_new (void); G_END_DECLS - -#endif /* __SHELL_SECURE_TEXT_BUFFER_H__ */ diff --git a/src/shell-square-bin.h b/src/shell-square-bin.h index 2b7d4b236..1fd547d31 100644 --- a/src/shell-square-bin.h +++ b/src/shell-square-bin.h @@ -1,5 +1,5 @@ -#ifndef __SHELL_SQUARE_BIN_H__ -#define __SHELL_SQUARE_BIN_H__ +#pragma once + #include @@ -9,5 +9,3 @@ G_BEGIN_DECLS G_DECLARE_FINAL_TYPE (ShellSquareBin, shell_square_bin, SHELL, SquareBin, StBin) G_END_DECLS - -#endif /* __SHELL_SQUARE_BIN_H__ */ diff --git a/src/shell-stack.h b/src/shell-stack.h index 6f307694e..3d6b4f58e 100644 --- a/src/shell-stack.h +++ b/src/shell-stack.h @@ -1,10 +1,7 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_STACK_H__ -#define __SHELL_STACK_H__ +#pragma once #include "st.h" #define SHELL_TYPE_STACK (shell_stack_get_type ()) G_DECLARE_FINAL_TYPE (ShellStack, shell_stack, SHELL, STACK, StWidget) - -#endif /* __SHELL_STACK_H__ */ diff --git a/src/shell-tray-icon-private.h b/src/shell-tray-icon-private.h index e77ac0aae..19f03de3a 100644 --- a/src/shell-tray-icon-private.h +++ b/src/shell-tray-icon-private.h @@ -1,11 +1,8 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef SHELL_TRAY_ICON_PRIVATE_H -#define SHELL_TRAY_ICON_PRIVATE_H +#pragma once #include "shell-tray-icon.h" #include "na-tray-child.h" ClutterActor * shell_tray_icon_new (NaTrayChild *tray_child); - -#endif /* SHELL_TRAY_ICON_PRIVATE_H */ diff --git a/src/shell-tray-icon.h b/src/shell-tray-icon.h index 434bd3d12..29ecb2d8c 100644 --- a/src/shell-tray-icon.h +++ b/src/shell-tray-icon.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_TRAY_ICON_H__ -#define __SHELL_TRAY_ICON_H__ +#pragma once #include @@ -10,5 +9,3 @@ G_DECLARE_FINAL_TYPE (ShellTrayIcon, shell_tray_icon, void shell_tray_icon_click (ShellTrayIcon *icon, ClutterEvent *event); - -#endif /* __SHELL_TRAY_ICON_H__ */ diff --git a/src/shell-tray-manager.h b/src/shell-tray-manager.h index d6279d47c..2609e4a05 100644 --- a/src/shell-tray-manager.h +++ b/src/shell-tray-manager.h @@ -1,7 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_TRAY_MANAGER_H__ -#define __SHELL_TRAY_MANAGER_H__ +#pragma once #include #include "st.h" @@ -18,5 +17,3 @@ void shell_tray_manager_manage_screen (ShellTrayManager *manager, void shell_tray_manager_unmanage_screen (ShellTrayManager *manager); G_END_DECLS - -#endif /* __SHELL_TRAY_MANAGER_H__ */ diff --git a/src/shell-util.h b/src/shell-util.h index 8464fbc2b..81dd6da54 100644 --- a/src/shell-util.h +++ b/src/shell-util.h @@ -1,7 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_UTIL_H__ -#define __SHELL_UTIL_H__ +#pragma once #include #include @@ -120,5 +119,3 @@ GPid shell_util_spawn_async (const char *working_directory, GError **error); G_END_DECLS - -#endif /* __SHELL_UTIL_H__ */ diff --git a/src/shell-window-preview-layout.h b/src/shell-window-preview-layout.h index 9376b0da8..89eb574f3 100644 --- a/src/shell-window-preview-layout.h +++ b/src/shell-window-preview-layout.h @@ -1,5 +1,4 @@ -#ifndef __SHELL_WINDOW_PREVIEW_LAYOUT_H__ -#define __SHELL_WINDOW_PREVIEW_LAYOUT_H__ +#pragma once G_BEGIN_DECLS @@ -29,5 +28,3 @@ void shell_window_preview_layout_remove_window (ShellWindowPreviewLayout *self GList * shell_window_preview_layout_get_windows (ShellWindowPreviewLayout *self); G_END_DECLS - -#endif /* __SHELL_WINDOW_PREVIEW_LAYOUT_H__ */ diff --git a/src/shell-window-preview.h b/src/shell-window-preview.h index e50380018..53b705b40 100644 --- a/src/shell-window-preview.h +++ b/src/shell-window-preview.h @@ -1,5 +1,4 @@ -#ifndef __SHELL_WINDOW_PREVIEW_H__ -#define __SHELL_WINDOW_PREVIEW_H__ +#pragma once #include @@ -10,5 +9,3 @@ G_DECLARE_FINAL_TYPE (ShellWindowPreview, shell_window_preview, SHELL, WINDOW_PREVIEW, StWidget) G_END_DECLS - -#endif /* __SHELL_WINDOW_PREVIEW_H__ */ diff --git a/src/shell-window-tracker-private.h b/src/shell-window-tracker-private.h index 4307d153a..fd5bf8869 100644 --- a/src/shell-window-tracker-private.h +++ b/src/shell-window-tracker-private.h @@ -1,11 +1,8 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_WINDOW_TRACKER_PRIVATE_H__ -#define __SHELL_WINDOW_TRACKER_PRIVATE_H__ +#pragma once #include "shell-window-tracker.h" void _shell_window_tracker_add_child_process_app (ShellWindowTracker *tracker, GPid pid, ShellApp *app); - -#endif diff --git a/src/shell-window-tracker.h b/src/shell-window-tracker.h index 87c38f882..d9322ed80 100644 --- a/src/shell-window-tracker.h +++ b/src/shell-window-tracker.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_WINDOW_TRACKER_H__ -#define __SHELL_WINDOW_TRACKER_H__ +#pragma once #include #include @@ -25,5 +24,3 @@ ShellApp *shell_window_tracker_get_app_from_pid (ShellWindowTracker *tracker, in GSList *shell_window_tracker_get_startup_sequences (ShellWindowTracker *tracker); G_END_DECLS - -#endif /* __SHELL_WINDOW_TRACKER_H__ */ diff --git a/src/shell-wm-private.h b/src/shell-wm-private.h index 1db0ae1a1..72bc4aee4 100644 --- a/src/shell-wm-private.h +++ b/src/shell-wm-private.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_WM_PRIVATE_H__ -#define __SHELL_WM_PRIVATE_H__ +#pragma once #include "shell-wm.h" #include @@ -60,5 +59,3 @@ MetaInhibitShortcutsDialog * _shell_wm_create_inhibit_shortcuts_dialog (ShellWM MetaWindow *window); G_END_DECLS - -#endif /* __SHELL_WM_PRIVATE_H__ */ diff --git a/src/shell-wm.h b/src/shell-wm.h index ddfe0958a..519384dd4 100644 --- a/src/shell-wm.h +++ b/src/shell-wm.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __SHELL_WM_H__ -#define __SHELL_WM_H__ +#pragma once #include #include @@ -28,5 +27,3 @@ void shell_wm_complete_display_change (ShellWM *wm, gboolean ok); G_END_DECLS - -#endif /* __SHELL_WM_H__ */ diff --git a/src/shell-workspace-background.h b/src/shell-workspace-background.h index 48b2bd68f..441a1ab94 100644 --- a/src/shell-workspace-background.h +++ b/src/shell-workspace-background.h @@ -1,5 +1,4 @@ -#ifndef __SHELL_WORKSPACE_BACKGROUND_H__ -#define __SHELL_WORKSPACE_BACKGROUND_H__ +#pragma once #include @@ -10,5 +9,3 @@ G_DECLARE_FINAL_TYPE (ShellWorkspaceBackground, shell_workspace_background, SHELL, WORKSPACE_BACKGROUND, StWidget) G_END_DECLS - -#endif /* __SHELL_WORKSPACE_BACKGROUND_H__ */ diff --git a/src/st/croco/cr-additional-sel.h b/src/st/croco/cr-additional-sel.h index 7ca3e07d5..9aba9ecff 100644 --- a/src/st/croco/cr-additional-sel.h +++ b/src/st/croco/cr-additional-sel.h @@ -21,9 +21,7 @@ * See the COPYRIGHTS file for copyright information. */ - -#ifndef __CR_ADD_SEL_H__ -#define __CR_ADD_SEL_H__ +#pragma once #include #include @@ -94,5 +92,3 @@ void cr_additional_sel_dump (CRAdditionalSel const *a_this, FILE *a_fp) ; void cr_additional_sel_destroy (CRAdditionalSel *a_this) ; G_END_DECLS - -#endif /*__CR_ADD_SEL_H*/ diff --git a/src/st/croco/cr-attr-sel.h b/src/st/croco/cr-attr-sel.h index 82d5a87d7..7080b7b9b 100644 --- a/src/st/croco/cr-attr-sel.h +++ b/src/st/croco/cr-attr-sel.h @@ -21,8 +21,7 @@ * See COPYRIGHTS file for copyright information. */ -#ifndef __CR_ATTR_SEL_H__ -#define __CR_ATTR_SEL_H__ +#pragma once #include #include @@ -70,5 +69,3 @@ void cr_attr_sel_dump (CRAttrSel const *a_this, FILE *a_fp) ; void cr_attr_sel_destroy (CRAttrSel *a_this) ; G_END_DECLS - -#endif /*__CR_ATTR_SEL_H__*/ diff --git a/src/st/croco/cr-cascade.h b/src/st/croco/cr-cascade.h index 3119ae85f..6318043ae 100644 --- a/src/st/croco/cr-cascade.h +++ b/src/st/croco/cr-cascade.h @@ -25,8 +25,7 @@ *$Id$ */ -#ifndef __CR_CASCADE_H__ -#define __CR_CASCADE_H__ +#pragma once #include "cr-stylesheet.h" @@ -70,5 +69,3 @@ void cr_cascade_unref (CRCascade *a_this) ; void cr_cascade_destroy (CRCascade *a_this) ; G_END_DECLS - -#endif /*__CR_CASCADE_H__*/ diff --git a/src/st/croco/cr-declaration.h b/src/st/croco/cr-declaration.h index eee8be321..d8267cf17 100644 --- a/src/st/croco/cr-declaration.h +++ b/src/st/croco/cr-declaration.h @@ -20,8 +20,7 @@ * See the COPYRIGHTS file for copyright information. */ -#ifndef __CR_DECLARATION_H__ -#define __CR_DECLARATION_H__ +#pragma once #include #include "cr-utils.h" @@ -132,5 +131,3 @@ gboolean cr_declaration_unref (CRDeclaration *a_this) ; void cr_declaration_destroy (CRDeclaration *a_this) ; G_END_DECLS - -#endif /*__CR_DECLARATION_H__*/ diff --git a/src/st/croco/cr-doc-handler.h b/src/st/croco/cr-doc-handler.h index d12673f31..364364083 100644 --- a/src/st/croco/cr-doc-handler.h +++ b/src/st/croco/cr-doc-handler.h @@ -20,8 +20,7 @@ * See the COPYRIGHTS file for copyright information. */ -#ifndef __CR_DOC_HANDLER_H__ -#define __CR_DOC_HANDLER_H__ +#pragma once /** *@file @@ -294,5 +293,3 @@ gboolean cr_doc_handler_unref (CRDocHandler *a_this) ; void cr_doc_handler_destroy (CRDocHandler *a_this) ; G_END_DECLS - -#endif /*__CR_DOC_HANDLER_H__*/ diff --git a/src/st/croco/cr-enc-handler.h b/src/st/croco/cr-enc-handler.h index 0727764c0..382e4371f 100644 --- a/src/st/croco/cr-enc-handler.h +++ b/src/st/croco/cr-enc-handler.h @@ -30,8 +30,7 @@ * */ -#ifndef __CR_ENC_HANDLER_H__ -#define __CR_ENC_HANDLER_H__ +#pragma once #include "cr-utils.h" @@ -90,5 +89,3 @@ cr_enc_handler_convert_input (CREncHandler *a_this, gulong *a_out_len) ; G_END_DECLS - -#endif /*__CR_ENC_HANDLER_H__*/ diff --git a/src/st/croco/cr-fonts.h b/src/st/croco/cr-fonts.h index 9eaeeeb98..39241c3df 100644 --- a/src/st/croco/cr-fonts.h +++ b/src/st/croco/cr-fonts.h @@ -23,8 +23,7 @@ * See COPYRIGHTS file for copyright information. */ -#ifndef __CR_FONTS_H__ -#define __CR_FONTS_H__ +#pragma once #include "cr-utils.h" #include "cr-num.h" @@ -311,5 +310,3 @@ const gchar * cr_font_variant_to_string (enum CRFontVariant a_code) ; const gchar * cr_font_stretch_to_string (enum CRFontStretch a_code) ; G_END_DECLS - -#endif diff --git a/src/st/croco/cr-input.h b/src/st/croco/cr-input.h index 9eb402a87..afc865633 100644 --- a/src/st/croco/cr-input.h +++ b/src/st/croco/cr-input.h @@ -21,8 +21,7 @@ * See the COPYRIGHTS file for copyrights information. */ -#ifndef __CR_INPUT_SRC_H__ -#define __CR_INPUT_SRC_H__ +#pragma once #include @@ -169,6 +168,3 @@ enum CRStatus cr_input_end_of_input (CRInput const *a_this, gboolean *a_end_of_input) ; G_END_DECLS - -#endif /*__CR_INPUT_SRC_H__*/ - diff --git a/src/st/croco/cr-num.h b/src/st/croco/cr-num.h index 2b73aaf79..8353be783 100644 --- a/src/st/croco/cr-num.h +++ b/src/st/croco/cr-num.h @@ -28,8 +28,7 @@ *of the #CRNum class. */ -#ifndef __CR_NUM_H__ -#define __CR_NUM_H__ +#pragma once #include #include "cr-utils.h" @@ -122,6 +121,3 @@ cr_num_destroy (CRNum *a_this) ; G_END_DECLS - - -#endif /*__CR_NUM_H__*/ diff --git a/src/st/croco/cr-om-parser.h b/src/st/croco/cr-om-parser.h index 13d35b1cd..4204565ee 100644 --- a/src/st/croco/cr-om-parser.h +++ b/src/st/croco/cr-om-parser.h @@ -25,8 +25,7 @@ *$Id$ */ -#ifndef __CR_OM_PARSER_H__ -#define __CR_OM_PARSER_H__ +#pragma once #include "cr-parser.h" #include "cr-cascade.h" @@ -94,5 +93,3 @@ enum CRStatus cr_om_parser_simply_parse_paths_to_cascade (const guchar *a_author void cr_om_parser_destroy (CROMParser *a_this) ; G_END_DECLS - -#endif /*__CR_OM_PARSER_H__*/ diff --git a/src/st/croco/cr-parser.h b/src/st/croco/cr-parser.h index 6dce9439e..ae7a9e2f8 100644 --- a/src/st/croco/cr-parser.h +++ b/src/st/croco/cr-parser.h @@ -21,8 +21,7 @@ * See COPYRIGHTS file for copyrights information. */ -#ifndef __CR_PARSER_H__ -#define __CR_PARSER_H__ +#pragma once #include #include "cr-input.h" @@ -124,5 +123,3 @@ enum CRStatus cr_parser_parse_font_face (CRParser *a_this) ; void cr_parser_destroy (CRParser *a_this) ; G_END_DECLS - -#endif /*__CR_PARSER_H__*/ diff --git a/src/st/croco/cr-parsing-location.h b/src/st/croco/cr-parsing-location.h index b8064a560..09bcd800e 100644 --- a/src/st/croco/cr-parsing-location.h +++ b/src/st/croco/cr-parsing-location.h @@ -21,8 +21,7 @@ * See the COPYRIGHTS file for copyright information. */ -#ifndef __CR_PARSING_LOCATION_H__ -#define __CR_PARSING_LOCATION_H__ +#pragma once #include "cr-utils.h" @@ -66,5 +65,4 @@ void cr_parsing_location_destroy (CRParsingLocation *a_this) ; -G_END_DECLS -#endif +G_END_DECLS \ No newline at end of file diff --git a/src/st/croco/cr-prop-list.h b/src/st/croco/cr-prop-list.h index 797ba43ea..5b3ad2215 100644 --- a/src/st/croco/cr-prop-list.h +++ b/src/st/croco/cr-prop-list.h @@ -19,8 +19,7 @@ * See COPYRIGHTS file for copyrights information. */ -#ifndef __CR_PROP_LIST_H__ -#define __CR_PROP_LIST_H__ +#pragma once #include "cr-utils.h" #include "cr-declaration.h" @@ -76,5 +75,3 @@ CRPropList * cr_prop_list_unlink (CRPropList *a_this, void cr_prop_list_destroy (CRPropList *a_this) ; G_END_DECLS - -#endif /*__CR_PROP_LIST_H__*/ diff --git a/src/st/croco/cr-pseudo.h b/src/st/croco/cr-pseudo.h index 8917da45e..3812d34f9 100644 --- a/src/st/croco/cr-pseudo.h +++ b/src/st/croco/cr-pseudo.h @@ -20,8 +20,7 @@ * See COPYRIGHTS file for copyright information */ -#ifndef __CR_PSEUDO_H__ -#define __CR_PSEUDO_H__ +#pragma once #include #include @@ -60,5 +59,3 @@ void cr_pseudo_dump (CRPseudo const *a_this, FILE *a_fp) ; void cr_pseudo_destroy (CRPseudo *a_this) ; G_END_DECLS - -#endif /*__CR_PSEUDO_H__*/ diff --git a/src/st/croco/cr-rgb.h b/src/st/croco/cr-rgb.h index a77e30992..8bda8b916 100644 --- a/src/st/croco/cr-rgb.h +++ b/src/st/croco/cr-rgb.h @@ -20,8 +20,7 @@ * see COPYRIGHTS file for copyright information. */ -#ifndef __CR_RGB_H__ -#define __CR_RGB_H__ +#pragma once #include #include @@ -80,5 +79,3 @@ void cr_rgb_dump (CRRgb const *a_this, FILE *a_fp) ; void cr_rgb_destroy (CRRgb *a_this) ; G_END_DECLS - -#endif /*__CR_RGB_H__*/ diff --git a/src/st/croco/cr-selector.h b/src/st/croco/cr-selector.h index 0731e1b80..3dcc21b85 100644 --- a/src/st/croco/cr-selector.h +++ b/src/st/croco/cr-selector.h @@ -22,8 +22,7 @@ * See COPYRIGHTS file for copyright information. */ -#ifndef __CR_SELECTOR_H__ -#define __CR_SELECTOR_H__ +#pragma once #include #include "cr-utils.h" @@ -88,5 +87,3 @@ gboolean cr_selector_unref (CRSelector *a_this) ; void cr_selector_destroy (CRSelector *a_this) ; G_END_DECLS - -#endif /*__CR_SELECTOR_H__*/ diff --git a/src/st/croco/cr-simple-sel.h b/src/st/croco/cr-simple-sel.h index 72b15fd1f..691b4d943 100644 --- a/src/st/croco/cr-simple-sel.h +++ b/src/st/croco/cr-simple-sel.h @@ -22,8 +22,7 @@ */ -#ifndef __CR_SEL_H__ -#define __CR_SEL_H__ +#pragma once #include #include @@ -125,6 +124,3 @@ enum CRStatus cr_simple_sel_compute_specificity (CRSimpleSel *a_this) ; void cr_simple_sel_destroy (CRSimpleSel *a_this) ; G_END_DECLS - - -#endif /*__CR_SIMPLE_SEL_H__*/ diff --git a/src/st/croco/cr-statement.h b/src/st/croco/cr-statement.h index c5bec977f..58fe6a367 100644 --- a/src/st/croco/cr-statement.h +++ b/src/st/croco/cr-statement.h @@ -27,8 +27,7 @@ #include "cr-selector.h" #include "cr-declaration.h" -#ifndef __CR_STATEMENT_H__ -#define __CR_STATEMENT_H__ +#pragma once G_BEGIN_DECLS @@ -436,5 +435,3 @@ void cr_statement_destroy (CRStatement *a_this) ; G_END_DECLS - -#endif /*__CR_STATEMENT_H__*/ diff --git a/src/st/croco/cr-string.h b/src/st/croco/cr-string.h index 2700f0e2e..4c6ab0b00 100644 --- a/src/st/croco/cr-string.h +++ b/src/st/croco/cr-string.h @@ -25,8 +25,7 @@ *Declaration file of the #CRString class. */ -#ifndef __CR_STRING_H__ -#define __CR_STRING_H__ +#pragma once #include #include "cr-utils.h" @@ -72,5 +71,3 @@ gint cr_string_peek_raw_str_len (CRString const *a_this) ; void cr_string_destroy (CRString *a_this) ; G_END_DECLS - -#endif diff --git a/src/st/croco/cr-stylesheet.h b/src/st/croco/cr-stylesheet.h index 2d6b4fa0f..47d8761af 100644 --- a/src/st/croco/cr-stylesheet.h +++ b/src/st/croco/cr-stylesheet.h @@ -21,8 +21,7 @@ */ -#ifndef __CR_STYLESHEET_H__ -#define __CR_STYLESHEET_H__ +#pragma once #include "cr-utils.h" #include "cr-statement.h" @@ -98,5 +97,3 @@ gboolean cr_stylesheet_unref (CRStyleSheet *a_this) ; void cr_stylesheet_destroy (CRStyleSheet *a_this) ; G_END_DECLS - -#endif /*__CR_STYLESHEET_H__*/ diff --git a/src/st/croco/cr-term.h b/src/st/croco/cr-term.h index 0f22dda75..32d1b35ff 100644 --- a/src/st/croco/cr-term.h +++ b/src/st/croco/cr-term.h @@ -28,8 +28,7 @@ #include "cr-num.h" #include "cr-string.h" -#ifndef __CR_TERM_H__ -#define __CR_TERM_H__ +#pragma once G_BEGIN_DECLS @@ -186,5 +185,3 @@ gboolean cr_term_unref (CRTerm *a_this) ; void cr_term_destroy (CRTerm * a_term) ; G_END_DECLS - -#endif /*__CR_TERM_H__*/ diff --git a/src/st/croco/cr-tknzr.h b/src/st/croco/cr-tknzr.h index 13985b30e..666c8f034 100644 --- a/src/st/croco/cr-tknzr.h +++ b/src/st/croco/cr-tknzr.h @@ -27,8 +27,7 @@ *class. */ -#ifndef __CR_TKNZR_H__ -#define __CR_TKNZR_H__ +#pragma once #include "cr-utils.h" #include "cr-input.h" @@ -111,5 +110,3 @@ enum CRStatus cr_tknzr_get_input (CRTknzr *a_this, CRInput **a_input) ; void cr_tknzr_destroy (CRTknzr *a_this) ; G_END_DECLS - -#endif /*__CR_TKZNR_H__*/ diff --git a/src/st/croco/cr-token.h b/src/st/croco/cr-token.h index f1257b7a8..76eb62d98 100644 --- a/src/st/croco/cr-token.h +++ b/src/st/croco/cr-token.h @@ -21,8 +21,7 @@ * See COPYRIGHTS file for copyright information. */ -#ifndef __CR_TOKEN_H__ -#define __CR_TOKEN_H__ +#pragma once #include "cr-utils.h" #include "cr-input.h" @@ -208,5 +207,3 @@ cr_token_destroy (CRToken *a_this) ; G_END_DECLS - -#endif /*__CR_TOKEN_H__*/ diff --git a/src/st/croco/cr-utils.h b/src/st/croco/cr-utils.h index 54aa24973..e57e35c92 100644 --- a/src/st/croco/cr-utils.h +++ b/src/st/croco/cr-utils.h @@ -21,8 +21,7 @@ * Look at file COPYRIGHTS for copyright information */ -#ifndef __CR_DEFS_H__ -#define __CR_DEFS_H__ +#pragma once #include #include @@ -242,5 +241,3 @@ GList * cr_utils_dup_glist_of_cr_string (GList const * a_list_of_strings) ; G_END_DECLS - -#endif /*__CR_DEFS_H__*/ diff --git a/src/st/croco/libcroco.h b/src/st/croco/libcroco.h index 6187a7cb9..1c644b36e 100644 --- a/src/st/croco/libcroco.h +++ b/src/st/croco/libcroco.h @@ -18,8 +18,7 @@ * USA */ -#ifndef __LIBCROCO_H__ -#define __LIBCROCO_H__ +#pragma once #include "libcroco-config.h" @@ -38,5 +37,3 @@ #include "cr-om-parser.h" #include "cr-prop-list.h" #include "cr-string.h" - -#endif /*__LIBCROCO_H__*/ diff --git a/src/st/st-adjustment.h b/src/st/st-adjustment.h index 08a0fc30a..68e7a330b 100644 --- a/src/st/st-adjustment.h +++ b/src/st/st-adjustment.h @@ -22,8 +22,7 @@ #error "Only can be included directly.h" #endif -#ifndef __ST_ADJUSTMENT_H__ -#define __ST_ADJUSTMENT_H__ +#pragma once #include #include @@ -88,5 +87,3 @@ void st_adjustment_remove_transition (StAdjustment *adjustme const char *name); G_END_DECLS - -#endif /* __ST_ADJUSTMENT_H__ */ diff --git a/src/st/st-bin.h b/src/st/st-bin.h index 7784f45b3..8316ac075 100644 --- a/src/st/st-bin.h +++ b/src/st/st-bin.h @@ -21,8 +21,7 @@ #error "Only can be included directly.h" #endif -#ifndef __ST_BIN_H__ -#define __ST_BIN_H__ +#pragma once #include #include @@ -49,5 +48,3 @@ void st_bin_set_child (StBin *bin, ClutterActor *st_bin_get_child (StBin *bin); G_END_DECLS - -#endif /* __ST_BIN_H__ */ diff --git a/src/st/st-border-image.h b/src/st/st-border-image.h index 9c581522f..005695f99 100644 --- a/src/st/st-border-image.h +++ b/src/st/st-border-image.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __ST_BORDER_IMAGE_H__ -#define __ST_BORDER_IMAGE_H__ +#pragma once #include #include @@ -50,5 +49,3 @@ gboolean st_border_image_equal (StBorderImage *image, StBorderImage *other); G_END_DECLS - -#endif /* __ST_BORDER_IMAGE_H__ */ diff --git a/src/st/st-box-layout.h b/src/st/st-box-layout.h index 82f5a7045..f268d8027 100644 --- a/src/st/st-box-layout.h +++ b/src/st/st-box-layout.h @@ -22,8 +22,7 @@ #error "Only can be included directly.h" #endif -#ifndef _ST_BOX_LAYOUT_H -#define _ST_BOX_LAYOUT_H +#pragma once #include #include @@ -61,5 +60,3 @@ void st_box_layout_set_pack_start (StBoxLayout *box, gboolean st_box_layout_get_pack_start (StBoxLayout *box); G_END_DECLS - -#endif /* _ST_BOX_LAYOUT_H */ diff --git a/src/st/st-button.h b/src/st/st-button.h index 3f7dbb000..74aa391e4 100644 --- a/src/st/st-button.h +++ b/src/st/st-button.h @@ -22,8 +22,7 @@ #error "Only can be included directly.h" #endif -#ifndef __ST_BUTTON_H__ -#define __ST_BUTTON_H__ +#pragma once G_BEGIN_DECLS @@ -81,5 +80,3 @@ void st_button_set_button_mask (StButton *button, StButtonMask st_button_get_button_mask (StButton *button); G_END_DECLS - -#endif /* __ST_BUTTON_H__ */ diff --git a/src/st/st-clipboard.h b/src/st/st-clipboard.h index 022b8323d..67d2e2b14 100644 --- a/src/st/st-clipboard.h +++ b/src/st/st-clipboard.h @@ -21,8 +21,7 @@ #error "Only can be included directly.h" #endif -#ifndef _ST_CLIPBOARD_H -#define _ST_CLIPBOARD_H +#pragma once #include #include @@ -101,5 +100,3 @@ void st_clipboard_get_content (StClipboard *clipboard, void st_clipboard_set_selection (MetaSelection *selection); G_END_DECLS - -#endif /* _ST_CLIPBOARD_H */ diff --git a/src/st/st-drawing-area.h b/src/st/st-drawing-area.h index e09f9c5b2..fa5adccbe 100644 --- a/src/st/st-drawing-area.h +++ b/src/st/st-drawing-area.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __ST_DRAWING_AREA_H__ -#define __ST_DRAWING_AREA_H__ +#pragma once #include "st-widget.h" #include @@ -40,5 +39,3 @@ cairo_t *st_drawing_area_get_context (StDrawingArea *area); void st_drawing_area_get_surface_size (StDrawingArea *area, guint *width, guint *height); - -#endif /* __ST_DRAWING_AREA_H__ */ diff --git a/src/st/st-entry.h b/src/st/st-entry.h index 2a05759d5..b0958bbab 100644 --- a/src/st/st-entry.h +++ b/src/st/st-entry.h @@ -21,8 +21,7 @@ #error "Only can be included directly.h" #endif -#ifndef __ST_ENTRY_H__ -#define __ST_ENTRY_H__ +#pragma once G_BEGIN_DECLS @@ -76,4 +75,3 @@ void st_entry_set_cursor_func (StEntryCursorFunc func, G_END_DECLS -#endif /* __ST_ENTRY_H__ */ diff --git a/src/st/st-focus-manager.h b/src/st/st-focus-manager.h index ba8442b56..36ec8e0a7 100644 --- a/src/st/st-focus-manager.h +++ b/src/st/st-focus-manager.h @@ -22,8 +22,7 @@ #error "Only can be included directly.h" #endif -#ifndef __ST_FOCUS_MANAGER_H__ -#define __ST_FOCUS_MANAGER_H__ +#pragma once #include #include @@ -61,5 +60,3 @@ gboolean st_focus_manager_navigate_from_event (StFocusManager *manager, ClutterEvent *event); G_END_DECLS - -#endif /* __ST_FOCUS_MANAGER_H__ */ diff --git a/src/st/st-generic-accessible.h b/src/st/st-generic-accessible.h index 99a6a7147..b180c05fb 100644 --- a/src/st/st-generic-accessible.h +++ b/src/st/st-generic-accessible.h @@ -21,8 +21,7 @@ #error "Only can be included directly.h" #endif -#ifndef __ST_GENERIC_ACCESSIBLE_H__ -#define __ST_GENERIC_ACCESSIBLE_H__ +#pragma once #include #include @@ -58,5 +57,3 @@ GType st_generic_accessible_get_type (void) G_GNUC_CONST; AtkObject* st_generic_accessible_new_for_actor (ClutterActor *actor); G_END_DECLS - -#endif /* __ST_GENERIC_ACCESSIBLE_H__ */ diff --git a/src/st/st-icon-cache.h b/src/st/st-icon-cache.h index 7bb5cf4dc..9d5e14eb4 100644 --- a/src/st/st-icon-cache.h +++ b/src/st/st-icon-cache.h @@ -14,8 +14,7 @@ * You should have received a copy of the GNU Library General Public * License along with this library. If not, see . */ -#ifndef __ST_ICON_CACHE_H__ -#define __ST_ICON_CACHE_H__ +#pragma once #include @@ -45,5 +44,3 @@ GdkPixbuf * st_icon_cache_get_icon (StIconCache *cache, StIconCache *st_icon_cache_ref (StIconCache *cache); void st_icon_cache_unref (StIconCache *cache); - -#endif /* __ST_ICON_CACHE_H__ */ diff --git a/src/st/st-icon-colors.h b/src/st/st-icon-colors.h index 36e1e677f..f1cd4e84c 100644 --- a/src/st/st-icon-colors.h +++ b/src/st/st-icon-colors.h @@ -1,6 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -#ifndef __ST_ICON_COLORS__ -#define __ST_ICON_COLORS__ +#pragma once #include @@ -37,5 +36,3 @@ gboolean st_icon_colors_equal (StIconColors *colors, StIconColors *other); G_END_DECLS - -#endif /* __ST_ICON_COLORS__ */ diff --git a/src/st/st-icon.h b/src/st/st-icon.h index 2b27ec8af..f80c5b4cc 100644 --- a/src/st/st-icon.h +++ b/src/st/st-icon.h @@ -25,8 +25,7 @@ #error "Only can be included directly.h" #endif -#ifndef _ST_ICON -#define _ST_ICON +#pragma once #include #include @@ -80,5 +79,3 @@ gboolean st_icon_get_is_symbolic (StIcon *icon); G_END_DECLS -#endif /* _ST_ICON */ - diff --git a/src/st/st-image-content.h b/src/st/st-image-content.h index 0ebb0b74f..84b594e1b 100644 --- a/src/st/st-image-content.h +++ b/src/st/st-image-content.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __ST_IMAGE_CONTENT_H__ -#define __ST_IMAGE_CONTENT_H__ +#pragma once #include @@ -29,5 +28,3 @@ G_DECLARE_FINAL_TYPE (StImageContent, st_image_content, ClutterContent *st_image_content_new_with_preferred_size (int width, int height); - -#endif /* __ST_IMAGE_CONTENT_H__ */ diff --git a/src/st/st-label.h b/src/st/st-label.h index 456ad3144..504a78a13 100644 --- a/src/st/st-label.h +++ b/src/st/st-label.h @@ -21,8 +21,7 @@ #error "Only can be included directly.h" #endif -#ifndef __ST_LABEL_H__ -#define __ST_LABEL_H__ +#pragma once G_BEGIN_DECLS @@ -55,4 +54,3 @@ ClutterActor * st_label_get_clutter_text (StLabel *label); G_END_DECLS -#endif /* __ST_LABEL_H__ */ diff --git a/src/st/st-password-entry.h b/src/st/st-password-entry.h index 399806808..38cccadec 100644 --- a/src/st/st-password-entry.h +++ b/src/st/st-password-entry.h @@ -21,8 +21,7 @@ #error "Only can be included directly.h" #endif -#ifndef __ST_PASSWORD_ENTRY_H__ -#define __ST_PASSWORD_ENTRY_H__ +#pragma once G_BEGIN_DECLS @@ -41,6 +40,3 @@ void st_password_entry_set_show_peek_icon (StPasswordEntr gboolean value); G_END_DECLS - -#endif /* __ST_PASSWORD_ENTRY_H__ */ - diff --git a/src/st/st-private.h b/src/st/st-private.h index 2ed84a257..214105a44 100644 --- a/src/st/st-private.h +++ b/src/st/st-private.h @@ -20,8 +20,7 @@ * along with this program. If not, see . */ -#ifndef __ST_PRIVATE_H__ -#define __ST_PRIVATE_H__ +#pragma once #include #include @@ -73,5 +72,3 @@ void _st_paint_shadow_with_opacity (StShadow *shadow_spec, CoglPipeline *shadow_pipeline, ClutterActorBox *box, guint8 paint_opacity); - -#endif /* __ST_PRIVATE_H__ */ diff --git a/src/st/st-scroll-bar.h b/src/st/st-scroll-bar.h index 2c69fdd2a..6360c5afe 100644 --- a/src/st/st-scroll-bar.h +++ b/src/st/st-scroll-bar.h @@ -22,8 +22,7 @@ #error "Only can be included directly.h" #endif -#ifndef __ST_SCROLL_BAR_H__ -#define __ST_SCROLL_BAR_H__ +#pragma once #include #include @@ -49,5 +48,3 @@ void st_scroll_bar_set_adjustment (StScrollBar *bar, StAdjustment *st_scroll_bar_get_adjustment (StScrollBar *bar); G_END_DECLS - -#endif /* __ST_SCROLL_BAR_H__ */ diff --git a/src/st/st-scroll-view-fade.h b/src/st/st-scroll-view-fade.h index 2c65a7763..92d5c2450 100644 --- a/src/st/st-scroll-view-fade.h +++ b/src/st/st-scroll-view-fade.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __ST_SCROLL_VIEW_FADE_H__ -#define __ST_SCROLL_VIEW_FADE_H__ +#pragma once #include @@ -32,5 +31,3 @@ G_DECLARE_FINAL_TYPE (StScrollViewFade, st_scroll_view_fade, ClutterEffect *st_scroll_view_fade_new (void); G_END_DECLS - -#endif /* __ST_SCROLL_VIEW_FADE_H__ */ diff --git a/src/st/st-scrollable.h b/src/st/st-scrollable.h index 797ec7db0..25fcabf2e 100644 --- a/src/st/st-scrollable.h +++ b/src/st/st-scrollable.h @@ -22,8 +22,7 @@ #error "Only can be included directly.h" #endif -#ifndef __ST_SCROLLABLE_H__ -#define __ST_SCROLLABLE_H__ +#pragma once #include #include @@ -55,5 +54,3 @@ void st_scrollable_get_adjustments (StScrollable *scrollable, StAdjustment **vadjustment); G_END_DECLS - -#endif /* __ST_SCROLLABLE_H__ */ diff --git a/src/st/st-settings.h b/src/st/st-settings.h index 272a4ad39..c871c4884 100644 --- a/src/st/st-settings.h +++ b/src/st/st-settings.h @@ -21,8 +21,7 @@ #error "Only can be included directly.h" #endif -#ifndef __ST_SETTINGS_H__ -#define __ST_SETTINGS_H__ +#pragma once #include #include @@ -57,5 +56,3 @@ void st_settings_inhibit_animations (StSettings *settings); void st_settings_uninhibit_animations (StSettings *settings); G_END_DECLS - -#endif /* __ST_SETTINGS_H__ */ diff --git a/src/st/st-shadow.h b/src/st/st-shadow.h index e201b6e06..5075bf2ac 100644 --- a/src/st/st-shadow.h +++ b/src/st/st-shadow.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __ST_SHADOW__ -#define __ST_SHADOW__ +#pragma once #include @@ -91,5 +90,3 @@ void st_shadow_helper_paint (StShadowHelper *helper, uint8_t paint_opacity); G_END_DECLS - -#endif /* __ST_SHADOW__ */ diff --git a/src/st/st-texture-cache.h b/src/st/st-texture-cache.h index 1c5be957c..3b5702bed 100644 --- a/src/st/st-texture-cache.h +++ b/src/st/st-texture-cache.h @@ -19,8 +19,7 @@ * along with this program. If not, see . */ -#ifndef __ST_TEXTURE_CACHE_H__ -#define __ST_TEXTURE_CACHE_H__ +#pragma once #if !defined(ST_H_INSIDE) && !defined(ST_COMPILATION) #error "Only can be included directly.h" @@ -112,5 +111,3 @@ CoglTexture * st_texture_cache_load (StTextureCache *cache, GError **error); gboolean st_texture_cache_rescan_icon_theme (StTextureCache *cache); - -#endif /* __ST_TEXTURE_CACHE_H__ */ diff --git a/src/st/st-theme-context.h b/src/st/st-theme-context.h index 3e4709e4c..96bbd76a3 100644 --- a/src/st/st-theme-context.h +++ b/src/st/st-theme-context.h @@ -19,8 +19,7 @@ * along with this program. If not, see . */ -#ifndef __ST_THEME_CONTEXT_H__ -#define __ST_THEME_CONTEXT_H__ +#pragma once #include #include @@ -65,5 +64,3 @@ StThemeNode * st_theme_context_intern_node (StThemeContext int st_theme_context_get_scale_factor (StThemeContext *context); G_END_DECLS - -#endif /* __ST_THEME_CONTEXT_H__ */ diff --git a/src/st/st-theme-node-private.h b/src/st/st-theme-node-private.h index 9a910089c..d95284e20 100644 --- a/src/st/st-theme-node-private.h +++ b/src/st/st-theme-node-private.h @@ -19,8 +19,7 @@ * along with this program. If not, see . */ -#ifndef __ST_THEME_NODE_PRIVATE_H__ -#define __ST_THEME_NODE_PRIVATE_H__ +#pragma once #include "st-theme-node.h" #include "croco/libcroco.h" @@ -124,5 +123,3 @@ void _st_theme_node_apply_margins (StThemeNode *node, ClutterActor *actor); G_END_DECLS - -#endif /* __ST_THEME_NODE_PRIVATE_H__ */ diff --git a/src/st/st-theme-node-transition.h b/src/st/st-theme-node-transition.h index 6a468f663..fe79f1283 100644 --- a/src/st/st-theme-node-transition.h +++ b/src/st/st-theme-node-transition.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __ST_THEME_NODE_TRANSITION_H__ -#define __ST_THEME_NODE_TRANSITION_H__ +#pragma once #include @@ -55,5 +54,3 @@ void st_theme_node_transition_get_paint_box (StThemeNodeTransition *transition, StThemeNodePaintState * st_theme_node_transition_get_new_paint_state (StThemeNodeTransition *transition); G_END_DECLS - -#endif diff --git a/src/st/st-theme-node.h b/src/st/st-theme-node.h index df923d7b5..c34fac133 100644 --- a/src/st/st-theme-node.h +++ b/src/st/st-theme-node.h @@ -20,8 +20,7 @@ * along with this program. If not, see . */ -#ifndef __ST_THEME_NODE_H__ -#define __ST_THEME_NODE_H__ +#pragma once #include #include "st-border-image.h" @@ -365,5 +364,3 @@ void st_theme_node_paint_state_set_node (StThemeNodePaintState *state, StThemeNode *node); G_END_DECLS - -#endif /* __ST_THEME_NODE_H__ */ diff --git a/src/st/st-theme-private.h b/src/st/st-theme-private.h index 2083a7c84..771236fd5 100644 --- a/src/st/st-theme-private.h +++ b/src/st/st-theme-private.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __ST_THEME_PRIVATE_H__ -#define __ST_THEME_PRIVATE_H__ +#pragma once #include "croco/libcroco.h" #include "st-theme.h" @@ -37,5 +36,3 @@ GFile *_st_theme_resolve_url (StTheme *theme, CRDeclaration *_st_theme_parse_declaration_list (const char *str); G_END_DECLS - -#endif /* __ST_THEME_PRIVATE_H__ */ diff --git a/src/st/st-theme.h b/src/st/st-theme.h index d3f242c2d..af595db0b 100644 --- a/src/st/st-theme.h +++ b/src/st/st-theme.h @@ -17,8 +17,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ -#ifndef __ST_THEME_H__ -#define __ST_THEME_H__ +#pragma once #include @@ -47,5 +46,3 @@ void st_theme_unload_stylesheet (StTheme *theme, GFile *file); GSList *st_theme_get_custom_stylesheets (StTheme *theme); G_END_DECLS - -#endif /* __ST_THEME_H__ */ diff --git a/src/st/st-types.h b/src/st/st-types.h index 5f5ee2dfd..52731978e 100644 --- a/src/st/st-types.h +++ b/src/st/st-types.h @@ -14,13 +14,13 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . */ -#ifndef __ST_TYPES_H__ -#define __ST_TYPES_H__ #if !defined(ST_H_INSIDE) && !defined(ST_COMPILATION) #error "Only can be included directly.h" #endif +#pragma once + #include #include @@ -41,5 +41,3 @@ typedef enum { } StBackgroundSize; G_END_DECLS - -#endif /* __ST_TYPES_H__ */ diff --git a/src/st/st-widget-accessible.h b/src/st/st-widget-accessible.h index ad1e62bbb..e3d00187c 100644 --- a/src/st/st-widget-accessible.h +++ b/src/st/st-widget-accessible.h @@ -22,8 +22,7 @@ #error "Only can be included directly.h" #endif -#ifndef __ST_WIDGET_ACCESSIBLE_H__ -#define __ST_WIDGET_ACCESSIBLE_H__ +#pragma once G_BEGIN_DECLS @@ -72,5 +71,3 @@ struct _StWidgetAccessibleClass GType st_widget_accessible_get_type (void) G_GNUC_CONST; G_END_DECLS - -#endif /* __ST_WIDGET_ACCESSIBLE_H__ */ diff --git a/src/st/st-widget.h b/src/st/st-widget.h index a1d575cb1..2d9f14642 100644 --- a/src/st/st-widget.h +++ b/src/st/st-widget.h @@ -25,8 +25,7 @@ #error "Only can be included directly.h" #endif -#ifndef __ST_WIDGET_H__ -#define __ST_WIDGET_H__ +#pragma once #include #include @@ -154,5 +153,3 @@ void st_widget_add_accessible_state (StWidget *widget, void st_widget_remove_accessible_state (StWidget *widget, AtkStateType state); G_END_DECLS - -#endif /* __ST_WIDGET_H__ */ diff --git a/src/tray/na-tray-child.h b/src/tray/na-tray-child.h index 7ff8a8d1d..8d76e78ef 100644 --- a/src/tray/na-tray-child.h +++ b/src/tray/na-tray-child.h @@ -18,8 +18,7 @@ * License along with this library; if not, see . */ -#ifndef __NA_TRAY_CHILD_H__ -#define __NA_TRAY_CHILD_H__ +#pragma once #include "na-xembed.h" @@ -41,5 +40,3 @@ void na_tray_child_emulate_event (NaTrayChild *tray_child, ClutterEvent *event); G_END_DECLS - -#endif /* __NA_TRAY_CHILD_H__ */ diff --git a/src/tray/na-tray-manager.h b/src/tray/na-tray-manager.h index de3eae2c4..e5d06c2b1 100644 --- a/src/tray/na-tray-manager.h +++ b/src/tray/na-tray-manager.h @@ -19,8 +19,7 @@ * Used to be: eggtraymanager.h */ -#ifndef __NA_TRAY_MANAGER_H__ -#define __NA_TRAY_MANAGER_H__ +#pragma once #include @@ -42,5 +41,3 @@ void na_tray_manager_set_colors (NaTrayManager *manager, CoglColor *success); G_END_DECLS - -#endif /* __NA_TRAY_MANAGER_H__ */ diff --git a/src/tray/na-xembed.h b/src/tray/na-xembed.h index f6b9bc0f4..4466305aa 100644 --- a/src/tray/na-xembed.h +++ b/src/tray/na-xembed.h @@ -18,8 +18,7 @@ * Author: Carlos Garnacho */ -#ifndef NA_XEMBED_H -#define NA_XEMBED_H +#pragma once #include #include @@ -62,6 +61,4 @@ void na_xembed_get_size (NaXembed *xembed, void na_xembed_set_background_color (NaXembed *xembed, const CoglColor *color); -G_END_DECLS - -#endif /* NA_XEMBED_H */ +G_END_DECLS \ No newline at end of file