diff --git a/demos/gtk-demo/bluroverlay.h b/demos/gtk-demo/bluroverlay.h index 0bae08401b..70f1c55c65 100644 --- a/demos/gtk-demo/bluroverlay.h +++ b/demos/gtk-demo/bluroverlay.h @@ -18,8 +18,7 @@ * License along with this library. If not, see . */ -#ifndef __BLUR_OVERLAY_H__ -#define __BLUR_OVERLAY_H__ +#pragma once #include @@ -60,5 +59,3 @@ void blur_overlay_set_child (BlurOverlay *overlay, GtkWidget *widget); G_END_DECLS - -#endif /* __BLUR_OVERLAY_H__ */ diff --git a/demos/gtk-demo/demotaggedentry.h b/demos/gtk-demo/demotaggedentry.h index 9724fa58d4..e733179987 100644 --- a/demos/gtk-demo/demotaggedentry.h +++ b/demos/gtk-demo/demotaggedentry.h @@ -18,8 +18,7 @@ * License along with this library. If not, see . */ -#ifndef __DEMO_TAGGED_ENTRY_H__ -#define __DEMO_TAGGED_ENTRY_H__ +#pragma once #include @@ -57,5 +56,3 @@ void demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag * gboolean has_close_button); G_END_DECLS - -#endif /* __DEMO_TAGGED_ENTRY_H__ */ diff --git a/demos/gtk-demo/fontplane.h b/demos/gtk-demo/fontplane.h index 73b310a917..94187db744 100644 --- a/demos/gtk-demo/fontplane.h +++ b/demos/gtk-demo/fontplane.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef __GTK_FONT_PLANE_H__ -#define __GTK_FONT_PLANE_H__ +#pragma once #include @@ -60,5 +59,3 @@ GtkWidget * gtk_font_plane_new (GtkAdjustment *width_adj, GtkAdjustment *weight_adj); G_END_DECLS - -#endif /* __GTK_FONT_PLANE_H__ */ diff --git a/demos/gtk-demo/gskshaderpaintable.h b/demos/gtk-demo/gskshaderpaintable.h index 98fd2bcaa7..cbc38dbabc 100644 --- a/demos/gtk-demo/gskshaderpaintable.h +++ b/demos/gtk-demo/gskshaderpaintable.h @@ -17,8 +17,7 @@ * Authors: Matthias Clasen */ -#ifndef __GSK_SHADER_PAINTABLE_H__ -#define __GSK_SHADER_PAINTABLE_H__ +#pragma once #include #include @@ -42,5 +41,3 @@ void gsk_shader_paintable_update_time (GskShaderPaintable *self int time_idx, gint64 frame_time); G_END_DECLS - -#endif /* __GSK_SHADER_PAINTABLE_H__ */ diff --git a/demos/gtk-demo/gtkfishbowl.h b/demos/gtk-demo/gtkfishbowl.h index 34ea83b40a..837efb7bc7 100644 --- a/demos/gtk-demo/gtkfishbowl.h +++ b/demos/gtk-demo/gtkfishbowl.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef __GTK_FISHBOWL_H__ -#define __GTK_FISHBOWL_H__ +#pragma once #include @@ -65,5 +64,3 @@ void gtk_fishbowl_set_creation_func (GtkFishbowl *fishbowl, GtkFishCreationFunc creation_func); G_END_DECLS - -#endif /* __GTK_FISHBOWL_H__ */ diff --git a/demos/gtk-demo/gtkgears.h b/demos/gtk-demo/gtkgears.h index 0109723c14..5ebfa535ca 100644 --- a/demos/gtk-demo/gtkgears.h +++ b/demos/gtk-demo/gtkgears.h @@ -1,5 +1,4 @@ -#ifndef __GTK_GEARS_H__ -#define __GTK_GEARS_H__ +#pragma once #include @@ -44,5 +43,3 @@ void gtk_gears_set_fps_label (GtkGears *gears, G_END_DECLS - -#endif /* __GTK_GEARS_H__ */ diff --git a/demos/gtk-demo/gtkshaderbin.h b/demos/gtk-demo/gtkshaderbin.h index 32ed18fe6f..fdc09cf6c7 100644 --- a/demos/gtk-demo/gtkshaderbin.h +++ b/demos/gtk-demo/gtkshaderbin.h @@ -1,5 +1,4 @@ -#ifndef __GTK_SHADER_BIN_H__ -#define __GTK_SHADER_BIN_H__ +#pragma once #include @@ -19,5 +18,3 @@ void gtk_shader_bin_set_child (GtkShaderBin *self, GtkWidget *gtk_shader_bin_get_child (GtkShaderBin *self); G_END_DECLS - -#endif /* __GTK_SHADER_BIN_H__ */ diff --git a/demos/gtk-demo/gtkshaderstack.h b/demos/gtk-demo/gtkshaderstack.h index 16d1fe9e3f..c146fc04be 100644 --- a/demos/gtk-demo/gtkshaderstack.h +++ b/demos/gtk-demo/gtkshaderstack.h @@ -1,5 +1,4 @@ -#ifndef __GTK_SHADER_STACK_H__ -#define __GTK_SHADER_STACK_H__ +#pragma once #include @@ -19,5 +18,3 @@ void gtk_shader_stack_set_active (GtkShaderStack *self, int index); G_END_DECLS - -#endif /* __GTK_SHADER_STACK_H__ */ diff --git a/demos/gtk-demo/gtkshadertoy.h b/demos/gtk-demo/gtkshadertoy.h index 38f48995b8..b56b928c75 100644 --- a/demos/gtk-demo/gtkshadertoy.h +++ b/demos/gtk-demo/gtkshadertoy.h @@ -1,5 +1,4 @@ -#ifndef __GTK_SHADERTOY_H__ -#define __GTK_SHADERTOY_H__ +#pragma once #include @@ -30,5 +29,3 @@ void gtk_shadertoy_set_image_shader (GtkShadertoy *shadertoy, const char *shader); G_END_DECLS - -#endif /* __GTK_SHADERTOY_H__ */ diff --git a/demos/gtk-demo/language-names.h b/demos/gtk-demo/language-names.h index 562f7ae2f8..2fe8b5ad4e 100644 --- a/demos/gtk-demo/language-names.h +++ b/demos/gtk-demo/language-names.h @@ -1,5 +1,4 @@ -#ifndef LANGUAGE_NAMES_H -#define LANGUAGE_NAMES_H +#pragma once #include @@ -9,5 +8,3 @@ const char * get_language_name (PangoLanguage *language); const char * get_language_name_for_tag (guint32 tag); G_END_DECLS - -#endif diff --git a/demos/gtk-demo/paintable.h b/demos/gtk-demo/paintable.h index b8d78160bb..0043b29119 100644 --- a/demos/gtk-demo/paintable.h +++ b/demos/gtk-demo/paintable.h @@ -1,5 +1,4 @@ -#ifndef __PAINTABLE_H__ -#define __PAINTABLE_H__ +#pragma once #include @@ -13,5 +12,3 @@ void gtk_nuclear_snapshot (GtkSnapshot *snapshot, GdkPaintable * gtk_nuclear_icon_new (double rotation); GdkPaintable * gtk_nuclear_animation_new (gboolean draw_background); GtkMediaStream *gtk_nuclear_media_stream_new (void); - -#endif /* __PAINTABLE_H__ */ diff --git a/demos/gtk-demo/puzzlepiece.h b/demos/gtk-demo/puzzlepiece.h index b7fc97dc05..0de8126f35 100644 --- a/demos/gtk-demo/puzzlepiece.h +++ b/demos/gtk-demo/puzzlepiece.h @@ -1,5 +1,4 @@ -#ifndef __PUZZLE_PIECE_H__ -#define __PUZZLE_PIECE_H__ +#pragma once #include @@ -19,5 +18,3 @@ GdkPaintable * gtk_puzzle_piece_new (GdkPaintable *puzzle, GdkPaintable * gtk_puzzle_piece_get_puzzle (GtkPuzzlePiece *self); guint gtk_puzzle_piece_get_x (GtkPuzzlePiece *self); guint gtk_puzzle_piece_get_y (GtkPuzzlePiece *self); - -#endif /* __PUZZLE_PIECE_H__ */ diff --git a/demos/gtk-demo/script-names.h b/demos/gtk-demo/script-names.h index 3036c05b56..50435d0eb1 100644 --- a/demos/gtk-demo/script-names.h +++ b/demos/gtk-demo/script-names.h @@ -1,5 +1,4 @@ -#ifndef SCRIPT_NAMES_H -#define SCRIPT_NAMES_H +#pragma once #include @@ -9,5 +8,3 @@ const char * get_script_name (GUnicodeScript script); const char * get_script_name_for_tag (guint32 tag); G_END_DECLS - -#endif diff --git a/demos/icon-browser/iconbrowserapp.h b/demos/icon-browser/iconbrowserapp.h index fd6ee18950..c269e55147 100644 --- a/demos/icon-browser/iconbrowserapp.h +++ b/demos/icon-browser/iconbrowserapp.h @@ -1,5 +1,4 @@ -#ifndef __ICON_BROWSER_APP_H -#define __ICON_BROWSER_APP_H +#pragma once #include @@ -14,6 +13,3 @@ typedef struct _IconBrowserAppClass IconBrowserAppClass; GType icon_browser_app_get_type (void); IconBrowserApp *icon_browser_app_new (void); - - -#endif /* __ICON_BROWSER_APP_H */ diff --git a/demos/icon-browser/iconbrowserwin.h b/demos/icon-browser/iconbrowserwin.h index 824ce95e70..c8997d8a8a 100644 --- a/demos/icon-browser/iconbrowserwin.h +++ b/demos/icon-browser/iconbrowserwin.h @@ -1,5 +1,4 @@ -#ifndef __ICON_BROWSER_WIN_H -#define __ICON_BROWSER_WIN_H +#pragma once #include #include "iconbrowserapp.h" @@ -15,6 +14,3 @@ typedef struct _IconBrowserWindowClass IconBrowserWindowClass; GType icon_browser_window_get_type (void); IconBrowserWindow *icon_browser_window_new (IconBrowserApp *app); - - -#endif /* __ICON_BROWSER_WIN_H */ diff --git a/demos/node-editor/gtkrendererpaintableprivate.h b/demos/node-editor/gtkrendererpaintableprivate.h index 39b9f8e93b..f9511a7913 100644 --- a/demos/node-editor/gtkrendererpaintableprivate.h +++ b/demos/node-editor/gtkrendererpaintableprivate.h @@ -17,8 +17,7 @@ * Authors: Benjamin Otte */ -#ifndef __GTK_RENDERER_PAINTABLE_H__ -#define __GTK_RENDERER_PAINTABLE_H__ +#pragma once #include @@ -39,5 +38,3 @@ void gtk_renderer_paintable_set_paintable (GtkRendererPaintable GdkPaintable * gtk_renderer_paintable_get_paintable (GtkRendererPaintable *self) G_GNUC_PURE; G_END_DECLS - -#endif /* __GTK_RENDERER_PAINTABLE_H__ */ diff --git a/demos/node-editor/node-editor-application.h b/demos/node-editor/node-editor-application.h index 90fbb24cb6..ec877d4786 100644 --- a/demos/node-editor/node-editor-application.h +++ b/demos/node-editor/node-editor-application.h @@ -17,8 +17,7 @@ * Authors: Benjamin Otte */ -#ifndef __NODE_EDITOR_APPLICATION_H__ -#define __NODE_EDITOR_APPLICATION_H__ +#pragma once #include @@ -33,6 +32,3 @@ typedef struct _NodeEditorApplicationClass NodeEditorApplicationClass; GType node_editor_application_get_type (void); NodeEditorApplication *node_editor_application_new (void); - - -#endif /* __NODE_EDITOR_APPLICATION_H__ */ diff --git a/demos/node-editor/node-editor-window.h b/demos/node-editor/node-editor-window.h index 9eaf6aed3f..72f8a6395e 100644 --- a/demos/node-editor/node-editor-window.h +++ b/demos/node-editor/node-editor-window.h @@ -17,8 +17,7 @@ * Authors: Benjamin Otte */ -#ifndef __NODE_EDITOR_WINDOW_H__ -#define __NODE_EDITOR_WINDOW_H__ +#pragma once #include @@ -38,5 +37,3 @@ NodeEditorWindow * node_editor_window_new (NodeEditorApplication gboolean node_editor_window_load (NodeEditorWindow *self, GFile *file); - -#endif /* __NODE_EDITOR_WINDOW_H__ */ diff --git a/examples/application1/exampleapp.h b/examples/application1/exampleapp.h index f7b837fbd5..2d866c689c 100644 --- a/examples/application1/exampleapp.h +++ b/examples/application1/exampleapp.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPP_H -#define __EXAMPLEAPP_H +#pragma once #include @@ -8,6 +7,3 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication) ExampleApp *example_app_new (void); - - -#endif /* __EXAMPLEAPP_H */ diff --git a/examples/application1/exampleappwin.h b/examples/application1/exampleappwin.h index 786338d083..00758f6187 100644 --- a/examples/application1/exampleappwin.h +++ b/examples/application1/exampleappwin.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPPWIN_H -#define __EXAMPLEAPPWIN_H +#pragma once #include #include "exampleapp.h" @@ -12,6 +11,3 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, ExampleAppWindow *example_app_window_new (ExampleApp *app); void example_app_window_open (ExampleAppWindow *win, GFile *file); - - -#endif /* __EXAMPLEAPPWIN_H */ diff --git a/examples/application2/exampleapp.h b/examples/application2/exampleapp.h index 51093791a3..fdbf91befc 100644 --- a/examples/application2/exampleapp.h +++ b/examples/application2/exampleapp.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPP_H -#define __EXAMPLEAPP_H +#pragma once #include @@ -9,6 +8,3 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication) ExampleApp *example_app_new (void); - - -#endif /* __EXAMPLEAPP_H */ diff --git a/examples/application2/exampleappwin.h b/examples/application2/exampleappwin.h index 786338d083..00758f6187 100644 --- a/examples/application2/exampleappwin.h +++ b/examples/application2/exampleappwin.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPPWIN_H -#define __EXAMPLEAPPWIN_H +#pragma once #include #include "exampleapp.h" @@ -12,6 +11,3 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, ExampleAppWindow *example_app_window_new (ExampleApp *app); void example_app_window_open (ExampleAppWindow *win, GFile *file); - - -#endif /* __EXAMPLEAPPWIN_H */ diff --git a/examples/application3/exampleapp.h b/examples/application3/exampleapp.h index 51093791a3..fdbf91befc 100644 --- a/examples/application3/exampleapp.h +++ b/examples/application3/exampleapp.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPP_H -#define __EXAMPLEAPP_H +#pragma once #include @@ -9,6 +8,3 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication) ExampleApp *example_app_new (void); - - -#endif /* __EXAMPLEAPP_H */ diff --git a/examples/application3/exampleappwin.h b/examples/application3/exampleappwin.h index 786338d083..00758f6187 100644 --- a/examples/application3/exampleappwin.h +++ b/examples/application3/exampleappwin.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPPWIN_H -#define __EXAMPLEAPPWIN_H +#pragma once #include #include "exampleapp.h" @@ -12,6 +11,3 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, ExampleAppWindow *example_app_window_new (ExampleApp *app); void example_app_window_open (ExampleAppWindow *win, GFile *file); - - -#endif /* __EXAMPLEAPPWIN_H */ diff --git a/examples/application4/exampleapp.h b/examples/application4/exampleapp.h index 51093791a3..fdbf91befc 100644 --- a/examples/application4/exampleapp.h +++ b/examples/application4/exampleapp.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPP_H -#define __EXAMPLEAPP_H +#pragma once #include @@ -9,6 +8,3 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication) ExampleApp *example_app_new (void); - - -#endif /* __EXAMPLEAPP_H */ diff --git a/examples/application4/exampleappwin.h b/examples/application4/exampleappwin.h index 786338d083..00758f6187 100644 --- a/examples/application4/exampleappwin.h +++ b/examples/application4/exampleappwin.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPPWIN_H -#define __EXAMPLEAPPWIN_H +#pragma once #include #include "exampleapp.h" @@ -12,6 +11,3 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, ExampleAppWindow *example_app_window_new (ExampleApp *app); void example_app_window_open (ExampleAppWindow *win, GFile *file); - - -#endif /* __EXAMPLEAPPWIN_H */ diff --git a/examples/application5/exampleapp.h b/examples/application5/exampleapp.h index 51093791a3..fdbf91befc 100644 --- a/examples/application5/exampleapp.h +++ b/examples/application5/exampleapp.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPP_H -#define __EXAMPLEAPP_H +#pragma once #include @@ -9,6 +8,3 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication) ExampleApp *example_app_new (void); - - -#endif /* __EXAMPLEAPP_H */ diff --git a/examples/application5/exampleappwin.h b/examples/application5/exampleappwin.h index 786338d083..00758f6187 100644 --- a/examples/application5/exampleappwin.h +++ b/examples/application5/exampleappwin.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPPWIN_H -#define __EXAMPLEAPPWIN_H +#pragma once #include #include "exampleapp.h" @@ -12,6 +11,3 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, ExampleAppWindow *example_app_window_new (ExampleApp *app); void example_app_window_open (ExampleAppWindow *win, GFile *file); - - -#endif /* __EXAMPLEAPPWIN_H */ diff --git a/examples/application6/exampleapp.h b/examples/application6/exampleapp.h index 51093791a3..fdbf91befc 100644 --- a/examples/application6/exampleapp.h +++ b/examples/application6/exampleapp.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPP_H -#define __EXAMPLEAPP_H +#pragma once #include @@ -9,6 +8,3 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication) ExampleApp *example_app_new (void); - - -#endif /* __EXAMPLEAPP_H */ diff --git a/examples/application6/exampleappprefs.h b/examples/application6/exampleappprefs.h index 2f08819ffb..b7a8df14df 100644 --- a/examples/application6/exampleappprefs.h +++ b/examples/application6/exampleappprefs.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPPPREFS_H -#define __EXAMPLEAPPPREFS_H +#pragma once #include #include "exampleappwin.h" @@ -10,6 +9,3 @@ G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, Gt ExampleAppPrefs *example_app_prefs_new (ExampleAppWindow *win); - - -#endif /* __EXAMPLEAPPPREFS_H */ diff --git a/examples/application6/exampleappwin.h b/examples/application6/exampleappwin.h index 786338d083..00758f6187 100644 --- a/examples/application6/exampleappwin.h +++ b/examples/application6/exampleappwin.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPPWIN_H -#define __EXAMPLEAPPWIN_H +#pragma once #include #include "exampleapp.h" @@ -12,6 +11,3 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, ExampleAppWindow *example_app_window_new (ExampleApp *app); void example_app_window_open (ExampleAppWindow *win, GFile *file); - - -#endif /* __EXAMPLEAPPWIN_H */ diff --git a/examples/application7/exampleapp.h b/examples/application7/exampleapp.h index 51093791a3..fdbf91befc 100644 --- a/examples/application7/exampleapp.h +++ b/examples/application7/exampleapp.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPP_H -#define __EXAMPLEAPP_H +#pragma once #include @@ -9,6 +8,3 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication) ExampleApp *example_app_new (void); - - -#endif /* __EXAMPLEAPP_H */ diff --git a/examples/application7/exampleappprefs.h b/examples/application7/exampleappprefs.h index 2f08819ffb..b7a8df14df 100644 --- a/examples/application7/exampleappprefs.h +++ b/examples/application7/exampleappprefs.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPPPREFS_H -#define __EXAMPLEAPPPREFS_H +#pragma once #include #include "exampleappwin.h" @@ -10,6 +9,3 @@ G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, Gt ExampleAppPrefs *example_app_prefs_new (ExampleAppWindow *win); - - -#endif /* __EXAMPLEAPPPREFS_H */ diff --git a/examples/application7/exampleappwin.h b/examples/application7/exampleappwin.h index 786338d083..00758f6187 100644 --- a/examples/application7/exampleappwin.h +++ b/examples/application7/exampleappwin.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPPWIN_H -#define __EXAMPLEAPPWIN_H +#pragma once #include #include "exampleapp.h" @@ -12,6 +11,3 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, ExampleAppWindow *example_app_window_new (ExampleApp *app); void example_app_window_open (ExampleAppWindow *win, GFile *file); - - -#endif /* __EXAMPLEAPPWIN_H */ diff --git a/examples/application8/exampleapp.h b/examples/application8/exampleapp.h index 51093791a3..fdbf91befc 100644 --- a/examples/application8/exampleapp.h +++ b/examples/application8/exampleapp.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPP_H -#define __EXAMPLEAPP_H +#pragma once #include @@ -9,6 +8,3 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication) ExampleApp *example_app_new (void); - - -#endif /* __EXAMPLEAPP_H */ diff --git a/examples/application8/exampleappprefs.h b/examples/application8/exampleappprefs.h index 2f08819ffb..b7a8df14df 100644 --- a/examples/application8/exampleappprefs.h +++ b/examples/application8/exampleappprefs.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPPPREFS_H -#define __EXAMPLEAPPPREFS_H +#pragma once #include #include "exampleappwin.h" @@ -10,6 +9,3 @@ G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, Gt ExampleAppPrefs *example_app_prefs_new (ExampleAppWindow *win); - - -#endif /* __EXAMPLEAPPPREFS_H */ diff --git a/examples/application8/exampleappwin.h b/examples/application8/exampleappwin.h index 786338d083..00758f6187 100644 --- a/examples/application8/exampleappwin.h +++ b/examples/application8/exampleappwin.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPPWIN_H -#define __EXAMPLEAPPWIN_H +#pragma once #include #include "exampleapp.h" @@ -12,6 +11,3 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, ExampleAppWindow *example_app_window_new (ExampleApp *app); void example_app_window_open (ExampleAppWindow *win, GFile *file); - - -#endif /* __EXAMPLEAPPWIN_H */ diff --git a/examples/application9/exampleapp.h b/examples/application9/exampleapp.h index 51093791a3..fdbf91befc 100644 --- a/examples/application9/exampleapp.h +++ b/examples/application9/exampleapp.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPP_H -#define __EXAMPLEAPP_H +#pragma once #include @@ -9,6 +8,3 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication) ExampleApp *example_app_new (void); - - -#endif /* __EXAMPLEAPP_H */ diff --git a/examples/application9/exampleappprefs.h b/examples/application9/exampleappprefs.h index 2f08819ffb..b7a8df14df 100644 --- a/examples/application9/exampleappprefs.h +++ b/examples/application9/exampleappprefs.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPPPREFS_H -#define __EXAMPLEAPPPREFS_H +#pragma once #include #include "exampleappwin.h" @@ -10,6 +9,3 @@ G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, Gt ExampleAppPrefs *example_app_prefs_new (ExampleAppWindow *win); - - -#endif /* __EXAMPLEAPPPREFS_H */ diff --git a/examples/application9/exampleappwin.h b/examples/application9/exampleappwin.h index 786338d083..00758f6187 100644 --- a/examples/application9/exampleappwin.h +++ b/examples/application9/exampleappwin.h @@ -1,5 +1,4 @@ -#ifndef __EXAMPLEAPPWIN_H -#define __EXAMPLEAPPWIN_H +#pragma once #include #include "exampleapp.h" @@ -12,6 +11,3 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW, ExampleAppWindow *example_app_window_new (ExampleApp *app); void example_app_window_open (ExampleAppWindow *win, GFile *file); - - -#endif /* __EXAMPLEAPPWIN_H */ diff --git a/gtk/gtkopenuriportal.h b/gtk/gtkopenuriportal.h index 3236f46e68..3c363723ab 100644 --- a/gtk/gtkopenuriportal.h +++ b/gtk/gtkopenuriportal.h @@ -18,7 +18,7 @@ * License along with this library; if not, see . */ -#ifndef __G_OPEN_URI_PORTAL_H__ +#pragma once #include "gtkwindow.h" #include @@ -55,5 +55,3 @@ gboolean gtk_openuri_portal_open_uri_finish (GAsyncResult *result, GError **error); G_END_DECLS - -#endif diff --git a/modules/media/gtkffmediafileprivate.h b/modules/media/gtkffmediafileprivate.h index c8366eff2f..6ee33be0c1 100644 --- a/modules/media/gtkffmediafileprivate.h +++ b/modules/media/gtkffmediafileprivate.h @@ -17,8 +17,7 @@ * Authors: Benjamin Otte */ -#ifndef __GTK_FF_MEDIA_FILE_H__ -#define __GTK_FF_MEDIA_FILE_H__ +#pragma once #include @@ -29,5 +28,3 @@ G_BEGIN_DECLS G_DECLARE_FINAL_TYPE (GtkFfMediaFile, gtk_ff_media_file, GTK, FF_MEDIA_FILE, GtkMediaFile) G_END_DECLS - -#endif /* __GTK_FF_MEDIA_FILE_H__ */ diff --git a/modules/media/gtkgstmediafileprivate.h b/modules/media/gtkgstmediafileprivate.h index 0229bbaaea..ae7aa55718 100644 --- a/modules/media/gtkgstmediafileprivate.h +++ b/modules/media/gtkgstmediafileprivate.h @@ -17,8 +17,7 @@ * Authors: Benjamin Otte */ -#ifndef __GTK_GST_MEDIA_FILE_H__ -#define __GTK_GST_MEDIA_FILE_H__ +#pragma once #include @@ -29,5 +28,3 @@ G_BEGIN_DECLS G_DECLARE_FINAL_TYPE (GtkGstMediaFile, gtk_gst_media_file, GTK, GST_MEDIA_FILE, GtkMediaFile) G_END_DECLS - -#endif /* __GTK_GST_MEDIA_FILE_H__ */ diff --git a/modules/media/gtkgstpaintableprivate.h b/modules/media/gtkgstpaintableprivate.h index 6691e51c0b..44d5a31e61 100644 --- a/modules/media/gtkgstpaintableprivate.h +++ b/modules/media/gtkgstpaintableprivate.h @@ -17,8 +17,7 @@ * Authors: Benjamin Otte */ -#ifndef __GTK_GST_PAINTABLE_H__ -#define __GTK_GST_PAINTABLE_H__ +#pragma once #include @@ -39,5 +38,3 @@ void gtk_gst_paintable_queue_set_texture (GtkGstPaintable double pixel_aspect_ratio); G_END_DECLS - -#endif /* __GTK_GST_PAINTABLE_H__ */ diff --git a/modules/media/gtkgstsinkprivate.h b/modules/media/gtkgstsinkprivate.h index f81ac0ee2d..b52d6183f6 100644 --- a/modules/media/gtkgstsinkprivate.h +++ b/modules/media/gtkgstsinkprivate.h @@ -18,8 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __GTK_GST_SINK_PRIVATE_H__ -#define __GTK_GST_SINK_PRIVATE_H__ +#pragma once #include "gtkgstpaintableprivate.h" @@ -63,5 +62,3 @@ struct _GtkGstSinkClass GType gtk_gst_sink_get_type (void); G_END_DECLS - -#endif /* __GTK_GST_SINK_PRIVATE_H__ */ diff --git a/modules/printbackends/gtkcupssecretsutils.h b/modules/printbackends/gtkcupssecretsutils.h index e8fb07b143..aeddfd76d7 100644 --- a/modules/printbackends/gtkcupssecretsutils.h +++ b/modules/printbackends/gtkcupssecretsutils.h @@ -14,8 +14,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ -#ifndef __GTK_SECRETS_UTILS_H__ -#define __GTK_SECRETS_UTILS_H__ + +#pragma once #include @@ -37,5 +37,3 @@ void gtk_cups_secrets_service_store (char **auth_info, const char *printer_uri); G_END_DECLS - -#endif /* __GTK_SECRETS_UTILS_H__ */ diff --git a/modules/printbackends/gtkcupsutils.h b/modules/printbackends/gtkcupsutils.h index 7859427ea0..33ea58b3f9 100644 --- a/modules/printbackends/gtkcupsutils.h +++ b/modules/printbackends/gtkcupsutils.h @@ -1,4 +1,4 @@ -/* gtkcupsutils.h +/* gtkcupsutils.h * Copyright (C) 2006 John (J5) Palmieri * * This library is free software; you can redistribute it and/or @@ -8,15 +8,14 @@ * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ - -#ifndef __GTK_CUPS_UTILS_H__ -#define __GTK_CUPS_UTILS_H__ + +#pragma once #include #include @@ -46,7 +45,7 @@ typedef enum } GtkCupsRequestType; -/** +/* * Direction we should be polling the http socket on. * We are either reading or writing at each state. * This makes it easy for mainloops to connect to poll. @@ -141,34 +140,34 @@ enum }; GtkCupsRequest * gtk_cups_request_new_with_username (http_t *connection, - GtkCupsRequestType req_type, - int operation_id, - GIOChannel *data_io, - const char *server, - const char *resource, - const char *username); + GtkCupsRequestType req_type, + int operation_id, + GIOChannel *data_io, + const char *server, + const char *resource, + const char *username); GtkCupsRequest * gtk_cups_request_new (http_t *connection, - GtkCupsRequestType req_type, - int operation_id, - GIOChannel *data_io, - const char *server, - const char *resource); + GtkCupsRequestType req_type, + int operation_id, + GIOChannel *data_io, + const char *server, + const char *resource); void gtk_cups_request_ipp_add_string (GtkCupsRequest *request, - ipp_tag_t group, - ipp_tag_t tag, - const char *name, - const char *charset, - const char *value); + ipp_tag_t group, + ipp_tag_t tag, + const char *name, + const char *charset, + const char *value); void gtk_cups_request_ipp_add_strings (GtkCupsRequest *request, - ipp_tag_t group, - ipp_tag_t tag, - const char *name, - int num_values, - const char *charset, - const char * const *values); + ipp_tag_t group, + ipp_tag_t tag, + const char *name, + int num_values, + const char *charset, + const char * const *values); const char * gtk_cups_request_ipp_get_string (GtkCupsRequest *request, - ipp_tag_t tag, - const char *name); + ipp_tag_t tag, + const char *name); gboolean gtk_cups_request_read_write (GtkCupsRequest *request, gboolean connect_only); GtkCupsPollState gtk_cups_request_get_poll_state (GtkCupsRequest *request); @@ -176,11 +175,11 @@ void gtk_cups_request_free (GtkCupsRequest * GtkCupsResult * gtk_cups_request_get_result (GtkCupsRequest *request); gboolean gtk_cups_request_is_done (GtkCupsRequest *request); void gtk_cups_request_encode_option (GtkCupsRequest *request, - const char *option, - const char *value); + const char *option, + const char *value); void gtk_cups_request_set_ipp_version (GtkCupsRequest *request, - int major, - int minor); + int major, + int minor); gboolean gtk_cups_result_is_error (GtkCupsResult *result); ipp_t * gtk_cups_result_get_response (GtkCupsResult *result); GtkCupsErrorType gtk_cups_result_get_error_type (GtkCupsResult *result); @@ -193,4 +192,4 @@ GtkCupsConnectionState gtk_cups_connection_test_get_state (GtkCupsConnectionTes void gtk_cups_connection_test_free (GtkCupsConnectionTest *test); G_END_DECLS -#endif + diff --git a/modules/printbackends/gtkprintbackendcpdb.h b/modules/printbackends/gtkprintbackendcpdb.h index f7e87efa5f..9b4e28f84e 100644 --- a/modules/printbackends/gtkprintbackendcpdb.h +++ b/modules/printbackends/gtkprintbackendcpdb.h @@ -17,9 +17,7 @@ * License along with this library. If not, see . */ - -#ifndef __GTK_PRINT_BACKEND_CPDB_H__ -#define __GTK_PRINT_BACKEND_CPDB_H__ +#pragma once #include #include @@ -38,6 +36,3 @@ GtkPrintBackend *gtk_print_backend_cpdb_new (void); GType gtk_print_backend_cpdb_get_type (void) G_GNUC_CONST; G_END_DECLS - -#endif /* __GTK_PRINT_BACKEND_CPDB_H__ */ - diff --git a/modules/printbackends/gtkprintbackendcups.h b/modules/printbackends/gtkprintbackendcups.h index b5ac6d3980..528ff3d83f 100644 --- a/modules/printbackends/gtkprintbackendcups.h +++ b/modules/printbackends/gtkprintbackendcups.h @@ -16,8 +16,7 @@ * License along with this library. If not, see . */ -#ifndef __GTK_PRINT_BACKEND_CUPS_H__ -#define __GTK_PRINT_BACKEND_CUPS_H__ +#pragma once #include #include "gtk/print/gtkprintbackendprivate.h" @@ -34,7 +33,3 @@ GtkPrintBackend *gtk_print_backend_cups_new (void); GType gtk_print_backend_cups_get_type (void) G_GNUC_CONST; G_END_DECLS - -#endif /* __GTK_PRINT_BACKEND_CUPS_H__ */ - - diff --git a/modules/printbackends/gtkprintbackendfile.h b/modules/printbackends/gtkprintbackendfile.h index 280b901d00..4e77ce4e43 100644 --- a/modules/printbackends/gtkprintbackendfile.h +++ b/modules/printbackends/gtkprintbackendfile.h @@ -1,5 +1,5 @@ /* GTK - The GIMP Toolkit - * gtkprintbackendpdf.h: Default implementation of GtkPrintBackend + * gtkprintbackendpdf.h: Default implementation of GtkPrintBackend * for printing to a file * Copyright (C) 2003, Red Hat, Inc. * @@ -17,8 +17,7 @@ * License along with this library. If not, see . */ -#ifndef __GTK_PRINT_BACKEND_FILE_H__ -#define __GTK_PRINT_BACKEND_FILE_H__ +#pragma once #include #include "gtk/print/gtkprintbackendprivate.h" @@ -35,5 +34,3 @@ GtkPrintBackend *gtk_print_backend_file_new (void); GType gtk_print_backend_file_get_type (void) G_GNUC_CONST; G_END_DECLS - -#endif /* __GTK_PRINT_BACKEND_FILE_H__ */ diff --git a/modules/printbackends/gtkprintbackendutils.h b/modules/printbackends/gtkprintbackendutils.h index 8c8a4f8415..dfbdd5910d 100644 --- a/modules/printbackends/gtkprintbackendutils.h +++ b/modules/printbackends/gtkprintbackendutils.h @@ -17,11 +17,8 @@ * License along with this library. If not, see . */ -#ifndef __GTK_PRINT_BACKEND_UTILS_H__ -#define __GTK_PRINT_BACKEND_UTILS_H__ +#pragma once char *random_string (int size); char *localtime_to_utctime (const char *local_time); gboolean supports_am_pm (void); - -#endif /* __GTK_PRINT_BACKEND_UTILS_H__ */ \ No newline at end of file diff --git a/modules/printbackends/gtkprintercpdb.h b/modules/printbackends/gtkprintercpdb.h index 7c4d6bbb64..5a5dac233d 100644 --- a/modules/printbackends/gtkprintercpdb.h +++ b/modules/printbackends/gtkprintercpdb.h @@ -15,9 +15,7 @@ * License along with this library. If not, see . */ - -#ifndef __GTK_PRINTER_CPDB_H__ -#define __GTK_PRINTER_CPDB_H__ +#pragma once #include #include @@ -42,5 +40,3 @@ void gtk_printer_cpdb_set_printer_obj (GtkPrinterCpdb cpdb_printer_obj_t *printer_obj); G_END_DECLS - -#endif /* __GTK_PRINTER_CPDB_H__ */ diff --git a/modules/printbackends/gtkprintercups.h b/modules/printbackends/gtkprintercups.h index 30edcece27..7e75f84caa 100644 --- a/modules/printbackends/gtkprintercups.h +++ b/modules/printbackends/gtkprintercups.h @@ -8,15 +8,14 @@ * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ -#ifndef __GTK_PRINTER_CUPS_H__ -#define __GTK_PRINTER_CUPS_H__ +#pragma once #include #include @@ -39,7 +38,7 @@ G_BEGIN_DECLS #define GTK_IS_PRINTER_CUPS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINTER_CUPS)) #define GTK_PRINTER_CUPS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINTER_CUPS, GtkPrinterCupsClass)) -typedef struct _GtkPrinterCups GtkPrinterCups; +typedef struct _GtkPrinterCups GtkPrinterCups; typedef struct _GtkPrinterCupsClass GtkPrinterCupsClass; typedef struct _GtkPrinterCupsPrivate GtkPrinterCupsPrivate; @@ -123,8 +122,8 @@ void gtk_printer_cups_register_type (GTypeModule *module GtkPrinterCups *gtk_printer_cups_new (const char *name, GtkPrintBackend *backend, gpointer colord_client); -ppd_file_t *gtk_printer_cups_get_ppd (GtkPrinterCups *printer); -const char *gtk_printer_cups_get_ppd_name (GtkPrinterCups *printer); +ppd_file_t *gtk_printer_cups_get_ppd (GtkPrinterCups *printer); +const char *gtk_printer_cups_get_ppd_name (GtkPrinterCups *printer); #ifdef HAVE_COLORD void gtk_printer_cups_update_settings (GtkPrinterCups *printer, @@ -133,5 +132,3 @@ void gtk_printer_cups_update_settings (GtkPrinterCups *print #endif G_END_DECLS - -#endif /* __GTK_PRINTER_CUPS_H__ */ diff --git a/tests/frame-stats.h b/tests/frame-stats.h index 9c046a7f97..4a773021a1 100644 --- a/tests/frame-stats.h +++ b/tests/frame-stats.h @@ -1,9 +1,6 @@ -#ifndef __FRAME_STATS_H__ -#define __FRAME_STATS_H__ +#pragma once #include void frame_stats_add_options (GOptionGroup *group); void frame_stats_ensure (GtkWindow *window); - -#endif /* __FRAME_STATS_H__ */ diff --git a/tests/gtkgears.h b/tests/gtkgears.h index 0109723c14..5ebfa535ca 100644 --- a/tests/gtkgears.h +++ b/tests/gtkgears.h @@ -1,5 +1,4 @@ -#ifndef __GTK_GEARS_H__ -#define __GTK_GEARS_H__ +#pragma once #include @@ -44,5 +43,3 @@ void gtk_gears_set_fps_label (GtkGears *gears, G_END_DECLS - -#endif /* __GTK_GEARS_H__ */ diff --git a/tests/testprintfileoperation.h b/tests/testprintfileoperation.h index 40472fdf94..83e0f5eeee 100644 --- a/tests/testprintfileoperation.h +++ b/tests/testprintfileoperation.h @@ -1,5 +1,4 @@ -#ifndef __TEST_PRINT_FILE_OPERATION_H__ -#define __TEST_PRINT_FILE_OPERATION_H__ +#pragma once #include @@ -22,7 +21,6 @@ struct _TestPrintFileOperation double font_size; int lines_per_page; - char **lines; int num_lines; int num_pages; @@ -36,8 +34,6 @@ struct _TestPrintFileOperationClass GType test_print_file_operation_get_type (void); TestPrintFileOperation *test_print_file_operation_new (const char *filename); void test_print_file_operation_set_font_size (TestPrintFileOperation *op, - double points); + double points); G_END_DECLS - -#endif /* __TEST_PRINT_FILE_OPERATION_H__ */ diff --git a/tests/variable.h b/tests/variable.h index cc73022992..0cb4e04b69 100644 --- a/tests/variable.h +++ b/tests/variable.h @@ -1,5 +1,4 @@ -#ifndef __VARIABLE_H__ -#define __VARIABLE_H__ +#pragma once typedef struct { @@ -19,6 +18,3 @@ void variable_add (Variable *variable, double variable_mean (Variable *variable); double variable_standard_deviation (Variable *variable); void variable_reset (Variable *variable); - -#endif /* __VARIABLE_H__ */ - diff --git a/testsuite/gsk/gtkrendernodeattach.h b/testsuite/gsk/gtkrendernodeattach.h new file mode 100644 index 0000000000..689be4516a --- /dev/null +++ b/testsuite/gsk/gtkrendernodeattach.h @@ -0,0 +1,120 @@ +#pragma once + +#include "gskrendernode.h" +#include "gskoffloadprivate.h" +#include + +#include "gdk/gdkmemoryformatprivate.h" + +G_BEGIN_DECLS + +typedef struct _GskRenderNodeClass GskRenderNodeClass; + +/* Keep this in sync with the GskRenderNodeType enumeration. + * + * We don't add an "n-types" value to avoid having to handle + * it in every single switch. + */ +#define GSK_RENDER_NODE_TYPE_N_TYPES (GSK_SUBSURFACE_NODE + 1) + +extern GType gsk_render_node_types[]; + +#define GSK_IS_RENDER_NODE_TYPE(node,type) \ + (G_TYPE_INSTANCE_GET_CLASS ((node), GSK_TYPE_RENDER_NODE, GskRenderNodeClass)->node_type == (type)) + +#define GSK_RENDER_NODE_TYPE(node) \ + (G_TYPE_INSTANCE_GET_CLASS ((node), GSK_TYPE_RENDER_NODE, GskRenderNodeClass)->node_type) + +struct _GskRenderNode +{ + GTypeInstance parent_instance; + + gatomicrefcount ref_count; + + graphene_rect_t bounds; + + guint preferred_depth : 2; + guint offscreen_for_opacity : 1; +}; + +typedef struct +{ + cairo_region_t *region; + GskOffload *offload; +} GskDiffData; + +struct _GskRenderNodeClass +{ + GTypeClass parent_class; + + GskRenderNodeType node_type; + + void (* finalize) (GskRenderNode *node); + void (* draw) (GskRenderNode *node, + cairo_t *cr); + gboolean (* can_diff) (const GskRenderNode *node1, + const GskRenderNode *node2); + void (* diff) (GskRenderNode *node1, + GskRenderNode *node2, + GskDiffData *data); +}; + +void gsk_render_node_init_types (void); + +GType gsk_render_node_type_register_static (const char *node_name, + gsize instance_size, + GClassInitFunc class_init); + +gpointer gsk_render_node_alloc (GskRenderNodeType node_type); + +void _gsk_render_node_unref (GskRenderNode *node); + +gboolean gsk_render_node_can_diff (const GskRenderNode *node1, + const GskRenderNode *node2) G_GNUC_PURE; +void gsk_render_node_diff (GskRenderNode *node1, + GskRenderNode *node2, + cairo_region_t *region, + GskOffload *offload); +void gsk_render_node_data_diff (GskRenderNode *node1, + GskRenderNode *node2, + GskDiffData *data); +void gsk_render_node_diff_impossible (GskRenderNode *node1, + GskRenderNode *node2, + GskDiffData *data); +void gsk_container_node_diff_with (GskRenderNode *container, + GskRenderNode *other, + GskDiffData *data); + +bool gsk_border_node_get_uniform (const GskRenderNode *self); +bool gsk_border_node_get_uniform_color (const GskRenderNode *self); + +void gsk_text_node_serialize_glyphs (GskRenderNode *self, + GString *str); + +GskRenderNode ** gsk_container_node_get_children (const GskRenderNode *node, + guint *n_children); + +void gsk_transform_node_get_translate (const GskRenderNode *node, + float *dx, + float *dy); +GdkMemoryDepth gsk_render_node_get_preferred_depth (const GskRenderNode *node); + +gboolean gsk_container_node_is_disjoint (const GskRenderNode *node); + +gboolean gsk_render_node_use_offscreen_for_opacity (const GskRenderNode *node); + +GskRenderNode * gsk_render_node_attach (const GskRenderNode *node, + GdkSurface *surface); + +#define gsk_render_node_ref(node) _gsk_render_node_ref(node) +#define gsk_render_node_unref(node) _gsk_render_node_unref(node) + +static inline GskRenderNode * +_gsk_render_node_ref (GskRenderNode *node) +{ + g_atomic_ref_count_inc (&node->ref_count); + return node; +} + +G_END_DECLS + diff --git a/testsuite/gtk/gtktreemodelrefcount.h b/testsuite/gtk/gtktreemodelrefcount.h index 019f166478..1ef3edef47 100644 --- a/testsuite/gtk/gtktreemodelrefcount.h +++ b/testsuite/gtk/gtktreemodelrefcount.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef __GTK_TREE_MODEL_REF_COUNT_H__ -#define __GTK_TREE_MODEL_REF_COUNT_H__ +#pragma once #include @@ -127,6 +126,3 @@ assert_node_ref_count (GtkTreeModelRefCount *ref_model, { gtk_tree_model_ref_count_check_node (ref_model, iter, ref_count, TRUE); } - - -#endif /* __GTK_TREE_MODEL_REF_COUNT_H__ */ diff --git a/testsuite/reftests/gtk-reftest.h b/testsuite/reftests/gtk-reftest.h index bb845e5711..624d70db13 100644 --- a/testsuite/reftests/gtk-reftest.h +++ b/testsuite/reftests/gtk-reftest.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef __GTK_REFTEST_H__ -#define __GTK_REFTEST_H__ +#pragma once G_BEGIN_DECLS @@ -27,5 +26,3 @@ G_MODULE_EXPORT extern void reftest_uninhibit_snapshot (void); G_END_DECLS - -#endif /* __GTK_REFTEST_H__ */ diff --git a/testsuite/reftests/reftest-compare.h b/testsuite/reftests/reftest-compare.h index d5e02a1a7d..b91a12f4df 100644 --- a/testsuite/reftests/reftest-compare.h +++ b/testsuite/reftests/reftest-compare.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef __REFTEST_COMPARE_H__ -#define __REFTEST_COMPARE_H__ +#pragma once #include @@ -27,5 +26,3 @@ GdkTexture * reftest_compare_textures (GdkTexture GdkTexture *texture2); G_END_DECLS - -#endif /* __REFTEST_COMPARE_H__ */ diff --git a/testsuite/reftests/reftest-module.h b/testsuite/reftests/reftest-module.h index 222b46a6d1..751bf1947b 100644 --- a/testsuite/reftests/reftest-module.h +++ b/testsuite/reftests/reftest-module.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef __REFTEST_MODULE_H__ -#define __REFTEST_MODULE_H__ +#pragma once #include @@ -40,5 +39,3 @@ GCallback reftest_module_lookup (ReftestModule *module, const char *function_name); G_END_DECLS - -#endif /* __REFTEST_MODULE_H__ */ diff --git a/testsuite/reftests/reftest-snapshot.h b/testsuite/reftests/reftest-snapshot.h index 31dca9e6af..48bc6f8730 100644 --- a/testsuite/reftests/reftest-snapshot.h +++ b/testsuite/reftests/reftest-snapshot.h @@ -15,8 +15,7 @@ * License along with this library. If not, see . */ -#ifndef __REFTEST_SNAPSHOT_H__ -#define __REFTEST_SNAPSHOT_H__ +#pragma once #include @@ -26,5 +25,3 @@ G_MODULE_EXPORT GdkTexture * reftest_snapshot_ui_file (const char *ui_file); G_END_DECLS - -#endif /* __REFTEST_SNAPSHOT_H__ */