diff --git a/app/widgets/gimpaccellabel.h b/app/widgets/gimpaccellabel.h index 543812128d..bd7963dcfd 100644 --- a/app/widgets/gimpaccellabel.h +++ b/app/widgets/gimpaccellabel.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_ACCEL_LABEL_H__ -#define __GIMP_ACCEL_LABEL_H__ +#pragma once #define GIMP_TYPE_ACCEL_LABEL (gimp_accel_label_get_type ()) @@ -53,6 +52,3 @@ GtkWidget * gimp_accel_label_new (GimpAction *action); void gimp_accel_label_set_action (GimpAccelLabel *accel_label, GimpAction *action); GimpAction * gimp_accel_label_get_action (GimpAccelLabel *accel_label); - - -#endif /* __GIMP_ACCEL_LABEL_H__ */ diff --git a/app/widgets/gimpaction-history.h b/app/widgets/gimpaction-history.h index 40252a85fe..340dbdf1c6 100644 --- a/app/widgets/gimpaction-history.h +++ b/app/widgets/gimpaction-history.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_ACTION_HISTORY_H__ -#define __GIMP_ACTION_HISTORY_H__ +#pragma once typedef gboolean (* GimpActionMatchFunc) (GimpAction *action, @@ -41,6 +40,3 @@ gboolean gimp_action_history_is_blacklisted_action (const gchar *actio gboolean gimp_action_history_is_excluded_action (const gchar *action_name); void gimp_action_history_action_activated (GimpAction *action); - - -#endif /* __GIMP_ACTION_HISTORY_H__ */ diff --git a/app/widgets/gimpactioneditor.h b/app/widgets/gimpactioneditor.h index 89657a2e31..d52fe43a19 100644 --- a/app/widgets/gimpactioneditor.h +++ b/app/widgets/gimpactioneditor.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_ACTION_EDITOR_H__ -#define __GIMP_ACTION_EDITOR_H__ +#pragma once #define GIMP_TYPE_ACTION_EDITOR (gimp_action_editor_get_type ()) @@ -50,6 +49,3 @@ GType gimp_action_editor_get_type (void) G_GNUC_CONST; GtkWidget * gimp_action_editor_new (Gimp *gimp, const gchar *select_action, gboolean show_shortcuts); - - -#endif /* __GIMP_ACTION_EDITOR_H__ */ diff --git a/app/widgets/gimpactionfactory.h b/app/widgets/gimpactionfactory.h index 71339a54c4..0a9fc80ada 100644 --- a/app/widgets/gimpactionfactory.h +++ b/app/widgets/gimpactionfactory.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_ACTION_FACTORY_H__ -#define __GIMP_ACTION_FACTORY_H__ - +#pragma once #include "core/gimpobject.h" @@ -80,6 +78,3 @@ GimpActionGroup * gimp_action_factory_get_group (GimpActionFactory void gimp_action_factory_delete_group (GimpActionFactory *factory, const gchar *identifier, gpointer user_data); - - -#endif /* __GIMP_ACTION_FACTORY_H__ */ diff --git a/app/widgets/gimpactionimpl.h b/app/widgets/gimpactionimpl.h index ea00497052..1dff9593d6 100644 --- a/app/widgets/gimpactionimpl.h +++ b/app/widgets/gimpactionimpl.h @@ -18,11 +18,11 @@ * along with this program. If not, see . */ -#ifndef __GIMP_ACTION_IMPL_H__ -#define __GIMP_ACTION_IMPL_H__ +#pragma once #include "core/gimpobject.h" + #define GIMP_TYPE_ACTION_IMPL (gimp_action_impl_get_type ()) #define GIMP_ACTION_IMPL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ACTION_IMPL, GimpActionImpl)) #define GIMP_ACTION_IMPL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ACTION_IMPL, GimpActionImplClass)) @@ -45,19 +45,16 @@ struct _GimpActionImplClass GimpObjectClass parent_class; /* signals */ - void (* change_state) (GimpActionImpl *impl, - GVariant *value); + void (* change_state) (GimpActionImpl *impl, + GVariant *value); }; -GType gimp_action_impl_get_type (void) G_GNUC_CONST; +GType gimp_action_impl_get_type (void) G_GNUC_CONST; -GimpAction * gimp_action_impl_new (const gchar *name, - const gchar *label, - const gchar *short_label, - const gchar *tooltip, - const gchar *icon_name, - const gchar *help_id, - GimpContext *context); - - -#endif /* __GIMP_ACTION_IMPL_H__ */ +GimpAction * gimp_action_impl_new (const gchar *name, + const gchar *label, + const gchar *short_label, + const gchar *tooltip, + const gchar *icon_name, + const gchar *help_id, + GimpContext *context); diff --git a/app/widgets/gimpactionview.h b/app/widgets/gimpactionview.h index 75cc4936d1..96046d90e5 100644 --- a/app/widgets/gimpactionview.h +++ b/app/widgets/gimpactionview.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_ACTION_VIEW_H__ -#define __GIMP_ACTION_VIEW_H__ +#pragma once enum @@ -70,6 +69,3 @@ GtkWidget * gimp_action_view_new (Gimp *gimp, void gimp_action_view_set_filter (GimpActionView *view, const gchar *filter); - - -#endif /* __GIMP_ACTION_VIEW_H__ */ diff --git a/app/widgets/gimpbrushfactoryview.h b/app/widgets/gimpbrushfactoryview.h index e3d547d1e4..78a89b58a0 100644 --- a/app/widgets/gimpbrushfactoryview.h +++ b/app/widgets/gimpbrushfactoryview.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_BRUSH_FACTORY_VIEW_H__ -#define __GIMP_BRUSH_FACTORY_VIEW_H__ +#pragma once #include "gimpdatafactoryview.h" @@ -64,6 +63,3 @@ GtkWidget * gimp_brush_factory_view_new (GimpViewType view_type, gint view_size, gint view_border_width, GimpMenuFactory *menu_factory); - - -#endif /* __GIMP_BRUSH_FACTORY_VIEW_H__ */ diff --git a/app/widgets/gimpbrushselect.h b/app/widgets/gimpbrushselect.h index c282b17cf3..d8405fe4a0 100644 --- a/app/widgets/gimpbrushselect.h +++ b/app/widgets/gimpbrushselect.h @@ -18,13 +18,10 @@ * along with this program. If not, see . */ -#ifndef __GIMP_BRUSH_SELECT_H__ -#define __GIMP_BRUSH_SELECT_H__ +#pragma once #include "gimppdbdialog.h" -G_BEGIN_DECLS - #define GIMP_TYPE_BRUSH_SELECT (gimp_brush_select_get_type ()) #define GIMP_BRUSH_SELECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BRUSH_SELECT, GimpBrushSelect)) @@ -48,8 +45,3 @@ struct _GimpBrushSelectClass GType gimp_brush_select_get_type (void) G_GNUC_CONST; - - -G_END_DECLS - -#endif /* __GIMP_BRUSH_SELECT_H__ */ diff --git a/app/widgets/gimpbuffersourcebox.h b/app/widgets/gimpbuffersourcebox.h index fa769cb6b9..14bf9b9c5e 100644 --- a/app/widgets/gimpbuffersourcebox.h +++ b/app/widgets/gimpbuffersourcebox.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_BUFFER_SOURCE_BOX_H__ -#define __GIMP_BUFFER_SOURCE_BOX_H__ +#pragma once #define GIMP_TYPE_BUFFER_SOURCE_BOX (gimp_buffer_source_box_get_type ()) @@ -53,6 +52,3 @@ GtkWidget * gimp_buffer_source_box_new (GimpContext *context, const gchar *name); GtkWidget * gimp_buffer_source_box_get_toggle (GimpBufferSourceBox *box); - - -#endif /* __GIMP_BUFFER_SOURCE_BOX_H__ */ diff --git a/app/widgets/gimpbufferview.h b/app/widgets/gimpbufferview.h index 547b7986d2..b62d236c1e 100644 --- a/app/widgets/gimpbufferview.h +++ b/app/widgets/gimpbufferview.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_BUFFER_VIEW_H__ -#define __GIMP_BUFFER_VIEW_H__ - +#pragma once #include "gimpcontainereditor.h" @@ -63,6 +61,3 @@ GtkWidget * gimp_buffer_view_new (GimpViewType view_type, gint view_size, gint view_border_width, GimpMenuFactory *menu_factory); - - -#endif /* __GIMP_BUFFER_VIEW_H__ */ diff --git a/app/widgets/gimpcairo-wilber.h b/app/widgets/gimpcairo-wilber.h index 52873ad334..c1f424899d 100644 --- a/app/widgets/gimpcairo-wilber.h +++ b/app/widgets/gimpcairo-wilber.h @@ -21,8 +21,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CAIRO_WILBER_H__ -#define __GIMP_CAIRO_WILBER_H__ +#pragma once void gimp_cairo_wilber_toggle_pointer_eyes (void); @@ -40,6 +39,3 @@ void gimp_cairo_wilber (cairo_t *cr, void gimp_cairo_wilber_get_size (cairo_t *cr, gdouble *width, gdouble *height); - - -#endif /* __GIMP_CAIRO_WILBER_H__ */ diff --git a/app/widgets/gimpcellrendererbutton.h b/app/widgets/gimpcellrendererbutton.h index 93e9580564..ef2d03ace0 100644 --- a/app/widgets/gimpcellrendererbutton.h +++ b/app/widgets/gimpcellrendererbutton.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CELL_RENDERER_BUTTON_H__ -#define __GIMP_CELL_RENDERER_BUTTON_H__ +#pragma once #define GIMP_TYPE_CELL_RENDERER_BUTTON (gimp_cell_renderer_button_get_type ()) @@ -54,6 +53,3 @@ GtkCellRenderer * gimp_cell_renderer_button_new (void); void gimp_cell_renderer_button_clicked (GimpCellRendererButton *cell, const gchar *path, GdkModifierType state); - - -#endif /* __GIMP_CELL_RENDERER_BUTTON_H__ */ diff --git a/app/widgets/gimpcellrendererdashes.h b/app/widgets/gimpcellrendererdashes.h index 5b2ed8da56..37bcc00b8f 100644 --- a/app/widgets/gimpcellrendererdashes.h +++ b/app/widgets/gimpcellrendererdashes.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CELL_RENDERER_DASHES_H__ -#define __GIMP_CELL_RENDERER_DASHES_H__ +#pragma once #define GIMP_TYPE_CELL_RENDERER_DASHES (gimp_cell_renderer_dashes_get_type ()) @@ -48,6 +47,3 @@ struct _GimpCellRendererDashesClass GType gimp_cell_renderer_dashes_get_type (void) G_GNUC_CONST; GtkCellRenderer * gimp_cell_renderer_dashes_new (void); - - -#endif /* __GIMP_CELL_RENDERER_DASHES_H__ */ diff --git a/app/widgets/gimpcellrendererviewable.h b/app/widgets/gimpcellrendererviewable.h index 150596e46e..bee502c6c5 100644 --- a/app/widgets/gimpcellrendererviewable.h +++ b/app/widgets/gimpcellrendererviewable.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CELL_RENDERER_VIEWABLE_H__ -#define __GIMP_CELL_RENDERER_VIEWABLE_H__ +#pragma once #define GIMP_TYPE_CELL_RENDERER_VIEWABLE (gimp_cell_renderer_viewable_get_type ()) @@ -60,6 +59,3 @@ gboolean gimp_cell_renderer_viewable_pre_clicked (GimpCellRendererViewa void gimp_cell_renderer_viewable_clicked (GimpCellRendererViewable *cell, const gchar *path, GdkModifierType state); - - -#endif /* __GIMP_CELL_RENDERER_VIEWABLE_H__ */ diff --git a/app/widgets/gimpchanneltreeview.h b/app/widgets/gimpchanneltreeview.h index 933dcddd7c..236cef528b 100644 --- a/app/widgets/gimpchanneltreeview.h +++ b/app/widgets/gimpchanneltreeview.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CHANNEL_TREE_VIEW_H__ -#define __GIMP_CHANNEL_TREE_VIEW_H__ - +#pragma once #include "gimpdrawabletreeview.h" @@ -50,6 +48,3 @@ struct _GimpChannelTreeViewClass GType gimp_channel_tree_view_get_type (void) G_GNUC_CONST; - - -#endif /* __GIMP_CHANNEL_TREE_VIEW_H__ */ diff --git a/app/widgets/gimpclipboard.h b/app/widgets/gimpclipboard.h index 13f60d317d..bab5fbe158 100644 --- a/app/widgets/gimpclipboard.h +++ b/app/widgets/gimpclipboard.h @@ -15,8 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CLIPBOARD_H__ -#define __GIMP_CLIPBOARD_H__ +#pragma once void gimp_clipboard_init (Gimp *gimp); @@ -45,6 +44,3 @@ void gimp_clipboard_set_text (Gimp *gimp, const gchar *text); void gimp_clipboard_set_curve (Gimp *gimp, GimpCurve *curve); - - -#endif /* __GIMP_CLIPBOARD_H__ */ diff --git a/app/widgets/gimpcolorbar.h b/app/widgets/gimpcolorbar.h index 7f6f0ec4ba..8e16effa8a 100644 --- a/app/widgets/gimpcolorbar.h +++ b/app/widgets/gimpcolorbar.h @@ -15,8 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_COLOR_BAR_H__ -#define __GIMP_COLOR_BAR_H__ +#pragma once #define GIMP_TYPE_COLOR_BAR (gimp_color_bar_get_type ()) @@ -55,6 +54,3 @@ void gimp_color_bar_set_buffers (GimpColorBar *bar, const guchar *red, const guchar *green, const guchar *blue); - - -#endif /* __GIMP_COLOR_BAR_H__ */ diff --git a/app/widgets/gimpcolordialog.h b/app/widgets/gimpcolordialog.h index 1ff5d24f0e..a5ddf12fb4 100644 --- a/app/widgets/gimpcolordialog.h +++ b/app/widgets/gimpcolordialog.h @@ -17,9 +17,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_COLOR_DIALOG_H__ -#define __GIMP_COLOR_DIALOG_H__ - +#pragma once #include "gimpviewabledialog.h" @@ -80,6 +78,3 @@ GtkWidget * gimp_color_dialog_new (GimpViewable *viewable, void gimp_color_dialog_set_color (GimpColorDialog *dialog, GeglColor *color); GeglColor * gimp_color_dialog_get_color (GimpColorDialog *dialog); - - -#endif /* __GIMP_COLOR_DIALOG_H__ */ diff --git a/app/widgets/gimpcolordisplayeditor.h b/app/widgets/gimpcolordisplayeditor.h index cd84fd9bcf..8d881be753 100644 --- a/app/widgets/gimpcolordisplayeditor.h +++ b/app/widgets/gimpcolordisplayeditor.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_COLOR_DISPLAY_EDITOR_H__ -#define __GIMP_COLOR_DISPLAY_EDITOR_H__ +#pragma once #define GIMP_TYPE_COLOR_DISPLAY_EDITOR (gimp_color_display_editor_get_type ()) @@ -74,6 +73,3 @@ GtkWidget * gimp_color_display_editor_new (Gimp *gimp, GimpColorDisplayStack *stack, GimpColorConfig *config, GimpColorManaged *managed); - - -#endif /* __GIMP_COLOR_DISPLAY_EDITOR_H__ */ diff --git a/app/widgets/gimpcolorframe.h b/app/widgets/gimpcolorframe.h index 3c6988b0e1..70f11d03a0 100644 --- a/app/widgets/gimpcolorframe.h +++ b/app/widgets/gimpcolorframe.h @@ -15,8 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_COLOR_FRAME_H__ -#define __GIMP_COLOR_FRAME_H__ +#pragma once #define GIMP_COLOR_FRAME_ROWS 6 @@ -111,6 +110,3 @@ void gimp_color_frame_set_color_config (GimpColorFrame *frame, void gimp_color_frame_set_image (GimpColorFrame *frame, GimpImage *image); - - -#endif /* __GIMP_COLOR_FRAME_H__ */ diff --git a/app/widgets/gimpcolorhistory.h b/app/widgets/gimpcolorhistory.h index 428bdb4dd1..5b07c131a6 100644 --- a/app/widgets/gimpcolorhistory.h +++ b/app/widgets/gimpcolorhistory.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_COLOR_HISTORY_H__ -#define __GIMP_COLOR_HISTORY_H__ +#pragma once #define GIMP_TYPE_COLOR_HISTORY (gimp_color_history_get_type ()) @@ -59,6 +58,3 @@ GType gimp_color_history_get_type (void) G_GNUC_CONST; GtkWidget * gimp_color_history_new (GimpContext *context, gint history_size); - - -#endif /* __GIMP_COLOR_HISTORY_H__ */ diff --git a/app/widgets/gimpcolormapeditor.h b/app/widgets/gimpcolormapeditor.h index f3fa2933d7..6303de90ed 100644 --- a/app/widgets/gimpcolormapeditor.h +++ b/app/widgets/gimpcolormapeditor.h @@ -15,9 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_COLORMAP_EDITOR_H__ -#define __GIMP_COLORMAP_EDITOR_H__ - +#pragma once #include "gimpimageeditor.h" @@ -61,6 +59,3 @@ gboolean gimp_colormap_editor_set_index (GimpColormapEditor *editor, GeglColor *color); gint gimp_colormap_editor_max_index (GimpColormapEditor *editor); - - -#endif /* __GIMP_COLORMAP_EDITOR_H__ */ diff --git a/app/widgets/gimpcolormapselection.h b/app/widgets/gimpcolormapselection.h index ab185bcc8d..8e14594967 100644 --- a/app/widgets/gimpcolormapselection.h +++ b/app/widgets/gimpcolormapselection.h @@ -15,8 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_COLORMAP_SELECTION_H__ -#define __GIMP_COLORMAP_SELECTION_H__ +#pragma once #define GIMP_TYPE_COLORMAP_SELECTION (gimp_colormap_selection_get_type ()) @@ -80,5 +79,4 @@ void gimp_colormap_selection_get_entry_rect (GimpColormapSelection GimpPaletteEntry *entry, GdkRectangle *rect); -#endif /* __GIMP_COLORMAP_SELECTION_H__ */ diff --git a/app/widgets/gimpcolorpanel.h b/app/widgets/gimpcolorpanel.h index b5b319c13d..c3def7a0ce 100644 --- a/app/widgets/gimpcolorpanel.h +++ b/app/widgets/gimpcolorpanel.h @@ -15,8 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_COLOR_PANEL_H__ -#define __GIMP_COLOR_PANEL_H__ +#pragma once #define GIMP_TYPE_COLOR_PANEL (gimp_color_panel_get_type ()) @@ -66,6 +65,3 @@ void gimp_color_panel_set_user_context_aware void gimp_color_panel_dialog_response (GimpColorPanel *panel, GimpColorDialogState state); - - -#endif /* __GIMP_COLOR_PANEL_H__ */ diff --git a/app/widgets/gimpcolorselectorpalette.h b/app/widgets/gimpcolorselectorpalette.h index 7072238149..0640b2a4e9 100644 --- a/app/widgets/gimpcolorselectorpalette.h +++ b/app/widgets/gimpcolorselectorpalette.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_COLOR_SELECTOR_PALETTE_H__ -#define __GIMP_COLOR_SELECTOR_PALETTE_H__ +#pragma once #define GIMP_TYPE_COLOR_SELECTOR_PALETTE (gimp_color_selector_palette_get_type ()) @@ -49,6 +48,3 @@ struct _GimpColorSelectorPaletteClass GType gimp_color_selector_palette_get_type (void) G_GNUC_CONST; - - -#endif /* __GIMP_COLOR_SELECTOR_PALETTE_H__ */ diff --git a/app/widgets/gimpcombotagentry.h b/app/widgets/gimpcombotagentry.h index 0e625de8a8..979fceed32 100644 --- a/app/widgets/gimpcombotagentry.h +++ b/app/widgets/gimpcombotagentry.h @@ -18,11 +18,11 @@ * along with this program. If not, see . */ -#ifndef __GIMP_COMBO_TAG_ENTRY_H__ -#define __GIMP_COMBO_TAG_ENTRY_H__ +#pragma once #include "gimptagentry.h" + #define GIMP_TYPE_COMBO_TAG_ENTRY (gimp_combo_tag_entry_get_type ()) #define GIMP_COMBO_TAG_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COMBO_TAG_ENTRY, GimpComboTagEntry)) #define GIMP_COMBO_TAG_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COMBO_TAG_ENTRY, GimpComboTagEntryClass)) @@ -50,6 +50,3 @@ GType gimp_combo_tag_entry_get_type (void) G_GNUC_CONST; GtkWidget * gimp_combo_tag_entry_new (GimpTaggedContainer *container, GimpTagEntryMode mode); - - -#endif /* __GIMP_COMBO_TAG_ENTRY_H__ */ diff --git a/app/widgets/gimpcomponenteditor.h b/app/widgets/gimpcomponenteditor.h index 717e8cb79e..d7a1aa3890 100644 --- a/app/widgets/gimpcomponenteditor.h +++ b/app/widgets/gimpcomponenteditor.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_COMPONENT_EDITOR_H__ -#define __GIMP_COMPONENT_EDITOR_H__ - +#pragma once #include "gimpimageeditor.h" @@ -64,6 +62,3 @@ GtkWidget * gimp_component_editor_new (gint view_size, GimpMenuFactory *menu_factory); void gimp_component_editor_set_view_size (GimpComponentEditor *editor, gint view_size); - - -#endif /* __GIMP_COMPONENT_EDITOR_H__ */ diff --git a/app/widgets/gimpcompressioncombobox.h b/app/widgets/gimpcompressioncombobox.h index 71ac4502e1..c266f65b5a 100644 --- a/app/widgets/gimpcompressioncombobox.h +++ b/app/widgets/gimpcompressioncombobox.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_COMPRESSION_COMBO_BOX_H__ -#define __GIMP_COMPRESSION_COMBO_BOX_H__ +#pragma once #define GIMP_TYPE_COMPRESSION_COMBO_BOX (gimp_compression_combo_box_get_type ()) @@ -51,5 +50,3 @@ GtkWidget * gimp_compression_combo_box_new (void); void gimp_compression_combo_box_set_compression (GimpCompressionComboBox *combo_box, const gchar *compression); gchar * gimp_compression_combo_box_get_compression (GimpCompressionComboBox *combo_box); - -#endif /* __GIMP_COMPRESSION_COMBO_BOX_H__ */ diff --git a/app/widgets/gimpcontainercombobox.h b/app/widgets/gimpcontainercombobox.h index 6fbeea1f74..923253890d 100644 --- a/app/widgets/gimpcontainercombobox.h +++ b/app/widgets/gimpcontainercombobox.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CONTAINER_COMBO_BOX_H__ -#define __GIMP_CONTAINER_COMBO_BOX_H__ +#pragma once #define GIMP_TYPE_CONTAINER_COMBO_BOX (gimp_container_combo_box_get_type ()) @@ -52,6 +51,3 @@ GtkWidget * gimp_container_combo_box_new (GimpContainer *container, GimpContext *context, gint view_size, gint view_border_width); - - -#endif /* __GIMP_CONTAINER_COMBO_BOX_H__ */ diff --git a/app/widgets/gimpcontainerentry.h b/app/widgets/gimpcontainerentry.h index 6705ac2d2b..6606446495 100644 --- a/app/widgets/gimpcontainerentry.h +++ b/app/widgets/gimpcontainerentry.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CONTAINER_ENTRY_H__ -#define __GIMP_CONTAINER_ENTRY_H__ +#pragma once #define GIMP_TYPE_CONTAINER_ENTRY (gimp_container_entry_get_type ()) @@ -51,6 +50,3 @@ GtkWidget * gimp_container_entry_new (GimpContainer *container, GimpContext *context, gint view_size, gint view_border_width); - - -#endif /* __GIMP_CONTAINER_ENTRY_H__ */ diff --git a/app/widgets/gimpcontainerpopup.h b/app/widgets/gimpcontainerpopup.h index 77e4c9a76b..7a75651e7d 100644 --- a/app/widgets/gimpcontainerpopup.h +++ b/app/widgets/gimpcontainerpopup.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CONTAINER_POPUP_H__ -#define __GIMP_CONTAINER_POPUP_H__ - +#pragma once #include "gimppopup.h" @@ -83,6 +81,3 @@ void gimp_container_popup_set_view_type (GimpContainerPopup *popup, GimpViewSize gimp_container_popup_get_view_size (GimpContainerPopup *popup); void gimp_container_popup_set_view_size (GimpContainerPopup *popup, GimpViewSize view_size); - - -#endif /* __GIMP_CONTAINER_POPUP_H__ */ diff --git a/app/widgets/gimpcontainertreeview-dnd.h b/app/widgets/gimpcontainertreeview-dnd.h index f6fe0d9139..e4bc8eec6b 100644 --- a/app/widgets/gimpcontainertreeview-dnd.h +++ b/app/widgets/gimpcontainertreeview-dnd.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CONTAINER_TREE_VIEW_DND_H__ -#define __GIMP_CONTAINER_TREE_VIEW_DND_H__ +#pragma once void gimp_container_tree_view_drag_failed (GtkWidget *widget, @@ -66,6 +65,3 @@ gimp_container_tree_view_real_drop_viewables (GimpContainerTreeView *tree_view GList *src_viewables, GimpViewable *dest_viewable, GtkTreeViewDropPosition drop_pos); - - -#endif /* __GIMP_CONTAINER_TREE_VIEW_DND_H__ */ diff --git a/app/widgets/gimpcontainerview-utils.h b/app/widgets/gimpcontainerview-utils.h index b179eefaf8..fa352aef61 100644 --- a/app/widgets/gimpcontainerview-utils.h +++ b/app/widgets/gimpcontainerview-utils.h @@ -18,13 +18,9 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CONTAINER_VIEW_UTILS_H__ -#define __GIMP_CONTAINER_VIEW_UTILS_H__ +#pragma once GimpContainerView * gimp_container_view_get_by_dockable (GimpDockable *dockable); void gimp_container_view_remove_active (GimpContainerView *view); - - -#endif /* __GIMP_CONTAINER_VIEW_UTILS_H__ */ diff --git a/app/widgets/gimpcontrollereditor.h b/app/widgets/gimpcontrollereditor.h index d46aa173d9..6a93484670 100644 --- a/app/widgets/gimpcontrollereditor.h +++ b/app/widgets/gimpcontrollereditor.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CONTROLLER_EDITOR_H__ -#define __GIMP_CONTROLLER_EDITOR_H__ +#pragma once #define GIMP_TYPE_CONTROLLER_EDITOR (gimp_controller_editor_get_type ()) @@ -59,6 +58,3 @@ GType gimp_controller_editor_get_type (void) G_GNUC_CONST; GtkWidget * gimp_controller_editor_new (GimpControllerInfo *info, GimpContext *context); - - -#endif /* __GIMP_CONTROLLER_EDITOR_H__ */ diff --git a/app/widgets/gimpcontrollerinfo.h b/app/widgets/gimpcontrollerinfo.h index b655f47ba9..d539ce8c73 100644 --- a/app/widgets/gimpcontrollerinfo.h +++ b/app/widgets/gimpcontrollerinfo.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CONTROLLER_INFO_H__ -#define __GIMP_CONTROLLER_INFO_H__ - +#pragma once #include "core/gimpviewable.h" @@ -77,6 +75,3 @@ gboolean gimp_controller_info_get_enabled (GimpControllerInfo *inf void gimp_controller_info_set_event_snooper (GimpControllerInfo *info, GimpControllerEventSnooper snooper, gpointer snooper_data); - - -#endif /* __GIMP_CONTROLLER_INFO_H__ */ diff --git a/app/widgets/gimpcontrollerkeyboard.h b/app/widgets/gimpcontrollerkeyboard.h index f17d0a13db..bf86ba403d 100644 --- a/app/widgets/gimpcontrollerkeyboard.h +++ b/app/widgets/gimpcontrollerkeyboard.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CONTROLLER_KEYBOARD_H__ -#define __GIMP_CONTROLLER_KEYBOARD_H__ - +#pragma once #define GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION #include "libgimpwidgets/gimpcontroller.h" @@ -51,6 +49,3 @@ GType gimp_controller_keyboard_get_type (void) G_GNUC_CONST; gboolean gimp_controller_keyboard_key_press (GimpControllerKeyboard *keyboard, const GdkEventKey *kevent); - - -#endif /* __GIMP_CONTROLLER_KEYBOARD_H__ */ diff --git a/app/widgets/gimpcontrollerwheel.h b/app/widgets/gimpcontrollerwheel.h index ede656428b..2589e6414e 100644 --- a/app/widgets/gimpcontrollerwheel.h +++ b/app/widgets/gimpcontrollerwheel.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CONTROLLER_WHEEL_H__ -#define __GIMP_CONTROLLER_WHEEL_H__ - +#pragma once #define GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION #include "libgimpwidgets/gimpcontroller.h" @@ -51,6 +49,3 @@ GType gimp_controller_wheel_get_type (void) G_GNUC_CONST; gboolean gimp_controller_wheel_scroll (GimpControllerWheel *wheel, const GdkEventScroll *sevent); - - -#endif /* __GIMP_CONTROLLER_WHEEL_H__ */ diff --git a/app/widgets/gimpcriticaldialog.h b/app/widgets/gimpcriticaldialog.h index 9721bf0add..eab56298f2 100644 --- a/app/widgets/gimpcriticaldialog.h +++ b/app/widgets/gimpcriticaldialog.h @@ -18,10 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_CRITICAL_DIALOG_H__ -#define __GIMP_CRITICAL_DIALOG_H__ - -G_BEGIN_DECLS +#pragma once #define GIMP_TYPE_CRITICAL_DIALOG (gimp_critical_dialog_get_type ()) @@ -69,8 +66,3 @@ void gimp_critical_dialog_add (GtkWidget *dialog, gboolean is_fatal, const gchar *program, gint pid); - - -G_END_DECLS - -#endif /* __GIMP_CRITICAL_DIALOG_H__ */ diff --git a/app/widgets/gimpdashboard.h b/app/widgets/gimpdashboard.h index 5d8a73f63c..bae2af12f3 100644 --- a/app/widgets/gimpdashboard.h +++ b/app/widgets/gimpdashboard.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DASHBOARD_H__ -#define __GIMP_DASHBOARD_H__ - +#pragma once #include "gimpeditor.h" @@ -90,6 +88,3 @@ gboolean gimp_dashboard_get_low_swap_space_warning (GimpDa void gimp_dashboard_menu_setup (GimpUIManager *manager, const gchar *ui_path); - - -#endif /* __GIMP_DASHBOARD_H__ */ diff --git a/app/widgets/gimpdasheditor.h b/app/widgets/gimpdasheditor.h index cfc346fafe..24ad9c68ef 100644 --- a/app/widgets/gimpdasheditor.h +++ b/app/widgets/gimpdasheditor.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DASH_EDITOR_H__ -#define __GIMP_DASH_EDITOR_H__ +#pragma once #define GIMP_TYPE_DASH_EDITOR (gimp_dash_editor_get_type ()) @@ -65,6 +64,3 @@ GtkWidget * gimp_dash_editor_new (GimpStrokeOptions *stroke_options); void gimp_dash_editor_shift_left (GimpDashEditor *editor); void gimp_dash_editor_shift_right (GimpDashEditor *editor); - - -#endif /* __GIMP_DASH_EDITOR_H__ */ diff --git a/app/widgets/gimpdataeditor.h b/app/widgets/gimpdataeditor.h index 70d77bff75..554042e56b 100644 --- a/app/widgets/gimpdataeditor.h +++ b/app/widgets/gimpdataeditor.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DATA_EDITOR_H__ -#define __GIMP_DATA_EDITOR_H__ - +#pragma once #include "gimpeditor.h" @@ -72,6 +70,3 @@ GimpData * gimp_data_editor_get_data (GimpDataEditor *editor); void gimp_data_editor_set_edit_active (GimpDataEditor *editor, gboolean edit_active); gboolean gimp_data_editor_get_edit_active (GimpDataEditor *editor); - - -#endif /* __GIMP_DATA_EDITOR_H__ */ diff --git a/app/widgets/gimpdatafactoryview.h b/app/widgets/gimpdatafactoryview.h index 3a8752aeeb..a3975a2f45 100644 --- a/app/widgets/gimpdatafactoryview.h +++ b/app/widgets/gimpdatafactoryview.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DATA_FACTORY_VIEW_H__ -#define __GIMP_DATA_FACTORY_VIEW_H__ - +#pragma once #include "gimpcontainereditor.h" @@ -72,6 +70,3 @@ GType gimp_data_factory_view_get_child_type (GimpDataFacto gboolean gimp_data_factory_view_has_data_new_func (GimpDataFactoryView *factory_view); gboolean gimp_data_factory_view_have (GimpDataFactoryView *factory_view, GimpObject *object); - - -#endif /* __GIMP_DATA_FACTORY_VIEW_H__ */ diff --git a/app/widgets/gimpdeviceeditor.h b/app/widgets/gimpdeviceeditor.h index 38de6cef61..80ac39bfb4 100644 --- a/app/widgets/gimpdeviceeditor.h +++ b/app/widgets/gimpdeviceeditor.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DEVICE_EDITOR_H__ -#define __GIMP_DEVICE_EDITOR_H__ +#pragma once #define GIMP_TYPE_DEVICE_EDITOR (gimp_device_editor_get_type ()) @@ -46,6 +45,3 @@ struct _GimpDeviceEditorClass GType gimp_device_editor_get_type (void) G_GNUC_CONST; GtkWidget * gimp_device_editor_new (Gimp *gimp); - - -#endif /* __GIMP_DEVICE_EDITOR_H__ */ diff --git a/app/widgets/gimpdeviceinfo-coords.h b/app/widgets/gimpdeviceinfo-coords.h index 862a75f358..e63a4be9ff 100644 --- a/app/widgets/gimpdeviceinfo-coords.h +++ b/app/widgets/gimpdeviceinfo-coords.h @@ -15,8 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DEVICE_INFO_COORDS_H__ -#define __GIMP_DEVICE_INFO_COORDS_H__ +#pragma once gboolean gimp_device_info_get_event_coords (GimpDeviceInfo *info, @@ -38,6 +37,3 @@ gboolean gimp_device_info_get_event_state (GimpDeviceInfo *info, void gimp_device_info_get_device_state (GimpDeviceInfo *info, GdkWindow *window, GdkModifierType *state); - - -#endif /* __GIMP_DEVICE_INFO_COORDS_H__ */ diff --git a/app/widgets/gimpdeviceinfo.h b/app/widgets/gimpdeviceinfo.h index f8d1355ae6..b227d2f6d6 100644 --- a/app/widgets/gimpdeviceinfo.h +++ b/app/widgets/gimpdeviceinfo.h @@ -15,16 +15,11 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DEVICE_INFO_H__ -#define __GIMP_DEVICE_INFO_H__ - +#pragma once #include "core/gimptoolpreset.h" -G_BEGIN_DECLS - - typedef struct _GimpDeviceKey GimpDeviceKey; struct _GimpDeviceKey @@ -128,8 +123,3 @@ GimpPadActions * gimp_device_info_get_pad_actions (GimpDeviceInfo *info); GtkPadController * gimp_device_info_create_pad_controller (GimpDeviceInfo *info, GimpWindow *window); - - -G_END_DECLS - -#endif /* __GIMP_DEVICE_INFO_H__ */ diff --git a/app/widgets/gimpdeviceinfoeditor.h b/app/widgets/gimpdeviceinfoeditor.h index 85fafc7433..06043a120b 100644 --- a/app/widgets/gimpdeviceinfoeditor.h +++ b/app/widgets/gimpdeviceinfoeditor.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DEVICE_INFO_EDITOR_H__ -#define __GIMP_DEVICE_INFO_EDITOR_H__ +#pragma once #define GIMP_TYPE_DEVICE_INFO_EDITOR (gimp_device_info_editor_get_type ()) @@ -46,6 +45,3 @@ struct _GimpDeviceInfoEditorClass GType gimp_device_info_editor_get_type (void) G_GNUC_CONST; GtkWidget * gimp_device_info_editor_new (GimpDeviceInfo *info); - - -#endif /* __GIMP_DEVICE_INFO_EDITOR_H__ */ diff --git a/app/widgets/gimpdevices.h b/app/widgets/gimpdevices.h index 6624515a76..df33922e6d 100644 --- a/app/widgets/gimpdevices.h +++ b/app/widgets/gimpdevices.h @@ -15,8 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DEVICES_H__ -#define __GIMP_DEVICES_H__ +#pragma once void gimp_devices_init (Gimp *gimp); @@ -43,6 +42,3 @@ gboolean gimp_devices_check_callback (GtkWidget *widget, Gimp *gimp); gboolean gimp_devices_check_change (Gimp *gimp, GdkDevice *device); - - -#endif /* __GIMP_DEVICES_H__ */ diff --git a/app/widgets/gimpdevicestatus.h b/app/widgets/gimpdevicestatus.h index 2bc4650159..809b97a3d3 100644 --- a/app/widgets/gimpdevicestatus.h +++ b/app/widgets/gimpdevicestatus.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DEVICE_STATUS_H__ -#define __GIMP_DEVICE_STATUS_H__ - +#pragma once #include "gimpeditor.h" @@ -60,6 +58,3 @@ struct _GimpDeviceStatusClass GType gimp_device_status_get_type (void) G_GNUC_CONST; GtkWidget * gimp_device_status_new (Gimp *gimp); - - -#endif /* __GIMP_DEVICE_STATUS_H__ */ diff --git a/app/widgets/gimpdialogfactory.h b/app/widgets/gimpdialogfactory.h index d2015aace2..3ea22d287f 100644 --- a/app/widgets/gimpdialogfactory.h +++ b/app/widgets/gimpdialogfactory.h @@ -18,12 +18,11 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DIALOG_FACTORY_H__ -#define __GIMP_DIALOG_FACTORY_H__ - +#pragma once #include "core/gimpobject.h" + #define GIMP_DIALOG_VISIBILITY_KEY "gimp-dialog-visibility" typedef enum @@ -205,6 +204,3 @@ gboolean gimp_dialog_factory_get_has_min_size (GtkWindow GimpDialogFactory * gimp_dialog_factory_get_singleton (void); void gimp_dialog_factory_set_singleton (GimpDialogFactory *factory); - - -#endif /* __GIMP_DIALOG_FACTORY_H__ */ diff --git a/app/widgets/gimpdnd-xds.h b/app/widgets/gimpdnd-xds.h index c6aa4c1379..a89f3c1add 100644 --- a/app/widgets/gimpdnd-xds.h +++ b/app/widgets/gimpdnd-xds.h @@ -21,8 +21,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DND_XDS_H__ -#define __GIMP_DND_XDS_H__ +#pragma once void gimp_dnd_xds_source_set (GdkDragContext *context, @@ -30,6 +29,3 @@ void gimp_dnd_xds_source_set (GdkDragContext *context, void gimp_dnd_xds_save_image (GdkDragContext *context, GimpImage *image, GtkSelectionData *selection); - - -#endif /* __GIMP_DND_XDS_H__ */ diff --git a/app/widgets/gimpdock.h b/app/widgets/gimpdock.h index 691c95219f..b8e3c23f21 100644 --- a/app/widgets/gimpdock.h +++ b/app/widgets/gimpdock.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DOCK_H__ -#define __GIMP_DOCK_H__ +#pragma once #define GIMP_TYPE_DOCK (gimp_dock_get_type ()) @@ -105,6 +104,3 @@ void gimp_dock_add_book (GimpDock *dock, gint index); void gimp_dock_remove_book (GimpDock *dock, GimpDockbook *dockbook); - - -#endif /* __GIMP_DOCK_H__ */ diff --git a/app/widgets/gimpdockable.h b/app/widgets/gimpdockable.h index 3298e41f05..bae579a9c8 100644 --- a/app/widgets/gimpdockable.h +++ b/app/widgets/gimpdockable.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DOCKABLE_H__ -#define __GIMP_DOCKABLE_H__ +#pragma once #define GIMP_DOCKABLE_DRAG_OFFSET (-6) @@ -93,6 +92,3 @@ GimpUIManager * gimp_dockable_get_menu (GimpDockable *dockable, gpointer *popup_data); void gimp_dockable_detach (GimpDockable *dockable); - - -#endif /* __GIMP_DOCKABLE_H__ */ diff --git a/app/widgets/gimpdockbook.h b/app/widgets/gimpdockbook.h index d66569d2f5..047c5f43de 100644 --- a/app/widgets/gimpdockbook.h +++ b/app/widgets/gimpdockbook.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DOCKBOOK_H__ -#define __GIMP_DOCKBOOK_H__ +#pragma once #define GIMP_TYPE_DOCKBOOK (gimp_dockbook_get_type ()) @@ -85,6 +84,3 @@ void gimp_dockbook_add_drag_callback (GimpDockbookDragCallback gpointer data); void gimp_dockbook_remove_drag_callback (GimpDockbookDragCallback callback, gpointer data); - - -#endif /* __GIMP_DOCKBOOK_H__ */ diff --git a/app/widgets/gimpdockcolumns.h b/app/widgets/gimpdockcolumns.h index bd9f6192a6..77a7e34512 100644 --- a/app/widgets/gimpdockcolumns.h +++ b/app/widgets/gimpdockcolumns.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DOCK_COLUMNS_H__ -#define __GIMP_DOCK_COLUMNS_H__ +#pragma once #define GIMP_TYPE_DOCK_COLUMNS (gimp_dock_columns_get_type ()) @@ -75,6 +74,3 @@ void gimp_dock_columns_set_context (GimpDockColumns *doc GimpContext *context); GimpDialogFactory * gimp_dock_columns_get_dialog_factory (GimpDockColumns *dock_columns); GimpUIManager * gimp_dock_columns_get_ui_manager (GimpDockColumns *dock_columns); - - -#endif /* __GIMP_DOCK_COLUMNS_H__ */ diff --git a/app/widgets/gimpdockcontainer.h b/app/widgets/gimpdockcontainer.h index 497fd33b48..0fcbef2720 100644 --- a/app/widgets/gimpdockcontainer.h +++ b/app/widgets/gimpdockcontainer.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DOCK_CONTAINER_H__ -#define __GIMP_DOCK_CONTAINER_H__ +#pragma once #define GIMP_TYPE_DOCK_CONTAINER (gimp_dock_container_get_type ()) @@ -50,6 +49,3 @@ void gimp_dock_container_add_dock (GimpDockContainer GimpSessionInfoDock *dock_info); GimpAlignmentType gimp_dock_container_get_dock_side (GimpDockContainer *container, GimpDock *dock); - - -#endif /* __GIMP_DOCK_CONTAINER_H__ */ diff --git a/app/widgets/gimpdocked.h b/app/widgets/gimpdocked.h index ae6433282f..c7c449d4ac 100644 --- a/app/widgets/gimpdocked.h +++ b/app/widgets/gimpdocked.h @@ -18,12 +18,14 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DOCKED_H__ -#define __GIMP_DOCKED_H__ +#pragma once #define GIMP_TYPE_DOCKED (gimp_docked_get_type ()) -G_DECLARE_INTERFACE (GimpDocked, gimp_docked, GIMP, DOCKED, GtkWidget) +G_DECLARE_INTERFACE (GimpDocked, + gimp_docked, + GIMP, DOCKED, + GtkWidget) /** @@ -84,6 +86,3 @@ gboolean gimp_docked_has_button_bar (GimpDocked *docked); void gimp_docked_set_show_button_bar (GimpDocked *docked, gboolean show); gboolean gimp_docked_get_show_button_bar (GimpDocked *docked); - - -#endif /* __GIMP_DOCKED_H__ */ diff --git a/app/widgets/gimpdockwindow.h b/app/widgets/gimpdockwindow.h index d09bfc04da..e2568837cb 100644 --- a/app/widgets/gimpdockwindow.h +++ b/app/widgets/gimpdockwindow.h @@ -19,9 +19,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DOCK_WINDOW_H__ -#define __GIMP_DOCK_WINDOW_H__ - +#pragma once #include "widgets/gimpwindow.h" @@ -79,7 +77,3 @@ void gimp_dock_window_setup (GimpDockWindow * gboolean gimp_dock_window_has_toolbox (GimpDockWindow *dock_window); GimpDockWindow * gimp_dock_window_from_dock (GimpDock *dock); - - - -#endif /* __GIMP_DOCK_WINDOW_H__ */ diff --git a/app/widgets/gimpdocumentview.h b/app/widgets/gimpdocumentview.h index 947a38d807..d6f75896e7 100644 --- a/app/widgets/gimpdocumentview.h +++ b/app/widgets/gimpdocumentview.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DOCUMENT_VIEW_H__ -#define __GIMP_DOCUMENT_VIEW_H__ - +#pragma once #include "gimpcontainereditor.h" @@ -58,6 +56,3 @@ GtkWidget * gimp_document_view_new (GimpViewType view_type, gint view_size, gint view_border_width, GimpMenuFactory *menu_factory); - - -#endif /* __GIMP_DOCUMENT_VIEW_H__ */ diff --git a/app/widgets/gimpdoubleaction.h b/app/widgets/gimpdoubleaction.h index ad5cd9e3b5..7180db0cfc 100644 --- a/app/widgets/gimpdoubleaction.h +++ b/app/widgets/gimpdoubleaction.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DOUBLE_ACTION_H__ -#define __GIMP_DOUBLE_ACTION_H__ - +#pragma once #include "gimpactionimpl.h" @@ -58,6 +56,3 @@ GimpDoubleAction * gimp_double_action_new (const gchar *name, const gchar *help_id, gdouble value, GimpContext *context); - - -#endif /* __GIMP_DOUBLE_ACTION_H__ */ diff --git a/app/widgets/gimpdynamicseditor.h b/app/widgets/gimpdynamicseditor.h index d0eb23be20..d162c6e5c2 100644 --- a/app/widgets/gimpdynamicseditor.h +++ b/app/widgets/gimpdynamicseditor.h @@ -15,9 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DYNAMICS_EDITOR_H__ -#define __GIMP_DYNAMICS_EDITOR_H__ - +#pragma once #include "gimpdataeditor.h" @@ -52,6 +50,3 @@ GType gimp_dynamics_editor_get_type (void) G_GNUC_CONST; GtkWidget * gimp_dynamics_editor_new (GimpContext *context, GimpMenuFactory *menu_factory); - - -#endif /* __GIMP_DYNAMICS_EDITOR_H__ */ diff --git a/app/widgets/gimpdynamicsfactoryview.h b/app/widgets/gimpdynamicsfactoryview.h index d7a21010fe..1392c40d47 100644 --- a/app/widgets/gimpdynamicsfactoryview.h +++ b/app/widgets/gimpdynamicsfactoryview.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DYNAMICS_FACTORY_VIEW_H__ -#define __GIMP_DYNAMICS_FACTORY_VIEW_H__ +#pragma once #include "gimpdatafactoryview.h" @@ -53,6 +52,3 @@ GtkWidget * gimp_dynamics_factory_view_new (GimpViewType view_type, gint view_size, gint view_border_width, GimpMenuFactory *menu_factory); - - -#endif /* __GIMP_DYNAMICS_FACTORY_VIEW_H__ */ diff --git a/app/widgets/gimpdynamicsoutputeditor.h b/app/widgets/gimpdynamicsoutputeditor.h index b5f6e4fc83..41e3c082a9 100644 --- a/app/widgets/gimpdynamicsoutputeditor.h +++ b/app/widgets/gimpdynamicsoutputeditor.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_DYNAMICS_OUTPUT_EDITOR_H__ -#define __GIMP_DYNAMICS_OUTPUT_EDITOR_H__ +#pragma once #define GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR (gimp_dynamics_output_editor_get_type ()) @@ -46,6 +45,3 @@ struct _GimpDynamicsOutputEditorClass GType gimp_dynamics_output_editor_get_type (void) G_GNUC_CONST; GtkWidget * gimp_dynamics_output_editor_new (GimpDynamicsOutput *output); - - -#endif /* __GIMP_DYNAMICS_OUTPUT_EDITOR_H__ */ diff --git a/app/widgets/gimpenumaction.h b/app/widgets/gimpenumaction.h index db7de0ce6e..181c7fe7f0 100644 --- a/app/widgets/gimpenumaction.h +++ b/app/widgets/gimpenumaction.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_ENUM_ACTION_H__ -#define __GIMP_ENUM_ACTION_H__ - +#pragma once #include "gimpactionimpl.h" @@ -60,6 +58,3 @@ GimpEnumAction * gimp_enum_action_new (const gchar *name, gint value, gboolean value_variable, GimpContext *context); - - -#endif /* __GIMP_ENUM_ACTION_H__ */ diff --git a/app/widgets/gimperrorconsole.h b/app/widgets/gimperrorconsole.h index ac450c5ec5..59edf36ba6 100644 --- a/app/widgets/gimperrorconsole.h +++ b/app/widgets/gimperrorconsole.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_ERROR_CONSOLE_H__ -#define __GIMP_ERROR_CONSOLE_H__ - +#pragma once #include "gimpeditor.h" @@ -68,6 +66,3 @@ void gimp_error_console_add (GimpErrorConsole *console, GimpMessageSeverity severity, const gchar *domain, const gchar *message); - - -#endif /* __GIMP_ERROR_CONSOLE_H__ */ diff --git a/app/widgets/gimperrordialog.h b/app/widgets/gimperrordialog.h index 5c8d1e59b1..5a830a040c 100644 --- a/app/widgets/gimperrordialog.h +++ b/app/widgets/gimperrordialog.h @@ -18,10 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_ERROR_DIALOG_H__ -#define __GIMP_ERROR_DIALOG_H__ - -G_BEGIN_DECLS +#pragma once #define GIMP_TYPE_ERROR_DIALOG (gimp_error_dialog_get_type ()) @@ -57,9 +54,3 @@ void gimp_error_dialog_add (GimpErrorDialog *dialog, const gchar *icon_name, const gchar *domain, const gchar *message); - - - -G_END_DECLS - -#endif /* __GIMP_ERROR_DIALOG_H__ */ diff --git a/app/widgets/gimpexportdialog.h b/app/widgets/gimpexportdialog.h index f9791c29ea..319bee09ee 100644 --- a/app/widgets/gimpexportdialog.h +++ b/app/widgets/gimpexportdialog.h @@ -18,12 +18,10 @@ * along with this program. If not, see . */ -#ifndef __GIMP_EXPORT_DIALOG_H__ -#define __GIMP_EXPORT_DIALOG_H__ +#pragma once #include "gimpfiledialog.h" -G_BEGIN_DECLS #define GIMP_TYPE_EXPORT_DIALOG (gimp_export_dialog_get_type ()) #define GIMP_EXPORT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_EXPORT_DIALOG, GimpExportDialog)) @@ -55,7 +53,3 @@ GtkWidget * gimp_export_dialog_new (Gimp *gimp); void gimp_export_dialog_set_image (GimpExportDialog *dialog, GimpImage *image, GimpObject *display); - -G_END_DECLS - -#endif /* __GIMP_EXPORT_DIALOG_H__ */ diff --git a/app/widgets/gimpextensiondetails.h b/app/widgets/gimpextensiondetails.h index 2a2916af58..de21cf9a2e 100644 --- a/app/widgets/gimpextensiondetails.h +++ b/app/widgets/gimpextensiondetails.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_EXTENSION_DETAILS_H__ -#define __GIMP_EXTENSION_DETAILS_H__ +#pragma once #define GIMP_TYPE_EXTENSION_DETAILS (gimp_extension_details_get_type ()) @@ -52,6 +51,3 @@ GtkWidget * gimp_extension_details_new (void); void gimp_extension_details_set (GimpExtensionDetails *details, GimpExtension *extension); - -#endif /* __GIMP_EXTENSION_DETAILS_H__ */ - diff --git a/app/widgets/gimpextensionlist.h b/app/widgets/gimpextensionlist.h index a2bcd36f11..eceec7f54a 100644 --- a/app/widgets/gimpextensionlist.h +++ b/app/widgets/gimpextensionlist.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_EXTENSION_LIST_H__ -#define __GIMP_EXTENSION_LIST_H__ +#pragma once #define GIMP_TYPE_EXTENSION_LIST (gimp_extension_list_get_type ()) @@ -44,8 +43,8 @@ struct _GimpExtensionListClass { GtkListBoxClass parent_class; - void (* extension_activated) (GimpExtensionList *list, - GimpExtension *extension); + void (* extension_activated) (GimpExtensionList *list, + GimpExtension *extension); }; @@ -57,5 +56,3 @@ void gimp_extension_list_show_system (GimpExtensionList *list); void gimp_extension_list_show_user (GimpExtensionList *list); void gimp_extension_list_show_search (GimpExtensionList *list, const gchar *search_terms); - -#endif /* __GIMP_EXTENSION_LIST_H__ */ diff --git a/app/widgets/gimpfgbgeditor.h b/app/widgets/gimpfgbgeditor.h index c06af6930c..61e181e6e1 100644 --- a/app/widgets/gimpfgbgeditor.h +++ b/app/widgets/gimpfgbgeditor.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_FG_BG_EDITOR_H__ -#define __GIMP_FG_BG_EDITOR_H__ +#pragma once typedef enum @@ -89,6 +88,3 @@ void gimp_fg_bg_editor_set_context (GimpFgBgEditor *editor, GimpContext *context); void gimp_fg_bg_editor_set_active (GimpFgBgEditor *editor, GimpActiveColor active); - - -#endif /* __GIMP_FG_BG_EDITOR_H__ */ diff --git a/app/widgets/gimpfgbgview.h b/app/widgets/gimpfgbgview.h index 19e97b16f1..7f0f5e891f 100644 --- a/app/widgets/gimpfgbgview.h +++ b/app/widgets/gimpfgbgview.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_FG_BG_VIEW_H__ -#define __GIMP_FG_BG_VIEW_H__ +#pragma once #define GIMP_TYPE_FG_BG_VIEW (gimp_fg_bg_view_get_type ()) @@ -53,6 +52,3 @@ GtkWidget * gimp_fg_bg_view_new (GimpContext *context); void gimp_fg_bg_view_set_context (GimpFgBgView *view, GimpContext *context); - - -#endif /* __GIMP_FG_BG_VIEW_H__ */ diff --git a/app/widgets/gimpfiledialog.h b/app/widgets/gimpfiledialog.h index 4a5ba79cdd..2540066304 100644 --- a/app/widgets/gimpfiledialog.h +++ b/app/widgets/gimpfiledialog.h @@ -18,10 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_FILE_DIALOG_H__ -#define __GIMP_FILE_DIALOG_H__ - -G_BEGIN_DECLS +#pragma once #define GIMP_TYPE_FILE_DIALOG (gimp_file_dialog_get_type ()) @@ -99,8 +96,3 @@ void gimp_file_dialog_save_state (GimpFileDialog *dialog, const gchar *state_name); void gimp_file_dialog_load_state (GimpFileDialog *dialog, const gchar *state_name); - - -G_END_DECLS - -#endif /* __GIMP_FILE_DIALOG_H__ */ diff --git a/app/widgets/gimpfileprocview.h b/app/widgets/gimpfileprocview.h index 6facd34d7a..05888b7db6 100644 --- a/app/widgets/gimpfileprocview.h +++ b/app/widgets/gimpfileprocview.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_FILE_PROC_VIEW_H__ -#define __GIMP_FILE_PROC_VIEW_H__ +#pragma once #define GIMP_TYPE_FILE_PROC_VIEW (gimp_file_proc_view_get_type ()) @@ -61,6 +60,3 @@ gboolean gimp_file_proc_view_set_proc (GimpFileProcView *vie GimpPlugInProcedure *proc); gchar * gimp_file_proc_view_get_help_id (GimpFileProcView *view); - - -#endif /* __GIMP_FILE_PROC_VIEW_H__ */ diff --git a/app/widgets/gimpfontfactoryview.h b/app/widgets/gimpfontfactoryview.h index 8c24e309d9..726cc0f9ad 100644 --- a/app/widgets/gimpfontfactoryview.h +++ b/app/widgets/gimpfontfactoryview.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_FONT_FACTORY_VIEW_H__ -#define __GIMP_FONT_FACTORY_VIEW_H__ +#pragma once #include "gimpdatafactoryview.h" @@ -53,6 +52,3 @@ GtkWidget * gimp_font_factory_view_new (GimpViewType view_type, gint view_size, gint view_border_width, GimpMenuFactory *menu_factory); - - -#endif /* __GIMP_FONT_FACTORY_VIEW_H__ */ diff --git a/app/widgets/gimpfontselect.h b/app/widgets/gimpfontselect.h index e3c5a378ea..62963a9361 100644 --- a/app/widgets/gimpfontselect.h +++ b/app/widgets/gimpfontselect.h @@ -18,13 +18,10 @@ * along with this program. If not, see . */ -#ifndef __GIMP_FONT_SELECT_H__ -#define __GIMP_FONT_SELECT_H__ +#pragma once #include "gimppdbdialog.h" -G_BEGIN_DECLS - #define GIMP_TYPE_FONT_SELECT (gimp_font_select_get_type ()) #define GIMP_FONT_SELECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FONT_SELECT, GimpFontSelect)) @@ -48,8 +45,3 @@ struct _GimpFontSelectClass GType gimp_font_select_get_type (void) G_GNUC_CONST; - - -G_END_DECLS - -#endif /* __GIMP_FONT_SELECT_H__ */ diff --git a/app/widgets/gimpgradienteditor.h b/app/widgets/gimpgradienteditor.h index b829905813..6d05bc8a69 100644 --- a/app/widgets/gimpgradienteditor.h +++ b/app/widgets/gimpgradienteditor.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_GRADIENT_EDITOR_H__ -#define __GIMP_GRADIENT_EDITOR_H__ - +#pragma once #include "gimpdataeditor.h" @@ -117,6 +115,3 @@ void gimp_gradient_editor_zoom (GimpGradientEditor *editor, GimpZoomType zoom_type, gdouble delta, gdouble zoom_focus_x); - - -#endif /* __GIMP_GRADIENT_EDITOR_H__ */ diff --git a/app/widgets/gimpgradientselect.h b/app/widgets/gimpgradientselect.h index ec2f9b09da..9fd89159aa 100644 --- a/app/widgets/gimpgradientselect.h +++ b/app/widgets/gimpgradientselect.h @@ -18,13 +18,10 @@ * along with this program. If not, see . */ -#ifndef __GIMP_GRADIENT_SELECT_H__ -#define __GIMP_GRADIENT_SELECT_H__ +#pragma once #include "gimppdbdialog.h" -G_BEGIN_DECLS - #define GIMP_TYPE_GRADIENT_SELECT (gimp_gradient_select_get_type ()) #define GIMP_GRADIENT_SELECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GRADIENT_SELECT, GimpGradientSelect)) @@ -50,8 +47,3 @@ struct _GimpGradientSelectClass GType gimp_gradient_select_get_type (void) G_GNUC_CONST; - - -G_END_DECLS - -#endif /* __GIMP_GRADIENT_SELECT_H__ */ diff --git a/app/widgets/gimpgrideditor.h b/app/widgets/gimpgrideditor.h index 659674b379..f5b33af1d8 100644 --- a/app/widgets/gimpgrideditor.h +++ b/app/widgets/gimpgrideditor.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_GRID_EDITOR_H__ -#define __GIMP_GRID_EDITOR_H__ +#pragma once #define GIMP_TYPE_GRID_EDITOR (gimp_grid_editor_get_type ()) @@ -54,6 +53,3 @@ GtkWidget * gimp_grid_editor_new (GimpGrid *grid, GimpContext *context, gdouble xresolution, gdouble yresolution); - - -#endif /* __GIMP_GRID_EDITOR_H__ */ diff --git a/app/widgets/gimphandlebar.h b/app/widgets/gimphandlebar.h index 6007d50c04..5913c2e21a 100644 --- a/app/widgets/gimphandlebar.h +++ b/app/widgets/gimphandlebar.h @@ -15,8 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_HANDLE_BAR_H__ -#define __GIMP_HANDLE_BAR_H__ +#pragma once #define GIMP_TYPE_HANDLE_BAR (gimp_handle_bar_get_type ()) @@ -68,6 +67,3 @@ gboolean gimp_handle_bar_get_limits (GimpHandleBar *bar, void gimp_handle_bar_connect_events (GimpHandleBar *bar, GtkWidget *event_source); - - -#endif /* __GIMP_HANDLE_BAR_H__ */ diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h index 3d13392b22..66306d5652 100644 --- a/app/widgets/gimphelp-ids.h +++ b/app/widgets/gimphelp-ids.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_HELP_IDS_H__ -#define __GIMP_HELP_IDS_H__ +#pragma once #define GIMP_HELP_MAIN "gimp-main" @@ -804,5 +803,3 @@ #define GIMP_HELP_EXTENSIONS_INSTALLED "gimp-extensions-installed" #define GIMP_HELP_EXTENSIONS_SYSTEM "gimp-extensions-system" #define GIMP_HELP_EXTENSIONS_INSTALL "gimp-extensions-install" - -#endif /* __GIMP_HELP_IDS_H__ */ diff --git a/app/widgets/gimphelp.h b/app/widgets/gimphelp.h index d4508d26fa..38b893f3e3 100644 --- a/app/widgets/gimphelp.h +++ b/app/widgets/gimphelp.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_HELP_H__ -#define __GIMP_HELP_H__ +#pragma once /* the main help function @@ -47,5 +46,3 @@ void gimp_help_user_manual_changed (Gimp *gimp); GList * gimp_help_get_installed_languages (void); - -#endif /* __GIMP_HELP_H__ */ diff --git a/app/widgets/gimphistogramview.h b/app/widgets/gimphistogramview.h index c6dc140c4f..98b8040c31 100644 --- a/app/widgets/gimphistogramview.h +++ b/app/widgets/gimphistogramview.h @@ -15,8 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_HISTOGRAM_VIEW_H__ -#define __GIMP_HISTOGRAM_VIEW_H__ +#pragma once #define GIMP_TYPE_HISTOGRAM_VIEW (gimp_histogram_view_get_type ()) @@ -85,6 +84,3 @@ void gimp_histogram_view_set_range (GimpHistogramView *view, void gimp_histogram_view_get_range (GimpHistogramView *view, gint *start, gint *end); - - -#endif /* __GIMP_HISTOGRAM_VIEW_H__ */ diff --git a/app/widgets/gimpimagecommenteditor.h b/app/widgets/gimpimagecommenteditor.h index 0bcd880bc4..5d82ad3ccb 100644 --- a/app/widgets/gimpimagecommenteditor.h +++ b/app/widgets/gimpimagecommenteditor.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_IMAGE_COMMENT_EDITOR_H__ -#define __GIMP_IMAGE_COMMENT_EDITOR_H__ - +#pragma once #include "gimpimageparasiteview.h" @@ -52,6 +50,3 @@ struct _GimpImageCommentEditorClass GType gimp_image_comment_editor_get_type (void) G_GNUC_CONST; GtkWidget * gimp_image_comment_editor_new (GimpImage *image); - - -#endif /* __GIMP_IMAGE_COMMENT_EDITOR_H__ */ diff --git a/app/widgets/gimpimageeditor.h b/app/widgets/gimpimageeditor.h index 0e97eff195..ea0e8f4d43 100644 --- a/app/widgets/gimpimageeditor.h +++ b/app/widgets/gimpimageeditor.h @@ -15,9 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_IMAGE_EDITOR_H__ -#define __GIMP_IMAGE_EDITOR_H__ - +#pragma once #include "gimpeditor.h" @@ -55,6 +53,3 @@ GType gimp_image_editor_get_type (void) G_GNUC_CONST; void gimp_image_editor_set_image (GimpImageEditor *editor, GimpImage *image); GimpImage * gimp_image_editor_get_image (GimpImageEditor *editor); - - -#endif /* __GIMP_IMAGE_EDITOR_H__ */ diff --git a/app/widgets/gimpimageparasiteview.h b/app/widgets/gimpimageparasiteview.h index e8b25c2726..5ff4d4e0a0 100644 --- a/app/widgets/gimpimageparasiteview.h +++ b/app/widgets/gimpimageparasiteview.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_IMAGE_PARASITE_VIEW_H__ -#define __GIMP_IMAGE_PARASITE_VIEW_H__ +#pragma once #define GIMP_TYPE_IMAGE_PARASITE_VIEW (gimp_image_parasite_view_get_type ()) @@ -55,6 +54,3 @@ GtkWidget * gimp_image_parasite_view_new (GimpImage *image, const gchar *parasite); GimpImage * gimp_image_parasite_view_get_image (GimpImageParasiteView *view); const GimpParasite * gimp_image_parasite_view_get_parasite (GimpImageParasiteView *view); - - -#endif /* __GIMP_IMAGE_PARASITE_VIEW_H__ */ diff --git a/app/widgets/gimpimageprofileview.h b/app/widgets/gimpimageprofileview.h index 2c99883d47..3dc5bc02c3 100644 --- a/app/widgets/gimpimageprofileview.h +++ b/app/widgets/gimpimageprofileview.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_IMAGE_PROFILE_VIEW_H__ -#define __GIMP_IMAGE_PROFILE_VIEW_H__ - +#pragma once #include "gimpimageparasiteview.h" @@ -51,6 +49,3 @@ struct _GimpImageProfileViewClass GType gimp_image_profile_view_get_type (void) G_GNUC_CONST; GtkWidget * gimp_image_profile_view_new (GimpImage *image); - - -#endif /* __GIMP_IMAGE_PROFILE_VIEW_H__ */ diff --git a/app/widgets/gimpimageview.h b/app/widgets/gimpimageview.h index 53e1c88030..de3e589439 100644 --- a/app/widgets/gimpimageview.h +++ b/app/widgets/gimpimageview.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_IMAGE_VIEW_H__ -#define __GIMP_IMAGE_VIEW_H__ - +#pragma once #include "gimpcontainereditor.h" @@ -58,6 +56,3 @@ GtkWidget * gimp_image_view_new (GimpViewType view_type, gint view_size, gint view_border_width, GimpMenuFactory *menu_factory); - - -#endif /* __GIMP_IMAGE_VIEW_H__ */ diff --git a/app/widgets/gimpitemtreeview.h b/app/widgets/gimpitemtreeview.h index b8e31b5a20..227b30a1be 100644 --- a/app/widgets/gimpitemtreeview.h +++ b/app/widgets/gimpitemtreeview.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_ITEM_TREE_VIEW_H__ -#define __GIMP_ITEM_TREE_VIEW_H__ - +#pragma once #include "gimpcontainertreeview.h" @@ -149,6 +147,3 @@ gint gimp_item_tree_view_get_drop_index (GimpItemTreeView *view, GimpViewable *dest_viewable, GtkTreeViewDropPosition drop_pos, GimpViewable **parent); - - -#endif /* __GIMP_ITEM_TREE_VIEW_H__ */ diff --git a/app/widgets/gimplanguagecombobox.h b/app/widgets/gimplanguagecombobox.h index 03610ec7ed..7b3e872e84 100644 --- a/app/widgets/gimplanguagecombobox.h +++ b/app/widgets/gimplanguagecombobox.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_LANGUAGE_COMBO_BOX_H__ -#define __GIMP_LANGUAGE_COMBO_BOX_H__ +#pragma once #define GIMP_TYPE_LANGUAGE_COMBO_BOX (gimp_language_combo_box_get_type ()) @@ -46,6 +45,3 @@ GtkWidget * gimp_language_combo_box_new (gboolean manual_l18n, gchar * gimp_language_combo_box_get_code (GimpLanguageComboBox *combo); gboolean gimp_language_combo_box_set_code (GimpLanguageComboBox *combo, const gchar *code); - - -#endif /* __GIMP_LANGUAGE_COMBO_BOX_H__ */ diff --git a/app/widgets/gimplanguageentry.h b/app/widgets/gimplanguageentry.h index d7ad2db156..1d571a8cb6 100644 --- a/app/widgets/gimplanguageentry.h +++ b/app/widgets/gimplanguageentry.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_LANGUAGE_ENTRY_H__ -#define __GIMP_LANGUAGE_ENTRY_H__ +#pragma once #define GIMP_TYPE_LANGUAGE_ENTRY (gimp_language_entry_get_type ()) @@ -45,6 +44,3 @@ GtkWidget * gimp_language_entry_new (void); const gchar * gimp_language_entry_get_code (GimpLanguageEntry *entry); gboolean gimp_language_entry_set_code (GimpLanguageEntry *entry, const gchar *code); - - -#endif /* __GIMP_LANGUAGE_ENTRY_H__ */ diff --git a/app/widgets/gimplanguagestore.h b/app/widgets/gimplanguagestore.h index de6857c4d0..968ee11463 100644 --- a/app/widgets/gimplanguagestore.h +++ b/app/widgets/gimplanguagestore.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_LANGUAGE_STORE_H__ -#define __GIMP_LANGUAGE_STORE_H__ +#pragma once enum @@ -61,5 +60,3 @@ GtkListStore * gimp_language_store_new (void); gboolean gimp_language_store_lookup (GimpLanguageStore *store, const gchar *code, GtkTreeIter *iter); - -#endif /* __GIMP_LANGUAGE_STORE_H__ */ diff --git a/app/widgets/gimplayermodebox.h b/app/widgets/gimplayermodebox.h index 5ebe57761a..3320c7af35 100644 --- a/app/widgets/gimplayermodebox.h +++ b/app/widgets/gimplayermodebox.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_LAYER_MODE_BOX_H__ -#define __GIMP_LAYER_MODE_BOX_H__ +#pragma once #define GIMP_TYPE_LAYER_MODE_BOX (gimp_layer_mode_box_get_type ()) @@ -62,6 +61,3 @@ void gimp_layer_mode_box_set_label (GimpLayerModeBox * const gchar *label); void gimp_layer_mode_box_set_ellipsize (GimpLayerModeBox *box, PangoEllipsizeMode mode); - - -#endif /* __GIMP_LAYER_MODE_BOX_H__ */ diff --git a/app/widgets/gimplayermodecombobox.h b/app/widgets/gimplayermodecombobox.h index e37b2631ed..f1ba162a3d 100644 --- a/app/widgets/gimplayermodecombobox.h +++ b/app/widgets/gimplayermodecombobox.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_LAYER_MODE_COMBO_BOX_H__ -#define __GIMP_LAYER_MODE_COMBO_BOX_H__ +#pragma once #define GIMP_TYPE_LAYER_MODE_COMBO_BOX (gimp_layer_mode_combo_box_get_type ()) @@ -61,6 +60,3 @@ GimpLayerMode gimp_layer_mode_combo_box_get_mode (GimpLayerModeCombo void gimp_layer_mode_combo_box_set_group (GimpLayerModeComboBox *combo, GimpLayerModeGroup group); GimpLayerModeGroup gimp_layer_mode_combo_box_get_group (GimpLayerModeComboBox *combo); - - -#endif /* __GIMP_LAYER_MODE_COMBO_BOX_H__ */ diff --git a/app/widgets/gimplayertreeview.h b/app/widgets/gimplayertreeview.h index 1a89b2d4e9..af4cb41476 100644 --- a/app/widgets/gimplayertreeview.h +++ b/app/widgets/gimplayertreeview.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_LAYER_TREE_VIEW_H__ -#define __GIMP_LAYER_TREE_VIEW_H__ - +#pragma once #include "gimpdrawabletreeview.h" @@ -50,6 +48,3 @@ struct _GimpLayerTreeViewClass GType gimp_layer_tree_view_get_type (void) G_GNUC_CONST; - - -#endif /* __GIMP_LAYER_TREE_VIEW_H__ */ diff --git a/app/widgets/gimpmenu.h b/app/widgets/gimpmenu.h index 35818fc2f3..c4bb1490c1 100644 --- a/app/widgets/gimpmenu.h +++ b/app/widgets/gimpmenu.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_MENU_H__ -#define __GIMP_MENU_H__ +#pragma once #define GIMP_TYPE_MENU (gimp_menu_get_type ()) @@ -53,6 +52,3 @@ GtkWidget * gimp_menu_new (GimpUIManager *manager); void gimp_menu_merge (GimpMenu *menu, GimpMenu *menu2, gboolean top); - - -#endif /* __GIMP_MENU_H__ */ diff --git a/app/widgets/gimpmenubar.h b/app/widgets/gimpmenubar.h index 40e699f758..f2c407da5e 100644 --- a/app/widgets/gimpmenubar.h +++ b/app/widgets/gimpmenubar.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_MENU_BAR_H__ -#define __GIMP_MENU_BAR_H__ +#pragma once #define GIMP_TYPE_MENU_BAR (gimp_menu_bar_get_type ()) @@ -35,9 +34,9 @@ typedef struct _GimpMenuBarClass GimpMenuBarClass; struct _GimpMenuBar { - GtkMenuBar parent_instance; + GtkMenuBar parent_instance; - GimpMenuBarPrivate *priv; + GimpMenuBarPrivate *priv; }; struct _GimpMenuBarClass @@ -46,10 +45,7 @@ struct _GimpMenuBarClass }; -GType gimp_menu_bar_get_type (void) G_GNUC_CONST; +GType gimp_menu_bar_get_type (void) G_GNUC_CONST; -GtkWidget * gimp_menu_bar_new (GimpMenuModel *model, - GimpUIManager *manager); - - -#endif /* __GIMP_MENU_BAR_H__ */ +GtkWidget * gimp_menu_bar_new (GimpMenuModel *model, + GimpUIManager *manager); diff --git a/app/widgets/gimpmenudock.h b/app/widgets/gimpmenudock.h index ab58ded14e..8122f77494 100644 --- a/app/widgets/gimpmenudock.h +++ b/app/widgets/gimpmenudock.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_MENU_DOCK_H__ -#define __GIMP_MENU_DOCK_H__ - +#pragma once #include "gimpdock.h" @@ -51,7 +49,3 @@ struct _GimpMenuDockClass GType gimp_menu_dock_get_type (void) G_GNUC_CONST; GtkWidget * gimp_menu_dock_new (void); - - - -#endif /* __GIMP_MENU_DOCK_H__ */ diff --git a/app/widgets/gimpmenufactory.h b/app/widgets/gimpmenufactory.h index a347e3c4d4..21be452e48 100644 --- a/app/widgets/gimpmenufactory.h +++ b/app/widgets/gimpmenufactory.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_MENU_FACTORY_H__ -#define __GIMP_MENU_FACTORY_H__ - +#pragma once #include "core/gimpobject.h" @@ -75,6 +73,3 @@ GimpUIManager * gimp_menu_factory_get_manager (GimpMenuFactory *fac void gimp_menu_factory_delete_manager (GimpMenuFactory *factory, const gchar *identifier, gpointer callback_data); - - -#endif /* __GIMP_MENU_FACTORY_H__ */ diff --git a/app/widgets/gimpmenumodel.h b/app/widgets/gimpmenumodel.h index aca6ddf4d7..3a88f76d27 100644 --- a/app/widgets/gimpmenumodel.h +++ b/app/widgets/gimpmenumodel.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_MENU_MODEL_H__ -#define __GIMP_MENU_MODEL_H__ +#pragma once #define GIMP_TYPE_MENU_MODEL (gimp_menu_model_get_type ()) @@ -62,6 +61,3 @@ void gimp_menu_model_set_title (GimpMenuModel *model, void gimp_menu_model_set_color (GimpMenuModel *model, const gchar *path, GeglColor *color); - - -#endif /* __GIMP_MENU_MODEL_H__ */ diff --git a/app/widgets/gimpmenushell.h b/app/widgets/gimpmenushell.h index c6c5c6d143..d2bd00a9af 100644 --- a/app/widgets/gimpmenushell.h +++ b/app/widgets/gimpmenushell.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_MENU_SHELL_H__ -#define __GIMP_MENU_SHELL_H__ +#pragma once #define GIMP_TYPE_MENU_SHELL (gimp_menu_shell_get_type ()) @@ -85,6 +84,3 @@ void gimp_menu_shell_set_property (GObject *object, GParamSpec *pspec); GimpUIManager * gimp_menu_shell_get_manager (GimpMenuShell *shell); - - -#endif /* __GIMP_MENU_SHELL_H__ */ diff --git a/app/widgets/gimpmessagebox.h b/app/widgets/gimpmessagebox.h index d6d6447451..91da1c2a85 100644 --- a/app/widgets/gimpmessagebox.h +++ b/app/widgets/gimpmessagebox.h @@ -18,10 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_MESSAGE_BOX_H__ -#define __GIMP_MESSAGE_BOX_H__ - -G_BEGIN_DECLS +#pragma once #define GIMP_TYPE_MESSAGE_BOX (gimp_message_box_get_type ()) @@ -65,8 +62,3 @@ void gimp_message_box_set_markup (GimpMessageBox *box, const gchar *format, ...) G_GNUC_PRINTF (2, 3); gint gimp_message_box_repeat (GimpMessageBox *box); - - -G_END_DECLS - -#endif /* __GIMP_MESSAGE_BOX_H__ */ diff --git a/app/widgets/gimpmessagedialog.h b/app/widgets/gimpmessagedialog.h index 484de63647..a6b649102f 100644 --- a/app/widgets/gimpmessagedialog.h +++ b/app/widgets/gimpmessagedialog.h @@ -18,10 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_MESSAGE_DIALOG_H__ -#define __GIMP_MESSAGE_DIALOG_H__ - -G_BEGIN_DECLS +#pragma once #define GIMP_TYPE_MESSAGE_DIALOG (gimp_message_dialog_get_type ()) @@ -56,8 +53,3 @@ GtkWidget * gimp_message_dialog_new (const gchar *title, GimpHelpFunc help_func, const gchar *help_id, ...) G_GNUC_NULL_TERMINATED; - - -G_END_DECLS - -#endif /* __GIMP_MESSAGE_DIALOG_H__ */ diff --git a/app/widgets/gimpmeter.h b/app/widgets/gimpmeter.h index e77bcedf57..3bd6d9e8f0 100644 --- a/app/widgets/gimpmeter.h +++ b/app/widgets/gimpmeter.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_METER_H__ -#define __GIMP_METER_H__ +#pragma once #define GIMP_TYPE_METER (gimp_meter_get_type ()) @@ -123,6 +122,3 @@ gboolean gimp_meter_get_led_active (GimpMeter void gimp_meter_set_led_color (GimpMeter *meter, GeglColor *color); GeglColor * gimp_meter_get_led_color (GimpMeter *meter); - - -#endif /* __GIMP_METER_H__ */ diff --git a/app/widgets/gimpmodifierseditor.h b/app/widgets/gimpmodifierseditor.h index dede800b82..98f944a24e 100644 --- a/app/widgets/gimpmodifierseditor.h +++ b/app/widgets/gimpmodifierseditor.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_MODIFIERS_EDITOR_H__ -#define __GIMP_MODIFIERS_EDITOR_H__ +#pragma once #define GIMP_TYPE_MODIFIERS_EDITOR (gimp_modifiers_editor_get_type ()) @@ -46,12 +45,9 @@ struct _GimpModifiersEditorClass }; -GType gimp_modifiers_editor_get_type (void) G_GNUC_CONST; +GType gimp_modifiers_editor_get_type (void) G_GNUC_CONST; -GtkWidget * gimp_modifiers_editor_new (GimpModifiersManager *manager, - Gimp *gimp); +GtkWidget * gimp_modifiers_editor_new (GimpModifiersManager *manager, + Gimp *gimp); -void gimp_modifiers_editor_clear (GimpModifiersEditor *editor); - - -#endif /* __GIMP_MODIFIERS_EDITOR_H__ */ +void gimp_modifiers_editor_clear (GimpModifiersEditor *editor); diff --git a/app/widgets/gimpnavigationview.h b/app/widgets/gimpnavigationview.h index 3c254fd755..3cd43bfd4d 100644 --- a/app/widgets/gimpnavigationview.h +++ b/app/widgets/gimpnavigationview.h @@ -21,8 +21,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_NAVIGATION_VIEW_H__ -#define __GIMP_NAVIGATION_VIEW_H__ +#pragma once #include "gimpview.h" @@ -82,6 +81,3 @@ void gimp_navigation_view_get_local_marker gint *height); void gimp_navigation_view_grab_pointer (GimpNavigationView *view, GdkEvent *event); - - -#endif /* __GIMP_NAVIGATION_VIEW_H__ */ diff --git a/app/widgets/gimpopendialog.h b/app/widgets/gimpopendialog.h index 9256f37a4d..b9451ec8bf 100644 --- a/app/widgets/gimpopendialog.h +++ b/app/widgets/gimpopendialog.h @@ -18,12 +18,10 @@ * along with this program. If not, see . */ -#ifndef __GIMP_OPEN_DIALOG_H__ -#define __GIMP_OPEN_DIALOG_H__ +#pragma once #include "gimpfiledialog.h" -G_BEGIN_DECLS #define GIMP_TYPE_OPEN_DIALOG (gimp_open_dialog_get_type ()) #define GIMP_OPEN_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPEN_DIALOG, GimpOpenDialog)) @@ -55,7 +53,3 @@ GtkWidget * gimp_open_dialog_new (Gimp *gimp); void gimp_open_dialog_set_image (GimpOpenDialog *dialog, GimpImage *image, gboolean open_as_layers); - -G_END_DECLS - -#endif /* __GIMP_OPEN_DIALOG_H__ */ diff --git a/app/widgets/gimpoverlaybox.h b/app/widgets/gimpoverlaybox.h index 780ff26d5f..8dfa46225a 100644 --- a/app/widgets/gimpoverlaybox.h +++ b/app/widgets/gimpoverlaybox.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_OVERLAY_BOX_H__ -#define __GIMP_OVERLAY_BOX_H__ +#pragma once #define GIMP_TYPE_OVERLAY_BOX (gimp_overlay_box_get_type ()) @@ -71,6 +70,3 @@ void gimp_overlay_box_set_child_opacity (GimpOverlayBox *box, void gimp_overlay_box_scroll (GimpOverlayBox *box, gint offset_x, gint offset_y); - - -#endif /* __GIMP_OVERLAY_BOX_H__ */ diff --git a/app/widgets/gimpoverlaychild.h b/app/widgets/gimpoverlaychild.h index 3e752a7dbf..7700f30e89 100644 --- a/app/widgets/gimpoverlaychild.h +++ b/app/widgets/gimpoverlaychild.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_OVERLAY_CHILD_H__ -#define __GIMP_OVERLAY_CHILD_H__ +#pragma once typedef struct _GimpOverlayChild GimpOverlayChild; @@ -82,6 +81,3 @@ gboolean gimp_overlay_child_pick (GimpOverlayBox *bo GimpOverlayChild *child, gdouble box_x, gdouble box_y); - - -#endif /* __GIMP_OVERLAY_CHILD_H__ */ diff --git a/app/widgets/gimpoverlaydialog.h b/app/widgets/gimpoverlaydialog.h index d8043b708f..71a70fa4fd 100644 --- a/app/widgets/gimpoverlaydialog.h +++ b/app/widgets/gimpoverlaydialog.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_OVERLAY_DIALOG_H__ -#define __GIMP_OVERLAY_DIALOG_H__ - +#pragma once #include "gimpoverlayframe.h" @@ -88,6 +86,3 @@ void gimp_overlay_dialog_set_default_response (GimpOverlayDialog *overl void gimp_overlay_dialog_set_response_sensitive (GimpOverlayDialog *overlay, gint response_id, gboolean sensitive); - - -#endif /* __GIMP_OVERLAY_DIALOG_H__ */ diff --git a/app/widgets/gimpoverlayframe.h b/app/widgets/gimpoverlayframe.h index 4bbf0f616e..f254b47e19 100644 --- a/app/widgets/gimpoverlayframe.h +++ b/app/widgets/gimpoverlayframe.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_OVERLAY_FRAME_H__ -#define __GIMP_OVERLAY_FRAME_H__ +#pragma once #define GIMP_TYPE_OVERLAY_FRAME (gimp_overlay_frame_get_type ()) @@ -47,6 +46,3 @@ struct _GimpOverlayFrameClass GType gimp_overlay_frame_get_type (void) G_GNUC_CONST; GtkWidget * gimp_overlay_frame_new (void); - - -#endif /* __GIMP_OVERLAY_FRAME_H__ */ diff --git a/app/widgets/gimppaletteeditor.h b/app/widgets/gimppaletteeditor.h index ce1b4c3d90..4fd3f45ac6 100644 --- a/app/widgets/gimppaletteeditor.h +++ b/app/widgets/gimppaletteeditor.h @@ -15,9 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PALETTE_EDITOR_H__ -#define __GIMP_PALETTE_EDITOR_H__ - +#pragma once #include "gimpdataeditor.h" @@ -77,6 +75,3 @@ gboolean gimp_palette_editor_set_index (GimpPaletteEditor *editor, GeglColor *color); gint gimp_palette_editor_max_index (GimpPaletteEditor *editor); - - -#endif /* __GIMP_PALETTE_EDITOR_H__ */ diff --git a/app/widgets/gimppaletteselect.h b/app/widgets/gimppaletteselect.h index 135bee18d7..aa698c4d6f 100644 --- a/app/widgets/gimppaletteselect.h +++ b/app/widgets/gimppaletteselect.h @@ -18,13 +18,10 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PALETTE_SELECT_H__ -#define __GIMP_PALETTE_SELECT_H__ +#pragma once #include "gimppdbdialog.h" -G_BEGIN_DECLS - #define GIMP_TYPE_PALETTE_SELECT (gimp_palette_select_get_type ()) #define GIMP_PALETTE_SELECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PALETTE_SELECT, GimpPaletteSelect)) @@ -48,8 +45,3 @@ struct _GimpPaletteSelectClass GType gimp_palette_select_get_type (void) G_GNUC_CONST; - - -G_END_DECLS - -#endif /* __GIMP_PALETTE_SELECT_H__ */ diff --git a/app/widgets/gimppaletteview.h b/app/widgets/gimppaletteview.h index cb94fd8de0..9a391eecf7 100644 --- a/app/widgets/gimppaletteview.h +++ b/app/widgets/gimppaletteview.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PALETTE_VIEW_H__ -#define __GIMP_PALETTE_VIEW_H__ +#pragma once #include "gimpview.h" @@ -71,6 +70,3 @@ GimpPaletteEntry * gimp_palette_view_get_selected_entry (GimpPaletteView *view); void gimp_palette_view_get_entry_rect (GimpPaletteView *view, GimpPaletteEntry *entry, GdkRectangle *rect); - - -#endif /* __GIMP_PALETTE_VIEW_H__ */ diff --git a/app/widgets/gimppanedbox.h b/app/widgets/gimppanedbox.h index 6a07a393bb..bc94ab093f 100644 --- a/app/widgets/gimppanedbox.h +++ b/app/widgets/gimppanedbox.h @@ -19,8 +19,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PANED_BOX_H__ -#define __GIMP_PANED_BOX_H__ +#pragma once #define GIMP_TYPE_PANED_BOX (gimp_paned_box_get_type ()) @@ -53,26 +52,24 @@ struct _GimpPanedBoxClass }; -GType gimp_paned_box_get_type (void) G_GNUC_CONST; -GtkWidget * gimp_paned_box_new (gboolean homogeneous, - gint spacing, - GtkOrientation orientation); -void gimp_paned_box_set_dropped_cb (GimpPanedBox *paned_box, - GimpPanedBoxDroppedFunc dropped_cb, - gpointer dropped_cb_data); -void gimp_paned_box_add_widget (GimpPanedBox *paned_box, - GtkWidget *widget, - gint index); -void gimp_paned_box_remove_widget (GimpPanedBox *paned_box, - GtkWidget *widget); -gboolean gimp_paned_box_will_handle_drag (GimpPanedBox *paned_box, - GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - gint time); -void gimp_paned_box_set_drag_handler (GimpPanedBox *paned_box, - GimpPanedBox *drag_handler); +GType gimp_paned_box_get_type (void) G_GNUC_CONST; - -#endif /* __GIMP_PANED_BOX_H__ */ +GtkWidget * gimp_paned_box_new (gboolean homogeneous, + gint spacing, + GtkOrientation orientation); +void gimp_paned_box_set_dropped_cb (GimpPanedBox *paned_box, + GimpPanedBoxDroppedFunc dropped_cb, + gpointer dropped_cb_data); +void gimp_paned_box_add_widget (GimpPanedBox *paned_box, + GtkWidget *widget, + gint index); +void gimp_paned_box_remove_widget (GimpPanedBox *paned_box, + GtkWidget *widget); +gboolean gimp_paned_box_will_handle_drag (GimpPanedBox *paned_box, + GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + gint time); +void gimp_paned_box_set_drag_handler (GimpPanedBox *paned_box, + GimpPanedBox *drag_handler); diff --git a/app/widgets/gimppatternfactoryview.h b/app/widgets/gimppatternfactoryview.h index d2805aff9c..278701c47c 100644 --- a/app/widgets/gimppatternfactoryview.h +++ b/app/widgets/gimppatternfactoryview.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PATTERN_FACTORY_VIEW_H__ -#define __GIMP_PATTERN_FACTORY_VIEW_H__ +#pragma once #include "gimpdatafactoryview.h" @@ -53,6 +52,3 @@ GtkWidget * gimp_pattern_factory_view_new (GimpViewType view_type, gint view_size, gint view_border_width, GimpMenuFactory *menu_factory); - - -#endif /* __GIMP_PATTERN_FACTORY_VIEW_H__ */ diff --git a/app/widgets/gimppatternselect.h b/app/widgets/gimppatternselect.h index d18fac4b4d..0ed5b3d301 100644 --- a/app/widgets/gimppatternselect.h +++ b/app/widgets/gimppatternselect.h @@ -18,13 +18,10 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PATTERN_SELECT_H__ -#define __GIMP_PATTERN_SELECT_H__ +#pragma once #include "gimppdbdialog.h" -G_BEGIN_DECLS - #define GIMP_TYPE_PATTERN_SELECT (gimp_pattern_select_get_type ()) #define GIMP_PATTERN_SELECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PATTERN_SELECT, GimpPatternSelect)) @@ -48,8 +45,3 @@ struct _GimpPatternSelectClass GType gimp_pattern_select_get_type (void) G_GNUC_CONST; - - -G_END_DECLS - -#endif /* __GIMP_PATTERN_SELECT_H__ */ diff --git a/app/widgets/gimppdbdialog.h b/app/widgets/gimppdbdialog.h index 0f8153dd08..12c5ce63a5 100644 --- a/app/widgets/gimppdbdialog.h +++ b/app/widgets/gimppdbdialog.h @@ -18,10 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PDB_DIALOG_H__ -#define __GIMP_PDB_DIALOG_H__ - -G_BEGIN_DECLS +#pragma once #define GIMP_TYPE_PDB_DIALOG (gimp_pdb_dialog_get_type ()) @@ -82,8 +79,3 @@ void gimp_pdb_dialog_run_callback (GimpPdbDialog **dialog, GimpPdbDialog * gimp_pdb_dialog_get_by_callback (GimpPdbDialogClass *klass, const gchar *callback_name); - - -G_END_DECLS - -#endif /* __GIMP_PDB_DIALOG_H__ */ diff --git a/app/widgets/gimppickablebutton.h b/app/widgets/gimppickablebutton.h index 1cce09b8f8..6609950c4f 100644 --- a/app/widgets/gimppickablebutton.h +++ b/app/widgets/gimppickablebutton.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PICKABLE_BUTTON_H__ -#define __GIMP_PICKABLE_BUTTON_H__ +#pragma once #define GIMP_TYPE_PICKABLE_BUTTON (gimp_pickable_button_get_type ()) @@ -55,6 +54,3 @@ GtkWidget * gimp_pickable_button_new (GimpContext *context, GimpPickable * gimp_pickable_button_get_pickable (GimpPickableButton *button); void gimp_pickable_button_set_pickable (GimpPickableButton *button, GimpPickable *pickable); - - -#endif /* __GIMP_PICKABLE_BUTTON_H__ */ diff --git a/app/widgets/gimppickablechooser.h b/app/widgets/gimppickablechooser.h index bbb249161d..10314ac13e 100644 --- a/app/widgets/gimppickablechooser.h +++ b/app/widgets/gimppickablechooser.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PICKABLE_CHOOSER_H__ -#define __GIMP_PICKABLE_CHOOSER_H__ +#pragma once #define GIMP_TYPE_PICKABLE_CHOOSER (gimp_pickable_chooser_get_type ()) @@ -61,6 +60,3 @@ GtkWidget * gimp_pickable_chooser_new (GimpContext *context, GimpPickable * gimp_pickable_chooser_get_pickable (GimpPickableChooser *chooser); void gimp_pickable_chooser_set_pickable (GimpPickableChooser *chooser, GimpPickable *pickable); - - -#endif /* __GIMP_PICKABLE_CHOOSER_H__ */ diff --git a/app/widgets/gimppickablepopup.h b/app/widgets/gimppickablepopup.h index 554f3fe49a..0426aca763 100644 --- a/app/widgets/gimppickablepopup.h +++ b/app/widgets/gimppickablepopup.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PICKABLE_POPUP_H__ -#define __GIMP_PICKABLE_POPUP_H__ - +#pragma once #include "gimppopup.h" @@ -56,6 +54,3 @@ GtkWidget * gimp_pickable_popup_new (GimpContext *context, gint view_border_width); GimpPickable * gimp_pickable_popup_get_pickable (GimpPickablePopup *popup); - - -#endif /* __GIMP_PICKABLE_POPUP_H__ */ diff --git a/app/widgets/gimppickableselect.h b/app/widgets/gimppickableselect.h index dc742cee0e..b475373a8b 100644 --- a/app/widgets/gimppickableselect.h +++ b/app/widgets/gimppickableselect.h @@ -18,13 +18,10 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PICKABLE_SELECT_H__ -#define __GIMP_PICKABLE_SELECT_H__ +#pragma once #include "gimppdbdialog.h" -G_BEGIN_DECLS - #define GIMP_TYPE_PICKABLE_SELECT (gimp_pickable_select_get_type ()) #define GIMP_PICKABLE_SELECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PICKABLE_SELECT, GimpPickableSelect)) @@ -50,8 +47,3 @@ struct _GimpPickableSelectClass GType gimp_pickable_select_get_type (void) G_GNUC_CONST; - - -G_END_DECLS - -#endif /* __GIMP_PICKABLE_SELECT_H__ */ diff --git a/app/widgets/gimppivotselector.h b/app/widgets/gimppivotselector.h index c2e99a264a..95005b77bd 100644 --- a/app/widgets/gimppivotselector.h +++ b/app/widgets/gimppivotselector.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PIVOT_SELECTOR_H__ -#define __GIMP_PIVOT_SELECTOR_H__ +#pragma once #define GIMP_TYPE_PIVOT_SELECTOR (gimp_pivot_selector_get_type ()) @@ -73,6 +72,3 @@ void gimp_pivot_selector_get_bounds (GimpPivotSelector *selector, gdouble *top, gdouble *right, gdouble *bottom); - - -#endif /* __GIMP_PIVOT_SELECTOR_H__ */ diff --git a/app/widgets/gimppluginview.h b/app/widgets/gimppluginview.h index 887cdaf824..2cca93703b 100644 --- a/app/widgets/gimppluginview.h +++ b/app/widgets/gimppluginview.h @@ -19,8 +19,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PLUG_IN_VIEW_H__ -#define __GIMP_PLUG_IN_VIEW_H__ +#pragma once #define GIMP_TYPE_PLUG_IN_VIEW (gimp_plug_in_view_get_type ()) @@ -55,6 +54,3 @@ GtkWidget * gimp_plug_in_view_new (GSList *procedures); gchar * gimp_plug_in_view_get_plug_in (GimpPlugInView *view); gboolean gimp_plug_in_view_set_plug_in (GimpPlugInView *view, const gchar *path); - - -#endif /* __GIMP_PLUG_IN_VIEW_H__ */ diff --git a/app/widgets/gimppopup.h b/app/widgets/gimppopup.h index b13f3f7c0f..93ca903df2 100644 --- a/app/widgets/gimppopup.h +++ b/app/widgets/gimppopup.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_POPUP_H__ -#define __GIMP_POPUP_H__ +#pragma once #define GIMP_TYPE_POPUP (gimp_popup_get_type ()) @@ -50,6 +49,3 @@ GType gimp_popup_get_type (void) G_GNUC_CONST; void gimp_popup_show (GimpPopup *popup, GtkWidget *widget); - - -#endif /* __GIMP_POPUP_H__ */ diff --git a/app/widgets/gimpprefsbox.h b/app/widgets/gimpprefsbox.h index 2b62f43085..7a0dfbd6c8 100644 --- a/app/widgets/gimpprefsbox.h +++ b/app/widgets/gimpprefsbox.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PREFS_BOX_H__ -#define __GIMP_PREFS_BOX_H__ +#pragma once #define GIMP_TYPE_PREFS_BOX (gimp_prefs_box_get_type ()) @@ -72,6 +71,3 @@ GtkWidget * gimp_prefs_box_set_page_resettable (GimpPrefsBox *box, GtkWidget * gimp_prefs_box_get_tree_view (GimpPrefsBox *box); GtkWidget * gimp_prefs_box_get_stack (GimpPrefsBox *box); - - -#endif /* __GIMP_PREFS_BOX_H__ */ diff --git a/app/widgets/gimpprocedureaction.h b/app/widgets/gimpprocedureaction.h index 7da2592c9b..7e3b585330 100644 --- a/app/widgets/gimpprocedureaction.h +++ b/app/widgets/gimpprocedureaction.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PROCEDURE_ACTION_H__ -#define __GIMP_PROCEDURE_ACTION_H__ - +#pragma once #include "gimpactionimpl.h" @@ -57,6 +55,3 @@ GimpProcedureAction * gimp_procedure_action_new (const gchar *name, const gchar *help_id, GimpProcedure *procedure, GimpContext *context); - - -#endif /* __GIMP_PROCEDURE_ACTION_H__ */ diff --git a/app/widgets/gimpprogressbox.h b/app/widgets/gimpprogressbox.h index bc0ee8eda0..af6f2377e9 100644 --- a/app/widgets/gimpprogressbox.h +++ b/app/widgets/gimpprogressbox.h @@ -18,10 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PROGRESS_BOX_H__ -#define __GIMP_PROGRESS_BOX_H__ - -G_BEGIN_DECLS +#pragma once #define GIMP_TYPE_PROGRESS_BOX (gimp_progress_box_get_type ()) @@ -55,8 +52,3 @@ struct _GimpProgressBoxClass GType gimp_progress_box_get_type (void) G_GNUC_CONST; GtkWidget * gimp_progress_box_new (void); - - -G_END_DECLS - -#endif /* __GIMP_PROGRESS_BOX_H__ */ diff --git a/app/widgets/gimpprogressdialog.h b/app/widgets/gimpprogressdialog.h index 659d1acf4d..261c499738 100644 --- a/app/widgets/gimpprogressdialog.h +++ b/app/widgets/gimpprogressdialog.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_PROGRESS_DIALOG_H__ -#define __GIMP_PROGRESS_DIALOG_H__ +#pragma once #define GIMP_TYPE_PROGRESS_DIALOG (gimp_progress_dialog_get_type ()) @@ -48,6 +47,3 @@ struct _GimpProgressDialogClass GType gimp_progress_dialog_get_type (void) G_GNUC_CONST; GtkWidget * gimp_progress_dialog_new (void); - - -#endif /* __GIMP_PROGRESS_DIALOG_H__ */ diff --git a/app/widgets/gimppropwidgets.h b/app/widgets/gimppropwidgets.h index 8d3cc29549..a9256bd470 100644 --- a/app/widgets/gimppropwidgets.h +++ b/app/widgets/gimppropwidgets.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_APP_PROP_WIDGETS_H__ -#define __GIMP_APP_PROP_WIDGETS_H__ +#pragma once /* GParamBoolean */ @@ -133,6 +132,3 @@ gboolean _gimp_prop_widgets_get_numeric_values (GObject *object, gdouble *lower, gdouble *upper, const gchar *strloc); - - -#endif /* __GIMP_APP_PROP_WIDGETS_H__ */ diff --git a/app/widgets/gimpradioaction.h b/app/widgets/gimpradioaction.h index 9fb041c67e..70e523213c 100644 --- a/app/widgets/gimpradioaction.h +++ b/app/widgets/gimpradioaction.h @@ -20,11 +20,11 @@ * along with this program. If not, see . */ -#ifndef __GIMP_RADIO_ACTION_H__ -#define __GIMP_RADIO_ACTION_H__ +#pragma once #include "gimptoggleaction.h" + #define GIMP_TYPE_RADIO_ACTION (gimp_radio_action_get_type ()) #define GIMP_RADIO_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_RADIO_ACTION, GimpRadioAction)) #define GIMP_RADIO_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_RADIO_ACTION, GimpRadioActionClass)) @@ -70,6 +70,3 @@ const gchar * gimp_radio_action_get_group_label (GimpRadioAction *action); gint gimp_radio_action_get_current_value (GimpRadioAction *action); void gimp_radio_action_set_current_value (GimpRadioAction *action, gint current_value); - - -#endif /* __GIMP_RADIO_ACTION_H__ */ diff --git a/app/widgets/gimprender.h b/app/widgets/gimprender.h index 06b4206061..a81b614864 100644 --- a/app/widgets/gimprender.h +++ b/app/widgets/gimprender.h @@ -15,8 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_RENDER_H__ -#define __GIMP_RENDER_H__ +#pragma once void gimp_render_init (Gimp *gimp); @@ -24,6 +23,3 @@ void gimp_render_exit (Gimp *gimp); const GeglColor * gimp_render_check_color1 (void); const GeglColor * gimp_render_check_color2 (void); - - -#endif /* __GIMP_RENDER_H__ */ diff --git a/app/widgets/gimpsamplepointeditor.h b/app/widgets/gimpsamplepointeditor.h index 2393adbb93..1c54ab2a4a 100644 --- a/app/widgets/gimpsamplepointeditor.h +++ b/app/widgets/gimpsamplepointeditor.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SAMPLE_POINT_EDITOR_H__ -#define __GIMP_SAMPLE_POINT_EDITOR_H__ - +#pragma once #include "gimpimageeditor.h" @@ -64,6 +62,3 @@ GtkWidget * gimp_sample_point_editor_new (GimpMenuFactory *menu_fa void gimp_sample_point_editor_set_sample_merged (GimpSamplePointEditor *editor, gboolean sample_merged); gboolean gimp_sample_point_editor_get_sample_merged (GimpSamplePointEditor *editor); - - -#endif /* __GIMP_SAMPLE_POINT_EDITOR_H__ */ diff --git a/app/widgets/gimpsavedialog.h b/app/widgets/gimpsavedialog.h index 1966e8ee21..d1245c5cdc 100644 --- a/app/widgets/gimpsavedialog.h +++ b/app/widgets/gimpsavedialog.h @@ -18,12 +18,10 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SAVE_DIALOG_H__ -#define __GIMP_SAVE_DIALOG_H__ +#pragma once #include "gimpfiledialog.h" -G_BEGIN_DECLS #define GIMP_TYPE_SAVE_DIALOG (gimp_save_dialog_get_type ()) #define GIMP_SAVE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SAVE_DIALOG, GimpSaveDialog)) @@ -63,7 +61,3 @@ void gimp_save_dialog_set_image (GimpSaveDialog *dialog, gboolean save_a_copy, gboolean close_after_saving, GimpObject *display); - -G_END_DECLS - -#endif /* __GIMP_SAVE_DIALOG_H__ */ diff --git a/app/widgets/gimpsearchpopup.h b/app/widgets/gimpsearchpopup.h index d995115ff0..b7e50dede2 100644 --- a/app/widgets/gimpsearchpopup.h +++ b/app/widgets/gimpsearchpopup.h @@ -18,11 +18,11 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SEARCH_POPUP_H__ -#define __GIMP_SEARCH_POPUP_H__ +#pragma once #include "gimppopup.h" + #define GIMP_TYPE_SEARCH_POPUP (gimp_search_popup_get_type ()) #define GIMP_SEARCH_POPUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SEARCH_POPUP, GimpSearchPopup)) #define GIMP_SEARCH_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SEARCH_POPUP, GimpSearchPopupClass)) @@ -70,5 +70,3 @@ GtkWidget * gimp_search_popup_new (Gimp *gimp, void gimp_search_popup_add_result (GimpSearchPopup *popup, GimpAction *action, gint section); - -#endif /* __GIMP_SEARCH_POPUP_H__ */ diff --git a/app/widgets/gimpselectiondata.h b/app/widgets/gimpselectiondata.h index ed028b55fd..f5afbc5028 100644 --- a/app/widgets/gimpselectiondata.h +++ b/app/widgets/gimpselectiondata.h @@ -15,8 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SELECTION_DATA_H__ -#define __GIMP_SELECTION_DATA_H__ +#pragma once /* uri list */ @@ -114,6 +113,3 @@ GimpTemplate * gimp_selection_data_get_template (GtkSelectionData *selection, Gimp *gimp); GimpToolItem * gimp_selection_data_get_tool_item (GtkSelectionData *selection, Gimp *gimp); - - -#endif /* __GIMP_SELECTION_DATA_H__ */ diff --git a/app/widgets/gimpselectioneditor.h b/app/widgets/gimpselectioneditor.h index 8d9d901864..d1ebf0c6e1 100644 --- a/app/widgets/gimpselectioneditor.h +++ b/app/widgets/gimpselectioneditor.h @@ -15,9 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SELECTION_EDITOR_H__ -#define __GIMP_SELECTION_EDITOR_H__ - +#pragma once #include "gimpimageeditor.h" @@ -55,6 +53,3 @@ struct _GimpSelectionEditorClass GType gimp_selection_editor_get_type (void) G_GNUC_CONST; GtkWidget * gimp_selection_editor_new (GimpMenuFactory *menu_factory); - - -#endif /* __GIMP_SELECTION_EDITOR_H__ */ diff --git a/app/widgets/gimpsessioninfo-aux.h b/app/widgets/gimpsessioninfo-aux.h index d74c56ef59..af90687da1 100644 --- a/app/widgets/gimpsessioninfo-aux.h +++ b/app/widgets/gimpsessioninfo-aux.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SESSION_INFO_AUX_H__ -#define __GIMP_SESSION_INFO_AUX_H__ +#pragma once /** @@ -50,6 +49,3 @@ void gimp_session_info_aux_serialize (GimpConfigWriter *writer, GList *aux_info); GTokenType gimp_session_info_aux_deserialize (GScanner *scanner, GList **aux_list); - - -#endif /* __GIMP_SESSION_INFO_AUX_H__ */ diff --git a/app/widgets/gimpsessioninfo-book.h b/app/widgets/gimpsessioninfo-book.h index c7b83882d9..7a0e0de6c9 100644 --- a/app/widgets/gimpsessioninfo-book.h +++ b/app/widgets/gimpsessioninfo-book.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SESSION_INFO_BOOK_H__ -#define __GIMP_SESSION_INFO_BOOK_H__ +#pragma once /** @@ -53,6 +52,3 @@ GimpSessionInfoBook * GimpDockbook * gimp_session_info_book_restore (GimpSessionInfoBook *info, GimpDock *dock); - - -#endif /* __GIMP_SESSION_INFO_BOOK_H__ */ diff --git a/app/widgets/gimpsessioninfo-dock.h b/app/widgets/gimpsessioninfo-dock.h index 419b03686e..7e46dbbd21 100644 --- a/app/widgets/gimpsessioninfo-dock.h +++ b/app/widgets/gimpsessioninfo-dock.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SESSION_INFO_DOCK_H__ -#define __GIMP_SESSION_INFO_DOCK_H__ +#pragma once /** @@ -59,6 +58,3 @@ GimpDock * gimp_session_info_dock_restore (GimpSessionInfoDock * GimpDialogFactory *factory, GdkMonitor *monitor, GimpDockContainer *dock_container); - - -#endif /* __GIMP_SESSION_INFO_DOCK_H__ */ diff --git a/app/widgets/gimpsessioninfo-dockable.h b/app/widgets/gimpsessioninfo-dockable.h index 83df53aa6d..be96bf931e 100644 --- a/app/widgets/gimpsessioninfo-dockable.h +++ b/app/widgets/gimpsessioninfo-dockable.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SESSION_INFO_DOCKABLE_H__ -#define __GIMP_SESSION_INFO_DOCKABLE_H__ +#pragma once /** @@ -54,6 +53,3 @@ GimpSessionInfoDockable * GimpDockable * gimp_session_info_dockable_restore (GimpSessionInfoDockable *info, GimpDock *dock); - - -#endif /* __GIMP_SESSION_INFO_DOCKABLE_H__ */ diff --git a/app/widgets/gimpsessioninfo-private.h b/app/widgets/gimpsessioninfo-private.h index 9b0dea0edd..de76891252 100644 --- a/app/widgets/gimpsessioninfo-private.h +++ b/app/widgets/gimpsessioninfo-private.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SESSION_INFO_PRIVATE_H__ -#define __GIMP_SESSION_INFO_PRIVATE_H__ +#pragma once struct _GimpSessionInfoPrivate @@ -48,6 +47,3 @@ struct _GimpSessionInfoPrivate /* list of GimpSessionInfoDock */ GList *docks; }; - - -#endif /* __GIMP_SESSION_INFO_PRIVATE_H__ */ diff --git a/app/widgets/gimpsessioninfo.h b/app/widgets/gimpsessioninfo.h index b925d5ae05..e626a03cf5 100644 --- a/app/widgets/gimpsessioninfo.h +++ b/app/widgets/gimpsessioninfo.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SESSION_INFO_H__ -#define __GIMP_SESSION_INFO_H__ - +#pragma once #include "core/gimpobject.h" @@ -92,6 +90,3 @@ gint gimp_session_info_get_height (GimpSessionInfo void gimp_session_info_set_position_accuracy (gint accuracy); gint gimp_session_info_apply_position_accuracy (gint position); - - -#endif /* __GIMP_SESSION_INFO_H__ */ diff --git a/app/widgets/gimpsessionmanaged.h b/app/widgets/gimpsessionmanaged.h index ddb040e260..3dc5357fd1 100644 --- a/app/widgets/gimpsessionmanaged.h +++ b/app/widgets/gimpsessionmanaged.h @@ -18,12 +18,14 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SESSION_MANAGED_H__ -#define __GIMP_SESSION_MANAGED_H__ +#pragma once #define GIMP_TYPE_SESSION_MANAGED (gimp_session_managed_get_type ()) -G_DECLARE_INTERFACE (GimpSessionManaged, gimp_session_managed, GIMP, SESSION_MANAGED, GtkWidget) +G_DECLARE_INTERFACE (GimpSessionManaged, + gimp_session_managed, + GIMP, SESSION_MANAGED, + GtkWidget) struct _GimpSessionManagedInterface @@ -37,9 +39,6 @@ struct _GimpSessionManagedInterface }; -GList * gimp_session_managed_get_aux_info (GimpSessionManaged *session_managed); -void gimp_session_managed_set_aux_info (GimpSessionManaged *session_managed, - GList *aux_info); - - -#endif /* __GIMP_SESSION_MANAGED_H__ */ +GList * gimp_session_managed_get_aux_info (GimpSessionManaged *session_managed); +void gimp_session_managed_set_aux_info (GimpSessionManaged *session_managed, + GList *aux_info); diff --git a/app/widgets/gimpsettingsbox.h b/app/widgets/gimpsettingsbox.h index 7879083bda..b6d19f7507 100644 --- a/app/widgets/gimpsettingsbox.h +++ b/app/widgets/gimpsettingsbox.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SETTINGS_BOX_H__ -#define __GIMP_SETTINGS_BOX_H__ +#pragma once #define GIMP_TYPE_SETTINGS_BOX (gimp_settings_box_get_type ()) @@ -71,6 +70,3 @@ void gimp_settings_box_add_current (GimpSettingsBox *box, gint max_recent); void gimp_settings_box_unset (GimpSettingsBox *box); - - -#endif /* __GIMP_SETTINGS_BOX_H__ */ diff --git a/app/widgets/gimpsettingseditor.h b/app/widgets/gimpsettingseditor.h index 5e35f27d64..81d5afe5c8 100644 --- a/app/widgets/gimpsettingseditor.h +++ b/app/widgets/gimpsettingseditor.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SETTINGS_EDITOR_H__ -#define __GIMP_SETTINGS_EDITOR_H__ +#pragma once #define GIMP_TYPE_SETTINGS_EDITOR (gimp_settings_editor_get_type ()) @@ -48,6 +47,3 @@ GType gimp_settings_editor_get_type (void) G_GNUC_CONST; GtkWidget * gimp_settings_editor_new (Gimp *gimp, GObject *config, GimpContainer *container); - - -#endif /* __GIMP_SETTINGS_EDITOR_H__ */ diff --git a/app/widgets/gimpshortcutbutton.h b/app/widgets/gimpshortcutbutton.h index bcc6bddd7d..28bcea0ce2 100644 --- a/app/widgets/gimpshortcutbutton.h +++ b/app/widgets/gimpshortcutbutton.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SHORTCUT_BUTTON_H__ -#define __GIMP_SHORTCUT_BUTTON_H__ +#pragma once #define GIMP_TYPE_SHORTCUT_BUTTON (gimp_shortcut_button_get_type ()) @@ -65,6 +64,3 @@ void gimp_shortcut_button_set_accelerator (GimpShortcutButton *butto void gimp_shortcut_button_accepts_modifier (GimpShortcutButton *button, gboolean only, gboolean unique); - - -#endif /* __GIMP_SHORTCUT_BUTTON_H__ */ diff --git a/app/widgets/gimpsizebox.h b/app/widgets/gimpsizebox.h index 88b6b57fd9..fe9b5ec83a 100644 --- a/app/widgets/gimpsizebox.h +++ b/app/widgets/gimpsizebox.h @@ -18,10 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SIZE_BOX_H__ -#define __GIMP_SIZE_BOX_H__ - -G_BEGIN_DECLS +#pragma once #define GIMP_TYPE_SIZE_BOX (gimp_size_box_get_type ()) @@ -56,9 +53,4 @@ struct _GimpSizeBoxClass }; -GType gimp_size_box_get_type (void) G_GNUC_CONST; - - -G_END_DECLS - -#endif /* __GIMP_SIZE_BOX_H__ */ +GType gimp_size_box_get_type (void) G_GNUC_CONST; diff --git a/app/widgets/gimpstringaction.h b/app/widgets/gimpstringaction.h index 33ea3c13f4..0390f215db 100644 --- a/app/widgets/gimpstringaction.h +++ b/app/widgets/gimpstringaction.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_STRING_ACTION_H__ -#define __GIMP_STRING_ACTION_H__ - +#pragma once #include "gimpactionimpl.h" @@ -58,6 +56,3 @@ GimpStringAction * gimp_string_action_new (const gchar *name, const gchar *help_id, const gchar *value, GimpContext *context); - - -#endif /* __GIMP_STRING_ACTION_H__ */ diff --git a/app/widgets/gimpsymmetryeditor.h b/app/widgets/gimpsymmetryeditor.h index f35122de40..711aaceab2 100644 --- a/app/widgets/gimpsymmetryeditor.h +++ b/app/widgets/gimpsymmetryeditor.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_SYMMETRY_EDITOR_H__ -#define __GIMP_SYMMETRY_EDITOR_H__ - +#pragma once #include "gimpimageeditor.h" @@ -52,6 +50,3 @@ struct _GimpSymmetryEditorClass GType gimp_symmetry_editor_get_type (void) G_GNUC_CONST; GtkWidget * gimp_symmetry_editor_new (GimpMenuFactory *menu_factory); - - -#endif /* __GIMP_SYMMETRY_EDITOR_H__ */ diff --git a/app/widgets/gimptagentry.h b/app/widgets/gimptagentry.h index f3d6fa462a..d5b55db224 100644 --- a/app/widgets/gimptagentry.h +++ b/app/widgets/gimptagentry.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TAG_ENTRY_H__ -#define __GIMP_TAG_ENTRY_H__ +#pragma once #define GIMP_TYPE_TAG_ENTRY (gimp_tag_entry_get_type ()) @@ -81,6 +80,3 @@ void gimp_tag_entry_set_tag_string (GimpTagEntry *entry, const gchar *tag_string); const gchar * gimp_tag_entry_get_separator (void); - - -#endif /* __GIMP_TAG_ENTRY_H__ */ diff --git a/app/widgets/gimptagpopup.h b/app/widgets/gimptagpopup.h index 292c1b4cb9..e1ba014a40 100644 --- a/app/widgets/gimptagpopup.h +++ b/app/widgets/gimptagpopup.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TAG_POPUP_H__ -#define __GIMP_TAG_POPUP_H__ +#pragma once #define GIMP_TYPE_TAG_POPUP (gimp_tag_popup_get_type ()) @@ -80,6 +79,3 @@ GtkWidget * gimp_tag_popup_new (GimpComboTagEntry *entry); void gimp_tag_popup_show (GimpTagPopup *popup, GdkEvent *event); - - -#endif /* __GIMP_TAG_POPUP_H__ */ diff --git a/app/widgets/gimptemplateeditor.h b/app/widgets/gimptemplateeditor.h index 79adbda7a2..db87062a0d 100644 --- a/app/widgets/gimptemplateeditor.h +++ b/app/widgets/gimptemplateeditor.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TEMPLATE_EDITOR_H__ -#define __GIMP_TEMPLATE_EDITOR_H__ +#pragma once #define GIMP_TYPE_TEMPLATE_EDITOR (gimp_template_editor_get_type ()) @@ -58,6 +57,3 @@ GtkWidget * gimp_template_editor_get_resolution_se (GimpTemplateEditor *editor); GtkWidget * gimp_template_editor_get_resolution_chain (GimpTemplateEditor *editor); - - -#endif /* __GIMP_TEMPLATE_EDITOR_H__ */ diff --git a/app/widgets/gimptemplateview.h b/app/widgets/gimptemplateview.h index 403be1d345..405be6119f 100644 --- a/app/widgets/gimptemplateview.h +++ b/app/widgets/gimptemplateview.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TEMPLATE_VIEW_H__ -#define __GIMP_TEMPLATE_VIEW_H__ - +#pragma once #include "gimpcontainereditor.h" @@ -60,6 +58,3 @@ GtkWidget * gimp_template_view_new (GimpViewType view_type, gint view_size, gint view_border_width, GimpMenuFactory *menu_factory); - - -#endif /* __GIMP_TEMPLATE_VIEW_H__ */ diff --git a/app/widgets/gimptextbuffer-serialize.h b/app/widgets/gimptextbuffer-serialize.h index 468e73c60d..fa3b7709fe 100644 --- a/app/widgets/gimptextbuffer-serialize.h +++ b/app/widgets/gimptextbuffer-serialize.h @@ -22,8 +22,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TEXT_BUFFER_SERIALIZE_H__ -#define __GIMP_TEXT_BUFFER_SERIALIZE_H__ +#pragma once #define WORD_JOINER "\342\201\240" @@ -49,7 +48,3 @@ void gimp_text_buffer_pre_serialize (GimpTextBuffer *buffer, GtkTextBuffer *content); void gimp_text_buffer_post_deserialize (GimpTextBuffer *buffer, GtkTextBuffer *content); - - - -#endif /* __GIMP_TEXT_BUFFER_SERIALIZE_H__ */ diff --git a/app/widgets/gimptextbuffer.h b/app/widgets/gimptextbuffer.h index 2ee8e100c2..e3b818a36f 100644 --- a/app/widgets/gimptextbuffer.h +++ b/app/widgets/gimptextbuffer.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TEXT_BUFFER_H__ -#define __GIMP_TEXT_BUFFER_H__ +#pragma once #define GIMP_TYPE_TEXT_BUFFER (gimp_text_buffer_get_type ()) @@ -186,5 +185,3 @@ gboolean gimp_text_buffer_save (GimpTextBuffer *buff GList * gimp_text_buffer_get_tags_on_iter (GimpTextBuffer *buffer, const GtkTextIter *iter); GList * gimp_text_buffer_get_all_tags (GimpTextBuffer *buffer); - -#endif /* __GIMP_TEXT_BUFFER_H__ */ diff --git a/app/widgets/gimptextproxy.h b/app/widgets/gimptextproxy.h index 47dcecf1e9..f91a7f3ac7 100644 --- a/app/widgets/gimptextproxy.h +++ b/app/widgets/gimptextproxy.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TEXT_PROXY_H__ -#define __GIMP_TEXT_PROXY_H__ +#pragma once #define GIMP_TYPE_TEXT_PROXY (gimp_text_proxy_get_type ()) @@ -53,6 +52,3 @@ struct _GimpTextProxyClass GType gimp_text_proxy_get_type (void) G_GNUC_CONST; GtkWidget * gimp_text_proxy_new (void); - - -#endif /* __GIMP_TEXT_PROXY_H__ */ diff --git a/app/widgets/gimptextstyleeditor.h b/app/widgets/gimptextstyleeditor.h index 964f12503d..7e5616cdec 100644 --- a/app/widgets/gimptextstyleeditor.h +++ b/app/widgets/gimptextstyleeditor.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TEXT_STYLE_EDITOR_H__ -#define __GIMP_TEXT_STYLE_EDITOR_H__ +#pragma once #define GIMP_TYPE_TEXT_STYLE_EDITOR (gimp_text_style_editor_get_type ()) @@ -84,6 +83,3 @@ GtkWidget * gimp_text_style_editor_new (Gimp *gimp, GList * gimp_text_style_editor_list_tags (GimpTextStyleEditor *editor, GList **remove_tags); - - -#endif /* __GIMP_TEXT_STYLE_EDITOR_H__ */ diff --git a/app/widgets/gimptexttag.h b/app/widgets/gimptexttag.h index 440575146e..cecb6fe5a3 100644 --- a/app/widgets/gimptexttag.h +++ b/app/widgets/gimptexttag.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TEXT_TAG_H__ -#define __GIMP_TEXT_TAG_H__ +#pragma once /* GtkTextTag property names */ @@ -40,6 +39,3 @@ gboolean gimp_text_tag_get_fg_color (GtkTextTag *tag, GeglColor **color); gboolean gimp_text_tag_get_bg_color (GtkTextTag *tag, GeglColor **color); - - -#endif /* __GIMP_TEXT_TAG_H__ */ diff --git a/app/widgets/gimpthumbbox.h b/app/widgets/gimpthumbbox.h index ad29db6f2e..e52db8cb09 100644 --- a/app/widgets/gimpthumbbox.h +++ b/app/widgets/gimpthumbbox.h @@ -15,8 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_THUMB_BOX_H__ -#define __GIMP_THUMB_BOX_H__ +#pragma once #define GIMP_TYPE_THUMB_BOX (gimp_thumb_box_get_type ()) @@ -61,6 +60,3 @@ void gimp_thumb_box_take_file (GimpThumbBox *box, GFile *file); void gimp_thumb_box_take_files (GimpThumbBox *box, GSList *files); - - -#endif /* __GIMP_THUMB_BOX_H__ */ diff --git a/app/widgets/gimptoggleaction.h b/app/widgets/gimptoggleaction.h index 3cb1187924..5b430ef09b 100644 --- a/app/widgets/gimptoggleaction.h +++ b/app/widgets/gimptoggleaction.h @@ -19,9 +19,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TOGGLE_ACTION_H__ -#define __GIMP_TOGGLE_ACTION_H__ - +#pragma once #include "gimpactionimpl.h" @@ -77,6 +75,3 @@ gboolean gimp_toggle_action_get_active (GimpToggleAction *action); void _gimp_toggle_action_set_active (GimpToggleAction *action, gboolean active); - - -#endif /* __GIMP_TOGGLE_ACTION_H__ */ diff --git a/app/widgets/gimptoolbar.h b/app/widgets/gimptoolbar.h index 64b1c51485..c2ba2adc28 100644 --- a/app/widgets/gimptoolbar.h +++ b/app/widgets/gimptoolbar.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TOOLBAR_H__ -#define __GIMP_TOOLBAR_H__ +#pragma once #define GIMP_TYPE_TOOLBAR (gimp_toolbar_get_type ()) @@ -50,6 +49,3 @@ GType gimp_toolbar_get_type (void) G_GNUC_CONST; GtkWidget * gimp_toolbar_new (GimpMenuModel *model, GimpUIManager *manager); - - -#endif /* __GIMP_TOOLBAR_H__ */ diff --git a/app/widgets/gimptoolbox-color-area.h b/app/widgets/gimptoolbox-color-area.h index 50f6427904..0b6b09b9cd 100644 --- a/app/widgets/gimptoolbox-color-area.h +++ b/app/widgets/gimptoolbox-color-area.h @@ -15,13 +15,9 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TOOLBOX_COLOR_AREA_H__ -#define __GIMP_TOOLBOX_COLOR_AREA_H__ +#pragma once GtkWidget * gimp_toolbox_color_area_create (GimpToolbox *toolbox, gint width, gint height); - - -#endif /* __GIMP_TOOLBOX_COLOR_AREA_H__ */ diff --git a/app/widgets/gimptoolbox-dnd.h b/app/widgets/gimptoolbox-dnd.h index dd94ca8083..bdb3e931b7 100644 --- a/app/widgets/gimptoolbox-dnd.h +++ b/app/widgets/gimptoolbox-dnd.h @@ -15,12 +15,8 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TOOLBOX_DND_H__ -#define __GIMP_TOOLBOX_DND_H__ +#pragma once void gimp_toolbox_dnd_init (GimpToolbox *toolbox, GtkWidget *vbox); - - -#endif /* __GIMP_TOOLBOX_DND_H__ */ diff --git a/app/widgets/gimptoolbox-image-area.h b/app/widgets/gimptoolbox-image-area.h index 77f0b15690..bb8c023c5d 100644 --- a/app/widgets/gimptoolbox-image-area.h +++ b/app/widgets/gimptoolbox-image-area.h @@ -15,13 +15,9 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TOOLBOX_IMAGE_AREA_H__ -#define __GIMP_TOOLBOX_IMAGE_AREA_H__ +#pragma once GtkWidget * gimp_toolbox_image_area_create (GimpToolbox *toolbox, gint width, gint height); - - -#endif /* __GIMP_TOOLBOX_IMAGE_AREA_H__ */ diff --git a/app/widgets/gimptoolbox-indicator-area.h b/app/widgets/gimptoolbox-indicator-area.h index 05c9c7c5fb..3ab7e67aa0 100644 --- a/app/widgets/gimptoolbox-indicator-area.h +++ b/app/widgets/gimptoolbox-indicator-area.h @@ -15,11 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TOOLBOX_INDICATOR_AREA_H__ -#define __GIMP_TOOLBOX_INDICATOR_AREA_H__ +#pragma once GtkWidget * gimp_toolbox_indicator_area_create (GimpToolbox *toolbox); - - -#endif /* __GIMP_TOOLBOX_INDICATOR_AREA_H__ */ diff --git a/app/widgets/gimptoolbox.h b/app/widgets/gimptoolbox.h index b62f7585aa..c75e54416c 100644 --- a/app/widgets/gimptoolbox.h +++ b/app/widgets/gimptoolbox.h @@ -15,9 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TOOLBOX_H__ -#define __GIMP_TOOLBOX_H__ - +#pragma once #include "gimpdock.h" @@ -53,7 +51,3 @@ GtkWidget * gimp_toolbox_new (GimpDialogFactory *factory, GimpContext * gimp_toolbox_get_context (GimpToolbox *toolbox); void gimp_toolbox_set_drag_handler (GimpToolbox *toolbox, GimpPanedBox *drag_handler); - - - -#endif /* __GIMP_TOOLBOX_H__ */ diff --git a/app/widgets/gimptoolbutton.h b/app/widgets/gimptoolbutton.h index b53d48a27a..e6297be9de 100644 --- a/app/widgets/gimptoolbutton.h +++ b/app/widgets/gimptoolbutton.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TOOL_BUTTON_H__ -#define __GIMP_TOOL_BUTTON_H__ +#pragma once #define GIMP_TYPE_TOOL_BUTTON (gimp_tool_button_get_type ()) @@ -58,6 +57,3 @@ void gimp_tool_button_set_tool_item (GimpToolButton *tool_button, GimpToolItem * gimp_tool_button_get_tool_item (GimpToolButton *tool_button); GimpToolInfo * gimp_tool_button_get_tool_info (GimpToolButton *tool_button); - - -#endif /* __GIMP_TOOL_BUTTON_H__ */ diff --git a/app/widgets/gimptooleditor.h b/app/widgets/gimptooleditor.h index ac34b92c12..00b6b0a049 100644 --- a/app/widgets/gimptooleditor.h +++ b/app/widgets/gimptooleditor.h @@ -19,9 +19,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TOOL_EDITOR_H__ -#define __GIMP_TOOL_EDITOR_H__ - +#pragma once #include "gimpcontainertreeview.h" @@ -58,6 +56,3 @@ GtkWidget * gimp_tool_editor_new (GimpContainer *container, gint view_border_width); void gimp_tool_editor_revert_changes (GimpToolEditor *tool_editor); - - -#endif /* __GIMP_TOOL_EDITOR_H__ */ diff --git a/app/widgets/gimptooloptionseditor.h b/app/widgets/gimptooloptionseditor.h index fe02d943b0..dae01e71f2 100644 --- a/app/widgets/gimptooloptionseditor.h +++ b/app/widgets/gimptooloptionseditor.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TOOL_OPTIONS_EDITOR_H__ -#define __GIMP_TOOL_OPTIONS_EDITOR_H__ - +#pragma once #include "gimpeditor.h" @@ -53,6 +51,3 @@ GType gimp_tool_options_editor_get_type (void) G_GNUC_CONST; GtkWidget * gimp_tool_options_editor_new (Gimp *gimp, GimpMenuFactory *menu_factory); GimpToolOptions * gimp_tool_options_editor_get_tool_options (GimpToolOptionsEditor *editor); - - -#endif /* __GIMP_TOOL_OPTIONS_EDITOR_H__ */ diff --git a/app/widgets/gimptoolpalette.h b/app/widgets/gimptoolpalette.h index d451a36e1b..94fc23650d 100644 --- a/app/widgets/gimptoolpalette.h +++ b/app/widgets/gimptoolpalette.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TOOL_PALETTE_H__ -#define __GIMP_TOOL_PALETTE_H__ +#pragma once #define GIMP_TYPE_TOOL_PALETTE (gimp_tool_palette_get_type ()) @@ -51,6 +50,3 @@ void gimp_tool_palette_set_toolbox (GimpToolPalette *palette, gboolean gimp_tool_palette_get_button_size (GimpToolPalette *palette, gint *width, gint *height); - - -#endif /* __GIMP_TOOL_PALETTE_H__ */ diff --git a/app/widgets/gimptoolpreseteditor.h b/app/widgets/gimptoolpreseteditor.h index af08108115..bc11fc228b 100644 --- a/app/widgets/gimptoolpreseteditor.h +++ b/app/widgets/gimptoolpreseteditor.h @@ -15,9 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TOOL_PRESET_EDITOR_H__ -#define __GIMP_TOOL_PRESET_EDITOR_H__ - +#pragma once #include "gimpdataeditor.h" @@ -50,6 +48,3 @@ GType gimp_tool_preset_editor_get_type (void) G_GNUC_CONST; GtkWidget * gimp_tool_preset_editor_new (GimpContext *context, GimpMenuFactory *menu_factory); - - -#endif /* __GIMP_TOOL_PRESET_EDITOR_H__ */ diff --git a/app/widgets/gimptoolpresetfactoryview.h b/app/widgets/gimptoolpresetfactoryview.h index 9c05871fe2..eda367d8ee 100644 --- a/app/widgets/gimptoolpresetfactoryview.h +++ b/app/widgets/gimptoolpresetfactoryview.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TOOL_PRESET_FACTORY_VIEW_H__ -#define __GIMP_TOOL_PRESET_FACTORY_VIEW_H__ +#pragma once #include "gimpdatafactoryview.h" @@ -53,6 +52,3 @@ GtkWidget * gimp_tool_preset_factory_view_new (GimpViewType view_type, gint view_size, gint view_border_width, GimpMenuFactory *menu_factory); - - -#endif /* __GIMP_TOOL_PRESET_FACTORY_VIEW_H__ */ diff --git a/app/widgets/gimptranslationstore.h b/app/widgets/gimptranslationstore.h index 1c1e0d7e89..31b2baed7f 100644 --- a/app/widgets/gimptranslationstore.h +++ b/app/widgets/gimptranslationstore.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_TRANSLATION_STORE_H__ -#define __GIMP_TRANSLATION_STORE_H__ - +#pragma once #include "gimplanguagestore.h" @@ -41,6 +39,3 @@ GType gimp_translation_store_get_type (void) G_GNUC_CONST; void gimp_translation_store_initialize (const gchar *system_lang_l10n); GtkListStore * gimp_translation_store_new (gboolean manual_l18n, const gchar *empty_label); - - -#endif /* __GIMP_TRANSLATION_STORE_H__ */ diff --git a/app/widgets/gimpuimanager.h b/app/widgets/gimpuimanager.h index 89d8c99372..01ad579e78 100644 --- a/app/widgets/gimpuimanager.h +++ b/app/widgets/gimpuimanager.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_UI_MANAGER_H__ -#define __GIMP_UI_MANAGER_H__ - +#pragma once #include "core/gimpobject.h" @@ -172,6 +170,3 @@ void gimp_ui_manager_ui_popup_at_rect const GdkEvent *trigger_event, GDestroyNotify popdown_func, gpointer popdown_data); - - -#endif /* __GIMP_UI_MANAGER_H__ */ diff --git a/app/widgets/gimpundoeditor.h b/app/widgets/gimpundoeditor.h index bb76214288..d7627ab8e7 100644 --- a/app/widgets/gimpundoeditor.h +++ b/app/widgets/gimpundoeditor.h @@ -15,9 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_UNDO_EDITOR_H__ -#define __GIMP_UNDO_EDITOR_H__ - +#pragma once #include "gimpimageeditor.h" @@ -58,6 +56,3 @@ GType gimp_undo_editor_get_type (void) G_GNUC_CONST; GtkWidget * gimp_undo_editor_new (GimpCoreConfig *config, GimpMenuFactory *menu_factory); - - -#endif /* __GIMP_UNDO_EDITOR_H__ */ diff --git a/app/widgets/gimpview-popup.h b/app/widgets/gimpview-popup.h index 4cfdaa95df..ff5ba4df98 100644 --- a/app/widgets/gimpview-popup.h +++ b/app/widgets/gimpview-popup.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEW_POPUP_H__ -#define __GIMP_VIEW_POPUP_H__ +#pragma once gboolean gimp_view_popup_show (GtkWidget *widget, @@ -29,6 +28,3 @@ gboolean gimp_view_popup_show (GtkWidget *widget, gint view_width, gint view_height, gboolean dot_for_dot); - - -#endif /* __GIMP_VIEW_POPUP_H__ */ diff --git a/app/widgets/gimpview.h b/app/widgets/gimpview.h index 328aa5c9d7..c67ee30345 100644 --- a/app/widgets/gimpview.h +++ b/app/widgets/gimpview.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEW_H__ -#define __GIMP_VIEW_H__ +#pragma once #define GIMP_TYPE_VIEW (gimp_view_get_type ()) @@ -103,6 +102,3 @@ void gimp_view_set_viewable (GimpView *view, GimpViewable *viewable); void gimp_view_set_expand (GimpView *view, gboolean expand); - - -#endif /* __GIMP_VIEW_H__ */ diff --git a/app/widgets/gimpviewablebox.h b/app/widgets/gimpviewablebox.h index 05552453f8..a6c3e3ea23 100644 --- a/app/widgets/gimpviewablebox.h +++ b/app/widgets/gimpviewablebox.h @@ -15,8 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEWABLE_BOX_H__ -#define __GIMP_VIEWABLE_BOX_H__ +#pragma once GtkWidget * gimp_brush_box_new (GimpContainer *container, @@ -106,6 +105,3 @@ GtkWidget * gimp_prop_font_box_new (GimpContainer *container, gint spacing, const gchar *view_type_prop, const gchar *view_size_prop); - - -#endif /* __GIMP_VIEWABLE_BOX_H__ */ diff --git a/app/widgets/gimpviewablebutton.h b/app/widgets/gimpviewablebutton.h index d4e95cdcf1..45bc07270f 100644 --- a/app/widgets/gimpviewablebutton.h +++ b/app/widgets/gimpviewablebutton.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEWABLE_BUTTON_H__ -#define __GIMP_VIEWABLE_BUTTON_H__ +#pragma once #define GIMP_TYPE_VIEWABLE_BUTTON (gimp_viewable_button_get_type ()) @@ -79,6 +78,3 @@ void gimp_viewable_button_set_view_type (GimpViewableButton *button, gint gimp_viewable_button_get_view_size (GimpViewableButton *button); void gimp_viewable_button_set_view_size (GimpViewableButton *button, GimpViewSize view_size); - - -#endif /* __GIMP_VIEWABLE_BUTTON_H__ */ diff --git a/app/widgets/gimpviewabledialog.h b/app/widgets/gimpviewabledialog.h index c9d67025fe..3dbea0ad02 100644 --- a/app/widgets/gimpviewabledialog.h +++ b/app/widgets/gimpviewabledialog.h @@ -18,10 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEWABLE_DIALOG_H__ -#define __GIMP_VIEWABLE_DIALOG_H__ - -G_BEGIN_DECLS +#pragma once #define GIMP_TYPE_VIEWABLE_DIALOG (gimp_viewable_dialog_get_type ()) @@ -70,8 +67,3 @@ GtkWidget * gimp_viewable_dialog_new (GList *viewables, void gimp_viewable_dialog_set_viewables (GimpViewableDialog *dialog, GList *viewables, GimpContext *context); - - -G_END_DECLS - -#endif /* __GIMP_VIEWABLE_DIALOG_H__ */ diff --git a/app/widgets/gimpviewrenderer-frame.h b/app/widgets/gimpviewrenderer-frame.h index e8cbd4ad8a..ab1040cb34 100644 --- a/app/widgets/gimpviewrenderer-frame.h +++ b/app/widgets/gimpviewrenderer-frame.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEW_RENDERER_FRAME_H__ -#define __GIMP_VIEW_RENDERER_FRAME_H__ +#pragma once GdkPixbuf * gimp_view_renderer_get_frame_pixbuf (GimpViewRenderer *renderer, @@ -29,6 +28,3 @@ GdkPixbuf * gimp_view_renderer_get_frame_pixbuf (GimpViewRenderer *renderer, void gimp_view_renderer_get_frame_size (gint *width, gint *height); - - -#endif /* __GIMP_VIEW_RENDERER_FRAME_H__ */ diff --git a/app/widgets/gimpviewrenderer-utils.h b/app/widgets/gimpviewrenderer-utils.h index 3cf60d0c14..c9031a9f6a 100644 --- a/app/widgets/gimpviewrenderer-utils.h +++ b/app/widgets/gimpviewrenderer-utils.h @@ -18,11 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEW_RENDERER_UTILS_H__ -#define __GIMP_VIEW_RENDERER_UTILS_H__ +#pragma once GType gimp_view_renderer_type_from_viewable_type (GType viewable_type); - - -#endif /* __GIMP_VIEW_RENDERER_UTILS_H__ */ diff --git a/app/widgets/gimpviewrenderer.h b/app/widgets/gimpviewrenderer.h index b2f5e0d14a..b746ff2eb7 100644 --- a/app/widgets/gimpviewrenderer.h +++ b/app/widgets/gimpviewrenderer.h @@ -18,8 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEW_RENDERER_H__ -#define __GIMP_VIEW_RENDERER_H__ +#pragma once #define GIMP_VIEW_MAX_BORDER_WIDTH 16 @@ -164,6 +163,3 @@ GimpColorTransform * const Babl *src_format, const Babl *dest_format); void gimp_view_renderer_free_color_transform (GimpViewRenderer *renderer); - - -#endif /* __GIMP_VIEW_RENDERER_H__ */ diff --git a/app/widgets/gimpviewrendererbrush.h b/app/widgets/gimpviewrendererbrush.h index b9a5399d40..b55a4144f8 100644 --- a/app/widgets/gimpviewrendererbrush.h +++ b/app/widgets/gimpviewrendererbrush.h @@ -18,11 +18,11 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEW_RENDERER_BRUSH_H__ -#define __GIMP_VIEW_RENDERER_BRUSH_H__ +#pragma once #include "gimpviewrenderer.h" + #define GIMP_TYPE_VIEW_RENDERER_BRUSH (gimp_view_renderer_brush_get_type ()) #define GIMP_VIEW_RENDERER_BRUSH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_BRUSH, GimpViewRendererBrush)) #define GIMP_VIEW_RENDERER_BRUSH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_BRUSH, GimpViewRendererBrushClass)) @@ -51,6 +51,3 @@ struct _GimpViewRendererBrushClass GType gimp_view_renderer_brush_get_type (void) G_GNUC_CONST; - - -#endif /* __GIMP_VIEW_RENDERER_BRUSH_H__ */ diff --git a/app/widgets/gimpviewrendererbuffer.h b/app/widgets/gimpviewrendererbuffer.h index df748969ab..87dae849e2 100644 --- a/app/widgets/gimpviewrendererbuffer.h +++ b/app/widgets/gimpviewrendererbuffer.h @@ -18,11 +18,11 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEW_RENDERER_BUFFER_H__ -#define __GIMP_VIEW_RENDERER_BUFFER_H__ +#pragma once #include "gimpviewrenderer.h" + #define GIMP_TYPE_VIEW_RENDERER_BUFFER (gimp_view_renderer_buffer_get_type ()) #define GIMP_VIEW_RENDERER_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_BUFFER, GimpViewRendererBuffer)) #define GIMP_VIEW_RENDERER_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_BUFFER, GimpViewRendererBufferClass)) @@ -45,6 +45,3 @@ struct _GimpViewRendererBufferClass GType gimp_view_renderer_buffer_get_type (void) G_GNUC_CONST; - - -#endif /* __GIMP_VIEW_RENDERER_BUFFER_H__ */ diff --git a/app/widgets/gimpviewrendererdrawable.h b/app/widgets/gimpviewrendererdrawable.h index a0634588a5..2f644ab8ce 100644 --- a/app/widgets/gimpviewrendererdrawable.h +++ b/app/widgets/gimpviewrendererdrawable.h @@ -18,11 +18,11 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEW_RENDERER_DRAWABLE_H__ -#define __GIMP_VIEW_RENDERER_DRAWABLE_H__ +#pragma once #include "gimpviewrenderer.h" + #define GIMP_TYPE_VIEW_RENDERER_DRAWABLE (gimp_view_renderer_drawable_get_type ()) #define GIMP_VIEW_RENDERER_DRAWABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_DRAWABLE, GimpViewRendererDrawable)) #define GIMP_VIEW_RENDERER_DRAWABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_DRAWABLE, GimpViewRendererDrawableClass)) @@ -48,6 +48,3 @@ struct _GimpViewRendererDrawableClass GType gimp_view_renderer_drawable_get_type (void) G_GNUC_CONST; - - -#endif /* __GIMP_VIEW_RENDERER_DRAWABLE_H__ */ diff --git a/app/widgets/gimpviewrenderergradient.h b/app/widgets/gimpviewrenderergradient.h index ce8816fbb3..0a1aea2a7e 100644 --- a/app/widgets/gimpviewrenderergradient.h +++ b/app/widgets/gimpviewrenderergradient.h @@ -18,11 +18,11 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEW_RENDERER_GRADIENT_H__ -#define __GIMP_VIEW_RENDERER_GRADIENT_H__ +#pragma once #include "gimpviewrenderer.h" + #define GIMP_TYPE_VIEW_RENDERER_GRADIENT (gimp_view_renderer_gradient_get_type ()) #define GIMP_VIEW_RENDERER_GRADIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_GRADIENT, GimpViewRendererGradient)) #define GIMP_VIEW_RENDERER_GRADIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_GRADIENT, GimpViewRendererGradientClass)) @@ -60,6 +60,3 @@ void gimp_view_renderer_gradient_set_reverse (GimpViewRendererGradient *re void gimp_view_renderer_gradient_set_blend_color_space (GimpViewRendererGradient *renderer, GimpGradientBlendColorSpace blend_color_space); - - -#endif /* __GIMP_VIEW_RENDERER_GRADIENT_H__ */ diff --git a/app/widgets/gimpviewrendererimage.h b/app/widgets/gimpviewrendererimage.h index e73bc47a6a..d165a6111e 100644 --- a/app/widgets/gimpviewrendererimage.h +++ b/app/widgets/gimpviewrendererimage.h @@ -18,11 +18,11 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEW_RENDERER_IMAGE_H__ -#define __GIMP_VIEW_RENDERER_IMAGE_H__ +#pragma once #include "gimpviewrenderer.h" + #define GIMP_TYPE_VIEW_RENDERER_IMAGE (gimp_view_renderer_image_get_type ()) #define GIMP_VIEW_RENDERER_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_IMAGE, GimpViewRendererImage)) #define GIMP_VIEW_RENDERER_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_IMAGE, GimpViewRendererImageClass)) @@ -47,6 +47,3 @@ struct _GimpViewRendererImageClass GType gimp_view_renderer_image_get_type (void) G_GNUC_CONST; - - -#endif /* __GIMP_VIEW_RENDERER_IMAGE_H__ */ diff --git a/app/widgets/gimpviewrendererimagefile.h b/app/widgets/gimpviewrendererimagefile.h index 223afd94c8..9cfcb4c86b 100644 --- a/app/widgets/gimpviewrendererimagefile.h +++ b/app/widgets/gimpviewrendererimagefile.h @@ -18,9 +18,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEW_RENDERER_IMAGEFILE_H__ -#define __GIMP_VIEW_RENDERER_IMAGEFILE_H__ - +#pragma once #include "gimpviewrenderer.h" @@ -47,6 +45,3 @@ struct _GimpViewRendererImagefileClass GType gimp_view_renderer_imagefile_get_type (void) G_GNUC_CONST; - - -#endif /* __GIMP_VIEW_RENDERER_IMAGEFILE_H__ */ diff --git a/app/widgets/gimpviewrendererlayer.h b/app/widgets/gimpviewrendererlayer.h index e770ec2546..8a34a7a9d4 100644 --- a/app/widgets/gimpviewrendererlayer.h +++ b/app/widgets/gimpviewrendererlayer.h @@ -18,11 +18,11 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEW_RENDERER_LAYER_H__ -#define __GIMP_VIEW_RENDERER_LAYER_H__ +#pragma once #include "gimpviewrendererdrawable.h" + #define GIMP_TYPE_VIEW_RENDERER_LAYER (gimp_view_renderer_layer_get_type ()) #define GIMP_VIEW_RENDERER_LAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_LAYER, GimpViewRendererLayer)) #define GIMP_VIEW_RENDERER_LAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_LAYER, GimpViewRendererLayerClass)) @@ -45,6 +45,3 @@ struct _GimpViewRendererLayerClass GType gimp_view_renderer_layer_get_type (void) G_GNUC_CONST; - - -#endif /* __GIMP_VIEW_RENDERER_LAYER_H__ */ diff --git a/app/widgets/gimpviewrendererpalette.h b/app/widgets/gimpviewrendererpalette.h index 53b3736734..a8ef260993 100644 --- a/app/widgets/gimpviewrendererpalette.h +++ b/app/widgets/gimpviewrendererpalette.h @@ -18,11 +18,11 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEW_RENDERER_PALETTE_H__ -#define __GIMP_VIEW_RENDERER_PALETTE_H__ +#pragma once #include "gimpviewrenderer.h" + #define GIMP_TYPE_VIEW_RENDERER_PALETTE (gimp_view_renderer_palette_get_type ()) #define GIMP_VIEW_RENDERER_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_PALETTE, GimpViewRendererPalette)) #define GIMP_VIEW_RENDERER_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_PALETTE, GimpViewRendererPaletteClass)) @@ -58,6 +58,3 @@ void gimp_view_renderer_palette_set_cell_size (GimpViewRendererPalette *rende gint cell_size); void gimp_view_renderer_palette_set_draw_grid (GimpViewRendererPalette *renderer, gboolean draw_grid); - - -#endif /* __GIMP_VIEW_RENDERER_PALETTE_H__ */ diff --git a/app/widgets/gimpviewrendererpath.h b/app/widgets/gimpviewrendererpath.h index 279eecf282..ad55911490 100644 --- a/app/widgets/gimpviewrendererpath.h +++ b/app/widgets/gimpviewrendererpath.h @@ -19,11 +19,11 @@ * along with this program. If not, see . */ -#ifndef __GIMP_VIEW_RENDERER_PATH_H__ -#define __GIMP_VIEW_RENDERER_PATH_H__ +#pragma once #include "gimpviewrenderer.h" + #define GIMP_TYPE_VIEW_RENDERER_PATH (gimp_view_renderer_path_get_type ()) #define GIMP_VIEW_RENDERER_PATH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEW_RENDERER_PATH, GimpViewRendererPath)) #define GIMP_VIEW_RENDERER_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_VIEW_RENDERER_PATH, GimpViewRendererPathClass)) @@ -46,6 +46,3 @@ struct _GimpViewRendererPathClass GType gimp_view_renderer_path_get_type (void) G_GNUC_CONST; - - -#endif /* __GIMP_VIEW_RENDERER_PATH_H__ */ diff --git a/app/widgets/gimpwidgets-constructors.h b/app/widgets/gimpwidgets-constructors.h index 909f4ca543..983fa59eee 100644 --- a/app/widgets/gimpwidgets-constructors.h +++ b/app/widgets/gimpwidgets-constructors.h @@ -15,14 +15,10 @@ * along with this program. If not, see . */ -#ifndef __GIMP_WIDGETS_CONSTRUCTORS_H__ -#define __GIMP_WIDGETS_CONSTRUCTORS_H__ +#pragma once GtkWidget * gimp_icon_button_new (const gchar *icon_name, const gchar *label); GtkWidget * gimp_color_profile_label_new (GimpColorProfile *profile); - - -#endif /* __GIMP_WIDGETS_CONSTRUCTORS_H__ */ diff --git a/app/widgets/gimpwindowstrategy.h b/app/widgets/gimpwindowstrategy.h index f916bb157a..da979a75ed 100644 --- a/app/widgets/gimpwindowstrategy.h +++ b/app/widgets/gimpwindowstrategy.h @@ -18,12 +18,14 @@ * along with this program. If not, see . */ -#ifndef __GIMP_WINDOW_STRATEGY_H__ -#define __GIMP_WINDOW_STRATEGY_H__ +#pragma once #define GIMP_TYPE_WINDOW_STRATEGY (gimp_window_strategy_get_type ()) -G_DECLARE_INTERFACE (GimpWindowStrategy, gimp_window_strategy, GIMP, WINDOW_STRATEGY, GObject) +G_DECLARE_INTERFACE (GimpWindowStrategy, + gimp_window_strategy, + GIMP, WINDOW_STRATEGY, + GObject) struct _GimpWindowStrategyInterface @@ -44,6 +46,3 @@ GtkWidget * gimp_window_strategy_show_dockable_dialog (GimpWindowStrategy *strat GimpDialogFactory *factory, GdkMonitor *monitor, const gchar *identifiers); - - -#endif /* __GIMP_WINDOW_STRATEGY_H__ */ diff --git a/plug-ins/filter-browser/gegl-filter-info.h b/plug-ins/filter-browser/gegl-filter-info.h index ed86ea993c..b2871d0ead 100644 --- a/plug-ins/filter-browser/gegl-filter-info.h +++ b/plug-ins/filter-browser/gegl-filter-info.h @@ -15,15 +15,16 @@ * along with this program. If not, see . */ -#ifndef __GIMP_GEGL_FILTER_INFO_H__ -#define __GIMP_GEGL_FILTER_INFO_H__ +#pragma once #include G_BEGIN_DECLS #define GIMP_GEGL_FILTER_TYPE_INFO gimp_gegl_filter_info_get_type () -G_DECLARE_FINAL_TYPE (GimpGeglFilterInfo, gimp_gegl_filter_info, GIMP, GEGL_FILTER_INFO, GObject) -G_END_DECLS +G_DECLARE_FINAL_TYPE (GimpGeglFilterInfo, + gimp_gegl_filter_info, + GIMP, GEGL_FILTER_INFO, + GObject) -#endif +G_END_DECLS diff --git a/plug-ins/gimpressionist/gimpressionist.h b/plug-ins/gimpressionist/gimpressionist.h index 8c45a89c00..1af357d8eb 100644 --- a/plug-ins/gimpressionist/gimpressionist.h +++ b/plug-ins/gimpressionist/gimpressionist.h @@ -15,8 +15,7 @@ * along with this program. If not, see . */ -#ifndef __GIMPRESSIONIST_H -#define __GIMPRESSIONIST_H +#pragma once /* Includes necessary for the correct processing of this file. */ #include @@ -181,7 +180,3 @@ void gimpressionist_scale_entry_update_int (GimpLabelSpin *entry, gint *value); #define CLAMP_UP_TO(x, max) (CLAMP((x),(0),(max-1))) - -#endif /* #ifndef __GIMPRESSIONIST_H */ - - diff --git a/plug-ins/help/gimphelp.h b/plug-ins/help/gimphelp.h index 8c5d83fc34..febf974d27 100644 --- a/plug-ins/help/gimphelp.h +++ b/plug-ins/help/gimphelp.h @@ -20,9 +20,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_HELP_H__ -#define __GIMP_HELP_H__ - +#pragma once #include "gimphelptypes.h" @@ -51,6 +49,3 @@ void gimp_help_register_domain (const gchar *domain_name, GimpHelpDomain * gimp_help_lookup_domain (const gchar *domain_name); GList * gimp_help_parse_locales (const gchar *help_locales); - - -#endif /* ! __GIMP_HELP_H__ */ diff --git a/plug-ins/help/gimphelpdomain.h b/plug-ins/help/gimphelpdomain.h index b7e6920b31..78acf85264 100644 --- a/plug-ins/help/gimphelpdomain.h +++ b/plug-ins/help/gimphelpdomain.h @@ -20,8 +20,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_HELP_DOMAIN_H__ -#define __GIMP_HELP_DOMAIN_H__ +#pragma once struct _GimpHelpDomain @@ -46,6 +45,3 @@ gchar * gimp_help_domain_map (GimpHelpDomain *domain, GimpHelpLocale **locale, gboolean *fatal_error); void gimp_help_domain_exit (void); - - -#endif /* ! __GIMP_HELP_DOMAIN_H__ */ diff --git a/plug-ins/help/gimphelpitem.h b/plug-ins/help/gimphelpitem.h index 15c3c7bbb0..f7602ac1df 100644 --- a/plug-ins/help/gimphelpitem.h +++ b/plug-ins/help/gimphelpitem.h @@ -20,8 +20,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_HELP_ITEM_H__ -#define __GIMP_HELP_ITEM_H__ +#pragma once struct _GimpHelpItem @@ -42,6 +41,3 @@ GimpHelpItem * gimp_help_item_new (const gchar *ref, const gchar *sort, const gchar *parent); void gimp_help_item_free (GimpHelpItem *item); - - -#endif /* __GIMP_HELP_ITEM_H__ */ diff --git a/plug-ins/help/gimphelplocale.h b/plug-ins/help/gimphelplocale.h index 8dd57a6bf5..f7f391e68f 100644 --- a/plug-ins/help/gimphelplocale.h +++ b/plug-ins/help/gimphelplocale.h @@ -20,8 +20,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_HELP_LOCALE_H__ -#define __GIMP_HELP_LOCALE_H__ +#pragma once struct _GimpHelpLocale @@ -46,6 +45,3 @@ gboolean gimp_help_locale_parse (GimpHelpLocale *locale, const gchar *help_domain, GimpHelpProgress *progress, GError **error); - - -#endif /* __GIMP_HELP_LOCALE_H__ */ diff --git a/plug-ins/help/gimphelpprogress-private.h b/plug-ins/help/gimphelpprogress-private.h index d83e45fc75..7fcd795180 100644 --- a/plug-ins/help/gimphelpprogress-private.h +++ b/plug-ins/help/gimphelpprogress-private.h @@ -20,8 +20,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_HELP_PROGRESS_PRIVATE_H__ -#define __GIMP_HELP_PROGRESS_PRIVATE_H__ +#pragma once /* internal API */ @@ -34,6 +33,3 @@ void _gimp_help_progress_update (GimpHelpProgress *progress, gdouble percentage) G_GNUC_INTERNAL; void _gimp_help_progress_pulse (GimpHelpProgress *progress) G_GNUC_INTERNAL; void _gimp_help_progress_finish (GimpHelpProgress *progress) G_GNUC_INTERNAL; - - -#endif /* ! __GIMP_HELP_PROGRESS_PRIVATE_H__ */ diff --git a/plug-ins/help/gimphelpprogress.h b/plug-ins/help/gimphelpprogress.h index d7fdb32294..d5df039888 100644 --- a/plug-ins/help/gimphelpprogress.h +++ b/plug-ins/help/gimphelpprogress.h @@ -20,8 +20,7 @@ * along with this program. If not, see . */ -#ifndef __GIMP_HELP_PROGRESS_H__ -#define __GIMP_HELP_PROGRESS_H__ +#pragma once typedef struct @@ -46,6 +45,3 @@ GimpHelpProgress * gimp_help_progress_new (const GimpHelpProgressVTable *vtab void gimp_help_progress_free (GimpHelpProgress *progress); void gimp_help_progress_cancel (GimpHelpProgress *progress); - - -#endif /* ! __GIMP_HELP_PROGRESS_H__ */ diff --git a/plug-ins/help/gimphelptypes.h b/plug-ins/help/gimphelptypes.h index 4937d6f32d..9ab138ea8c 100644 --- a/plug-ins/help/gimphelptypes.h +++ b/plug-ins/help/gimphelptypes.h @@ -20,14 +20,10 @@ * along with this program. If not, see . */ -#ifndef __GIMP_HELP_TYPES_H__ -#define __GIMP_HELP_TYPES_H__ +#pragma once typedef struct _GimpHelpDomain GimpHelpDomain; typedef struct _GimpHelpItem GimpHelpItem; typedef struct _GimpHelpLocale GimpHelpLocale; typedef struct _GimpHelpProgress GimpHelpProgress; - - -#endif /* ! __GIMP_HELP_TYPES_H__ */ diff --git a/tools/gen-languages.c b/tools/gen-languages.c index dc0cd8c129..25416776b6 100644 --- a/tools/gen-languages.c +++ b/tools/gen-languages.c @@ -123,7 +123,9 @@ main (int argc, *\n\ * You should have received a copy of the GNU General Public License\n\ * along with this program. If not, see .\n\ - */\n"; + */\n\ +\n\ +#pragma once\n"; if (! gimp_language_store_parser_init (&error)) {