diff --git a/app/about.h b/app/about.h
index c0dac07f83..ed333b6a9a 100644
--- a/app/about.h
+++ b/app/about.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __ABOUT_H__
-#define __ABOUT_H__
+#pragma once
#define GIMP_ACRONYM \
@@ -48,6 +47,3 @@
"\n\n" \
"You should have received a copy of the GNU General Public License " \
"along with GIMP. If not, see: https://www.gnu.org/licenses/")
-
-
-#endif /* __ABOUT_H__ */
diff --git a/app/actions/actions-types.h b/app/actions/actions-types.h
index 27024dbee8..4c15f47784 100644
--- a/app/actions/actions-types.h
+++ b/app/actions/actions-types.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __ACTIONS_TYPES_H__
-#define __ACTIONS_TYPES_H__
-
+#pragma once
#include "dialogs/dialogs-types.h"
#include "tools/tools-types.h"
@@ -51,6 +49,3 @@ typedef enum
GIMP_SAVE_MODE_EXPORT_AS,
GIMP_SAVE_MODE_OVERWRITE
} GimpSaveMode;
-
-
-#endif /* __ACTIONS_TYPES_H__ */
diff --git a/app/actions/actions.h b/app/actions/actions.h
index 3148cbb9de..494a03e1bb 100644
--- a/app/actions/actions.h
+++ b/app/actions/actions.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __ACTIONS_H__
-#define __ACTIONS_H__
+#pragma once
extern GimpActionFactory *global_action_factory;
@@ -114,6 +113,3 @@ void action_message (GimpDisplay *display,
paths = gimp_image_get_selected_paths (image); \
if (! paths) \
return
-
-
-#endif /* __ACTIONS_H__ */
diff --git a/app/actions/brush-editor-actions.h b/app/actions/brush-editor-actions.h
index 9b4eb6f153..67af4248e8 100644
--- a/app/actions/brush-editor-actions.h
+++ b/app/actions/brush-editor-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __BRUSH_EDITOR_ACTIONS_H__
-#define __BRUSH_EDITOR_ACTIONS_H__
+#pragma once
void brush_editor_actions_setup (GimpActionGroup *group);
void brush_editor_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __BRUSH_EDITOR_ACTIONS_H__ */
diff --git a/app/actions/brushes-actions.h b/app/actions/brushes-actions.h
index 1d292a2fb2..961e566373 100644
--- a/app/actions/brushes-actions.h
+++ b/app/actions/brushes-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __BRUSHES_ACTIONS_H__
-#define __BRUSHES_ACTIONS_H__
+#pragma once
void brushes_actions_setup (GimpActionGroup *group);
void brushes_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __BRUSHES_ACTIONS_H__ */
diff --git a/app/actions/buffers-actions.h b/app/actions/buffers-actions.h
index 6a02344301..2a646e0fc5 100644
--- a/app/actions/buffers-actions.h
+++ b/app/actions/buffers-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __BUFFERS_ACTIONS_H__
-#define __BUFFERS_ACTIONS_H__
+#pragma once
void buffers_actions_setup (GimpActionGroup *group);
void buffers_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __BUFFERS_ACTIONS_H__ */
diff --git a/app/actions/buffers-commands.h b/app/actions/buffers-commands.h
index a5e733930e..f0ab36273c 100644
--- a/app/actions/buffers-commands.h
+++ b/app/actions/buffers-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __BUFFERS_COMMANDS_H__
-#define __BUFFERS_COMMANDS_H__
+#pragma once
void buffers_paste_cmd_callback (GimpAction *action,
@@ -28,6 +27,3 @@ void buffers_paste_as_new_image_cmd_callback (GimpAction *action,
void buffers_delete_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __BUFFERS_COMMANDS_H__ */
diff --git a/app/actions/channels-actions.h b/app/actions/channels-actions.h
index 382eae1a21..ac2a341379 100644
--- a/app/actions/channels-actions.h
+++ b/app/actions/channels-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __CHANNELS_ACTIONS_H__
-#define __CHANNELS_ACTIONS_H__
+#pragma once
void channels_actions_setup (GimpActionGroup *group);
void channels_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __CHANNELS_ACTIONS_H__ */
diff --git a/app/actions/channels-commands.h b/app/actions/channels-commands.h
index a7d6283cce..ff3fee06d8 100644
--- a/app/actions/channels-commands.h
+++ b/app/actions/channels-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __CHANNELS_COMMANDS_H__
-#define __CHANNELS_COMMANDS_H__
+#pragma once
void channels_edit_attributes_cmd_callback (GimpAction *action,
@@ -69,6 +68,3 @@ void channels_color_tag_cmd_callback (GimpAction *action,
void channels_select_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __CHANNELS_COMMANDS_H__ */
diff --git a/app/actions/colormap-actions.h b/app/actions/colormap-actions.h
index 0451632429..9a3c4ca900 100644
--- a/app/actions/colormap-actions.h
+++ b/app/actions/colormap-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __COLORMAP_ACTIONS_H__
-#define __COLORMAP_ACTIONS_H__
+#pragma once
void colormap_actions_setup (GimpActionGroup *group);
void colormap_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __COLORMAP_ACTIONS_H__ */
diff --git a/app/actions/colormap-commands.h b/app/actions/colormap-commands.h
index fd29274da5..5c90aa783a 100644
--- a/app/actions/colormap-commands.h
+++ b/app/actions/colormap-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __COLORMAP_COMMANDS_H__
-#define __COLORMAP_COMMANDS_H__
+#pragma once
void colormap_edit_color_cmd_callback (GimpAction *action,
@@ -31,6 +30,3 @@ void colormap_add_color_cmd_callback (GimpAction *action,
void colormap_to_selection_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __COLORMAP_COMMANDS_H__ */
diff --git a/app/actions/context-actions.h b/app/actions/context-actions.h
index f2ad085f0e..42a1fd2a4b 100644
--- a/app/actions/context-actions.h
+++ b/app/actions/context-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __CONTEXT_ACTIONS_H__
-#define __CONTEXT_ACTIONS_H__
+#pragma once
void context_actions_setup (GimpActionGroup *group);
void context_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __CONTEXT_ACTIONS_H__ */
diff --git a/app/actions/context-commands.h b/app/actions/context-commands.h
index 0e486d534b..284ade6b56 100644
--- a/app/actions/context-commands.h
+++ b/app/actions/context-commands.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __CONTEXT_COMMANDS_H__
-#define __CONTEXT_COMMANDS_H__
-
+#pragma once
void context_colors_default_cmd_callback (GimpAction *action,
@@ -139,6 +137,3 @@ void context_brush_angle_cmd_callback (GimpAction *action,
void context_toggle_dynamics_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __CONTEXT_COMMANDS_H__ */
diff --git a/app/actions/cursor-info-actions.h b/app/actions/cursor-info-actions.h
index 58b3f71523..4abb03335d 100644
--- a/app/actions/cursor-info-actions.h
+++ b/app/actions/cursor-info-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __CURSOR_INFO_ACIONS_H__
-#define __CURSOR_INFO_ACIONS_H__
+#pragma once
void cursor_info_actions_setup (GimpActionGroup *group);
void cursor_info_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __CURSOR_INFO_ACTIONS_H__ */
diff --git a/app/actions/cursor-info-commands.h b/app/actions/cursor-info-commands.h
index 3562e15d62..a3b49142a1 100644
--- a/app/actions/cursor-info-commands.h
+++ b/app/actions/cursor-info-commands.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __CURSOR_INFO_COMMANDS_H__
-#define __CURSOR_INFO_COMMANDS_H__
+#pragma once
void cursor_info_sample_merged_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __CURSOR_INFO_COMMANDS_H__ */
diff --git a/app/actions/dashboard-actions.h b/app/actions/dashboard-actions.h
index b2f8342071..69ea85ec62 100644
--- a/app/actions/dashboard-actions.h
+++ b/app/actions/dashboard-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __DASHBOARD_ACTIONS_H__
-#define __DASHBOARD_ACTIONS_H__
+#pragma once
void dashboard_actions_setup (GimpActionGroup *group);
void dashboard_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __DASHBOARD_ACTIONS_H__ */
diff --git a/app/actions/dashboard-commands.h b/app/actions/dashboard-commands.h
index a97b7f17e2..00fa2b405b 100644
--- a/app/actions/dashboard-commands.h
+++ b/app/actions/dashboard-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __DASHBOARD_COMMANDS_H__
-#define __DASHBOARD_COMMANDS_H__
+#pragma once
void dashboard_update_interval_cmd_callback (GimpAction *action,
@@ -43,6 +42,3 @@ void dashboard_reset_cmd_callback (GimpAction *action,
void dashboard_low_swap_space_warning_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __DASHBOARD_COMMANDS_H__ */
diff --git a/app/actions/data-commands.h b/app/actions/data-commands.h
index a9bb4afee7..009d2b216b 100644
--- a/app/actions/data-commands.h
+++ b/app/actions/data-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __DATA_COMMANDS_H__
-#define __DATA_COMMANDS_H__
+#pragma once
void data_open_as_image_cmd_callback (GimpAction *action,
@@ -43,6 +42,3 @@ void data_refresh_cmd_callback (GimpAction *action,
void data_edit_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __DATA_COMMANDS_H__ */
diff --git a/app/actions/data-editor-commands.h b/app/actions/data-editor-commands.h
index c70743d960..e3b4763010 100644
--- a/app/actions/data-editor-commands.h
+++ b/app/actions/data-editor-commands.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __DATA_EDITOR_COMMANDS_H__
-#define __DATA_EDITOR_COMMANDS_H__
+#pragma once
void data_editor_edit_active_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __DATA_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/debug-actions.h b/app/actions/debug-actions.h
index c00780ca18..e3c57d2538 100644
--- a/app/actions/debug-actions.h
+++ b/app/actions/debug-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __DEBUG_ACTIONS_H__
-#define __DEBUG_ACTIONS_H__
+#pragma once
void debug_actions_setup (GimpActionGroup *group);
void debug_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __DEBUG_ACTIONS_H__ */
diff --git a/app/actions/debug-commands.h b/app/actions/debug-commands.h
index c51fcbff01..2513a7439a 100644
--- a/app/actions/debug-commands.h
+++ b/app/actions/debug-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __DEBUG_COMMANDS_H__
-#define __DEBUG_COMMANDS_H__
+#pragma once
void debug_gtk_inspector_cmd_callback (GimpAction *action,
@@ -40,6 +39,3 @@ void debug_dump_keyboard_shortcuts_cmd_callback (GimpAction *action,
void debug_dump_attached_data_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __DEBUG_COMMANDS_H__ */
diff --git a/app/actions/dialogs-actions.h b/app/actions/dialogs-actions.h
index b424bdd0b9..d8a5a4d037 100644
--- a/app/actions/dialogs-actions.h
+++ b/app/actions/dialogs-actions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __DIALOGS_ACTIONS_H__
-#define __DIALOGS_ACTIONS_H__
-
+#pragma once
/* this check is needed for the extern declaration below to be correct */
#ifndef __GIMP_ACTION_GROUP_H__
@@ -33,6 +31,3 @@ void dialogs_actions_update (GimpActionGroup *group,
gpointer data);
gboolean dialogs_actions_toolbox_exists (Gimp *gimp);
-
-
-#endif /* __DIALOGS_ACTIONS_H__ */
diff --git a/app/actions/dialogs-commands.h b/app/actions/dialogs-commands.h
index 22abafcc35..fe88f2943b 100644
--- a/app/actions/dialogs-commands.h
+++ b/app/actions/dialogs-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __DIALOGS_COMMANDS_H__
-#define __DIALOGS_COMMANDS_H__
+#pragma once
void dialogs_create_toplevel_cmd_callback (GimpAction *action,
@@ -25,6 +24,3 @@ void dialogs_create_toplevel_cmd_callback (GimpAction *action,
void dialogs_create_dockable_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __DIALOGS_COMMANDS_H__ */
diff --git a/app/actions/dock-actions.h b/app/actions/dock-actions.h
index 9e26c36334..6984eedf52 100644
--- a/app/actions/dock-actions.h
+++ b/app/actions/dock-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __DOCK_ACTIONS_H__
-#define __DOCK_ACTIONS_H__
+#pragma once
void dock_actions_setup (GimpActionGroup *group);
void dock_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __DOCK_ACTIONS_H__ */
diff --git a/app/actions/dock-commands.h b/app/actions/dock-commands.h
index 73120de848..6a777caa9c 100644
--- a/app/actions/dock-commands.h
+++ b/app/actions/dock-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __DOCK_COMMANDS_H__
-#define __DOCK_COMMANDS_H__
+#pragma once
void dock_toggle_image_menu_cmd_callback (GimpAction *action,
@@ -25,6 +24,3 @@ void dock_toggle_image_menu_cmd_callback (GimpAction *action,
void dock_toggle_auto_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __DOCK_COMMANDS_H__ */
diff --git a/app/actions/dockable-actions.h b/app/actions/dockable-actions.h
index d70872d97d..30f56df167 100644
--- a/app/actions/dockable-actions.h
+++ b/app/actions/dockable-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __DOCKABLE_ACTIONS_H__
-#define __DOCKABLE_ACTIONS_H__
+#pragma once
void dockable_actions_setup (GimpActionGroup *group);
void dockable_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __DOCKABLE_ACTIONS_H__ */
diff --git a/app/actions/dockable-commands.h b/app/actions/dockable-commands.h
index 3ffb848f4c..f89b433829 100644
--- a/app/actions/dockable-commands.h
+++ b/app/actions/dockable-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __DOCKABLE_COMMANDS_H__
-#define __DOCKABLE_COMMANDS_H__
+#pragma once
void dockable_add_tab_cmd_callback (GimpAction *action,
@@ -44,6 +43,3 @@ void dockable_tab_style_cmd_callback (GimpAction *action,
void dockable_show_button_bar_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __DOCKABLE_COMMANDS_H__ */
diff --git a/app/actions/documents-actions.h b/app/actions/documents-actions.h
index 3d31f27643..2d8fda25aa 100644
--- a/app/actions/documents-actions.h
+++ b/app/actions/documents-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __DOCUMENTS_ACTIONS_H__
-#define __DOCUMENTS_ACTIONS_H__
+#pragma once
void documents_actions_setup (GimpActionGroup *group);
void documents_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __DOCUMENTS_ACTIONS_H__ */
diff --git a/app/actions/documents-commands.h b/app/actions/documents-commands.h
index 6db47c5022..23d59c10c9 100644
--- a/app/actions/documents-commands.h
+++ b/app/actions/documents-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __DOCUMENTS_COMMANDS_H__
-#define __DOCUMENTS_COMMANDS_H__
+#pragma once
void documents_open_cmd_callback (GimpAction *action,
@@ -49,6 +48,3 @@ void documents_reload_previews_cmd_callback (GimpAction *action,
void documents_remove_dangling_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __DOCUMENTS_COMMANDS_H__ */
diff --git a/app/actions/drawable-actions.h b/app/actions/drawable-actions.h
index 1b6e38cd31..5f2b957e9c 100644
--- a/app/actions/drawable-actions.h
+++ b/app/actions/drawable-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __DRAWABLE_ACTIONS_H__
-#define __DRAWABLE_ACTIONS_H__
+#pragma once
void drawable_actions_setup (GimpActionGroup *group);
void drawable_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __DRAWABLE_ACTIONS_H__ */
diff --git a/app/actions/drawable-commands.h b/app/actions/drawable-commands.h
index a115f77ff5..dd68c34fd8 100644
--- a/app/actions/drawable-commands.h
+++ b/app/actions/drawable-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __DRAWABLE_COMMANDS_H__
-#define __DRAWABLE_COMMANDS_H__
+#pragma once
void drawable_equalize_cmd_callback (GimpAction *action,
@@ -42,6 +41,3 @@ void drawable_flip_cmd_callback (GimpAction *action,
void drawable_rotate_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __DRAWABLE_COMMANDS_H__ */
diff --git a/app/actions/dynamics-actions.h b/app/actions/dynamics-actions.h
index 515f6b3e8b..041bb35bcd 100644
--- a/app/actions/dynamics-actions.h
+++ b/app/actions/dynamics-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __DYNAMICS_ACTIONS_H__
-#define __DYNAMICS_ACTIONS_H__
+#pragma once
void dynamics_actions_setup (GimpActionGroup *group);
void dynamics_actions_update (GimpActionGroup *group,
gpointer user_data);
-
-
-#endif /* __DYNAMICS_ACTIONS_H__ */
diff --git a/app/actions/dynamics-editor-actions.h b/app/actions/dynamics-editor-actions.h
index 2f79c6dec6..68f95d94ca 100644
--- a/app/actions/dynamics-editor-actions.h
+++ b/app/actions/dynamics-editor-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __DYNAMICS_EDITOR_ACTIONS_H__
-#define __DYNAMICS_EDITOR_ACTIONS_H__
+#pragma once
void dynamics_editor_actions_setup (GimpActionGroup *group);
void dynamics_editor_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __DYNAMICS_EDITOR_ACTIONS_H__ */
diff --git a/app/actions/edit-actions.h b/app/actions/edit-actions.h
index 89978b3347..356693502d 100644
--- a/app/actions/edit-actions.h
+++ b/app/actions/edit-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __EDIT_ACTIONS_H__
-#define __EDIT_ACTIONS_H__
+#pragma once
void edit_actions_setup (GimpActionGroup *group);
void edit_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __EDIT_ACTIONS_H__ */
diff --git a/app/actions/edit-commands.h b/app/actions/edit-commands.h
index 21858544f7..636d10a404 100644
--- a/app/actions/edit-commands.h
+++ b/app/actions/edit-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __EDIT_COMMANDS_H__
-#define __EDIT_COMMANDS_H__
+#pragma once
void edit_undo_cmd_callback (GimpAction *action,
@@ -71,6 +70,3 @@ void edit_clear_cmd_callback (GimpAction *action,
void edit_fill_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __EDIT_COMMANDS_H__ */
diff --git a/app/actions/error-console-actions.h b/app/actions/error-console-actions.h
index c7a2dde574..e69d69400e 100644
--- a/app/actions/error-console-actions.h
+++ b/app/actions/error-console-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __ERROR_CONSOLE_ACIONS_H__
-#define __ERROR_CONSOLE_ACIONS_H__
+#pragma once
void error_console_actions_setup (GimpActionGroup *group);
void error_console_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __ERROR_CONSOLE_ACTIONS_H__ */
diff --git a/app/actions/error-console-commands.h b/app/actions/error-console-commands.h
index 6913a9b02f..9cdf24e42e 100644
--- a/app/actions/error-console-commands.h
+++ b/app/actions/error-console-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __ERROR_CONSOLE_COMMANDS_H__
-#define __ERROR_CONSOLE_COMMANDS_H__
+#pragma once
void error_console_clear_cmd_callback (GimpAction *action,
@@ -38,6 +37,3 @@ void error_console_highlight_warning_cmd_callback (GimpAction *action,
void error_console_highlight_info_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __ERROR_CONSOLE_COMMANDS_H__ */
diff --git a/app/actions/file-actions.h b/app/actions/file-actions.h
index 7029a9aa49..171591e593 100644
--- a/app/actions/file-actions.h
+++ b/app/actions/file-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_ACTIONS_H__
-#define __FILE_ACTIONS_H__
+#pragma once
void file_actions_setup (GimpActionGroup *group);
void file_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __FILE_ACTIONS_H__ */
diff --git a/app/actions/file-commands.h b/app/actions/file-commands.h
index 47c87503e3..22c48bb208 100644
--- a/app/actions/file-commands.h
+++ b/app/actions/file-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_COMMANDS_H__
-#define __FILE_COMMANDS_H__
+#pragma once
void file_open_cmd_callback (GimpAction *action,
@@ -58,6 +57,3 @@ void file_quit_cmd_callback (GimpAction *action,
void file_file_open_dialog (Gimp *gimp,
GFile *file,
GtkWidget *parent);
-
-
-#endif /* __FILE_COMMANDS_H__ */
diff --git a/app/actions/filters-actions.h b/app/actions/filters-actions.h
index f197b861c7..624dd0cd92 100644
--- a/app/actions/filters-actions.h
+++ b/app/actions/filters-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __FILTERS_ACTIONS_H__
-#define __FILTERS_ACTIONS_H__
+#pragma once
void filters_actions_setup (GimpActionGroup *group);
void filters_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __FILTERS_ACTIONS_H__ */
diff --git a/app/actions/filters-commands.h b/app/actions/filters-commands.h
index d4db5ec25e..6667e374c8 100644
--- a/app/actions/filters-commands.h
+++ b/app/actions/filters-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILTERS_COMMANDS_H__
-#define __FILTERS_COMMANDS_H__
+#pragma once
void filters_apply_cmd_callback (GimpAction *action,
@@ -37,6 +36,3 @@ void filters_run_procedure (Gimp *gimp,
GimpDisplay *display,
GimpProcedure *procedure,
GimpRunMode run_mode);
-
-
-#endif /* __FILTERS_COMMANDS_H__ */
diff --git a/app/actions/fonts-actions.h b/app/actions/fonts-actions.h
index f4651d5227..2777b4d6d8 100644
--- a/app/actions/fonts-actions.h
+++ b/app/actions/fonts-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __FONTS_ACTIONS_H__
-#define __FONTS_ACTIONS_H__
+#pragma once
void fonts_actions_setup (GimpActionGroup *group);
void fonts_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __FONTS_ACTIONS_H__ */
diff --git a/app/actions/gimpgeglprocedure.h b/app/actions/gimpgeglprocedure.h
index 61becf24b2..455471719a 100644
--- a/app/actions/gimpgeglprocedure.h
+++ b/app/actions/gimpgeglprocedure.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GEGL_PROCEDURE_H__
-#define __GIMP_GEGL_PROCEDURE_H__
-
+#pragma once
#include "pdb/gimpprocedure.h"
@@ -68,5 +66,3 @@ GimpProcedure * gimp_gegl_procedure_new (Gimp *gimp,
const gchar *icon_name,
const gchar *help_id);
gboolean gimp_gegl_procedure_is_editing_filter (GimpGeglProcedure *procedure);
-
-#endif /* __GIMP_GEGL_PROCEDURE_H__ */
diff --git a/app/actions/gradient-editor-actions.h b/app/actions/gradient-editor-actions.h
index 5c2f999084..c381d4ee64 100644
--- a/app/actions/gradient-editor-actions.h
+++ b/app/actions/gradient-editor-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __GRADIENT_EDITOR_ACTIONS_H__
-#define __GRADIENT_EDITOR_ACTIONS_H__
+#pragma once
void gradient_editor_actions_setup (GimpActionGroup *group);
void gradient_editor_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __GRADIENT_EDITOR_ACTIONS_H__ */
diff --git a/app/actions/gradient-editor-commands.h b/app/actions/gradient-editor-commands.h
index 4f930ea8f5..c6d474ed87 100644
--- a/app/actions/gradient-editor-commands.h
+++ b/app/actions/gradient-editor-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GRADIENT_EDITOR_COMMANDS_H__
-#define __GRADIENT_EDITOR_COMMANDS_H__
+#pragma once
enum
@@ -94,6 +93,3 @@ void gradient_editor_blend_opacity_cmd_callback (GimpAction *action,
void gradient_editor_zoom_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __GRADIENT_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/gradients-actions.h b/app/actions/gradients-actions.h
index c8ee1ce275..4415540c4f 100644
--- a/app/actions/gradients-actions.h
+++ b/app/actions/gradients-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __GRADIENTS_ACTIONS_H__
-#define __GRADIENTS_ACTIONS_H__
+#pragma once
void gradients_actions_setup (GimpActionGroup *group);
void gradients_actions_update (GimpActionGroup *group,
gpointer user_data);
-
-
-#endif /* __GRADIENT_ACTIONS_H__ */
diff --git a/app/actions/gradients-commands.h b/app/actions/gradients-commands.h
index 938f3ff814..e931162ab6 100644
--- a/app/actions/gradients-commands.h
+++ b/app/actions/gradients-commands.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __GRADIENTS_COMMANDS_H__
-#define __GRADIENTS_COMMANDS_H__
+#pragma once
void gradients_save_as_pov_ray_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __GRADIENTS_COMMANDS_H__ */
diff --git a/app/actions/help-actions.h b/app/actions/help-actions.h
index 970dc97ac8..afd724af0d 100644
--- a/app/actions/help-actions.h
+++ b/app/actions/help-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __HELP_ACTIONS_H__
-#define __HELP_ACTIONS_H__
+#pragma once
void help_actions_setup (GimpActionGroup *group);
void help_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __HELP_ACTIONS_H__ */
diff --git a/app/actions/help-commands.h b/app/actions/help-commands.h
index 61ce201785..d517023fb4 100644
--- a/app/actions/help-commands.h
+++ b/app/actions/help-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __HELP_COMMANDS_H__
-#define __HELP_COMMANDS_H__
+#pragma once
void help_help_cmd_callback (GimpAction *action,
@@ -25,6 +24,3 @@ void help_help_cmd_callback (GimpAction *action,
void help_context_help_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __HELP_COMMANDS_H__ */
diff --git a/app/actions/image-actions.h b/app/actions/image-actions.h
index 802f7af651..f725676076 100644
--- a/app/actions/image-actions.h
+++ b/app/actions/image-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __IMAGE_ACTIONS_H__
-#define __IMAGE_ACTIONS_H__
+#pragma once
void image_actions_setup (GimpActionGroup *group);
void image_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __IMAGE_ACTIONS_H__ */
diff --git a/app/actions/image-commands.h b/app/actions/image-commands.h
index 0cc6f5abc7..3c2debe29a 100644
--- a/app/actions/image-commands.h
+++ b/app/actions/image-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __IMAGE_COMMANDS_H__
-#define __IMAGE_COMMANDS_H__
+#pragma once
void image_new_cmd_callback (GimpAction *action,
@@ -106,5 +105,3 @@ void image_softproof_intent_cmd_callback (GimpAction *action,
void image_softproof_bpc_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-#endif /* __IMAGE_COMMANDS_H__ */
diff --git a/app/actions/images-actions.h b/app/actions/images-actions.h
index 4a304f7eb4..28f295eed1 100644
--- a/app/actions/images-actions.h
+++ b/app/actions/images-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __IMAGES_ACTIONS_H__
-#define __IMAGES_ACTIONS_H__
+#pragma once
void images_actions_setup (GimpActionGroup *group);
void images_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __IMAGES_ACTIONS_H__ */
diff --git a/app/actions/images-commands.h b/app/actions/images-commands.h
index f836fc4e53..970c7a8b1d 100644
--- a/app/actions/images-commands.h
+++ b/app/actions/images-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __IMAGES_COMMANDS_H__
-#define __IMAGES_COMMANDS_H__
+#pragma once
void images_raise_views_cmd_callback (GimpAction *action,
@@ -28,6 +27,3 @@ void images_new_view_cmd_callback (GimpAction *action,
void images_delete_image_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __IMAGES_COMMANDS_H__ */
diff --git a/app/actions/items-actions.h b/app/actions/items-actions.h
index 69832f7a66..cfa214fc2b 100644
--- a/app/actions/items-actions.h
+++ b/app/actions/items-actions.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __ITEMS_ACTIONS_H__
-#define __ITEMS_ACTIONS_H__
+#pragma once
void items_actions_setup (GimpActionGroup *group,
@@ -24,6 +23,3 @@ void items_actions_setup (GimpActionGroup *group,
void items_actions_update (GimpActionGroup *group,
const gchar *prefix,
GList *items);
-
-
-#endif /* __ITEMS_ACTIONS_H__ */
diff --git a/app/actions/items-commands.h b/app/actions/items-commands.h
index 7ac3697135..58b7bec59f 100644
--- a/app/actions/items-commands.h
+++ b/app/actions/items-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __ITEMS_COMMANDS_H__
-#define __ITEMS_COMMANDS_H__
+#pragma once
void items_visible_cmd_callback (GimpAction *action,
@@ -60,7 +59,3 @@ void items_stroke_last_vals_cmd_callback (GimpAction *action,
GimpImage *image,
GList *items,
gpointer data);
-
-
-
-#endif /* __ITEMS_COMMANDS_H__ */
diff --git a/app/actions/layers-actions.h b/app/actions/layers-actions.h
index 0f257bf73b..aad529895f 100644
--- a/app/actions/layers-actions.h
+++ b/app/actions/layers-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __LAYERS_ACTIONS_H__
-#define __LAYERS_ACTIONS_H__
+#pragma once
void layers_actions_setup (GimpActionGroup *group);
void layers_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __LAYERS_ACTIONS_H__ */
diff --git a/app/actions/layers-commands.h b/app/actions/layers-commands.h
index 29d00f8a51..cc92c6ed54 100644
--- a/app/actions/layers-commands.h
+++ b/app/actions/layers-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __LAYERS_COMMANDS_H__
-#define __LAYERS_COMMANDS_H__
+#pragma once
void layers_edit_cmd_callback (GimpAction *action,
@@ -165,6 +164,3 @@ void layers_lock_alpha_cmd_callback (GimpAction *action,
void layers_color_tag_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __LAYERS_COMMANDS_H__ */
diff --git a/app/actions/mypaint-brushes-actions.h b/app/actions/mypaint-brushes-actions.h
index 63c93c60f1..bb1b13cc69 100644
--- a/app/actions/mypaint-brushes-actions.h
+++ b/app/actions/mypaint-brushes-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __MYPAINT_BRUSHES_ACTIONS_H__
-#define __MYPAINT_BRUSHES_ACTIONS_H__
+#pragma once
void mypaint_brushes_actions_setup (GimpActionGroup *group);
void mypaint_brushes_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __MYPAINT_BRUSHES_ACTIONS_H__ */
diff --git a/app/actions/palette-editor-actions.h b/app/actions/palette-editor-actions.h
index 287df8aca3..01d8ff60ae 100644
--- a/app/actions/palette-editor-actions.h
+++ b/app/actions/palette-editor-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __PALETTE_EDITOR_ACTIONS_H__
-#define __PALETTE_EDITOR_ACTIONS_H__
+#pragma once
void palette_editor_actions_setup (GimpActionGroup *group);
void palette_editor_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __PALETTE_EDITOR_ACTIONS_H__ */
diff --git a/app/actions/palette-editor-commands.h b/app/actions/palette-editor-commands.h
index 29cd43c071..0e643a2bba 100644
--- a/app/actions/palette-editor-commands.h
+++ b/app/actions/palette-editor-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PALETTE_EDITOR_COMMANDS_H__
-#define __PALETTE_EDITOR_COMMANDS_H__
+#pragma once
void palette_editor_edit_color_cmd_callback (GimpAction *action,
@@ -32,6 +31,3 @@ void palette_editor_delete_color_cmd_callback (GimpAction *action,
void palette_editor_zoom_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __PALETTE_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/palettes-actions.h b/app/actions/palettes-actions.h
index 4029532fbb..9aad64186a 100644
--- a/app/actions/palettes-actions.h
+++ b/app/actions/palettes-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __PALETTES_ACTIONS_H__
-#define __PALETTES_ACTIONS_H__
+#pragma once
void palettes_actions_setup (GimpActionGroup *group);
void palettes_actions_update (GimpActionGroup *group,
gpointer user_data);
-
-
-#endif /* __PALETTES_ACTIONS_H__ */
diff --git a/app/actions/palettes-commands.h b/app/actions/palettes-commands.h
index ab7fb24a7f..0c3cf529ce 100644
--- a/app/actions/palettes-commands.h
+++ b/app/actions/palettes-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PALETTES_COMMANDS_H__
-#define __PALETTES_COMMANDS_H__
+#pragma once
void palettes_import_cmd_callback (GimpAction *action,
@@ -25,6 +24,3 @@ void palettes_import_cmd_callback (GimpAction *action,
void palettes_merge_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __PALETTES_COMMANDS_H__ */
diff --git a/app/actions/paths-actions.h b/app/actions/paths-actions.h
index f8a3b41079..18763a3cf8 100644
--- a/app/actions/paths-actions.h
+++ b/app/actions/paths-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __PATHS_ACTIONS_H__
-#define __PATHS_ACTIONS_H__
+#pragma once
void paths_actions_setup (GimpActionGroup *group);
void paths_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __PATHS_ACTIONS_H__ */
diff --git a/app/actions/paths-commands.h b/app/actions/paths-commands.h
index de04439112..219a6246f9 100644
--- a/app/actions/paths-commands.h
+++ b/app/actions/paths-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PATHS_COMMANDS_H__
-#define __PATHS_COMMANDS_H__
+#pragma once
void paths_edit_cmd_callback (GimpAction *action,
@@ -104,6 +103,3 @@ void paths_color_tag_cmd_callback (GimpAction *action,
void paths_select_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __PATHS_COMMANDS_H__ */
diff --git a/app/actions/patterns-actions.h b/app/actions/patterns-actions.h
index a736b9d9e9..75992e7563 100644
--- a/app/actions/patterns-actions.h
+++ b/app/actions/patterns-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __PATTERNS_ACTIONS_H__
-#define __PATTERNS_ACTIONS_H__
+#pragma once
void patterns_actions_setup (GimpActionGroup *group);
void patterns_actions_update (GimpActionGroup *group,
gpointer user_data);
-
-
-#endif /* __PATTERNS_ACTIONS_H__ */
diff --git a/app/actions/plug-in-actions.h b/app/actions/plug-in-actions.h
index a586acd22d..b01e17a245 100644
--- a/app/actions/plug-in-actions.h
+++ b/app/actions/plug-in-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __PLUG_IN_ACTIONS_H__
-#define __PLUG_IN_ACTIONS_H__
+#pragma once
void plug_in_actions_setup (GimpActionGroup *group);
void plug_in_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __PLUG_IN_ACTIONS_H__ */
diff --git a/app/actions/plug-in-commands.h b/app/actions/plug-in-commands.h
index b648482514..4ee83fb87f 100644
--- a/app/actions/plug-in-commands.h
+++ b/app/actions/plug-in-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PLUG_IN_COMMANDS_H__
-#define __PLUG_IN_COMMANDS_H__
+#pragma once
void plug_in_run_cmd_callback (GimpAction *action,
@@ -26,6 +25,3 @@ void plug_in_run_cmd_callback (GimpAction *action,
void plug_in_reset_all_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __PLUG_IN_COMMANDS_H__ */
diff --git a/app/actions/procedure-commands.h b/app/actions/procedure-commands.h
index f05dd1aff2..bb9adea46a 100644
--- a/app/actions/procedure-commands.h
+++ b/app/actions/procedure-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PROCEDURE_COMMANDS_H__
-#define __PROCEDURE_COMMANDS_H__
+#pragma once
GimpValueArray * procedure_commands_get_run_mode_arg (GimpProcedure *procedure);
@@ -41,6 +40,3 @@ gboolean procedure_commands_run_procedure_async (GimpProcedure *procedure,
GimpRunMode run_mode,
GimpValueArray *args,
GimpDisplay *display);
-
-
-#endif /* __PROCEDURE_COMMANDS_H__ */
diff --git a/app/actions/quick-mask-actions.h b/app/actions/quick-mask-actions.h
index 78ea13e0aa..95458abda5 100644
--- a/app/actions/quick-mask-actions.h
+++ b/app/actions/quick-mask-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __QUICK_MASK_ACTIONS_H__
-#define __QUICK_MASK_ACTIONS_H__
+#pragma once
void quick_mask_actions_setup (GimpActionGroup *group);
void quick_mask_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __QUICK_MASK_ACTIONS_H__ */
diff --git a/app/actions/quick-mask-commands.h b/app/actions/quick-mask-commands.h
index 1e8628cf6a..4a9f94b85b 100644
--- a/app/actions/quick-mask-commands.h
+++ b/app/actions/quick-mask-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __QUICK_MASK_COMMANDS_H__
-#define __QUICK_MASK_COMMANDS_H__
+#pragma once
void quick_mask_toggle_cmd_callback (GimpAction *action,
@@ -28,6 +27,3 @@ void quick_mask_invert_cmd_callback (GimpAction *action,
void quick_mask_configure_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __QUICK_MASK_COMMANDS_H__ */
diff --git a/app/actions/sample-points-actions.h b/app/actions/sample-points-actions.h
index 47b40fb4ed..021dab047a 100644
--- a/app/actions/sample-points-actions.h
+++ b/app/actions/sample-points-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __SAMPLE_POINTS_ACIONS_H__
-#define __SAMPLE_POINTS_ACIONS_H__
+#pragma once
void sample_points_actions_setup (GimpActionGroup *group);
void sample_points_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __SAMPLE_POINTS_ACTIONS_H__ */
diff --git a/app/actions/sample-points-commands.h b/app/actions/sample-points-commands.h
index bfdd4ef75a..bcc25f68dd 100644
--- a/app/actions/sample-points-commands.h
+++ b/app/actions/sample-points-commands.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __SAMPLE_POINTS_COMMANDS_H__
-#define __SAMPLE_POINTS_COMMANDS_H__
+#pragma once
void sample_points_sample_merged_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __SAMPLE_POINTS_COMMANDS_H__ */
diff --git a/app/actions/select-actions.h b/app/actions/select-actions.h
index 250d2e1467..d440bd98b2 100644
--- a/app/actions/select-actions.h
+++ b/app/actions/select-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __SELECT_ACTIONS_H__
-#define __SELECT_ACTIONS_H__
+#pragma once
void select_actions_setup (GimpActionGroup *group);
void select_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __SELECT_ACTIONS_H__ */
diff --git a/app/actions/select-commands.h b/app/actions/select-commands.h
index b9c550478c..726f4c6f27 100644
--- a/app/actions/select-commands.h
+++ b/app/actions/select-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __SELECT_COMMANDS_H__
-#define __SELECT_COMMANDS_H__
+#pragma once
void select_all_cmd_callback (GimpAction *action,
@@ -68,6 +67,3 @@ void select_stroke_cmd_callback (GimpAction *action,
void select_stroke_last_vals_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __SELECT_COMMANDS_H__ */
diff --git a/app/actions/templates-actions.h b/app/actions/templates-actions.h
index 904a40dee0..ff0e793f4f 100644
--- a/app/actions/templates-actions.h
+++ b/app/actions/templates-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __TEMPLATES_ACTIONS_H__
-#define __TEMPLATES_ACTIONS_H__
+#pragma once
void templates_actions_setup (GimpActionGroup *group);
void templates_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __TEMPLATES_COMMANDS_H__ */
diff --git a/app/actions/templates-commands.h b/app/actions/templates-commands.h
index 91356f23da..f81ad3db79 100644
--- a/app/actions/templates-commands.h
+++ b/app/actions/templates-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TEMPLATES_COMMANDS_H__
-#define __TEMPLATES_COMMANDS_H__
+#pragma once
void templates_create_image_cmd_callback (GimpAction *action,
@@ -34,6 +33,3 @@ void templates_edit_cmd_callback (GimpAction *action,
void templates_delete_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __TEMPLATES_COMMANDS_H__ */
diff --git a/app/actions/text-editor-actions.h b/app/actions/text-editor-actions.h
index a2940b7465..c1d44fdbf8 100644
--- a/app/actions/text-editor-actions.h
+++ b/app/actions/text-editor-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __TEXT_EDITOR_ACIONS_H__
-#define __TEXT_EDITOR_ACIONS_H__
+#pragma once
void text_editor_actions_setup (GimpActionGroup *group);
void text_editor_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __TEXT_EDITOR_ACTIONS_H__ */
diff --git a/app/actions/text-editor-commands.h b/app/actions/text-editor-commands.h
index 1ea89d0321..c1ee7d21de 100644
--- a/app/actions/text-editor-commands.h
+++ b/app/actions/text-editor-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TEXT_EDITOR_COMMANDS_H__
-#define __TEXT_EDITOR_COMMANDS_H__
+#pragma once
void text_editor_load_cmd_callback (GimpAction *action,
@@ -28,6 +27,3 @@ void text_editor_clear_cmd_callback (GimpAction *action,
void text_editor_direction_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __TEXT_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/text-tool-actions.h b/app/actions/text-tool-actions.h
index 5efca91804..b4d1947b7c 100644
--- a/app/actions/text-tool-actions.h
+++ b/app/actions/text-tool-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __TEXT_TOOL_ACTIONS_H__
-#define __TEXT_TOOL_ACTIONS_H__
+#pragma once
void text_tool_actions_setup (GimpActionGroup *group);
void text_tool_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __TEXT_TOOL_ACTIONS_H__ */
diff --git a/app/actions/text-tool-commands.h b/app/actions/text-tool-commands.h
index d7bef1c8ad..76845e4a09 100644
--- a/app/actions/text-tool-commands.h
+++ b/app/actions/text-tool-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TEXT_TOOL_COMMANDS_H__
-#define __TEXT_TOOL_COMMANDS_H__
+#pragma once
void text_tool_cut_cmd_callback (GimpAction *action,
@@ -46,6 +45,3 @@ void text_tool_text_along_path_cmd_callback (GimpAction *action,
void text_tool_direction_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __TEXT_TOOL_COMMANDS_H__ */
diff --git a/app/actions/tool-options-actions.h b/app/actions/tool-options-actions.h
index 2115fe1036..fa66496995 100644
--- a/app/actions/tool-options-actions.h
+++ b/app/actions/tool-options-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __TOOL_OPTIONS_ACTIONS_H__
-#define __TOOL_OPTIONS_ACTIONS_H__
+#pragma once
void tool_options_actions_setup (GimpActionGroup *group);
void tool_options_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __TOOL_OPTIONS_ACTIONS_H__ */
diff --git a/app/actions/tool-options-commands.h b/app/actions/tool-options-commands.h
index 8594e44040..11921805e0 100644
--- a/app/actions/tool-options-commands.h
+++ b/app/actions/tool-options-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TOOL_OPTIONS_COMMANDS_H__
-#define __TOOL_OPTIONS_COMMANDS_H__
+#pragma once
void tool_options_save_new_preset_cmd_callback (GimpAction *action,
@@ -42,6 +41,3 @@ void tool_options_reset_cmd_callback (GimpAction *action,
void tool_options_reset_all_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __TOOL_OPTIONS_COMMANDS_H__ */
diff --git a/app/actions/tool-path-actions.h b/app/actions/tool-path-actions.h
index b5da82b698..92c384aa8c 100644
--- a/app/actions/tool-path-actions.h
+++ b/app/actions/tool-path-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __TOOL_PATH_ACTIONS_H__
-#define __TOOL_PATH_ACTIONS_H__
+#pragma once
void tool_path_actions_setup (GimpActionGroup *group);
void tool_path_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __TOOL_PATH_ACTIONS_H__ */
diff --git a/app/actions/tool-path-commands.h b/app/actions/tool-path-commands.h
index 119d5ee008..579782dbf6 100644
--- a/app/actions/tool-path-commands.h
+++ b/app/actions/tool-path-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TOOL_PATH_COMMANDS_H__
-#define __TOOL_PATH_COMMANDS_H__
+#pragma once
void tool_path_delete_anchor_cmd_callback (GimpAction *action,
@@ -35,6 +34,3 @@ void tool_path_delete_segment_cmd_callback (GimpAction *action,
void tool_path_reverse_stroke_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __TOOL_PATH_COMMANDS_H__ */
diff --git a/app/actions/tool-preset-editor-actions.h b/app/actions/tool-preset-editor-actions.h
index 35275c5700..86c14ef81a 100644
--- a/app/actions/tool-preset-editor-actions.h
+++ b/app/actions/tool-preset-editor-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __TOOL_PRESET_EDITOR_ACTIONS_H__
-#define __TOOL_PRESET_EDITOR_ACTIONS_H__
+#pragma once
void tool_preset_editor_actions_setup (GimpActionGroup *group);
void tool_preset_editor_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __TOOL_PRESET_EDITOR_ACTIONS_H__ */
diff --git a/app/actions/tool-preset-editor-commands.h b/app/actions/tool-preset-editor-commands.h
index f90f63672e..d3d0a27bdb 100644
--- a/app/actions/tool-preset-editor-commands.h
+++ b/app/actions/tool-preset-editor-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TOOL_PRESET_EDITOR_COMMANDS_H__
-#define __TOOL_PRESET_EDITOR_COMMANDS_H__
+#pragma once
void tool_preset_editor_save_cmd_callback (GimpAction *action,
@@ -25,6 +24,3 @@ void tool_preset_editor_save_cmd_callback (GimpAction *action,
void tool_preset_editor_restore_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __TOOL_PRESET_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/tool-presets-actions.h b/app/actions/tool-presets-actions.h
index 7cdf96943e..e22e61bb20 100644
--- a/app/actions/tool-presets-actions.h
+++ b/app/actions/tool-presets-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __TOOL_PRESETS_ACTIONS_H__
-#define __TOOL_PRESETS_ACTIONS_H__
+#pragma once
void tool_presets_actions_setup (GimpActionGroup *group);
void tool_presets_actions_update (GimpActionGroup *group,
gpointer user_data);
-
-
-#endif /* __TOOL_PRESET_ACTIONS_H__ */
diff --git a/app/actions/tool-presets-commands.h b/app/actions/tool-presets-commands.h
index ecf9c2144d..534ff7be25 100644
--- a/app/actions/tool-presets-commands.h
+++ b/app/actions/tool-presets-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TOOL_PRESETS_COMMANDS_H__
-#define __TOOL_PRESETS_COMMANDS_H__
+#pragma once
void tool_presets_save_cmd_callback (GimpAction *action,
@@ -25,6 +24,3 @@ void tool_presets_save_cmd_callback (GimpAction *action,
void tool_presets_restore_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __TOOL_PRESETS_COMMANDS_H__ */
diff --git a/app/actions/tools-actions.h b/app/actions/tools-actions.h
index 9bec68bd34..445ff9f33e 100644
--- a/app/actions/tools-actions.h
+++ b/app/actions/tools-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __TOOLS_ACTIONS_H__
-#define __TOOLS_ACTIONS_H__
+#pragma once
void tools_actions_setup (GimpActionGroup *group);
void tools_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __TOOLS_ACTIONS_H__ */
diff --git a/app/actions/tools-commands.h b/app/actions/tools-commands.h
index 16ae9a50ae..f9697b3169 100644
--- a/app/actions/tools-commands.h
+++ b/app/actions/tools-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TOOLS_COMMANDS_H__
-#define __TOOLS_COMMANDS_H__
+#pragma once
void tools_select_cmd_callback (GimpAction *action,
@@ -129,6 +128,3 @@ void tools_object_1_cmd_callback (GimpAction *action,
void tools_object_2_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __TOOLS_COMMANDS_H__ */
diff --git a/app/actions/view-actions.h b/app/actions/view-actions.h
index 97aad0a39f..738f5a0a51 100644
--- a/app/actions/view-actions.h
+++ b/app/actions/view-actions.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __VIEW_ACTIONS_H__
-#define __VIEW_ACTIONS_H__
+#pragma once
void view_actions_setup (GimpActionGroup *group);
void view_actions_update (GimpActionGroup *group,
gpointer data);
-
-
-#endif /* __VIEW_ACTIONS_H__ */
diff --git a/app/actions/view-commands.h b/app/actions/view-commands.h
index 942ce068c8..3b835f31a9 100644
--- a/app/actions/view-commands.h
+++ b/app/actions/view-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __VIEW_COMMANDS_H__
-#define __VIEW_COMMANDS_H__
+#pragma once
void view_new_cmd_callback (GimpAction *action,
@@ -176,6 +175,3 @@ void view_shrink_wrap_cmd_callback (GimpAction *action,
void view_fullscreen_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __VIEW_COMMANDS_H__ */
diff --git a/app/actions/window-actions.h b/app/actions/window-actions.h
index 2aae4e2452..e9d359f97d 100644
--- a/app/actions/window-actions.h
+++ b/app/actions/window-actions.h
@@ -15,14 +15,10 @@
* along with this program. If not, see .
*/
-#ifndef __WINDOW_ACTIONS_H__
-#define __WINDOW_ACTIONS_H__
+#pragma once
void window_actions_setup (GimpActionGroup *group,
const gchar *move_to_screen_help_id);
void window_actions_update (GimpActionGroup *group,
GtkWidget *window);
-
-
-#endif /* __WINDOW_ACTIONS_H__ */
diff --git a/app/actions/window-commands.h b/app/actions/window-commands.h
index 41478d5a59..4e8ef2e102 100644
--- a/app/actions/window-commands.h
+++ b/app/actions/window-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __WINDOW_COMMANDS_H__
-#define __WINDOW_COMMANDS_H__
+#pragma once
void window_close_cmd_callback (GimpAction *action,
@@ -28,6 +27,3 @@ void window_open_display_cmd_callback (GimpAction *action,
void window_move_to_screen_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __WINDOW_COMMANDS_H__ */
diff --git a/app/actions/windows-actions.h b/app/actions/windows-actions.h
index 6d73fed741..ff6a3557e4 100644
--- a/app/actions/windows-actions.h
+++ b/app/actions/windows-actions.h
@@ -15,14 +15,10 @@
* along with this program. If not, see .
*/
-#ifndef __WINDOWS_ACTIONS_H__
-#define __WINDOWS_ACTIONS_H__
+#pragma once
void windows_actions_setup (GimpActionGroup *group);
void windows_actions_update (GimpActionGroup *group,
gpointer data);
gchar * windows_actions_dock_window_to_action_name (GimpDockWindow *dock_window);
-
-
-#endif /* __WINDOWS_ACTIONS_H__ */
diff --git a/app/actions/windows-commands.h b/app/actions/windows-commands.h
index 712d3c1126..a7de8ff4f0 100644
--- a/app/actions/windows-commands.h
+++ b/app/actions/windows-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __WINDOWS_COMMANDS_H__
-#define __WINDOWS_COMMANDS_H__
+#pragma once
void windows_hide_docks_cmd_callback (GimpAction *action,
@@ -48,6 +47,3 @@ void windows_show_dock_cmd_callback (GimpAction *action,
void windows_open_recent_cmd_callback (GimpAction *action,
GVariant *value,
gpointer data);
-
-
-#endif /* __WINDOWS_COMMANDS_H__ */
diff --git a/app/app.h b/app/app.h
index f11672efaf..8ae36853dd 100644
--- a/app/app.h
+++ b/app/app.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __APP_H__
-#define __APP_H__
-
+#pragma once
#ifndef GIMP_APP_GLUE_COMPILATION
#error You must not #include "app.h" from a subdir
@@ -53,6 +51,3 @@ gint app_run (const gchar *full_prog_name,
GimpStackTraceMode stack_trace_mode,
GimpPDBCompatMode pdb_compat_mode,
const gchar *backtrace_file);
-
-
-#endif /* __APP_H__ */
diff --git a/app/config/config-enums.h b/app/config/config-enums.h
index 07e06243df..1240e3e764 100644
--- a/app/config/config-enums.h
+++ b/app/config/config-enums.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __CONFIG_ENUMS_H__
-#define __CONFIG_ENUMS_H__
+#pragma once
#define GIMP_TYPE_CANVAS_PADDING_MODE (gimp_canvas_padding_mode_get_type ())
@@ -175,6 +174,3 @@ typedef enum
GIMP_THEME_DARK, /*< desc="Dark Colors" >*/
GIMP_THEME_SYSTEM, /*< desc="System Colors" >*/
} GimpThemeScheme;
-
-
-#endif /* __CONFIG_ENUMS_H__ */
diff --git a/app/config/config-types.h b/app/config/config-types.h
index 1c29a01318..9daec2e62c 100644
--- a/app/config/config-types.h
+++ b/app/config/config-types.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __CONFIG_TYPES_H__
-#define __CONFIG_TYPES_H__
-
+#pragma once
#include "libgimpconfig/gimpconfigtypes.h"
@@ -82,6 +80,3 @@ g_set_str (char **str_pointer,
return TRUE;
}
#endif
-
-
-#endif /* __CONFIG_TYPES_H__ */
diff --git a/app/config/gimpconfig-dump.h b/app/config/gimpconfig-dump.h
index ead2da3790..4f980be0eb 100644
--- a/app/config/gimpconfig-dump.h
+++ b/app/config/gimpconfig-dump.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONFIG_DUMP_H__
-#define __GIMP_CONFIG_DUMP_H__
+#pragma once
typedef enum
@@ -32,6 +31,3 @@ typedef enum
gboolean gimp_config_dump (GObject *gimp,
GimpConfigDumpFormat format);
-
-
-#endif /* __GIMP_CONFIG_DUMP_H__ */
diff --git a/app/config/gimpconfig-file.h b/app/config/gimpconfig-file.h
index 8db02b1a02..260f7d841b 100644
--- a/app/config/gimpconfig-file.h
+++ b/app/config/gimpconfig-file.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONFIG_FILE_H__
-#define __GIMP_CONFIG_FILE_H__
+#pragma once
typedef gchar * (* GimpCopyPostProcess) (gpointer user_data);
@@ -36,6 +35,3 @@ gboolean gimp_config_file_copy (const gchar *source,
gboolean gimp_config_file_backup_on_error (GFile *file,
const gchar *name,
GError **error);
-
-
-#endif /* __GIMP_CONFIG_FILE_H__ */
diff --git a/app/config/gimpconfig-utils.h b/app/config/gimpconfig-utils.h
index 7928ca9dce..0dd235e660 100644
--- a/app/config/gimpconfig-utils.h
+++ b/app/config/gimpconfig-utils.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __APP_GIMP_CONFIG_UTILS_H__
-#define __APP_GIMP_CONFIG_UTILS_H__
+#pragma once
void gimp_config_connect (GObject *a,
@@ -31,6 +30,3 @@ void gimp_config_connect_full (GObject *a,
const gchar *property_name_b);
void gimp_config_disconnect (GObject *a,
GObject *b);
-
-
-#endif /* __APP_GIMP_CONFIG_UTILS_H__ */
diff --git a/app/config/gimpcoreconfig.h b/app/config/gimpcoreconfig.h
index 8ab57d6526..39543ae94b 100644
--- a/app/config/gimpcoreconfig.h
+++ b/app/config/gimpcoreconfig.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CORE_CONFIG_H__
-#define __GIMP_CORE_CONFIG_H__
+#pragma once
#include "operations/operations-enums.h"
#include "core/core-enums.h"
@@ -128,6 +127,3 @@ struct _GimpCoreConfigClass
GType gimp_core_config_get_type (void) G_GNUC_CONST;
-
-
-#endif /* GIMP_CORE_CONFIG_H__ */
diff --git a/app/config/gimpdialogconfig.h b/app/config/gimpdialogconfig.h
index 0dd9cedc40..3e20aa6e18 100644
--- a/app/config/gimpdialogconfig.h
+++ b/app/config/gimpdialogconfig.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DIALOG_CONFIG_H__
-#define __GIMP_DIALOG_CONFIG_H__
+#pragma once
#include "config/gimpguiconfig.h"
@@ -119,6 +118,3 @@ struct _GimpDialogConfigClass
GType gimp_dialog_config_get_type (void) G_GNUC_CONST;
-
-
-#endif /* GIMP_DIALOG_CONFIG_H__ */
diff --git a/app/config/gimpdisplayconfig.h b/app/config/gimpdisplayconfig.h
index 4be0dc6541..43867aeb88 100644
--- a/app/config/gimpdisplayconfig.h
+++ b/app/config/gimpdisplayconfig.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_CONFIG_H__
-#define __GIMP_DISPLAY_CONFIG_H__
+#pragma once
#include "config/gimpcoreconfig.h"
@@ -82,6 +81,3 @@ struct _GimpDisplayConfigClass
GType gimp_display_config_get_type (void) G_GNUC_CONST;
-
-
-#endif /* GIMP_DISPLAY_CONFIG_H__ */
diff --git a/app/config/gimpdisplayoptions.h b/app/config/gimpdisplayoptions.h
index 05b2ab2550..78081321ef 100644
--- a/app/config/gimpdisplayoptions.h
+++ b/app/config/gimpdisplayoptions.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_OPTIONS_H__
-#define __GIMP_DISPLAY_OPTIONS_H__
-
+#pragma once
#define GIMP_TYPE_DISPLAY_OPTIONS (gimp_display_options_get_type ())
#define GIMP_TYPE_DISPLAY_OPTIONS_FULLSCREEN (gimp_display_options_fullscreen_get_type ())
@@ -75,6 +73,3 @@ struct _GimpDisplayOptionsClass
GType gimp_display_options_get_type (void) G_GNUC_CONST;
GType gimp_display_options_fullscreen_get_type (void) G_GNUC_CONST;
GType gimp_display_options_no_image_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_DISPLAY_OPTIONS_H__ */
diff --git a/app/config/gimpearlyrc.h b/app/config/gimpearlyrc.h
index b10835dac6..02048388d4 100644
--- a/app/config/gimpearlyrc.h
+++ b/app/config/gimpearlyrc.h
@@ -20,11 +20,11 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_EARLY_RC_H__
-#define __GIMP_EARLY_RC_H__
+#pragma once
#include "core/core-enums.h"
+
#define GIMP_TYPE_EARLY_RC (gimp_early_rc_get_type ())
#define GIMP_EARLY_RC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_EARLY_RC, GimpEarlyRc))
#define GIMP_EARLY_RC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_EARLY_RC, GimpEarlyRcClass))
@@ -65,7 +65,3 @@ gchar * gimp_early_rc_get_language (GimpEarlyRc *rc);
#ifdef G_OS_WIN32
GimpWin32PointerInputAPI gimp_early_rc_get_win32_pointer_input_api (GimpEarlyRc *rc);
#endif
-
-
-#endif /* GIMP_EARLY_RC_H__ */
-
diff --git a/app/config/gimpgeglconfig.h b/app/config/gimpgeglconfig.h
index 4806a22065..02761ff4ed 100644
--- a/app/config/gimpgeglconfig.h
+++ b/app/config/gimpgeglconfig.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GEGL_CONFIG_H__
-#define __GIMP_GEGL_CONFIG_H__
+#pragma once
#define GIMP_TYPE_GEGL_CONFIG (gimp_gegl_config_get_type ())
@@ -50,6 +49,3 @@ struct _GimpGeglConfigClass
GType gimp_gegl_config_get_type (void) G_GNUC_CONST;
-
-
-#endif /* GIMP_GEGL_CONFIG_H__ */
diff --git a/app/config/gimpguiconfig.h b/app/config/gimpguiconfig.h
index 213dbb5c51..695d440521 100644
--- a/app/config/gimpguiconfig.h
+++ b/app/config/gimpguiconfig.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GUI_CONFIG_H__
-#define __GIMP_GUI_CONFIG_H__
+#pragma once
#include "config/gimpdisplayconfig.h"
@@ -108,6 +107,3 @@ struct _GimpGuiConfigClass
GType gimp_gui_config_get_type (void) G_GNUC_CONST;
-
-
-#endif /* GIMP_GUI_CONFIG_H__ */
diff --git a/app/config/gimppluginconfig.h b/app/config/gimppluginconfig.h
index e9b0f5396d..72e700b6b0 100644
--- a/app/config/gimppluginconfig.h
+++ b/app/config/gimppluginconfig.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUGIN_CONFIG_H__
-#define __GIMP_PLUGIN_CONFIG_H__
+#pragma once
#include "config/gimpdialogconfig.h"
@@ -51,6 +50,3 @@ struct _GimpPluginConfigClass
GType gimp_plugin_config_get_type (void) G_GNUC_CONST;
-
-
-#endif /* GIMP_PLUGIN_CONFIG_H__ */
diff --git a/app/config/gimprc-blurbs.h b/app/config/gimprc-blurbs.h
index 4dab8e570f..27839ec405 100644
--- a/app/config/gimprc-blurbs.h
+++ b/app/config/gimprc-blurbs.h
@@ -1,8 +1,6 @@
/* gimprc-blurbs.h -- descriptions for gimprc properties */
-#ifndef __GIMP_RC_BLURBS_H__
-#define __GIMP_RC_BLURBS_H__
-
+#pragma once
/* Not all strings defined here are used in the user interface
* (the preferences dialog mainly) and only those that are should
@@ -799,6 +797,3 @@ _("When enabled, a search of actions will also return inactive actions.")
#define ACTION_HISTORY_SIZE_BLURB \
_("The maximum number of actions saved in history.")
-
-
-#endif /* __GIMP_RC_BLURBS_H__ */
diff --git a/app/config/gimprc-deserialize.h b/app/config/gimprc-deserialize.h
index 06b39fccd2..65104a4d85 100644
--- a/app/config/gimprc-deserialize.h
+++ b/app/config/gimprc-deserialize.h
@@ -18,14 +18,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_RC_DESERIALIZE_H__
-#define __GIMP_RC_DESERIALIZE_H__
+#pragma once
gboolean gimp_rc_deserialize (GimpConfig *config,
GScanner *scanner,
gint nest_level,
gpointer data);
-
-
-#endif /* __GIMP_RC_DESERIALIZE_H__ */
diff --git a/app/config/gimprc-serialize.h b/app/config/gimprc-serialize.h
index d314835c09..11d20d1ef8 100644
--- a/app/config/gimprc-serialize.h
+++ b/app/config/gimprc-serialize.h
@@ -18,13 +18,9 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_RC_SERIALIZE_H__
-#define __GIMP_RC_SERIALIZE_H__
+#pragma once
gboolean gimp_rc_serialize (GimpConfig *config,
GimpConfigWriter *writer,
gpointer data);
-
-
-#endif /* __GIMP_RC_SERIALIZE_H__ */
diff --git a/app/config/gimprc-unknown.h b/app/config/gimprc-unknown.h
index 33a6243fdc..a48e000a22 100644
--- a/app/config/gimprc-unknown.h
+++ b/app/config/gimprc-unknown.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_RC_UNKNOWN_H__
-#define __GIMP_RC_UNKNOWN_H__
+#pragma once
typedef void (* GimpConfigForeachFunc) (const gchar *key,
@@ -35,6 +34,3 @@ const gchar * gimp_rc_lookup_unknown_token (GimpConfig *config,
void gimp_rc_foreach_unknown_token (GimpConfig *config,
GimpConfigForeachFunc func,
gpointer user_data);
-
-
-#endif /* __GIMP_RC_UNKNOWN_H__ */
diff --git a/app/config/gimprc.h b/app/config/gimprc.h
index fbe47a1a72..f5f2453bc2 100644
--- a/app/config/gimprc.h
+++ b/app/config/gimprc.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_RC_H__
-#define __GIMP_RC_H__
+#pragma once
#include "config/gimppluginconfig.h"
@@ -72,6 +71,3 @@ void gimp_rc_set_unknown_token (GimpRc *rc,
const gchar *value);
void gimp_rc_migrate (GimpRc *rc);
-
-
-#endif /* GIMP_RC_H__ */
diff --git a/app/config/gimpxmlparser.h b/app/config/gimpxmlparser.h
index f744472675..abc4f60c13 100644
--- a/app/config/gimpxmlparser.h
+++ b/app/config/gimpxmlparser.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_XML_PARSER_H__
-#define __GIMP_XML_PARSER_H__
+#pragma once
GimpXmlParser * gimp_xml_parser_new (const GMarkupParser *markup_parser,
@@ -41,6 +40,3 @@ gboolean gimp_xml_parser_parse_buffer (GimpXmlParser *parser,
gssize len,
GError **error);
void gimp_xml_parser_free (GimpXmlParser *parser);
-
-
-#endif /* __GIMP_XML_PARSER_H__ */
diff --git a/app/core/core-enums.h b/app/core/core-enums.h
index 5db3dfd541..d6f42b279f 100644
--- a/app/core/core-enums.h
+++ b/app/core/core-enums.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __CORE_ENUMS_H__
-#define __CORE_ENUMS_H__
-
+#pragma once
#if 0
This file is parsed by two scripts, enumgen.pl in pdb,
@@ -788,6 +786,3 @@ typedef enum /*< pdb-skip, skip >*/
GIMP_ITEM_TYPE_CHANNELS |
GIMP_ITEM_TYPE_PATHS)
} GimpItemTypeMask;
-
-
-#endif /* __CORE_ENUMS_H__ */
diff --git a/app/core/core-types.h b/app/core/core-types.h
index 0a69e91b3d..2a8bbbbe31 100644
--- a/app/core/core-types.h
+++ b/app/core/core-types.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __CORE_TYPES_H__
-#define __CORE_TYPES_H__
-
+#pragma once
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpmath/gimpmathtypes.h"
@@ -321,5 +319,3 @@ struct _GimpSegment
#include "pdb/pdb-types.h"
#include "plug-in/plug-in-types.h"
-
-#endif /* __CORE_TYPES_H__ */
diff --git a/app/core/gimp-atomic.h b/app/core/gimp-atomic.h
index 0c8d7c5e80..0d32e2534f 100644
--- a/app/core/gimp-atomic.h
+++ b/app/core/gimp-atomic.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ATOMIC_H__
-#define __GIMP_ATOMIC_H__
+#pragma once
/* GSList */
@@ -27,6 +26,3 @@
void gimp_atomic_slist_push_head (GSList **list,
gpointer data);
gpointer gimp_atomic_slist_pop_head (GSList **list);
-
-
-#endif /* __GIMP_ATOMIC_H__ */
diff --git a/app/core/gimp-batch.h b/app/core/gimp-batch.h
index 1c6e4dfd4a..b9d884766c 100644
--- a/app/core/gimp-batch.h
+++ b/app/core/gimp-batch.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BATCH_H__
-#define __GIMP_BATCH_H__
+#pragma once
gint gimp_batch_run (Gimp *gimp,
const gchar *batch_interpreter,
const gchar **batch_commands);
-
-
-#endif /* __GIMP_BATCH_H__ */
diff --git a/app/core/gimp-cairo.h b/app/core/gimp-cairo.h
index 8c2713918b..d5d321e531 100644
--- a/app/core/gimp-cairo.h
+++ b/app/core/gimp-cairo.h
@@ -21,8 +21,7 @@
* along with this program. If not, see .
*/
-#ifndef __APP_GIMP_CAIRO_H__
-#define __APP_GIMP_CAIRO_H__
+#pragma once
cairo_pattern_t * gimp_cairo_pattern_create_stipple (GeglColor *fg,
@@ -47,6 +46,3 @@ void gimp_cairo_rounded_rectangle (cairo_t *cr,
void gimp_cairo_segments (cairo_t *cr,
GimpSegment *segs,
gint n_segs);
-
-
-#endif /* __APP_GIMP_CAIRO_H__ */
diff --git a/app/core/gimp-contexts.h b/app/core/gimp-contexts.h
index 9aa402b7c9..89ff56571b 100644
--- a/app/core/gimp-contexts.h
+++ b/app/core/gimp-contexts.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONTEXTS_H__
-#define __GIMP_CONTEXTS_H__
+#pragma once
void gimp_contexts_init (Gimp *gimp);
@@ -31,6 +30,3 @@ gboolean gimp_contexts_save (Gimp *gimp,
gboolean gimp_contexts_clear (Gimp *gimp,
GError **error);
-
-
-#endif /* __GIMP_CONTEXTS_H__ */
diff --git a/app/core/gimp-data-factories.h b/app/core/gimp-data-factories.h
index d5b273d91d..eb177c4f91 100644
--- a/app/core/gimp-data-factories.h
+++ b/app/core/gimp-data-factories.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DATA_FACTORIES_H__
-#define __GIMP_DATA_FACTORIES_H__
+#pragma once
void gimp_data_factories_init (Gimp *gimp);
@@ -31,6 +30,3 @@ void gimp_data_factories_data_clean (Gimp *gimp);
void gimp_data_factories_load (Gimp *gimp,
GimpInitStatusFunc status_callback);
void gimp_data_factories_save (Gimp *gimp);
-
-
-#endif /* __GIMP_DATA_FACTORIES_H__ */
diff --git a/app/core/gimp-edit.h b/app/core/gimp-edit.h
index 8db394f3e1..dd26fb38bb 100644
--- a/app/core/gimp-edit.h
+++ b/app/core/gimp-edit.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_EDIT_H__
-#define __GIMP_EDIT_H__
+#pragma once
GimpObject * gimp_edit_cut (GimpImage *image,
@@ -60,6 +59,3 @@ const gchar * gimp_edit_named_copy_visible (GimpImage *image,
const gchar *name,
GimpContext *context,
GError **error);
-
-
-#endif /* __GIMP_EDIT_H__ */
diff --git a/app/core/gimp-filter-history.h b/app/core/gimp-filter-history.h
index e74b8201b3..b4503b4ec3 100644
--- a/app/core/gimp-filter-history.h
+++ b/app/core/gimp-filter-history.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_FILTER_HISTORY_H__
-#define __GIMP_FILTER_HISTORY_H__
+#pragma once
gint gimp_filter_history_size (Gimp *gimp);
@@ -30,6 +29,3 @@ void gimp_filter_history_add (Gimp *gimp,
void gimp_filter_history_remove (Gimp *gimp,
GimpProcedure *procedure);
void gimp_filter_history_clear (Gimp *gimp);
-
-
-#endif /* __GIMP_FILTER_HISTORY_H__ */
diff --git a/app/core/gimp-gradients.h b/app/core/gimp-gradients.h
index 72f21a6d0f..94684a570f 100644
--- a/app/core/gimp-gradients.h
+++ b/app/core/gimp-gradients.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GRADIENTS__
-#define __GIMP_GRADIENTS__
+#pragma once
void gimp_gradients_init (Gimp *gimp);
@@ -29,6 +28,3 @@ GimpGradient * gimp_gradients_get_fg_bg_rgb (Gimp *gimp);
GimpGradient * gimp_gradients_get_fg_bg_hsv_ccw (Gimp *gimp);
GimpGradient * gimp_gradients_get_fg_bg_hsv_cw (Gimp *gimp);
GimpGradient * gimp_gradients_get_fg_transparent (Gimp *gimp);
-
-
-#endif /* __GIMP_GRADIENTS__ */
diff --git a/app/core/gimp-gui.h b/app/core/gimp-gui.h
index b4b264f2f2..f5c9254442 100644
--- a/app/core/gimp-gui.h
+++ b/app/core/gimp-gui.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GUI_H__
-#define __GIMP_GUI_H__
+#pragma once
typedef struct _GimpGui GimpGui;
@@ -210,6 +209,3 @@ GimpMetadataRotationPolicy
GimpImage *image,
GimpContext *context,
gboolean *dont_ask);
-
-
-#endif /* __GIMP_GUI_H__ */
diff --git a/app/core/gimp-internal-data.h b/app/core/gimp-internal-data.h
index 93f42dd968..fcf6ce3c98 100644
--- a/app/core/gimp-internal-data.h
+++ b/app/core/gimp-internal-data.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_INTERNAL_DATA__
-#define __GIMP_INTERNAL_DATA__
+#pragma once
gboolean gimp_internal_data_load (Gimp *gimp,
@@ -29,6 +28,3 @@ gboolean gimp_internal_data_save (Gimp *gimp,
gboolean gimp_internal_data_clear (Gimp *gimp,
GError **error);
-
-
-#endif /* __GIMP_INTERNAL_DATA__ */
diff --git a/app/core/gimp-memsize.h b/app/core/gimp-memsize.h
index 139dc0208f..da024542ec 100644
--- a/app/core/gimp-memsize.h
+++ b/app/core/gimp-memsize.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __APP_GIMP_MEMSIZE_H__
-#define __APP_GIMP_MEMSIZE_H__
+#pragma once
gint64 gimp_g_type_instance_get_memsize (GTypeInstance *instance);
@@ -55,6 +54,3 @@ gint64 gimp_gegl_pyramid_get_memsize (GeglBuffer *buffer);
gint64 gimp_string_get_memsize (const gchar *string);
gint64 gimp_parasite_get_memsize (GimpParasite *parasite,
gint64 *gui_size);
-
-
-#endif /* __APP_GIMP_MEMSIZE_H__ */
diff --git a/app/core/gimp-modules.h b/app/core/gimp-modules.h
index fc90d695cd..b36a7795c0 100644
--- a/app/core/gimp-modules.h
+++ b/app/core/gimp-modules.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_MODULES_H__
-#define __GIMP_MODULES_H__
+#pragma once
void gimp_modules_init (Gimp *gimp);
@@ -29,6 +28,3 @@ void gimp_modules_load (Gimp *gimp);
void gimp_modules_unload (Gimp *gimp);
void gimp_modules_refresh (Gimp *gimp);
-
-
-#endif /* __GIMP_MODULES_H__ */
diff --git a/app/core/gimp-palettes.h b/app/core/gimp-palettes.h
index b73a817c6c..2d711a72c2 100644
--- a/app/core/gimp-palettes.h
+++ b/app/core/gimp-palettes.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PALETTES__
-#define __GIMP_PALETTES__
+#pragma once
void gimp_palettes_init (Gimp *gimp);
@@ -30,6 +29,3 @@ void gimp_palettes_save (Gimp *gimp);
GimpPalette * gimp_palettes_get_color_history (Gimp *gimp);
void gimp_palettes_add_color_history (Gimp *gimp,
GeglColor *color);
-
-
-#endif /* __GIMP_PALETTES__ */
diff --git a/app/core/gimp-parallel.h b/app/core/gimp-parallel.h
index 76abc1dfe3..69c832960c 100644
--- a/app/core/gimp-parallel.h
+++ b/app/core/gimp-parallel.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PARALLEL_H__
-#define __GIMP_PARALLEL_H__
+#pragma once
void gimp_parallel_init (Gimp *gimp);
@@ -152,6 +151,3 @@ gimp_parallel_run_async_independent (RunAsyncFunc func)
}
#endif /* __cplusplus */
-
-
-#endif /* __GIMP_PARALLEL_H__ */
diff --git a/app/core/gimp-parasites.h b/app/core/gimp-parasites.h
index 942e930e97..b2ac3a0761 100644
--- a/app/core/gimp-parasites.h
+++ b/app/core/gimp-parasites.h
@@ -14,8 +14,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PARASITES_H__
-#define __GIMP_PARASITES_H__
+#pragma once
/* some wrappers to access gimp->parasites, mainly for the PDB */
@@ -35,6 +34,3 @@ void gimp_parasite_shift_parent (GimpParasite *parasite);
void gimp_parasiterc_load (Gimp *gimp);
void gimp_parasiterc_save (Gimp *gimp);
-
-
-#endif /* __GIMP_PARASITES_H__ */
diff --git a/app/core/gimp-spawn.h b/app/core/gimp-spawn.h
index f81cf7d6f8..09ee8776be 100644
--- a/app/core/gimp-spawn.h
+++ b/app/core/gimp-spawn.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_SPAWN_H__
-#define __GIMP_SPAWN_H__
+#pragma once
gboolean gimp_spawn_async (gchar **argv,
@@ -29,6 +28,3 @@ gboolean gimp_spawn_async (gchar **argv,
GError **error);
void gimp_spawn_set_cloexec (gint fd);
-
-
-#endif /* __GIMP_SPAWN_H__ */
diff --git a/app/core/gimp-tags.h b/app/core/gimp-tags.h
index 8f52dcef48..b51c26e47d 100644
--- a/app/core/gimp-tags.h
+++ b/app/core/gimp-tags.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TAGS_H__
-#define __GIMP_TAGS_H__
+#pragma once
gboolean gimp_tags_user_install (void);
-
-
-#endif /* __GIMP_TAGS_H__ */
diff --git a/app/core/gimp-templates.h b/app/core/gimp-templates.h
index 3dc0fde4c7..7e2392eaff 100644
--- a/app/core/gimp-templates.h
+++ b/app/core/gimp-templates.h
@@ -15,14 +15,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEMPLATES_H__
-#define __GIMP_TEMPLATES_H__
+#pragma once
void gimp_templates_load (Gimp *gimp);
void gimp_templates_save (Gimp *gimp);
void gimp_templates_migrate (const gchar *olddir);
-
-
-#endif /* __GIMP_TEMPLATES_H__ */
diff --git a/app/core/gimp-transform-3d-utils.h b/app/core/gimp-transform-3d-utils.h
index 92f6795d4f..9f2a33aa0d 100644
--- a/app/core/gimp-transform-3d-utils.h
+++ b/app/core/gimp-transform-3d-utils.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TRANSFORM_3D_UTILS_H__
-#define __GIMP_TRANSFORM_3D_UTILS_H__
+#pragma once
gdouble gimp_transform_3d_angle_of_view_to_focal_length (gdouble angle_of_view,
@@ -90,6 +89,3 @@ void gimp_transform_3d_matrix (GimpMatrix3
gdouble pivot_x,
gdouble pivot_y,
gdouble pivot_z);
-
-
-#endif /* __GIMP_TRANSFORM_3D_UTILS_H__ */
diff --git a/app/core/gimp-transform-resize.h b/app/core/gimp-transform-resize.h
index 4ebb53f0ed..c88d6610f0 100644
--- a/app/core/gimp-transform-resize.h
+++ b/app/core/gimp-transform-resize.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TRANSFORM_RESIZE_H__
-#define __GIMP_TRANSFORM_RESIZE_H__
+#pragma once
gboolean gimp_transform_resize_boundary (const GimpMatrix3 *inv,
@@ -29,6 +28,3 @@ gboolean gimp_transform_resize_boundary (const GimpMatrix3 *inv,
gint *y1,
gint *x2,
gint *y2);
-
-
-#endif /* __GIMP_TRANSFORM_RESIZE_H__ */
diff --git a/app/core/gimp-transform-utils.h b/app/core/gimp-transform-utils.h
index c2c1252deb..efc2d4eb7d 100644
--- a/app/core/gimp-transform-utils.h
+++ b/app/core/gimp-transform-utils.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TRANSFORM_UTILS_H__
-#define __GIMP_TRANSFORM_UTILS_H__
+#pragma once
#define GIMP_TRANSFORM_NEAR_Z 0.02
@@ -120,6 +119,3 @@ void gimp_transform_bezier_coords (const GimpMatrix3 *matrix,
gint *n_t_beziers,
gboolean *start_in,
gboolean *end_in);
-
-
-#endif /* __GIMP_TRANSFORM_UTILS_H__ */
diff --git a/app/core/gimp-units.h b/app/core/gimp-units.h
index 64f819aec3..177c19e4ea 100644
--- a/app/core/gimp-units.h
+++ b/app/core/gimp-units.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_UNITS_H__
-#define __GIMP_UNITS_H__
+#pragma once
void gimp_units_init (Gimp *gimp);
@@ -24,6 +23,3 @@ void gimp_units_exit (Gimp *gimp);
void gimp_unitrc_load (Gimp *gimp);
void gimp_unitrc_save (Gimp *gimp);
-
-
-#endif /* __GIMP_UNITS_H__ */
diff --git a/app/core/gimp-user-install.h b/app/core/gimp-user-install.h
index e96792efb8..748b23f7d9 100644
--- a/app/core/gimp-user-install.h
+++ b/app/core/gimp-user-install.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_USER_INSTALL_H__
-#define __GIMP_USER_INSTALL_H__
+#pragma once
typedef struct _GimpUserInstall GimpUserInstall;
@@ -35,6 +34,3 @@ void gimp_user_install_free (GimpUserInstall *install);
void gimp_user_install_set_log_handler (GimpUserInstall *install,
GimpUserInstallLogFunc log,
gpointer user_data);
-
-
-#endif /* __USER_INSTALL_H__ */
diff --git a/app/core/gimp-utils.h b/app/core/gimp-utils.h
index 5675668763..b1c5293811 100644
--- a/app/core/gimp-utils.h
+++ b/app/core/gimp-utils.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __APP_GIMP_UTILS_H__
-#define __APP_GIMP_UTILS_H__
+#pragma once
#ifdef GIMP_RELEASE
@@ -150,10 +149,6 @@ gint gimp_view_size_get_larger (gint view_size);
gint gimp_view_size_get_smaller (gint view_size);
#ifdef G_OS_WIN32
-
gboolean gimp_win32_have_wintab (void);
gboolean gimp_win32_have_windows_ink (void);
-
#endif
-
-#endif /* __APP_GIMP_UTILS_H__ */
diff --git a/app/core/gimp.h b/app/core/gimp.h
index 328a72413c..93e53450f9 100644
--- a/app/core/gimp.h
+++ b/app/core/gimp.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_H__
-#define __GIMP_H__
-
+#pragma once
#include "gimpobject.h"
#include "gimp-gui.h"
@@ -253,6 +251,3 @@ void gimp_image_opened (Gimp *gimp,
GFile * gimp_get_temp_file (Gimp *gimp,
const gchar *extension);
-
-
-#endif /* __GIMP_H__ */
diff --git a/app/core/gimpasync.h b/app/core/gimpasync.h
index 0c2a671c94..ea65e57785 100644
--- a/app/core/gimpasync.h
+++ b/app/core/gimpasync.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ASYNC_H__
-#define __GIMP_ASYNC_H__
+#pragma once
#define GIMP_TYPE_ASYNC (gimp_async_get_type ())
@@ -90,6 +89,3 @@ void gimp_async_cancel_and_wait (GimpAsync *async);
/* stats */
gint gimp_async_get_n_running (void);
-
-
-#endif /* __GIMP_ASYNC_H__ */
diff --git a/app/core/gimpasyncset.h b/app/core/gimpasyncset.h
index 62cc524230..143cdea095 100644
--- a/app/core/gimpasyncset.h
+++ b/app/core/gimpasyncset.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ASYNC_SET_H__
-#define __GIMP_ASYNC_SET_H__
+#pragma once
#define GIMP_TYPE_ASYNC_SET (gimp_async_set_get_type ())
@@ -56,6 +55,3 @@ void gimp_async_set_remove (GimpAsyncSet *async_set,
GimpAsync *async);
void gimp_async_set_clear (GimpAsyncSet *async_set);
gboolean gimp_async_set_is_empty (GimpAsyncSet *async_set);
-
-
-#endif /* __GIMP_ASYNC_SET_H__ */
diff --git a/app/core/gimpauxitem.h b/app/core/gimpauxitem.h
index 028542d823..d89924477d 100644
--- a/app/core/gimpauxitem.h
+++ b/app/core/gimpauxitem.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_AUX_ITEM_H__
-#define __GIMP_AUX_ITEM_H__
+#pragma once
#define GIMP_TYPE_AUX_ITEM (gimp_aux_item_get_type ())
@@ -48,9 +47,6 @@ struct _GimpAuxItemClass
GType gimp_aux_item_get_type (void) G_GNUC_CONST;
-guint32 gimp_aux_item_get_id (GimpAuxItem *aux_item);
+guint32 gimp_aux_item_get_id (GimpAuxItem *aux_item);
-void gimp_aux_item_removed (GimpAuxItem *aux_item);
-
-
-#endif /* __GIMP_AUX_ITEM_H__ */
+void gimp_aux_item_removed (GimpAuxItem *aux_item);
diff --git a/app/core/gimpauxitemundo.h b/app/core/gimpauxitemundo.h
index 2858f4d82d..16e0f46f32 100644
--- a/app/core/gimpauxitemundo.h
+++ b/app/core/gimpauxitemundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_AUX_ITEM_UNDO_H__
-#define __GIMP_AUX_ITEM_UNDO_H__
-
+#pragma once
#include "gimpundo.h"
@@ -47,6 +45,3 @@ struct _GimpAuxItemUndoClass
GType gimp_aux_item_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_AUX_ITEM_UNDO_H__ */
diff --git a/app/core/gimpbacktrace-backend.h b/app/core/gimpbacktrace-backend.h
index 0e1612611b..06d1e04f40 100644
--- a/app/core/gimpbacktrace-backend.h
+++ b/app/core/gimpbacktrace-backend.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BACKTRACE_BACKEND_H__
-#define __GIMP_BACKTRACE_BACKEND_H__
+#pragma once
#if defined (__gnu_linux__) && defined (HAVE_EXECINFO_H)
@@ -29,6 +28,3 @@
#else
# define GIMP_BACKTRACE_BACKEND_NONE
#endif
-
-
-#endif /* __GIMP_BACKTRACE_BACKEND_H__ */
diff --git a/app/core/gimpbacktrace.h b/app/core/gimpbacktrace.h
index 8c172b2d13..eefd7e2a21 100644
--- a/app/core/gimpbacktrace.h
+++ b/app/core/gimpbacktrace.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BACKTRACE_H__
-#define __GIMP_BACKTRACE_H__
+#pragma once
typedef struct _GimpBacktraceAddressInfo GimpBacktraceAddressInfo;
@@ -65,6 +64,3 @@ guintptr gimp_backtrace_get_frame_address (GimpBacktrace *backt
gboolean gimp_backtrace_get_address_info (guintptr address,
GimpBacktraceAddressInfo *info);
-
-
-#endif /* __GIMP_BACKTRACE_H__ */
diff --git a/app/core/gimpbezierdesc.h b/app/core/gimpbezierdesc.h
index 3d09dc2efc..e1a29dd2c8 100644
--- a/app/core/gimpbezierdesc.h
+++ b/app/core/gimpbezierdesc.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BEZIER_DESC_H__
-#define __GIMP_BEZIER_DESC_H__
+#pragma once
#define GIMP_TYPE_BEZIER_DESC (gimp_bezier_desc_get_type ())
@@ -42,6 +41,3 @@ void gimp_bezier_desc_translate (GimpBezierDesc *des
GimpBezierDesc * gimp_bezier_desc_copy (const GimpBezierDesc *desc);
void gimp_bezier_desc_free (GimpBezierDesc *desc);
-
-
-#endif /* __GIMP_BEZIER_DESC_H__ */
diff --git a/app/core/gimpbrush-boundary.h b/app/core/gimpbrush-boundary.h
index 0bc99dba6e..0cd0f798f8 100644
--- a/app/core/gimpbrush-boundary.h
+++ b/app/core/gimpbrush-boundary.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_BOUNDARY_H__
-#define __GIMP_BRUSH_BOUNDARY_H__
+#pragma once
GimpBezierDesc * gimp_brush_real_transform_boundary (GimpBrush *brush,
@@ -27,6 +26,3 @@ GimpBezierDesc * gimp_brush_real_transform_boundary (GimpBrush *brush,
gdouble hardness,
gint *width,
gint *height);
-
-
-#endif /* __GIMP_BRUSH_BOUNDARY_H__ */
diff --git a/app/core/gimpbrush-header.h b/app/core/gimpbrush-header.h
index 0e66715d07..ffb3d16e32 100644
--- a/app/core/gimpbrush-header.h
+++ b/app/core/gimpbrush-header.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_HEADER_H__
-#define __GIMP_BRUSH_HEADER_H__
+#pragma once
#define GIMP_BRUSH_MAGIC (('G' << 24) + ('I' << 16) + \
@@ -44,6 +43,3 @@ struct _GimpBrushHeader
* After that comes the brush data -- width * height * bytes bytes of
* it...
*/
-
-
-#endif /* __GIMP_BRUSH_HEADER_H__ */
diff --git a/app/core/gimpbrush-load.h b/app/core/gimpbrush-load.h
index 6c4f0afa24..9db080f38d 100644
--- a/app/core/gimpbrush-load.h
+++ b/app/core/gimpbrush-load.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_LOAD_H__
-#define __GIMP_BRUSH_LOAD_H__
+#pragma once
#define GIMP_BRUSH_FILE_EXTENSION ".gbr"
@@ -38,6 +37,3 @@ GList * gimp_brush_load_abr (GimpContext *context,
GFile *file,
GInputStream *input,
GError **error);
-
-
-#endif /* __GIMP_BRUSH_LOAD_H__ */
diff --git a/app/core/gimpbrush-mipmap.h b/app/core/gimpbrush-mipmap.h
index b2b8fd3cca..f2ebbc0d0c 100644
--- a/app/core/gimpbrush-mipmap.h
+++ b/app/core/gimpbrush-mipmap.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_MIPMAP_H__
-#define __GIMP_BRUSH_MIPMAP_H__
+#pragma once
void gimp_brush_mipmap_clear (GimpBrush *brush);
@@ -33,6 +32,3 @@ const GimpTempBuf * gimp_brush_mipmap_get_pixmap (GimpBrush *brush,
gdouble *scale_y);
gsize gimp_brush_mipmap_get_memsize (GimpBrush *brush);
-
-
-#endif /* __GIMP_BRUSH_MIPMAP_H__ */
diff --git a/app/core/gimpbrush-private.h b/app/core/gimpbrush-private.h
index c8d4d29294..00ed824447 100644
--- a/app/core/gimpbrush-private.h
+++ b/app/core/gimpbrush-private.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_PRIVATE_H__
-#define __GIMP_BRUSH_PRIVATE_H__
+#pragma once
struct _GimpBrushPrivate
@@ -42,6 +41,3 @@ struct _GimpBrushPrivate
GimpBrushCache *pixmap_cache;
GimpBrushCache *boundary_cache;
};
-
-
-#endif /* __GIMP_BRUSH_PRIVATE_H__ */
diff --git a/app/core/gimpbrush-save.h b/app/core/gimpbrush-save.h
index f400cf07f3..2ab4df4109 100644
--- a/app/core/gimpbrush-save.h
+++ b/app/core/gimpbrush-save.h
@@ -15,14 +15,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_SAVE_H__
-#define __GIMP_BRUSH_SAVE_H__
+#pragma once
/* don't call this function directly, use gimp_data_save() instead */
gboolean gimp_brush_save (GimpData *data,
GOutputStream *output,
GError **error);
-
-
-#endif /* __GIMP_BRUSH_SAVE_H__ */
diff --git a/app/core/gimpbrush-transform.h b/app/core/gimpbrush-transform.h
index 5f7cbcb74a..753a23dbbd 100644
--- a/app/core/gimpbrush-transform.h
+++ b/app/core/gimpbrush-transform.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_TRANSFORM_H__
-#define __GIMP_BRUSH_TRANSFORM_H__
+#pragma once
/* virtual functions of GimpBrush, don't call directly */
@@ -54,6 +53,3 @@ void gimp_brush_transform_matrix (gdouble width,
gdouble angle,
gboolean reflect,
GimpMatrix3 *matrix);
-
-
-#endif /* __GIMP_BRUSH_TRANSFORM_H__ */
diff --git a/app/core/gimpbrush.h b/app/core/gimpbrush.h
index b5735f0dd2..c7963258a8 100644
--- a/app/core/gimpbrush.h
+++ b/app/core/gimpbrush.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_H__
-#define __GIMP_BRUSH_H__
-
+#pragma once
#include "gimpdata.h"
@@ -148,5 +146,3 @@ GimpVector2 gimp_brush_get_y_axis (GimpBrush *brush);
void gimp_brush_flush_blur_caches (GimpBrush *brush);
gdouble gimp_brush_get_blur_hardness (GimpBrush *brush);
-
-#endif /* __GIMP_BRUSH_H__ */
diff --git a/app/core/gimpbrushcache.h b/app/core/gimpbrushcache.h
index 77221170b4..dccd6a52a8 100644
--- a/app/core/gimpbrushcache.h
+++ b/app/core/gimpbrushcache.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_CACHE_H__
-#define __GIMP_BRUSH_CACHE_H__
-
+#pragma once
#include "gimpobject.h"
@@ -78,6 +76,3 @@ void gimp_brush_cache_add (GimpBrushCache *cache,
gdouble angle,
gboolean reflect,
gdouble hardness);
-
-
-#endif /* __GIMP_BRUSH_CACHE_H__ */
diff --git a/app/core/gimpbrushclipboard.h b/app/core/gimpbrushclipboard.h
index 95af7e1246..50b8cbb8c6 100644
--- a/app/core/gimpbrushclipboard.h
+++ b/app/core/gimpbrushclipboard.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_CLIPBOARD_H__
-#define __GIMP_BRUSH_CLIPBOARD_H__
-
+#pragma once
#include "gimpbrush.h"
@@ -53,6 +51,3 @@ GType gimp_brush_clipboard_get_type (void) G_GNUC_CONST;
GimpData * gimp_brush_clipboard_new (Gimp *gimp,
gboolean mask_only);
-
-
-#endif /* __GIMP_BRUSH_CLIPBOARD_H__ */
diff --git a/app/core/gimpbrushgenerated-load.h b/app/core/gimpbrushgenerated-load.h
index afecb3b723..6e433761fc 100644
--- a/app/core/gimpbrushgenerated-load.h
+++ b/app/core/gimpbrushgenerated-load.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_GENERATED_LOAD_H__
-#define __GIMP_BRUSH_GENERATED_LOAD_H__
+#pragma once
#define GIMP_BRUSH_GENERATED_FILE_EXTENSION ".vbr"
@@ -28,6 +27,3 @@ GList * gimp_brush_generated_load (GimpContext *context,
GFile *file,
GInputStream *input,
GError **error);
-
-
-#endif /* __GIMP_BRUSH_GENERATED_LOAD_H__ */
diff --git a/app/core/gimpbrushgenerated-save.h b/app/core/gimpbrushgenerated-save.h
index b33d82e7c2..47d956d4a5 100644
--- a/app/core/gimpbrushgenerated-save.h
+++ b/app/core/gimpbrushgenerated-save.h
@@ -17,14 +17,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_GENERATED_SAVE_H__
-#define __GIMP_BRUSH_GENERATED_SAVE_H__
+#pragma once
/* don't call this function directly, use gimp_data_save() instead */
gboolean gimp_brush_generated_save (GimpData *data,
GOutputStream *output,
GError **error);
-
-
-#endif /* __GIMP_BRUSH_GENERATED_SAVE_H__ */
diff --git a/app/core/gimpbrushgenerated.h b/app/core/gimpbrushgenerated.h
index 64c5a5e392..a399503b33 100644
--- a/app/core/gimpbrushgenerated.h
+++ b/app/core/gimpbrushgenerated.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_GENERATED_H__
-#define __GIMP_BRUSH_GENERATED_H__
-
+#pragma once
#include "gimpbrush.h"
@@ -87,6 +85,3 @@ gint gimp_brush_generated_get_spikes (GimpBrushGenerated *brush);
gfloat gimp_brush_generated_get_hardness (GimpBrushGenerated *brush);
gfloat gimp_brush_generated_get_aspect_ratio (GimpBrushGenerated *brush);
gfloat gimp_brush_generated_get_angle (GimpBrushGenerated *brush);
-
-
-#endif /* __GIMP_BRUSH_GENERATED_H__ */
diff --git a/app/core/gimpbrushpipe-load.h b/app/core/gimpbrushpipe-load.h
index 7426fcbc69..c5a8d6d045 100644
--- a/app/core/gimpbrushpipe-load.h
+++ b/app/core/gimpbrushpipe-load.h
@@ -16,9 +16,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_PIPE_LOAD_H__
-#define __GIMP_BRUSH_PIPE_LOAD_H__
-
+#pragma once
#define GIMP_BRUSH_PIPE_FILE_EXTENSION ".gih"
@@ -27,6 +25,3 @@ GList * gimp_brush_pipe_load (GimpContext *context,
GFile *file,
GInputStream *input,
GError **error);
-
-
-#endif /* __GIMP_BRUSH_PIPE_LOAD_H__ */
diff --git a/app/core/gimpbrushpipe-save.h b/app/core/gimpbrushpipe-save.h
index df768555aa..4d24b5271e 100644
--- a/app/core/gimpbrushpipe-save.h
+++ b/app/core/gimpbrushpipe-save.h
@@ -15,14 +15,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_PIPE_SAVE_H__
-#define __GIMP_BRUSH_PIPE_SAVE_H__
+#pragma once
/* don't call this function directly, use gimp_data_save() instead */
gboolean gimp_brush_pipe_save (GimpData *data,
GOutputStream *output,
GError **error);
-
-
-#endif /* __GIMP_BRUSH_PIPE_SAVE_H__ */
diff --git a/app/core/gimpbrushpipe.h b/app/core/gimpbrushpipe.h
index 9615210392..7ef7eb6baf 100644
--- a/app/core/gimpbrushpipe.h
+++ b/app/core/gimpbrushpipe.h
@@ -16,9 +16,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_PIPE_H__
-#define __GIMP_BRUSH_PIPE_H__
-
+#pragma once
#include "gimpbrush.h"
@@ -75,6 +73,3 @@ GType gimp_brush_pipe_get_type (void) G_GNUC_CONST;
gboolean gimp_brush_pipe_set_params (GimpBrushPipe *pipe,
const gchar *paramstring);
-
-
-#endif /* __GIMP_BRUSH_PIPE_H__ */
diff --git a/app/core/gimpbuffer.h b/app/core/gimpbuffer.h
index 89daa6b4ab..339ee71960 100644
--- a/app/core/gimpbuffer.h
+++ b/app/core/gimpbuffer.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BUFFER_H__
-#define __GIMP_BUFFER_H__
-
+#pragma once
#include "gimpviewable.h"
@@ -86,6 +84,3 @@ GimpUnit * gimp_buffer_get_unit (GimpBuffer *buffer);
void gimp_buffer_set_color_profile (GimpBuffer *buffer,
GimpColorProfile *profile);
GimpColorProfile * gimp_buffer_get_color_profile (GimpBuffer *buffer);
-
-
-#endif /* __GIMP_BUFFER_H__ */
diff --git a/app/core/gimpcancelable.h b/app/core/gimpcancelable.h
index 151c17103c..189dba59ab 100644
--- a/app/core/gimpcancelable.h
+++ b/app/core/gimpcancelable.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANCELABLE_H__
-#define __GIMP_CANCELABLE_H__
+#pragma once
#define GIMP_TYPE_CANCELABLE (gimp_cancelable_get_type ())
@@ -35,7 +34,4 @@ struct _GimpCancelableInterface
};
-void gimp_cancelable_cancel (GimpCancelable *cancelable);
-
-
-#endif /* __GIMP_CANCELABLE_H__ */
+void gimp_cancelable_cancel (GimpCancelable *cancelable);
diff --git a/app/core/gimpchannel-combine.h b/app/core/gimpchannel-combine.h
index fdee026745..841a23eb5d 100644
--- a/app/core/gimpchannel-combine.h
+++ b/app/core/gimpchannel-combine.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CHANNEL_COMBINE_H__
-#define __GIMP_CHANNEL_COMBINE_H__
+#pragma once
void gimp_channel_combine_rect (GimpChannel *mask,
@@ -55,6 +54,3 @@ void gimp_channel_combine_buffer (GimpChannel *mask,
void gimp_channel_combine_items (GimpChannel *mask,
GList *items,
GimpChannelOps op);
-
-
-#endif /* __GIMP_CHANNEL_COMBINE_H__ */
diff --git a/app/core/gimpchannel-select.h b/app/core/gimpchannel-select.h
index 1c95099215..6b6fbf5479 100644
--- a/app/core/gimpchannel-select.h
+++ b/app/core/gimpchannel-select.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CHANNEL_SELECT_H__
-#define __GIMP_CHANNEL_SELECT_H__
+#pragma once
/* basic selection functions */
@@ -155,6 +154,3 @@ void gimp_channel_select_by_index (GimpChannel *channel,
gboolean feather,
gdouble feather_radius_x,
gdouble feather_radius_y);
-
-
-#endif /* __GIMP_CHANNEL_SELECT_H__ */
diff --git a/app/core/gimpchannel.h b/app/core/gimpchannel.h
index d9cbd68430..78762fc642 100644
--- a/app/core/gimpchannel.h
+++ b/app/core/gimpchannel.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CHANNEL_H__
-#define __GIMP_CHANNEL_H__
+#pragma once
#include "gimpdrawable.h"
@@ -214,6 +213,3 @@ void gimp_channel_shrink (GimpChannel *mask,
gboolean push_undo);
void gimp_channel_flood (GimpChannel *mask,
gboolean push_undo);
-
-
-#endif /* __GIMP_CHANNEL_H__ */
diff --git a/app/core/gimpchannelpropundo.h b/app/core/gimpchannelpropundo.h
index eb715a70da..fce984b551 100644
--- a/app/core/gimpchannelpropundo.h
+++ b/app/core/gimpchannelpropundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CHANNEL_PROP_UNDO_H__
-#define __GIMP_CHANNEL_PROP_UNDO_H__
-
+#pragma once
#include "gimpitemundo.h"
@@ -47,6 +45,3 @@ struct _GimpChannelPropUndoClass
GType gimp_channel_prop_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_CHANNEL_PROP_UNDO_H__ */
diff --git a/app/core/gimpchannelundo.h b/app/core/gimpchannelundo.h
index 985114c92e..87cfaa26ae 100644
--- a/app/core/gimpchannelundo.h
+++ b/app/core/gimpchannelundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CHANNEL_UNDO_H__
-#define __GIMP_CHANNEL_UNDO_H__
-
+#pragma once
#include "gimpitemundo.h"
@@ -49,6 +47,3 @@ struct _GimpChannelUndoClass
GType gimp_channel_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_CHANNEL_UNDO_H__ */
diff --git a/app/core/gimpchunkiterator.h b/app/core/gimpchunkiterator.h
index e1756f3629..9621ff4b97 100644
--- a/app/core/gimpchunkiterator.h
+++ b/app/core/gimpchunkiterator.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CHUNK_ITEARTOR_H__
-#define __GIMP_CHUNK_ITEARTOR_H__
+#pragma once
GimpChunkIterator * gimp_chunk_iterator_new (cairo_region_t *region);
@@ -39,6 +38,3 @@ gboolean gimp_chunk_iterator_get_rect (GimpChunkIterator *
cairo_region_t * gimp_chunk_iterator_stop (GimpChunkIterator *iter,
gboolean free_region);
-
-
-#endif /* __GIMP_CHUNK_ITEARTOR_H__ */
diff --git a/app/core/gimpcontainer-filter.h b/app/core/gimpcontainer-filter.h
index f45ebce9fe..2a7edfd3d0 100644
--- a/app/core/gimpcontainer-filter.h
+++ b/app/core/gimpcontainer-filter.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONTAINER_FILTER_H__
-#define __GIMP_CONTAINER_FILTER_H__
+#pragma once
GimpContainer * gimp_container_filter (GimpContainer *container,
@@ -33,6 +32,3 @@ gchar ** gimp_container_get_filtered_name_array (GimpContainer *c
const gchar *regexp);
GimpObject ** gimp_container_get_filtered_array (GimpContainer *container,
const gchar *regexp);
-
-
-#endif /* __GIMP_CONTAINER_FILTER_H__ */
diff --git a/app/core/gimpcontainer.h b/app/core/gimpcontainer.h
index 5e7e0536c3..3cf4e1b242 100644
--- a/app/core/gimpcontainer.h
+++ b/app/core/gimpcontainer.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONTAINER_H__
-#define __GIMP_CONTAINER_H__
-
+#pragma once
#include "gimpobject.h"
@@ -150,6 +148,3 @@ void gimp_container_remove_handlers_by_data
gpointer callback_data);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (GimpContainer, g_object_unref);
-
-
-#endif /* __GIMP_CONTAINER_H__ */
diff --git a/app/core/gimpcontext.h b/app/core/gimpcontext.h
index 41fe283ea9..f9b01a5f0d 100644
--- a/app/core/gimpcontext.h
+++ b/app/core/gimpcontext.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONTEXT_H__
-#define __GIMP_CONTEXT_H__
-
+#pragma once
#include "gimpviewable.h"
@@ -367,6 +365,3 @@ void gimp_context_template_changed (GimpContext *context);
GimpLineArt * gimp_context_take_line_art (GimpContext *context);
void gimp_context_store_line_art (GimpContext *context,
GimpLineArt *line_art);
-
-
-#endif /* __GIMP_CONTEXT_H__ */
diff --git a/app/core/gimpcoords-interpolate.h b/app/core/gimpcoords-interpolate.h
index d729cd4e47..a359d448fa 100644
--- a/app/core/gimpcoords-interpolate.h
+++ b/app/core/gimpcoords-interpolate.h
@@ -17,8 +17,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_COORDS_INTERPOLATE_H__
-#define __GIMP_COORDS_INTERPOLATE_H__
+#pragma once
+
void gimp_coords_interpolate_bezier (const GimpCoords bezier_pt[4],
gdouble precision,
@@ -37,5 +37,3 @@ void gimp_coords_interpolate_catmull (const GimpCoords catmull_pt[4],
gdouble precision,
GArray *ret_coords,
GArray *ret_params);
-
-#endif /* __GIMP_COORDS_INTERPOLATE_H__ */
diff --git a/app/core/gimpcoords.h b/app/core/gimpcoords.h
index 38297f24aa..036f9db513 100644
--- a/app/core/gimpcoords.h
+++ b/app/core/gimpcoords.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_COORDS_H__
-#define __GIMP_COORDS_H__
+#pragma once
void gimp_coords_mix (const gdouble amul,
@@ -52,6 +51,3 @@ gboolean gimp_coords_equal (const GimpCoords *a,
gdouble gimp_coords_direction (const GimpCoords *a,
const GimpCoords *b);
-
-
-#endif /* __GIMP_COORDS_H__ */
diff --git a/app/core/gimpcurve-load.h b/app/core/gimpcurve-load.h
index fc7ffa32cd..090f4e221c 100644
--- a/app/core/gimpcurve-load.h
+++ b/app/core/gimpcurve-load.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CURVE_LOAD_H__
-#define __GIMP_CURVE_LOAD_H__
+#pragma once
#define GIMP_CURVE_FILE_EXTENSION ".curve"
@@ -25,6 +24,3 @@
GList * gimp_curve_load (GFile *file,
GInputStream *input,
GError **error);
-
-
-#endif /* __GIMP_CURVE_LOAD_H__ */
diff --git a/app/core/gimpcurve-map.h b/app/core/gimpcurve-map.h
index 185e2fc351..97769e09de 100644
--- a/app/core/gimpcurve-map.h
+++ b/app/core/gimpcurve-map.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CURVE_MAP_H__
-#define __GIMP_CURVE_MAP_H__
+#pragma once
gdouble gimp_curve_map_value (GimpCurve *curve,
@@ -29,6 +28,3 @@ void gimp_curve_map_pixels (GimpCurve *curve_colors,
gfloat *src,
gfloat *dest,
glong samples);
-
-
-#endif /* __GIMP_CURVE_MAP_H__ */
diff --git a/app/core/gimpcurve-save.h b/app/core/gimpcurve-save.h
index 98d504f2c5..bd159651b2 100644
--- a/app/core/gimpcurve-save.h
+++ b/app/core/gimpcurve-save.h
@@ -15,14 +15,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CURVE_SAVE_H__
-#define __GIMP_CURVE_SAVE_H__
+#pragma once
/* don't call this function directly, use gimp_data_save() instead */
gboolean gimp_curve_save (GimpData *data,
GOutputStream *output,
GError **error);
-
-
-#endif /* __GIMP_CURVE_SAVE_H__ */
diff --git a/app/core/gimpcurve.h b/app/core/gimpcurve.h
index 71654aa184..53620f1f78 100644
--- a/app/core/gimpcurve.h
+++ b/app/core/gimpcurve.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CURVE_H__
-#define __GIMP_CURVE_H__
-
+#pragma once
#include "gimpdata.h"
@@ -119,6 +117,3 @@ gboolean gimp_curve_is_identity (GimpCurve *curve);
void gimp_curve_get_uchar (GimpCurve *curve,
gint n_samples,
guchar *samples);
-
-
-#endif /* __GIMP_CURVE_H__ */
diff --git a/app/core/gimpdashpattern.h b/app/core/gimpdashpattern.h
index f07cdae203..333d5fddde 100644
--- a/app/core/gimpdashpattern.h
+++ b/app/core/gimpdashpattern.h
@@ -19,8 +19,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DASH_PATTERN_H__
-#define __GIMP_DASH_PATTERN_H__
+#pragma once
#define GIMP_TYPE_DASH_PATTERN (gimp_dash_pattern_get_type ())
@@ -48,6 +47,3 @@ gdouble * gimp_dash_pattern_to_double_array (GArray *pattern,
GArray * gimp_dash_pattern_copy (GArray *pattern);
void gimp_dash_pattern_free (GArray *pattern);
-
-
-#endif /* __GIMP_DASH_PATTERN_H__ */
diff --git a/app/core/gimpdata.h b/app/core/gimpdata.h
index 02a29e868e..c290d0d137 100644
--- a/app/core/gimpdata.h
+++ b/app/core/gimpdata.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DATA_H__
-#define __GIMP_DATA_H__
-
+#pragma once
#include "gimpresource.h"
@@ -144,6 +142,3 @@ void gimp_data_get_identifiers (GimpData *data,
#define GIMP_DATA_ERROR (gimp_data_error_quark ())
GQuark gimp_data_error_quark (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_DATA_H__ */
diff --git a/app/core/gimpdatafactory.h b/app/core/gimpdatafactory.h
index be398d94b8..af0a0409bc 100644
--- a/app/core/gimpdatafactory.h
+++ b/app/core/gimpdatafactory.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DATA_FACTORY_H__
-#define __GIMP_DATA_FACTORY_H__
+#pragma once
#include "gimpobject.h"
@@ -120,7 +119,3 @@ GList * gimp_data_factory_get_data_path (GimpDataFactory *factory);
GList * gimp_data_factory_get_data_path_writable
(GimpDataFactory *factory);
const GList * gimp_data_factory_get_data_path_ext (GimpDataFactory *factory);
-
-
-
-#endif /* __GIMP_DATA_FACTORY_H__ */
diff --git a/app/core/gimpdataloaderfactory.h b/app/core/gimpdataloaderfactory.h
index 4a1a7fae19..b467887814 100644
--- a/app/core/gimpdataloaderfactory.h
+++ b/app/core/gimpdataloaderfactory.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DATA_LOADER_FACTORY_H__
-#define __GIMP_DATA_LOADER_FACTORY_H__
-
+#pragma once
#include "gimpdatafactory.h"
@@ -73,6 +71,3 @@ void gimp_data_loader_factory_add_loader (GimpDataFactory
void gimp_data_loader_factory_add_fallback (GimpDataFactory *factory,
const gchar *name,
GimpDataLoadFunc load_func);
-
-
-#endif /* __GIMP_DATA_LOADER_FACTORY_H__ */
diff --git a/app/core/gimpdisplay.h b/app/core/gimpdisplay.h
index 56ccedd79a..192b876723 100644
--- a/app/core/gimpdisplay.h
+++ b/app/core/gimpdisplay.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_H__
-#define __GIMP_DISPLAY_H__
-
+#pragma once
#include "gimpobject.h"
@@ -62,6 +60,3 @@ gboolean gimp_display_present (GimpDisplay *display);
gboolean gimp_display_grab_focus (GimpDisplay *display);
Gimp * gimp_display_get_gimp (GimpDisplay *display);
-
-
-#endif /* __GIMP_DISPLAY_H__ */
diff --git a/app/core/gimpdocumentlist.h b/app/core/gimpdocumentlist.h
index 68bca80f19..4b13123998 100644
--- a/app/core/gimpdocumentlist.h
+++ b/app/core/gimpdocumentlist.h
@@ -15,10 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DOCUMENT_LIST_H__
-#define __GIMP_DOCUMENT_LIST_H__
+#pragma once
-#include "core/gimplist.h"
+#include "gimplist.h"
#define GIMP_TYPE_DOCUMENT_LIST (gimp_document_list_get_type ())
@@ -49,6 +48,3 @@ GimpContainer * gimp_document_list_new (Gimp *gimp);
GimpImagefile * gimp_document_list_add_file (GimpDocumentList *document_list,
GFile *file,
const gchar *mime_type);
-
-
-#endif /* __GIMP_DOCUMENT_LIST_H__ */
diff --git a/app/core/gimpdrawable-combine.h b/app/core/gimpdrawable-combine.h
index d21d558d32..286aa190ac 100644
--- a/app/core/gimpdrawable-combine.h
+++ b/app/core/gimpdrawable-combine.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_COMBINE_H__
-#define __GIMP_DRAWABLE_COMBINE_H__
+#pragma once
/* virtual functions of GimpDrawable, don't call directly */
@@ -34,6 +33,3 @@ void gimp_drawable_real_apply_buffer (GimpDrawable *drawable,
GeglBuffer *base_buffer,
gint base_x,
gint base_y);
-
-
-#endif /* __GIMP_DRAWABLE_COMBINE_H__ */
diff --git a/app/core/gimpdrawable-edit.h b/app/core/gimpdrawable-edit.h
index a4ecb1c472..22597c9c01 100644
--- a/app/core/gimpdrawable-edit.h
+++ b/app/core/gimpdrawable-edit.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_EDIT_H__
-#define __GIMP_DRAWABLE_EDIT_H__
+#pragma once
void gimp_drawable_edit_clear (GimpDrawable *drawable,
@@ -24,6 +23,3 @@ void gimp_drawable_edit_clear (GimpDrawable *drawable,
void gimp_drawable_edit_fill (GimpDrawable *drawable,
GimpFillOptions *options,
const gchar *undo_desc);
-
-
-#endif /* __GIMP_DRAWABLE_EDIT_H__ */
diff --git a/app/core/gimpdrawable-equalize.h b/app/core/gimpdrawable-equalize.h
index 065b83f1a8..98af28448f 100644
--- a/app/core/gimpdrawable-equalize.h
+++ b/app/core/gimpdrawable-equalize.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_EQUALIZE_H__
-#define __GIMP_DRAWABLE_EQUALIZE_H__
+#pragma once
void gimp_drawable_equalize (GimpDrawable *drawable,
gboolean mask_only);
-
-
-#endif /* __GIMP_DRAWABLE_EQUALIZE_H__ */
diff --git a/app/core/gimpdrawable-fill.h b/app/core/gimpdrawable-fill.h
index 9477bf222e..e649a1a114 100644
--- a/app/core/gimpdrawable-fill.h
+++ b/app/core/gimpdrawable-fill.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_FILL_H__
-#define __GIMP_DRAWABLE_FILL_H__
+#pragma once
/* Lowlevel API that is used for initializing entire drawables and
@@ -55,6 +54,3 @@ void gimp_drawable_fill_scan_convert (GimpDrawable *drawable,
GimpFillOptions *options,
GimpScanConvert *scan_convert,
gboolean push_undo);
-
-
-#endif /* __GIMP_DRAWABLE_FILL_H__ */
diff --git a/app/core/gimpdrawable-filters.h b/app/core/gimpdrawable-filters.h
index 77a1131931..e55a58a643 100644
--- a/app/core/gimpdrawable-filters.h
+++ b/app/core/gimpdrawable-filters.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_FILTERS_H__
-#define __GIMP_DRAWABLE_FILTERS_H__
+#pragma once
/* internal functions */
@@ -61,6 +60,3 @@ gboolean gimp_drawable_merge_filter (GimpDrawable *drawable,
gboolean clip,
gboolean cancellable,
gboolean update);
-
-
-#endif /* __GIMP_DRAWABLE_FILTERS_H__ */
diff --git a/app/core/gimpdrawable-floating-selection.h b/app/core/gimpdrawable-floating-selection.h
index 336a0cf243..86d48832cf 100644
--- a/app/core/gimpdrawable-floating-selection.h
+++ b/app/core/gimpdrawable-floating-selection.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_FLOATING_SELECTION_H__
-#define __GIMP_DRAWABLE_FLOATING_SELECTION_H__
+#pragma once
GimpLayer * gimp_drawable_get_floating_sel (GimpDrawable *drawable);
@@ -26,6 +25,3 @@ void gimp_drawable_detach_floating_sel (GimpDrawable *drawable);
GimpFilter * gimp_drawable_get_floating_sel_filter (GimpDrawable *drawable);
void _gimp_drawable_add_floating_sel_filter (GimpDrawable *drawable);
-
-
-#endif /* __GIMP_DRAWABLE_FLOATING_SELECTION_H__ */
diff --git a/app/core/gimpdrawable-histogram.h b/app/core/gimpdrawable-histogram.h
index 947393a6e4..1346f23a3f 100644
--- a/app/core/gimpdrawable-histogram.h
+++ b/app/core/gimpdrawable-histogram.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_HISTOGRAM_H__
-#define __GIMP_DRAWABLE_HISTOGRAM_H__
+#pragma once
void gimp_drawable_calculate_histogram (GimpDrawable *drawable,
@@ -27,6 +26,3 @@ void gimp_drawable_calculate_histogram (GimpDrawable *drawable,
GimpAsync * gimp_drawable_calculate_histogram_async (GimpDrawable *drawable,
GimpHistogram *histogram,
gboolean with_filters);
-
-
-#endif /* __GIMP_HISTOGRAM_H__ */
diff --git a/app/core/gimpdrawable-levels.h b/app/core/gimpdrawable-levels.h
index 22011c1d7b..7397406016 100644
--- a/app/core/gimpdrawable-levels.h
+++ b/app/core/gimpdrawable-levels.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_LEVELS_H__
-#define __GIMP_DRAWABLE_LEVELS_H__
+#pragma once
void gimp_drawable_levels_stretch (GimpDrawable *drawable,
GimpProgress *progress);
-
-
-#endif /* __GIMP_DRAWABLE_LEVELS_H__ */
diff --git a/app/core/gimpdrawable-offset.h b/app/core/gimpdrawable-offset.h
index f41a1b53ff..85d214a053 100644
--- a/app/core/gimpdrawable-offset.h
+++ b/app/core/gimpdrawable-offset.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_OFFSET_H__
-#define __GIMP_DRAWABLE_OFFSET_H__
+#pragma once
void gimp_drawable_offset (GimpDrawable *drawable,
@@ -26,6 +25,3 @@ void gimp_drawable_offset (GimpDrawable *drawable,
GeglColor *color,
gint offset_x,
gint offset_y);
-
-
-#endif /* __GIMP_DRAWABLE_OFFSET_H__ */
diff --git a/app/core/gimpdrawable-operation.h b/app/core/gimpdrawable-operation.h
index 6ca381f250..fc7ecf9f56 100644
--- a/app/core/gimpdrawable-operation.h
+++ b/app/core/gimpdrawable-operation.h
@@ -20,8 +20,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_OPERATION_H__
-#define __GIMP_DRAWABLE_OPERATION_H__
+#pragma once
void gimp_drawable_apply_operation (GimpDrawable *drawable,
@@ -38,6 +37,3 @@ void gimp_drawable_apply_operation_by_name (GimpDrawable *drawable,
const gchar *undo_desc,
const gchar *operation_type,
GObject *config);
-
-
-#endif /* __GIMP_DRAWABLE_OPERATION_H__ */
diff --git a/app/core/gimpdrawable-preview.h b/app/core/gimpdrawable-preview.h
index 3b95dee34a..36bf9d454f 100644
--- a/app/core/gimpdrawable-preview.h
+++ b/app/core/gimpdrawable-preview.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE__PREVIEW_H__
-#define __GIMP_DRAWABLE__PREVIEW_H__
+#pragma once
/*
@@ -62,6 +61,3 @@ GimpAsync * gimp_drawable_get_sub_preview_async (GimpDrawable *drawable,
gint src_height,
gint dest_width,
gint dest_height);
-
-
-#endif /* __GIMP_DRAWABLE__PREVIEW_H__ */
diff --git a/app/core/gimpdrawable-private.h b/app/core/gimpdrawable-private.h
index d28def322c..1f5c028d46 100644
--- a/app/core/gimpdrawable-private.h
+++ b/app/core/gimpdrawable-private.h
@@ -15,8 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_PRIVATE_H__
-#define __GIMP_DRAWABLE_PRIVATE_H__
+#pragma once
+
struct _GimpDrawablePrivate
{
@@ -44,5 +44,3 @@ struct _GimpDrawablePrivate
gboolean push_resize_undo;
};
-
-#endif /* __GIMP_DRAWABLE_PRIVATE_H__ */
diff --git a/app/core/gimpdrawable-shadow.h b/app/core/gimpdrawable-shadow.h
index b3ab582770..e79752ed53 100644
--- a/app/core/gimpdrawable-shadow.h
+++ b/app/core/gimpdrawable-shadow.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_SHADOW_H__
-#define __GIMP_DRAWABLE_SHADOW_H__
+#pragma once
GeglBuffer * gimp_drawable_get_shadow_buffer (GimpDrawable *drawable);
@@ -27,6 +26,3 @@ void gimp_drawable_free_shadow_buffer (GimpDrawable *drawable);
void gimp_drawable_merge_shadow_buffer (GimpDrawable *drawable,
gboolean push_undo,
const gchar *undo_desc);
-
-
-#endif /* __GIMP_DRAWABLE_SHADOW_H__ */
diff --git a/app/core/gimpdrawable-stroke.h b/app/core/gimpdrawable-stroke.h
index 3c54f5e462..700d0ee28c 100644
--- a/app/core/gimpdrawable-stroke.h
+++ b/app/core/gimpdrawable-stroke.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_STROKE_H__
-#define __GIMP_DRAWABLE_STROKE_H__
+#pragma once
void gimp_drawable_stroke_boundary (GimpDrawable *drawable,
@@ -40,6 +39,3 @@ void gimp_drawable_stroke_scan_convert (GimpDrawable *drawable,
GimpStrokeOptions *options,
GimpScanConvert *scan_convert,
gboolean push_undo);
-
-
-#endif /* __GIMP_DRAWABLE_STROKE_H__ */
diff --git a/app/core/gimpdrawable-transform.h b/app/core/gimpdrawable-transform.h
index e265dcf26e..176e8b3130 100644
--- a/app/core/gimpdrawable-transform.h
+++ b/app/core/gimpdrawable-transform.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_TRANSFORM_H__
-#define __GIMP_DRAWABLE_TRANSFORM_H__
+#pragma once
GeglBuffer * gimp_drawable_transform_buffer_affine (GimpDrawable *drawable,
@@ -89,6 +88,3 @@ GimpDrawable * gimp_drawable_transform_paste (GimpDrawable
gint offset_x,
gint offset_y,
gboolean new_layer);
-
-
-#endif /* __GIMP_DRAWABLE_TRANSFORM_H__ */
diff --git a/app/core/gimpdrawable.h b/app/core/gimpdrawable.h
index c5ff47829d..a033295600 100644
--- a/app/core/gimpdrawable.h
+++ b/app/core/gimpdrawable.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_H__
-#define __GIMP_DRAWABLE_H__
-
+#pragma once
#include "gimpitem.h"
@@ -236,6 +234,3 @@ void gimp_drawable_start_paint (GimpDrawable *drawable)
gboolean gimp_drawable_end_paint (GimpDrawable *drawable);
gboolean gimp_drawable_flush_paint (GimpDrawable *drawable);
gboolean gimp_drawable_is_painting (GimpDrawable *drawable);
-
-
-#endif /* __GIMP_DRAWABLE_H__ */
diff --git a/app/core/gimpdrawablefilter.h b/app/core/gimpdrawablefilter.h
index 4f45a32536..1129717be0 100644
--- a/app/core/gimpdrawablefilter.h
+++ b/app/core/gimpdrawablefilter.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_FILTER_H__
-#define __GIMP_DRAWABLE_FILTER_H__
-
+#pragma once
#include "gimpfilter.h"
@@ -155,6 +153,3 @@ void gimp_drawable_filter_layer_mask_freeze
(GimpDrawableFilter *filter);
void gimp_drawable_filter_refresh_crop (GimpDrawableFilter *filter,
GeglRectangle *rect);
-
-
-#endif /* __GIMP_DRAWABLE_FILTER_H__ */
diff --git a/app/core/gimpdrawablefiltermask.h b/app/core/gimpdrawablefiltermask.h
index af12b2bca0..981a6d340d 100644
--- a/app/core/gimpdrawablefiltermask.h
+++ b/app/core/gimpdrawablefiltermask.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_FILTER_MASK_H__
-#define __GIMP_DRAWABLE_FILTER_MASK_H__
-
+#pragma once
#include "gimpchannel.h"
@@ -56,6 +54,3 @@ GimpDrawableFilterMask * gimp_drawable_filter_mask_new (GimpImage
void gimp_drawable_filter_mask_set_filter (GimpDrawableFilterMask *mask,
GimpDrawableFilter *filter);
GimpDrawableFilter * gimp_drawable_filter_mask_get_filter (GimpDrawableFilterMask *mask);
-
-
-#endif /* __GIMP_DRAWABLE_FILTER_MASK_H__ */
diff --git a/app/core/gimpdrawablefilterundo.h b/app/core/gimpdrawablefilterundo.h
index 1298c4b318..7bf7bf04e2 100644
--- a/app/core/gimpdrawablefilterundo.h
+++ b/app/core/gimpdrawablefilterundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_FILTER_UNDO_H__
-#define __GIMP_DRAWABLE_FILTER_UNDO_H__
-
+#pragma once
#include "gimpundo.h"
@@ -56,6 +54,3 @@ struct _GimpDrawableFilterUndoClass
GType gimp_drawable_filter_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_DRAWABLE_FILTER_UNDO_H__ */
diff --git a/app/core/gimpdrawablemodundo.h b/app/core/gimpdrawablemodundo.h
index 30bf5a0bcb..a0658ae036 100644
--- a/app/core/gimpdrawablemodundo.h
+++ b/app/core/gimpdrawablemodundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_MOD_UNDO_H__
-#define __GIMP_DRAWABLE_MOD_UNDO_H__
-
+#pragma once
#include "gimpitemundo.h"
@@ -50,6 +48,3 @@ struct _GimpDrawableModUndoClass
GType gimp_drawable_mod_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_DRAWABLE_MOD_UNDO_H__ */
diff --git a/app/core/gimpdrawablepropundo.h b/app/core/gimpdrawablepropundo.h
index 4cb9fb56bf..41e56a7cc3 100644
--- a/app/core/gimpdrawablepropundo.h
+++ b/app/core/gimpdrawablepropundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_PROP_UNDO_H__
-#define __GIMP_DRAWABLE_PROP_UNDO_H__
-
+#pragma once
#include "gimpitemundo.h"
@@ -47,6 +45,3 @@ struct _GimpDrawablePropUndoClass
GType gimp_drawable_prop_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_DRAWABLE_PROP_UNDO_H__ */
diff --git a/app/core/gimpdrawablestack.h b/app/core/gimpdrawablestack.h
index 28ee7c4af5..2525e1be83 100644
--- a/app/core/gimpdrawablestack.h
+++ b/app/core/gimpdrawablestack.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_STACK_H__
-#define __GIMP_DRAWABLE_STACK_H__
+#pragma once
#include "gimpitemstack.h"
@@ -61,6 +60,3 @@ void gimp_drawable_stack_update (GimpDrawableStack *stack,
gint y,
gint width,
gint height);
-
-
-#endif /* __GIMP_DRAWABLE_STACK_H__ */
diff --git a/app/core/gimpdrawableundo.h b/app/core/gimpdrawableundo.h
index 5d7269eb7d..91fcd91316 100644
--- a/app/core/gimpdrawableundo.h
+++ b/app/core/gimpdrawableundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_UNDO_H__
-#define __GIMP_DRAWABLE_UNDO_H__
-
+#pragma once
#include "gimpitemundo.h"
@@ -49,6 +47,3 @@ struct _GimpDrawableUndoClass
GType gimp_drawable_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_DRAWABLE_UNDO_H__ */
diff --git a/app/core/gimpdynamics-load.h b/app/core/gimpdynamics-load.h
index 374c6ed178..379c3eb20c 100644
--- a/app/core/gimpdynamics-load.h
+++ b/app/core/gimpdynamics-load.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DYNAMICS_LOAD_H__
-#define __GIMP_DYNAMICS_LOAD_H__
+#pragma once
#define GIMP_DYNAMICS_FILE_EXTENSION ".gdyn"
@@ -26,6 +25,3 @@ GList * gimp_dynamics_load (GimpContext *context,
GFile *file,
GInputStream *input,
GError **error);
-
-
-#endif /* __GIMP_DYNAMICS_LOAD_H__ */
diff --git a/app/core/gimpdynamics-save.h b/app/core/gimpdynamics-save.h
index 7fe2df334e..d6459db0fe 100644
--- a/app/core/gimpdynamics-save.h
+++ b/app/core/gimpdynamics-save.h
@@ -15,14 +15,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DYNAMICS_SAVE_H__
-#define __GIMP_DYNAMICS_SAVE_H__
+#pragma once
/* don't call this function directly, use gimp_data_save() instead */
gboolean gimp_dynamics_save (GimpData *data,
GOutputStream *output,
GError **error);
-
-
-#endif /* __GIMP_DYNAMICS_SAVE_H__ */
diff --git a/app/core/gimpdynamics.h b/app/core/gimpdynamics.h
index e65fdf6349..cc00d90afd 100644
--- a/app/core/gimpdynamics.h
+++ b/app/core/gimpdynamics.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DYNAMICS_H__
-#define __GIMP_DYNAMICS_H__
-
+#pragma once
#include "gimpdata.h"
@@ -72,6 +70,3 @@ gdouble gimp_dynamics_get_aspect_value (GimpDynamics *dynamic
const GimpCoords *coords,
GimpPaintOptions *options,
gdouble fade_point);
-
-
-#endif /* __GIMP_DYNAMICS_H__ */
diff --git a/app/core/gimpdynamicsoutput.h b/app/core/gimpdynamicsoutput.h
index 855cc4aa04..6e443afc43 100644
--- a/app/core/gimpdynamicsoutput.h
+++ b/app/core/gimpdynamicsoutput.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DYNAMICS_OUTPUT_H__
-#define __GIMP_DYNAMICS_OUTPUT_H__
-
+#pragma once
#include "gimpobject.h"
@@ -63,6 +61,3 @@ gdouble gimp_dynamics_output_get_aspect_value (GimpDynamicsOutput *output,
const GimpCoords *coords,
GimpPaintOptions *options,
gdouble fade_point);
-
-
-#endif /* __GIMP_DYNAMICS_OUTPUT_H__ */
diff --git a/app/core/gimperror.h b/app/core/gimperror.h
index f8088ec592..119f69b671 100644
--- a/app/core/gimperror.h
+++ b/app/core/gimperror.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ERROR_H__
-#define __GIMP_ERROR_H__
+#pragma once
typedef enum
@@ -28,6 +27,3 @@ typedef enum
#define GIMP_ERROR (gimp_error_quark ())
GQuark gimp_error_quark (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_ERROR_H__ */
diff --git a/app/core/gimpextension-error.h b/app/core/gimpextension-error.h
index c38f081af2..4e5f8542e8 100644
--- a/app/core/gimpextension-error.h
+++ b/app/core/gimpextension-error.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_EXTENSION_ERROR_H__
-#define __GIMP_EXTENSION_ERROR_H__
+#pragma once
typedef enum
@@ -36,7 +35,3 @@ typedef enum
#define GIMP_EXTENSION_ERROR (gimp_extension_error_quark ())
GQuark gimp_extension_error_quark (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_EXTENSION_ERROR_H__ */
-
diff --git a/app/core/gimpextension.h b/app/core/gimpextension.h
index 4d71be649b..c501e1e5b6 100644
--- a/app/core/gimpextension.h
+++ b/app/core/gimpextension.h
@@ -18,11 +18,9 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_EXTENSION_H__
-#define __GIMP_EXTENSION_H__
+#pragma once
-
-#include "core/gimpobject.h"
+#include "gimpobject.h"
#define GIMP_TYPE_EXTENSION (gimp_extension_get_type ())
@@ -84,5 +82,3 @@ gint gimp_extension_cmp (GimpExtension *extensio
GimpExtension *extension2);
gint gimp_extension_id_cmp (GimpExtension *extension1,
const gchar *id);
-
-#endif /* __GIMP_EXTENSION_H__ */
diff --git a/app/core/gimpextensionmanager.h b/app/core/gimpextensionmanager.h
index 39de0cb016..0d0f049954 100644
--- a/app/core/gimpextensionmanager.h
+++ b/app/core/gimpextensionmanager.h
@@ -18,11 +18,9 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_EXTENSION_MANAGER_H__
-#define __GIMP_EXTENSION_MANAGER_H__
+#pragma once
-
-#include "core/gimpobject.h"
+#include "gimpobject.h"
#define GIMP_TYPE_EXTENSION_MANAGER (gimp_extension_manager_get_type ())
@@ -81,5 +79,3 @@ gboolean gimp_extension_manager_remove (GimpExtensi
gboolean gimp_extension_manager_undo_remove (GimpExtensionManager *manager,
GimpExtension *extension,
GError **error);
-
-#endif /* __GIMP_EXTENSION_MANAGER_H__ */
diff --git a/app/core/gimpfilloptions.h b/app/core/gimpfilloptions.h
index d70a6bfe98..6835d53490 100644
--- a/app/core/gimpfilloptions.h
+++ b/app/core/gimpfilloptions.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_FILL_OPTIONS_H__
-#define __GIMP_FILL_OPTIONS_H__
-
+#pragma once
#include "gimpcontext.h"
@@ -94,6 +92,3 @@ void gimp_fill_options_fill_buffer (GimpFillOptions *optio
GeglBuffer *buffer,
gint pattern_offset_x,
gint pattern_offset_y);
-
-
-#endif /* __GIMP_FILL_OPTIONS_H__ */
diff --git a/app/core/gimpfilter.h b/app/core/gimpfilter.h
index c1272894b0..d65f12e4f6 100644
--- a/app/core/gimpfilter.h
+++ b/app/core/gimpfilter.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_FILTER_H__
-#define __GIMP_FILTER_H__
-
+#pragma once
#include "gimpviewable.h"
@@ -60,6 +58,3 @@ gboolean gimp_filter_get_is_last_node (GimpFilter *filter);
void gimp_filter_set_applicator (GimpFilter *filter,
GimpApplicator *applicator);
GimpApplicator * gimp_filter_get_applicator (GimpFilter *filter);
-
-
-#endif /* __GIMP_FILTER_H__ */
diff --git a/app/core/gimpfilteredcontainer.h b/app/core/gimpfilteredcontainer.h
index 28803c8565..a85c8918e7 100644
--- a/app/core/gimpfilteredcontainer.h
+++ b/app/core/gimpfilteredcontainer.h
@@ -19,9 +19,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_FILTERED_CONTAINER_H__
-#define __GIMP_FILTERED_CONTAINER_H__
-
+#pragma once
#include "gimplist.h"
@@ -63,6 +61,3 @@ GType gimp_filtered_container_get_type (void) G_GNUC_CONST;
GimpContainer * gimp_filtered_container_new (GimpContainer *src_container,
GimpObjectFilterFunc filter_func,
gpointer filter_data);
-
-
-#endif /* __GIMP_FILTERED_CONTAINER_H__ */
diff --git a/app/core/gimpfilterstack.h b/app/core/gimpfilterstack.h
index cf89a3c7ec..988596623f 100644
--- a/app/core/gimpfilterstack.h
+++ b/app/core/gimpfilterstack.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_FILTER_STACK_H__
-#define __GIMP_FILTER_STACK_H__
+#pragma once
#include "gimplist.h"
@@ -50,5 +49,3 @@ GType gimp_filter_stack_get_type (void) G_GNUC_CONST;
GimpContainer * gimp_filter_stack_new (GType filter_type);
GeglNode * gimp_filter_stack_get_graph (GimpFilterStack *stack);
-
-#endif /* __GIMP_FILTER_STACK_H__ */
diff --git a/app/core/gimpfloatingselectionundo.h b/app/core/gimpfloatingselectionundo.h
index 4d9a626790..7ba467e7b6 100644
--- a/app/core/gimpfloatingselectionundo.h
+++ b/app/core/gimpfloatingselectionundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_FLOATING_SELECTION_UNDO_H__
-#define __GIMP_FLOATING_SELECTION_UNDO_H__
-
+#pragma once
#include "gimpitemundo.h"
@@ -47,6 +45,3 @@ struct _GimpFloatingSelectionUndoClass
GType gimp_floating_selection_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_FLOATING_SELECTION_UNDO_H__ */
diff --git a/app/core/gimpgradient-load.h b/app/core/gimpgradient-load.h
index fcc648c911..4665fe1de3 100644
--- a/app/core/gimpgradient-load.h
+++ b/app/core/gimpgradient-load.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GRADIENT_LOAD_H__
-#define __GIMP_GRADIENT_LOAD_H__
+#pragma once
#define GIMP_GRADIENT_FILE_EXTENSION ".ggr"
@@ -31,6 +30,3 @@ GList * gimp_gradient_load_svg (GimpContext *context,
GFile *file,
GInputStream *input,
GError **error);
-
-
-#endif /* __GIMP_GRADIENT_LOAD_H__ */
diff --git a/app/core/gimpgradient-save.h b/app/core/gimpgradient-save.h
index 073bdd8a6b..b31ae094ea 100644
--- a/app/core/gimpgradient-save.h
+++ b/app/core/gimpgradient-save.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GRADIENT_SAVE_H__
-#define __GIMP_GRADIENT_SAVE_H__
+#pragma once
/* don't call this function directly, use gimp_data_save() instead */
@@ -27,6 +26,3 @@ gboolean gimp_gradient_save (GimpData *data,
gboolean gimp_gradient_save_pov (GimpGradient *gradient,
GFile *file,
GError **error);
-
-
-#endif /* __GIMP_GRADIENT_SAVE_H__ */
diff --git a/app/core/gimpgradient.h b/app/core/gimpgradient.h
index ccf919811d..ea9ea82410 100644
--- a/app/core/gimpgradient.h
+++ b/app/core/gimpgradient.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GRADIENT_H__
-#define __GIMP_GRADIENT_H__
-
+#pragma once
#include "gimpdata.h"
@@ -287,6 +285,3 @@ gdouble gimp_gradient_segment_range_move (GimpGradient *gradient,
GimpGradientSegment *range_r,
gdouble delta,
gboolean control_compress);
-
-
-#endif /* __GIMP_GRADIENT_H__ */
diff --git a/app/core/gimpgrid.h b/app/core/gimpgrid.h
index 9e816b712c..e29bd699ed 100644
--- a/app/core/gimpgrid.h
+++ b/app/core/gimpgrid.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GRID_H__
-#define __GIMP_GRID_H__
-
+#pragma once
#include "gimpobject.h"
@@ -74,6 +72,3 @@ void gimp_grid_get_offset (GimpGrid *grid,
const gchar * gimp_grid_parasite_name (void) G_GNUC_CONST;
GimpParasite * gimp_grid_to_parasite (GimpGrid *grid);
GimpGrid * gimp_grid_from_parasite (const GimpParasite *parasite);
-
-
-#endif /* __GIMP_GRID_H__ */
diff --git a/app/core/gimpgrouplayer.h b/app/core/gimpgrouplayer.h
index 5fef1e938e..7783156f13 100644
--- a/app/core/gimpgrouplayer.h
+++ b/app/core/gimpgrouplayer.h
@@ -18,11 +18,9 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GROUP_LAYER_H__
-#define __GIMP_GROUP_LAYER_H__
+#pragma once
-
-#include "core/gimplayer.h"
+#include "gimplayer.h"
#define GIMP_TYPE_GROUP_LAYER (gimp_group_layer_get_type ())
@@ -73,6 +71,3 @@ void _gimp_group_layer_start_transform (GimpGroupLayer *grou
gboolean push_undo);
void _gimp_group_layer_end_transform (GimpGroupLayer *group,
gboolean push_undo);
-
-
-#endif /* __GIMP_GROUP_LAYER_H__ */
diff --git a/app/core/gimpgrouplayerundo.h b/app/core/gimpgrouplayerundo.h
index 14c7043a6a..b49ce65700 100644
--- a/app/core/gimpgrouplayerundo.h
+++ b/app/core/gimpgrouplayerundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GROUP_LAYER_UNDO_H__
-#define __GIMP_GROUP_LAYER_UNDO_H__
-
+#pragma once
#include "gimpitemundo.h"
@@ -52,6 +50,3 @@ struct _GimpGroupLayerUndoClass
GType gimp_group_layer_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_GROUP_LAYER_UNDO_H__ */
diff --git a/app/core/gimpguide.h b/app/core/gimpguide.h
index 285e8eb470..e7e688eed6 100644
--- a/app/core/gimpguide.h
+++ b/app/core/gimpguide.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GUIDE_H__
-#define __GIMP_GUIDE_H__
-
+#pragma once
#include "gimpauxitem.h"
@@ -70,6 +68,3 @@ void gimp_guide_set_position (GimpGuide *guide,
GimpGuideStyle gimp_guide_get_style (GimpGuide *guide);
gboolean gimp_guide_is_custom (GimpGuide *guide);
-
-
-#endif /* __GIMP_GUIDE_H__ */
diff --git a/app/core/gimpguideundo.h b/app/core/gimpguideundo.h
index da77ff3ffd..113e9c5fa9 100644
--- a/app/core/gimpguideundo.h
+++ b/app/core/gimpguideundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GUIDE_UNDO_H__
-#define __GIMP_GUIDE_UNDO_H__
-
+#pragma once
#include "gimpauxitemundo.h"
@@ -48,6 +46,3 @@ struct _GimpGuideUndoClass
GType gimp_guide_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_GUIDE_UNDO_H__ */
diff --git a/app/core/gimphistogram.h b/app/core/gimphistogram.h
index 10ce299aa8..03709bc642 100644
--- a/app/core/gimphistogram.h
+++ b/app/core/gimphistogram.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_HISTOGRAM_H__
-#define __GIMP_HISTOGRAM_H__
-
+#pragma once
#include "gimpobject.h"
@@ -101,6 +99,3 @@ gint gimp_histogram_n_bins (GimpHistogram *histogram)
gboolean gimp_histogram_has_channel (GimpHistogram *histogram,
GimpHistogramChannel channel);
guint gimp_histogram_unique_colors (GimpDrawable *drawable);
-
-
-#endif /* __GIMP_HISTOGRAM_H__ */
diff --git a/app/core/gimpidtable.h b/app/core/gimpidtable.h
index 88097fd4c1..c6e47bfbd9 100644
--- a/app/core/gimpidtable.h
+++ b/app/core/gimpidtable.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ID_TABLE_H__
-#define __GIMP_ID_TABLE_H__
-
+#pragma once
#include "gimpobject.h"
@@ -63,6 +61,3 @@ gpointer gimp_id_table_lookup (GimpIdTable *id_table,
gint id);
gboolean gimp_id_table_remove (GimpIdTable *id_table,
gint id);
-
-
-#endif /* __GIMP_ID_TABLE_H__ */
diff --git a/app/core/gimpimage-arrange.h b/app/core/gimpimage-arrange.h
index 20cab4b2a3..e494a947cd 100644
--- a/app/core/gimpimage-arrange.h
+++ b/app/core/gimpimage-arrange.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_ARRANGE_H__
-#define __GIMP_IMAGE_ARRANGE_H__
+#pragma once
void gimp_image_arrange_objects (GimpImage *image,
@@ -26,5 +25,3 @@ void gimp_image_arrange_objects (GimpImage *image,
GObject *reference,
GimpAlignmentType reference_alignment,
gboolean align_contents);
-
-#endif /* __GIMP_IMAGE_ARRANGE_H__ */
diff --git a/app/core/gimpimage-color-profile.h b/app/core/gimpimage-color-profile.h
index 9b094848d3..8c919beceb 100644
--- a/app/core/gimpimage-color-profile.h
+++ b/app/core/gimpimage-color-profile.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_COLOR_PROFILE_H__
-#define __GIMP_IMAGE_COLOR_PROFILE_H__
+#pragma once
#define GIMP_ICC_PROFILE_PARASITE_NAME "icc-profile"
@@ -126,6 +125,3 @@ void _gimp_image_update_color_profile (GimpImage *ima
void _gimp_image_update_simulation_profile
(GimpImage *image,
const GimpParasite *icc_parasite);
-
-
-#endif /* __GIMP_IMAGE_COLOR_PROFILE_H__ */
diff --git a/app/core/gimpimage-colormap.h b/app/core/gimpimage-colormap.h
index 47f995b1a3..5861c878b9 100644
--- a/app/core/gimpimage-colormap.h
+++ b/app/core/gimpimage-colormap.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_COLORMAP_H__
-#define __GIMP_IMAGE_COLORMAP_H__
+#pragma once
#define GIMP_IMAGE_COLORMAP_SIZE 768
@@ -61,6 +60,3 @@ void gimp_image_add_colormap_entry (GimpImage *image,
gboolean gimp_image_delete_colormap_entry (GimpImage *image,
gint color_index,
gboolean push_undo);
-
-
-#endif /* __GIMP_IMAGE_COLORMAP_H__ */
diff --git a/app/core/gimpimage-convert-data.h b/app/core/gimpimage-convert-data.h
index dd0dd1183f..347f9ff8f3 100644
--- a/app/core/gimpimage-convert-data.h
+++ b/app/core/gimpimage-convert-data.h
@@ -18,10 +18,8 @@
/* Misc data definitions used by the convert.c code module. Moved
out here simply to unclutter convert.c, mostly. */
-#ifndef __GIMP_IMAGE_CONVERT_DATA_H__
-#define __GIMP_IMAGE_CONVERT_DATA_H__
+#pragma once
-#include
/* 'web safe' palette. */
static const guchar webpal[] =
@@ -139,5 +137,3 @@ static const guchar DM_ORIGINAL[32][32] = {
{ 43,233, 27,218, 39,229, 23,214, 42,232, 26,217, 38,228, 22,213, 42,233, 27,217, 38,229, 23,213, 41,232, 26,216, 37,228, 22,212},
{170,106,154, 90,166,102,150, 86,169,105,153, 89,165,101,149, 85,170,106,154, 90,166,102,150, 86,169,105,153, 89,165,101,149, 85}
};
-
-#endif /* __GIMP_IMAGE_CONVERT_DATA_H__ */
diff --git a/app/core/gimpimage-convert-indexed.h b/app/core/gimpimage-convert-indexed.h
index ba51f0279b..db28e560d8 100644
--- a/app/core/gimpimage-convert-indexed.h
+++ b/app/core/gimpimage-convert-indexed.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_CONVERT_INDEXED_H__
-#define __GIMP_IMAGE_CONVERT_INDEXED_H__
+#pragma once
#define MAXNUMCOLORS 256
@@ -36,6 +35,3 @@ gboolean gimp_image_convert_indexed (GimpImage *image,
void gimp_image_convert_indexed_set_dither_matrix (const guchar *matrix,
gint width,
gint height);
-
-
-#endif /* __GIMP_IMAGE_CONVERT_INDEXED_H__ */
diff --git a/app/core/gimpimage-convert-precision.h b/app/core/gimpimage-convert-precision.h
index cd3a0101f7..9f338136b6 100644
--- a/app/core/gimpimage-convert-precision.h
+++ b/app/core/gimpimage-convert-precision.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_CONVERT_PRECISION_H__
-#define __GIMP_IMAGE_CONVERT_PRECISION_H__
+#pragma once
void gimp_image_convert_precision (GimpImage *image,
@@ -31,6 +30,3 @@ void gimp_image_convert_precision (GimpImage *image,
void gimp_image_convert_dither_u8 (GimpImage *image,
GimpProgress *progress);
-
-
-#endif /* __GIMP_IMAGE_CONVERT_PRECISION_H__ */
diff --git a/app/core/gimpimage-convert-type.h b/app/core/gimpimage-convert-type.h
index 53c6950d2e..cb32ce5bea 100644
--- a/app/core/gimpimage-convert-type.h
+++ b/app/core/gimpimage-convert-type.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_CONVERT_TYPE_H__
-#define __GIMP_IMAGE_CONVERT_TYPE_H__
+#pragma once
gboolean gimp_image_convert_type (GimpImage *image,
@@ -24,6 +23,3 @@ gboolean gimp_image_convert_type (GimpImage *image,
GimpColorProfile *dest_profile,
GimpProgress *progress,
GError **error);
-
-
-#endif /* __GIMP_IMAGE_CONVERT_TYPE_H__ */
diff --git a/app/core/gimpimage-crop.h b/app/core/gimpimage-crop.h
index 19304dad59..f8fbc3e201 100644
--- a/app/core/gimpimage-crop.h
+++ b/app/core/gimpimage-crop.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_CROP_H__
-#define __GIMP_IMAGE_CROP_H__
+#pragma once
void gimp_image_crop (GimpImage *image,
@@ -27,6 +26,3 @@ void gimp_image_crop (GimpImage *image,
gint width,
gint height,
gboolean crop_layers);
-
-
-#endif /* __GIMP_IMAGE_CROP_H__ */
diff --git a/app/core/gimpimage-duplicate.h b/app/core/gimpimage-duplicate.h
index cbf55a2fee..b34151b316 100644
--- a/app/core/gimpimage-duplicate.h
+++ b/app/core/gimpimage-duplicate.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_DUPLICATE_H__
-#define __GIMP_IMAGE_DUPLICATE_H__
+#pragma once
GimpImage * gimp_image_duplicate (GimpImage *image);
-
-
-#endif /* __GIMP_IMAGE_DUPLICATE_H__ */
diff --git a/app/core/gimpimage-flip.h b/app/core/gimpimage-flip.h
index 5fa6ce6046..32751363e8 100644
--- a/app/core/gimpimage-flip.h
+++ b/app/core/gimpimage-flip.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_FLIP_H__
-#define __GIMP_IMAGE_FLIP_H__
+#pragma once
void gimp_image_flip (GimpImage *image,
@@ -29,6 +28,3 @@ void gimp_image_flip_full (GimpImage *image,
gdouble axis,
gboolean clip_result,
GimpProgress *progress);
-
-
-#endif /* __GIMP_IMAGE_FLIP_H__ */
diff --git a/app/core/gimpimage-grid.h b/app/core/gimpimage-grid.h
index c2a4a3f079..54bb557cd4 100644
--- a/app/core/gimpimage-grid.h
+++ b/app/core/gimpimage-grid.h
@@ -18,14 +18,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_GRID_H__
-#define __GIMP_IMAGE_GRID_H__
+#pragma once
GimpGrid * gimp_image_get_grid (GimpImage *image);
void gimp_image_set_grid (GimpImage *image,
GimpGrid *grid,
gboolean push_undo);
-
-
-#endif /* __GIMP_IMAGE_GRID_H__ */
diff --git a/app/core/gimpimage-guides.h b/app/core/gimpimage-guides.h
index 7f9706ed56..822c983e79 100644
--- a/app/core/gimpimage-guides.h
+++ b/app/core/gimpimage-guides.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_GUIDES_H__
-#define __GIMP_IMAGE_GUIDES_H__
+#pragma once
/* public guide adding API
@@ -49,6 +48,3 @@ GimpGuide * gimp_image_get_guide (GimpImage *image,
GimpGuide * gimp_image_get_next_guide (GimpImage *image,
guint32 id,
gboolean *guide_found);
-
-
-#endif /* __GIMP_IMAGE_GUIDES_H__ */
diff --git a/app/core/gimpimage-item-list.h b/app/core/gimpimage-item-list.h
index 75472d14a7..c5760493bf 100644
--- a/app/core/gimpimage-item-list.h
+++ b/app/core/gimpimage-item-list.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_ITEM_LIST_H__
-#define __GIMP_IMAGE_ITEM_LIST_H__
+#pragma once
gboolean gimp_image_item_list_bounds (GimpImage *image,
@@ -58,6 +57,3 @@ GList * gimp_image_item_list_get_list (GimpImage *image,
GimpItemSet set);
GList * gimp_image_item_list_filter (GList *list);
-
-
-#endif /* __GIMP_IMAGE_ITEM_LIST_H__ */
diff --git a/app/core/gimpimage-merge.h b/app/core/gimpimage-merge.h
index 6b87a3dc5a..228113df21 100644
--- a/app/core/gimpimage-merge.h
+++ b/app/core/gimpimage-merge.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_MERGE_H__
-#define __GIMP_IMAGE_MERGE_H__
+#pragma once
GList * gimp_image_merge_visible_layers (GimpImage *image,
@@ -41,6 +40,3 @@ GimpLayer * gimp_image_flatten (GimpImage *image,
GimpPath * gimp_image_merge_visible_paths (GimpImage *image,
GError **error);
-
-
-#endif /* __GIMP_IMAGE_MERGE_H__ */
diff --git a/app/core/gimpimage-metadata.h b/app/core/gimpimage-metadata.h
index 347a30022a..9a05ea0abe 100644
--- a/app/core/gimpimage-metadata.h
+++ b/app/core/gimpimage-metadata.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_METADATA_H__
-#define __GIMP_IMAGE_METADATA_H__
+#pragma once
GimpMetadata * gimp_image_get_metadata (GimpImage *image);
@@ -35,6 +34,3 @@ GimpImage * gimp_image_metadata_load_thumbnail (Gimp *gimp,
gint *full_image_height,
const Babl **format,
GError **error);
-
-
-#endif /* __GIMP_IMAGE_METADATA_H__ */
diff --git a/app/core/gimpimage-new.h b/app/core/gimpimage-new.h
index 5622ccd3ef..efe6fa2b8a 100644
--- a/app/core/gimpimage-new.h
+++ b/app/core/gimpimage-new.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_NEW_H__
-#define __GIMP_IMAGE_NEW_H__
+#pragma once
GimpTemplate * gimp_image_new_get_last_template (Gimp *gimp,
@@ -41,6 +40,3 @@ GimpImage * gimp_image_new_from_buffer (Gimp *gimp,
GimpImage * gimp_image_new_from_pixbuf (Gimp *gimp,
GdkPixbuf *pixbuf,
const gchar *layer_name);
-
-
-#endif /* __GIMP_IMAGE_NEW__ */
diff --git a/app/core/gimpimage-pick-item.h b/app/core/gimpimage-pick-item.h
index cbe608bb40..aff5674ea5 100644
--- a/app/core/gimpimage-pick-item.h
+++ b/app/core/gimpimage-pick-item.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_PICK_ITEM_H__
-#define __GIMP_IMAGE_PICK_ITEM_H__
+#pragma once
GimpLayer * gimp_image_pick_layer (GimpImage *image,
@@ -52,6 +51,3 @@ GimpSamplePoint * gimp_image_pick_sample_point (GimpImage *image,
gdouble y,
gdouble epsilon_x,
gdouble epsilon_y);
-
-
-#endif /* __GIMP_IMAGE_PICK_ITEM_H__ */
diff --git a/app/core/gimpimage-preview.h b/app/core/gimpimage-preview.h
index c5f2c35fd0..ca3037a73b 100644
--- a/app/core/gimpimage-preview.h
+++ b/app/core/gimpimage-preview.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_PREVIEW_H__
-#define __GIMP_IMAGE_PREVIEW_H__
+#pragma once
const Babl * gimp_image_get_preview_format (GimpImage *image);
@@ -50,6 +49,3 @@ GdkPixbuf * gimp_image_get_new_pixbuf (GimpViewable *viewable,
gint height,
GeglColor *color,
GeglColor *background);
-
-
-#endif /* __GIMP_IMAGE_PREVIEW_H__ */
diff --git a/app/core/gimpimage-private.h b/app/core/gimpimage-private.h
index d870f4530c..014fbfc735 100644
--- a/app/core/gimpimage-private.h
+++ b/app/core/gimpimage-private.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_PRIVATE_H__
-#define __GIMP_IMAGE_PRIVATE_H__
+#pragma once
typedef struct _GimpImageFlushAccumulator GimpImageFlushAccumulator;
@@ -154,6 +153,3 @@ struct _GimpImagePrivate
void gimp_image_take_mask (GimpImage *image,
GimpChannel *mask);
-
-
-#endif /* __GIMP_IMAGE_PRIVATE_H__ */
diff --git a/app/core/gimpimage-quick-mask.h b/app/core/gimpimage-quick-mask.h
index 71c6516dc0..806bd69254 100644
--- a/app/core/gimpimage-quick-mask.h
+++ b/app/core/gimpimage-quick-mask.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_QUICK_MASK_H__
-#define __GIMP_IMAGE_QUICK_MASK_H__
+#pragma once
/* don't change this string, it's used to identify the Quick Mask
@@ -37,6 +36,3 @@ GimpChannel * gimp_image_get_quick_mask (GimpImage *image);
void gimp_image_quick_mask_invert (GimpImage *image);
gboolean gimp_image_get_quick_mask_inverted (GimpImage *image);
-
-
-#endif /* __GIMP_IMAGE_QUICK_MASK_H__ */
diff --git a/app/core/gimpimage-resize.h b/app/core/gimpimage-resize.h
index edcc64c17f..d8357cc538 100644
--- a/app/core/gimpimage-resize.h
+++ b/app/core/gimpimage-resize.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_RESIZE_H__
-#define __GIMP_IMAGE_RESIZE_H__
+#pragma once
void gimp_image_resize (GimpImage *image,
@@ -48,6 +47,3 @@ void gimp_image_resize_to_layers (GimpImage *image,
void gimp_image_resize_to_selection (GimpImage *image,
GimpContext *context,
GimpProgress *progress);
-
-
-#endif /* __GIMP_IMAGE_RESIZE_H__ */
diff --git a/app/core/gimpimage-rotate.h b/app/core/gimpimage-rotate.h
index 63f493dbfe..adfa627143 100644
--- a/app/core/gimpimage-rotate.h
+++ b/app/core/gimpimage-rotate.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_ROTATE_H__
-#define __GIMP_IMAGE_ROTATE_H__
+#pragma once
void gimp_image_rotate (GimpImage *image,
@@ -33,6 +32,3 @@ void gimp_image_apply_metadata_orientation (GimpImage *image,
GimpContext *context,
GimpMetadata *metadata,
GimpProgress *progress);
-
-
-#endif /* __GIMP_IMAGE_ROTATE_H__ */
diff --git a/app/core/gimpimage-sample-points.h b/app/core/gimpimage-sample-points.h
index c84a02b30d..f549c8f5ee 100644
--- a/app/core/gimpimage-sample-points.h
+++ b/app/core/gimpimage-sample-points.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_SAMPLE_POINTS_H__
-#define __GIMP_IMAGE_SAMPLE_POINTS_H__
+#pragma once
/* public sample point adding API
@@ -55,6 +54,3 @@ GimpSamplePoint * gimp_image_get_sample_point (GimpImage *image,
GimpSamplePoint * gimp_image_get_next_sample_point (GimpImage *image,
guint32 id,
gboolean *sample_point_found);
-
-
-#endif /* __GIMP_IMAGE_SAMPLE_POINTS_H__ */
diff --git a/app/core/gimpimage-scale.h b/app/core/gimpimage-scale.h
index 1073e38659..076c194f38 100644
--- a/app/core/gimpimage-scale.h
+++ b/app/core/gimpimage-scale.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_SCALE_H__
-#define __GIMP_IMAGE_SCALE_H__
+#pragma once
void gimp_image_scale (GimpImage *image,
@@ -31,6 +30,3 @@ GimpImageScaleCheckType
gint new_height,
gint64 max_memsize,
gint64 *new_memsize);
-
-
-#endif /* __GIMP_IMAGE_SCALE_H__ */
diff --git a/app/core/gimpimage-snap.h b/app/core/gimpimage-snap.h
index 0554eb9bb8..8170124f69 100644
--- a/app/core/gimpimage-snap.h
+++ b/app/core/gimpimage-snap.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_SNAP_H__
-#define __GIMP_IMAGE_SNAP_H__
+#pragma once
typedef struct _GimpImageSnapData
@@ -88,6 +87,3 @@ gboolean gimp_image_snap_rectangle (GimpImage *image,
gboolean snap_to_path,
gboolean snap_to_bbox,
gboolean snap_to_equidistance);
-
-
-#endif /* __GIMP_IMAGE_SNAP_H__ */
diff --git a/app/core/gimpimage-symmetry.h b/app/core/gimpimage-symmetry.h
index 9211382d1f..70b5a2eeb8 100644
--- a/app/core/gimpimage-symmetry.h
+++ b/app/core/gimpimage-symmetry.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_SYMMETRY_H__
-#define __GIMP_IMAGE_SYMMETRY_H__
+#pragma once
GList * gimp_image_symmetry_list (void);
@@ -35,6 +34,3 @@ GList * gimp_image_symmetry_get (GimpImage *image);
gboolean gimp_image_set_active_symmetry (GimpImage *image,
GType type);
GimpSymmetry * gimp_image_get_active_symmetry (GimpImage *image);
-
-
-#endif /* __GIMP_IMAGE_SYMMETRY_H__ */
diff --git a/app/core/gimpimage-transform.h b/app/core/gimpimage-transform.h
index 63a851dff9..6605df8135 100644
--- a/app/core/gimpimage-transform.h
+++ b/app/core/gimpimage-transform.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_TRANSFORM_H__
-#define __GIMP_IMAGE_TRANSFORM_H__
+#pragma once
void gimp_image_transform (GimpImage *image,
@@ -29,6 +28,3 @@ void gimp_image_transform (GimpImage *image,
GimpInterpolationType interpolation_type,
GimpTransformResize clip_result,
GimpProgress *progress);
-
-
-#endif /* __GIMP_IMAGE_TRANSFORM_H__ */
diff --git a/app/core/gimpimage-undo-push.h b/app/core/gimpimage-undo-push.h
index c13850ce98..d50d355f8c 100644
--- a/app/core/gimpimage-undo-push.h
+++ b/app/core/gimpimage-undo-push.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_UNDO_PUSH_H__
-#define __GIMP_IMAGE_UNDO_PUSH_H__
+#pragma once
/* image undos */
@@ -279,6 +278,3 @@ GimpUndo * gimp_image_undo_push_fs_to_layer (GimpImage *image,
GimpUndo * gimp_image_undo_push_cantundo (GimpImage *image,
const gchar *undo_desc);
-
-
-#endif /* __GIMP_IMAGE_UNDO_PUSH_H__ */
diff --git a/app/core/gimpimage-undo.h b/app/core/gimpimage-undo.h
index 34bd2f4ce1..66bff2add0 100644
--- a/app/core/gimpimage-undo.h
+++ b/app/core/gimpimage-undo.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE__UNDO_H__
-#define __GIMP_IMAGE__UNDO_H__
+#pragma once
gboolean gimp_image_undo_is_enabled (GimpImage *image);
@@ -52,6 +51,3 @@ GimpUndo * gimp_image_undo_push (GimpImage *image,
GimpUndo * gimp_image_undo_can_compress (GimpImage *image,
GType object_type,
GimpUndoType undo_type);
-
-
-#endif /* __GIMP_IMAGE__UNDO_H__ */
diff --git a/app/core/gimpimage.h b/app/core/gimpimage.h
index e020d5c0a4..8f77201f72 100644
--- a/app/core/gimpimage.h
+++ b/app/core/gimpimage.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_H__
-#define __GIMP_IMAGE_H__
-
+#pragma once
#include "gimpviewable.h"
@@ -512,6 +510,3 @@ void gimp_image_invalidate_previews (GimpImage *image);
void gimp_image_set_converting (GimpImage *image,
gboolean converting);
gboolean gimp_image_get_converting (GimpImage *image);
-
-
-#endif /* __GIMP_IMAGE_H__ */
diff --git a/app/core/gimpimagefile.h b/app/core/gimpimagefile.h
index 9ea29b0637..c691a3161f 100644
--- a/app/core/gimpimagefile.h
+++ b/app/core/gimpimagefile.h
@@ -23,9 +23,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGEFILE_H__
-#define __GIMP_IMAGEFILE_H__
-
+#pragma once
#include "gimpviewable.h"
@@ -85,6 +83,3 @@ gboolean gimp_imagefile_save_thumbnail (GimpImagefile *imagefile,
GimpImage *image,
GError **error);
const gchar * gimp_imagefile_get_desc_string (GimpImagefile *imagefile);
-
-
-#endif /* __GIMP_IMAGEFILE_H__ */
diff --git a/app/core/gimpimageproxy.h b/app/core/gimpimageproxy.h
index a6c99229a4..e8e4aa54f0 100644
--- a/app/core/gimpimageproxy.h
+++ b/app/core/gimpimageproxy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_PROXY_H__
-#define __GIMP_IMAGE_PROXY_H__
-
+#pragma once
#include "gimpviewable.h"
@@ -54,12 +52,9 @@ GType gimp_image_proxy_get_type (void) G_GNUC_CONST;
GimpImageProxy * gimp_image_proxy_new (GimpImage *image);
GimpImage * gimp_image_proxy_get_image (GimpImageProxy *image_proxy);
-
+
void gimp_image_proxy_set_show_all (GimpImageProxy *image_proxy,
gboolean show_all);
gboolean gimp_image_proxy_get_show_all (GimpImageProxy *image_proxy);
-
+
GeglRectangle gimp_image_proxy_get_bounding_box (GimpImageProxy *image_proxy);
-
-
-#endif /* __GIMP_IMAGE_PROXY_H__ */
diff --git a/app/core/gimpimageundo.h b/app/core/gimpimageundo.h
index 08f7ef8e08..d32a73bcbe 100644
--- a/app/core/gimpimageundo.h
+++ b/app/core/gimpimageundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_UNDO_H__
-#define __GIMP_IMAGE_UNDO_H__
-
+#pragma once
#include "gimpundo.h"
@@ -64,6 +62,3 @@ struct _GimpImageUndoClass
GType gimp_image_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_IMAGE_UNDO_H__ */
diff --git a/app/core/gimpitem-exclusive.h b/app/core/gimpitem-exclusive.h
index 2bf3a63719..2ccea20600 100644
--- a/app/core/gimpitem-exclusive.h
+++ b/app/core/gimpitem-exclusive.h
@@ -18,8 +18,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ITEM_EXCLUSIVE_H__
-#define __GIMP_ITEM_EXCLUSIVE_H__
+#pragma once
+
typedef gboolean (* GimpItemIsEnabledFunc) (GimpItem *item);
typedef gboolean (* GimpItemCanSetFunc) (GimpItem *item);
@@ -44,6 +44,3 @@ void gimp_item_toggle_exclusive (GimpItem *item,
GimpUndoType group_undo_type,
gboolean only_selected,
GimpContext *context);
-
-
-#endif /* __GIMP_ITEM_EXCLUSIVE_H__ */
diff --git a/app/core/gimpitem-preview.h b/app/core/gimpitem-preview.h
index 6bfed245ca..a6bcc50819 100644
--- a/app/core/gimpitem-preview.h
+++ b/app/core/gimpitem-preview.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ITEM__PREVIEW_H__
-#define __GIMP_ITEM__PREVIEW_H__
+#pragma once
/*
@@ -35,6 +34,3 @@ gboolean gimp_item_get_popup_size (GimpViewable *viewable,
gboolean dot_for_dot,
gint *popup_width,
gint *popup_height);
-
-
-#endif /* __GIMP_ITEM__PREVIEW_H__ */
diff --git a/app/core/gimpitem.h b/app/core/gimpitem.h
index 90179da585..1a232c3317 100644
--- a/app/core/gimpitem.h
+++ b/app/core/gimpitem.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ITEM_H__
-#define __GIMP_ITEM_H__
-
+#pragma once
#include "gimpfilter.h"
@@ -401,6 +399,3 @@ gboolean gimp_item_mask_intersect (GimpItem *item,
gboolean gimp_item_is_in_set (GimpItem *item,
GimpItemSet set);
-
-
-#endif /* __GIMP_ITEM_H__ */
diff --git a/app/core/gimpitemlist.h b/app/core/gimpitemlist.h
index 5575d7ad73..a7c4c11047 100644
--- a/app/core/gimpitemlist.h
+++ b/app/core/gimpitemlist.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ITEM_LIST_H__
-#define __GIMP_ITEM_LIST_H__
+#pragma once
#define GIMP_TYPE_ITEM_LIST (gimp_item_list_get_type ())
@@ -66,5 +65,3 @@ gboolean gimp_item_list_is_pattern (GimpItemList *set,
void gimp_item_list_add (GimpItemList *set,
GimpItem *item);
-
-#endif /* __GIMP_ITEM_LIST_H__ */
diff --git a/app/core/gimpitempropundo.h b/app/core/gimpitempropundo.h
index 8f5a8c79f5..f64527c959 100644
--- a/app/core/gimpitempropundo.h
+++ b/app/core/gimpitempropundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ITEM_PROP_UNDO_H__
-#define __GIMP_ITEM_PROP_UNDO_H__
-
+#pragma once
#include "gimpitemundo.h"
@@ -59,6 +57,3 @@ struct _GimpItemPropUndoClass
GType gimp_item_prop_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_ITEM_PROP_UNDO_H__ */
diff --git a/app/core/gimpitemstack.h b/app/core/gimpitemstack.h
index b4760760ca..cf49e21268 100644
--- a/app/core/gimpitemstack.h
+++ b/app/core/gimpitemstack.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ITEM_STACK_H__
-#define __GIMP_ITEM_STACK_H__
+#pragma once
#include "gimpfilterstack.h"
@@ -61,6 +60,3 @@ GimpItem * gimp_item_stack_get_parent_by_path (GimpItemStack *stack,
void gimp_item_stack_invalidate_previews (GimpItemStack *stack);
void gimp_item_stack_profile_changed (GimpItemStack *stack);
-
-
-#endif /* __GIMP_ITEM_STACK_H__ */
diff --git a/app/core/gimpitemtree.h b/app/core/gimpitemtree.h
index 2367a9b9b8..f6088cb5ed 100644
--- a/app/core/gimpitemtree.h
+++ b/app/core/gimpitemtree.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ITEM_TREE_H__
-#define __GIMP_ITEM_TREE_H__
-
+#pragma once
#include "gimpobject.h"
@@ -88,6 +86,3 @@ void gimp_item_tree_rename_item (GimpItemTree *tree,
const gchar *new_name,
gboolean push_undo,
const gchar *undo_desc);
-
-
-#endif /* __GIMP_ITEM_TREE_H__ */
diff --git a/app/core/gimpitemundo.h b/app/core/gimpitemundo.h
index 91fe8d6b7f..20ae229b38 100644
--- a/app/core/gimpitemundo.h
+++ b/app/core/gimpitemundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ITEM_UNDO_H__
-#define __GIMP_ITEM_UNDO_H__
-
+#pragma once
#include "gimpundo.h"
@@ -47,6 +45,3 @@ struct _GimpItemUndoClass
GType gimp_item_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_ITEM_UNDO_H__ */
diff --git a/app/core/gimplayer-floating-selection.h b/app/core/gimplayer-floating-selection.h
index e111c1a88d..07f08f177a 100644
--- a/app/core/gimplayer-floating-selection.h
+++ b/app/core/gimplayer-floating-selection.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_LAYER_FLOATING_SELECTION_H__
-#define __GIMP_LAYER_FLOATING_SELECTION_H__
+#pragma once
void floating_sel_attach (GimpLayer *layer,
@@ -28,6 +27,3 @@ void floating_sel_activate_drawable (GimpLayer *layer);
const GimpBoundSeg * floating_sel_boundary (GimpLayer *layer,
gint *n_segs);
void floating_sel_invalidate (GimpLayer *layer);
-
-
-#endif /* __GIMP_LAYER_FLOATING_SELECTION_H__ */
diff --git a/app/core/gimplayer-new.h b/app/core/gimplayer-new.h
index 58b3aa9906..a11fa091c0 100644
--- a/app/core/gimplayer-new.h
+++ b/app/core/gimplayer-new.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_LAYER_NEW_H__
-#define __GIMP_LAYER_NEW_H__
+#pragma once
GimpLayer * gimp_layer_new (GimpImage *image,
@@ -46,6 +45,3 @@ GimpLayer * gimp_layer_new_from_pixbuf (GdkPixbuf *pixbuf,
const gchar *name,
gdouble opacity,
GimpLayerMode mode);
-
-
-#endif /* __GIMP_LAYER_NEW_H__ */
diff --git a/app/core/gimplayer.h b/app/core/gimplayer.h
index df58355bb7..6748ebc879 100644
--- a/app/core/gimplayer.h
+++ b/app/core/gimplayer.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_LAYER_H__
-#define __GIMP_LAYER_H__
-
+#pragma once
#include "gimpdrawable.h"
@@ -248,6 +246,3 @@ gboolean gimp_layer_is_alpha_locked (GimpLayer *layer,
void gimp_layer_update_effective_mode (GimpLayer *layer);
void gimp_layer_update_excludes_backdrop (GimpLayer *layer);
-
-
-#endif /* __GIMP_LAYER_H__ */
diff --git a/app/core/gimplayermask.h b/app/core/gimplayermask.h
index 7f07450d16..ae6721b077 100644
--- a/app/core/gimplayermask.h
+++ b/app/core/gimplayermask.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_LAYER_MASK_H__
-#define __GIMP_LAYER_MASK_H__
-
+#pragma once
#include "gimpchannel.h"
@@ -56,6 +54,3 @@ GimpLayerMask * gimp_layer_mask_new (GimpImage *image,
void gimp_layer_mask_set_layer (GimpLayerMask *layer_mask,
GimpLayer *layer);
GimpLayer * gimp_layer_mask_get_layer (GimpLayerMask *layer_mask);
-
-
-#endif /* __GIMP_LAYER_MASK_H__ */
diff --git a/app/core/gimplayermaskpropundo.h b/app/core/gimplayermaskpropundo.h
index a416e4319a..dbb05e50be 100644
--- a/app/core/gimplayermaskpropundo.h
+++ b/app/core/gimplayermaskpropundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_LAYER_MASK_PROP_UNDO_H__
-#define __GIMP_LAYER_MASK_PROP_UNDO_H__
-
+#pragma once
#include "gimpitemundo.h"
@@ -48,6 +46,3 @@ struct _GimpLayerMaskPropUndoClass
GType gimp_layer_mask_prop_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_LAYER_MASK_PROP_UNDO_H__ */
diff --git a/app/core/gimplayermaskundo.h b/app/core/gimplayermaskundo.h
index c8591c1606..cb9e838675 100644
--- a/app/core/gimplayermaskundo.h
+++ b/app/core/gimplayermaskundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_LAYER_MASK_UNDO_H__
-#define __GIMP_LAYER_MASK_UNDO_H__
-
+#pragma once
#include "gimpitemundo.h"
@@ -47,6 +45,3 @@ struct _GimpLayerMaskUndoClass
GType gimp_layer_mask_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_LAYER_MASK_UNDO_H__ */
diff --git a/app/core/gimplayerpropundo.h b/app/core/gimplayerpropundo.h
index 5a3b4780d5..26fa80a7d4 100644
--- a/app/core/gimplayerpropundo.h
+++ b/app/core/gimplayerpropundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_LAYER_PROP_UNDO_H__
-#define __GIMP_LAYER_PROP_UNDO_H__
-
+#pragma once
#include "gimpitemundo.h"
@@ -52,6 +50,3 @@ struct _GimpLayerPropUndoClass
GType gimp_layer_prop_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_LAYER_PROP_UNDO_H__ */
diff --git a/app/core/gimplayerstack.h b/app/core/gimplayerstack.h
index 598d21caed..18175a772a 100644
--- a/app/core/gimplayerstack.h
+++ b/app/core/gimplayerstack.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_LAYER_STACK_H__
-#define __GIMP_LAYER_STACK_H__
+#pragma once
#include "gimpdrawablestack.h"
@@ -46,6 +45,3 @@ struct _GimpLayerStackClass
GType gimp_layer_stack_get_type (void) G_GNUC_CONST;
GimpContainer * gimp_layer_stack_new (GType layer_type);
-
-
-#endif /* __GIMP_LAYER_STACK_H__ */
diff --git a/app/core/gimplayerundo.h b/app/core/gimplayerundo.h
index 5d99b2773d..be60092546 100644
--- a/app/core/gimplayerundo.h
+++ b/app/core/gimplayerundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_LAYER_UNDO_H__
-#define __GIMP_LAYER_UNDO_H__
-
+#pragma once
#include "gimpitemundo.h"
@@ -49,6 +47,3 @@ struct _GimpLayerUndoClass
GType gimp_layer_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_LAYER_UNDO_H__ */
diff --git a/app/core/gimplineart.h b/app/core/gimplineart.h
index cdec1eebc2..306c8ecac2 100644
--- a/app/core/gimplineart.h
+++ b/app/core/gimplineart.h
@@ -18,12 +18,11 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_LINEART__
-#define __GIMP_LINEART__
-
+#pragma once
#include "gimpobject.h"
+
#define GIMP_TYPE_LINE_ART (gimp_line_art_get_type ())
#define GIMP_LINE_ART(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LINE_ART, GimpLineArt))
#define GIMP_LINE_ART_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_LINE_ART, GimpLineArtClass))
@@ -69,5 +68,3 @@ gboolean gimp_line_art_is_frozen (GimpLineArt *line_art);
GeglBuffer * gimp_line_art_get (GimpLineArt *line_art,
gfloat **distmap);
-
-#endif /* __GIMP_LINEART__ */
diff --git a/app/core/gimplist.h b/app/core/gimplist.h
index f0fc273f8f..1e9d241372 100644
--- a/app/core/gimplist.h
+++ b/app/core/gimplist.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_LIST_H__
-#define __GIMP_LIST_H__
-
+#pragma once
#include "gimpcontainer.h"
@@ -67,6 +65,3 @@ void gimp_list_sort (GimpList *list,
void gimp_list_sort_by_name (GimpList *list);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (GimpList, g_object_unref);
-
-
-#endif /* __GIMP_LIST_H__ */
diff --git a/app/core/gimpmaskundo.h b/app/core/gimpmaskundo.h
index 53b92e8000..850c10cf6d 100644
--- a/app/core/gimpmaskundo.h
+++ b/app/core/gimpmaskundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_MASK_UNDO_H__
-#define __GIMP_MASK_UNDO_H__
-
+#pragma once
#include "gimpitemundo.h"
@@ -53,6 +51,3 @@ struct _GimpMaskUndoClass
GType gimp_mask_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_MASK_UNDO_H__ */
diff --git a/app/core/gimpmybrush-load.h b/app/core/gimpmybrush-load.h
index 4afe203c47..9defef949f 100644
--- a/app/core/gimpmybrush-load.h
+++ b/app/core/gimpmybrush-load.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_MYBRUSH_LOAD_H__
-#define __GIMP_MYBRUSH_LOAD_H__
+#pragma once
#define GIMP_MYBRUSH_FILE_EXTENSION ".myb"
@@ -28,6 +27,3 @@ GList * gimp_mybrush_load (GimpContext *context,
GFile *file,
GInputStream *input,
GError **error);
-
-
-#endif /* __GIMP_MYBRUSH_LOAD_H__ */
diff --git a/app/core/gimpmybrush-private.h b/app/core/gimpmybrush-private.h
index 6fb0c77e18..db8ca1fd8f 100644
--- a/app/core/gimpmybrush-private.h
+++ b/app/core/gimpmybrush-private.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_MYBRUSH_PRIVATE_H__
-#define __GIMP_MYBRUSH_PRIVATE_H__
+#pragma once
struct _GimpMybrushPrivate
@@ -34,6 +33,3 @@ struct _GimpMybrushPrivate
gdouble offset_by_random;
gboolean eraser;
};
-
-
-#endif /* __GIMP_MYBRUSH_PRIVATE_H__ */
diff --git a/app/core/gimpmybrush.h b/app/core/gimpmybrush.h
index c54760b249..f57b916263 100644
--- a/app/core/gimpmybrush.h
+++ b/app/core/gimpmybrush.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_MYBRUSH_H__
-#define __GIMP_MYBRUSH_H__
-
+#pragma once
#include "gimpdata.h"
@@ -65,6 +63,3 @@ gdouble gimp_mybrush_get_posterize (GimpMybrush *brush);
gdouble gimp_mybrush_get_posterize_num (GimpMybrush *brush);
gdouble gimp_mybrush_get_offset_by_random (GimpMybrush *brush);
gboolean gimp_mybrush_get_is_eraser (GimpMybrush *brush);
-
-
-#endif /* __GIMP_MYBRUSH_H__ */
diff --git a/app/core/gimpobject.h b/app/core/gimpobject.h
index fb1212ff87..3b09b4246f 100644
--- a/app/core/gimpobject.h
+++ b/app/core/gimpobject.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OBJECT_H__
-#define __GIMP_OBJECT_H__
+#pragma once
#define GIMP_TYPE_OBJECT (gimp_object_get_type ())
@@ -71,5 +70,3 @@ gint64 gimp_object_get_memsize (GimpObject *object,
gint64 *gui_size);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (GimpObject, g_object_unref);
-
-#endif /* __GIMP_OBJECT_H__ */
diff --git a/app/core/gimpobjectqueue.h b/app/core/gimpobjectqueue.h
index 024754fbd9..8ddc7db590 100644
--- a/app/core/gimpobjectqueue.h
+++ b/app/core/gimpobjectqueue.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OBJECT_QUEUE_H__
-#define __GIMP_OBJECT_QUEUE_H__
-
+#pragma once
#include "gimpsubprogress.h"
@@ -61,6 +59,3 @@ void gimp_object_queue_push_list (GimpObjectQueue *queue,
GList *list);
gpointer gimp_object_queue_pop (GimpObjectQueue *queue);
-
-
-#endif /* __GIMP_OBJECT_QUEUE_H__ */
diff --git a/app/core/gimppadactions.c b/app/core/gimppadactions.c
index aafcd236b3..4da020a5d6 100644
--- a/app/core/gimppadactions.c
+++ b/app/core/gimppadactions.c
@@ -28,6 +28,7 @@
#include "core-types.h"
+#include "gimpdata.h"
#include "gimppadactions.h"
#include "gimpparamspecs.h"
@@ -35,6 +36,7 @@
typedef struct _GimpPadAction GimpPadAction;
+
struct _GimpPadAction
{
GimpPadActionType type;
diff --git a/app/core/gimppadactions.h b/app/core/gimppadactions.h
index b5123bf128..4f9edbfeed 100644
--- a/app/core/gimppadactions.h
+++ b/app/core/gimppadactions.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PAD_ACTIONS_H__
-#define __GIMP_PAD_ACTIONS_H__
-
-
-#include "gimpdata.h"
+#pragma once
#define GIMP_TYPE_PAD_ACTIONS (gimp_pad_actions_get_type ())
@@ -44,13 +40,12 @@ struct _GimpPadActionsClass
GObjectClass parent_class;
};
-typedef enum _GimpPadActionType GimpPadActionType;
-enum _GimpPadActionType
+typedef enum
{
GIMP_PAD_ACTION_BUTTON,
GIMP_PAD_ACTION_RING,
GIMP_PAD_ACTION_STRIP
-};
+} GimpPadActionType;
typedef void (* GimpPadActionForeach) (GimpPadActions *pad_actions,
GimpPadActionType action_type,
@@ -81,6 +76,3 @@ const gchar * gimp_pad_actions_get_action (GimpPadActions *pad_actio
GimpPadActionType action_type,
guint number,
guint mode);
-
-
-#endif /* __GIMP_PAD_ACTIONS_H__ */
diff --git a/app/core/gimppaintinfo.h b/app/core/gimppaintinfo.h
index c67b326c0e..811acb7c02 100644
--- a/app/core/gimppaintinfo.h
+++ b/app/core/gimppaintinfo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PAINT_INFO_H__
-#define __GIMP_PAINT_INFO_H__
-
+#pragma once
#include "gimpviewable.h"
@@ -64,6 +62,3 @@ GimpPaintInfo * gimp_paint_info_new (Gimp *gimp,
void gimp_paint_info_set_standard (Gimp *gimp,
GimpPaintInfo *paint_info);
GimpPaintInfo * gimp_paint_info_get_standard (Gimp *gimp);
-
-
-#endif /* __GIMP_PAINT_INFO_H__ */
diff --git a/app/core/gimppalette-import.h b/app/core/gimppalette-import.h
index 099d718be6..7df7763ac7 100644
--- a/app/core/gimppalette-import.h
+++ b/app/core/gimppalette-import.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PALETTE_IMPORT__
-#define __GIMP_PALETTE_IMPORT__
+#pragma once
GimpPalette * gimp_palette_import_from_gradient (GimpGradient *gradient,
@@ -44,5 +43,3 @@ GimpPalette * gimp_palette_import_from_file (GimpContext *context,
GFile *file,
const gchar *palette_name,
GError **error);
-
-#endif /* __GIMP_PALETTE_IMPORT_H__ */
diff --git a/app/core/gimppalette-load.h b/app/core/gimppalette-load.h
index fa0c31423f..e00aefef97 100644
--- a/app/core/gimppalette-load.h
+++ b/app/core/gimppalette-load.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PALETTE_LOAD_H__
-#define __GIMP_PALETTE_LOAD_H__
+#pragma once
#define GIMP_PALETTE_FILE_EXTENSION ".gpl"
@@ -76,6 +75,3 @@ GList * gimp_palette_load_sbz (GimpContext *context,
GimpPaletteFileFormat gimp_palette_load_detect_format (GFile *file,
GInputStream *input);
-
-
-#endif /* __GIMP_PALETTE_H__ */
diff --git a/app/core/gimppalette-save.h b/app/core/gimppalette-save.h
index e72c4483f1..ecdb290dd3 100644
--- a/app/core/gimppalette-save.h
+++ b/app/core/gimppalette-save.h
@@ -15,14 +15,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PALETTE_SAVE_H__
-#define __GIMP_PALETTE_SAVE_H__
+#pragma once
/* don't call this function directly, use gimp_data_save() instead */
gboolean gimp_palette_save (GimpData *data,
GOutputStream *output,
GError **error);
-
-
-#endif /* __GIMP_PALETTE_SAVE_H__ */
diff --git a/app/core/gimppalette.h b/app/core/gimppalette.h
index e8f2660437..94466279df 100644
--- a/app/core/gimppalette.h
+++ b/app/core/gimppalette.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PALETTE_H__
-#define __GIMP_PALETTE_H__
-
+#pragma once
#include "gimpdata.h"
@@ -127,6 +125,3 @@ void gimp_palette_set_colormap (GimpPalette *palette,
const guchar *colormap,
gint n_colors,
gboolean push_undo_if_image);
-
-
-#endif /* __GIMP_PALETTE_H__ */
diff --git a/app/core/gimppalettemru.h b/app/core/gimppalettemru.h
index 2566400145..5384a6e956 100644
--- a/app/core/gimppalettemru.h
+++ b/app/core/gimppalettemru.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PALETTE_MRU_H__
-#define __GIMP_PALETTE_MRU_H__
-
+#pragma once
#include "gimppalette.h"
@@ -57,6 +55,3 @@ void gimp_palette_mru_save (GimpPaletteMru *mru,
void gimp_palette_mru_add (GimpPaletteMru *mru,
GeglColor *color);
-
-
-#endif /* __GIMP_PALETTE_MRU_H__ */
diff --git a/app/core/gimpparamspecs-desc.h b/app/core/gimpparamspecs-desc.h
index 1e6ea2d655..5d580e488d 100644
--- a/app/core/gimpparamspecs-desc.h
+++ b/app/core/gimpparamspecs-desc.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PARAM_SPECS_DESC_H__
-#define __GIMP_PARAM_SPECS_DESC_H__
+#pragma once
gchar * gimp_param_spec_get_desc (GParamSpec *pspec);
-
-
-#endif /* __GIMP_PARAM_SPECS_DESC_H__ */
diff --git a/app/core/gimpparamspecs.h b/app/core/gimpparamspecs.h
index 5b1dc5c6e5..a10a5f19f3 100644
--- a/app/core/gimpparamspecs.h
+++ b/app/core/gimpparamspecs.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __APP_GIMP_PARAM_SPECS_H__
-#define __APP_GIMP_PARAM_SPECS_H__
+#pragma once
/*
@@ -86,6 +85,3 @@ void gimp_param_spec_enum_exclude_value (GimpParamSpecEnum *espec,
#define GIMP_COMPILATION
#include "../../libgimp/gimpparamspecs.h"
#undef GIMP_COMPILATION
-
-
-#endif /* __APP_GIMP_PARAM_SPECS_H__ */
diff --git a/app/core/gimpparasitelist.h b/app/core/gimpparasitelist.h
index 17627531c0..d69be9b865 100644
--- a/app/core/gimpparasitelist.h
+++ b/app/core/gimpparasitelist.h
@@ -14,9 +14,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PARASITE_LIST_H__
-#define __GIMP_PARASITE_LIST_H__
-
+#pragma once
#include "gimpobject.h"
@@ -64,6 +62,3 @@ void gimp_parasite_list_foreach (GimpParasiteList *list,
gpointer user_data);
const GimpParasite * gimp_parasite_list_find (GimpParasiteList *list,
const gchar *name);
-
-
-#endif /* __GIMP_PARASITE_LIST_H__ */
diff --git a/app/core/gimppattern-header.h b/app/core/gimppattern-header.h
index e11b3c9cbd..2973a1a5aa 100644
--- a/app/core/gimppattern-header.h
+++ b/app/core/gimppattern-header.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATTERN_HEADER_H__
-#define __GIMP_PATTERN_HEADER_H__
+#pragma once
#define GIMP_PATTERN_MAGIC (('G' << 24) + ('P' << 16) + \
@@ -43,6 +42,3 @@ struct _GimpPatternHeader
* After that comes the pattern data -- width * height * bytes bytes
* of it...
*/
-
-
-#endif /* __GIMP_PATTERN_HEADER_H__ */
diff --git a/app/core/gimppattern-load.h b/app/core/gimppattern-load.h
index 8e7fc8aca0..aaa5b1273d 100644
--- a/app/core/gimppattern-load.h
+++ b/app/core/gimppattern-load.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATTERN_LOAD_H__
-#define __GIMP_PATTERN_LOAD_H__
+#pragma once
#define GIMP_PATTERN_FILE_EXTENSION ".pat"
@@ -30,6 +29,3 @@ GList * gimp_pattern_load_pixbuf (GimpContext *context,
GFile *file,
GInputStream *input,
GError **error);
-
-
-#endif /* __GIMP_PATTERN_LOAD_H__ */
diff --git a/app/core/gimppattern-save.h b/app/core/gimppattern-save.h
index d3c657c681..b687055726 100644
--- a/app/core/gimppattern-save.h
+++ b/app/core/gimppattern-save.h
@@ -15,14 +15,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATTERN_SAVE_H__
-#define __GIMP_PATTERN_SAVE_H__
+#pragma once
/* don't call this function directly, use gimp_data_save() instead */
gboolean gimp_pattern_save (GimpData *data,
GOutputStream *output,
GError **error);
-
-
-#endif /* __GIMP_PATTERN_SAVE_H__ */
diff --git a/app/core/gimppattern.h b/app/core/gimppattern.h
index 14cc099edb..453eee54ce 100644
--- a/app/core/gimppattern.h
+++ b/app/core/gimppattern.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATTERN_H__
-#define __GIMP_PATTERN_H__
-
+#pragma once
#include "gimpdata.h"
@@ -53,6 +51,3 @@ GimpData * gimp_pattern_get_standard (GimpContext *context);
GimpTempBuf * gimp_pattern_get_mask (GimpPattern *pattern);
GeglBuffer * gimp_pattern_create_buffer (GimpPattern *pattern);
-
-
-#endif /* __GIMP_PATTERN_H__ */
diff --git a/app/core/gimppatternclipboard.h b/app/core/gimppatternclipboard.h
index 2707291a5a..2a243e8e81 100644
--- a/app/core/gimppatternclipboard.h
+++ b/app/core/gimppatternclipboard.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATTERN_CLIPBOARD_H__
-#define __GIMP_PATTERN_CLIPBOARD_H__
-
+#pragma once
#include "gimppattern.h"
@@ -51,6 +49,3 @@ struct _GimpPatternClipboardClass
GType gimp_pattern_clipboard_get_type (void) G_GNUC_CONST;
GimpData * gimp_pattern_clipboard_new (Gimp *gimp);
-
-
-#endif /* __GIMP_PATTERN_CLIPBOARD_H__ */
diff --git a/app/core/gimppdbprogress.h b/app/core/gimppdbprogress.h
index 4057332b35..30bec6f1d5 100644
--- a/app/core/gimppdbprogress.h
+++ b/app/core/gimppdbprogress.h
@@ -18,10 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PDB_PROGRESS_H__
-#define __GIMP_PDB_PROGRESS_H__
-
-G_BEGIN_DECLS
+#pragma once
#define GIMP_TYPE_PDB_PROGRESS (gimp_pdb_progress_get_type ())
@@ -59,8 +56,3 @@ GType gimp_pdb_progress_get_type (void) G_GNUC_CONST;
GimpPdbProgress * gimp_pdb_progress_get_by_callback (GimpPdbProgressClass *klass,
const gchar *callback_name);
-
-
-G_END_DECLS
-
-#endif /* __GIMP_PDB_PROGRESS_H__ */
diff --git a/app/core/gimppickable-auto-shrink.h b/app/core/gimppickable-auto-shrink.h
index 2f2eaa0140..d87db80af5 100644
--- a/app/core/gimppickable-auto-shrink.h
+++ b/app/core/gimppickable-auto-shrink.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PICKABLE_AUTO_SHRINK_H__
-#define __GIMP_PICKABLE_AUTO_SHRINK_H__
+#pragma once
typedef enum
@@ -36,6 +35,3 @@ GimpAutoShrink gimp_pickable_auto_shrink (GimpPickable *pickable,
gint *shrunk_y,
gint *shrunk_width,
gint *shrunk_height);
-
-
-#endif /* __GIMP_PICKABLE_AUTO_SHRINK_H__ */
diff --git a/app/core/gimppickable-contiguous-region.h b/app/core/gimppickable-contiguous-region.h
index c7bd0c3533..403ce556a8 100644
--- a/app/core/gimppickable-contiguous-region.h
+++ b/app/core/gimppickable-contiguous-region.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PICKABLE_CONTIGUOUS_REGION_H__
-#define __GIMP_PICKABLE_CONTIGUOUS_REGION_H__
+#pragma once
GeglBuffer * gimp_pickable_contiguous_region_by_seed (GimpPickable *pickable,
@@ -44,5 +43,3 @@ GeglBuffer * gimp_pickable_contiguous_region_by_line_art (GimpPickabl
gint fill_offset_y,
gint x,
gint y);
-
-#endif /* __GIMP_PICKABLE_CONTIGUOUS_REGION_H__ */
diff --git a/app/core/gimppickable.h b/app/core/gimppickable.h
index 3f39d5e5d8..b5e19356b4 100644
--- a/app/core/gimppickable.h
+++ b/app/core/gimppickable.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PICKABLE_H__
-#define __GIMP_PICKABLE_H__
+#pragma once
#define GIMP_TYPE_PICKABLE (gimp_pickable_get_type ())
@@ -80,6 +79,3 @@ gboolean gimp_pickable_pick_color (GimpPickable *pick
gdouble average_radius,
gpointer pixel,
GeglColor **color);
-
-
-#endif /* __GIMP_PICKABLE_H__ */
diff --git a/app/core/gimpprogress.h b/app/core/gimpprogress.h
index 472374700d..db260f14bb 100644
--- a/app/core/gimpprogress.h
+++ b/app/core/gimpprogress.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROGRESS_H__
-#define __GIMP_PROGRESS_H__
+#pragma once
#define GIMP_TYPE_PROGRESS (gimp_progress_get_type ())
@@ -88,6 +87,3 @@ void gimp_progress_update_and_flush (gint min,
gint max,
gint current,
gpointer data);
-
-
-#endif /* __GIMP_PROGRESS_H__ */
diff --git a/app/core/gimpprojectable.h b/app/core/gimpprojectable.h
index e2aaa6e99f..7fdf52329b 100644
--- a/app/core/gimpprojectable.h
+++ b/app/core/gimpprojectable.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROJECTABLE_H__
-#define __GIMP_PROJECTABLE_H__
+#pragma once
#define GIMP_TYPE_PROJECTABLE (gimp_projectable_get_type ())
@@ -79,6 +78,3 @@ GeglNode * gimp_projectable_get_graph (GimpProjectable *projectable);
void gimp_projectable_begin_render (GimpProjectable *projectable);
void gimp_projectable_end_render (GimpProjectable *projectable);
void gimp_projectable_invalidate_preview (GimpProjectable *projectable);
-
-
-#endif /* __GIMP_PROJECTABLE_H__ */
diff --git a/app/core/gimpprojection.h b/app/core/gimpprojection.h
index 8c9baf69e6..4bd19c326a 100644
--- a/app/core/gimpprojection.h
+++ b/app/core/gimpprojection.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROJECTION_H__
-#define __GIMP_PROJECTION_H__
-
+#pragma once
#include "gimpobject.h"
@@ -78,6 +76,3 @@ gint64 gimp_projection_estimate_memsize (GimpImageBaseType type,
GimpComponentType component_type,
gint width,
gint height);
-
-
-#endif /* __GIMP_PROJECTION_H__ */
diff --git a/app/core/gimpresource.h b/app/core/gimpresource.h
index d5c96f2b40..9f08a11c3c 100644
--- a/app/core/gimpresource.h
+++ b/app/core/gimpresource.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_RESOURCE_H__
-#define __GIMP_RESOURCE_H__
-
+#pragma once
#include "gimpviewable.h"
@@ -44,6 +42,3 @@ struct _GimpResourceClass
GType gimp_resource_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_RESOURCE_H__ */
diff --git a/app/core/gimpsamplepoint.h b/app/core/gimpsamplepoint.h
index dddd328f7f..1e77aec5e3 100644
--- a/app/core/gimpsamplepoint.h
+++ b/app/core/gimpsamplepoint.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_SAMPLE_POINT_H__
-#define __GIMP_SAMPLE_POINT_H__
-
+#pragma once
#include "gimpauxitem.h"
@@ -63,6 +61,3 @@ void gimp_sample_point_set_position (GimpSamplePoint *sample_poi
GimpColorPickMode gimp_sample_point_get_pick_mode (GimpSamplePoint *sample_point);
void gimp_sample_point_set_pick_mode (GimpSamplePoint *sample_point,
GimpColorPickMode pick_mode);
-
-
-#endif /* __GIMP_SAMPLE_POINT_H__ */
diff --git a/app/core/gimpsamplepointundo.h b/app/core/gimpsamplepointundo.h
index 10a3e90daa..e8d1b930c6 100644
--- a/app/core/gimpsamplepointundo.h
+++ b/app/core/gimpsamplepointundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_SAMPLE_POINT_UNDO_H__
-#define __GIMP_SAMPLE_POINT_UNDO_H__
-
+#pragma once
#include "gimpauxitemundo.h"
@@ -49,6 +47,3 @@ struct _GimpSamplePointUndoClass
GType gimp_sample_point_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_SAMPLE_POINT_UNDO_H__ */
diff --git a/app/core/gimpscanconvert.h b/app/core/gimpscanconvert.h
index 9df4da1a5f..8e152f2f2a 100644
--- a/app/core/gimpscanconvert.h
+++ b/app/core/gimpscanconvert.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_SCAN_CONVERT_H__
-#define __GIMP_SCAN_CONVERT_H__
+#pragma once
GimpScanConvert *
@@ -76,6 +75,3 @@ void gimp_scan_convert_compose_value (GimpScanConvert *sc,
gint off_x,
gint off_y,
gdouble value);
-
-
-#endif /* __GIMP_SCAN_CONVERT_H__ */
diff --git a/app/core/gimpselection.h b/app/core/gimpselection.h
index 310614efe8..273f8fbab0 100644
--- a/app/core/gimpselection.h
+++ b/app/core/gimpselection.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_SELECTION_H__
-#define __GIMP_SELECTION_H__
-
+#pragma once
#include "gimpchannel.h"
@@ -71,6 +69,3 @@ GimpLayer * gimp_selection_float (GimpSelection *selection,
gint off_x,
gint off_y,
GError **error);
-
-
-#endif /* __GIMP_SELECTION_H__ */
diff --git a/app/core/gimpsettings.h b/app/core/gimpsettings.h
index 73aa96f737..d81c01049a 100644
--- a/app/core/gimpsettings.h
+++ b/app/core/gimpsettings.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_SETTINGS_H__
-#define __GIMP_SETTINGS_H__
-
+#pragma once
#include "gimpviewable.h"
@@ -52,6 +50,3 @@ GType gimp_settings_get_type (void) G_GNUC_CONST;
gint gimp_settings_compare (GimpSettings *a,
GimpSettings *b);
-
-
-#endif /* __GIMP_SETTINGS_H__ */
diff --git a/app/core/gimpstrokeoptions.h b/app/core/gimpstrokeoptions.h
index f82250dc80..cf7d532d7b 100644
--- a/app/core/gimpstrokeoptions.h
+++ b/app/core/gimpstrokeoptions.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_STROKE_OPTIONS_H__
-#define __GIMP_STROKE_OPTIONS_H__
-
+#pragma once
#include "gimpfilloptions.h"
@@ -76,6 +74,3 @@ void gimp_stroke_options_prepare (GimpStrokeOptions
GimpContext *context,
GimpPaintOptions *paint_options);
void gimp_stroke_options_finish (GimpStrokeOptions *options);
-
-
-#endif /* __GIMP_STROKE_OPTIONS_H__ */
diff --git a/app/core/gimpsubprogress.h b/app/core/gimpsubprogress.h
index c031182bab..1f441db954 100644
--- a/app/core/gimpsubprogress.h
+++ b/app/core/gimpsubprogress.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_SUB_PROGRESS_H__
-#define __GIMP_SUB_PROGRESS_H__
+#pragma once
#define GIMP_TYPE_SUB_PROGRESS (gimp_sub_progress_get_type ())
@@ -53,7 +52,3 @@ void gimp_sub_progress_set_range (GimpSubProgress *progress,
void gimp_sub_progress_set_step (GimpSubProgress *progress,
gint index,
gint num_steps);
-
-
-
-#endif /* __GIMP_SUB_PROGRESS_H__ */
diff --git a/app/core/gimpsymmetry-mandala.h b/app/core/gimpsymmetry-mandala.h
index 0978a40593..22ce36fec5 100644
--- a/app/core/gimpsymmetry-mandala.h
+++ b/app/core/gimpsymmetry-mandala.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_MANDALA_H__
-#define __GIMP_MANDALA_H__
-
+#pragma once
#include "gimpsymmetry.h"
@@ -56,6 +54,3 @@ struct _GimpMandalaClass
GType gimp_mandala_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_MANDALA_H__ */
diff --git a/app/core/gimpsymmetry-mirror.h b/app/core/gimpsymmetry-mirror.h
index f9ac26ab46..cf26c31a39 100644
--- a/app/core/gimpsymmetry-mirror.h
+++ b/app/core/gimpsymmetry-mirror.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_MIRROR_H__
-#define __GIMP_MIRROR_H__
-
+#pragma once
#include "gimpsymmetry.h"
@@ -57,6 +55,3 @@ struct _GimpMirrorClass
GType gimp_mirror_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_MIRROR_H__ */
diff --git a/app/core/gimpsymmetry-tiling.h b/app/core/gimpsymmetry-tiling.h
index 7fbff71570..7113e6a1b4 100644
--- a/app/core/gimpsymmetry-tiling.h
+++ b/app/core/gimpsymmetry-tiling.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TILING_H__
-#define __GIMP_TILING_H__
-
+#pragma once
#include "gimpsymmetry.h"
@@ -53,6 +51,3 @@ struct _GimpTilingClass
GType gimp_tiling_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_TILING_H__ */
diff --git a/app/core/gimpsymmetry.h b/app/core/gimpsymmetry.h
index bd1dcee615..8d9db43b97 100644
--- a/app/core/gimpsymmetry.h
+++ b/app/core/gimpsymmetry.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_SYMMETRY_H__
-#define __GIMP_SYMMETRY_H__
-
+#pragma once
#include "gimpobject.h"
@@ -101,6 +99,3 @@ GimpParasite * gimp_symmetry_to_parasite (const GimpSymmetry *symmetry);
GimpSymmetry * gimp_symmetry_from_parasite (const GimpParasite *parasite,
GimpImage *image,
GType type);
-
-
-#endif /* __GIMP_SYMMETRY_H__ */
diff --git a/app/core/gimptag.h b/app/core/gimptag.h
index 0cd6c32c4d..da8f568e50 100644
--- a/app/core/gimptag.h
+++ b/app/core/gimptag.h
@@ -18,11 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TAG_H__
-#define __GIMP_TAG_H__
-
-
-#include
+#pragma once
#define GIMP_TYPE_TAG (gimp_tag_get_type ())
@@ -75,6 +71,3 @@ gboolean gimp_tag_is_tag_separator (gunichar c);
void gimp_tag_or_null_ref (GimpTag *tag_or_null);
void gimp_tag_or_null_unref (GimpTag *tag_or_null);
-
-
-#endif /* __GIMP_TAG_H__ */
diff --git a/app/core/gimptagcache.h b/app/core/gimptagcache.h
index 4c3a465926..7c4f6ea1b6 100644
--- a/app/core/gimptagcache.h
+++ b/app/core/gimptagcache.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TAG_CACHE_H__
-#define __GIMP_TAG_CACHE_H__
-
+#pragma once
#include "gimpobject.h"
@@ -58,6 +56,3 @@ void gimp_tag_cache_load (GimpTagCache *cache);
void gimp_tag_cache_add_container (GimpTagCache *cache,
GimpContainer *container);
-
-
-#endif /* __GIMP_TAG_CACHE_H__ */
diff --git a/app/core/gimptagged.h b/app/core/gimptagged.h
index 0518f3cc85..4527bb5723 100644
--- a/app/core/gimptagged.h
+++ b/app/core/gimptagged.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TAGGED_H__
-#define __GIMP_TAGGED_H__
+#pragma once
#define GIMP_TYPE_TAGGED (gimp_tagged_get_type ())
@@ -61,6 +60,3 @@ gchar * gimp_tagged_get_checksum (GimpTagged *tagged);
gboolean gimp_tagged_has_tag (GimpTagged *tagged,
GimpTag *tag);
-
-
-#endif /* __GIMP_TAGGED_H__ */
diff --git a/app/core/gimptaggedcontainer.h b/app/core/gimptaggedcontainer.h
index 02beeeb335..7a4ce8aeeb 100644
--- a/app/core/gimptaggedcontainer.h
+++ b/app/core/gimptaggedcontainer.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TAGGED_CONTAINER_H__
-#define __GIMP_TAGGED_CONTAINER_H__
-
+#pragma once
#include "gimpfilteredcontainer.h"
@@ -62,6 +60,3 @@ void gimp_tagged_container_set_filter (GimpTaggedContainer *tagged
const GList * gimp_tagged_container_get_filter (GimpTaggedContainer *tagged_container);
gint gimp_tagged_container_get_tag_count (GimpTaggedContainer *container);
-
-
-#endif /* __GIMP_TAGGED_CONTAINER_H__ */
diff --git a/app/core/gimptempbuf.h b/app/core/gimptempbuf.h
index d5228f5e8b..10513bfc37 100644
--- a/app/core/gimptempbuf.h
+++ b/app/core/gimptempbuf.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEMP_BUF_H__
-#define __GIMP_TEMP_BUF_H__
+#pragma once
GimpTempBuf * gimp_temp_buf_new (gint width,
@@ -62,6 +61,3 @@ GimpTempBuf * gimp_gegl_buffer_get_temp_buf (GeglBuffer *buffer);
/* stats */
guint64 gimp_temp_buf_get_total_memsize (void);
-
-
-#endif /* __GIMP_TEMP_BUF_H__ */
diff --git a/app/core/gimptemplate.h b/app/core/gimptemplate.h
index f3e977248e..f312555964 100644
--- a/app/core/gimptemplate.h
+++ b/app/core/gimptemplate.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEMPLATE_H__
-#define __GIMP_TEMPLATE_H__
-
+#pragma once
#include "gimpviewable.h"
@@ -96,6 +94,3 @@ GimpFillType gimp_template_get_fill_type (GimpTemplate *template);
const gchar * gimp_template_get_comment (GimpTemplate *template);
guint64 gimp_template_get_initial_size (GimpTemplate *template);
-
-
-#endif /* __GIMP_TEMPLATE__ */
diff --git a/app/core/gimptilehandlerprojectable.h b/app/core/gimptilehandlerprojectable.h
index 57af4b61af..31c0e6a259 100644
--- a/app/core/gimptilehandlerprojectable.h
+++ b/app/core/gimptilehandlerprojectable.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TILE_HANDLER_PROJECTABLE_H__
-#define __GIMP_TILE_HANDLER_PROJECTABLE_H__
-
+#pragma once
#include "gegl/gimptilehandlervalidate.h"
@@ -59,6 +57,3 @@ struct _GimpTileHandlerProjectableClass
GType gimp_tile_handler_projectable_get_type (void) G_GNUC_CONST;
GeglTileHandler * gimp_tile_handler_projectable_new (GimpProjectable *projectable);
-
-
-#endif /* __GIMP_TILE_HANDLER_PROJECTABLE_H__ */
diff --git a/app/core/gimptoolgroup.h b/app/core/gimptoolgroup.h
index ef4d979b5e..a4c6c759fe 100644
--- a/app/core/gimptoolgroup.h
+++ b/app/core/gimptoolgroup.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_GROUP_H__
-#define __GIMP_TOOL_GROUP_H__
-
+#pragma once
#include "gimptoolitem.h"
@@ -63,6 +61,3 @@ const gchar * gimp_tool_group_get_active_tool (GimpToolGroup *tool_group)
void gimp_tool_group_set_active_tool_info (GimpToolGroup *tool_group,
GimpToolInfo *tool_info);
GimpToolInfo * gimp_tool_group_get_active_tool_info (GimpToolGroup *tool_group);
-
-
-#endif /* __GIMP_TOOL_GROUP_H__ */
diff --git a/app/core/gimptoolinfo.h b/app/core/gimptoolinfo.h
index fc028b72bf..22129b6c4f 100644
--- a/app/core/gimptoolinfo.h
+++ b/app/core/gimptoolinfo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_INFO_H__
-#define __GIMP_TOOL_INFO_H__
-
+#pragma once
#include "gimptoolitem.h"
@@ -90,6 +88,3 @@ gchar * gimp_tool_info_get_action_name (GimpToolInfo *tool_info);
GFile * gimp_tool_info_get_options_file (GimpToolInfo *tool_info,
const gchar *suffix);
-
-
-#endif /* __GIMP_TOOL_INFO_H__ */
diff --git a/app/core/gimptoolitem.h b/app/core/gimptoolitem.h
index 3f19f496d5..38b8736599 100644
--- a/app/core/gimptoolitem.h
+++ b/app/core/gimptoolitem.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_ITEM_H__
-#define __GIMP_TOOL_ITEM_H__
-
+#pragma once
#include "gimpviewable.h"
@@ -54,17 +52,14 @@ struct _GimpToolItemClass
GType gimp_tool_item_get_type (void) G_GNUC_CONST;
-
+
void gimp_tool_item_set_visible (GimpToolItem *tool_item,
gboolean visible);
gboolean gimp_tool_item_get_visible (GimpToolItem *tool_item);
-
+
gboolean gimp_tool_item_get_shown (GimpToolItem *tool_item);
/* protected */
void gimp_tool_item_shown_changed (GimpToolItem *tool_item);
-
-
-#endif /* __GIMP_TOOL_ITEM_H__ */
diff --git a/app/core/gimptooloptions.h b/app/core/gimptooloptions.h
index f59aa5260c..20d99a52e3 100644
--- a/app/core/gimptooloptions.h
+++ b/app/core/gimptooloptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_OPTIONS_H__
-#define __GIMP_TOOL_OPTIONS_H__
-
+#pragma once
#include "gimpcontext.h"
@@ -68,6 +66,3 @@ gboolean gimp_tool_options_deserialize (GimpToolOptions *tool_options,
gboolean gimp_tool_options_delete (GimpToolOptions *tool_options,
GError **error);
void gimp_tool_options_create_folder (void);
-
-
-#endif /* __GIMP_TOOL_OPTIONS_H__ */
diff --git a/app/core/gimptoolpreset-load.h b/app/core/gimptoolpreset-load.h
index 9a016df2d3..1fa5cc7820 100644
--- a/app/core/gimptoolpreset-load.h
+++ b/app/core/gimptoolpreset-load.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_PRESET_LOAD_H__
-#define __GIMP_TOOL_PRESET_LOAD_H__
+#pragma once
#define GIMP_TOOL_PRESET_FILE_EXTENSION ".gtp"
@@ -26,6 +25,3 @@ GList * gimp_tool_preset_load (GimpContext *context,
GFile *file,
GInputStream *input,
GError **error);
-
-
-#endif /* __GIMP_TOOL_PRESET_LOAD_H__ */
diff --git a/app/core/gimptoolpreset-save.h b/app/core/gimptoolpreset-save.h
index d78ef64cf5..41f848a7fe 100644
--- a/app/core/gimptoolpreset-save.h
+++ b/app/core/gimptoolpreset-save.h
@@ -15,14 +15,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_PRESET_SAVE_H__
-#define __GIMP_TOOL_PRESET_SAVE_H__
+#pragma once
/* don't call this function directly, use gimp_data_save() instead */
gboolean gimp_tool_preset_save (GimpData *data,
GOutputStream *output,
GError **error);
-
-
-#endif /* __GIMP_TOOL_PRESET_SAVE_H__ */
diff --git a/app/core/gimptoolpreset.h b/app/core/gimptoolpreset.h
index bf2cceb6ca..822bf6d23d 100644
--- a/app/core/gimptoolpreset.h
+++ b/app/core/gimptoolpreset.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_PRESET_H__
-#define __GIMP_TOOL_PRESET_H__
-
+#pragma once
#include "gimpdata.h"
@@ -62,6 +60,3 @@ GimpData * gimp_tool_preset_new (GimpContext *context,
const gchar *unused);
GimpContextPropMask gimp_tool_preset_get_prop_mask (GimpToolPreset *preset);
-
-
-#endif /* __GIMP_TOOL_PRESET_H__ */
diff --git a/app/core/gimptreehandler.h b/app/core/gimptreehandler.h
index 27497c4fe1..572437941d 100644
--- a/app/core/gimptreehandler.h
+++ b/app/core/gimptreehandler.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TREE_HANDLER_H__
-#define __GIMP_TREE_HANDLER_H__
-
+#pragma once
#include "core/gimpobject.h"
@@ -59,6 +57,3 @@ GimpTreeHandler * gimp_tree_handler_connect (GimpContainer *container,
GCallback callback,
gpointer user_data);
void gimp_tree_handler_disconnect (GimpTreeHandler *handler);
-
-
-#endif /* __GIMP_TREE_HANDLER_H__ */
diff --git a/app/core/gimptreeproxy.h b/app/core/gimptreeproxy.h
index 8ae39f8173..4ad95705b6 100644
--- a/app/core/gimptreeproxy.h
+++ b/app/core/gimptreeproxy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TREE_PROXY_H__
-#define __GIMP_TREE_PROXY_H__
-
+#pragma once
#include "gimplist.h"
@@ -61,6 +59,3 @@ GimpContainer * gimp_tree_proxy_get_container (GimpTreeProxy *tree_proxy);
void gimp_tree_proxy_set_flat (GimpTreeProxy *tree_proxy,
gboolean flat);
gboolean gimp_tree_proxy_get_flat (GimpTreeProxy *tree_proxy);
-
-
-#endif /* __GIMP_TREE_PROXY_H__ */
diff --git a/app/core/gimptriviallycancelablewaitable.h b/app/core/gimptriviallycancelablewaitable.h
index bb09a529ef..2f6df81385 100644
--- a/app/core/gimptriviallycancelablewaitable.h
+++ b/app/core/gimptriviallycancelablewaitable.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TRIVIALLY_CANCELABLE_WAITABLE_H__
-#define __GIMP_TRIVIALLY_CANCELABLE_WAITABLE_H__
-
+#pragma once
#include "gimpuncancelablewaitable.h"
@@ -52,6 +50,3 @@ struct _GimpTriviallyCancelableWaitableClass
GType gimp_trivially_cancelable_waitable_get_type (void) G_GNUC_CONST;
GimpWaitable * gimp_trivially_cancelable_waitable_new (GimpWaitable *waitable);
-
-
-#endif /* __GIMP_TRIVIALLY_CANCELABLE_WAITABLE_H__ */
diff --git a/app/core/gimpuncancelablewaitable.h b/app/core/gimpuncancelablewaitable.h
index 90b26ff718..28f28149f6 100644
--- a/app/core/gimpuncancelablewaitable.h
+++ b/app/core/gimpuncancelablewaitable.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_UNCANCELABLE_WAITABLE_H__
-#define __GIMP_UNCANCELABLE_WAITABLE_H__
+#pragma once
#define GIMP_TYPE_UNCANCELABLE_WAITABLE (gimp_uncancelable_waitable_get_type ())
@@ -49,6 +48,3 @@ struct _GimpUncancelableWaitableClass
GType gimp_uncancelable_waitable_get_type (void) G_GNUC_CONST;
GimpWaitable * gimp_uncancelable_waitable_new (GimpWaitable *waitable);
-
-
-#endif /* __GIMP_UNCANCELABLE_WAITABLE_H__ */
diff --git a/app/core/gimpundo.h b/app/core/gimpundo.h
index 03d03c2113..504f3c94d0 100644
--- a/app/core/gimpundo.h
+++ b/app/core/gimpundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_UNDO_H__
-#define __GIMP_UNDO_H__
-
+#pragma once
#include "gimpviewable.h"
@@ -94,6 +92,3 @@ const gchar * gimp_undo_type_to_name (GimpUndoType type);
gboolean gimp_undo_is_weak (GimpUndo *undo);
gint gimp_undo_get_age (GimpUndo *undo);
void gimp_undo_reset_age (GimpUndo *undo);
-
-
-#endif /* __GIMP_UNDO_H__ */
diff --git a/app/core/gimpundostack.h b/app/core/gimpundostack.h
index 8432df077c..ea63c42999 100644
--- a/app/core/gimpundostack.h
+++ b/app/core/gimpundostack.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_UNDO_STACK_H__
-#define __GIMP_UNDO_STACK_H__
-
+#pragma once
#include "gimpundo.h"
@@ -59,6 +57,3 @@ GimpUndo * gimp_undo_stack_free_bottom (GimpUndoStack *stack,
GimpUndoMode undo_mode);
GimpUndo * gimp_undo_stack_peek (GimpUndoStack *stack);
gint gimp_undo_stack_get_depth (GimpUndoStack *stack);
-
-
-#endif /* __GIMP_UNDO_STACK_H__ */
diff --git a/app/core/gimpunit.h b/app/core/gimpunit.h
index 28f7fcd55f..9123bf23ef 100644
--- a/app/core/gimpunit.h
+++ b/app/core/gimpunit.h
@@ -15,16 +15,12 @@
* along with this program. If not, see .
*/
-#ifndef __APP_GIMP_UNIT_H__
-#define __APP_GIMP_UNIT_H__
+#pragma once
-GimpUnit * _gimp_unit_new (Gimp *gimp,
- const gchar *name,
- gdouble factor,
- gint digits,
- const gchar *symbol,
- const gchar *abbreviation);
-
-
-#endif /* __APP_GIMP_UNIT_H__ */
+GimpUnit * _gimp_unit_new (Gimp *gimp,
+ const gchar *name,
+ gdouble factor,
+ gint digits,
+ const gchar *symbol,
+ const gchar *abbreviation);
diff --git a/app/core/gimpviewable.h b/app/core/gimpviewable.h
index bbcfeb4343..51f3e0dd39 100644
--- a/app/core/gimpviewable.h
+++ b/app/core/gimpviewable.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_VIEWABLE_H__
-#define __GIMP_VIEWABLE_H__
-
+#pragma once
#include "gimpobject.h"
@@ -204,6 +202,3 @@ void gimp_viewable_set_expanded (GimpViewable *viewable,
gboolean gimp_viewable_is_ancestor (GimpViewable *ancestor,
GimpViewable *descendant);
-
-
-#endif /* __GIMP_VIEWABLE_H__ */
diff --git a/app/core/gimpwaitable.h b/app/core/gimpwaitable.h
index 72a44acff3..ff12bdee83 100644
--- a/app/core/gimpwaitable.h
+++ b/app/core/gimpwaitable.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_WAITABLE_H__
-#define __GIMP_WAITABLE_H__
+#pragma once
#define GIMP_TYPE_WAITABLE (gimp_waitable_get_type ())
@@ -44,6 +43,3 @@ gboolean gimp_waitable_wait_until (GimpWaitable *waitable,
gint64 end_time);
gboolean gimp_waitable_wait_for (GimpWaitable *waitable,
gint64 wait_duration);
-
-
-#endif /* __GIMP_WAITABLE_H__ */
diff --git a/app/dialogs/about-dialog.h b/app/dialogs/about-dialog.h
index 0a929cbe24..a56936b463 100644
--- a/app/dialogs/about-dialog.h
+++ b/app/dialogs/about-dialog.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __ABOUT_DIALOG_H__
-#define __ABOUT_DIALOG_H__
+#pragma once
GtkWidget * about_dialog_create (Gimp *gimp,
GimpCoreConfig *config);
-
-
-#endif /* __ABOUT_DIALOG_H__ */
diff --git a/app/dialogs/action-search-dialog.h b/app/dialogs/action-search-dialog.h
index 7fa3e06ea4..f03dbc6d3a 100644
--- a/app/dialogs/action-search-dialog.h
+++ b/app/dialogs/action-search-dialog.h
@@ -21,9 +21,7 @@
* along with this program. If not, see .
*/
-#ifndef __ACTION_SEARCH_DIALOG_H__
-#define __ACTION_SEARCH_DIALOG_H__
+#pragma once
+
GtkWidget * action_search_dialog_create (Gimp *gimp);
-
-#endif /* __ACTION_SEARCH_DIALOG_H__ */
diff --git a/app/dialogs/channel-options-dialog.h b/app/dialogs/channel-options-dialog.h
index e74b85b48f..437803d3b1 100644
--- a/app/dialogs/channel-options-dialog.h
+++ b/app/dialogs/channel-options-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __CHANNEL_OPTIONS_DIALOG_H__
-#define __CHANNEL_OPTIONS_DIALOG_H__
+#pragma once
typedef void (* GimpChannelOptionsCallback) (GtkWidget *dialog,
@@ -55,6 +54,3 @@ GtkWidget * channel_options_dialog_new (GimpImage *image,
gboolean channel_lock_visibility,
GimpChannelOptionsCallback callback,
gpointer user_data);
-
-
-#endif /* __CHANNEL_OPTIONS_DIALOG_H__ */
diff --git a/app/dialogs/color-profile-dialog.h b/app/dialogs/color-profile-dialog.h
index 5f3921d45b..17b8c31221 100644
--- a/app/dialogs/color-profile-dialog.h
+++ b/app/dialogs/color-profile-dialog.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __COLOR_PROFILE_DIALOG_H__
-#define __COLOR_PROFILE_DIALOG_H__
+#pragma once
typedef enum
@@ -51,6 +50,3 @@ GtkWidget * color_profile_dialog_new (ColorProfileDialogType dialog_type,
gboolean bpc,
GimpColorProfileCallback callback,
gpointer user_data);
-
-
-#endif /* __COLOR_PROFILE_DIALOG_H__ */
diff --git a/app/dialogs/color-profile-import-dialog.h b/app/dialogs/color-profile-import-dialog.h
index d5dc588bd6..04aa2f27b3 100644
--- a/app/dialogs/color-profile-import-dialog.h
+++ b/app/dialogs/color-profile-import-dialog.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __COLOR_PROFILE_IMPORT_DIALOG_H__
-#define __COLOR_PROFILE_IMPORT_DIALOG_H__
+#pragma once
GimpColorProfilePolicy
@@ -30,6 +29,3 @@ color_profile_import_dialog_run (GimpImage *image,
GimpColorRenderingIntent *intent,
gboolean *bpc,
gboolean *dont_ask);
-
-
-#endif /* __COLOR_PROFILE_IMPORT_DIALOG_H__ */
diff --git a/app/dialogs/convert-indexed-dialog.h b/app/dialogs/convert-indexed-dialog.h
index df0ca5054b..c7a6a84fbb 100644
--- a/app/dialogs/convert-indexed-dialog.h
+++ b/app/dialogs/convert-indexed-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __CONVERT_INDEXED_DIALOG_H__
-#define __CONVERT_INDEXED_DIALOG_H__
+#pragma once
typedef void (* GimpConvertIndexedCallback) (GtkWidget *dialog,
@@ -43,6 +42,3 @@ GtkWidget * convert_indexed_dialog_new (GimpImage *image,
GimpPalette *custom_palette,
GimpConvertIndexedCallback callback,
gpointer user_data);
-
-
-#endif /* __CONVERT_INDEXED_DIALOG_H__ */
diff --git a/app/dialogs/convert-precision-dialog.h b/app/dialogs/convert-precision-dialog.h
index 7d4ebcd269..746881d700 100644
--- a/app/dialogs/convert-precision-dialog.h
+++ b/app/dialogs/convert-precision-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __CONVERT_PRECISION_DIALOG_H__
-#define __CONVERT_PRECISION_DIALOG_H__
+#pragma once
/* Don't offer dithering when converting down to more than this
@@ -45,6 +44,3 @@ GtkWidget * convert_precision_dialog_new (GimpImage *image,
GeglDitherMethod channel_dither_method,
GimpConvertPrecisionCallback callback,
gpointer user_data);
-
-
-#endif /* __CONVERT_PRECISION_DIALOG_H__ */
diff --git a/app/dialogs/data-delete-dialog.h b/app/dialogs/data-delete-dialog.h
index 1b41a964b6..6112b37234 100644
--- a/app/dialogs/data-delete-dialog.h
+++ b/app/dialogs/data-delete-dialog.h
@@ -15,14 +15,10 @@
* along with this program. If not, see .
*/
-#ifndef __DATA_DELETE_DIALOG_H__
-#define __DATA_DELETE_DIALOG_H__
+#pragma once
GtkWidget * data_delete_dialog_new (GimpDataFactory *factory,
GimpData *data,
GimpContext *context,
GtkWidget *parent);
-
-
-#endif /* __DATA_DELETE_DIALOG_H__ */
diff --git a/app/dialogs/dialogs-constructors.h b/app/dialogs/dialogs-constructors.h
index a12332b4d7..daed8674ea 100644
--- a/app/dialogs/dialogs-constructors.h
+++ b/app/dialogs/dialogs-constructors.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __DIALOGS_CONSTRUCTORS_H__
-#define __DIALOGS_CONSTRUCTORS_H__
+#pragma once
/* toplevel dialogs */
@@ -307,6 +306,3 @@ GtkWidget * dialogs_tool_preset_editor_get (GimpDialogFactory *factory,
GimpContext *context,
GimpUIManager *ui_manager,
gint view_size);
-
-
-#endif /* __DIALOGS_CONSTRUCTORS_H__ */
diff --git a/app/dialogs/dialogs-types.h b/app/dialogs/dialogs-types.h
index 0972d8cb13..d9a8508974 100644
--- a/app/dialogs/dialogs-types.h
+++ b/app/dialogs/dialogs-types.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __DIALOGS_TYPES_H__
-#define __DIALOGS_TYPES_H__
-
+#pragma once
#include "display/display-types.h"
@@ -32,6 +30,3 @@ typedef void (* GimpScaleCallback) (GtkWidget *dialog,
gdouble yresolution,
GimpUnit *resolution_unit,
gpointer user_data);
-
-
-#endif /* __DIALOGS_TYPES_H__ */
diff --git a/app/dialogs/dialogs.h b/app/dialogs/dialogs.h
index 6ffe780407..e6d563d7a0 100644
--- a/app/dialogs/dialogs.h
+++ b/app/dialogs/dialogs.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __DIALOGS_H__
-#define __DIALOGS_H__
+#pragma once
extern GimpDialogFactory *global_dialog_factory;
@@ -44,6 +43,3 @@ void dialogs_detach_dialog (GObject *attach_object,
GtkWidget *dialog);
void dialogs_destroy_dialog (GObject *attach_object,
const gchar *attach_key);
-
-
-#endif /* __DIALOGS_H__ */
diff --git a/app/dialogs/extensions-dialog.h b/app/dialogs/extensions-dialog.h
index b63072e306..d680100be1 100644
--- a/app/dialogs/extensions-dialog.h
+++ b/app/dialogs/extensions-dialog.h
@@ -18,11 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __EXTENSIONS_DIALOG_H__
-#define __EXTENSIONS_DIALOG_H__
+#pragma once
GtkWidget * extensions_dialog_new (Gimp *gimp);
-
-
-#endif /* __EXTENSIONS_DIALOG_H__ */
diff --git a/app/dialogs/file-open-dialog.h b/app/dialogs/file-open-dialog.h
index fba4896f60..889c4b1765 100644
--- a/app/dialogs/file-open-dialog.h
+++ b/app/dialogs/file-open-dialog.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_OPEN_DIALOG_H__
-#define __FILE_OPEN_DIALOG_H__
+#pragma once
GtkWidget * file_open_dialog_new (Gimp *gimp);
-
-
-#endif /* __FILE_OPEN_DIALOG_H__ */
diff --git a/app/dialogs/file-open-location-dialog.h b/app/dialogs/file-open-location-dialog.h
index b2926cd3c5..5d5e8cadd7 100644
--- a/app/dialogs/file-open-location-dialog.h
+++ b/app/dialogs/file-open-location-dialog.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_OPEN_LOCATION_DIALOG_H__
-#define __FILE_OPEN_LOCATION_DIALOG_H__
+#pragma once
GtkWidget * file_open_location_dialog_new (Gimp *gimp);
-
-
-#endif /* __FILE_OPEN_LOCATION_DIALOG_H__ */
diff --git a/app/dialogs/file-save-dialog.h b/app/dialogs/file-save-dialog.h
index 92f69cb5c4..7733333284 100644
--- a/app/dialogs/file-save-dialog.h
+++ b/app/dialogs/file-save-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_SAVE_DIALOG_H__
-#define __FILE_SAVE_DIALOG_H__
+#pragma once
#define FILE_SAVE_RESPONSE_OTHER_DIALOG -23
@@ -36,7 +35,3 @@ gboolean file_save_dialog_save_image (GimpProgress *progress_and_handl
gboolean export_forward,
gboolean xcf_compression,
gboolean verbose_cancel);
-
-
-
-#endif /* __FILE_SAVE_DIALOG_H__ */
diff --git a/app/dialogs/fill-dialog.h b/app/dialogs/fill-dialog.h
index 82f4960516..74c3e8ae2d 100644
--- a/app/dialogs/fill-dialog.h
+++ b/app/dialogs/fill-dialog.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILL_DIALOG_H__
-#define __FILL_DIALOG_H__
+#pragma once
typedef void (* GimpFillCallback) (GtkWidget *dialog,
@@ -40,6 +39,3 @@ GtkWidget * fill_dialog_new (GList *items,
GimpFillOptions *options,
GimpFillCallback callback,
gpointer user_data);
-
-
-#endif /* __FILL_DIALOG_H__ */
diff --git a/app/dialogs/grid-dialog.h b/app/dialogs/grid-dialog.h
index 19670f968b..7048ace433 100644
--- a/app/dialogs/grid-dialog.h
+++ b/app/dialogs/grid-dialog.h
@@ -17,13 +17,9 @@
* along with this program. If not, see .
*/
-#ifndef __GRID_DIALOG_H__
-#define __GRID_DIALOG_H__
+#pragma once
GtkWidget * grid_dialog_new (GimpImage *image,
GimpContext *context,
GtkWidget *parent);
-
-
-#endif /* __GRID_DIALOG_H__ */
diff --git a/app/dialogs/image-merge-layers-dialog.h b/app/dialogs/image-merge-layers-dialog.h
index ee965150ee..e540e0301b 100644
--- a/app/dialogs/image-merge-layers-dialog.h
+++ b/app/dialogs/image-merge-layers-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __IMAGE_MERGE_LAYERS_DIALOG_H__
-#define __IMAGE_MERGE_LAYERS_DIALOG_H__
+#pragma once
typedef void (* GimpMergeLayersCallback) (GtkWidget *dialog,
@@ -37,6 +36,3 @@ GtkWidget *
gboolean discard_invisible,
GimpMergeLayersCallback callback,
gpointer user_data);
-
-
-#endif /* __IMAGE_MERGE_LAYERS_DIALOG_H__ */
diff --git a/app/dialogs/image-new-dialog.h b/app/dialogs/image-new-dialog.h
index e619cb7919..685acbc2fc 100644
--- a/app/dialogs/image-new-dialog.h
+++ b/app/dialogs/image-new-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __IMAGE_NEW_DIALOG_H__
-#define __IMAGE_NEW_DIALOG_H__
+#pragma once
GtkWidget * image_new_dialog_new (GimpContext *context);
@@ -24,6 +23,3 @@ GtkWidget * image_new_dialog_new (GimpContext *context);
void image_new_dialog_set (GtkWidget *dialog,
GimpImage *image,
GimpTemplate *template);
-
-
-#endif /* __IMAGE_NEW_DIALOG_H__ */
diff --git a/app/dialogs/image-properties-dialog.h b/app/dialogs/image-properties-dialog.h
index 57a14ff733..4c76e3a2e1 100644
--- a/app/dialogs/image-properties-dialog.h
+++ b/app/dialogs/image-properties-dialog.h
@@ -18,13 +18,9 @@
* along with this program. If not, see .
*/
-#ifndef __IMAGE_PROPERTIES_DIALOG_H__
-#define __IMAGE_PROPERTIES_DIALOG_H__
+#pragma once
GtkWidget * image_properties_dialog_new (GimpImage *image,
GimpContext *context,
GtkWidget *parent);
-
-
-#endif /* __IMAGE_PROPERTIES_DIALOG_H__ */
diff --git a/app/dialogs/image-scale-dialog.h b/app/dialogs/image-scale-dialog.h
index bbd9ae8c65..9670d3c2ce 100644
--- a/app/dialogs/image-scale-dialog.h
+++ b/app/dialogs/image-scale-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __IMAGE_SCALE_DIALOG_H__
-#define __IMAGE_SCALE_DIALOG_H__
+#pragma once
GtkWidget * image_scale_dialog_new (GimpImage *image,
@@ -26,6 +25,3 @@ GtkWidget * image_scale_dialog_new (GimpImage *image,
GimpInterpolationType interpolation,
GimpScaleCallback callback,
gpointer user_data);
-
-
-#endif /* __IMAGE_SCALE_DIALOG_H__ */
diff --git a/app/dialogs/input-devices-dialog.h b/app/dialogs/input-devices-dialog.h
index 54d50d20ec..a677362fcf 100644
--- a/app/dialogs/input-devices-dialog.h
+++ b/app/dialogs/input-devices-dialog.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __INPUT_DEVICES_DIALOG_H__
-#define __INPUT_DEVICES_DIALOG_H__
+#pragma once
GtkWidget * input_devices_dialog_new (Gimp *gimp);
-
-
-#endif /* __INPUT_DEVICES_DIALOG_H__ */
diff --git a/app/dialogs/item-options-dialog.h b/app/dialogs/item-options-dialog.h
index 15d7b2e205..360fd64a43 100644
--- a/app/dialogs/item-options-dialog.h
+++ b/app/dialogs/item-options-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __ITEM_OPTIONS_DIALOG_H__
-#define __ITEM_OPTIONS_DIALOG_H__
+#pragma once
typedef void (* GimpItemOptionsCallback) (GtkWidget *dialog,
@@ -70,6 +69,3 @@ GtkWidget * item_options_dialog_add_switch (GtkWidget *dialog,
void item_options_dialog_set_switches_visible (GtkWidget *dialog,
gboolean visible);
-
-
-#endif /* __ITEM_OPTIONS_DIALOG_H__ */
diff --git a/app/dialogs/keyboard-shortcuts-dialog.h b/app/dialogs/keyboard-shortcuts-dialog.h
index 3c799125e3..19ea6d4947 100644
--- a/app/dialogs/keyboard-shortcuts-dialog.h
+++ b/app/dialogs/keyboard-shortcuts-dialog.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __KEYBOARD_SHORTCUTS_DIALOG_H__
-#define __KEYBOARD_SHORTCUTS_DIALOG_H__
+#pragma once
GtkWidget * keyboard_shortcuts_dialog_new (Gimp *gimp);
-
-
-#endif /* __KEYBOARD_SHORTCUTS_DIALOG_H__ */
diff --git a/app/dialogs/layer-add-mask-dialog.h b/app/dialogs/layer-add-mask-dialog.h
index c6d79767c2..db8f0c2abe 100644
--- a/app/dialogs/layer-add-mask-dialog.h
+++ b/app/dialogs/layer-add-mask-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __LAYER_ADD_MASK_DIALOG_H__
-#define __LAYER_ADD_MASK_DIALOG_H__
+#pragma once
typedef void (* GimpAddMaskCallback) (GtkWidget *dialog,
@@ -34,6 +33,3 @@ GtkWidget * layer_add_mask_dialog_new (GList *layers,
gboolean invert,
GimpAddMaskCallback callback,
gpointer user_data);
-
-
-#endif /* __LAYER_ADD_MASK_DIALOG_H__ */
diff --git a/app/dialogs/layer-options-dialog.h b/app/dialogs/layer-options-dialog.h
index 0cac5e8013..7eb027f157 100644
--- a/app/dialogs/layer-options-dialog.h
+++ b/app/dialogs/layer-options-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __LAYER_OPTIONS_DIALOG_H__
-#define __LAYER_OPTIONS_DIALOG_H__
+#pragma once
typedef void (* GimpLayerOptionsCallback) (GtkWidget *dialog,
@@ -68,6 +67,3 @@ GtkWidget * layer_options_dialog_new (GimpImage *image,
gboolean layer_lock_alpha,
GimpLayerOptionsCallback callback,
gpointer user_data);
-
-
-#endif /* __LAYER_OPTIONS_DIALOG_H__ */
diff --git a/app/dialogs/metadata-rotation-import-dialog.h b/app/dialogs/metadata-rotation-import-dialog.h
index fc3b4bbbde..e69a476eb0 100644
--- a/app/dialogs/metadata-rotation-import-dialog.h
+++ b/app/dialogs/metadata-rotation-import-dialog.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __METADATA_ROTATION_IMPORT_DIALOG_H__
-#define __METADATA_ROTATION_IMPORT_DIALOG_H__
+#pragma once
GimpMetadataRotationPolicy
@@ -27,6 +26,3 @@ metadata_rotation_import_dialog_run (GimpImage *image,
GimpContext *context,
GtkWidget *parent,
gboolean *dont_ask);
-
-
-#endif /* __METADATA_ROTATION_IMPORT_DIALOG_H__*/
diff --git a/app/dialogs/module-dialog.h b/app/dialogs/module-dialog.h
index 17aaef0f63..57677afc23 100644
--- a/app/dialogs/module-dialog.h
+++ b/app/dialogs/module-dialog.h
@@ -18,10 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __MODULE_DIALOG_H__
+#pragma once
GtkWidget * module_dialog_new (Gimp *gimp);
-
-
-#endif /* __MODULE_DIALOG_H__ */
diff --git a/app/dialogs/palette-import-dialog.h b/app/dialogs/palette-import-dialog.h
index baa5677c27..a064860ef5 100644
--- a/app/dialogs/palette-import-dialog.h
+++ b/app/dialogs/palette-import-dialog.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PALETTE_IMPORT_DIALOG_H__
-#define __PALETTE_IMPORT_DIALOG_H__
+#pragma once
GtkWidget * palette_import_dialog_new (GimpContext *context);
-
-
-#endif /* __PALETTE_IMPORT_DIALOG_H__ */
diff --git a/app/dialogs/path-export-dialog.h b/app/dialogs/path-export-dialog.h
index 91a7b699e8..6fdac7d0b8 100644
--- a/app/dialogs/path-export-dialog.h
+++ b/app/dialogs/path-export-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PATH_EXPORT_DIALOG_H__
-#define __PATH_EXPORT_DIALOG_H__
+#pragma once
typedef void (* GimpPathExportCallback) (GtkWidget *dialog,
@@ -33,6 +32,3 @@ GtkWidget * path_export_dialog_new (GimpImage *image,
gboolean active_only,
GimpPathExportCallback callback,
gpointer user_data);
-
-
-#endif /* __PATH_EXPORT_DIALOG_H__ */
diff --git a/app/dialogs/path-import-dialog.h b/app/dialogs/path-import-dialog.h
index 6ed78c3997..0949b7733b 100644
--- a/app/dialogs/path-import-dialog.h
+++ b/app/dialogs/path-import-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PATH_IMPORT_DIALOG_H__
-#define __PATH_IMPORT_DIALOG_H__
+#pragma once
typedef void (* GimpPathImportCallback) (GtkWidget *dialog,
@@ -35,6 +34,3 @@ GtkWidget * path_import_dialog_new (GimpImage *image,
gboolean scale_paths,
GimpPathImportCallback callback,
gpointer user_data);
-
-
-#endif /* __PATH_IMPORT_DIALOG_H__ */
diff --git a/app/dialogs/path-options-dialog.h b/app/dialogs/path-options-dialog.h
index ba0916b7a8..a5494de439 100644
--- a/app/dialogs/path-options-dialog.h
+++ b/app/dialogs/path-options-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PATH_OPTIONS_DIALOG_H__
-#define __PATH_OPTIONS_DIALOG_H__
+#pragma once
typedef void (* GimpPathOptionsCallback) (GtkWidget *dialog,
@@ -49,6 +48,3 @@ GtkWidget * path_options_dialog_new (GimpImage *image,
gboolean path_lock_visibility,
GimpPathOptionsCallback callback,
gpointer user_data);
-
-
-#endif /* __PATH_OPTIONS_DIALOG_H__ */
diff --git a/app/dialogs/preferences-dialog-utils.h b/app/dialogs/preferences-dialog-utils.h
index c18ad02de7..635e969bcf 100644
--- a/app/dialogs/preferences-dialog-utils.h
+++ b/app/dialogs/preferences-dialog-utils.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PREFERENCES_DIALOG_UTILS_H__
-#define __PREFERENCES_DIALOG_UTILS_H__
+#pragma once
#define PREFS_COLOR_BUTTON_WIDTH 40
@@ -155,5 +154,3 @@ void prefs_gui_config_notify_icon_size (GObject *config,
GtkRange *range);
void prefs_icon_size_value_changed (GtkRange *range,
GimpGuiConfig *config);
-
-#endif /* __PREFERENCES_DIALOG_H__ */
diff --git a/app/dialogs/preferences-dialog.h b/app/dialogs/preferences-dialog.h
index 899f2938f2..6cfde033bc 100644
--- a/app/dialogs/preferences-dialog.h
+++ b/app/dialogs/preferences-dialog.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PREFERENCES_DIALOG_H__
-#define __PREFERENCES_DIALOG_H__
+#pragma once
GtkWidget * preferences_dialog_create (Gimp *gimp);
-
-
-#endif /* __PREFERENCES_DIALOG_H__ */
diff --git a/app/dialogs/print-size-dialog.h b/app/dialogs/print-size-dialog.h
index 75a80535b4..e6eb0ec75c 100644
--- a/app/dialogs/print-size-dialog.h
+++ b/app/dialogs/print-size-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PRINT_SIZE_DIALOG_H__
-#define __PRINT_SIZE_DIALOG_H__
+#pragma once
typedef void (* GimpResolutionCallback) (GtkWidget *dialog,
@@ -36,6 +35,3 @@ GtkWidget * print_size_dialog_new (GimpImage *image,
const gchar *help_id,
GimpResolutionCallback callback,
gpointer user_data);
-
-
-#endif /* __PRINT_SIZE_DIALOG_H__ */
diff --git a/app/dialogs/quit-dialog.h b/app/dialogs/quit-dialog.h
index 17609766ec..4432da9604 100644
--- a/app/dialogs/quit-dialog.h
+++ b/app/dialogs/quit-dialog.h
@@ -17,12 +17,8 @@
* along with this program. If not, see .
*/
-#ifndef __QUIT_DIALOG_H__
-#define __QUIT_DIALOG_H__
+#pragma once
GtkWidget * quit_dialog_new (Gimp *gimp);
GtkWidget * close_all_dialog_new (Gimp *gimp);
-
-
-#endif /* __QUIT_DIALOG_H__ */
diff --git a/app/dialogs/resize-dialog.h b/app/dialogs/resize-dialog.h
index 61e22e70b4..9679fa9369 100644
--- a/app/dialogs/resize-dialog.h
+++ b/app/dialogs/resize-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __RESIZE_DIALOG_H__
-#define __RESIZE_DIALOG_H__
+#pragma once
typedef void (* GimpResizeCallback) (GtkWidget *dialog,
@@ -49,6 +48,3 @@ GtkWidget * resize_dialog_new (GimpViewable *viewable,
gboolean resize_text_layers,
GimpResizeCallback callback,
gpointer user_data);
-
-
-#endif /* __RESIZE_DIALOG_H__ */
diff --git a/app/dialogs/resolution-calibrate-dialog.h b/app/dialogs/resolution-calibrate-dialog.h
index 84a60dc5ac..1cf0985a11 100644
--- a/app/dialogs/resolution-calibrate-dialog.h
+++ b/app/dialogs/resolution-calibrate-dialog.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __RESOLUTION_CALIBRATE_DIALOG_H__
-#define __RESOLUTION_CALIBRATE_DIALOG_H__
+#pragma once
void resolution_calibrate_dialog (GtkWidget *resolution_entry,
const gchar *icon_name);
-
-
-#endif /* __RESOLUTION_CALIBRATE_DIALOG_H__ */
diff --git a/app/dialogs/scale-dialog.h b/app/dialogs/scale-dialog.h
index 5f0177736f..3ed3d11d79 100644
--- a/app/dialogs/scale-dialog.h
+++ b/app/dialogs/scale-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __SCALE_DIALOG_H__
-#define __SCALE_DIALOG_H__
+#pragma once
GtkWidget * scale_dialog_new (GimpViewable *viewable,
@@ -30,6 +29,3 @@ GtkWidget * scale_dialog_new (GimpViewable *viewable,
GimpInterpolationType interpolation,
GimpScaleCallback callback,
gpointer user_data);
-
-
-#endif /* __SCALE_DIALOG_H__ */
diff --git a/app/dialogs/stroke-dialog.h b/app/dialogs/stroke-dialog.h
index a122494b3d..2c464bd139 100644
--- a/app/dialogs/stroke-dialog.h
+++ b/app/dialogs/stroke-dialog.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __STROKE_DIALOG_H__
-#define __STROKE_DIALOG_H__
+#pragma once
typedef void (* GimpStrokeCallback) (GtkWidget *dialog,
@@ -39,6 +38,3 @@ GtkWidget * stroke_dialog_new (GList *items,
GimpStrokeOptions *options,
GimpStrokeCallback callback,
gpointer user_data);
-
-
-#endif /* __STROKE_DIALOG_H__ */
diff --git a/app/dialogs/template-options-dialog.h b/app/dialogs/template-options-dialog.h
index 633489e752..c716ca0c77 100644
--- a/app/dialogs/template-options-dialog.h
+++ b/app/dialogs/template-options-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TEMPLATE_OPTIONS_DIALOG_H__
-#define __TEMPLATE_OPTIONS_DIALOG_H__
+#pragma once
typedef void (* GimpTemplateOptionsCallback) (GtkWidget *dialog,
@@ -36,6 +35,3 @@ GtkWidget * template_options_dialog_new (GimpTemplate *template,
const gchar *help_id,
GimpTemplateOptionsCallback callback,
gpointer user_data);
-
-
-#endif /* __TEMPLATE_OPTIONS_DIALOG_H__ */
diff --git a/app/dialogs/tips-dialog.h b/app/dialogs/tips-dialog.h
index e594212ecf..3780555b77 100644
--- a/app/dialogs/tips-dialog.h
+++ b/app/dialogs/tips-dialog.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TIPS_DIALOG_H__
-#define __TIPS_DIALOG_H__
+#pragma once
GtkWidget * tips_dialog_create (Gimp *gimp);
-
-
-#endif /* __TIPS_DIALOG_H__ */
diff --git a/app/dialogs/tips-parser.h b/app/dialogs/tips-parser.h
index 4d9fab78ed..7bb97d86c2 100644
--- a/app/dialogs/tips-parser.h
+++ b/app/dialogs/tips-parser.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __TIPS_PARSER_H__
-#define __TIPS_PARSER_H__
+#pragma once
typedef struct _GimpTip GimpTip;
@@ -39,6 +38,3 @@ void gimp_tip_free (GimpTip *tip);
GList * gimp_tips_from_file (GFile *file,
GError **error);
void gimp_tips_free (GList *tips);
-
-
-#endif /* __TIPS_PARSER_H__ */
diff --git a/app/dialogs/user-install-dialog.h b/app/dialogs/user-install-dialog.h
index baa2bdad15..271f1cf8e1 100644
--- a/app/dialogs/user-install-dialog.h
+++ b/app/dialogs/user-install-dialog.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __USER_INSTALL_DIALOG_H__
-#define __USER_INSTALL_DIALOG_H__
+#pragma once
gboolean user_install_dialog_run (GimpUserInstall *install);
-
-
-#endif /* __USER_INSTALL_DIALOG_H__ */
diff --git a/app/dialogs/welcome-dialog.h b/app/dialogs/welcome-dialog.h
index 9e6d1a8e09..8282b0fe54 100644
--- a/app/dialogs/welcome-dialog.h
+++ b/app/dialogs/welcome-dialog.h
@@ -18,12 +18,8 @@
* along with this program. If not, see .
*/
-#ifndef __WELCOME_DIALOG_H__
-#define __WELCOME_DIALOG_H__
+#pragma once
GtkWidget * welcome_dialog_create (Gimp *gimp,
gboolean show_welcome_page);
-
-
-#endif /* __WELCOME_DIALOG_H__ */
diff --git a/app/display/display-enums.h b/app/display/display-enums.h
index 81357d7987..fd7839ab94 100644
--- a/app/display/display-enums.h
+++ b/app/display/display-enums.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __DISPLAY_ENUMS_H__
-#define __DISPLAY_ENUMS_H__
+#pragma once
#define GIMP_TYPE_BUTTON_PRESS_TYPE (gimp_button_press_type_get_type ())
@@ -295,6 +294,3 @@ typedef enum /*< pdb-skip, skip >*/
GIMP_HIT_INDIRECT,
GIMP_HIT_DIRECT
} GimpHit;
-
-
-#endif /* __DISPLAY_ENUMS_H__ */
diff --git a/app/display/display-types.h b/app/display/display-types.h
index 04f2e8d237..42dd7ef189 100644
--- a/app/display/display-types.h
+++ b/app/display/display-types.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __DISPLAY_TYPES_H__
-#define __DISPLAY_TYPES_H__
-
+#pragma once
#include "propgui/propgui-types.h"
@@ -49,6 +47,3 @@ typedef struct _GimpDisplayXfer GimpDisplayXfer;
typedef struct _Selection Selection;
typedef struct _GimpModifiersManager GimpModifiersManager;
-
-
-#endif /* __DISPLAY_TYPES_H__ */
diff --git a/app/display/gimpcanvas-style.h b/app/display/gimpcanvas-style.h
index 72f6457972..3fb17cce97 100644
--- a/app/display/gimpcanvas-style.h
+++ b/app/display/gimpcanvas-style.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_STYLE_H__
-#define __GIMP_CANVAS_STYLE_H__
+#pragma once
void gimp_canvas_styles_init (void);
@@ -79,6 +78,3 @@ void gimp_canvas_set_tool_bg_style (GtkWidget *canvas,
void gimp_canvas_set_tool_fg_style (GtkWidget *canvas,
cairo_t *cr,
gboolean highlight);
-
-
-#endif /* __GIMP_CANVAS_STYLE_H__ */
diff --git a/app/display/gimpcanvas.h b/app/display/gimpcanvas.h
index 30c108930a..553f806380 100644
--- a/app/display/gimpcanvas.h
+++ b/app/display/gimpcanvas.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_H__
-#define __GIMP_CANVAS_H__
-
+#pragma once
#include "widgets/gimpoverlaybox.h"
@@ -76,6 +74,3 @@ PangoLayout * gimp_canvas_get_layout (GimpCanvas *canvas,
void gimp_canvas_set_padding (GimpCanvas *canvas,
GimpCanvasPaddingMode padding_mode,
GeglColor *padding_color);
-
-
-#endif /* __GIMP_CANVAS_H__ */
diff --git a/app/display/gimpcanvasarc.h b/app/display/gimpcanvasarc.h
index 18963520fd..f75baf0f7d 100644
--- a/app/display/gimpcanvasarc.h
+++ b/app/display/gimpcanvasarc.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_ARC_H__
-#define __GIMP_CANVAS_ARC_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -65,5 +63,3 @@ void gimp_canvas_arc_set (GimpCanvasItem *arc,
gdouble radius_y,
gdouble start_angle,
gdouble slice_angle);
-
-#endif /* __GIMP_CANVAS_ARC_H__ */
diff --git a/app/display/gimpcanvasboundary.h b/app/display/gimpcanvasboundary.h
index 527f89ef6d..59a8d09702 100644
--- a/app/display/gimpcanvasboundary.h
+++ b/app/display/gimpcanvasboundary.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_BOUNDARY_H__
-#define __GIMP_CANVAS_BOUNDARY_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -55,6 +53,3 @@ GimpCanvasItem * gimp_canvas_boundary_new (GimpDisplayShell *shell,
GimpMatrix3 *transform,
gdouble offset_x,
gdouble offset_y);
-
-
-#endif /* __GIMP_CANVAS_BOUNDARY_H__ */
diff --git a/app/display/gimpcanvasbufferpreview.h b/app/display/gimpcanvasbufferpreview.h
index 28d8806bad..2f31e38fd4 100644
--- a/app/display/gimpcanvasbufferpreview.h
+++ b/app/display/gimpcanvasbufferpreview.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_BUFFER_PREVIEW_H__
-#define __GIMP_CANVAS_BUFFER_PREVIEW_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -51,6 +49,3 @@ GType gimp_canvas_buffer_preview_get_type (void) G_GNUC_CONST;
GimpCanvasItem * gimp_canvas_buffer_preview_new (GimpDisplayShell *shell,
GeglBuffer *buffer);
-
-
-#endif /* __GIMP_CANVAS_BUFFER_PREVIEW_H__ */
diff --git a/app/display/gimpcanvascanvasboundary.h b/app/display/gimpcanvascanvasboundary.h
index c8fe16f79f..fdaa043ff5 100644
--- a/app/display/gimpcanvascanvasboundary.h
+++ b/app/display/gimpcanvascanvasboundary.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_CANVAS_BOUNDARY_H__
-#define __GIMP_CANVAS_CANVAS_BOUNDARY_H__
-
+#pragma once
#include "gimpcanvasrectangle.h"
@@ -53,6 +51,3 @@ GimpCanvasItem * gimp_canvas_canvas_boundary_new (GimpDisplayShell
void gimp_canvas_canvas_boundary_set_image (GimpCanvasCanvasBoundary *boundary,
GimpImage *image);
-
-
-#endif /* __GIMP_CANVAS_CANVAS_BOUNDARY_H__ */
diff --git a/app/display/gimpcanvascorner.h b/app/display/gimpcanvascorner.h
index 47cc53b1d9..517c08bd81 100644
--- a/app/display/gimpcanvascorner.h
+++ b/app/display/gimpcanvascorner.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_CORNER_H__
-#define __GIMP_CANVAS_CORNER_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -67,6 +65,3 @@ void gimp_canvas_corner_set (GimpCanvasItem *corner,
gint corner_width,
gint corner_height,
gboolean outside);
-
-
-#endif /* __GIMP_CANVAS_CORNER_H__ */
diff --git a/app/display/gimpcanvascursor.h b/app/display/gimpcanvascursor.h
index b518563184..7e0fd3ce6c 100644
--- a/app/display/gimpcanvascursor.h
+++ b/app/display/gimpcanvascursor.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_CURSOR_H__
-#define __GIMP_CANVAS_CURSOR_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -54,6 +52,3 @@ GimpCanvasItem * gimp_canvas_cursor_new (GimpDisplayShell *shell);
void gimp_canvas_cursor_set (GimpCanvasItem *cursor,
gdouble x,
gdouble y);
-
-
-#endif /* __GIMP_CANVAS_CURSOR_H__ */
diff --git a/app/display/gimpcanvasgrid.h b/app/display/gimpcanvasgrid.h
index 391d2ea507..f7aea6774d 100644
--- a/app/display/gimpcanvasgrid.h
+++ b/app/display/gimpcanvasgrid.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_GRID_H__
-#define __GIMP_CANVAS_GRID_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -51,6 +49,3 @@ GType gimp_canvas_grid_get_type (void) G_GNUC_CONST;
GimpCanvasItem * gimp_canvas_grid_new (GimpDisplayShell *shell,
GimpGrid *grid);
-
-
-#endif /* __GIMP_CANVAS_GRID_H__ */
diff --git a/app/display/gimpcanvasgroup.h b/app/display/gimpcanvasgroup.h
index d2fb9cc8bf..d496139dac 100644
--- a/app/display/gimpcanvasgroup.h
+++ b/app/display/gimpcanvasgroup.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_GROUP_H__
-#define __GIMP_CANVAS_GROUP_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -63,6 +61,3 @@ void gimp_canvas_group_set_group_stroking (GimpCanvasGroup *group,
gboolean group_stroking);
void gimp_canvas_group_set_group_filling (GimpCanvasGroup *group,
gboolean group_filling);
-
-
-#endif /* __GIMP_CANVAS_GROUP_H__ */
diff --git a/app/display/gimpcanvasguide.h b/app/display/gimpcanvasguide.h
index 54b1696480..7e6fd31376 100644
--- a/app/display/gimpcanvasguide.h
+++ b/app/display/gimpcanvasguide.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_GUIDE_H__
-#define __GIMP_CANVAS_GUIDE_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -57,6 +55,3 @@ GimpCanvasItem * gimp_canvas_guide_new (GimpDisplayShell *shell,
void gimp_canvas_guide_set (GimpCanvasItem *guide,
GimpOrientationType orientation,
gint position);
-
-
-#endif /* __GIMP_CANVAS_GUIDE_H__ */
diff --git a/app/display/gimpcanvashandle.h b/app/display/gimpcanvashandle.h
index 0dea9572de..7af81948d0 100644
--- a/app/display/gimpcanvashandle.h
+++ b/app/display/gimpcanvashandle.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_HANDLE_H__
-#define __GIMP_CANVAS_HANDLE_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -87,6 +85,3 @@ void gimp_canvas_handle_set_size (GimpCanvasItem *handle,
void gimp_canvas_handle_set_angles (GimpCanvasItem *handle,
gdouble start_handle,
gdouble slice_handle);
-
-
-#endif /* __GIMP_CANVAS_HANDLE_H__ */
diff --git a/app/display/gimpcanvasitem-utils.h b/app/display/gimpcanvasitem-utils.h
index 6c0c84edcb..52b7fbc9f1 100644
--- a/app/display/gimpcanvasitem-utils.h
+++ b/app/display/gimpcanvasitem-utils.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_ITEM_UTILS_H__
-#define __GIMP_CANVAS_ITEM_UTILS_H__
+#pragma once
gboolean gimp_canvas_item_on_handle (GimpCanvasItem *item,
@@ -76,6 +75,3 @@ void gimp_canvas_item_shift_to_center (GimpHandleAnchor anchor,
gint height,
gdouble *shifted_x,
gdouble *shifted_y);
-
-
-#endif /* __GIMP_CANVAS_ITEM_UTILS_H__ */
diff --git a/app/display/gimpcanvasitem.h b/app/display/gimpcanvasitem.h
index 20042601cc..41b8d759cd 100644
--- a/app/display/gimpcanvasitem.h
+++ b/app/display/gimpcanvasitem.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_ITEM_H__
-#define __GIMP_CANVAS_ITEM_H__
-
+#pragma once
#include "core/gimpobject.h"
@@ -142,6 +140,3 @@ void _gimp_canvas_item_stroke (GimpCanvasItem *item,
cairo_t *cr);
void _gimp_canvas_item_fill (GimpCanvasItem *item,
cairo_t *cr);
-
-
-#endif /* __GIMP_CANVAS_ITEM_H__ */
diff --git a/app/display/gimpcanvaslayerboundary.h b/app/display/gimpcanvaslayerboundary.h
index 3da09b2a0c..d8a164efcc 100644
--- a/app/display/gimpcanvaslayerboundary.h
+++ b/app/display/gimpcanvaslayerboundary.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_LAYER_BOUNDARY_H__
-#define __GIMP_CANVAS_LAYER_BOUNDARY_H__
-
+#pragma once
#include "gimpcanvasrectangle.h"
@@ -53,6 +51,3 @@ GimpCanvasItem * gimp_canvas_layer_boundary_new (GimpDisplayShell
void gimp_canvas_layer_boundary_set_layers (GimpCanvasLayerBoundary *boundary,
GList *layers);
-
-
-#endif /* __GIMP_CANVAS_LAYER_BOUNDARY_H__ */
diff --git a/app/display/gimpcanvaslimit.h b/app/display/gimpcanvaslimit.h
index cf6ffc8ea5..2e94871db4 100644
--- a/app/display/gimpcanvaslimit.h
+++ b/app/display/gimpcanvaslimit.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_LIMIT_H__
-#define __GIMP_CANVAS_LIMIT_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -79,6 +77,3 @@ void gimp_canvas_limit_center_point (GimpCanvasLimit *limit,
gdouble y,
gdouble *cx,
gdouble *cy);
-
-
-#endif /* __GIMP_CANVAS_LIMIT_H__ */
diff --git a/app/display/gimpcanvasline.h b/app/display/gimpcanvasline.h
index 6f3f5f20a4..1294f11e88 100644
--- a/app/display/gimpcanvasline.h
+++ b/app/display/gimpcanvasline.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_LINE_H__
-#define __GIMP_CANVAS_LINE_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -60,6 +58,3 @@ void gimp_canvas_line_set (GimpCanvasItem *line,
gdouble y1,
gdouble x2,
gdouble y2);
-
-
-#endif /* __GIMP_CANVAS_LINE_H__ */
diff --git a/app/display/gimpcanvaspassepartout.h b/app/display/gimpcanvaspassepartout.h
index 7356e3a146..d939177dde 100644
--- a/app/display/gimpcanvaspassepartout.h
+++ b/app/display/gimpcanvaspassepartout.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_PASSE_PARTOUT_H__
-#define __GIMP_CANVAS_PASSE_PARTOUT_H__
-
+#pragma once
#include "gimpcanvasrectangle.h"
@@ -54,6 +52,3 @@ GimpCanvasItem * gimp_canvas_passe_partout_new (GimpDisplayShell *shell,
gdouble y,
gdouble width,
gdouble height);
-
-
-#endif /* __GIMP_CANVAS_PASSE_PARTOUT_H__ */
diff --git a/app/display/gimpcanvaspath.h b/app/display/gimpcanvaspath.h
index 03fbb019fc..d9bb5ac5a0 100644
--- a/app/display/gimpcanvaspath.h
+++ b/app/display/gimpcanvaspath.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_PATH_H__
-#define __GIMP_CANVAS_PATH_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -58,6 +56,3 @@ GimpCanvasItem * gimp_canvas_path_new (GimpDisplayShell *shell,
void gimp_canvas_path_set (GimpCanvasItem *path,
const GimpBezierDesc *bezier);
-
-
-#endif /* __GIMP_CANVAS_PATH_H__ */
diff --git a/app/display/gimpcanvaspen.h b/app/display/gimpcanvaspen.h
index 3380790c84..8c4caaf3aa 100644
--- a/app/display/gimpcanvaspen.h
+++ b/app/display/gimpcanvaspen.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_PEN_H__
-#define __GIMP_CANVAS_PEN_H__
-
+#pragma once
#include "gimpcanvaspolygon.h"
@@ -55,6 +53,3 @@ GimpCanvasItem * gimp_canvas_pen_new (GimpDisplayShell *shell,
GimpContext *context,
GimpActiveColor color,
gint width);
-
-
-#endif /* __GIMP_CANVAS_PEN_H__ */
diff --git a/app/display/gimpcanvaspolygon.h b/app/display/gimpcanvaspolygon.h
index f68e36a0eb..6dd17b2c2a 100644
--- a/app/display/gimpcanvaspolygon.h
+++ b/app/display/gimpcanvaspolygon.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_POLYGON_H__
-#define __GIMP_CANVAS_POLYGON_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -63,6 +61,3 @@ GimpCanvasItem * gimp_canvas_polygon_new_from_coords (GimpDisplayShell *shell,
void gimp_canvas_polygon_set_points (GimpCanvasItem *polygon,
const GimpVector2 *points,
gint n_points);
-
-
-#endif /* __GIMP_CANVAS_POLYGON_H__ */
diff --git a/app/display/gimpcanvasprogress.h b/app/display/gimpcanvasprogress.h
index 1f6a9c7803..538c5b1085 100644
--- a/app/display/gimpcanvasprogress.h
+++ b/app/display/gimpcanvasprogress.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_PROGRESS_H__
-#define __GIMP_CANVAS_PROGRESS_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -53,6 +51,3 @@ GimpCanvasItem * gimp_canvas_progress_new (GimpDisplayShell *shell,
GimpHandleAnchor anchor,
gdouble x,
gdouble y);
-
-
-#endif /* __GIMP_CANVAS_PROGRESS_H__ */
diff --git a/app/display/gimpcanvasproxygroup.h b/app/display/gimpcanvasproxygroup.h
index be25787361..927e6804a8 100644
--- a/app/display/gimpcanvasproxygroup.h
+++ b/app/display/gimpcanvasproxygroup.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_PROXY_GROUP_H__
-#define __GIMP_CANVAS_PROXY_GROUP_H__
-
+#pragma once
#include "gimpcanvasgroup.h"
@@ -58,6 +56,3 @@ void gimp_canvas_proxy_group_remove_item (GimpCanvasProxyGroup *grou
gpointer object);
GimpCanvasItem * gimp_canvas_proxy_group_get_item (GimpCanvasProxyGroup *group,
gpointer object);
-
-
-#endif /* __GIMP_CANVAS_PROXY_GROUP_H__ */
diff --git a/app/display/gimpcanvasrectangle.h b/app/display/gimpcanvasrectangle.h
index 6a96c067ac..9150e1927f 100644
--- a/app/display/gimpcanvasrectangle.h
+++ b/app/display/gimpcanvasrectangle.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_RECTANGLE_H__
-#define __GIMP_CANVAS_RECTANGLE_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -61,6 +59,3 @@ void gimp_canvas_rectangle_set (GimpCanvasItem *rectangle,
gdouble y,
gdouble width,
gdouble height);
-
-
-#endif /* __GIMP_CANVAS_RECTANGLE_H__ */
diff --git a/app/display/gimpcanvasrectangleguides.h b/app/display/gimpcanvasrectangleguides.h
index 1d37d15209..3bf057fde7 100644
--- a/app/display/gimpcanvasrectangleguides.h
+++ b/app/display/gimpcanvasrectangleguides.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_RECTANGLE_GUIDES_H__
-#define __GIMP_CANVAS_RECTANGLE_GUIDES_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -64,6 +62,3 @@ void gimp_canvas_rectangle_guides_set (GimpCanvasItem *rectan
gdouble height,
GimpGuidesType type,
gint n_guides);
-
-
-#endif /* __GIMP_CANVAS_RECTANGLE_GUIDES_H__ */
diff --git a/app/display/gimpcanvassamplepoint.h b/app/display/gimpcanvassamplepoint.h
index 00ac0d5967..3ad4deea34 100644
--- a/app/display/gimpcanvassamplepoint.h
+++ b/app/display/gimpcanvassamplepoint.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_SAMPLE_POINT_H__
-#define __GIMP_CANVAS_SAMPLE_POINT_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -58,6 +56,3 @@ GimpCanvasItem * gimp_canvas_sample_point_new (GimpDisplayShell *shell,
void gimp_canvas_sample_point_set (GimpCanvasItem *sample_point,
gint x,
gint y);
-
-
-#endif /* __GIMP_CANVAS_SAMPLE_POINT_H__ */
diff --git a/app/display/gimpcanvastext.h b/app/display/gimpcanvastext.h
index cb19d0890c..ee770de15e 100644
--- a/app/display/gimpcanvastext.h
+++ b/app/display/gimpcanvastext.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMPCANVASTEXT_H__
-#define __GIMPCANVASTEXT_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -54,5 +52,3 @@ GimpCanvasItem * gimp_canvas_text_new (GimpDisplayShell *shell,
gdouble y,
gdouble font_size,
gchar *text);
-
-#endif
diff --git a/app/display/gimpcanvastextcursor.h b/app/display/gimpcanvastextcursor.h
index 210b2a25fb..adee556847 100644
--- a/app/display/gimpcanvastextcursor.h
+++ b/app/display/gimpcanvastextcursor.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_TEXT_CURSOR_H__
-#define __GIMP_CANVAS_TEXT_CURSOR_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -53,6 +51,3 @@ GimpCanvasItem * gimp_canvas_text_cursor_new (GimpDisplayShell *shell,
PangoRectangle *cursor,
gboolean overwrite,
GimpTextDirection direction);
-
-
-#endif /* __GIMP_CANVAS_RECTANGLE_H__ */
diff --git a/app/display/gimpcanvastransformguides.h b/app/display/gimpcanvastransformguides.h
index 4358501581..8084ff7772 100644
--- a/app/display/gimpcanvastransformguides.h
+++ b/app/display/gimpcanvastransformguides.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_TRANSFORM_GUIDES_H__
-#define __GIMP_CANVAS_TRANSFORM_GUIDES_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -68,6 +66,3 @@ void gimp_canvas_transform_guides_set (GimpCanvasItem *guide
GimpGuidesType type,
gint n_guides,
gboolean clip);
-
-
-#endif /* __GIMP_CANVAS_TRANSFORM_GUIDES_H__ */
diff --git a/app/display/gimpcanvastransformpreview.h b/app/display/gimpcanvastransformpreview.h
index a82d50cc4b..cc6ae38bdc 100644
--- a/app/display/gimpcanvastransformpreview.h
+++ b/app/display/gimpcanvastransformpreview.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CANVAS_TRANSFORM_PREVIEW_H__
-#define __GIMP_CANVAS_TRANSFORM_PREVIEW_H__
-
+#pragma once
#include "gimpcanvasitem.h"
@@ -56,6 +54,3 @@ GimpCanvasItem * gimp_canvas_transform_preview_new (GimpDisplayShell *shel
gdouble y1,
gdouble x2,
gdouble y2);
-
-
-#endif /* __GIMP_CANVAS_TRANSFORM_PREVIEW_H__ */
diff --git a/app/display/gimpcursorview.h b/app/display/gimpcursorview.h
index 2cf2ea0bc6..cfb8e17710 100644
--- a/app/display/gimpcursorview.h
+++ b/app/display/gimpcursorview.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CURSOR_VIEW_H__
-#define __GIMP_CURSOR_VIEW_H__
-
+#pragma once
#include "widgets/gimpeditor.h"
@@ -65,6 +63,3 @@ void gimp_cursor_view_update_cursor (GimpCursorView *view,
gdouble x,
gdouble y);
void gimp_cursor_view_clear_cursor (GimpCursorView *view);
-
-
-#endif /* __GIMP_CURSOR_VIEW_H__ */
diff --git a/app/display/gimpdisplay-foreach.h b/app/display/gimpdisplay-foreach.h
index eeb3d47218..6333b6a614 100644
--- a/app/display/gimpdisplay-foreach.h
+++ b/app/display/gimpdisplay-foreach.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_FOREACH_H__
-#define __GIMP_DISPLAY_FOREACH_H__
+#pragma once
gboolean gimp_displays_dirty (Gimp *gimp);
@@ -32,6 +31,3 @@ gint gimp_displays_get_num_visible (Gimp *gimp);
void gimp_displays_set_busy (Gimp *gimp);
void gimp_displays_unset_busy (Gimp *gimp);
gboolean gimp_displays_accept_focus_events (Gimp *gimp);
-
-
-#endif /* __GIMP_DISPLAY_FOREACH_H__ */
diff --git a/app/display/gimpdisplay-handlers.h b/app/display/gimpdisplay-handlers.h
index 34c547c9da..20f119c3c9 100644
--- a/app/display/gimpdisplay-handlers.h
+++ b/app/display/gimpdisplay-handlers.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_HANDLERS_H__
-#define __GIMP_DISPLAY_HANDLERS_H__
+#pragma once
void gimp_display_connect (GimpDisplay *display);
void gimp_display_disconnect (GimpDisplay *display);
-
-
-#endif /* __GIMP_DISPLAY_HANDLERS_H__ */
diff --git a/app/display/gimpdisplay.h b/app/display/gimpdisplay.h
index 21109e384b..a131d7d5fd 100644
--- a/app/display/gimpdisplay.h
+++ b/app/display/gimpdisplay.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_IMPL_H__
-#define __GIMP_DISPLAY_IMPL_H__
-
+#pragma once
#include "core/gimpdisplay.h"
@@ -89,6 +87,3 @@ void gimp_display_update_area (GimpDisplay *display,
void gimp_display_flush (GimpDisplay *display);
void gimp_display_flush_now (GimpDisplay *display);
-
-
-#endif /* __GIMP_DISPLAY_IMPL_H__ */
diff --git a/app/display/gimpdisplayshell-actions.h b/app/display/gimpdisplayshell-actions.h
index 4f06187c83..40a580a415 100644
--- a/app/display/gimpdisplayshell-actions.h
+++ b/app/display/gimpdisplayshell-actions.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_ACTIONS_H__
-#define __GIMP_DISPLAY_SHELL_ACTIONS_H__
+#pragma once
void gimp_display_shell_set_action_sensitive (GimpDisplayShell *shell,
@@ -28,6 +27,3 @@ void gimp_display_shell_set_action_active (GimpDisplayShell *shell,
void gimp_display_shell_set_action_color (GimpDisplayShell *shell,
const gchar *action,
GeglColor *color);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_ACTIONS_H__ */
diff --git a/app/display/gimpdisplayshell-appearance.h b/app/display/gimpdisplayshell-appearance.h
index e91b11e67a..435c4ae74b 100644
--- a/app/display/gimpdisplayshell-appearance.h
+++ b/app/display/gimpdisplayshell-appearance.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_APPEARANCE_H__
-#define __GIMP_DISPLAY_SHELL_APPEARANCE_H__
+#pragma once
void gimp_display_shell_appearance_update (GimpDisplayShell *shell);
@@ -95,6 +94,3 @@ void gimp_display_shell_get_padding (GimpDisplayShell *
void gimp_display_shell_set_padding_in_show_all (GimpDisplayShell *shell,
gboolean keep);
gboolean gimp_display_shell_get_padding_in_show_all (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_APPEARANCE_H__ */
diff --git a/app/display/gimpdisplayshell-autoscroll.h b/app/display/gimpdisplayshell-autoscroll.h
index c030759113..792e5f5a93 100644
--- a/app/display/gimpdisplayshell-autoscroll.h
+++ b/app/display/gimpdisplayshell-autoscroll.h
@@ -15,14 +15,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_AUTOSCROLL_H__
-#define __GIMP_DISPLAY_SHELL_AUTOSCROLL_H__
+#pragma once
void gimp_display_shell_autoscroll_start (GimpDisplayShell *shell,
GdkModifierType state,
GdkEventMotion *mevent);
void gimp_display_shell_autoscroll_stop (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_AUTOSCROLL_H__ */
diff --git a/app/display/gimpdisplayshell-callbacks.h b/app/display/gimpdisplayshell-callbacks.h
index ca09a9afe9..da08372128 100644
--- a/app/display/gimpdisplayshell-callbacks.h
+++ b/app/display/gimpdisplayshell-callbacks.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_CALLBACKS_H__
-#define __GIMP_DISPLAY_SHELL_CALLBACKS_H__
+#pragma once
void gimp_display_shell_canvas_realize (GtkWidget *widget,
@@ -41,6 +40,3 @@ void gimp_display_shell_quick_mask_toggled (GtkWidget *widget,
gboolean gimp_display_shell_navigation_button_press (GtkWidget *widget,
GdkEventButton *bevent,
GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_CALLBACKS_H__ */
diff --git a/app/display/gimpdisplayshell-close.h b/app/display/gimpdisplayshell-close.h
index 3d5565081e..2d36e64c2d 100644
--- a/app/display/gimpdisplayshell-close.h
+++ b/app/display/gimpdisplayshell-close.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_CLOSE_H__
-#define __GIMP_DISPLAY_SHELL_CLOSE_H__
+#pragma once
void gimp_display_shell_close (GimpDisplayShell *shell,
gboolean kill_it);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_CLOSE_H__ */
diff --git a/app/display/gimpdisplayshell-cursor.h b/app/display/gimpdisplayshell-cursor.h
index 8f434c619e..c97570ac05 100644
--- a/app/display/gimpdisplayshell-cursor.h
+++ b/app/display/gimpdisplayshell-cursor.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_CURSOR_H__
-#define __GIMP_DISPLAY_SHELL_CURSOR_H__
+#pragma once
/* functions dealing with the normal windowing system cursor */
@@ -42,6 +41,3 @@ void gimp_display_shell_update_software_cursor (GimpDisplayShell *shell,
gdouble image_x,
gdouble image_y);
void gimp_display_shell_clear_software_cursor (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_CURSOR_H__ */
diff --git a/app/display/gimpdisplayshell-dnd.h b/app/display/gimpdisplayshell-dnd.h
index d1f6e9982b..754c233a05 100644
--- a/app/display/gimpdisplayshell-dnd.h
+++ b/app/display/gimpdisplayshell-dnd.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_DND_H__
-#define __GIMP_DISPLAY_SHELL_DND_H__
+#pragma once
void gimp_display_shell_dnd_init (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_DND_H__ */
diff --git a/app/display/gimpdisplayshell-draw.h b/app/display/gimpdisplayshell-draw.h
index 148ee2a4f3..a3d4680933 100644
--- a/app/display/gimpdisplayshell-draw.h
+++ b/app/display/gimpdisplayshell-draw.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_DRAW_H__
-#define __GIMP_DISPLAY_SHELL_DRAW_H__
+#pragma once
void gimp_display_shell_draw_selection_out (GimpDisplayShell *shell,
@@ -38,6 +37,3 @@ void gimp_display_shell_draw_image (GimpDisplayShell *shell,
gint y,
gint w,
gint h);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_DRAW_H__ */
diff --git a/app/display/gimpdisplayshell-expose.h b/app/display/gimpdisplayshell-expose.h
index 36d35196e7..f3792bdc58 100644
--- a/app/display/gimpdisplayshell-expose.h
+++ b/app/display/gimpdisplayshell-expose.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_EXPOSE_H__
-#define __GIMP_DISPLAY_SHELL_EXPOSE_H__
+#pragma once
void gimp_display_shell_expose_area (GimpDisplayShell *shell,
@@ -27,6 +26,3 @@ void gimp_display_shell_expose_area (GimpDisplayShell *shell,
void gimp_display_shell_expose_region (GimpDisplayShell *shell,
cairo_region_t *region);
void gimp_display_shell_expose_full (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_EXPOSE_H__ */
diff --git a/app/display/gimpdisplayshell-filter-dialog.h b/app/display/gimpdisplayshell-filter-dialog.h
index 9f73a8bcdd..e81d292792 100644
--- a/app/display/gimpdisplayshell-filter-dialog.h
+++ b/app/display/gimpdisplayshell-filter-dialog.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_FILTER_DIALOG_H__
-#define __GIMP_DISPLAY_SHELL_FILTER_DIALOG_H__
+#pragma once
GtkWidget * gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_FILTER_DIALOG_H__ */
diff --git a/app/display/gimpdisplayshell-filter.h b/app/display/gimpdisplayshell-filter.h
index 7543a8b8b5..10e611929e 100644
--- a/app/display/gimpdisplayshell-filter.h
+++ b/app/display/gimpdisplayshell-filter.h
@@ -15,14 +15,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_FILTER_H__
-#define __GIMP_DISPLAY_SHELL_FILTER_H__
+#pragma once
void gimp_display_shell_filter_set (GimpDisplayShell *shell,
GimpColorDisplayStack *stack);
gboolean gimp_display_shell_has_filter (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_FILTER_H__ */
diff --git a/app/display/gimpdisplayshell-grab.h b/app/display/gimpdisplayshell-grab.h
index 580811bd79..649552815a 100644
--- a/app/display/gimpdisplayshell-grab.h
+++ b/app/display/gimpdisplayshell-grab.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_GRAB_H__
-#define __GIMP_DISPLAY_SHELL_GRAB_H__
+#pragma once
gboolean gimp_display_shell_pointer_grab (GimpDisplayShell *shell,
@@ -26,6 +25,3 @@ gboolean gimp_display_shell_pointer_grab (GimpDisplayShell *shell,
GdkEventMask event_mask);
void gimp_display_shell_pointer_ungrab (GimpDisplayShell *shell,
const GdkEvent *event);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_GRAB_H__ */
diff --git a/app/display/gimpdisplayshell-handlers.h b/app/display/gimpdisplayshell-handlers.h
index 49d743ed53..14dbaaa8a7 100644
--- a/app/display/gimpdisplayshell-handlers.h
+++ b/app/display/gimpdisplayshell-handlers.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_HANDLERS_H__
-#define __GIMP_DISPLAY_SHELL_HANDLERS_H__
+#pragma once
void gimp_display_shell_connect (GimpDisplayShell *shell);
void gimp_display_shell_disconnect (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_HANDLERS_H__ */
diff --git a/app/display/gimpdisplayshell-items.h b/app/display/gimpdisplayshell-items.h
index 84f169e3a6..17c3196fb8 100644
--- a/app/display/gimpdisplayshell-items.h
+++ b/app/display/gimpdisplayshell-items.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_ITEMS_H__
-#define __GIMP_DISPLAY_SHELL_ITEMS_H__
+#pragma once
void gimp_display_shell_items_init (GimpDisplayShell *shell);
@@ -44,6 +43,3 @@ void gimp_display_shell_add_tool_item (GimpDisplayShell *shell,
GimpCanvasItem *item);
void gimp_display_shell_remove_tool_item (GimpDisplayShell *shell,
GimpCanvasItem *item);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_ITEMS_H__ */
diff --git a/app/display/gimpdisplayshell-profile.h b/app/display/gimpdisplayshell-profile.h
index e390cac7c1..72320addf8 100644
--- a/app/display/gimpdisplayshell-profile.h
+++ b/app/display/gimpdisplayshell-profile.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_PROFILE_H__
-#define __GIMP_DISPLAY_SHELL_PROFILE_H__
+#pragma once
void gimp_display_shell_profile_init (GimpDisplayShell *shell);
@@ -25,6 +24,3 @@ void gimp_display_shell_profile_finalize (GimpDisplayShell *shell);
void gimp_display_shell_profile_update (GimpDisplayShell *shell);
gboolean gimp_display_shell_profile_can_convert_to_u8 (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_PROFILE_H__ */
diff --git a/app/display/gimpdisplayshell-progress.h b/app/display/gimpdisplayshell-progress.h
index d697fa1e49..fdfbbf457c 100644
--- a/app/display/gimpdisplayshell-progress.h
+++ b/app/display/gimpdisplayshell-progress.h
@@ -15,14 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_PROGRESS_H__
-#define __GIMP_DISPLAY_SHELL_PROGRESS_H__
-
+#pragma once
#include "core/gimpprogress.h"
void gimp_display_shell_progress_iface_init (GimpProgressInterface *iface);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_PROGRESS_H__ */
diff --git a/app/display/gimpdisplayshell-render.h b/app/display/gimpdisplayshell-render.h
index 8cdc89b25a..32aacca04f 100644
--- a/app/display/gimpdisplayshell-render.h
+++ b/app/display/gimpdisplayshell-render.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_RENDER_H__
-#define __GIMP_DISPLAY_SHELL_RENDER_H__
+#pragma once
void gimp_display_shell_render_set_scale (GimpDisplayShell *shell,
@@ -48,6 +47,3 @@ void gimp_display_shell_render (GimpDisplayShell *shell,
gint width,
gint height,
gdouble scale);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_RENDER_H__ */
diff --git a/app/display/gimpdisplayshell-rotate-dialog.h b/app/display/gimpdisplayshell-rotate-dialog.h
index 5222d1311c..19ec872018 100644
--- a/app/display/gimpdisplayshell-rotate-dialog.h
+++ b/app/display/gimpdisplayshell-rotate-dialog.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_ROTATE_DIALOG_H__
-#define __GIMP_DISPLAY_SHELL_ROTATE_DIALOG_H__
+#pragma once
void gimp_display_shell_rotate_dialog (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_ROTATE_DIALOG_H__ */
diff --git a/app/display/gimpdisplayshell-rotate.h b/app/display/gimpdisplayshell-rotate.h
index d1ffa05d39..bee1a5a3e0 100644
--- a/app/display/gimpdisplayshell-rotate.h
+++ b/app/display/gimpdisplayshell-rotate.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_ROTATE_H__
-#define __GIMP_DISPLAY_SHELL_ROTATE_H__
+#pragma once
void gimp_display_shell_flip (GimpDisplayShell *shell,
@@ -35,6 +34,3 @@ void gimp_display_shell_rotate_drag (GimpDisplayShell *shell,
gboolean constrain);
void gimp_display_shell_rotate_update_transform (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_ROTATE_H__ */
diff --git a/app/display/gimpdisplayshell-rulers.h b/app/display/gimpdisplayshell-rulers.h
index 117a8f05e2..2fe43e44d4 100644
--- a/app/display/gimpdisplayshell-rulers.h
+++ b/app/display/gimpdisplayshell-rulers.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_RULERS_H__
-#define __GIMP_DISPLAY_SHELL_RULERS_H__
+#pragma once
void gimp_display_shell_rulers_update (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_RULERS_H__ */
diff --git a/app/display/gimpdisplayshell-scale-dialog.h b/app/display/gimpdisplayshell-scale-dialog.h
index eb8306589f..2fe86c97d5 100644
--- a/app/display/gimpdisplayshell-scale-dialog.h
+++ b/app/display/gimpdisplayshell-scale-dialog.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_SCALE_DIALOG_H__
-#define __GIMP_DISPLAY_SHELL_SCALE_DIALOG_H__
+#pragma once
void gimp_display_shell_scale_dialog (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_SCALE_DIALOG_H__ */
diff --git a/app/display/gimpdisplayshell-scale.h b/app/display/gimpdisplayshell-scale.h
index b97f9fb509..f4cdecd262 100644
--- a/app/display/gimpdisplayshell-scale.h
+++ b/app/display/gimpdisplayshell-scale.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_SCALE_H__
-#define __GIMP_DISPLAY_SHELL_SCALE_H__
+#pragma once
gboolean gimp_display_shell_scale_revert (GimpDisplayShell *shell);
@@ -103,6 +102,3 @@ void gimp_display_shell_get_rotated_scale (GimpDisplayShell *shell,
void gimp_display_shell_push_zoom_focus_pointer_pos (GimpDisplayShell *shell,
gint x,
gint y);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_SCALE_H__ */
diff --git a/app/display/gimpdisplayshell-scroll.h b/app/display/gimpdisplayshell-scroll.h
index fba444baf2..13e241542e 100644
--- a/app/display/gimpdisplayshell-scroll.h
+++ b/app/display/gimpdisplayshell-scroll.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_SCROLL_H__
-#define __GIMP_DISPLAY_SHELL_SCROLL_H__
+#pragma once
void gimp_display_shell_scroll (GimpDisplayShell *shell,
@@ -54,6 +53,3 @@ void gimp_display_shell_scroll_get_viewport (GimpDisplayShell *shell,
gdouble *y,
gdouble *w,
gdouble *h);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_SCROLL_H__ */
diff --git a/app/display/gimpdisplayshell-scrollbars.h b/app/display/gimpdisplayshell-scrollbars.h
index c15f802992..e6cf091a93 100644
--- a/app/display/gimpdisplayshell-scrollbars.h
+++ b/app/display/gimpdisplayshell-scrollbars.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_SCROLLBARS_H__
-#define __GIMP_DISPLAY_SHELL_SCROLLBARS_H__
+#pragma once
void gimp_display_shell_scrollbars_update (GimpDisplayShell *shell);
@@ -31,6 +30,3 @@ void gimp_display_shell_scrollbars_update_steppers (GimpDisplayShell *shell,
gint max_offset_x,
gint min_offset_y,
gint max_offset_y);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_SCROLLBARS_H__ */
diff --git a/app/display/gimpdisplayshell-selection.h b/app/display/gimpdisplayshell-selection.h
index c7b0a5f7a0..bc62db975b 100644
--- a/app/display/gimpdisplayshell-selection.h
+++ b/app/display/gimpdisplayshell-selection.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_SELECTION_H__
-#define __GIMP_DISPLAY_SHELL_SELECTION_H__
+#pragma once
void gimp_display_shell_selection_init (GimpDisplayShell *shell);
@@ -33,5 +32,3 @@ void gimp_display_shell_selection_set_show (GimpDisplayShell *shell,
void gimp_display_shell_selection_draw (GimpDisplayShell *shell,
cairo_t *cr);
-
-#endif /* __GIMP_DISPLAY_SHELL_SELECTION_H__ */
diff --git a/app/display/gimpdisplayshell-title.h b/app/display/gimpdisplayshell-title.h
index 0a3ed21e73..017bcd7f44 100644
--- a/app/display/gimpdisplayshell-title.h
+++ b/app/display/gimpdisplayshell-title.h
@@ -15,11 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_TITLE_H__
-#define __GIMP_DISPLAY_SHELL_TITLE_H__
+#pragma once
void gimp_display_shell_title_update (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_TITLE_H__ */
diff --git a/app/display/gimpdisplayshell-tool-events.h b/app/display/gimpdisplayshell-tool-events.h
index 0e3cf93e02..259bef9f8c 100644
--- a/app/display/gimpdisplayshell-tool-events.h
+++ b/app/display/gimpdisplayshell-tool-events.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_TOOL_EVENTS_H__
-#define __GIMP_DISPLAY_SHELL_TOOL_EVENTS_H__
+#pragma once
gboolean gimp_display_shell_events (GtkWidget *widget,
@@ -67,6 +66,3 @@ gboolean gimp_display_shell_hruler_button_press (GtkWidget *widget,
gboolean gimp_display_shell_vruler_button_press (GtkWidget *widget,
GdkEventButton *bevent,
GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_TOOL_EVENT_H__ */
diff --git a/app/display/gimpdisplayshell-transform.h b/app/display/gimpdisplayshell-transform.h
index 4b0a7d9dbb..cd7ce8d94b 100644
--- a/app/display/gimpdisplayshell-transform.h
+++ b/app/display/gimpdisplayshell-transform.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_TRANSFORM_H__
-#define __GIMP_DISPLAY_SHELL_TRANSFORM_H__
+#pragma once
/* zoom: functions to transform from image space to unrotated display
@@ -195,6 +194,3 @@ void gimp_display_shell_untransform_viewport (GimpDisplayShell *shel
gint *y,
gint *width,
gint *height);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_TRANSFORM_H__ */
diff --git a/app/display/gimpdisplayshell-utils.h b/app/display/gimpdisplayshell-utils.h
index 3eb52e383b..c8bbd38d8f 100644
--- a/app/display/gimpdisplayshell-utils.h
+++ b/app/display/gimpdisplayshell-utils.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_UTILS_H__
-#define __GIMP_DISPLAY_SHELL_UTILS_H__
+#pragma once
void gimp_display_shell_get_constrained_line_params (GimpDisplayShell *shell,
@@ -40,6 +39,3 @@ gchar * gimp_display_shell_get_line_status (GimpDisplayShell *shel
gdouble y1,
gdouble x2,
gdouble y2);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_UTILS_H__ */
diff --git a/app/display/gimpdisplayshell.h b/app/display/gimpdisplayshell.h
index 3d9e77cf65..4137049036 100644
--- a/app/display/gimpdisplayshell.h
+++ b/app/display/gimpdisplayshell.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DISPLAY_SHELL_H__
-#define __GIMP_DISPLAY_SHELL_H__
+#pragma once
/* Apply to a float the same rounding mode used in the renderer */
@@ -364,6 +363,3 @@ void gimp_display_shell_set_mask (GimpDisplayShell *shell,
gboolean inverted);
gboolean gimp_display_shell_is_drawn (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_DISPLAY_SHELL_H__ */
diff --git a/app/display/gimpimagewindow.h b/app/display/gimpimagewindow.h
index e0b4304071..e9170c741c 100644
--- a/app/display/gimpimagewindow.h
+++ b/app/display/gimpimagewindow.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_WINDOW_H__
-#define __GIMP_IMAGE_WINDOW_H__
-
+#pragma once
#include "widgets/gimpwindow.h"
@@ -96,5 +94,3 @@ void gimp_image_window_suspend_keep_pos (GimpImageWindow *win
void gimp_image_window_resume_keep_pos (GimpImageWindow *window);
void gimp_image_window_update_tabs (GimpImageWindow *window);
-
-#endif /* __GIMP_IMAGE_WINDOW_H__ */
diff --git a/app/display/gimpmodifiersmanager.h b/app/display/gimpmodifiersmanager.h
index 23d779c17b..ec9a691a4c 100644
--- a/app/display/gimpmodifiersmanager.h
+++ b/app/display/gimpmodifiersmanager.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_MODIFIERS_MANAGER_H__
-#define __GIMP_MODIFIERS_MANAGER_H__
+#pragma once
#define GIMP_TYPE_MODIFIERS_MANAGER (gimp_modifiers_manager_get_type ())
@@ -78,6 +77,3 @@ void gimp_modifiers_manager_remove (GimpModifiersManage
guint button,
GdkModifierType modifiers);
void gimp_modifiers_manager_clear (GimpModifiersManager *manager);
-
-
-#endif /* __GIMP_MODIFIERS_MANAGER_H__ */
diff --git a/app/display/gimpmotionbuffer.h b/app/display/gimpmotionbuffer.h
index c7aee64402..3df3f3c7d9 100644
--- a/app/display/gimpmotionbuffer.h
+++ b/app/display/gimpmotionbuffer.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_MOTION_BUFFER_H__
-#define __GIMP_MOTION_BUFFER_H__
-
+#pragma once
#include "core/gimpobject.h"
@@ -94,6 +92,3 @@ void gimp_motion_buffer_request_stroke (GimpMotionBuffer *buffer,
void gimp_motion_buffer_request_hover (GimpMotionBuffer *buffer,
GdkModifierType state,
gboolean proximity);
-
-
-#endif /* __GIMP_MOTION_BUFFER_H__ */
diff --git a/app/display/gimpmultiwindowstrategy.h b/app/display/gimpmultiwindowstrategy.h
index 4df8873a90..561e6b887d 100644
--- a/app/display/gimpmultiwindowstrategy.h
+++ b/app/display/gimpmultiwindowstrategy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_MULTI_WINDOW_STRATEGY_H__
-#define __GIMP_MULTI_WINDOW_STRATEGY_H__
-
+#pragma once
#include "core/gimpobject.h"
@@ -49,6 +47,3 @@ struct _GimpMultiWindowStrategyClass
GType gimp_multi_window_strategy_get_type (void) G_GNUC_CONST;
GimpObject * gimp_multi_window_strategy_get_singleton (void);
-
-
-#endif /* __GIMP_MULTI_WINDOW_STRATEGY_H__ */
diff --git a/app/display/gimpnavigationeditor.h b/app/display/gimpnavigationeditor.h
index 318e0dd698..9860110ff5 100644
--- a/app/display/gimpnavigationeditor.h
+++ b/app/display/gimpnavigationeditor.h
@@ -21,9 +21,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_NAVIGATION_EDITOR_H__
-#define __GIMP_NAVIGATION_EDITOR_H__
-
+#pragma once
#include "widgets/gimpeditor.h"
@@ -75,6 +73,3 @@ void gimp_navigation_editor_popup (GimpDisplayShell *shell,
GdkEvent *event,
gint click_x,
gint click_y);
-
-
-#endif /* __GIMP_NAVIGATION_EDITOR_H__ */
diff --git a/app/display/gimpscalecombobox.h b/app/display/gimpscalecombobox.h
index 2e71b1387a..62d44bc3fe 100644
--- a/app/display/gimpscalecombobox.h
+++ b/app/display/gimpscalecombobox.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_SCALE_COMBO_BOX_H__
-#define __GIMP_SCALE_COMBO_BOX_H__
+#pragma once
#define GIMP_TYPE_SCALE_COMBO_BOX (gimp_scale_combo_box_get_type ())
@@ -55,6 +54,3 @@ GtkWidget * gimp_scale_combo_box_new (void);
void gimp_scale_combo_box_set_scale (GimpScaleComboBox *combo_box,
gdouble scale);
gdouble gimp_scale_combo_box_get_scale (GimpScaleComboBox *combo_box);
-
-
-#endif /* __GIMP_SCALE_COMBO_BOX_H__ */
diff --git a/app/display/gimpsinglewindowstrategy.h b/app/display/gimpsinglewindowstrategy.h
index 5b145c7119..edbfbe92a2 100644
--- a/app/display/gimpsinglewindowstrategy.h
+++ b/app/display/gimpsinglewindowstrategy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_SINGLE_WINDOW_STRATEGY_H__
-#define __GIMP_SINGLE_WINDOW_STRATEGY_H__
-
+#pragma once
#include "core/gimpobject.h"
@@ -46,9 +44,6 @@ struct _GimpSingleWindowStrategyClass
};
-GType gimp_single_window_strategy_get_type (void) G_GNUC_CONST;
+GType gimp_single_window_strategy_get_type (void) G_GNUC_CONST;
-GimpObject * gimp_single_window_strategy_get_singleton (void);
-
-
-#endif /* __GIMP_SINGLE_WINDOW_STRATEGY_H__ */
+GimpObject * gimp_single_window_strategy_get_singleton (void);
diff --git a/app/display/gimpstatusbar.h b/app/display/gimpstatusbar.h
index 525bc19f6d..016998aac3 100644
--- a/app/display/gimpstatusbar.h
+++ b/app/display/gimpstatusbar.h
@@ -15,10 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_STATUSBAR_H__
-#define __GIMP_STATUSBAR_H__
-
-G_BEGIN_DECLS
+#pragma once
/* maximal length of the format string for the cursor-coordinates */
@@ -176,8 +173,3 @@ void gimp_statusbar_update_cursor (GimpStatusbar *statusbar
gdouble x,
gdouble y);
void gimp_statusbar_clear_cursor (GimpStatusbar *statusbar);
-
-
-G_END_DECLS
-
-#endif /* __GIMP_STATUSBAR_H__ */
diff --git a/app/display/gimptoolcompass.h b/app/display/gimptoolcompass.h
index 8e6fdfe06e..9b15c45ec1 100644
--- a/app/display/gimptoolcompass.h
+++ b/app/display/gimptoolcompass.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_COMPASS_H__
-#define __GIMP_TOOL_COMPASS_H__
-
+#pragma once
#include "gimptoolwidget.h"
@@ -67,6 +65,3 @@ GimpToolWidget * gimp_tool_compass_new (GimpDisplayShell *shell,
gint y2,
gint y3,
gint x3);
-
-
-#endif /* __GIMP_TOOL_COMPASS_H__ */
diff --git a/app/display/gimptooldialog.h b/app/display/gimptooldialog.h
index badc6b43d9..b6ea4b8bb6 100644
--- a/app/display/gimptooldialog.h
+++ b/app/display/gimptooldialog.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_DIALOG_H__
-#define __GIMP_TOOL_DIALOG_H__
+#pragma once
#include "widgets/gimpviewabledialog.h"
@@ -52,6 +51,3 @@ GtkWidget * gimp_tool_dialog_new (GimpToolInfo *tool_info,
void gimp_tool_dialog_set_shell (GimpToolDialog *tool_dialog,
GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_TOOL_DIALOG_H__ */
diff --git a/app/display/gimptoolfocus.h b/app/display/gimptoolfocus.h
index e2fc5bdbfe..42491ca9e1 100644
--- a/app/display/gimptoolfocus.h
+++ b/app/display/gimptoolfocus.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_FOCUS_H__
-#define __GIMP_TOOL_FOCUS_H__
-
+#pragma once
#include "gimptoolwidget.h"
@@ -53,6 +51,3 @@ struct _GimpToolFocusClass
GType gimp_tool_focus_get_type (void) G_GNUC_CONST;
GimpToolWidget * gimp_tool_focus_new (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_TOOL_FOCUS_H__ */
diff --git a/app/display/gimptoolgui.h b/app/display/gimptoolgui.h
index fa931aaa91..f528771d5f 100644
--- a/app/display/gimptoolgui.h
+++ b/app/display/gimptoolgui.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_GUI_H__
-#define __GIMP_TOOL_GUI_H__
-
+#pragma once
#include "core/gimpobject.h"
@@ -110,6 +108,3 @@ void gimp_tool_gui_set_response_sensitive (GimpToolGui *gui,
gboolean sensitive);
void gimp_tool_gui_set_alternative_button_order (GimpToolGui *gui,
...);
-
-
-#endif /* __GIMP_TOOL_GUI_H__ */
diff --git a/app/display/gimptoolgyroscope.h b/app/display/gimptoolgyroscope.h
index 3d89648f04..6810872af5 100644
--- a/app/display/gimptoolgyroscope.h
+++ b/app/display/gimptoolgyroscope.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_GYROSCOPE_H__
-#define __GIMP_TOOL_GYROSCOPE_H__
-
+#pragma once
#include "gimptoolwidget.h"
@@ -53,6 +51,3 @@ struct _GimpToolGyroscopeClass
GType gimp_tool_gyroscope_get_type (void) G_GNUC_CONST;
GimpToolWidget * gimp_tool_gyroscope_new (GimpDisplayShell *shell);
-
-
-#endif /* __GIMP_TOOL_GYROSCOPE_H__ */
diff --git a/app/display/gimptoolhandlegrid.h b/app/display/gimptoolhandlegrid.h
index 77d31dc9e2..3e6d36ca9e 100644
--- a/app/display/gimptoolhandlegrid.h
+++ b/app/display/gimptoolhandlegrid.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_HANDLE_GRID_H__
-#define __GIMP_TOOL_HANDLE_GRID_H__
-
+#pragma once
#include "gimptooltransformgrid.h"
@@ -57,6 +55,3 @@ GimpToolWidget * gimp_tool_handle_grid_new (GimpDisplayShell *shell,
gdouble y1,
gdouble x2,
gdouble y2);
-
-
-#endif /* __GIMP_TOOL_HANDLE_GRID_H__ */
diff --git a/app/display/gimptoolline.h b/app/display/gimptoolline.h
index 80d046d01a..d399c32f80 100644
--- a/app/display/gimptoolline.h
+++ b/app/display/gimptoolline.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_LINE_H__
-#define __GIMP_TOOL_LINE_H__
-
+#pragma once
#include "gimptoolwidget.h"
@@ -94,6 +92,3 @@ const GimpControllerSlider * gimp_tool_line_get_sliders (GimpToolLine
void gimp_tool_line_set_selection (GimpToolLine *line,
gint handle);
gint gimp_tool_line_get_selection (GimpToolLine *line);
-
-
-#endif /* __GIMP_TOOL_LINE_H__ */
diff --git a/app/display/gimptoolpath.h b/app/display/gimptoolpath.h
index 5c6c042e5b..d475c26532 100644
--- a/app/display/gimptoolpath.h
+++ b/app/display/gimptoolpath.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_PATH_H__
-#define __GIMP_TOOL_PATH_H__
-
+#pragma once
#include "gimptoolwidget.h"
@@ -73,6 +71,3 @@ void gimp_tool_path_shift_start (GimpToolPath *tool_path);
void gimp_tool_path_insert_anchor (GimpToolPath *tool_path);
void gimp_tool_path_delete_segment (GimpToolPath *tool_path);
void gimp_tool_path_reverse_stroke (GimpToolPath *tool_path);
-
-
-#endif /* __GIMP_TOOL_PATH_H__ */
diff --git a/app/display/gimptoolpolygon.h b/app/display/gimptoolpolygon.h
index fa3560a17f..6680bf9032 100644
--- a/app/display/gimptoolpolygon.h
+++ b/app/display/gimptoolpolygon.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_POLYGON_H__
-#define __GIMP_TOOL_POLYGON_H__
-
+#pragma once
#include "gimptoolwidget.h"
@@ -61,6 +59,3 @@ gboolean gimp_tool_polygon_is_closed (GimpToolPolygon *polygon);
void gimp_tool_polygon_get_points (GimpToolPolygon *polygon,
const GimpVector2 **points,
gint *n_points);
-
-
-#endif /* __GIMP_TOOL_POLYGON_H__ */
diff --git a/app/display/gimptoolrectangle.h b/app/display/gimptoolrectangle.h
index 361839ab49..9c26a57381 100644
--- a/app/display/gimptoolrectangle.h
+++ b/app/display/gimptoolrectangle.h
@@ -21,9 +21,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_RECTANGLE_H__
-#define __GIMP_TOOL_RECTANGLE_H__
-
+#pragma once
#include "gimptoolwidget.h"
@@ -119,6 +117,3 @@ void gimp_tool_rectangle_frame_item (GimpToolRectangle *rectangle
GimpItem *item);
void gimp_tool_rectangle_auto_shrink (GimpToolRectangle *rectrectangle,
gboolean shrink_merged);
-
-
-#endif /* __GIMP_TOOL_RECTANGLE_H__ */
diff --git a/app/display/gimptoolrotategrid.h b/app/display/gimptoolrotategrid.h
index 2254c8d90a..e066f0bc35 100644
--- a/app/display/gimptoolrotategrid.h
+++ b/app/display/gimptoolrotategrid.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_ROTATE_GRID_H__
-#define __GIMP_TOOL_ROTATE_GRID_H__
-
+#pragma once
#include "gimptooltransformgrid.h"
@@ -60,6 +58,3 @@ GimpToolWidget * gimp_tool_rotate_grid_new (GimpDisplayShell *shell,
gdouble pivot_x,
gdouble pivot_y,
gdouble angle);
-
-
-#endif /* __GIMP_TOOL_ROTATE_GRID_H__ */
diff --git a/app/display/gimptoolsheargrid.h b/app/display/gimptoolsheargrid.h
index dab96d53ec..bfbc45d9e6 100644
--- a/app/display/gimptoolsheargrid.h
+++ b/app/display/gimptoolsheargrid.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_SHEAR_GRID_H__
-#define __GIMP_TOOL_SHEAR_GRID_H__
-
+#pragma once
#include "gimptooltransformgrid.h"
@@ -60,6 +58,3 @@ GimpToolWidget * gimp_tool_shear_grid_new (GimpDisplayShell *shell,
GimpOrientationType orientation,
gdouble shear_x,
gdouble shear_y);
-
-
-#endif /* __GIMP_TOOL_SHEAR_GRID_H__ */
diff --git a/app/display/gimptooltransform3dgrid.h b/app/display/gimptooltransform3dgrid.h
index 42ac3eaa49..04a2563664 100644
--- a/app/display/gimptooltransform3dgrid.h
+++ b/app/display/gimptooltransform3dgrid.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_TRANSFORM_3D_GRID_H__
-#define __GIMP_TOOL_TRANSFORM_3D_GRID_H__
-
+#pragma once
#include "gimptooltransformgrid.h"
@@ -60,6 +58,3 @@ GimpToolWidget * gimp_tool_transform_3d_grid_new (GimpDisplayShell *shel
gdouble camera_x,
gdouble camera_y,
gdouble camera_z);
-
-
-#endif /* __GIMP_TOOL_TRANSFORM_3D_GRID_H__ */
diff --git a/app/display/gimptooltransformgrid.h b/app/display/gimptooltransformgrid.h
index 949beb2a95..7d445eb057 100644
--- a/app/display/gimptooltransformgrid.h
+++ b/app/display/gimptooltransformgrid.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_TRANSFORM_GRID_H__
-#define __GIMP_TOOL_TRANSFORM_GRID_H__
-
+#pragma once
#include "gimpcanvashandle.h"
#include "gimptoolwidget.h"
@@ -94,6 +92,3 @@ GimpToolWidget * gimp_tool_transform_grid_new (GimpDisplayShell
/* protected functions */
GimpTransformHandle gimp_tool_transform_grid_get_handle (GimpToolTransformGrid *grid);
-
-
-#endif /* __GIMP_TOOL_TRANSFORM_GRID_H__ */
diff --git a/app/display/gimptoolwidget.h b/app/display/gimptoolwidget.h
index 638284b4b6..6ffbd9f122 100644
--- a/app/display/gimptoolwidget.h
+++ b/app/display/gimptoolwidget.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_WIDGET_H__
-#define __GIMP_TOOL_WIDGET_H__
-
+#pragma once
#include "core/gimpobject.h"
@@ -325,5 +323,3 @@ GimpUIManager *
const GimpCoords *coords,
GdkModifierType state,
const gchar **ui_path);
-
-#endif /* __GIMP_TOOL_WIDGET_H__ */
diff --git a/app/display/gimptoolwidgetgroup.h b/app/display/gimptoolwidgetgroup.h
index 0a8331f384..16d402214e 100644
--- a/app/display/gimptoolwidgetgroup.h
+++ b/app/display/gimptoolwidgetgroup.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TOOL_WIDGET_GROUP_H__
-#define __GIMP_TOOL_WIDGET_GROUP_H__
-
+#pragma once
#include "gimptoolwidget.h"
@@ -60,6 +58,3 @@ GimpToolWidget * gimp_tool_widget_group_get_focus_widget (GimpToolWidgetGroup *g
void gimp_tool_widget_group_set_auto_raise (GimpToolWidgetGroup *group,
gboolean auto_raise);
gboolean gimp_tool_widget_group_get_auto_raise (GimpToolWidgetGroup *group);
-
-
-#endif /* __GIMP_TOOL_WIDGET_GROUP_H__ */
diff --git a/app/errors.h b/app/errors.h
index 0c306da686..988f15d894 100644
--- a/app/errors.h
+++ b/app/errors.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __ERRORS_H__
-#define __ERRORS_H__
+#pragma once
#ifndef GIMP_APP_GLUE_COMPILATION
#error You must not #include "errors.h" from an app/ subdir
@@ -34,6 +33,3 @@ GList * errors_recovered (void);
void gimp_fatal_error (const gchar *message) G_GNUC_NORETURN;
void gimp_terminate (const gchar *message) G_GNUC_NORETURN;
-
-
-#endif /* __ERRORS_H__ */
diff --git a/app/file-data/file-data-gbr.h b/app/file-data/file-data-gbr.h
index fb3bf47ff3..5ebddd5d3d 100644
--- a/app/file-data/file-data-gbr.h
+++ b/app/file-data/file-data-gbr.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_DATA_GBR_H__
-#define __FILE_DATA_GBR_H__
+#pragma once
GimpValueArray * file_gbr_load_invoker (GimpProcedure *procedure,
@@ -39,6 +38,3 @@ GimpBrush * file_gbr_drawable_to_brush (GimpDrawable *drawable,
const GeglRectangle *rect,
const gchar *name,
gdouble spacing);
-
-
-#endif /* __FILE_DATA_GBR_H__ */
diff --git a/app/file-data/file-data-gex.h b/app/file-data/file-data-gex.h
index dfddc00f91..615a49d1e7 100644
--- a/app/file-data/file-data-gex.h
+++ b/app/file-data/file-data-gex.h
@@ -16,8 +16,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_DATA_GEX_H__
-#define __FILE_DATA_GEX_H__
+#pragma once
GimpValueArray * file_gex_load_invoker (GimpProcedure *procedure,
@@ -26,7 +25,3 @@ GimpValueArray * file_gex_load_invoker (GimpProcedure *procedure,
GimpProgress *progress,
const GimpValueArray *args,
GError **error);
-
-
-#endif /* __FILE_DATA_GEX_H__ */
-
diff --git a/app/file-data/file-data-gih.h b/app/file-data/file-data-gih.h
index 877e4a53eb..69a65b6bb5 100644
--- a/app/file-data/file-data-gih.h
+++ b/app/file-data/file-data-gih.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_DATA_GIH_H__
-#define __FILE_DATA_GIH_H__
+#pragma once
GimpValueArray * file_gih_load_invoker (GimpProcedure *procedure,
@@ -32,6 +31,3 @@ GimpValueArray * file_gih_save_invoker (GimpProcedure *procedure,
GimpProgress *progress,
const GimpValueArray *args,
GError **error);
-
-
-#endif /* __FILE_DATA_GIH_H__ */
diff --git a/app/file-data/file-data-pat.h b/app/file-data/file-data-pat.h
index 1417139290..fa3da08524 100644
--- a/app/file-data/file-data-pat.h
+++ b/app/file-data/file-data-pat.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_DATA_PAT_H__
-#define __FILE_DATA_PAT_H__
+#pragma once
GimpValueArray * file_pat_load_invoker (GimpProcedure *procedure,
@@ -32,6 +31,3 @@ GimpValueArray * file_pat_save_invoker (GimpProcedure *procedure,
GimpProgress *progress,
const GimpValueArray *args,
GError **error);
-
-
-#endif /* __FILE_DATA_PAT_H__ */
diff --git a/app/file-data/file-data.h b/app/file-data/file-data.h
index a36381d81a..348e4f11ce 100644
--- a/app/file-data/file-data.h
+++ b/app/file-data/file-data.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_DATA_H__
-#define __FILE_DATA_H__
+#pragma once
void file_data_init (Gimp *gimp);
void file_data_exit (Gimp *gimp);
-
-
-#endif /* __FILE_DATA_H__ */
diff --git a/app/file/file-import.h b/app/file/file-import.h
index d23eff6039..3b96501c5c 100644
--- a/app/file/file-import.h
+++ b/app/file/file-import.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_IMPORT_H__
-#define __FILE_IMPORT_H__
+#pragma once
void file_import_image (GimpImage *image,
@@ -26,6 +25,3 @@ void file_import_image (GimpImage *image,
GFile *file,
gboolean interactive,
GimpProgress *progress);
-
-
-#endif /* __FILE_IMPORT_H__ */
diff --git a/app/file/file-open.h b/app/file/file-open.h
index 600af8b58a..c9f8e1d0de 100644
--- a/app/file/file-open.h
+++ b/app/file/file-open.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_OPEN_H__
-#define __FILE_OPEN_H__
+#pragma once
GimpImage * file_open_image (Gimp *gimp,
@@ -79,6 +78,3 @@ gboolean file_open_from_command_line (Gimp *gimp,
GFile *file,
gboolean as_new,
GObject *monitor);
-
-
-#endif /* __FILE_OPEN_H__ */
diff --git a/app/file/file-remote.h b/app/file/file-remote.h
index e5f38ccee8..d7e4852ed6 100644
--- a/app/file/file-remote.h
+++ b/app/file/file-remote.h
@@ -21,8 +21,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_REMOTE_H__
-#define __FILE_REMOTE_H__
+#pragma once
gboolean file_remote_mount_file (Gimp *gimp,
@@ -44,5 +43,3 @@ gboolean file_remote_upload_image_finish (Gimp *gimp,
GFile *local_file,
GimpProgress *progress,
GError **error);
-
-#endif /* __FILE_REMOTE_H__ */
diff --git a/app/file/file-save.h b/app/file/file-save.h
index fcfac0ccd3..a5f97e22b4 100644
--- a/app/file/file-save.h
+++ b/app/file/file-save.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_SAVE_H__
-#define __FILE_SAVE_H__
+#pragma once
GimpPDBStatusType file_save (Gimp *gimp,
@@ -31,6 +30,3 @@ GimpPDBStatusType file_save (Gimp *gimp,
gboolean export_backward,
gboolean export_forward,
GError **error);
-
-
-#endif /* __FILE_SAVE_H__ */
diff --git a/app/file/file-utils.h b/app/file/file-utils.h
index b491e4737c..391cc13dd0 100644
--- a/app/file/file-utils.h
+++ b/app/file/file-utils.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_UTILS_H__
-#define __FILE_UTILS_H__
+#pragma once
GFile * file_utils_filename_to_file (Gimp *gimp,
@@ -28,6 +27,3 @@ GFile * file_utils_filename_to_file (Gimp *gimp,
GdkPixbuf * file_utils_load_thumbnail (GFile *file);
gboolean file_utils_save_thumbnail (GimpImage *image,
GFile *file);
-
-
-#endif /* __FILE_UTILS_H__ */
diff --git a/app/file/gimp-file.h b/app/file/gimp-file.h
index a18442f4d3..b7a343674e 100644
--- a/app/file/gimp-file.h
+++ b/app/file/gimp-file.h
@@ -18,13 +18,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_FILE_H__
-#define __GIMP_FILE_H__
+#pragma once
+
/* Data keys for Gimp */
#define GIMP_FILE_OPEN_LAST_FILE_KEY "gimp-file-open-last-file"
#define GIMP_FILE_SAVE_LAST_FILE_KEY "gimp-file-save-last-file"
#define GIMP_FILE_EXPORT_LAST_FILE_KEY "gimp-file-export-last-file"
-
-
-#endif /* __GIMP_FILE_H__ */
diff --git a/app/gegl/gimp-babl-compat.h b/app/gegl/gimp-babl-compat.h
index 778bf3ec90..aa1ff8a96f 100644
--- a/app/gegl/gimp-babl-compat.h
+++ b/app/gegl/gimp-babl-compat.h
@@ -18,14 +18,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BABL_COMPAT_H__
-#define __GIMP_BABL_COMPAT_H__
+#pragma once
GimpImageType gimp_babl_format_get_image_type (const Babl *format);
const Babl * gimp_babl_compat_u8_format (const Babl *format);
const Babl * gimp_babl_compat_u8_mask_format (const Babl *format);
-
-
-#endif /* __GIMP_BABL_COMPAT_H__ */
diff --git a/app/gegl/gimp-babl.h b/app/gegl/gimp-babl.h
index cdf59256f3..3934b46d89 100644
--- a/app/gegl/gimp-babl.h
+++ b/app/gegl/gimp-babl.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BABL_H__
-#define __GIMP_BABL_H__
+#pragma once
void gimp_babl_init (void);
@@ -59,6 +58,3 @@ const Babl * gimp_babl_format_change_trc (const Babl
GimpTRCType trc);
gchar ** gimp_babl_print_color (GeglColor *color);
-
-
-#endif /* __GIMP_BABL_H__ */
diff --git a/app/gegl/gimp-gegl-apply-operation.h b/app/gegl/gimp-gegl-apply-operation.h
index 051d555d7f..197d18b210 100644
--- a/app/gegl/gimp-gegl-apply-operation.h
+++ b/app/gegl/gimp-gegl-apply-operation.h
@@ -20,8 +20,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GEGL_APPLY_OPERATION_H__
-#define __GIMP_GEGL_APPLY_OPERATION_H__
+#pragma once
/* generic functions, also used by the specific ones below */
@@ -167,6 +166,3 @@ void gimp_gegl_apply_transform (GeglBuffer *src_buffer,
GeglBuffer *dest_buffer,
GimpInterpolationType interpolation_type,
GimpMatrix3 *transform);
-
-
-#endif /* __GIMP_GEGL_APPLY_OPERATION_H__ */
diff --git a/app/gegl/gimp-gegl-enums.h b/app/gegl/gimp-gegl-enums.h
index 022c93aed6..e21fe92d29 100644
--- a/app/gegl/gimp-gegl-enums.h
+++ b/app/gegl/gimp-gegl-enums.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GEGL_ENUMS_H__
-#define __GIMP_GEGL_ENUMS_H__
+#pragma once
#define GIMP_TYPE_CAGE_MODE (gimp_cage_mode_get_type ())
@@ -30,6 +29,3 @@ typedef enum
GIMP_CAGE_MODE_CAGE_CHANGE, /*< desc="Create or adjust the cage" >*/
GIMP_CAGE_MODE_DEFORM /*< desc="Deform the cage\nto deform the image" >*/
} GimpCageMode;
-
-
-#endif /* __GIMP_GEGL_ENUMS_H__ */
diff --git a/app/gegl/gimp-gegl-loops-sse2.h b/app/gegl/gimp-gegl-loops-sse2.h
index fc8100cd42..ff591b2945 100644
--- a/app/gegl/gimp-gegl-loops-sse2.h
+++ b/app/gegl/gimp-gegl-loops-sse2.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GEGL_LOOPS_SSE2_H__
-#define __GIMP_GEGL_LOOPS_SSE2_H__
+#pragma once
#if COMPILE_SSE2_INTRINISICS
@@ -35,6 +34,3 @@ void gimp_gegl_smudge_with_paint_process_sse2 (gfloat *accum,
gfloat rate);
#endif /* COMPILE_SSE2_INTRINISICS */
-
-
-#endif /* __GIMP_GEGL_LOOPS_SSE2_H__ */
diff --git a/app/gegl/gimp-gegl-loops.h b/app/gegl/gimp-gegl-loops.h
index 800c10e4da..62f3bfc93f 100644
--- a/app/gegl/gimp-gegl-loops.h
+++ b/app/gegl/gimp-gegl-loops.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GEGL_LOOPS_H__
-#define __GIMP_GEGL_LOOPS_H__
+#pragma once
void gimp_gegl_buffer_copy (GeglBuffer *src_buffer,
@@ -113,6 +112,3 @@ void gimp_gegl_average_color (GeglBuffer *buffer,
GeglAbyssPolicy abyss_policy,
const Babl *format,
gpointer color);
-
-
-#endif /* __GIMP_GEGL_LOOPS_H__ */
diff --git a/app/gegl/gimp-gegl-mask-combine.h b/app/gegl/gimp-gegl-mask-combine.h
index d8e0fa2590..84bfec224c 100644
--- a/app/gegl/gimp-gegl-mask-combine.h
+++ b/app/gegl/gimp-gegl-mask-combine.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GEGL_MASK_COMBINE_H__
-#define __GIMP_GEGL_MASK_COMBINE_H__
+#pragma once
gboolean gimp_gegl_mask_combine_rect (GeglBuffer *mask,
@@ -46,6 +45,3 @@ gboolean gimp_gegl_mask_combine_buffer (GeglBuffer *mask,
GimpChannelOps op,
gint off_x,
gint off_y);
-
-
-#endif /* __GIMP_GEGL_MASK_COMBINE_H__ */
diff --git a/app/gegl/gimp-gegl-mask.h b/app/gegl/gimp-gegl-mask.h
index e14d838331..83f94fb445 100644
--- a/app/gegl/gimp-gegl-mask.h
+++ b/app/gegl/gimp-gegl-mask.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GEGL_MASK_H__
-#define __GIMP_GEGL_MASK_H__
+#pragma once
gboolean gimp_gegl_mask_bounds (GeglBuffer *buffer,
@@ -25,6 +24,3 @@ gboolean gimp_gegl_mask_bounds (GeglBuffer *buffer,
gint *x2,
gint *y2);
gboolean gimp_gegl_mask_is_empty (GeglBuffer *buffer);
-
-
-#endif /* __GIMP_GEGL_MASK_H__ */
diff --git a/app/gegl/gimp-gegl-nodes.h b/app/gegl/gimp-gegl-nodes.h
index 0aceae1f52..b313d0de9d 100644
--- a/app/gegl/gimp-gegl-nodes.h
+++ b/app/gegl/gimp-gegl-nodes.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GEGL_NODES_H__
-#define __GIMP_GEGL_NODES_H__
+#pragma once
GeglNode * gimp_gegl_create_flatten_node (GeglColor *background,
@@ -47,6 +46,3 @@ void gimp_gegl_node_set_matrix (GeglNode *node,
const GimpMatrix3 *matrix);
void gimp_gegl_node_set_color (GeglNode *node,
GeglColor *color);
-
-
-#endif /* __GIMP_GEGL_NODES_H__ */
diff --git a/app/gegl/gimp-gegl-tile-compat.h b/app/gegl/gimp-gegl-tile-compat.h
index e35f28822c..c3170def89 100644
--- a/app/gegl/gimp-gegl-tile-compat.h
+++ b/app/gegl/gimp-gegl-tile-compat.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GEGL_TILE_COMPAT_H__
-#define __GIMP_GEGL_TILE_COMPAT_H__
+#pragma once
gint gimp_gegl_buffer_get_n_tile_rows (GeglBuffer *buffer,
@@ -31,6 +30,3 @@ gboolean gimp_gegl_buffer_get_tile_rect (GeglBuffer *buffer,
gint tile_height,
gint tile_num,
GeglRectangle *rect);
-
-
-#endif /* __GIMP_GEGL_TILE_COMPAT_H__ */
diff --git a/app/gegl/gimp-gegl-types.h b/app/gegl/gimp-gegl-types.h
index ecea87e1e6..168ab891ad 100644
--- a/app/gegl/gimp-gegl-types.h
+++ b/app/gegl/gimp-gegl-types.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GEGL_TYPES_H__
-#define __GIMP_GEGL_TYPES_H__
-
+#pragma once
#include "core/core-types.h"
@@ -29,6 +27,3 @@
typedef struct _GimpApplicator GimpApplicator;
-
-
-#endif /* __GIMP_GEGL_TYPES_H__ */
diff --git a/app/gegl/gimp-gegl-utils.h b/app/gegl/gimp-gegl-utils.h
index d760781b92..8f460be31b 100644
--- a/app/gegl/gimp-gegl-utils.h
+++ b/app/gegl/gimp-gegl-utils.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GEGL_UTILS_H__
-#define __GIMP_GEGL_UTILS_H__
+#pragma once
GList * gimp_gegl_get_op_classes (void);
@@ -66,6 +65,3 @@ GeglBuffer * gimp_gegl_buffer_resize (GeglBuffer *buff
gboolean gimp_gegl_buffer_set_extent (GeglBuffer *buffer,
const GeglRectangle *extent);
-
-
-#endif /* __GIMP_GEGL_UTILS_H__ */
diff --git a/app/gegl/gimp-gegl.h b/app/gegl/gimp-gegl.h
index a8e12c2c96..c8473eb3fd 100644
--- a/app/gegl/gimp-gegl.h
+++ b/app/gegl/gimp-gegl.h
@@ -18,12 +18,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_GEGL_H__
-#define __GIMP_GEGL_H__
+#pragma once
void gimp_gegl_init (Gimp *gimp);
void gimp_gegl_exit (Gimp *gimp);
-
-
-#endif /* __GIMP_GEGL_H__ */
diff --git a/app/gegl/gimpapplicator.h b/app/gegl/gimpapplicator.h
index ec9d46393f..c521d3b1f9 100644
--- a/app/gegl/gimpapplicator.h
+++ b/app/gegl/gimpapplicator.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_APPLICATOR_H__
-#define __GIMP_APPLICATOR_H__
+#pragma once
#define GIMP_TYPE_APPLICATOR (gimp_applicator_get_type ())
@@ -141,6 +140,3 @@ const GeglRectangle * gimp_applicator_get_crop (GimpApplicator *applicator
void gimp_applicator_blit (GimpApplicator *applicator,
const GeglRectangle *rect);
-
-
-#endif /* __GIMP_APPLICATOR_H__ */
diff --git a/app/gegl/gimptilehandlervalidate.h b/app/gegl/gimptilehandlervalidate.h
index 998430fd8d..d63d9db46e 100644
--- a/app/gegl/gimptilehandlervalidate.h
+++ b/app/gegl/gimptilehandlervalidate.h
@@ -15,18 +15,16 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TILE_HANDLER_VALIDATE_H__
-#define __GIMP_TILE_HANDLER_VALIDATE_H__
+#pragma once
#include
+
/***
* GimpTileHandlerValidate is a GeglTileHandler that renders the
* projection.
*/
-G_BEGIN_DECLS
-
#define GIMP_TYPE_TILE_HANDLER_VALIDATE (gimp_tile_handler_validate_get_type ())
#define GIMP_TILE_HANDLER_VALIDATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TILE_HANDLER_VALIDATE, GimpTileHandlerValidate))
#define GIMP_TILE_HANDLER_VALIDATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TILE_HANDLER_VALIDATE, GimpTileHandlerValidateClass))
@@ -105,8 +103,3 @@ void gimp_tile_handler_validate_buffer_copy (GeglBuff
const GeglRectangle *src_rect,
GeglBuffer *dst_buffer,
const GeglRectangle *dst_rect);
-
-
-G_END_DECLS
-
-#endif /* __GIMP_TILE_HANDLER_VALIDATE_H__ */
diff --git a/app/gimp-debug.h b/app/gimp-debug.h
index 59b43f831e..bad99f4360 100644
--- a/app/gimp-debug.h
+++ b/app/gimp-debug.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DEBUG_H__
-#define __GIMP_DEBUG_H__
+#pragma once
void gimp_debug_enable_instances (void);
@@ -29,6 +28,3 @@ void gimp_debug_add_instance (GObject *instance,
void gimp_debug_remove_instance (GObject *instance);
void gimp_debug_instances (void);
-
-
-#endif /* __GIMP_DEBUG_H__ */
diff --git a/app/gimp-intl.h b/app/gimp-intl.h
index 178ae4768a..b3738d32a6 100644
--- a/app/gimp-intl.h
+++ b/app/gimp-intl.h
@@ -15,13 +15,11 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_INTL_H__
-#define __GIMP_INTL_H__
+#pragma once
+
#ifndef GETTEXT_PACKAGE
#error "config.h must be included prior to gimp-intl.h"
#endif
#include
-
-#endif /* __GIMP_INTL_H__ */
diff --git a/app/gimp-log.h b/app/gimp-log.h
index 41e0589f2c..c0fcd45eee 100644
--- a/app/gimp-log.h
+++ b/app/gimp-log.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_LOG_H__
-#define __GIMP_LOG_H__
+#pragma once
typedef guint *GimpLogHandler;
@@ -134,5 +133,3 @@ GIMP_LOG (GimpLogFlags flags,
#define geimnum(vienna) gimp_l##vienna##l_dialog()
#define fnord(kosmoso) void gimp_##kosmoso##bl_dialog(void);
-
-#endif /* __GIMP_LOG_H__ */
diff --git a/app/gimp-priorities.h b/app/gimp-priorities.h
index 198f1d3252..8600977aa2 100644
--- a/app/gimp-priorities.h
+++ b/app/gimp-priorities.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PRIORITIES_H__
-#define __GIMP_PRIORITIES_H__
+#pragma once
/* #define G_PRIORITY_HIGH -100 */
@@ -39,6 +38,3 @@
#define GIMP_PRIORITY_VIEWABLE_IDLE (G_PRIORITY_LOW)
/* #define G_PRIORITY_LOW 300 */
-
-
-#endif /* __GIMP_PRIORITIES_H__ */
diff --git a/app/gimp-update.h b/app/gimp-update.h
index 7ddc25e28a..c6056731ba 100644
--- a/app/gimp-update.h
+++ b/app/gimp-update.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __APP_GIMP_UPDATE_H__
-#define __APP_GIMP_UPDATE_H__
+#pragma once
gboolean gimp_update_auto_check (GimpCoreConfig *config,
@@ -27,6 +26,3 @@ gboolean gimp_update_auto_check (GimpCoreConfig *config,
void gimp_update_check (GimpCoreConfig *config);
void gimp_update_refresh (GimpCoreConfig *config);
-
-
-#endif /* __APP_GIMP_UPDATE_H__ */
diff --git a/app/gimp-version.h b/app/gimp-version.h
index 556a41a8c7..31ee1a9c5c 100644
--- a/app/gimp-version.h
+++ b/app/gimp-version.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __APP_GIMP_VERSION_H__
-#define __APP_GIMP_VERSION_H__
+#pragma once
void gimp_version_show (gboolean be_verbose);
@@ -26,6 +25,3 @@ gchar * gimp_version (gboolean be_verbose,
gint gimp_version_get_revision (void);
gboolean gimp_version_check_update (void);
-
-
-#endif /* __APP_GIMP_VERSION_H__ */
diff --git a/app/gimpconsoleapp.h b/app/gimpconsoleapp.h
index 7b0fa7ca4c..b933d0b056 100644
--- a/app/gimpconsoleapp.h
+++ b/app/gimpconsoleapp.h
@@ -15,19 +15,18 @@
* .
*/
-#ifndef __GIMP_CONSOLE_APP_H__
-#define __GIMP_CONSOLE_APP_H__
+#pragma once
#define GIMP_TYPE_CONSOLE_APP (gimp_console_app_get_type ())
-G_DECLARE_FINAL_TYPE (GimpConsoleApp, gimp_console_app, GIMP, CONSOLE_APP, GApplication)
+G_DECLARE_FINAL_TYPE (GimpConsoleApp,
+ gimp_console_app,
+ GIMP, CONSOLE_APP
+ , GApplication)
-GApplication * gimp_console_app_new (Gimp *gimp,
- gboolean quit,
- gboolean as_new,
- const char **filenames,
- const char *batch_interpreter,
- const char **batch_commands);
-
-
-#endif /* __GIMP_CONSOLE_APP_H__ */
+GApplication * gimp_console_app_new (Gimp *gimp,
+ gboolean quit,
+ gboolean as_new,
+ const char **filenames,
+ const char *batch_interpreter,
+ const char **batch_commands);
diff --git a/app/gimpcoreapp.h b/app/gimpcoreapp.h
index f301ce0d65..727f208d59 100644
--- a/app/gimpcoreapp.h
+++ b/app/gimpcoreapp.h
@@ -15,10 +15,8 @@
* .
*/
-#ifndef __GIMP_CORE_APP_H__
-#define __GIMP_CORE_APP_H__
+#pragma once
-G_BEGIN_DECLS
#define GIMP_APPLICATION_ID "org.gimp.GIMP"
@@ -37,7 +35,10 @@ enum
};
#define GIMP_TYPE_CORE_APP gimp_core_app_get_type()
-G_DECLARE_INTERFACE (GimpCoreApp, gimp_core_app, GIMP, CORE_APP, GObject)
+G_DECLARE_INTERFACE (GimpCoreApp,
+ gimp_core_app,
+ GIMP, CORE_APP,
+ GObject)
struct _GimpCoreAppInterface
{
@@ -77,8 +78,3 @@ void gimp_core_app_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
-
-
-G_END_DECLS
-
-#endif /* __GIMP_CORE_APP_H__ */
diff --git a/app/git-version.h.in b/app/git-version.h.in
index 2cc800c6e5..2adb4479f6 100644
--- a/app/git-version.h.in
+++ b/app/git-version.h.in
@@ -1,8 +1,5 @@
-#ifndef __GIT_VERSION_H__
-#define __GIT_VERSION_H__
+#pragma once
#define GIMP_GIT_VERSION "@GIMP_GIT_VERSION@"
#define GIMP_GIT_VERSION_ABBREV "@GIMP_GIT_VERSION_ABBREV@"
#define GIMP_GIT_LAST_COMMIT_YEAR "@GIMP_GIT_LAST_COMMIT_YEAR@"
-
-#endif /* __GIT_VERSION_H__ */
diff --git a/app/gui/gimpapp.h b/app/gui/gimpapp.h
index c60c76753b..6ae610365d 100644
--- a/app/gui/gimpapp.h
+++ b/app/gui/gimpapp.h
@@ -14,21 +14,22 @@
* .
*/
-#ifndef __GIMP_APP_H__
-#define __GIMP_APP_H__
+#pragma once
#define GIMP_TYPE_APP (gimp_app_get_type ())
-G_DECLARE_FINAL_TYPE (GimpApp, gimp_app, GIMP, APP, GtkApplication)
+G_DECLARE_FINAL_TYPE (GimpApp,
+ gimp_app,
+ GIMP, APP,
+ GtkApplication)
-GApplication * gimp_app_new (Gimp *gimp,
- gboolean no_splash,
- gboolean quit,
- gboolean as_new,
- const char **filenames,
- const char *batch_interpreter,
- const char **batch_commands);
-gboolean gimp_app_get_no_splash (GimpApp *self);
+GApplication * gimp_app_new (Gimp *gimp,
+ gboolean no_splash,
+ gboolean quit,
+ gboolean as_new,
+ const char **filenames,
+ const char *batch_interpreter,
+ const char **batch_commands);
-#endif /* __GIMP_APP_H__ */
+gboolean gimp_app_get_no_splash (GimpApp *self);
diff --git a/app/gui/gimpdbusservice.h b/app/gui/gimpdbusservice.h
index 71f149347b..171111a070 100644
--- a/app/gui/gimpdbusservice.h
+++ b/app/gui/gimpdbusservice.h
@@ -19,12 +19,11 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DBUS_SERVICE_H__
-#define __GIMP_DBUS_SERVICE_H__
-
+#pragma once
#include "gimpdbusservice-generated.h"
+
/* service name and path should really be org.gimp.GIMP and
* /org/gimp/GIMP and only the interface be called UI.
*/
@@ -64,6 +63,3 @@ struct _GimpDBusServiceClass
GType gimp_dbus_service_get_type (void) G_GNUC_CONST;
GObject * gimp_dbus_service_new (Gimp *gimp);
-
-
-#endif /* __GIMP_DBUS_SERVICE_H__ */
diff --git a/app/gui/gimpuiconfigurer.h b/app/gui/gimpuiconfigurer.h
index db22ffccc3..d441285b52 100644
--- a/app/gui/gimpuiconfigurer.h
+++ b/app/gui/gimpuiconfigurer.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_UI_CONFIGURER_H__
-#define __GIMP_UI_CONFIGURER_H__
-
+#pragma once
#include "core/gimpobject.h"
@@ -49,9 +47,7 @@ struct _GimpUIConfigurerClass
};
-GType gimp_ui_configurer_get_type (void) G_GNUC_CONST;
-void gimp_ui_configurer_configure (GimpUIConfigurer *ui_configurer,
- gboolean single_window_mode);
+GType gimp_ui_configurer_get_type (void) G_GNUC_CONST;
-
-#endif /* __GIMP_UI_CONFIGURER_H__ */
+void gimp_ui_configurer_configure (GimpUIConfigurer *ui_configurer,
+ gboolean single_window_mode);
diff --git a/app/gui/gui-message.h b/app/gui/gui-message.h
index e866f2a3df..753a6728c1 100644
--- a/app/gui/gui-message.h
+++ b/app/gui/gui-message.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GUI_MESSAGE_H__
-#define __GUI_MESSAGE_H__
+#pragma once
void gui_message (Gimp *gimp,
@@ -24,6 +23,3 @@ void gui_message (Gimp *gimp,
GimpMessageSeverity severity,
const gchar *domain,
const gchar *message);
-
-
-#endif /* __GUI_VTABLE_H__ */
diff --git a/app/gui/gui-types.h b/app/gui/gui-types.h
index 294192c652..f36f02af21 100644
--- a/app/gui/gui-types.h
+++ b/app/gui/gui-types.h
@@ -15,14 +15,11 @@
* along with this program. If not, see .
*/
-#ifndef __GUI_TYPES_H__
-#define __GUI_TYPES_H__
-
+#pragma once
#include "tools/tools-types.h"
#include "dialogs/dialogs-types.h"
#include "menus/menus-types.h"
-#include "gimpapp.h"
-#endif /* __GUI_TYPES_H__ */
+typedef struct _GimpApp GimpApp;
diff --git a/app/gui/gui-unique.h b/app/gui/gui-unique.h
index 73b9231048..a556eb8f95 100644
--- a/app/gui/gui-unique.h
+++ b/app/gui/gui-unique.h
@@ -15,8 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __GUI_UNIQUE_H__
-#define __GUI_UNIQUE_H__
+#pragma once
+
#ifdef G_OS_WIN32
#define GIMP_UNIQUE_WIN32_WINDOW_CLASS L"GimpWin32UniqueHandler"
@@ -26,6 +26,3 @@
void gui_unique_init (Gimp *gimp);
void gui_unique_exit (void);
-
-
-#endif /* __GUI_UNIQUE_H__ */
diff --git a/app/gui/gui-vtable.h b/app/gui/gui-vtable.h
index 626ba2635e..9f9f080521 100644
--- a/app/gui/gui-vtable.h
+++ b/app/gui/gui-vtable.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GUI_VTABLE_H__
-#define __GUI_VTABLE_H__
+#pragma once
void gui_vtable_init (Gimp *gimp);
@@ -25,6 +24,3 @@ void gui_vtable_init (Gimp *gimp);
* also, gui.h can't contain any Gdk types.
*/
GdkMonitor * gui_get_initial_monitor (Gimp *gimp);
-
-
-#endif /* __GUI_VTABLE_H__ */
diff --git a/app/gui/gui.h b/app/gui/gui.h
index 696128c0ee..4cbfaaa9a8 100644
--- a/app/gui/gui.h
+++ b/app/gui/gui.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GUI_H__
-#define __GUI_H__
+#pragma once
void gui_libs_init (GOptionContext *context);
@@ -29,5 +28,3 @@ GimpInitStatusFunc gui_init (Gimp *gimp,
const gchar *system_lang_l10n);
gboolean gui_recover (gint n_recoveries);
-
-#endif /* __GUI_H__ */
diff --git a/app/gui/icon-themes.h b/app/gui/icon-themes.h
index 79e19a0451..d3cf7b7bf4 100644
--- a/app/gui/icon-themes.h
+++ b/app/gui/icon-themes.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __ICONS_THEMES_H__
-#define __ICONS_THEMES_H__
+#pragma once
void icon_themes_init (Gimp *gimp);
@@ -31,6 +30,3 @@ GFile * icon_themes_get_theme_dir (Gimp *gimp,
const gchar *theme_name);
gboolean icon_themes_current_prefer_symbolic (Gimp *gimp);
-
-
-#endif /* __ICONS_THEMES_H__ */
diff --git a/app/gui/modifiers.h b/app/gui/modifiers.h
index 72a1d9c2e0..dc3cbdcc74 100644
--- a/app/gui/modifiers.h
+++ b/app/gui/modifiers.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __MODIFIERS_H__
-#define __MODIFIERS_H__
+#pragma once
void modifiers_init (Gimp *gimp);
@@ -31,6 +30,3 @@ void modifiers_save (Gimp *gimp,
gboolean modifiers_clear (Gimp *gimp,
GError **error);
-
-
-#endif /* __MODIFIERS_H__ */
diff --git a/app/gui/session.h b/app/gui/session.h
index d5be445ca6..affcec6345 100644
--- a/app/gui/session.h
+++ b/app/gui/session.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __SESSION_H__
-#define __SESSION_H__
+#pragma once
void session_init (Gimp *gimp);
@@ -29,6 +28,3 @@ void session_save (Gimp *gimp,
gboolean session_clear (Gimp *gimp,
GError **error);
-
-
-#endif /* __SESSION_H__ */
diff --git a/app/gui/splash.c b/app/gui/splash.c
index eeb9958625..52a14b982f 100644
--- a/app/gui/splash.c
+++ b/app/gui/splash.c
@@ -43,6 +43,7 @@
#include "widgets/gimpwidgets-utils.h"
+#include "gimpapp.h"
#include "splash.h"
#include "gimp-intl.h"
diff --git a/app/gui/splash.h b/app/gui/splash.h
index 9f18e02ea1..fad6467bce 100644
--- a/app/gui/splash.h
+++ b/app/gui/splash.h
@@ -15,8 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __SPLASH_H__
-#define __SPLASH_H__
+#pragma once
+
void splash_create (Gimp *gimp,
gboolean be_verbose,
@@ -27,6 +27,3 @@ void splash_destroy (void);
void splash_update (const gchar *label1,
const gchar *label2,
gdouble percentage);
-
-
-#endif /* __SPLASH_H__ */
diff --git a/app/gui/themes.h b/app/gui/themes.h
index 155d150d10..1dcf586beb 100644
--- a/app/gui/themes.h
+++ b/app/gui/themes.h
@@ -15,8 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __THEMES_H__
-#define __THEMES_H__
+#pragma once
+
void themes_init (Gimp *gimp);
void themes_exit (Gimp *gimp);
@@ -36,5 +36,3 @@ void themes_theme_change_notify (GimpGuiConfig *config,
#ifdef G_OS_WIN32
void themes_set_title_bar (Gimp *gimp);
#endif
-
-#endif /* __THEMES_H__ */
diff --git a/app/language.h b/app/language.h
index 7929bc7f60..54bfe8215d 100644
--- a/app/language.h
+++ b/app/language.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __LANGUAGE_H__
-#define __LANGUAGE_H__
+#pragma once
#ifndef GIMP_APP_GLUE_COMPILATION
#error You must not #include "language.h" from a subdir
@@ -25,6 +24,3 @@
const gchar * language_init (const gchar *language,
const gchar **system_lang_l10n);
-
-
-#endif /* __LANGUAGE_H__ */
diff --git a/app/menus/dockable-menu.h b/app/menus/dockable-menu.h
index 1fd2483124..389f1b1be4 100644
--- a/app/menus/dockable-menu.h
+++ b/app/menus/dockable-menu.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __DOCKABLE_MENU_H__
-#define __DOCKABLE_MENU_H__
+#pragma once
void dockable_menu_setup (GimpUIManager *manager,
const gchar *ui_path);
-
-
-#endif /* __DOCKABLE_MENU_H__ */
diff --git a/app/menus/file-menu.h b/app/menus/file-menu.h
index e439e8d699..f0105916d3 100644
--- a/app/menus/file-menu.h
+++ b/app/menus/file-menu.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __FILE_MENU_H__
-#define __FILE_MENU_H__
+#pragma once
void file_menu_setup (GimpUIManager *manager,
const gchar *ui_path);
-
-
-#endif /* __FILE_MENU_H__ */
diff --git a/app/menus/filters-menu.h b/app/menus/filters-menu.h
index 9c1a70565f..cadeb1ed31 100644
--- a/app/menus/filters-menu.h
+++ b/app/menus/filters-menu.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __FILTERS_MENU_H__
-#define __FILTERS_MENU_H__
+#pragma once
void filters_menu_setup (GimpUIManager *manager,
const gchar *ui_path);
-
-
-#endif /* __FILTERS_MENU_H__ */
diff --git a/app/menus/image-menu.h b/app/menus/image-menu.h
index 0ae5418dd3..ee5ba9b78c 100644
--- a/app/menus/image-menu.h
+++ b/app/menus/image-menu.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __IMAGE_MENU_H__
-#define __IMAGE_MENU_H__
+#pragma once
void image_menu_setup (GimpUIManager *manager,
const gchar *ui_path);
-
-
-#endif /* __IMAGE_MENU_H__ */
diff --git a/app/menus/menus-types.h b/app/menus/menus-types.h
index 1c05529725..ceaf549c4e 100644
--- a/app/menus/menus-types.h
+++ b/app/menus/menus-types.h
@@ -15,11 +15,6 @@
* along with this program. If not, see .
*/
-#ifndef __MENUS_TYPES_H__
-#define __MENUS_TYPES_H__
-
+#pragma once
#include "actions/actions-types.h"
-
-
-#endif /* __MENUS_TYPES_H__ */
diff --git a/app/menus/menus.h b/app/menus/menus.h
index 70dfe730eb..df74e62ca4 100644
--- a/app/menus/menus.h
+++ b/app/menus/menus.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __MENUS_H__
-#define __MENUS_H__
+#pragma once
void menus_init (Gimp *gimp);
@@ -32,6 +31,3 @@ void menus_remove (Gimp *gimp);
GimpMenuFactory * menus_get_global_menu_factory (Gimp *gimp);
GimpUIManager * menus_get_image_manager_singleton (Gimp *gimp);
-
-
-#endif /* __MENUS_H__ */
diff --git a/app/menus/plug-in-menus.h b/app/menus/plug-in-menus.h
index 4e07e2eee7..c42054e1c5 100644
--- a/app/menus/plug-in-menus.h
+++ b/app/menus/plug-in-menus.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __PLUG_IN_MENUS_H__
-#define __PLUG_IN_MENUS_H__
+#pragma once
void plug_in_menus_setup (GimpUIManager *manager,
const gchar *ui_path);
-
-
-#endif /* __PLUG_IN_MENUS_H__ */
diff --git a/app/menus/shortcuts-rc.h b/app/menus/shortcuts-rc.h
index 68bcd00f3c..66908716a7 100644
--- a/app/menus/shortcuts-rc.h
+++ b/app/menus/shortcuts-rc.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __SHORTCUTS_RC_H__
-#define __SHORTCUTS_RC_H__
+#pragma once
gboolean shortcuts_rc_parse (GtkApplication *application,
@@ -28,6 +27,3 @@ gboolean shortcuts_rc_parse (GtkApplication *application,
gboolean shortcuts_rc_write (GtkApplication *application,
GFile *file,
GError **error);
-
-
-#endif /* __SHORTCUTS_RC_H__ */
diff --git a/app/menus/tool-options-menu.h b/app/menus/tool-options-menu.h
index 9fbc291fef..c8ce8ad13d 100644
--- a/app/menus/tool-options-menu.h
+++ b/app/menus/tool-options-menu.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __TOOL_OPTIONS_MENU_H__
-#define __TOOL_OPTIONS_MENU_H__
+#pragma once
void tool_options_menu_setup (GimpUIManager *manager,
const gchar *ui_path);
-
-
-#endif /* __TOOL_OPTIONS_MENU_H__ */
diff --git a/app/menus/window-menu.h b/app/menus/window-menu.h
index acce261525..1122f65733 100644
--- a/app/menus/window-menu.h
+++ b/app/menus/window-menu.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __WINDOW_MENU_H__
-#define __WINDOW_MENU_H__
+#pragma once
void window_menu_setup (GimpUIManager *manager,
const gchar *group_name,
const gchar *ui_path);
-
-
-#endif /* __WINDOW_MENU_H__ */
diff --git a/app/menus/windows-menu.h b/app/menus/windows-menu.h
index e57ac79e7f..793904f0ec 100644
--- a/app/menus/windows-menu.h
+++ b/app/menus/windows-menu.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __WINDOWS_MENU_H__
-#define __WINDOWS_MENU_H__
+#pragma once
void windows_menu_setup (GimpUIManager *manager,
const gchar *ui_path);
-
-
-#endif /* __WINDOWS_MENU_H__ */
diff --git a/app/operations/gimp-operation-config.h b/app/operations/gimp-operation-config.h
index 6bbc407fc2..8c60d32832 100644
--- a/app/operations/gimp-operation-config.h
+++ b/app/operations/gimp-operation-config.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_CONFIG_H__
-#define __GIMP_OPERATION_CONFIG_H__
+#pragma once
void gimp_operation_config_init_start (Gimp *gimp);
@@ -55,6 +54,3 @@ GParamSpec ** gimp_operation_config_list_properties (GObject *config,
GType owner_type,
GParamFlags flags,
guint *n_pspecs);
-
-
-#endif /* __GIMP_OPERATION_CONFIG_H__ */
diff --git a/app/operations/gimp-operations.h b/app/operations/gimp-operations.h
index 8e41e45241..dc508c25fe 100644
--- a/app/operations/gimp-operations.h
+++ b/app/operations/gimp-operations.h
@@ -17,12 +17,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATIONS_H__
-#define __GIMP_OPERATIONS_H__
+#pragma once
void gimp_operations_init (Gimp *gimp);
void gimp_operations_exit (Gimp *gimp);
-
-
-#endif /* __GIMP_OPERATIONS_H__ */
diff --git a/app/operations/gimpbrightnesscontrastconfig.h b/app/operations/gimpbrightnesscontrastconfig.h
index bab1a03113..2b124e27bf 100644
--- a/app/operations/gimpbrightnesscontrastconfig.h
+++ b/app/operations/gimpbrightnesscontrastconfig.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRIGHTNESS_CONTRAST_CONFIG_H__
-#define __GIMP_BRIGHTNESS_CONTRAST_CONFIG_H__
-
+#pragma once
#include "gimpoperationsettings.h"
@@ -53,6 +51,3 @@ GType gimp_brightness_contrast_config_get_type (void) G_GNUC_CONST;
GimpLevelsConfig *
gimp_brightness_contrast_config_to_levels_config (GimpBrightnessContrastConfig *config);
-
-
-#endif /* __GIMP_BRIGHTNESS_CONTRAST_CONFIG_H__ */
diff --git a/app/operations/gimpcageconfig.h b/app/operations/gimpcageconfig.h
index 8106d5256a..d720ec4ad5 100644
--- a/app/operations/gimpcageconfig.h
+++ b/app/operations/gimpcageconfig.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CAGE_CONFIG_H__
-#define __GIMP_CAGE_CONFIG_H__
-
+#pragma once
#include "gimpoperationsettings.h"
@@ -103,6 +101,3 @@ void gimp_cage_config_toggle_point_selection (GimpCageConfig *gcc,
void gimp_cage_config_deselect_points (GimpCageConfig *gcc);
gboolean gimp_cage_config_point_is_selected (GimpCageConfig *gcc,
gint point_number);
-
-
-#endif /* __GIMP_CAGE_CONFIG_H__ */
diff --git a/app/operations/gimpcolorbalanceconfig.h b/app/operations/gimpcolorbalanceconfig.h
index 4c58ceab4d..bbec8c18a4 100644
--- a/app/operations/gimpcolorbalanceconfig.h
+++ b/app/operations/gimpcolorbalanceconfig.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_COLOR_BALANCE_CONFIG_H__
-#define __GIMP_COLOR_BALANCE_CONFIG_H__
-
+#pragma once
#include "gimpoperationsettings.h"
@@ -57,6 +55,3 @@ struct _GimpColorBalanceConfigClass
GType gimp_color_balance_config_get_type (void) G_GNUC_CONST;
void gimp_color_balance_config_reset_range (GimpColorBalanceConfig *config);
-
-
-#endif /* __GIMP_COLOR_BALANCE_CONFIG_H__ */
diff --git a/app/operations/gimpcurvesconfig.h b/app/operations/gimpcurvesconfig.h
index ce21379a58..02c377425e 100644
--- a/app/operations/gimpcurvesconfig.h
+++ b/app/operations/gimpcurvesconfig.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CURVES_CONFIG_H__
-#define __GIMP_CURVES_CONFIG_H__
-
+#pragma once
#include "gimpoperationsettings.h"
@@ -80,5 +78,3 @@ gboolean gimp_curves_config_save_cruft (GimpCurvesConfig *config,
gboolean gimp_curves_config_load_acv (GimpCurvesConfig *config,
GInputStream *input,
GError **error);
-
-#endif /* __GIMP_CURVES_CONFIG_H__ */
diff --git a/app/operations/gimphuesaturationconfig.h b/app/operations/gimphuesaturationconfig.h
index 151ac0593e..c6296bb01a 100644
--- a/app/operations/gimphuesaturationconfig.h
+++ b/app/operations/gimphuesaturationconfig.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_HUE_SATURATION_CONFIG_H__
-#define __GIMP_HUE_SATURATION_CONFIG_H__
-
+#pragma once
#include "gimpoperationsettings.h"
@@ -57,6 +55,3 @@ struct _GimpHueSaturationConfigClass
GType gimp_hue_saturation_config_get_type (void) G_GNUC_CONST;
void gimp_hue_saturation_config_reset_range (GimpHueSaturationConfig *config);
-
-
-#endif /* __GIMP_HUE_SATURATION_CONFIG_H__ */
diff --git a/app/operations/gimplevelsconfig.h b/app/operations/gimplevelsconfig.h
index 68bcc00252..90e156dedb 100644
--- a/app/operations/gimplevelsconfig.h
+++ b/app/operations/gimplevelsconfig.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_LEVELS_CONFIG_H__
-#define __GIMP_LEVELS_CONFIG_H__
-
+#pragma once
#include "gimpoperationsettings.h"
@@ -92,5 +90,3 @@ gboolean gimp_levels_config_save_cruft (GimpLevelsConfig *config,
gboolean gimp_levels_config_load_alv (GimpLevelsConfig *config,
GInputStream *input,
GError **error);
-
-#endif /* __GIMP_LEVELS_CONFIG_H__ */
diff --git a/app/operations/gimpoperationborder.h b/app/operations/gimpoperationborder.h
index 83eb9fac32..5ef587c365 100644
--- a/app/operations/gimpoperationborder.h
+++ b/app/operations/gimpoperationborder.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_BORDER_H__
-#define __GIMP_OPERATION_BORDER_H__
-
+#pragma once
#include
@@ -53,6 +51,3 @@ struct _GimpOperationBorderClass
GType gimp_operation_border_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_BORDER_H__ */
diff --git a/app/operations/gimpoperationbrightnesscontrast.h b/app/operations/gimpoperationbrightnesscontrast.h
index d93ff20dff..4c10ba2417 100644
--- a/app/operations/gimpoperationbrightnesscontrast.h
+++ b/app/operations/gimpoperationbrightnesscontrast.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_BRIGHTNESS_CONTRAST_H__
-#define __GIMP_OPERATION_BRIGHTNESS_CONTRAST_H__
-
+#pragma once
#include "gimpoperationpointfilter.h"
@@ -48,6 +46,3 @@ struct _GimpOperationBrightnessContrastClass
GType gimp_operation_brightness_contrast_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_BRIGHTNESS_CONTRAST_H__ */
diff --git a/app/operations/gimpoperationbuffersourcevalidate.h b/app/operations/gimpoperationbuffersourcevalidate.h
index c47c333388..bf4b0dafb5 100644
--- a/app/operations/gimpoperationbuffersourcevalidate.h
+++ b/app/operations/gimpoperationbuffersourcevalidate.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_BUFFER_SOURCE_VALIDATE_H__
-#define __GIMP_OPERATION_BUFFER_SOURCE_VALIDATE_H__
+#pragma once
#define GIMP_TYPE_OPERATION_BUFFER_SOURCE_VALIDATE (gimp_operation_buffer_source_validate_get_type ())
@@ -47,6 +46,3 @@ struct _GimpOperationBufferSourceValidateClass
GType gimp_operation_buffer_source_validate_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_BUFFER_SOURCE_VALIDATE_H__ */
diff --git a/app/operations/gimpoperationcagecoefcalc.h b/app/operations/gimpoperationcagecoefcalc.h
index e63be27929..5ec4cb4127 100644
--- a/app/operations/gimpoperationcagecoefcalc.h
+++ b/app/operations/gimpoperationcagecoefcalc.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_CAGE_COEF_CALC_H__
-#define __GIMP_OPERATION_CAGE_COEF_CALC_H__
-
+#pragma once
#include
#include
@@ -57,6 +55,3 @@ struct _GimpOperationCageCoefCalcClass
GType gimp_operation_cage_coef_calc_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_CAGE_COEF_CALC_H__ */
diff --git a/app/operations/gimpoperationcagetransform.h b/app/operations/gimpoperationcagetransform.h
index 8ee9286c00..bb737fc1f9 100644
--- a/app/operations/gimpoperationcagetransform.h
+++ b/app/operations/gimpoperationcagetransform.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_CAGE_TRANSFORM_H__
-#define __GIMP_OPERATION_CAGE_TRANSFORM_H__
-
+#pragma once
#include
#include
@@ -53,6 +51,3 @@ struct _GimpOperationCageTransformClass
GType gimp_operation_cage_transform_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_CAGE_TRANSFORM_H__ */
diff --git a/app/operations/gimpoperationcolorbalance.h b/app/operations/gimpoperationcolorbalance.h
index a6ba386090..7250ca9602 100644
--- a/app/operations/gimpoperationcolorbalance.h
+++ b/app/operations/gimpoperationcolorbalance.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_COLOR_BALANCE_H__
-#define __GIMP_OPERATION_COLOR_BALANCE_H__
-
+#pragma once
#include "gimpoperationpointfilter.h"
@@ -48,6 +46,3 @@ struct _GimpOperationColorBalanceClass
GType gimp_operation_color_balance_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_COLOR_BALANCE_H__ */
diff --git a/app/operations/gimpoperationcolorize.h b/app/operations/gimpoperationcolorize.h
index b6aaf3f39f..73ccc539f7 100644
--- a/app/operations/gimpoperationcolorize.h
+++ b/app/operations/gimpoperationcolorize.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_COLORIZE_H__
-#define __GIMP_OPERATION_COLORIZE_H__
-
+#pragma once
#include "gimpoperationpointfilter.h"
@@ -55,6 +53,3 @@ struct _GimpOperationColorizeClass
GType gimp_operation_colorize_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_COLORIZE_H__ */
diff --git a/app/operations/gimpoperationcomposecrop.h b/app/operations/gimpoperationcomposecrop.h
index 83b76139ac..4b33750b65 100644
--- a/app/operations/gimpoperationcomposecrop.h
+++ b/app/operations/gimpoperationcomposecrop.h
@@ -19,8 +19,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_COMPOSE_CROP_H__
-#define __GIMP_OPERATION_COMPOSE_CROP_H__
+#pragma once
#include
@@ -50,6 +49,3 @@ struct _GimpOperationComposeCropClass
GType gimp_operation_compose_crop_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_COMPOSE_CROP_H__ */
diff --git a/app/operations/gimpoperationcurves.h b/app/operations/gimpoperationcurves.h
index ab097b2d97..0f9c883b61 100644
--- a/app/operations/gimpoperationcurves.h
+++ b/app/operations/gimpoperationcurves.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_CURVES_H__
-#define __GIMP_OPERATION_CURVES_H__
-
+#pragma once
#include "gimpoperationpointfilter.h"
@@ -48,6 +46,3 @@ struct _GimpOperationCurvesClass
GType gimp_operation_curves_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_CURVES_H__ */
diff --git a/app/operations/gimpoperationdesaturate.h b/app/operations/gimpoperationdesaturate.h
index 3117a61e5b..efe33cd0e6 100644
--- a/app/operations/gimpoperationdesaturate.h
+++ b/app/operations/gimpoperationdesaturate.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_DESATURATE_H__
-#define __GIMP_OPERATION_DESATURATE_H__
-
+#pragma once
#include "gimpoperationpointfilter.h"
@@ -50,6 +48,3 @@ struct _GimpOperationDesaturateClass
GType gimp_operation_desaturate_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_DESATURATE_H__ */
diff --git a/app/operations/gimpoperationequalize.h b/app/operations/gimpoperationequalize.h
index ea03b18a37..02092ffef7 100644
--- a/app/operations/gimpoperationequalize.h
+++ b/app/operations/gimpoperationequalize.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_EQUALIZE_H__
-#define __GIMP_OPERATION_EQUALIZE_H__
-
+#pragma once
#include "gimpoperationpointfilter.h"
@@ -52,6 +50,3 @@ struct _GimpOperationEqualizeClass
GType gimp_operation_equalize_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_EQUALIZE_H__ */
diff --git a/app/operations/gimpoperationfillsource.h b/app/operations/gimpoperationfillsource.h
index 6a9f468c93..3522361d3d 100644
--- a/app/operations/gimpoperationfillsource.h
+++ b/app/operations/gimpoperationfillsource.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_FILL_SOURCE_H__
-#define __GIMP_OPERATION_FILL_SOURCE_H__
+#pragma once
#define GIMP_TYPE_OPERATION_FILL_SOURCE (gimp_operation_fill_source_get_type ())
@@ -50,6 +49,3 @@ struct _GimpOperationFillSourceClass
GType gimp_operation_fill_source_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_FILL_SOURCE_H__ */
diff --git a/app/operations/gimpoperationflood.h b/app/operations/gimpoperationflood.h
index ed2c1c68e4..fd7ab80b01 100644
--- a/app/operations/gimpoperationflood.h
+++ b/app/operations/gimpoperationflood.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_FLOOD_H__
-#define __GIMP_OPERATION_FLOOD_H__
-
+#pragma once
#include
@@ -48,6 +46,3 @@ struct _GimpOperationFloodClass
GType gimp_operation_flood_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_FLOOD_H__ */
diff --git a/app/operations/gimpoperationgradient.h b/app/operations/gimpoperationgradient.h
index 7fb86c7d82..eeb54e76ad 100644
--- a/app/operations/gimpoperationgradient.h
+++ b/app/operations/gimpoperationgradient.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_GRADIENT_H__
-#define __GIMP_OPERATION_GRADIENT_H__
-
+#pragma once
#include
@@ -69,5 +67,3 @@ struct _GimpOperationGradientClass
GType gimp_operation_gradient_get_type (void) G_GNUC_CONST;
-
-#endif /* __GIMP_OPERATION_GRADIENT_H__ */
diff --git a/app/operations/gimpoperationgrow.h b/app/operations/gimpoperationgrow.h
index d680997605..24655dea4a 100644
--- a/app/operations/gimpoperationgrow.h
+++ b/app/operations/gimpoperationgrow.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_GROW_H__
-#define __GIMP_OPERATION_GROW_H__
-
+#pragma once
#include
@@ -52,5 +50,3 @@ struct _GimpOperationGrowClass
GType gimp_operation_grow_get_type (void) G_GNUC_CONST;
-
-#endif /* __GIMP_OPERATION_GROW_H__ */
diff --git a/app/operations/gimpoperationhistogramsink.h b/app/operations/gimpoperationhistogramsink.h
index 719719c522..cc2affacee 100644
--- a/app/operations/gimpoperationhistogramsink.h
+++ b/app/operations/gimpoperationhistogramsink.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_HISTOGRAM_SINK_H__
-#define __GIMP_OPERATION_HISTOGRAM_SINK_H__
-
+#pragma once
#include
#include
@@ -52,5 +50,3 @@ struct _GimpOperationHistogramSinkClass
GType gimp_operation_histogram_sink_get_type (void) G_GNUC_CONST;
-
-#endif /* __GIMP_OPERATION_HISTOGRAM_SINK_C__ */
diff --git a/app/operations/gimpoperationhuesaturation.h b/app/operations/gimpoperationhuesaturation.h
index 7baf425342..2e860d6412 100644
--- a/app/operations/gimpoperationhuesaturation.h
+++ b/app/operations/gimpoperationhuesaturation.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_HUE_SATURATION_H__
-#define __GIMP_OPERATION_HUE_SATURATION_H__
-
+#pragma once
#include "gimpoperationpointfilter.h"
@@ -52,6 +50,3 @@ GType gimp_operation_hue_saturation_get_type (void) G_GNUC_CONST;
void gimp_operation_hue_saturation_map (GimpHueSaturationConfig *config,
GeglColor *color,
GimpHueRange range);
-
-
-#endif /* __GIMP_OPERATION_HUE_SATURATION_H__ */
diff --git a/app/operations/gimpoperationlevels.h b/app/operations/gimpoperationlevels.h
index d977f42663..5d1def9a59 100644
--- a/app/operations/gimpoperationlevels.h
+++ b/app/operations/gimpoperationlevels.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_LEVELS_H__
-#define __GIMP_OPERATION_LEVELS_H__
-
+#pragma once
#include "gimpoperationpointfilter.h"
@@ -52,6 +50,3 @@ GType gimp_operation_levels_get_type (void) G_GNUC_CONST;
gdouble gimp_operation_levels_map_input (GimpLevelsConfig *config,
GimpHistogramChannel channel,
gdouble value);
-
-
-#endif /* __GIMP_OPERATION_LEVELS_H__ */
diff --git a/app/operations/gimpoperationmaskcomponents.h b/app/operations/gimpoperationmaskcomponents.h
index 0919a3876f..86f56f6bf0 100644
--- a/app/operations/gimpoperationmaskcomponents.h
+++ b/app/operations/gimpoperationmaskcomponents.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_MASK_COMPONENTS_H__
-#define __GIMP_OPERATION_MASK_COMPONENTS_H__
+#pragma once
#include
@@ -63,6 +62,3 @@ void gimp_operation_mask_components_process (const Babl *forma
gpointer out,
gint n,
GimpComponentMask mask);
-
-
-#endif /* __GIMP_OPERATION_MASK_COMPONENTS_H__ */
diff --git a/app/operations/gimpoperationoffset.h b/app/operations/gimpoperationoffset.h
index edc567029c..a47cab4f3e 100644
--- a/app/operations/gimpoperationoffset.h
+++ b/app/operations/gimpoperationoffset.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_OFFSET_H__
-#define __GIMP_OPERATION_OFFSET_H__
+#pragma once
#define GIMP_TYPE_OPERATION_OFFSET (gimp_operation_offset_get_type ())
@@ -50,6 +49,3 @@ struct _GimpOperationOffsetClass
GType gimp_operation_offset_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_OFFSET_H__ */
diff --git a/app/operations/gimpoperationpointfilter.h b/app/operations/gimpoperationpointfilter.h
index 10b7ffa3b7..55b50d6f9a 100644
--- a/app/operations/gimpoperationpointfilter.h
+++ b/app/operations/gimpoperationpointfilter.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_POINT_FILTER_H__
-#define __GIMP_OPERATION_POINT_FILTER_H__
-
+#pragma once
#include
#include
@@ -68,6 +66,3 @@ void gimp_operation_point_filter_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
-
-
-#endif /* __GIMP_OPERATION_POINT_FILTER_H__ */
diff --git a/app/operations/gimpoperationposterize.h b/app/operations/gimpoperationposterize.h
index 06e5731b4b..af314528ee 100644
--- a/app/operations/gimpoperationposterize.h
+++ b/app/operations/gimpoperationposterize.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_POSTERIZE_H__
-#define __GIMP_OPERATION_POSTERIZE_H__
-
+#pragma once
#include "gimpoperationpointfilter.h"
@@ -50,6 +48,3 @@ struct _GimpOperationPosterizeClass
GType gimp_operation_posterize_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_POSTERIZE_H__ */
diff --git a/app/operations/gimpoperationprofiletransform.h b/app/operations/gimpoperationprofiletransform.h
index 52aaf4a7c2..8db44106bb 100644
--- a/app/operations/gimpoperationprofiletransform.h
+++ b/app/operations/gimpoperationprofiletransform.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_PROFILE_TRANSFORM_H__
-#define __GIMP_OPERATION_PROFILE_TRANSFORM_H__
-
+#pragma once
#include
#include
@@ -60,6 +58,3 @@ struct _GimpOperationProfileTransformClass
GType gimp_operation_profile_transform_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_PROFILE_TRANSFORM_H__ */
diff --git a/app/operations/gimpoperationscalarmultiply.h b/app/operations/gimpoperationscalarmultiply.h
index 61122b75b5..54e82b2595 100644
--- a/app/operations/gimpoperationscalarmultiply.h
+++ b/app/operations/gimpoperationscalarmultiply.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_SCALAR_MULTIPLY_H__
-#define __GIMP_OPERATION_SCALAR_MULTIPLY_H__
-
+#pragma once
#include
@@ -51,6 +49,3 @@ struct _GimpOperationScalarMultiplyClass
GType gimp_operation_scalar_multiply_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_SCALAR_MULTIPLY_H__ */
diff --git a/app/operations/gimpoperationsemiflatten.h b/app/operations/gimpoperationsemiflatten.h
index 7e537caf45..ecfd3f82df 100644
--- a/app/operations/gimpoperationsemiflatten.h
+++ b/app/operations/gimpoperationsemiflatten.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_SEMI_FLATTEN_H__
-#define __GIMP_OPERATION_SEMI_FLATTEN_H__
-
+#pragma once
#include
@@ -50,6 +48,3 @@ struct _GimpOperationSemiFlattenClass
GType gimp_operation_semi_flatten_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_SEMI_FLATTEN_H__ */
diff --git a/app/operations/gimpoperationsetalpha.h b/app/operations/gimpoperationsetalpha.h
index 741ae1ea68..576bc03276 100644
--- a/app/operations/gimpoperationsetalpha.h
+++ b/app/operations/gimpoperationsetalpha.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_SET_ALPHA_H__
-#define __GIMP_OPERATION_SET_ALPHA_H__
-
+#pragma once
#include
@@ -50,6 +48,3 @@ struct _GimpOperationSetAlphaClass
GType gimp_operation_set_alpha_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_SET_ALPHA_H__ */
diff --git a/app/operations/gimpoperationsettings.h b/app/operations/gimpoperationsettings.h
index bb65db5f82..775bf28fa7 100644
--- a/app/operations/gimpoperationsettings.h
+++ b/app/operations/gimpoperationsettings.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_SETTINGS_H__
-#define __GIMP_OPERATION_SETTINGS_H__
-
+#pragma once
#include "core/gimpsettings.h"
@@ -68,6 +66,3 @@ void gimp_operation_settings_config_reset_base (GimpConfig
gboolean gimp_operation_settings_config_copy_base (GimpConfig *src,
GimpConfig *dest,
GParamFlags flags);
-
-
-#endif /* __GIMP_OPERATION_SETTINGS_H__ */
diff --git a/app/operations/gimpoperationshrink.h b/app/operations/gimpoperationshrink.h
index 1ba58e6229..8a5033e422 100644
--- a/app/operations/gimpoperationshrink.h
+++ b/app/operations/gimpoperationshrink.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_SHRINK_H__
-#define __GIMP_OPERATION_SHRINK_H__
-
+#pragma once
#include
@@ -52,6 +50,3 @@ struct _GimpOperationShrinkClass
GType gimp_operation_shrink_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_SHRINK_H__ */
diff --git a/app/operations/gimpoperationthreshold.h b/app/operations/gimpoperationthreshold.h
index dcdf52b216..4361d33e19 100644
--- a/app/operations/gimpoperationthreshold.h
+++ b/app/operations/gimpoperationthreshold.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_THRESHOLD_H__
-#define __GIMP_OPERATION_THRESHOLD_H__
-
+#pragma once
#include "gimpoperationpointfilter.h"
@@ -52,6 +50,3 @@ struct _GimpOperationThresholdClass
GType gimp_operation_threshold_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_THRESHOLD_H__ */
diff --git a/app/operations/gimpoperationthresholdalpha.h b/app/operations/gimpoperationthresholdalpha.h
index 03392893ce..5c8eec5477 100644
--- a/app/operations/gimpoperationthresholdalpha.h
+++ b/app/operations/gimpoperationthresholdalpha.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_THRESHOLD_ALPHA_H__
-#define __GIMP_OPERATION_THRESHOLD_ALPHA_H__
-
+#pragma once
#include
#include
@@ -51,6 +49,3 @@ struct _GimpOperationThresholdAlphaClass
GType gimp_operation_threshold_alpha_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_THRESHOLD_ALPHA_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpcolor-legacy.h b/app/operations/layer-modes-legacy/gimpcolor-legacy.h
index 64f15cddae..cbd1ab851d 100644
--- a/app/operations/layer-modes-legacy/gimpcolor-legacy.h
+++ b/app/operations/layer-modes-legacy/gimpcolor-legacy.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_COLOR_LEGACY_H__
-#define __GIMP_COLOR_LEGACY_H__
+#pragma once
void gimp_rgb_to_hsv_legacy (gdouble *rgb,
@@ -31,6 +30,3 @@ void gimp_rgb_to_hsl_legacy (gdouble *rgb,
gdouble *hsl);
void gimp_hsl_to_rgb_legacy (gdouble *hsl,
gdouble *rgb);
-
-
-#endif /* __GIMP_COLOR_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
index 7f9df60c60..dd6ee8c0d7 100644
--- a/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_ADDITION_LEGACY_H__
-#define __GIMP_OPERATION_ADDITION_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -49,5 +47,3 @@ struct _GimpOperationAdditionLegacyClass
GType gimp_operation_addition_legacy_get_type (void) G_GNUC_CONST;
-
-#endif /* __GIMP_OPERATION_ADDITION_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
index dc13e3fc4c..85141ed681 100644
--- a/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_BURN_LEGACY_H__
-#define __GIMP_OPERATION_BURN_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationBurnLegacyClass
GType gimp_operation_burn_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_BURN_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
index c0406a10c9..d4d91bc926 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_DARKEN_ONLY_LEGACY_H__
-#define __GIMP_OPERATION_DARKEN_ONLY_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationDarkenOnlyLegacyClass
GType gimp_operation_darken_only_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_DARKEN_ONLY_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
index 145b9c2d38..55ef8c189d 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_DIFFERENCE_LEGACY_H__
-#define __GIMP_OPERATION_DIFFERENCE_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationDifferenceLegacyClass
GType gimp_operation_difference_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_DIFFERENCE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
index fa5de12cdc..805e9a79d2 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_DIVIDE_LEGACY_H__
-#define __GIMP_OPERATION_DIVIDE_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationDivideLegacyClass
GType gimp_operation_divide_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_DIVIDE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
index b640fedf7f..bae72f2761 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_DODGE_LEGACY_H__
-#define __GIMP_OPERATION_DODGE_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationDodgeLegacyClass
GType gimp_operation_dodge_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_DODGE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
index 149ee095ad..a6d3251b4c 100644
--- a/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_GRAIN_EXTRACT_LEGACY_H__
-#define __GIMP_OPERATION_GRAIN_EXTRACT_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationGrainExtractLegacyClass
GType gimp_operation_grain_extract_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_GRAIN_EXTRACT_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
index 344e89566b..e082b109c2 100644
--- a/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_GRAIN_MERGE_LEGACY_H__
-#define __GIMP_OPERATION_GRAIN_MERGE_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationGrainMergeLegacyClass
GType gimp_operation_grain_merge_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_GRAIN_MERGE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
index 38791be2e1..32ec46fbf1 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_HARDLIGHT_LEGACY_H__
-#define __GIMP_OPERATION_HARDLIGHT_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationHardlightLegacyClass
GType gimp_operation_hardlight_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_HARDLIGHT_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhslcolorlegacy.h b/app/operations/layer-modes-legacy/gimpoperationhslcolorlegacy.h
index add2933945..cc047aa8ae 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhslcolorlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhslcolorlegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_HSL_COLOR_LEGACY_H__
-#define __GIMP_OPERATION_HSL_COLOR_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationHslColorLegacyClass
GType gimp_operation_hsl_color_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_HSL_COLOR_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
index 59ef1259c8..d1db7de0e3 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_HSV_HUE_LEGACY_H__
-#define __GIMP_OPERATION_HSV_HUE_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationHsvHueLegacyClass
GType gimp_operation_hsv_hue_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_HSV_HUE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
index ecb5589af1..604198ba06 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_HSV_SATURATION_LEGACY_H__
-#define __GIMP_OPERATION_HSV_SATURATION_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationHsvSaturationLegacyClass
GType gimp_operation_hsv_saturation_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_HSV_SATURATION_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
index 7701ffd9f6..45bed5f2af 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_HSV_VALUE_LEGACY_H__
-#define __GIMP_OPERATION_HSV_VALUE_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -49,5 +47,3 @@ struct _GimpOperationHsvValueLegacyClass
GType gimp_operation_hsv_value_legacy_get_type (void) G_GNUC_CONST;
-
-#endif /* __GIMP_OPERATION_HSV_VALUE_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
index 2417d57f90..13699a6dc4 100644
--- a/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_LIGHTEN_ONLY_LEGACY_H__
-#define __GIMP_OPERATION_LIGHTEN_ONLY_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationLightenOnlyLegacyClass
GType gimp_operation_lighten_only_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_LIGHTEN_ONLY_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
index f099ebdaa2..ba585d5e4e 100644
--- a/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_MULTIPLY_LEGACY_H__
-#define __GIMP_OPERATION_MULTIPLY_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationMultiplyLegacyClass
GType gimp_operation_multiply_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_MULTIPLY_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
index 5d0dc9e0df..429ec0b2f6 100644
--- a/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_SCREEN_LEGACY_H__
-#define __GIMP_OPERATION_SCREEN_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationScreenLegacyClass
GType gimp_operation_screen_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_SCREEN_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h b/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h
index aa8930e3f3..f280b53653 100644
--- a/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_SOFTLIGHT_LEGACY_H__
-#define __GIMP_OPERATION_SOFTLIGHT_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationSoftlightLegacyClass
GType gimp_operation_softlight_legacy_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_SOFTLIGHT_LEGACY_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
index 34a55d56a0..32c8c29c19 100644
--- a/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_SUBTRACT_LEGACY_H__
-#define __GIMP_OPERATION_SUBTRACT_LEGACY_H__
-
+#pragma once
#include "operations/layer-modes/gimpoperationlayermode.h"
@@ -49,5 +47,3 @@ struct _GimpOperationSubtractLegacyClass
GType gimp_operation_subtract_legacy_get_type (void) G_GNUC_CONST;
-
-#endif /* __GIMP_OPERATION_SUBTRACT_LEGACY_H__ */
diff --git a/app/operations/layer-modes/gimp-layer-modes.h b/app/operations/layer-modes/gimp-layer-modes.h
index 34ebf64d2e..a5e8b1b8d9 100644
--- a/app/operations/layer-modes/gimp-layer-modes.h
+++ b/app/operations/layer-modes/gimp-layer-modes.h
@@ -19,8 +19,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_LAYER_MODES_H__
-#define __GIMP_LAYER_MODES_H__
+#pragma once
void gimp_layer_modes_init (void);
@@ -71,5 +70,3 @@ const Babl * gimp_layer_mode_get_format (GimpLayer
GimpLayerCompositeRegion gimp_layer_mode_get_included_region (GimpLayerMode mode,
GimpLayerCompositeMode composite_mode);
-
-#endif /* __GIMP_LAYER_MODES_H__ */
diff --git a/app/operations/layer-modes/gimpoperationantierase.h b/app/operations/layer-modes/gimpoperationantierase.h
index 0c5ddf819c..e416d6dbcf 100644
--- a/app/operations/layer-modes/gimpoperationantierase.h
+++ b/app/operations/layer-modes/gimpoperationantierase.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_ANTI_ERASE_H__
-#define __GIMP_OPERATION_ANTI_ERASE_H__
-
+#pragma once
#include "gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationAntiEraseClass
GType gimp_operation_anti_erase_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_ANTI_ERASE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationbehind.h b/app/operations/layer-modes/gimpoperationbehind.h
index 46b9ac4ff1..ecbf154df8 100644
--- a/app/operations/layer-modes/gimpoperationbehind.h
+++ b/app/operations/layer-modes/gimpoperationbehind.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_BEHIND_H__
-#define __GIMP_OPERATION_BEHIND_H__
-
+#pragma once
#include "gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationBehindClass
GType gimp_operation_behind_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_BEHIND_H__ */
diff --git a/app/operations/layer-modes/gimpoperationdissolve.h b/app/operations/layer-modes/gimpoperationdissolve.h
index d448918478..7853db6efd 100644
--- a/app/operations/layer-modes/gimpoperationdissolve.h
+++ b/app/operations/layer-modes/gimpoperationdissolve.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_DISSOLVE_H__
-#define __GIMP_OPERATION_DISSOLVE_H__
-
+#pragma once
#include "gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationDissolve
GType gimp_operation_dissolve_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_DISSOLVE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationerase.h b/app/operations/layer-modes/gimpoperationerase.h
index fec309b8e9..b79e6332e1 100644
--- a/app/operations/layer-modes/gimpoperationerase.h
+++ b/app/operations/layer-modes/gimpoperationerase.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_ERASE_H__
-#define __GIMP_OPERATION_ERASE_H__
-
+#pragma once
#include "gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationEraseClass
GType gimp_operation_erase_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_ERASE_MODE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationlayermode-blend.h b/app/operations/layer-modes/gimpoperationlayermode-blend.h
index 3a8f995070..e8218ba9d0 100644
--- a/app/operations/layer-modes/gimpoperationlayermode-blend.h
+++ b/app/operations/layer-modes/gimpoperationlayermode-blend.h
@@ -20,8 +20,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_LAYER_MODE_BLEND_H__
-#define __GIMP_OPERATION_LAYER_MODE_BLEND_H__
+#pragma once
/* nonsubtractive blend functions */
@@ -195,6 +194,3 @@ void gimp_operation_layer_mode_blend_color_erase (GeglOperation *operation
const gfloat *layer,
gfloat *comp,
gint samples);
-
-
-#endif /* __GIMP_OPERATION_LAYER_MODE_BLEND_H__ */
diff --git a/app/operations/layer-modes/gimpoperationlayermode-composite.h b/app/operations/layer-modes/gimpoperationlayermode-composite.h
index f9ec2a547a..26852c3175 100644
--- a/app/operations/layer-modes/gimpoperationlayermode-composite.h
+++ b/app/operations/layer-modes/gimpoperationlayermode-composite.h
@@ -20,8 +20,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_LAYER_MODE_COMPOSITE_H__
-#define __GIMP_OPERATION_LAYER_MODE_COMPOSITE_H__
+#pragma once
void gimp_operation_layer_mode_composite_union (const gfloat *in,
@@ -93,6 +92,3 @@ void gimp_operation_layer_mode_composite_clip_to_backdrop_sse2 (const gfloat
gint samples);
#endif /* COMPILE_SSE2_INTRINISICS */
-
-
-#endif /* __GIMP_OPERATION_LAYER_MODE_COMPOSITE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationlayermode.h b/app/operations/layer-modes/gimpoperationlayermode.h
index dad840857e..6a2cabc76c 100644
--- a/app/operations/layer-modes/gimpoperationlayermode.h
+++ b/app/operations/layer-modes/gimpoperationlayermode.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_LAYER_MODE_H__
-#define __GIMP_OPERATION_LAYER_MODE_H__
-
+#pragma once
#include
@@ -87,6 +85,3 @@ struct _GimpOperationLayerModeClass
GType gimp_operation_layer_mode_get_type (void) G_GNUC_CONST;
GimpLayerCompositeRegion gimp_operation_layer_mode_get_affected_region (GimpOperationLayerMode *layer_mode);
-
-
-#endif /* __GIMP_OPERATION_LAYER_MODE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationmerge.h b/app/operations/layer-modes/gimpoperationmerge.h
index 01afde17fb..12dcabbfaa 100644
--- a/app/operations/layer-modes/gimpoperationmerge.h
+++ b/app/operations/layer-modes/gimpoperationmerge.h
@@ -19,9 +19,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_MERGE_H__
-#define __GIMP_OPERATION_MERGE_H__
-
+#pragma once
#include "gimpoperationlayermode.h"
@@ -49,6 +47,3 @@ struct _GimpOperationMergeClass
GType gimp_operation_merge_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_MERGE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationnormal.h b/app/operations/layer-modes/gimpoperationnormal.h
index 6fa1b36408..011ee0380c 100644
--- a/app/operations/layer-modes/gimpoperationnormal.h
+++ b/app/operations/layer-modes/gimpoperationnormal.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_NORMAL_H__
-#define __GIMP_OPERATION_NORMAL_H__
-
+#pragma once
#include "gimpoperationlayermode.h"
@@ -86,6 +84,3 @@ gboolean gimp_operation_normal_process_sse4 (GeglOperation *op,
gint level);
#endif /* COMPILE_SSE4_1_INTRINISICS */
-
-
-#endif /* __GIMP_OPERATION_NORMAL_H__ */
diff --git a/app/operations/layer-modes/gimpoperationoverwrite.h b/app/operations/layer-modes/gimpoperationoverwrite.h
index 2ac63264d3..4614fad444 100644
--- a/app/operations/layer-modes/gimpoperationoverwrite.h
+++ b/app/operations/layer-modes/gimpoperationoverwrite.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_OVERWRITE_H__
-#define __GIMP_OPERATION_OVERWRITE_H__
-
+#pragma once
#include "gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationOverwriteClass
GType gimp_operation_overwrite_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_OVERWRITE_MODE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationpassthrough.h b/app/operations/layer-modes/gimpoperationpassthrough.h
index 5a5b83852c..e4f6e67c7c 100644
--- a/app/operations/layer-modes/gimpoperationpassthrough.h
+++ b/app/operations/layer-modes/gimpoperationpassthrough.h
@@ -19,9 +19,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_PASS_THROUGH_H__
-#define __GIMP_OPERATION_PASS_THROUGH_H__
-
+#pragma once
#include "gimpoperationreplace.h"
@@ -49,6 +47,3 @@ struct _GimpOperationPassThroughClass
GType gimp_operation_pass_through_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_PASS_THROUGH_H__ */
diff --git a/app/operations/layer-modes/gimpoperationreplace.h b/app/operations/layer-modes/gimpoperationreplace.h
index f8d7b0ca05..e41907fb1e 100644
--- a/app/operations/layer-modes/gimpoperationreplace.h
+++ b/app/operations/layer-modes/gimpoperationreplace.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_REPLACE_H__
-#define __GIMP_OPERATION_REPLACE_H__
-
+#pragma once
#include "gimpoperationlayermode.h"
@@ -48,6 +46,3 @@ struct _GimpOperationReplaceClass
GType gimp_operation_replace_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_REPLACE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationsplit.h b/app/operations/layer-modes/gimpoperationsplit.h
index e1dbbe96e3..bb014b98d9 100644
--- a/app/operations/layer-modes/gimpoperationsplit.h
+++ b/app/operations/layer-modes/gimpoperationsplit.h
@@ -19,9 +19,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_OPERATION_SPLIT_H__
-#define __GIMP_OPERATION_SPLIT_H__
-
+#pragma once
#include "gimpoperationlayermode.h"
@@ -49,6 +47,3 @@ struct _GimpOperationSplitClass
GType gimp_operation_split_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_OPERATION_SPLIT_H__ */
diff --git a/app/operations/operations-enums.h b/app/operations/operations-enums.h
index c9f586f758..d893ba585b 100644
--- a/app/operations/operations-enums.h
+++ b/app/operations/operations-enums.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __OPERATIONS_ENUMS_H__
-#define __OPERATIONS_ENUMS_H__
+#pragma once
#define GIMP_TYPE_LAYER_COLOR_SPACE (gimp_layer_color_space_get_type ())
@@ -192,6 +191,3 @@ typedef enum /*< pdb-skip, skip >*/
GIMP_LAYER_MODE_FLAG_ALPHA_ONLY = 1 << 5,
GIMP_LAYER_MODE_FLAG_TRIVIAL = 1 << 6
} GimpLayerModeFlags;
-
-
-#endif /* __OPERATIONS_ENUMS_H__ */
diff --git a/app/operations/operations-types.h b/app/operations/operations-types.h
index 15e97d861d..f0cac9610f 100644
--- a/app/operations/operations-types.h
+++ b/app/operations/operations-types.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __OPERATIONS_TYPES_H__
-#define __OPERATIONS_TYPES_H__
-
+#pragma once
#include
@@ -71,6 +69,3 @@ typedef void (* GimpLayerModeBlendFunc) (GeglOperation *operation,
const gfloat *layer,
gfloat *out,
gint samples);
-
-
-#endif /* __OPERATIONS_TYPES_H__ */
diff --git a/app/paint/gimp-paint.h b/app/paint/gimp-paint.h
index 97dee10bff..ddc75d067e 100644
--- a/app/paint/gimp-paint.h
+++ b/app/paint/gimp-paint.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PAINT_H__
-#define __GIMP_PAINT_H__
+#pragma once
void gimp_paint_init (Gimp *gimp);
void gimp_paint_exit (Gimp *gimp);
-
-
-#endif /* __GIMP_PAINT_H__ */
diff --git a/app/paint/gimpairbrush.h b/app/paint/gimpairbrush.h
index 23b2b859a0..2ac15cf8f9 100644
--- a/app/paint/gimpairbrush.h
+++ b/app/paint/gimpairbrush.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_AIRBRUSH_H__
-#define __GIMP_AIRBRUSH_H__
-
+#pragma once
#include "gimppaintbrush.h"
@@ -59,6 +57,3 @@ void gimp_airbrush_register (Gimp *gimp,
GType gimp_airbrush_get_type (void) G_GNUC_CONST;
void gimp_airbrush_stamp (GimpAirbrush *airbrush);
-
-
-#endif /* __GIMP_AIRBRUSH_H__ */
diff --git a/app/paint/gimpairbrushoptions.h b/app/paint/gimpairbrushoptions.h
index d7d8bcdb5f..01441253d7 100644
--- a/app/paint/gimpairbrushoptions.h
+++ b/app/paint/gimpairbrushoptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_AIRBRUSH_OPTIONS_H__
-#define __GIMP_AIRBRUSH_OPTIONS_H__
-
+#pragma once
#include "gimppaintoptions.h"
@@ -49,5 +47,3 @@ struct _GimpAirbrushOptionsClass
GType gimp_airbrush_options_get_type (void) G_GNUC_CONST;
-
-#endif /* __GIMP_AIRBRUSH_OPTIONS_H__ */
diff --git a/app/paint/gimpbrushcore-kernels.h b/app/paint/gimpbrushcore-kernels.h
index ea5eb4530c..4adcbb33c2 100644
--- a/app/paint/gimpbrushcore-kernels.h
+++ b/app/paint/gimpbrushcore-kernels.h
@@ -4,8 +4,7 @@
* (threshold = 0.25)
*/
-#ifndef __GIMP_BRUSH_CORE_KERNELS_H__
-#define __GIMP_BRUSH_CORE_KERNELS_H__
+#pragma once
#define KERNEL_WIDTH 3
@@ -111,6 +110,3 @@ template
constexpr typename Subsample::kernel_type Subsample::kernel[5][5][9];
#endif /* __cplusplus */
-
-
-#endif /* __GIMP_BRUSH_CORE_KERNELS_H__ */
diff --git a/app/paint/gimpbrushcore-loops.h b/app/paint/gimpbrushcore-loops.h
index 6fde397eb5..928edba1a9 100644
--- a/app/paint/gimpbrushcore-loops.h
+++ b/app/paint/gimpbrushcore-loops.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_CORE_LOOPS_H__
-#define __GIMP_BRUSH_CORE_LOOPS_H__
+#pragma once
const GimpTempBuf * gimp_brush_core_subsample_mask (GimpBrushCore *core,
@@ -32,6 +31,3 @@ const GimpTempBuf * gimp_brush_core_solidify_mask (GimpBrushCore *core,
const GimpTempBuf *brush_mask,
gdouble x,
gdouble y);
-
-
-#endif /* __GIMP_BRUSH_CORE_LOOPS_H__ */
diff --git a/app/paint/gimpbrushcore.h b/app/paint/gimpbrushcore.h
index a6ab08bdd6..1bcf5d0999 100644
--- a/app/paint/gimpbrushcore.h
+++ b/app/paint/gimpbrushcore.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BRUSH_CORE_H__
-#define __GIMP_BRUSH_CORE_H__
-
+#pragma once
#include "gimppaintcore.h"
@@ -147,6 +145,3 @@ void gimp_brush_core_eval_transform_symmetry
(GimpBrushCore *core,
GimpSymmetry *symmetry,
gint stroke);
-
-
-#endif /* __GIMP_BRUSH_CORE_H__ */
diff --git a/app/paint/gimpclone.h b/app/paint/gimpclone.h
index dced05b2ad..23fcbbba34 100644
--- a/app/paint/gimpclone.h
+++ b/app/paint/gimpclone.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CLONE_H__
-#define __GIMP_CLONE_H__
-
+#pragma once
#include "gimpsourcecore.h"
@@ -47,6 +45,3 @@ void gimp_clone_register (Gimp *gimp,
GimpPaintRegisterCallback callback);
GType gimp_clone_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_CLONE_H__ */
diff --git a/app/paint/gimpcloneoptions.h b/app/paint/gimpcloneoptions.h
index b71f217212..fe54702d8c 100644
--- a/app/paint/gimpcloneoptions.h
+++ b/app/paint/gimpcloneoptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CLONE_OPTIONS_H__
-#define __GIMP_CLONE_OPTIONS_H__
-
+#pragma once
#include "gimpsourceoptions.h"
@@ -46,6 +44,3 @@ struct _GimpCloneOptionsClass
GType gimp_clone_options_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_CLONE_OPTIONS_H__ */
diff --git a/app/paint/gimpconvolve.h b/app/paint/gimpconvolve.h
index 1aecf033b1..0144308e24 100644
--- a/app/paint/gimpconvolve.h
+++ b/app/paint/gimpconvolve.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONVOLVE_H__
-#define __GIMP_CONVOLVE_H__
-
+#pragma once
#include "gimpbrushcore.h"
@@ -49,6 +47,3 @@ void gimp_convolve_register (Gimp *gimp,
GimpPaintRegisterCallback callback);
GType gimp_convolve_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_CONVOLVE_H__ */
diff --git a/app/paint/gimpconvolveoptions.h b/app/paint/gimpconvolveoptions.h
index 62bd99b77c..2fb2ecc57f 100644
--- a/app/paint/gimpconvolveoptions.h
+++ b/app/paint/gimpconvolveoptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONVOLVE_OPTIONS_H__
-#define __GIMP_CONVOLVE_OPTIONS_H__
-
+#pragma once
#include "gimppaintoptions.h"
@@ -47,6 +45,3 @@ struct _GimpConvolveOptionsClass
GType gimp_convolve_options_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_CONVOLVE_OPTIONS_H__ */
diff --git a/app/paint/gimpdodgeburn.h b/app/paint/gimpdodgeburn.h
index 859887b67a..58e4ff3c87 100644
--- a/app/paint/gimpdodgeburn.h
+++ b/app/paint/gimpdodgeburn.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DODGE_BURN_H__
-#define __GIMP_DODGE_BURN_H__
-
+#pragma once
#include "gimpbrushcore.h"
@@ -46,6 +44,3 @@ void gimp_dodge_burn_register (Gimp *gimp,
GimpPaintRegisterCallback callback);
GType gimp_dodge_burn_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_DODGE_BURN_H__ */
diff --git a/app/paint/gimpdodgeburnoptions.h b/app/paint/gimpdodgeburnoptions.h
index 02eed8a4ab..d312a822cc 100644
--- a/app/paint/gimpdodgeburnoptions.h
+++ b/app/paint/gimpdodgeburnoptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DODGE_BURN_OPTIONS_H__
-#define __GIMP_DODGE_BURN_OPTIONS_H__
-
+#pragma once
#include "gimppaintoptions.h"
@@ -48,6 +46,3 @@ struct _GimpDodgeBurnOptionsClass
GType gimp_dodge_burn_options_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_DODGE_BURN_OPTIONS_H__ */
diff --git a/app/paint/gimperaser.h b/app/paint/gimperaser.h
index 5b04a3292f..4a62673931 100644
--- a/app/paint/gimperaser.h
+++ b/app/paint/gimperaser.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ERASER_H__
-#define __GIMP_ERASER_H__
-
+#pragma once
#include "gimppaintbrush.h"
@@ -48,5 +46,3 @@ void gimp_eraser_register (Gimp *gimp,
GType gimp_eraser_get_type (void) G_GNUC_CONST;
-
-#endif /* __GIMP_ERASER_H__ */
diff --git a/app/paint/gimperaseroptions.h b/app/paint/gimperaseroptions.h
index 3551d11f8b..a4a4a2f1d0 100644
--- a/app/paint/gimperaseroptions.h
+++ b/app/paint/gimperaseroptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ERASER_OPTIONS_H__
-#define __GIMP_ERASER_OPTIONS_H__
-
+#pragma once
#include "gimppaintoptions.h"
@@ -46,6 +44,3 @@ struct _GimpEraserOptionsClass
GType gimp_eraser_options_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_ERASER_OPTIONS_H__ */
diff --git a/app/paint/gimpheal.h b/app/paint/gimpheal.h
index 780609d9ab..ce067fe9b7 100644
--- a/app/paint/gimpheal.h
+++ b/app/paint/gimpheal.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_HEAL_H__
-#define __GIMP_HEAL_H__
-
+#pragma once
#include "gimpsourcecore.h"
@@ -47,6 +45,3 @@ void gimp_heal_register (Gimp *gimp,
GimpPaintRegisterCallback callback);
GType gimp_heal_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_HEAL_H__ */
diff --git a/app/paint/gimpink-blob.h b/app/paint/gimpink-blob.h
index 53ff27aa31..d8cea45994 100644
--- a/app/paint/gimpink-blob.h
+++ b/app/paint/gimpink-blob.h
@@ -19,8 +19,7 @@
*
*/
-#ifndef __GIMP_INK_BLOB_H__
-#define __GIMP_INK_BLOB_H__
+#pragma once
typedef struct _GimpBlobPoint GimpBlobPoint;
@@ -85,6 +84,3 @@ GimpBlob * gimp_blob_duplicate (GimpBlob *b);
void gimp_blob_move (GimpBlob *b,
gint x,
gint y);
-
-
-#endif /* __GIMP_INK_BLOB_H__ */
diff --git a/app/paint/gimpink.h b/app/paint/gimpink.h
index bd9b32b9d2..d4e3f8077b 100644
--- a/app/paint/gimpink.h
+++ b/app/paint/gimpink.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_INK_H__
-#define __GIMP_INK_H__
-
+#pragma once
#include "gimppaintcore.h"
#include "gimpink-blob.h"
@@ -55,5 +53,3 @@ void gimp_ink_register (Gimp *gimp,
GType gimp_ink_get_type (void) G_GNUC_CONST;
-
-#endif /* __GIMP_INK_H__ */
diff --git a/app/paint/gimpinkoptions.h b/app/paint/gimpinkoptions.h
index 7776b609be..f2af64be1e 100644
--- a/app/paint/gimpinkoptions.h
+++ b/app/paint/gimpinkoptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_INK_OPTIONS_H__
-#define __GIMP_INK_OPTIONS_H__
-
+#pragma once
#include "gimppaintoptions.h"
@@ -55,6 +53,3 @@ struct _GimpInkOptionsClass
GType gimp_ink_options_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_INK_OPTIONS_H__ */
diff --git a/app/paint/gimpinkundo.h b/app/paint/gimpinkundo.h
index 59abf02f5a..7d19dd8f74 100644
--- a/app/paint/gimpinkundo.h
+++ b/app/paint/gimpinkundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_INK_UNDO_H__
-#define __GIMP_INK_UNDO_H__
-
+#pragma once
#include "gimppaintcoreundo.h"
@@ -47,6 +45,3 @@ struct _GimpInkUndoClass
GType gimp_ink_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_INK_UNDO_H__ */
diff --git a/app/paint/gimppaintbrush.h b/app/paint/gimppaintbrush.h
index 16c2dd3475..132fe6a3c0 100644
--- a/app/paint/gimppaintbrush.h
+++ b/app/paint/gimppaintbrush.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PAINTBRUSH_H__
-#define __GIMP_PAINTBRUSH_H__
-
+#pragma once
#include "gimpbrushcore.h"
@@ -75,6 +73,3 @@ void _gimp_paintbrush_motion (GimpPaintCore *paint_core,
GimpPaintOptions *paint_options,
GimpSymmetry *sym,
gdouble opacity);
-
-
-#endif /* __GIMP_PAINTBRUSH_H__ */
diff --git a/app/paint/gimppaintcore-loops.h b/app/paint/gimppaintcore-loops.h
index 1d7e1fd361..d6bf909cb9 100644
--- a/app/paint/gimppaintcore-loops.h
+++ b/app/paint/gimppaintcore-loops.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PAINT_CORE_LOOPS_H__
-#define __GIMP_PAINT_CORE_LOOPS_H__
+#pragma once
typedef enum
@@ -65,6 +64,3 @@ typedef struct
void gimp_paint_core_loops_process (const GimpPaintCoreLoopsParams *params,
GimpPaintCoreLoopsAlgorithm algorithms);
-
-
-#endif /* __GIMP_PAINT_CORE_LOOPS_H__ */
diff --git a/app/paint/gimppaintcore-stroke.h b/app/paint/gimppaintcore-stroke.h
index b0bb25b3e9..7e5606e7fa 100644
--- a/app/paint/gimppaintcore-stroke.h
+++ b/app/paint/gimppaintcore-stroke.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PAINT_CORE_STROKE_H__
-#define __GIMP_PAINT_CORE_STROKE_H__
+#pragma once
gboolean gimp_paint_core_stroke (GimpPaintCore *core,
@@ -43,6 +42,3 @@ gboolean gimp_paint_core_stroke_path (GimpPaintCore *core,
GimpPath *path,
gboolean push_undo,
GError **error);
-
-
-#endif /* __GIMP_PAINT_CORE_STROKE_H__ */
diff --git a/app/paint/gimppaintcore.h b/app/paint/gimppaintcore.h
index deccff3401..e2f4d64759 100644
--- a/app/paint/gimppaintcore.h
+++ b/app/paint/gimppaintcore.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PAINT_CORE_H__
-#define __GIMP_PAINT_CORE_H__
-
+#pragma once
#include "core/gimpobject.h"
@@ -226,5 +224,3 @@ void gimp_paint_core_smooth_coords (GimpPaintCore *core,
GimpPaintOptions *paint_options,
GimpCoords *coords);
-
-#endif /* __GIMP_PAINT_CORE_H__ */
diff --git a/app/paint/gimppaintcoreundo.h b/app/paint/gimppaintcoreundo.h
index dca5c34a11..13d48cf7f9 100644
--- a/app/paint/gimppaintcoreundo.h
+++ b/app/paint/gimppaintcoreundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PAINT_CORE_UNDO_H__
-#define __GIMP_PAINT_CORE_UNDO_H__
-
+#pragma once
#include "core/gimpundo.h"
@@ -48,6 +46,3 @@ struct _GimpPaintCoreUndoClass
GType gimp_paint_core_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_PAINT_CORE_UNDO_H__ */
diff --git a/app/paint/gimppaintoptions.h b/app/paint/gimppaintoptions.h
index a5f2f9ed34..0a66d6a677 100644
--- a/app/paint/gimppaintoptions.h
+++ b/app/paint/gimppaintoptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PAINT_OPTIONS_H__
-#define __GIMP_PAINT_OPTIONS_H__
-
+#pragma once
#include "core/gimptooloptions.h"
@@ -180,6 +178,3 @@ gboolean gimp_paint_options_is_prop (const gchar *prop_name,
void gimp_paint_options_copy_props (GimpPaintOptions *src,
GimpPaintOptions *dest,
GimpContextPropMask prop_mask);
-
-
-#endif /* __GIMP_PAINT_OPTIONS_H__ */
diff --git a/app/paint/gimppencil.h b/app/paint/gimppencil.h
index 21fd8d27dc..7dd0c23d21 100644
--- a/app/paint/gimppencil.h
+++ b/app/paint/gimppencil.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PENCIL_H__
-#define __GIMP_PENCIL_H__
-
+#pragma once
#include "gimppaintbrush.h"
@@ -47,6 +45,3 @@ void gimp_pencil_register (Gimp *gimp,
GimpPaintRegisterCallback callback);
GType gimp_pencil_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_PENCIL_H__ */
diff --git a/app/paint/gimppenciloptions.h b/app/paint/gimppenciloptions.h
index f73850e7ca..664c88349f 100644
--- a/app/paint/gimppenciloptions.h
+++ b/app/paint/gimppenciloptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PENCIL_OPTIONS_H__
-#define __GIMP_PENCIL_OPTIONS_H__
-
+#pragma once
#include "gimppaintoptions.h"
@@ -44,6 +42,3 @@ struct _GimpPencilOptionsClass
GType gimp_pencil_options_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_PENCIL_OPTIONS_H__ */
diff --git a/app/paint/gimpperspectiveclone.h b/app/paint/gimpperspectiveclone.h
index 98da289a34..5f58ae298a 100644
--- a/app/paint/gimpperspectiveclone.h
+++ b/app/paint/gimpperspectiveclone.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PERSPECTIVE_CLONE_H__
-#define __GIMP_PERSPECTIVE_CLONE_H__
-
+#pragma once
#include "gimpclone.h"
@@ -70,6 +68,3 @@ void gimp_perspective_clone_get_source_point (GimpPerspectiveClone *clone,
gdouble y,
gdouble *newx,
gdouble *newy);
-
-
-#endif /* __GIMP_PERSPECTIVE_CLONE_H__ */
diff --git a/app/paint/gimpperspectivecloneoptions.h b/app/paint/gimpperspectivecloneoptions.h
index 026c24b27d..b9b878bbba 100644
--- a/app/paint/gimpperspectivecloneoptions.h
+++ b/app/paint/gimpperspectivecloneoptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PERSPECTIVE_CLONE_OPTIONS_H__
-#define __GIMP_PERSPECTIVE_CLONE_OPTIONS_H__
-
+#pragma once
#include "gimpcloneoptions.h"
@@ -46,6 +44,3 @@ struct _GimpPerspectiveCloneOptionsClass
GType gimp_perspective_clone_options_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_PERSPECTIVE_CLONE_OPTIONS_H__ */
diff --git a/app/paint/gimpsmudge.h b/app/paint/gimpsmudge.h
index 28be505a1e..943fe7c509 100644
--- a/app/paint/gimpsmudge.h
+++ b/app/paint/gimpsmudge.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_SMUDGE_H__
-#define __GIMP_SMUDGE_H__
-
+#pragma once
#include "gimpbrushcore.h"
@@ -51,5 +49,3 @@ void gimp_smudge_register (Gimp *gimp,
GType gimp_smudge_get_type (void) G_GNUC_CONST;
-
-#endif /* __GIMP_SMUDGE_H__ */
diff --git a/app/paint/gimpsmudgeoptions.h b/app/paint/gimpsmudgeoptions.h
index 910ff52e46..ba583f7551 100644
--- a/app/paint/gimpsmudgeoptions.h
+++ b/app/paint/gimpsmudgeoptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_SMUDGE_OPTIONS_H__
-#define __GIMP_SMUDGE_OPTIONS_H__
-
+#pragma once
#include "gimppaintoptions.h"
@@ -49,6 +47,3 @@ struct _GimpSmudgeOptionsClass
GType gimp_smudge_options_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_SMUDGE_OPTIONS_H__ */
diff --git a/app/paint/gimpsourcecore.h b/app/paint/gimpsourcecore.h
index 178de3b5f1..fd2c046b1a 100644
--- a/app/paint/gimpsourcecore.h
+++ b/app/paint/gimpsourcecore.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_SOURCE_CORE_H__
-#define __GIMP_SOURCE_CORE_H__
-
+#pragma once
#include "gimpbrushcore.h"
@@ -103,6 +101,3 @@ void gimp_source_core_motion (GimpSourceCore *source_core,
GimpPaintOptions *paint_options,
gboolean self_drawable,
GimpSymmetry *sym);
-
-
-#endif /* __GIMP_SOURCE_CORE_H__ */
diff --git a/app/paint/gimpsourceoptions.h b/app/paint/gimpsourceoptions.h
index 1426c4233f..6f061dd063 100644
--- a/app/paint/gimpsourceoptions.h
+++ b/app/paint/gimpsourceoptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_SOURCE_OPTIONS_H__
-#define __GIMP_SOURCE_OPTIONS_H__
-
+#pragma once
#include "gimppaintoptions.h"
@@ -56,5 +54,3 @@ struct _GimpSourceOptionsClass
GType gimp_source_options_get_type (void) G_GNUC_CONST;
-
-#endif /* __GIMP_SOURCE_OPTIONS_H__ */
diff --git a/app/paint/paint-enums.h b/app/paint/paint-enums.h
index 732324e496..a087f69f9a 100644
--- a/app/paint/paint-enums.h
+++ b/app/paint/paint-enums.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PAINT_ENUMS_H__
-#define __PAINT_ENUMS_H__
+#pragma once
#if 0
This file is parsed by two scripts, enumgen.pl in pdb,
@@ -88,5 +87,3 @@ typedef enum /*< skip, pdb-skip >*/
GIMP_PAINT_LOCK_BLINK_PENDING,
GIMP_PAINT_LOCK_BLINKED,
} GimpPaintLockBlinkState;
-
-#endif /* __PAINT_ENUMS_H__ */
diff --git a/app/paint/paint-types.h b/app/paint/paint-types.h
index 1c9d8ebefb..6370fc6804 100644
--- a/app/paint/paint-types.h
+++ b/app/paint/paint-types.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PAINT_TYPES_H__
-#define __PAINT_TYPES_H__
-
+#pragma once
#include "core/core-types.h"
#include "paint/paint-enums.h"
@@ -71,6 +69,3 @@ typedef void (* GimpPaintRegisterCallback) (Gimp *gimp,
typedef void (* GimpPaintRegisterFunc) (Gimp *gimp,
GimpPaintRegisterCallback callback);
-
-
-#endif /* __PAINT_TYPES_H__ */
diff --git a/app/path/gimpanchor.h b/app/path/gimpanchor.h
index 75203a4430..e6ae1fb0e9 100644
--- a/app/path/gimpanchor.h
+++ b/app/path/gimpanchor.h
@@ -18,8 +18,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ANCHOR_H__
-#define __GIMP_ANCHOR_H__
+#pragma once
+
#define GIMP_ANCHOR(anchor) ((GimpAnchor *) (anchor))
@@ -43,6 +43,3 @@ GimpAnchor * gimp_anchor_new (GimpAnchorType type,
GimpAnchor * gimp_anchor_copy (const GimpAnchor *anchor);
void gimp_anchor_free (GimpAnchor *anchor);
-
-
-#endif /* __GIMP_ANCHOR_H__ */
diff --git a/app/path/gimpbezierstroke.h b/app/path/gimpbezierstroke.h
index 2fbeabd6e9..ac8a928c99 100644
--- a/app/path/gimpbezierstroke.h
+++ b/app/path/gimpbezierstroke.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BEZIER_STROKE_H__
-#define __GIMP_BEZIER_STROKE_H__
+#pragma once
#include "gimpstroke.h"
@@ -79,6 +78,3 @@ GimpAnchor * gimp_bezier_stroke_extend (GimpStroke *stroke,
const GimpCoords *coords,
GimpAnchor *neighbor,
GimpStrokeExtendMode extend_mode);
-
-
-#endif /* __GIMP_BEZIER_STROKE_H__ */
diff --git a/app/path/gimppath-compat.h b/app/path/gimppath-compat.h
index 6a0b26810a..3d104712fa 100644
--- a/app/path/gimppath-compat.h
+++ b/app/path/gimppath-compat.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATH_COMPAT_H__
-#define __GIMP_PATH_COMPAT_H__
+#pragma once
typedef struct _GimpPathCompatPoint GimpPathCompatPoint;
@@ -43,6 +42,3 @@ gboolean gimp_path_compat_is_compatible (GimpImage *image);
GimpPathCompatPoint * gimp_path_compat_get_points (GimpPath *path,
gint32 *n_points,
gint32 *closed);
-
-
-#endif /* __GIMP_PATH_COMPAT_H__ */
diff --git a/app/path/gimppath-export.h b/app/path/gimppath-export.h
index 96416e7e02..87e8be24ef 100644
--- a/app/path/gimppath-export.h
+++ b/app/path/gimppath-export.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATH_EXPORT_H__
-#define __GIMP_PATH_EXPORT_H__
+#pragma once
gboolean gimp_path_export_file (GimpImage *image,
@@ -25,6 +24,3 @@ gboolean gimp_path_export_file (GimpImage *image,
GError **error);
gchar * gimp_path_export_string (GimpImage *image,
GList *path_list);
-
-
-#endif /* __GIMP_PATH_IMPORT_H__ */
diff --git a/app/path/gimppath-import.h b/app/path/gimppath-import.h
index 951b50a619..008fe80297 100644
--- a/app/path/gimppath-import.h
+++ b/app/path/gimppath-import.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATH_IMPORT_H__
-#define __GIMP_PATH_IMPORT_H__
+#pragma once
gboolean gimp_path_import_file (GimpImage *image,
@@ -39,6 +38,3 @@ gboolean gimp_path_import_buffer (GimpImage *image,
gint position,
GList **ret_paths,
GError **error);
-
-
-#endif /* __GIMP_PATH_IMPORT_H__ */
diff --git a/app/path/gimppath-preview.h b/app/path/gimppath-preview.h
index 8eea54b871..8b71776d7e 100644
--- a/app/path/gimppath-preview.h
+++ b/app/path/gimppath-preview.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATH_PREVIEW_H__
-#define __GIMP_PATH_PREVIEW_H__
+#pragma once
/*
@@ -29,6 +28,3 @@ GimpTempBuf * gimp_path_get_new_preview (GimpViewable *viewable,
gint height,
GeglColor *color,
GeglColor *background);
-
-
-#endif /* __GIMP_PATH_PREVIEW_H__ */
diff --git a/app/path/gimppath-warp.h b/app/path/gimppath-warp.h
index 1c455ce708..ef90fb09ec 100644
--- a/app/path/gimppath-warp.h
+++ b/app/path/gimppath-warp.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATH_WARP_H__
-#define __GIMP_PATH_WARP_H__
+#pragma once
void gimp_path_warp_point (GimpPath *path,
@@ -30,7 +29,3 @@ void gimp_path_warp_point (GimpPath *path,
void gimp_path_warp_path (GimpPath *path,
GimpPath *path_in,
gdouble yoffset);
-
-
-#endif /* __GIMP_PATH_WARP_H__ */
-
diff --git a/app/path/gimppath.h b/app/path/gimppath.h
index c4b7f26c75..1f8979b6e5 100644
--- a/app/path/gimppath.h
+++ b/app/path/gimppath.h
@@ -18,11 +18,11 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATH_H__
-#define __GIMP_PATH_H__
+#pragma once
#include "core/gimpitem.h"
+
#define GIMP_TYPE_PATH (gimp_path_get_type ())
#define GIMP_PATH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PATH, GimpPath))
#define GIMP_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PATH, GimpPathClass))
@@ -179,6 +179,3 @@ gint gimp_path_interpolate (GimpPath *path,
/* returns a bezier representation */
const GimpBezierDesc * gimp_path_get_bezier (GimpPath *path);
-
-
-#endif /* __GIMP_PATH_H__ */
diff --git a/app/path/gimppathmodundo.h b/app/path/gimppathmodundo.h
index 9e31d77549..31a0108bb3 100644
--- a/app/path/gimppathmodundo.h
+++ b/app/path/gimppathmodundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATH_MOD_UNDO_H__
-#define __GIMP_PATH_MOD_UNDO_H__
-
+#pragma once
#include "core/gimpitemundo.h"
@@ -47,6 +45,3 @@ struct _GimpPathModUndoClass
GType gimp_path_mod_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_PATH_MOD_UNDO_H__ */
diff --git a/app/path/gimppathpropundo.h b/app/path/gimppathpropundo.h
index b3432a8eec..c34c6f0521 100644
--- a/app/path/gimppathpropundo.h
+++ b/app/path/gimppathpropundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATH_PROP_UNDO_H__
-#define __GIMP_PATH_PROP_UNDO_H__
-
+#pragma once
#include "core/gimpitemundo.h"
@@ -45,6 +43,3 @@ struct _GimpPathPropUndoClass
GType gimp_path_prop_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_PATH_PROP_UNDO_H__ */
diff --git a/app/path/gimppathundo.h b/app/path/gimppathundo.h
index 2090c477c6..c13b01df10 100644
--- a/app/path/gimppathundo.h
+++ b/app/path/gimppathundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATH_UNDO_H__
-#define __GIMP_PATH_UNDO_H__
-
+#pragma once
#include "core/gimpitemundo.h"
@@ -49,6 +47,3 @@ struct _GimpPathUndoClass
GType gimp_path_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_PATH_UNDO_H__ */
diff --git a/app/path/gimpstroke-new.h b/app/path/gimpstroke-new.h
index 8b35d6a541..6de0fdf9b7 100644
--- a/app/path/gimpstroke-new.h
+++ b/app/path/gimpstroke-new.h
@@ -18,14 +18,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_STROKE_NEW_H__
-#define __GIMP_STROKE_NEW_H__
+#pragma once
GimpStroke * gimp_stroke_new_from_coords (GimpPathStrokeType type,
const GimpCoords *coords,
gint n_coords,
gboolean closed);
-
-
-#endif /* __GIMP_STROKE_NEW_H__ */
diff --git a/app/path/gimpstroke.h b/app/path/gimpstroke.h
index e7d58e544b..98aa55c17e 100644
--- a/app/path/gimpstroke.h
+++ b/app/path/gimpstroke.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_STROKE_H__
-#define __GIMP_STROKE_H__
+#pragma once
#include "core/gimpobject.h"
@@ -342,10 +341,6 @@ void gimp_stroke_transform (GimpStroke *stroke,
const GimpMatrix3 *matrix,
GQueue *ret_strokes);
-
GList * gimp_stroke_get_draw_anchors (GimpStroke *stroke);
GList * gimp_stroke_get_draw_controls (GimpStroke *stroke);
GArray * gimp_stroke_get_draw_lines (GimpStroke *stroke);
-
-#endif /* __GIMP_STROKE_H__ */
-
diff --git a/app/path/path-enums.h b/app/path/path-enums.h
index f9e9877172..12cf7817c3 100644
--- a/app/path/path-enums.h
+++ b/app/path/path-enums.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __PATH_ENUMS_H__
-#define __PATH_ENUMS_H__
+#pragma once
typedef enum
@@ -41,6 +40,3 @@ typedef enum
GIMP_STROKE_EXTEND_SIMPLE,
GIMP_STROKE_EXTEND_EDITABLE
} GimpStrokeExtendMode;
-
-
-#endif /* __PATH_ENUMS_H__ */
diff --git a/app/path/path-types.h b/app/path/path-types.h
index a38adfc507..ab5a69f1ce 100644
--- a/app/path/path-types.h
+++ b/app/path/path-types.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __PATH_TYPES_H__
-#define __PATH_TYPES_H__
-
+#pragma once
#include "core/core-types.h"
@@ -32,6 +30,3 @@ typedef struct _GimpAnchor GimpAnchor;
typedef struct _GimpPath GimpPath;
typedef struct _GimpStroke GimpStroke;
typedef struct _GimpBezierStroke GimpBezierStroke;
-
-
-#endif /* __PATH_TYPES_H__ */
diff --git a/app/pdb/gimp-pdb-compat.h b/app/pdb/gimp-pdb-compat.h
index f2ccb03a09..08d5791fca 100644
--- a/app/pdb/gimp-pdb-compat.h
+++ b/app/pdb/gimp-pdb-compat.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PDB_COMPAT_H__
-#define __GIMP_PDB_COMPAT_H__
+#pragma once
void gimp_pdb_compat_procs_register (GimpPDB *pdb,
GimpPDBCompatMode compat_mode);
-
-
-#endif /* __GIMP_PDB_COMPAT_H__ */
diff --git a/app/pdb/gimppdb-query.h b/app/pdb/gimppdb-query.h
index 1cc84c3a5e..9d700269c4 100644
--- a/app/pdb/gimppdb-query.h
+++ b/app/pdb/gimppdb-query.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PDB_QUERY_H__
-#define __GIMP_PDB_QUERY_H__
+#pragma once
gboolean gimp_pdb_dump (GimpPDB *pdb,
@@ -32,6 +31,3 @@ gboolean gimp_pdb_query (GimpPDB *pdb,
const gchar *proc_type,
gchar ***procs,
GError **error);
-
-
-#endif /* __GIMP_PDB_QUERY_H__ */
diff --git a/app/pdb/gimppdb-utils.h b/app/pdb/gimppdb-utils.h
index 824edb467d..698af8c0a1 100644
--- a/app/pdb/gimppdb-utils.h
+++ b/app/pdb/gimppdb-utils.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PDB_UTILS_H__
-#define __GIMP_PDB_UTILS_H__
+#pragma once
GimpDataFactory * gimp_pdb_get_data_factory (Gimp *gimp,
@@ -109,6 +108,3 @@ GimpStroke * gimp_pdb_get_path_stroke (GimpPath *path,
gboolean gimp_pdb_is_canonical_procedure (const gchar *procedure_name,
GError **error);
-
-
-#endif /* __GIMP_PDB_UTILS_H__ */
diff --git a/app/pdb/gimppdb.h b/app/pdb/gimppdb.h
index 26fc4167a0..03e335a379 100644
--- a/app/pdb/gimppdb.h
+++ b/app/pdb/gimppdb.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PDB_H__
-#define __GIMP_PDB_H__
-
+#pragma once
#include "core/gimpobject.h"
@@ -85,6 +83,3 @@ GimpValueArray * gimp_pdb_execute_procedure_by_name (GimpPDB *pdb,
...);
GList * gimp_pdb_get_deprecated_procedures (GimpPDB *pdb);
-
-
-#endif /* __GIMP_PDB_H__ */
diff --git a/app/pdb/gimppdbcontext.h b/app/pdb/gimppdbcontext.h
index ce2cdb3b70..9359f8649b 100644
--- a/app/pdb/gimppdbcontext.h
+++ b/app/pdb/gimppdbcontext.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PDB_CONTEXT_H__
-#define __GIMP_PDB_CONTEXT_H__
-
+#pragma once
#include "core/gimpcontext.h"
@@ -78,6 +76,3 @@ GimpPaintOptions * gimp_pdb_context_get_paint_options (GimpPDBContext *context
GList * gimp_pdb_context_get_brush_options (GimpPDBContext *context);
GimpStrokeOptions * gimp_pdb_context_get_stroke_options (GimpPDBContext *context);
-
-
-#endif /* __GIMP_PDB_CONTEXT_H__ */
diff --git a/app/pdb/gimppdberror.h b/app/pdb/gimppdberror.h
index 11caa48593..33e95a9e63 100644
--- a/app/pdb/gimppdberror.h
+++ b/app/pdb/gimppdberror.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PDB_ERROR_H__
-#define __GIMP_PDB_ERROR_H__
+#pragma once
typedef enum
@@ -33,6 +32,3 @@ typedef enum
#define GIMP_PDB_ERROR (gimp_pdb_error_quark ())
GQuark gimp_pdb_error_quark (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_PDB_ERROR_H__ */
diff --git a/app/pdb/gimpprocedure.h b/app/pdb/gimpprocedure.h
index 7adb4b4981..3d97b30856 100644
--- a/app/pdb/gimpprocedure.h
+++ b/app/pdb/gimpprocedure.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROCEDURE_H__
-#define __GIMP_PROCEDURE_H__
-
+#pragma once
#include "core/gimpviewable.h"
@@ -171,7 +169,3 @@ void gimp_procedure_execute_async (GimpProcedure *procedure,
gint gimp_procedure_name_compare (GimpProcedure *proc1,
GimpProcedure *proc2);
-
-
-
-#endif /* __GIMP_PROCEDURE_H__ */
diff --git a/app/pdb/internal-procs.h b/app/pdb/internal-procs.h
index 7599787b5b..ac6aadd206 100644
--- a/app/pdb/internal-procs.h
+++ b/app/pdb/internal-procs.h
@@ -17,8 +17,8 @@
/* NOTE: This file is auto-generated by pdbgen.pl. */
-#ifndef __INTERNAL_PROCS_H__
-#define __INTERNAL_PROCS_H__
+#pragma once
+
void internal_procs_init (GimpPDB *pdb);
@@ -81,5 +81,3 @@ void register_selection_procs (GimpPDB *pdb);
void register_text_layer_procs (GimpPDB *pdb);
void register_text_tool_procs (GimpPDB *pdb);
void register_unit_procs (GimpPDB *pdb);
-
-#endif /* __INTERNAL_PROCS_H__ */
diff --git a/app/pdb/pdb-types.h b/app/pdb/pdb-types.h
index 301c7ee3f7..21432170c0 100644
--- a/app/pdb/pdb-types.h
+++ b/app/pdb/pdb-types.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PDB_TYPES_H__
-#define __PDB_TYPES_H__
-
+#pragma once
#include "core/core-types.h"
@@ -49,6 +47,3 @@ typedef enum
GIMP_PDB_DATA_ACCESS_WRITE = 1 << 0,
GIMP_PDB_DATA_ACCESS_RENAME = 1 << 1
} GimpPDBDataAccess;
-
-
-#endif /* __PDB_TYPES_H__ */
diff --git a/app/plug-in/gimpenvirontable.h b/app/plug-in/gimpenvirontable.h
index c77710dfe6..e26a22378b 100644
--- a/app/plug-in/gimpenvirontable.h
+++ b/app/plug-in/gimpenvirontable.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ENVIRON_TABLE_H__
-#define __GIMP_ENVIRON_TABLE_H__
+#pragma once
#define GIMP_TYPE_ENVIRON_TABLE (gimp_environ_table_get_type ())
@@ -67,6 +66,3 @@ void gimp_environ_table_clear (GimpEnvironTable *environ_tabl
void gimp_environ_table_clear_all (GimpEnvironTable *environ_table);
gchar ** gimp_environ_table_get_envp (GimpEnvironTable *environ_table);
-
-
-#endif /* __GIMP_ENVIRON_TABLE_H__ */
diff --git a/app/plug-in/gimpinterpreterdb.h b/app/plug-in/gimpinterpreterdb.h
index 4c77accad5..be308014a8 100644
--- a/app/plug-in/gimpinterpreterdb.h
+++ b/app/plug-in/gimpinterpreterdb.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_INTERPRETER_DB_H__
-#define __GIMP_INTERPRETER_DB_H__
+#pragma once
#define GIMP_TYPE_INTERPRETER_DB (gimp_interpreter_db_get_type ())
@@ -65,6 +64,3 @@ gchar * gimp_interpreter_db_resolve (GimpInterpreterDB *db,
const gchar *program_path,
gchar **interp_arg);
gchar * gimp_interpreter_db_get_extensions (GimpInterpreterDB *db);
-
-
-#endif /* __GIMP_INTERPRETER_DB_H__ */
diff --git a/app/plug-in/gimpplugin-cleanup.h b/app/plug-in/gimpplugin-cleanup.h
index 0a7fc9a73f..78e8c41131 100644
--- a/app/plug-in/gimpplugin-cleanup.h
+++ b/app/plug-in/gimpplugin-cleanup.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_CLEANUP_H__
-#define __GIMP_PLUG_IN_CLEANUP_H__
+#pragma once
gboolean gimp_plug_in_cleanup_undo_group_start (GimpPlugIn *plug_in,
@@ -48,6 +47,3 @@ gboolean gimp_plug_in_cleanup_remove_shadow (GimpPlugIn *plug_in,
void gimp_plug_in_cleanup (GimpPlugIn *plug_in,
GimpPlugInProcFrame *proc_frame);
-
-
-#endif /* __GIMP_PLUG_IN_CLEANUP_H__ */
diff --git a/app/plug-in/gimpplugin-context.h b/app/plug-in/gimpplugin-context.h
index 8e46a20161..3fc4d6203e 100644
--- a/app/plug-in/gimpplugin-context.h
+++ b/app/plug-in/gimpplugin-context.h
@@ -17,12 +17,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_CONTEXT_H__
-#define __GIMP_PLUG_IN_CONTEXT_H__
+#pragma once
gboolean gimp_plug_in_context_push (GimpPlugIn *plug_in);
gboolean gimp_plug_in_context_pop (GimpPlugIn *plug_in);
-
-
-#endif /* __GIMP_PLUG_IN_CONTEXT_H__ */
diff --git a/app/plug-in/gimpplugin-message.h b/app/plug-in/gimpplugin-message.h
index 1dd301f5ca..0bda5fa88e 100644
--- a/app/plug-in/gimpplugin-message.h
+++ b/app/plug-in/gimpplugin-message.h
@@ -17,12 +17,9 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_MESSAGE_H__
-#define __GIMP_PLUG_IN_MESSAGE_H__
+#pragma once
void gimp_plug_in_handle_message (GimpPlugIn *plug_in,
GimpWireMessage *msg);
-
-#endif /* __GIMP_PLUG_IN_MESSAGE_H__ */
diff --git a/app/plug-in/gimpplugin-proc.h b/app/plug-in/gimpplugin-proc.h
index ef6cb122c9..974f8443d5 100644
--- a/app/plug-in/gimpplugin-proc.h
+++ b/app/plug-in/gimpplugin-proc.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_PROC_H__
-#define __GIMP_PLUG_IN_PROC_H__
+#pragma once
gboolean gimp_plug_in_set_proc_image_types (GimpPlugIn *plug_in,
@@ -92,6 +91,3 @@ gboolean gimp_plug_in_set_batch_interpreter (GimpPlugIn *plug_in,
const gchar *proc_name,
const gchar *interpreter_name,
GError **error);
-
-
-#endif /* __GIMP_PLUG_IN_PROC_H__ */
diff --git a/app/plug-in/gimpplugin-progress.h b/app/plug-in/gimpplugin-progress.h
index 2580893b73..701478d423 100644
--- a/app/plug-in/gimpplugin-progress.h
+++ b/app/plug-in/gimpplugin-progress.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_PROGRESS_H__
-#define __GIMP_PLUG_IN_PROGRESS_H__
+#pragma once
gint gimp_plug_in_progress_attach (GimpProgress *progress);
@@ -42,6 +41,3 @@ gboolean gimp_plug_in_progress_uninstall (GimpPlugIn *plug_in,
const gchar *progress_callback);
gboolean gimp_plug_in_progress_cancel (GimpPlugIn *plug_in,
const gchar *progress_callback);
-
-
-#endif /* __GIMP_PLUG_IN_PROGRESS_H__ */
diff --git a/app/plug-in/gimpplugin.h b/app/plug-in/gimpplugin.h
index de1f222494..6e0ffa922a 100644
--- a/app/plug-in/gimpplugin.h
+++ b/app/plug-in/gimpplugin.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_H__
-#define __GIMP_PLUG_IN_H__
-
+#pragma once
#include "core/gimpobject.h"
#include "gimppluginprocframe.h"
@@ -116,6 +114,3 @@ void gimp_plug_in_set_error_handler (GimpPlugIn *plug_in,
GimpPDBErrorHandler handler);
GimpPDBErrorHandler
gimp_plug_in_get_error_handler (GimpPlugIn *plug_in);
-
-
-#endif /* __GIMP_PLUG_IN_H__ */
diff --git a/app/plug-in/gimpplugindebug.h b/app/plug-in/gimpplugindebug.h
index ec5bc336a1..eb7556474a 100644
--- a/app/plug-in/gimpplugindebug.h
+++ b/app/plug-in/gimpplugindebug.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_DEBUG_H__
-#define __GIMP_PLUG_IN_DEBUG_H__
+#pragma once
typedef enum
@@ -38,6 +37,3 @@ gchar ** gimp_plug_in_debug_argv (GimpPlugInDebug *debug,
const gchar *name,
GimpDebugWrapFlag flag,
const gchar **args);
-
-
-#endif /* __GIMP_PLUG_IN_DEBUG_H__ */
diff --git a/app/plug-in/gimpplugindef.h b/app/plug-in/gimpplugindef.h
index 81e55ca65e..5cd653a5f5 100644
--- a/app/plug-in/gimpplugindef.h
+++ b/app/plug-in/gimpplugindef.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_DEF_H__
-#define __GIMP_PLUG_IN_DEF_H__
-
+#pragma once
#include "core/gimpobject.h"
@@ -71,6 +69,3 @@ void gimp_plug_in_def_set_needs_query (GimpPlugInDef *plug_in_def,
gboolean needs_query);
void gimp_plug_in_def_set_has_init (GimpPlugInDef *plug_in_def,
gboolean has_init);
-
-
-#endif /* __GIMP_PLUG_IN_DEF_H__ */
diff --git a/app/plug-in/gimppluginerror.h b/app/plug-in/gimppluginerror.h
index 7cf7eb2cc1..492d53275e 100644
--- a/app/plug-in/gimppluginerror.h
+++ b/app/plug-in/gimppluginerror.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_ERROR_H__
-#define __GIMP_PLUG_IN_ERROR_H__
+#pragma once
typedef enum
@@ -30,6 +29,3 @@ typedef enum
#define GIMP_PLUG_IN_ERROR (gimp_plug_in_error_quark ())
GQuark gimp_plug_in_error_quark (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_PLUG_IN_ERROR_H__ */
diff --git a/app/plug-in/gimppluginmanager-call.h b/app/plug-in/gimppluginmanager-call.h
index 405452e2a8..efa6d08264 100644
--- a/app/plug-in/gimppluginmanager-call.h
+++ b/app/plug-in/gimppluginmanager-call.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_MANAGER_CALL_H__
-#define __GIMP_PLUG_IN_MANAGER_CALL_H__
+#pragma once
#ifndef __YES_I_NEED_GIMP_PLUG_IN_MANAGER_CALL__
#error Do not use gimp_plug_in_manager_call_run*(), use gimp_procedure_execute*() instead.
@@ -54,6 +53,3 @@ GimpValueArray * gimp_plug_in_manager_call_run_temp (GimpPlugInManager *man
GimpProgress *progress,
GimpTemporaryProcedure *procedure,
GimpValueArray *args);
-
-
-#endif /* __GIMP_PLUG_IN_MANAGER_CALL_H__ */
diff --git a/app/plug-in/gimppluginmanager-data.h b/app/plug-in/gimppluginmanager-data.h
index 1a88f3276c..fac03f9003 100644
--- a/app/plug-in/gimppluginmanager-data.h
+++ b/app/plug-in/gimppluginmanager-data.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_MANAGER_DATA_H__
-#define __GIMP_PLUG_IN_MANAGER_DATA_H__
+#pragma once
void gimp_plug_in_manager_data_free (GimpPlugInManager *manager);
@@ -30,6 +29,3 @@ void gimp_plug_in_manager_set_data (GimpPlugInManager *manager,
const guint8 * gimp_plug_in_manager_get_data (GimpPlugInManager *manager,
const gchar *identifier,
gint32 *bytes);
-
-
-#endif /* __GIMP_PLUG_IN_MANAGER_DATA_H__ */
diff --git a/app/plug-in/gimppluginmanager-file.h b/app/plug-in/gimppluginmanager-file.h
index 79e2f667d6..d9472f070a 100644
--- a/app/plug-in/gimppluginmanager-file.h
+++ b/app/plug-in/gimppluginmanager-file.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_MANAGER_FILE_H__
-#define __GIMP_PLUG_IN_MANAGER_FILE_H__
+#pragma once
void gimp_plug_in_manager_add_load_procedure (GimpPlugInManager *manager,
@@ -47,5 +46,3 @@ gimp_plug_in_manager_file_procedure_find_by_mime_type (GimpPlugInManager *m
GimpFileProcedureGroup group,
const gchar *mime_type);
-
-#endif /* __GIMP_PLUG_IN_MANAGER_FILE_H__ */
diff --git a/app/plug-in/gimppluginmanager-help-domain.h b/app/plug-in/gimppluginmanager-help-domain.h
index e4f8972d53..f4f66d091c 100644
--- a/app/plug-in/gimppluginmanager-help-domain.h
+++ b/app/plug-in/gimppluginmanager-help-domain.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_MANAGER_HELP_DOMAIN_H__
-#define __GIMP_PLUG_IN_MANAGER_HELP_DOMAIN_H__
+#pragma once
void gimp_plug_in_manager_help_domain_exit (GimpPlugInManager *manager);
@@ -39,5 +38,3 @@ gint gimp_plug_in_manager_get_help_domains (GimpPlugInManager *manage
gchar ***help_domains,
gchar ***help_uris);
-
-#endif /* __GIMP_PLUG_IN_MANAGER_HELP_DOMAIN_H__ */
diff --git a/app/plug-in/gimppluginmanager-menu-branch.h b/app/plug-in/gimppluginmanager-menu-branch.h
index e092d01426..6ee70530a7 100644
--- a/app/plug-in/gimppluginmanager-menu-branch.h
+++ b/app/plug-in/gimppluginmanager-menu-branch.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_MANAGER_MENU_BRANCH_H__
-#define __GIMP_PLUG_IN_MANAGER_MENU_BRANCH_H__
+#pragma once
struct _GimpPlugInMenuBranch
@@ -37,6 +36,3 @@ void gimp_plug_in_manager_add_menu_branch (GimpPlugInManager *manager,
const gchar *menu_path,
const gchar *menu_label);
GSList * gimp_plug_in_manager_get_menu_branches (GimpPlugInManager *manager);
-
-
-#endif /* __GIMP_PLUG_IN_MANAGER_MENU_BRANCH_H__ */
diff --git a/app/plug-in/gimppluginmanager-query.h b/app/plug-in/gimppluginmanager-query.h
index 0e5ffc89d6..73922e5763 100644
--- a/app/plug-in/gimppluginmanager-query.h
+++ b/app/plug-in/gimppluginmanager-query.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_MANAGER_QUERY_H__
-#define __GIMP_PLUG_IN_MANAGER_QUERY_H__
+#pragma once
gint gimp_plug_in_manager_query (GimpPlugInManager *manager,
@@ -28,5 +27,3 @@ gint gimp_plug_in_manager_query (GimpPlugInManager *manager,
gchar ***prog_strs,
gint32 **time_ints);
-
-#endif /* __GIMP_PLUG_IN_MANAGER_QUERY_H__ */
diff --git a/app/plug-in/gimppluginmanager-restore.h b/app/plug-in/gimppluginmanager-restore.h
index 0389dcf837..b5591845b9 100644
--- a/app/plug-in/gimppluginmanager-restore.h
+++ b/app/plug-in/gimppluginmanager-restore.h
@@ -17,13 +17,9 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_MANAGER_RESTORE_H__
-#define __GIMP_PLUG_IN_MANAGER_RESTORE_H__
+#pragma once
void gimp_plug_in_manager_restore (GimpPlugInManager *manager,
GimpContext *context,
GimpInitStatusFunc status_callback);
-
-
-#endif /* __GIMP_PLUG_IN_MANAGER_RESTORE_H__ */
diff --git a/app/plug-in/gimppluginmanager.h b/app/plug-in/gimppluginmanager.h
index cd153c215a..652909705d 100644
--- a/app/plug-in/gimppluginmanager.h
+++ b/app/plug-in/gimppluginmanager.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_MANAGER_H__
-#define __GIMP_PLUG_IN_MANAGER_H__
-
+#pragma once
#include "core/gimpobject.h"
@@ -117,6 +115,3 @@ void gimp_plug_in_manager_remove_open_plug_in (GimpPlugInManager *manager,
void gimp_plug_in_manager_plug_in_push (GimpPlugInManager *manager,
GimpPlugIn *plug_in);
void gimp_plug_in_manager_plug_in_pop (GimpPlugInManager *manager);
-
-
-#endif /* __GIMP_PLUG_IN_MANAGER_H__ */
diff --git a/app/plug-in/gimppluginprocedure.h b/app/plug-in/gimppluginprocedure.h
index f9efda0228..fef1c70a78 100644
--- a/app/plug-in/gimppluginprocedure.h
+++ b/app/plug-in/gimppluginprocedure.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_PROCEDURE_H__
-#define __GIMP_PLUG_IN_PROCEDURE_H__
-
+#pragma once
#include "pdb/gimpprocedure.h"
@@ -149,5 +147,3 @@ void gimp_plug_in_procedure_handle_return_values (GimpPlugInProcedure *pro
GimpValueArray *return_vals);
-
-#endif /* __GIMP_PLUG_IN_PROCEDURE_H__ */
diff --git a/app/plug-in/gimppluginprocframe.h b/app/plug-in/gimppluginprocframe.h
index 1f21b8ef49..5e1170e333 100644
--- a/app/plug-in/gimppluginprocframe.h
+++ b/app/plug-in/gimppluginprocframe.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_PROC_FRAME_H__
-#define __GIMP_PLUG_IN_PROC_FRAME_H__
+#pragma once
struct _GimpPlugInProcFrame
@@ -62,6 +61,3 @@ void gimp_plug_in_proc_frame_unref (GimpPlugInProcFrame *proc
GimpValueArray * gimp_plug_in_proc_frame_get_return_values
(GimpPlugInProcFrame *proc_frame);
-
-
-#endif /* __GIMP_PLUG_IN_PROC_FRAME_H__ */
diff --git a/app/plug-in/gimppluginshm.h b/app/plug-in/gimppluginshm.h
index d50dd3a38e..61ca851548 100644
--- a/app/plug-in/gimppluginshm.h
+++ b/app/plug-in/gimppluginshm.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PLUG_IN_SHM_H__
-#define __GIMP_PLUG_IN_SHM_H__
+#pragma once
GimpPlugInShm * gimp_plug_in_shm_new (void);
@@ -26,6 +25,3 @@ void gimp_plug_in_shm_free (GimpPlugInShm *shm);
gint gimp_plug_in_shm_get_id (GimpPlugInShm *shm);
guchar * gimp_plug_in_shm_get_addr (GimpPlugInShm *shm);
-
-
-#endif /* __GIMP_PLUG_IN_SHM_H__ */
diff --git a/app/plug-in/gimptemporaryprocedure.h b/app/plug-in/gimptemporaryprocedure.h
index 3df53c895b..1c0e399793 100644
--- a/app/plug-in/gimptemporaryprocedure.h
+++ b/app/plug-in/gimptemporaryprocedure.h
@@ -17,9 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEMPORARY_PROCEDURE_H__
-#define __GIMP_TEMPORARY_PROCEDURE_H__
-
+#pragma once
#include "gimppluginprocedure.h"
@@ -50,6 +48,3 @@ struct _GimpTemporaryProcedureClass
GType gimp_temporary_procedure_get_type (void) G_GNUC_CONST;
GimpProcedure * gimp_temporary_procedure_new (GimpPlugIn *plug_in);
-
-
-#endif /* __GIMP_TEMPORARY_PROCEDURE_H__ */
diff --git a/app/plug-in/plug-in-enums.h b/app/plug-in/plug-in-enums.h
index c5b6775a12..3cc88e4618 100644
--- a/app/plug-in/plug-in-enums.h
+++ b/app/plug-in/plug-in-enums.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PLUG_IN_ENUMS_H__
-#define __PLUG_IN_ENUMS_H__
+#pragma once
#define GIMP_TYPE_PLUG_IN_IMAGE_TYPE (gimp_plug_in_image_type_get_type ())
@@ -60,5 +59,3 @@ typedef enum
GIMP_FILE_PROCEDURE_GROUP_EXPORT
} GimpFileProcedureGroup;
-
-#endif /* __PLUG_IN_ENUMS_H__ */
diff --git a/app/plug-in/plug-in-menu-path.h b/app/plug-in/plug-in-menu-path.h
index b222c065ae..ed3fc501ed 100644
--- a/app/plug-in/plug-in-menu-path.h
+++ b/app/plug-in/plug-in-menu-path.h
@@ -17,12 +17,8 @@
* along with this program. If not, see .
*/
-#ifndef __PLUG_IN_MENU_PATH_H__
-#define __PLUG_IN_MENU_PATH_H__
+#pragma once
gchar * plug_in_menu_path_map (const gchar *menu_path,
const gchar *menu_label);
-
-
-#endif /* __PLUG_IN_MENU_PATH_H__ */
diff --git a/app/plug-in/plug-in-rc.h b/app/plug-in/plug-in-rc.h
index 5a54b0bfc4..78ec2a27dd 100644
--- a/app/plug-in/plug-in-rc.h
+++ b/app/plug-in/plug-in-rc.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __PLUG_IN_RC_H__
-#define __PLUG_IN_RC_H__
+#pragma once
GSList * plug_in_rc_parse (Gimp *gimp,
@@ -28,6 +27,3 @@ GSList * plug_in_rc_parse (Gimp *gimp,
gboolean plug_in_rc_write (GSList *plug_in_defs,
GFile *file,
GError **error);
-
-
-#endif /* __PLUG_IN_RC_H__ */
diff --git a/app/plug-in/plug-in-types.h b/app/plug-in/plug-in-types.h
index 70d7ca0f12..c1e206b78f 100644
--- a/app/plug-in/plug-in-types.h
+++ b/app/plug-in/plug-in-types.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PLUG_IN_TYPES_H__
-#define __PLUG_IN_TYPES_H__
-
+#pragma once
#include "core/core-types.h"
@@ -35,6 +33,3 @@ typedef struct _GimpPlugInManager GimpPlugInManager;
typedef struct _GimpPlugInMenuBranch GimpPlugInMenuBranch;
typedef struct _GimpPlugInProcFrame GimpPlugInProcFrame;
typedef struct _GimpPlugInShm GimpPlugInShm;
-
-
-#endif /* __PLUG_IN_TYPES_H__ */
diff --git a/app/propgui/gimppropgui-channel-mixer.h b/app/propgui/gimppropgui-channel-mixer.h
index a44f99bd26..f50ed3cad4 100644
--- a/app/propgui/gimppropgui-channel-mixer.h
+++ b/app/propgui/gimppropgui-channel-mixer.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_CHANNEL_MIXER_H__
-#define __GIMP_PROP_GUI_CHANNEL_MIXER_H__
+#pragma once
GtkWidget *
@@ -30,6 +29,3 @@ _gimp_prop_gui_new_channel_mixer (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_CHANNEL_MIXER_H__ */
diff --git a/app/propgui/gimppropgui-color-balance.h b/app/propgui/gimppropgui-color-balance.h
index ecbee733bd..9445e871d0 100644
--- a/app/propgui/gimppropgui-color-balance.h
+++ b/app/propgui/gimppropgui-color-balance.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_COLOR_BALANCE_H__
-#define __GIMP_PROP_GUI_COLOR_BALANCE_H__
+#pragma once
GtkWidget *
@@ -30,6 +29,3 @@ _gimp_prop_gui_new_color_balance (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_COLOR_BALANCE_H__ */
diff --git a/app/propgui/gimppropgui-color-rotate.h b/app/propgui/gimppropgui-color-rotate.h
index a69770dfda..fe4911ee92 100644
--- a/app/propgui/gimppropgui-color-rotate.h
+++ b/app/propgui/gimppropgui-color-rotate.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_COLOR_ROTATE_H__
-#define __GIMP_PROP_GUI_COLOR_ROTATE_H__
+#pragma once
GtkWidget *
@@ -30,6 +29,3 @@ _gimp_prop_gui_new_color_rotate (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_COLOR_ROTATE_H__ */
diff --git a/app/propgui/gimppropgui-color-to-alpha.h b/app/propgui/gimppropgui-color-to-alpha.h
index af5a325aa7..5f001fe6c7 100644
--- a/app/propgui/gimppropgui-color-to-alpha.h
+++ b/app/propgui/gimppropgui-color-to-alpha.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_COLOR_TO_ALPHA_H__
-#define __GIMP_PROP_GUI_COLOR_TO_ALPHA_H__
+#pragma once
GtkWidget *
@@ -30,6 +29,3 @@ _gimp_prop_gui_new_color_to_alpha (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_COLOR_TO_ALPHA_H__ */
diff --git a/app/propgui/gimppropgui-convolution-matrix.h b/app/propgui/gimppropgui-convolution-matrix.h
index 21278c5657..06443e14ae 100644
--- a/app/propgui/gimppropgui-convolution-matrix.h
+++ b/app/propgui/gimppropgui-convolution-matrix.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_CONVOLUTION_MATRIX_H__
-#define __GIMP_PROP_GUI_CONVOLUTION_MATRIX_H__
+#pragma once
GtkWidget *
@@ -30,6 +29,3 @@ _gimp_prop_gui_new_convolution_matrix (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_CONVOLUTION_MATRIX_H__ */
diff --git a/app/propgui/gimppropgui-diffraction-patterns.h b/app/propgui/gimppropgui-diffraction-patterns.h
index dd6bbc5aa5..776abde0fc 100644
--- a/app/propgui/gimppropgui-diffraction-patterns.h
+++ b/app/propgui/gimppropgui-diffraction-patterns.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_DIFFRACTION_PATTERNS_H__
-#define __GIMP_PROP_GUI_DIFFRACTION_PATTERNS_H__
+#pragma once
GtkWidget *
@@ -30,6 +29,3 @@ _gimp_prop_gui_new_diffraction_patterns (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_DIFFRACTION_PATTERNS_H__ */
diff --git a/app/propgui/gimppropgui-eval.h b/app/propgui/gimppropgui-eval.h
index e2b870882d..0c2dbd1f5c 100644
--- a/app/propgui/gimppropgui-eval.h
+++ b/app/propgui/gimppropgui-eval.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_EVAL_H__
-#define __GIMP_PROP_GUI_EVAL_H__
+#pragma once
gboolean gimp_prop_eval_boolean (GObject *config,
@@ -31,6 +30,3 @@ gchar * gimp_prop_eval_string (GObject *config,
GParamSpec *pspec,
const gchar *key,
const gchar *default_value);
-
-
-#endif /* __GIMP_PROP_GUI_EVAL_H__ */
diff --git a/app/propgui/gimppropgui-focus-blur.h b/app/propgui/gimppropgui-focus-blur.h
index 1c0c0c78a1..1b0e997640 100644
--- a/app/propgui/gimppropgui-focus-blur.h
+++ b/app/propgui/gimppropgui-focus-blur.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_FOCUS_BLUR_H__
-#define __GIMP_PROP_GUI_FOCUS_BLUR_H__
+#pragma once
GtkWidget *
@@ -31,6 +30,3 @@ _gimp_prop_gui_new_focus_blur (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_FOCUS_BLUR_H__ */
diff --git a/app/propgui/gimppropgui-generic.h b/app/propgui/gimppropgui-generic.h
index 40e526966b..3b8dcef2ab 100644
--- a/app/propgui/gimppropgui-generic.h
+++ b/app/propgui/gimppropgui-generic.h
@@ -19,8 +19,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_GENERIC_H__
-#define __GIMP_PROP_GUI_GENERIC_H__
+#pragma once
GtkWidget * _gimp_prop_gui_new_generic (GObject *config,
@@ -31,6 +30,3 @@ GtkWidget * _gimp_prop_gui_new_generic (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_GENERIC_H__ */
diff --git a/app/propgui/gimppropgui-hue-saturation.h b/app/propgui/gimppropgui-hue-saturation.h
index efeca872f2..fbbf8c53cc 100644
--- a/app/propgui/gimppropgui-hue-saturation.h
+++ b/app/propgui/gimppropgui-hue-saturation.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_HUE_SATURATION_H__
-#define __GIMP_PROP_GUI_HUE_SATURATION_H__
+#pragma once
GtkWidget *
@@ -31,5 +30,3 @@ _gimp_prop_gui_new_hue_saturation (GObject *config,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-#endif /* __GIMP_PROP_GUI_HUE_SATURATION_H__ */
diff --git a/app/propgui/gimppropgui-motion-blur-circular.h b/app/propgui/gimppropgui-motion-blur-circular.h
index 3bb851eadd..7793a7f019 100644
--- a/app/propgui/gimppropgui-motion-blur-circular.h
+++ b/app/propgui/gimppropgui-motion-blur-circular.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_MOTION_BLUR_CIRCULAR_H__
-#define __GIMP_PROP_GUI_MOTION_BLUR_CIRCULAR_H__
+#pragma once
GtkWidget *
@@ -31,5 +30,3 @@ _gimp_prop_gui_new_motion_blur_circular (GObject *config,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-#endif /* __GIMP_PROP_GUI_MOTION_BLUR_CIRCULAR_H__ */
diff --git a/app/propgui/gimppropgui-motion-blur-linear.h b/app/propgui/gimppropgui-motion-blur-linear.h
index aacb5280ff..af40723bc0 100644
--- a/app/propgui/gimppropgui-motion-blur-linear.h
+++ b/app/propgui/gimppropgui-motion-blur-linear.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_MOTION_BLUR_LINEAR_H__
-#define __GIMP_PROP_GUI_MOTION_BLUR_LINEAR_H__
+#pragma once
GtkWidget *
@@ -30,6 +29,3 @@ _gimp_prop_gui_new_motion_blur_linear (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_MOTION_BLUR_LINEAR_H__ */
diff --git a/app/propgui/gimppropgui-motion-blur-zoom.h b/app/propgui/gimppropgui-motion-blur-zoom.h
index ab383045dd..19d3cf7658 100644
--- a/app/propgui/gimppropgui-motion-blur-zoom.h
+++ b/app/propgui/gimppropgui-motion-blur-zoom.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_MOTION_BLUR_ZOOM_H__
-#define __GIMP_PROP_GUI_MOTION_BLUR_ZOOM_H__
+#pragma once
GtkWidget *
@@ -30,6 +29,3 @@ _gimp_prop_gui_new_motion_blur_zoom (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_MOTION_BLUR_ZOOM_H__ */
diff --git a/app/propgui/gimppropgui-newsprint.h b/app/propgui/gimppropgui-newsprint.h
index 90df485eca..382ab394cb 100644
--- a/app/propgui/gimppropgui-newsprint.h
+++ b/app/propgui/gimppropgui-newsprint.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_NEWSPRINT_H__
-#define __GIMP_PROP_GUI_NEWSPRINT_H__
+#pragma once
GtkWidget *
@@ -30,6 +29,3 @@ _gimp_prop_gui_new_newsprint (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_NEWSPRINT_H__ */
diff --git a/app/propgui/gimppropgui-panorama-projection.h b/app/propgui/gimppropgui-panorama-projection.h
index 11c7b3aed9..807db568b3 100644
--- a/app/propgui/gimppropgui-panorama-projection.h
+++ b/app/propgui/gimppropgui-panorama-projection.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_PANORAMA_PROJECTION_H__
-#define __GIMP_PROP_GUI_PANORAMA_PROJECTION_H__
+#pragma once
GtkWidget *
@@ -30,6 +29,3 @@ _gimp_prop_gui_new_panorama_projection (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_PANORAMA_PROJECTION_H__ */
diff --git a/app/propgui/gimppropgui-recursive-transform.h b/app/propgui/gimppropgui-recursive-transform.h
index ac75545bed..ced801847c 100644
--- a/app/propgui/gimppropgui-recursive-transform.h
+++ b/app/propgui/gimppropgui-recursive-transform.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_RECURSIVE_TRANSFORM_H__
-#define __GIMP_PROP_GUI_RECURSIVE_TRANSFORM_H__
+#pragma once
GtkWidget *
@@ -31,5 +30,3 @@ _gimp_prop_gui_new_recursive_transform (GObject *config,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-#endif /* __GIMP_PROP_GUI_RECURSIVE_TRANSFORM_H__ */
diff --git a/app/propgui/gimppropgui-shadows-highlights.h b/app/propgui/gimppropgui-shadows-highlights.h
index fee9b520d1..b3f6546a8b 100644
--- a/app/propgui/gimppropgui-shadows-highlights.h
+++ b/app/propgui/gimppropgui-shadows-highlights.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_SHADOWS_HIGHLIGHTS_H__
-#define __GIMP_PROP_GUI_SHADOWS_HIGHLIGHTS_H__
+#pragma once
GtkWidget *
@@ -30,6 +29,3 @@ _gimp_prop_gui_new_shadows_highlights (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_SHADOWS_HIGHLIGHTS_H__ */
diff --git a/app/propgui/gimppropgui-spiral.h b/app/propgui/gimppropgui-spiral.h
index 1ed47df930..e6d93947f2 100644
--- a/app/propgui/gimppropgui-spiral.h
+++ b/app/propgui/gimppropgui-spiral.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_SPIRAL_H__
-#define __GIMP_PROP_GUI_SPIRAL_H__
+#pragma once
GtkWidget *
@@ -30,6 +29,3 @@ _gimp_prop_gui_new_spiral (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_SPIRAL_H__ */
diff --git a/app/propgui/gimppropgui-supernova.h b/app/propgui/gimppropgui-supernova.h
index 7cf3a42d56..9110a611a9 100644
--- a/app/propgui/gimppropgui-supernova.h
+++ b/app/propgui/gimppropgui-supernova.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_SUPERNOVA_H__
-#define __GIMP_PROP_GUI_SUPERNOVA_H__
+#pragma once
GtkWidget *
@@ -30,6 +29,3 @@ _gimp_prop_gui_new_supernova (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_SUPERNOVA_H__ */
diff --git a/app/propgui/gimppropgui-utils.h b/app/propgui/gimppropgui-utils.h
index f618ecf2bc..6c3b89f92a 100644
--- a/app/propgui/gimppropgui-utils.h
+++ b/app/propgui/gimppropgui-utils.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_UTILS_H__
-#define __GIMP_PROP_GUI_UTILS_H__
+#pragma once
GtkWidget * gimp_prop_kelvin_presets_new (GObject *config,
@@ -27,6 +26,3 @@ GtkWidget * gimp_prop_kelvin_presets_new (GObject *config,
GtkWidget * gimp_prop_random_seed_new (GObject *config,
const gchar *property_name);
-
-
-#endif /* __GIMP_PROP_GUI_UTILS_H__ */
diff --git a/app/propgui/gimppropgui-vignette.h b/app/propgui/gimppropgui-vignette.h
index 4db7ea4a9e..80d449b7de 100644
--- a/app/propgui/gimppropgui-vignette.h
+++ b/app/propgui/gimppropgui-vignette.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_VIGNETTE_H__
-#define __GIMP_PROP_GUI_VIGNETTE_H__
+#pragma once
GtkWidget *
@@ -31,6 +30,3 @@ _gimp_prop_gui_new_vignette (GObject *config,
GimpCreatePickerFunc create_picker_func,
GimpCreateControllerFunc create_controller_func,
gpointer creator);
-
-
-#endif /* __GIMP_PROP_GUI_VIGNETTE_H__ */
diff --git a/app/propgui/gimppropgui.h b/app/propgui/gimppropgui.h
index d5d6bac0f8..8b1b120720 100644
--- a/app/propgui/gimppropgui.h
+++ b/app/propgui/gimppropgui.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PROP_GUI_H__
-#define __GIMP_PROP_GUI_H__
+#pragma once
/* A view on all of an object's properties */
@@ -55,6 +54,3 @@ void gimp_prop_gui_bind_label (GtkWidget *source,
GtkWidget *target);
void gimp_prop_gui_bind_tooltip (GtkWidget *source,
GtkWidget *target);
-
-
-#endif /* __GIMP_PROP_GUI_H__ */
diff --git a/app/propgui/propgui-types.h b/app/propgui/propgui-types.h
index b6711a4ff2..43c6fe7d07 100644
--- a/app/propgui/propgui-types.h
+++ b/app/propgui/propgui-types.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __PROPGUI_TYPES_H__
-#define __PROPGUI_TYPES_H__
-
+#pragma once
#include "display/display-enums.h"
@@ -141,5 +139,3 @@ typedef GCallback (* GimpCreateControllerFunc) (gpointer
gpointer callback_data,
gpointer *set_func_data);
-
-#endif /* __PROPGUI_TYPES_H__ */
diff --git a/app/sanity.h b/app/sanity.h
index 8d30e83b46..33c957659d 100644
--- a/app/sanity.h
+++ b/app/sanity.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __SANITY_H__
-#define __SANITY_H__
+#pragma once
#ifndef GIMP_APP_GLUE_COMPILATION
#error You must not #include "sanity.h" from an app/ subdir
@@ -25,6 +24,3 @@
const gchar * sanity_check_early (void);
const gchar * sanity_check_late (void);
-
-
-#endif /* __SANITY_H__ */
diff --git a/app/signals.h b/app/signals.h
index 5eeae57e97..91d49e44c9 100644
--- a/app/signals.h
+++ b/app/signals.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __SIGNALS_H__
-#define __SIGNALS_H__
+#pragma once
#ifndef GIMP_APP_GLUE_COMPILATION
#signal You must not #include "signals.h" from an app/ subdir
@@ -24,6 +23,3 @@
void gimp_init_signal_handlers (gchar **backtrace_file);
-
-
-#endif /* __SIGNALS_H__ */
diff --git a/app/tests/gimp-test-session-utils.h b/app/tests/gimp-test-session-utils.h
index 1eeb4cb7b7..bbcb7a5f09 100644
--- a/app/tests/gimp-test-session-utils.h
+++ b/app/tests/gimp-test-session-utils.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEST_SESSION_UTILS_H__
-#define __GIMP_TEST_SESSION_UTILS_H__
+#pragma once
void gimp_test_session_load_and_write_session_files (const gchar *loaded_sessionrc,
@@ -24,6 +23,3 @@ void gimp_test_session_load_and_write_session_files (const gchar *loaded_session
const gchar *expected_sessionrc,
const gchar *expected_dockrc,
gboolean single_window_mode);
-
-
-#endif /* __GIMP_TEST_SESSION_UTILS_H__ */
diff --git a/app/tests/tests.c b/app/tests/tests.c
index c4ba82ba6c..979eadce32 100644
--- a/app/tests/tests.c
+++ b/app/tests/tests.c
@@ -25,6 +25,7 @@
#include "gui/gui-types.h"
#include "gui/gui.h"
+#include "gui/gimpapp.h"
#include "actions/actions.h"
diff --git a/app/tests/tests.h b/app/tests/tests.h
index 536b17b1c9..3f1758765a 100644
--- a/app/tests/tests.h
+++ b/app/tests/tests.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TESTS_H__
-#define __TESTS_H__
+#pragma once
/* Automake doc says:
"When no test protocol is in use, an exit status of 0 from a test
@@ -36,6 +35,3 @@ Gimp * gimp_init_for_gui_testing_with_rc (gboolean show_gui,
void gimp_test_run_temp_mainloop (guint32 running_time);
void gimp_test_run_mainloop_until_idle (void);
void gimp_test_bail_if_no_display (void);
-
-
-#endif /* __TESTS_H__ */
diff --git a/app/text/gimpfont.h b/app/text/gimpfont.h
index 082a41ac08..8ed571ff46 100644
--- a/app/text/gimpfont.h
+++ b/app/text/gimpfont.h
@@ -19,9 +19,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_FONT_H__
-#define __GIMP_FONT_H__
-
+#pragma once
#include "core/gimpdata.h"
@@ -70,5 +68,3 @@ enum
PROPERTIES_COUNT
};
-
-#endif /* __GIMP_FONT_H__ */
diff --git a/app/text/gimpfontfactory.h b/app/text/gimpfontfactory.h
index 77a82ea79b..6cc0cf5336 100644
--- a/app/text/gimpfontfactory.h
+++ b/app/text/gimpfontfactory.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_FONT_FACTORY_H__
-#define __GIMP_FONT_FACTORY_H__
-
+#pragma once
#include
#include "core/gimpdatafactory.h"
@@ -61,5 +59,3 @@ void gimp_font_factory_get_custom_config_path (GimpFontFactory
GSList * gimp_font_factory_get_fonts_renaming_config (GimpFontFactory *factory);
PangoContext * gimp_font_factory_get_pango_context (GimpFontFactory *factory);
-
-#endif /* __GIMP_FONT_FACTORY_H__ */
diff --git a/app/text/gimptext-compat.h b/app/text/gimptext-compat.h
index 3369c9a3e5..aed6e5b67d 100644
--- a/app/text/gimptext-compat.h
+++ b/app/text/gimptext-compat.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEXT_COMPAT_H__
-#define __GIMP_TEXT_COMPAT_H__
+#pragma once
/* convenience functions that provide the 1.2 API, only used by the PDB */
@@ -42,6 +41,3 @@ gboolean text_get_extents (Gimp *gimp,
gint *height,
gint *ascent,
gint *descent);
-
-
-#endif /* __GIMP_TEXT_COMPAT_H__ */
diff --git a/app/text/gimptext-parasite.h b/app/text/gimptext-parasite.h
index 9b2cc376b2..cc408a20e8 100644
--- a/app/text/gimptext-parasite.h
+++ b/app/text/gimptext-parasite.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEXT_PARASITE_H__
-#define __GIMP_TEXT_PARASITE_H__
+#pragma once
const gchar * gimp_text_parasite_name (void) G_GNUC_CONST;
@@ -32,6 +31,3 @@ GimpText * gimp_text_from_parasite (const GimpParasite *parasite,
const gchar * gimp_text_gdyntext_parasite_name (void) G_GNUC_CONST;
GimpText * gimp_text_from_gdyntext_parasite (Gimp *gimp,
const GimpParasite *parasite);
-
-
-#endif /* __GIMP_TEXT_PARASITE_H__ */
diff --git a/app/text/gimptext-path.h b/app/text/gimptext-path.h
index 808edbc6f4..28c9b2bca2 100644
--- a/app/text/gimptext-path.h
+++ b/app/text/gimptext-path.h
@@ -18,12 +18,8 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEXT_PATH_H__
-#define __GIMP_TEXT_PATH_H__
+#pragma once
GimpPath * gimp_text_path_new (GimpImage *image,
GimpText *text);
-
-
-#endif /* __GIMP_TEXT_PATH_H__ */
diff --git a/app/text/gimptext-xlfd.h b/app/text/gimptext-xlfd.h
index a6189588b5..18c2d5f67f 100644
--- a/app/text/gimptext-xlfd.h
+++ b/app/text/gimptext-xlfd.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEXT_XLFD_H__
-#define __GIMP_TEXT_XLFD_H__
+#pragma once
/* handle X Logical Font Descriptions for compat */
@@ -31,6 +30,3 @@ gboolean gimp_text_font_size_from_xlfd (const gchar *xlfd,
void gimp_text_set_font_from_xlfd (GimpText *text,
const gchar *xlfd);
-
-
-#endif /* __GIMP_TEXT_COMPAT_H__ */
diff --git a/app/text/gimptext.h b/app/text/gimptext.h
index adf7e3fd86..d7677104cb 100644
--- a/app/text/gimptext.h
+++ b/app/text/gimptext.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEXT_H__
-#define __GIMP_TEXT_H__
-
+#pragma once
#include "core/gimpobject.h"
@@ -90,6 +88,3 @@ GType gimp_text_get_type (void) G_GNUC_CONST;
void gimp_text_get_transformation (GimpText *text,
GimpMatrix3 *matrix);
-
-
-#endif /* __GIMP_TEXT_H__ */
diff --git a/app/text/gimptextlayer-transform.h b/app/text/gimptextlayer-transform.h
index bf17a86e65..01919f44cb 100644
--- a/app/text/gimptextlayer-transform.h
+++ b/app/text/gimptextlayer-transform.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEXT_LAYER_TRANSFORM_H__
-#define __GIMP_TEXT_LAYER_TRANSFORM_H__
+#pragma once
void gimp_text_layer_scale (GimpItem *item,
@@ -48,6 +47,3 @@ void gimp_text_layer_transform (GimpItem *item,
gboolean supersample,
GimpTransformResize clip_result,
GimpProgress *progress);
-
-
-#endif /* __GIMP_TEXT_LAYER_TRANSFORM_H__ */
diff --git a/app/text/gimptextlayer-xcf.h b/app/text/gimptextlayer-xcf.h
index 3d08dfaec0..c6bc02ab68 100644
--- a/app/text/gimptextlayer-xcf.h
+++ b/app/text/gimptextlayer-xcf.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEXT_LAYER_XCF_H__
-#define __GIMP_TEXT_LAYER_XCF_H__
+#pragma once
gboolean gimp_text_layer_xcf_load_hack (GimpLayer **layer);
@@ -29,6 +28,3 @@ void gimp_text_layer_xcf_save_prepare (GimpTextLayer *text_layer);
guint32 gimp_text_layer_get_xcf_flags (GimpTextLayer *text_layer);
void gimp_text_layer_set_xcf_flags (GimpTextLayer *text_layer,
guint32 flags);
-
-
-#endif /* __GIMP_TEXT_LAYER_XCF_H__ */
diff --git a/app/text/gimptextlayer.h b/app/text/gimptextlayer.h
index 53a233ff0a..b119f8b686 100644
--- a/app/text/gimptextlayer.h
+++ b/app/text/gimptextlayer.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEXT_LAYER_H__
-#define __GIMP_TEXT_LAYER_H__
-
+#pragma once
#include "core/gimplayer.h"
@@ -74,6 +72,3 @@ void gimp_text_layer_set (GimpTextLayer *layer,
...) G_GNUC_NULL_TERMINATED;
gboolean gimp_item_is_text_layer (GimpItem *item);
-
-
-#endif /* __GIMP_TEXT_LAYER_H__ */
diff --git a/app/text/gimptextlayout-render.h b/app/text/gimptextlayout-render.h
index 456480a762..ca55af9149 100644
--- a/app/text/gimptextlayout-render.h
+++ b/app/text/gimptextlayout-render.h
@@ -18,14 +18,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEXT_LAYOUT_RENDER_H__
-#define __GIMP_TEXT_LAYOUT_RENDER_H__
+#pragma once
void gimp_text_layout_render (GimpTextLayout *layout,
cairo_t *cr,
GimpTextDirection base_dir,
gboolean path);
-
-
-#endif /* __GIMP_TEXT_LAYOUT_RENDER_H__ */
diff --git a/app/text/gimptextlayout.h b/app/text/gimptextlayout.h
index ed7fd89ed8..4ce7c3f9fb 100644
--- a/app/text/gimptextlayout.h
+++ b/app/text/gimptextlayout.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEXT_LAYOUT_H__
-#define __GIMP_TEXT_LAYOUT_H__
+#pragma once
#define GIMP_TYPE_TEXT_LAYOUT (gimp_text_layout_get_type ())
@@ -81,6 +80,3 @@ void gimp_text_layout_untransform_point (GimpTextLayout *layout,
void gimp_text_layout_untransform_distance (GimpTextLayout *layout,
gdouble *x,
gdouble *y);
-
-
-#endif /* __GIMP_TEXT_LAYOUT_H__ */
diff --git a/app/text/gimptextundo.h b/app/text/gimptextundo.h
index 913aeb9aae..1444c37a9b 100644
--- a/app/text/gimptextundo.h
+++ b/app/text/gimptextundo.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEXT_UNDO_H__
-#define __GIMP_TEXT_UNDO_H__
-
+#pragma once
#include "core/gimpitemundo.h"
@@ -50,6 +48,3 @@ struct _GimpTextUndoClass
GType gimp_text_undo_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_TEXT_UNDO_H__ */
diff --git a/app/text/text-enums.h b/app/text/text-enums.h
index ad3538a4c3..8cb431753d 100644
--- a/app/text/text-enums.h
+++ b/app/text/text-enums.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TEXT_ENUMS_H__
-#define __TEXT_ENUMS_H__
+#pragma once
#define GIMP_TYPE_TEXT_BOX_MODE (gimp_text_box_mode_get_type ())
@@ -41,6 +40,7 @@ typedef enum
GIMP_TEXT_OUTLINE_STROKE_FILL /*< desc="Outlined and filled" >*/
} GimpTextOutline;
+
#define GIMP_TYPE_TEXT_OUTLINE_DIRECTION (gimp_text_outline_direction_get_type ())
GType gimp_text_outline_direction_get_type (void) G_GNUC_CONST;
@@ -51,5 +51,3 @@ typedef enum
GIMP_TEXT_OUTLINE_DIRECTION_INNER, /*< desc="Inner" >*/
GIMP_TEXT_OUTLINE_DIRECTION_CENTERED /*< desc="Centered" >*/
} GimpTextOutlineDirection;
-
-#endif /* __TEXT_ENUMS_H__ */
diff --git a/app/text/text-types.h b/app/text/text-types.h
index 83b61905c9..c8993e90e0 100644
--- a/app/text/text-types.h
+++ b/app/text/text-types.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __TEXT_TYPES_H__
-#define __TEXT_TYPES_H__
+#pragma once
#include "core/core-types.h"
@@ -33,6 +32,3 @@ typedef struct _GimpText GimpText;
typedef struct _GimpTextLayer GimpTextLayer;
typedef struct _GimpTextLayout GimpTextLayout;
typedef struct _GimpTextUndo GimpTextUndo;
-
-
-#endif /* __TEXT_TYPES_H__ */
diff --git a/app/tools/gimpalignoptions.h b/app/tools/gimpalignoptions.h
index 27b2b8f642..4c20cb7ed1 100644
--- a/app/tools/gimpalignoptions.h
+++ b/app/tools/gimpalignoptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ALIGN_OPTIONS_H__
-#define __GIMP_ALIGN_OPTIONS_H__
-
+#pragma once
#include "core/gimptooloptions.h"
@@ -70,6 +68,3 @@ gboolean gimp_align_options_align_contents (GimpAlignOptions *options);
void gimp_align_options_pick_guide (GimpAlignOptions *options,
GimpGuide *guide,
gboolean extend);
-
-
-#endif /* __GIMP_ALIGN_OPTIONS_H__ */
diff --git a/app/tools/gimpbucketfilloptions.h b/app/tools/gimpbucketfilloptions.h
index 2148f6cca0..b2ad804e3c 100644
--- a/app/tools/gimpbucketfilloptions.h
+++ b/app/tools/gimpbucketfilloptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BUCKET_FILL_OPTIONS_H__
-#define __GIMP_BUCKET_FILL_OPTIONS_H__
-
+#pragma once
#include "paint/gimppaintoptions.h"
@@ -72,6 +70,3 @@ struct _GimpBucketFillOptions
GType gimp_bucket_fill_options_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_bucket_fill_options_gui (GimpToolOptions *tool_options);
-
-
-#endif /* __GIMP_BUCKET_FILL_OPTIONS_H__ */
diff --git a/app/tools/gimpbucketfilltool.h b/app/tools/gimpbucketfilltool.h
index 37a1b9647e..f02639e4e5 100644
--- a/app/tools/gimpbucketfilltool.h
+++ b/app/tools/gimpbucketfilltool.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_BUCKET_FILL_TOOL_H__
-#define __GIMP_BUCKET_FILL_TOOL_H__
-
+#pragma once
#include "gimpcolortool.h"
@@ -53,6 +51,3 @@ void gimp_bucket_fill_tool_register (GimpToolRegisterCallback callback,
gpointer data);
GType gimp_bucket_fill_tool_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_BUCKET_FILL_TOOL_H__ */
diff --git a/app/tools/gimpmovetool.h b/app/tools/gimpmovetool.h
index 2791af029e..a33d2f35c4 100644
--- a/app/tools/gimpmovetool.h
+++ b/app/tools/gimpmovetool.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_MOVE_TOOL_H__
-#define __GIMP_MOVE_TOOL_H__
-
+#pragma once
#include "gimpdrawtool.h"
@@ -58,6 +56,3 @@ void gimp_move_tool_register (GimpToolRegisterCallback callback,
gpointer data);
GType gimp_move_tool_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_MOVE_TOOL_H__ */
diff --git a/app/tools/gimppathoptions.h b/app/tools/gimppathoptions.h
index e222a580bd..71655cc9bc 100644
--- a/app/tools/gimppathoptions.h
+++ b/app/tools/gimppathoptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATH_OPTIONS_H__
-#define __GIMP_PATH_OPTIONS_H__
-
+#pragma once
#include "core/gimptooloptions.h"
@@ -50,6 +48,3 @@ struct _GimpPathOptions
GType gimp_path_options_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_path_options_gui (GimpToolOptions *tool_options);
-
-
-#endif /* __GIMP_PATH_OPTIONS_H__ */
diff --git a/app/tools/gimppathtool.h b/app/tools/gimppathtool.h
index 4dcb7d2485..5c9f761bb7 100644
--- a/app/tools/gimppathtool.h
+++ b/app/tools/gimppathtool.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATH_TOOL_H__
-#define __GIMP_PATH_TOOL_H__
-
+#pragma once
#include "gimpdrawtool.h"
@@ -62,6 +60,3 @@ GType gimp_path_tool_get_type (void) G_GNUC_CONST;
void gimp_path_tool_set_path (GimpPathTool *path_tool,
GimpPath *path);
-
-
-#endif /* __GIMP_PATH_TOOL_H__ */
diff --git a/app/tools/gimptextoptions.h b/app/tools/gimptextoptions.h
index 8b5cde7ead..48fdfcac5a 100644
--- a/app/tools/gimptextoptions.h
+++ b/app/tools/gimptextoptions.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEXT_OPTIONS_H__
-#define __GIMP_TEXT_OPTIONS_H__
-
+#pragma once
#include "core/gimptooloptions.h"
@@ -90,6 +88,3 @@ GtkWidget * gimp_text_options_editor_new (GtkWindow *parent,
GimpTextBuffer *text_buffer,
gdouble xres,
gdouble yres);
-
-
-#endif /* __GIMP_TEXT_OPTIONS_H__ */
diff --git a/app/tools/gimptexttool.h b/app/tools/gimptexttool.h
index 0986fd421b..0c7f40d920 100644
--- a/app/tools/gimptexttool.h
+++ b/app/tools/gimptexttool.h
@@ -20,9 +20,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEXT_TOOL_H__
-#define __GIMP_TEXT_TOOL_H__
-
+#pragma once
#include "gimpdrawtool.h"
@@ -127,6 +125,3 @@ void gimp_text_tool_clear_layout (GimpTextTool *text_tool);
gboolean gimp_text_tool_ensure_layout (GimpTextTool *text_tool);
void gimp_text_tool_apply (GimpTextTool *text_tool,
gboolean push_undo);
-
-
-#endif /* __GIMP_TEXT_TOOL_H__ */
diff --git a/app/tools/tool_manager.h b/app/tools/tool_manager.h
index 2f406a1d08..1a3b168276 100644
--- a/app/tools/tool_manager.h
+++ b/app/tools/tool_manager.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TOOL_MANAGER_H__
-#define __TOOL_MANAGER_H__
+#pragma once
void tool_manager_init (Gimp *gimp);
@@ -91,6 +90,3 @@ GimpUIManager * tool_manager_get_popup_active (Gimp *gimp,
GdkModifierType state,
GimpDisplay *display,
const gchar **ui_path);
-
-
-#endif /* __TOOL_MANAGER_H__ */
diff --git a/app/tools/tools-enums.h b/app/tools/tools-enums.h
index f4f9736c0e..ac5378b941 100644
--- a/app/tools/tools-enums.h
+++ b/app/tools/tools-enums.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TOOLS_ENUMS_H__
-#define __TOOLS_ENUMS_H__
+#pragma once
/*
@@ -208,6 +207,3 @@ typedef enum /*< skip >*/
GIMP_MOTION_MODE_EXACT,
GIMP_MOTION_MODE_COMPRESS
} GimpMotionMode;
-
-
-#endif /* __TOOLS_ENUMS_H__ */
diff --git a/app/tools/tools-types.h b/app/tools/tools-types.h
index ea115ba88b..24de64c0d5 100644
--- a/app/tools/tools-types.h
+++ b/app/tools/tools-types.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __TOOLS_TYPES_H__
-#define __TOOLS_TYPES_H__
+#pragma once
#include "paint/paint-types.h"
#include "display/display-types.h"
@@ -24,9 +23,6 @@
#include "tools/tools-enums.h"
-G_BEGIN_DECLS
-
-
typedef struct _GimpTool GimpTool;
typedef struct _GimpToolControl GimpToolControl;
@@ -61,8 +57,3 @@ typedef void (* GimpToolRegisterCallback) (GType tool_type,
typedef void (* GimpToolRegisterFunc) (GimpToolRegisterCallback callback,
gpointer register_data);
-
-
-G_END_DECLS
-
-#endif /* __TOOLS_TYPES_H__ */
diff --git a/app/unique.h b/app/unique.h
index 6b24ea88f8..cb9fc5c9f2 100644
--- a/app/unique.h
+++ b/app/unique.h
@@ -15,15 +15,11 @@
* along with this program. If not, see .
*/
-#ifndef __UNIQUE_H__
-#define __UNIQUE_H__
+#pragma once
-gboolean gimp_unique_open (const gchar **filenames,
- gboolean as_new);
+gboolean gimp_unique_open (const gchar **filenames,
+ gboolean as_new);
gboolean gimp_unique_batch_run (const gchar *batch_interpreter,
const gchar **batch_commands);
-
-
-#endif /* __UNIQUE_H__ */
diff --git a/app/widgets/gimpaction.h b/app/widgets/gimpaction.h
index 95b757b65c..1d89dfa3b9 100644
--- a/app/widgets/gimpaction.h
+++ b/app/widgets/gimpaction.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ACTION_H__
-#define __GIMP_ACTION_H__
+#pragma once
G_BEGIN_DECLS
@@ -159,5 +158,3 @@ void gimp_action_set_menu_path (GimpAction *action,
const gchar *menu_path);
G_END_DECLS
-
-#endif /* __GIMP_ACTION_H__ */
diff --git a/app/widgets/gimpactiongroup.h b/app/widgets/gimpactiongroup.h
index b26480a5f0..ba5aec289a 100644
--- a/app/widgets/gimpactiongroup.h
+++ b/app/widgets/gimpactiongroup.h
@@ -18,8 +18,12 @@
* along with this program. If not, see .
*/
+#pragma once
+
+/* leave this here */
#ifndef __GIMP_ACTION_GROUP_H__
#define __GIMP_ACTION_GROUP_H__
+#endif
#include "core/gimpobject.h"
@@ -253,7 +257,3 @@ void gimp_action_group_set_action_hide_empty (GimpActionGroup *group,
void gimp_action_group_set_action_always_show_image (GimpActionGroup *group,
const gchar *action_name,
gboolean always_show_image);
-
-
-
-#endif /* __GIMP_ACTION_GROUP_H__ */
diff --git a/app/widgets/gimpcircle.h b/app/widgets/gimpcircle.h
index 170a28b0f2..da43f39c2f 100644
--- a/app/widgets/gimpcircle.h
+++ b/app/widgets/gimpcircle.h
@@ -22,8 +22,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CIRCLE_H__
-#define __GIMP_CIRCLE_H__
+#pragma once
#define GIMP_TYPE_CIRCLE (gimp_circle_get_type ())
@@ -50,6 +49,3 @@ gdouble _gimp_circle_get_angle_and_distance (GimpCircle *circle,
gdouble event_x,
gdouble event_y,
gdouble *distance);
-
-
-#endif /* __GIMP_CIRCLE_H__ */
diff --git a/app/widgets/gimpcoloreditor.h b/app/widgets/gimpcoloreditor.h
index fc686d62b9..f52ddda73b 100644
--- a/app/widgets/gimpcoloreditor.h
+++ b/app/widgets/gimpcoloreditor.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_COLOR_EDITOR_H__
-#define __GIMP_COLOR_EDITOR_H__
-
+#pragma once
#include "gimpeditor.h"
@@ -60,6 +58,3 @@ struct _GimpColorEditorClass
GType gimp_color_editor_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_color_editor_new (GimpContext *context);
-
-
-#endif /* __GIMP_COLOR_EDITOR_H__ */
diff --git a/app/widgets/gimpcontainerbox.h b/app/widgets/gimpcontainerbox.h
index e003efe3a8..392b20e138 100644
--- a/app/widgets/gimpcontainerbox.h
+++ b/app/widgets/gimpcontainerbox.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONTAINER_BOX_H__
-#define __GIMP_CONTAINER_BOX_H__
-
+#pragma once
#include "gimpeditor.h"
@@ -53,6 +51,3 @@ GType gimp_container_box_get_type (void) G_GNUC_CONST;
void gimp_container_box_set_size_request (GimpContainerBox *box,
gint width,
gint height);
-
-
-#endif /* __GIMP_CONTAINER_BOX_H__ */
diff --git a/app/widgets/gimpcontainereditor.h b/app/widgets/gimpcontainereditor.h
index 3d16dc4de2..c551d85b7b 100644
--- a/app/widgets/gimpcontainereditor.h
+++ b/app/widgets/gimpcontainereditor.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONTAINER_EDITOR_H__
-#define __GIMP_CONTAINER_EDITOR_H__
+#pragma once
#define GIMP_TYPE_CONTAINER_EDITOR (gimp_container_editor_get_type ())
@@ -62,6 +61,3 @@ void gimp_container_editor_set_selection_mode (GimpContainerEditor *
void gimp_container_editor_bind_to_async_set (GimpContainerEditor *editor,
GimpAsyncSet *async_set,
const gchar *message);
-
-
-#endif /* __GIMP_CONTAINER_EDITOR_H__ */
diff --git a/app/widgets/gimpcontainericonview.h b/app/widgets/gimpcontainericonview.h
index c7d15cdb51..8afddd0be7 100644
--- a/app/widgets/gimpcontainericonview.h
+++ b/app/widgets/gimpcontainericonview.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONTAINER_ICON_VIEW_H__
-#define __GIMP_CONTAINER_ICON_VIEW_H__
-
+#pragma once
#include "gimpcontainerbox.h"
@@ -65,6 +63,3 @@ GtkWidget * gimp_container_icon_view_new (GimpContainer *container,
GimpContext *context,
gint view_size,
gint view_border_width);
-
-
-#endif /* __GIMP_CONTAINER_ICON_VIEW_H__ */
diff --git a/app/widgets/gimpcontainertreestore.h b/app/widgets/gimpcontainertreestore.h
index 2214c394ff..52062b48b0 100644
--- a/app/widgets/gimpcontainertreestore.h
+++ b/app/widgets/gimpcontainertreestore.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONTAINER_TREE_STORE_H__
-#define __GIMP_CONTAINER_TREE_STORE_H__
+#pragma once
enum
@@ -95,6 +94,3 @@ gboolean gimp_container_tree_store_rename_item (GimpContainerTreeStore *
GtkTreeIter *iter);
void gimp_container_tree_store_clear_items (GimpContainerTreeStore *store);
void gimp_container_tree_store_set_view_size (GimpContainerTreeStore *store);
-
-
-#endif /* __GIMP_CONTAINER_TREE_STORE_H__ */
diff --git a/app/widgets/gimpcontainertreeview.h b/app/widgets/gimpcontainertreeview.h
index 1473705a39..c8459cffb7 100644
--- a/app/widgets/gimpcontainertreeview.h
+++ b/app/widgets/gimpcontainertreeview.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONTAINER_TREE_VIEW_H__
-#define __GIMP_CONTAINER_TREE_VIEW_H__
-
+#pragma once
#include "gimpcontainerbox.h"
@@ -137,6 +135,3 @@ gboolean gimp_container_tree_view_name_edited
const gchar *path_str,
const gchar *new_name,
GimpContainerTreeView *tree_view);
-
-
-#endif /* __GIMP_CONTAINER_TREE_VIEW_H__ */
diff --git a/app/widgets/gimpcontainerview.h b/app/widgets/gimpcontainerview.h
index e768c6345e..5efeb3a20a 100644
--- a/app/widgets/gimpcontainerview.h
+++ b/app/widgets/gimpcontainerview.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONTAINER_VIEW_H__
-#define __GIMP_CONTAINER_VIEW_H__
+#pragma once
typedef enum
@@ -160,5 +159,3 @@ void gimp_container_view_get_property (GObject *o
guint property_id,
GValue *value,
GParamSpec *pspec);
-
-#endif /* __GIMP_CONTAINER_VIEW_H__ */
diff --git a/app/widgets/gimpcontrollercategory.h b/app/widgets/gimpcontrollercategory.h
index cde3fc1021..a866083c7d 100644
--- a/app/widgets/gimpcontrollercategory.h
+++ b/app/widgets/gimpcontrollercategory.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONTROLLER_CATEGORY_H__
-#define __GIMP_CONTROLLER_CATEGORY_H__
-
+#pragma once
#include "core/gimpviewable.h"
@@ -32,6 +30,3 @@ G_DECLARE_FINAL_TYPE (GimpControllerCategory,
GimpControllerCategory * gimp_controller_category_new (GType gtype);
GType gimp_controller_category_get_gtype (GimpControllerCategory *self);
-
-
-#endif /* __GIMP_CONTROLLER_CATEGORY_H__ */
diff --git a/app/widgets/gimpcontrollerlist.h b/app/widgets/gimpcontrollerlist.h
index 0534b6edc2..f73726c21d 100644
--- a/app/widgets/gimpcontrollerlist.h
+++ b/app/widgets/gimpcontrollerlist.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONTROLLER_LIST_H__
-#define __GIMP_CONTROLLER_LIST_H__
+#pragma once
#define GIMP_TYPE_CONTROLLER_LIST (gimp_controller_list_get_type ())
@@ -59,6 +58,3 @@ struct _GimpControllerListClass
GType gimp_controller_list_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_controller_list_new (GimpControllerManager *controller_manager);
-
-
-#endif /* __GIMP_CONTROLLER_LIST_H__ */
diff --git a/app/widgets/gimpcontrollermanager.h b/app/widgets/gimpcontrollermanager.h
index 3bf7113602..f5e192f7da 100644
--- a/app/widgets/gimpcontrollermanager.h
+++ b/app/widgets/gimpcontrollermanager.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONTROLLER_MANAGER_H__
-#define __GIMP_CONTROLLER_MANAGER_H__
-
+#pragma once
#include "core/gimplist.h"
@@ -43,6 +41,3 @@ GimpUIManager * gimp_controller_manager_get_ui_manager (GimpControllerManager *
GimpController * gimp_controller_manager_get_wheel (GimpControllerManager *self);
GimpController * gimp_controller_manager_get_keyboard (GimpControllerManager *self);
GListModel * gimp_controller_manager_get_categories (GimpControllerManager *self);
-
-
-#endif /* __GIMP_CONTROLLER_MANAGER_H__ */
diff --git a/app/widgets/gimpcontrollers.h b/app/widgets/gimpcontrollers.h
index 1be29903be..2c31dc0f13 100644
--- a/app/widgets/gimpcontrollers.h
+++ b/app/widgets/gimpcontrollers.h
@@ -18,14 +18,10 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CONTROLLERS_H__
-#define __GIMP_CONTROLLERS_H__
+#pragma once
void gimp_controllers_init (Gimp *gimp);
void gimp_controllers_exit (Gimp *gimp);
GimpControllerManager * gimp_get_controller_manager (Gimp *gimp);
-
-
-#endif /* __GIMP_CONTROLLERS_H__ */
diff --git a/app/widgets/gimpcursor.h b/app/widgets/gimpcursor.h
index f6b9ad05c0..ec0346bd6d 100644
--- a/app/widgets/gimpcursor.h
+++ b/app/widgets/gimpcursor.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CURSOR_H__
-#define __GIMP_CURSOR_H__
+#pragma once
GdkCursor * gimp_cursor_new (GdkWindow *window,
@@ -32,6 +31,3 @@ void gimp_cursor_set (GtkWidget *widget,
GimpCursorType gimp_cursor_rotate (GimpCursorType cursor,
gdouble angle);
-
-
-#endif /* __GIMP_CURSOR_H__ */
diff --git a/app/widgets/gimpcurveview.h b/app/widgets/gimpcurveview.h
index 9e86df7bd5..ab840ba215 100644
--- a/app/widgets/gimpcurveview.h
+++ b/app/widgets/gimpcurveview.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_CURVE_VIEW_H__
-#define __GIMP_CURVE_VIEW_H__
-
+#pragma once
#include "gimphistogramview.h"
@@ -125,6 +123,3 @@ void gimp_curve_view_set_x_axis_label (GimpCurveView *view,
const gchar *label);
void gimp_curve_view_set_y_axis_label (GimpCurveView *view,
const gchar *label);
-
-
-#endif /* __GIMP_CURVE_VIEW_H__ */
diff --git a/app/widgets/gimpdevicemanager.h b/app/widgets/gimpdevicemanager.h
index 5d1bc152ba..6c17839888 100644
--- a/app/widgets/gimpdevicemanager.h
+++ b/app/widgets/gimpdevicemanager.h
@@ -18,16 +18,13 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DEVICE_MANAGER_H__
-#define __GIMP_DEVICE_MANAGER_H__
-
+#pragma once
#include "core/gimplist.h"
G_BEGIN_DECLS
-
#define GIMP_TYPE_DEVICE_MANAGER (gimp_device_manager_get_type ())
#define GIMP_DEVICE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DEVICE_MANAGER, GimpDeviceManager))
#define GIMP_DEVICE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DEVICE_MANAGER, GimpDeviceManagerClass))
@@ -64,7 +61,4 @@ void gimp_device_manager_reset (GimpDeviceManager *m
void gimp_device_manager_reconfigure_pads (GimpDeviceManager *manager);
-
G_END_DECLS
-
-#endif /* __GIMP_DEVICE_MANAGER_H__ */
diff --git a/app/widgets/gimpdial.h b/app/widgets/gimpdial.h
index ee8755f978..c42d3f1dc1 100644
--- a/app/widgets/gimpdial.h
+++ b/app/widgets/gimpdial.h
@@ -22,9 +22,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DIAL_H__
-#define __GIMP_DIAL_H__
-
+#pragma once
#include "gimpcircle.h"
@@ -45,6 +43,3 @@ struct _GimpDialClass
GType gimp_dial_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_dial_new (void);
-
-
-#endif /* __GIMP_DIAL_H__ */
diff --git a/app/widgets/gimpdnd.h b/app/widgets/gimpdnd.h
index 93b87d4232..105b9fbfda 100644
--- a/app/widgets/gimpdnd.h
+++ b/app/widgets/gimpdnd.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DND_H__
-#define __GIMP_DND_H__
+#pragma once
#define GIMP_TARGET_URI_LIST \
@@ -289,6 +288,3 @@ void gimp_dnd_xds_source_add (GtkWidget *widget,
GimpDndDragViewableFunc get_image_func,
gpointer data);
void gimp_dnd_xds_source_remove (GtkWidget *widget);
-
-
-#endif /* __GIMP_DND_H__ */
diff --git a/app/widgets/gimpdrawabletreeview-filters.h b/app/widgets/gimpdrawabletreeview-filters.h
index 32c967b836..a4d87a855e 100644
--- a/app/widgets/gimpdrawabletreeview-filters.h
+++ b/app/widgets/gimpdrawabletreeview-filters.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_TREE_VIEW_FILTERS_H__
-#define __GIMP_DRAWABLE_TREE_VIEW_FILTERS_H__
+#pragma once
gboolean _gimp_drawable_tree_view_filter_editor_show (GimpDrawableTreeView *view,
@@ -27,6 +26,3 @@ gboolean _gimp_drawable_tree_view_filter_editor_show (GimpDrawableTreeView
void _gimp_drawable_tree_view_filter_editor_hide (GimpDrawableTreeView *view);
void _gimp_drawable_tree_view_filter_editor_destroy (GimpDrawableTreeView *view);
-
-
-#endif /* __GIMP_DRAWABLE_TREE_VIEW_FILTERS_H__ */
diff --git a/app/widgets/gimpdrawabletreeview.h b/app/widgets/gimpdrawabletreeview.h
index a225f83235..2c387a1efa 100644
--- a/app/widgets/gimpdrawabletreeview.h
+++ b/app/widgets/gimpdrawabletreeview.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_DRAWABLE_TREE_VIEW_H__
-#define __GIMP_DRAWABLE_TREE_VIEW_H__
-
+#pragma once
#include "gimpitemtreeview.h"
@@ -52,6 +50,3 @@ struct _GimpDrawableTreeViewClass
GType gimp_drawable_tree_view_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_DRAWABLE_TREE_VIEW_H__ */
diff --git a/app/widgets/gimpeditor.h b/app/widgets/gimpeditor.h
index 4bd9d9368b..d327fb67b7 100644
--- a/app/widgets/gimpeditor.h
+++ b/app/widgets/gimpeditor.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_EDITOR_H__
-#define __GIMP_EDITOR_H__
+#pragma once
#define GIMP_TYPE_EDITOR (gimp_editor_get_type ())
@@ -97,6 +96,3 @@ GimpMenuFactory *
gimp_editor_get_menu_factory (GimpEditor *editor);
gpointer * gimp_editor_get_popup_data (GimpEditor *editor);
gchar * gimp_editor_get_ui_path (GimpEditor *editor);
-
-
-#endif /* __GIMP_EDITOR_H__ */
diff --git a/app/widgets/gimpfilleditor.h b/app/widgets/gimpfilleditor.h
index 8ac90c5987..5ca96dee26 100644
--- a/app/widgets/gimpfilleditor.h
+++ b/app/widgets/gimpfilleditor.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_FILL_EDITOR_H__
-#define __GIMP_FILL_EDITOR_H__
+#pragma once
#define GIMP_TYPE_FILL_EDITOR (gimp_fill_editor_get_type ())
@@ -52,6 +51,3 @@ GType gimp_fill_editor_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_fill_editor_new (GimpFillOptions *options,
gboolean edit_context,
gboolean use_custom_style);
-
-
-#endif /* __GIMP_FILL_EDITOR_H__ */
diff --git a/app/widgets/gimphistogrambox.h b/app/widgets/gimphistogrambox.h
index cff4a10946..ebc91a8225 100644
--- a/app/widgets/gimphistogrambox.h
+++ b/app/widgets/gimphistogrambox.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_HISTOGRAM_BOX_H__
-#define __GIMP_HISTOGRAM_BOX_H__
+#pragma once
#define GIMP_TYPE_HISTOGRAM_BOX (gimp_histogram_box_get_type ())
@@ -57,6 +56,3 @@ GType gimp_histogram_box_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_histogram_box_new (void);
void gimp_histogram_box_set_channel (GimpHistogramBox *box,
GimpHistogramChannel channel);
-
-
-#endif /* __GIMP_HISTOGRAM_BOX_H__ */
diff --git a/app/widgets/gimphistogrameditor.h b/app/widgets/gimphistogrameditor.h
index cd3fb2fa6e..6a1c811aed 100644
--- a/app/widgets/gimphistogrameditor.h
+++ b/app/widgets/gimphistogrameditor.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_HISTOGRAM_EDITOR_H__
-#define __GIMP_HISTOGRAM_EDITOR_H__
-
+#pragma once
#include "gimpimageeditor.h"
@@ -64,6 +62,3 @@ struct _GimpHistogramEditorClass
GType gimp_histogram_editor_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_histogram_editor_new (void);
-
-
-#endif /* __GIMP_HISTOGRAM_EDITOR_H__ */
diff --git a/app/widgets/gimpiconpicker.h b/app/widgets/gimpiconpicker.h
index f14420404d..ba357b2337 100644
--- a/app/widgets/gimpiconpicker.h
+++ b/app/widgets/gimpiconpicker.h
@@ -19,8 +19,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ICON_PICKER_H__
-#define __GIMP_ICON_PICKER_H__
+#pragma once
#define GIMP_TYPE_ICON_PICKER (gimp_icon_picker_get_type ())
@@ -55,6 +54,3 @@ void gimp_icon_picker_set_icon_name (GimpIconPicker *picker,
GdkPixbuf * gimp_icon_picker_get_icon_pixbuf (GimpIconPicker *picker);
void gimp_icon_picker_set_icon_pixbuf (GimpIconPicker *picker,
GdkPixbuf *value);
-
-
-#endif /* __GIMP_ICON_PICKER_H__ */
diff --git a/app/widgets/gimpimagepropview.h b/app/widgets/gimpimagepropview.h
index 7061e428b9..3cdf0a25f6 100644
--- a/app/widgets/gimpimagepropview.h
+++ b/app/widgets/gimpimagepropview.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_IMAGE_PROP_VIEW_H__
-#define __GIMP_IMAGE_PROP_VIEW_H__
+#pragma once
#define GIMP_TYPE_IMAGE_PROP_VIEW (gimp_image_prop_view_get_type ())
@@ -64,6 +63,3 @@ struct _GimpImagePropViewClass
GType gimp_image_prop_view_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_image_prop_view_new (GimpImage *image);
-
-
-#endif /* __GIMP_IMAGE_PROP_VIEW_H__ */
diff --git a/app/widgets/gimpitemtreeview-search.h b/app/widgets/gimpitemtreeview-search.h
index ec18a9d05a..213679654f 100644
--- a/app/widgets/gimpitemtreeview-search.h
+++ b/app/widgets/gimpitemtreeview-search.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ITEM_TREE_VIEW_SEARCH_H__
-#define __GIMP_ITEM_TREE_VIEW_SEARCH_H__
+#pragma once
void _gimp_item_tree_view_search_create (GimpItemTreeView *view,
@@ -31,6 +30,3 @@ void _gimp_item_tree_view_search_hide (GimpItemTreeView *view);
void _gimp_item_tree_view_search_update_links (GimpItemTreeView *view,
GimpImage *image,
GType item_type);
-
-
-#endif /* __GIMP_ITEM_TREE_VIEW_SEARCH_H__ */
diff --git a/app/widgets/gimppathtreeview.h b/app/widgets/gimppathtreeview.h
index d7055e655b..ecb873bd9c 100644
--- a/app/widgets/gimppathtreeview.h
+++ b/app/widgets/gimppathtreeview.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_PATH_TREE_VIEW_H__
-#define __GIMP_PATH_TREE_VIEW_H__
-
+#pragma once
#include "gimpitemtreeview.h"
@@ -51,6 +49,3 @@ struct _GimpPathTreeViewClass
GType gimp_path_tree_view_get_type (void) G_GNUC_CONST;
-
-
-#endif /* __GIMP_PATH_TREE_VIEW_H__ */
diff --git a/app/widgets/gimppolar.h b/app/widgets/gimppolar.h
index b60203b4ec..00d21e445b 100644
--- a/app/widgets/gimppolar.h
+++ b/app/widgets/gimppolar.h
@@ -22,9 +22,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_POLAR_H__
-#define __GIMP_POLAR_H__
-
+#pragma once
#include "gimpcircle.h"
@@ -45,6 +43,3 @@ struct _GimpPolarClass
GType gimp_polar_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_polar_new (void);
-
-
-#endif /* __GIMP_POLAR_H__ */
diff --git a/app/widgets/gimprow.h b/app/widgets/gimprow.h
index 480e6c83b6..de4b171869 100644
--- a/app/widgets/gimprow.h
+++ b/app/widgets/gimprow.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_ROW_H__
-#define __GIMP_ROW_H__
+#pragma once
#define GIMP_TYPE_ROW (gimp_row_get_type ())
@@ -45,6 +44,3 @@ GimpViewable * gimp_row_get_viewable (GimpRow *row);
/* a generic GtkListBoxCreateWidgetFunc */
GtkWidget * gimp_row_create (gpointer item,
gpointer user_data);
-
-
-#endif /* __GIMP_ROW_H__ */
diff --git a/app/widgets/gimpstrokeeditor.h b/app/widgets/gimpstrokeeditor.h
index b6a37087fd..9f48ad08c7 100644
--- a/app/widgets/gimpstrokeeditor.h
+++ b/app/widgets/gimpstrokeeditor.h
@@ -18,9 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_STROKE_EDITOR_H__
-#define __GIMP_STROKE_EDITOR_H__
-
+#pragma once
#include "gimpfilleditor.h"
@@ -54,6 +52,3 @@ GtkWidget * gimp_stroke_editor_new (GimpStrokeOptions *options,
gdouble resolution,
gboolean edit_context,
gboolean use_custom_style);
-
-
-#endif /* __GIMP_STROKE_EDITOR_H__ */
diff --git a/app/widgets/gimptexteditor.h b/app/widgets/gimptexteditor.h
index ace15267b0..4da5aef5e4 100644
--- a/app/widgets/gimptexteditor.h
+++ b/app/widgets/gimptexteditor.h
@@ -18,8 +18,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_TEXT_EDITOR_H__
-#define __GIMP_TEXT_EDITOR_H__
+#pragma once
#define GIMP_TYPE_TEXT_EDITOR (gimp_text_editor_get_type ())
@@ -75,6 +74,3 @@ GimpTextDirection gimp_text_editor_get_direction (GimpTextEditor *editor);
void gimp_text_editor_set_font_name (GimpTextEditor *editor,
const gchar *font_name);
const gchar * gimp_text_editor_get_font_name (GimpTextEditor *editor);
-
-
-#endif /* __GIMP_TEXT_EDITOR_H__ */
diff --git a/app/widgets/gimpwindow.h b/app/widgets/gimpwindow.h
index be372a138d..29635bb322 100644
--- a/app/widgets/gimpwindow.h
+++ b/app/widgets/gimpwindow.h
@@ -17,8 +17,7 @@
* along with this program. If not, see .
*/
-#ifndef __GIMP_WINDOW_H__
-#define __GIMP_WINDOW_H__
+#pragma once
#define GIMP_TYPE_WINDOW (gimp_window_get_type ())
@@ -53,6 +52,3 @@ GType gimp_window_get_type (void) G_GNUC_CONST;
void gimp_window_set_primary_focus_widget (GimpWindow *window,
GtkWidget *primary_focus);
GtkWidget * gimp_window_get_primary_focus_widget (GimpWindow *window);
-
-
-#endif /* __GIMP_WINDOW_H__ */
diff --git a/app/widgets/widgets-enums.h b/app/widgets/widgets-enums.h
index d5179f9826..72fa52dee3 100644
--- a/app/widgets/widgets-enums.h
+++ b/app/widgets/widgets-enums.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __WIDGETS_ENUMS_H__
-#define __WIDGETS_ENUMS_H__
+#pragma once
/*
@@ -314,6 +313,3 @@ typedef enum /*< skip >*/
GIMP_DASHBOARD_HISTORY_DURATION_120_SEC = 120000,
GIMP_DASHBOARD_HISTORY_DURATION_240_SEC = 240000
} GimpDashboardHistoryDuration;
-
-
-#endif /* __WIDGETS_ENUMS_H__ */
diff --git a/app/widgets/widgets-types.h b/app/widgets/widgets-types.h
index 9842cce8b1..6ddca18aee 100644
--- a/app/widgets/widgets-types.h
+++ b/app/widgets/widgets-types.h
@@ -15,9 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __WIDGETS_TYPES_H__
-#define __WIDGETS_TYPES_H__
-
+#pragma once
#include "libgimpwidgets/gimpwidgetstypes.h"
@@ -337,6 +335,3 @@ typedef gboolean (* GimpPanedBoxDroppedFunc) (GtkWidget *noteboo
gpointer data);
typedef GtkWidget * (* GimpToolOptionsGUIFunc) (GimpToolOptions *tool_options);
-
-
-#endif /* __WIDGETS_TYPES_H__ */
diff --git a/app/xcf/xcf-load.h b/app/xcf/xcf-load.h
index 94881d0fcc..f4585b3575 100644
--- a/app/xcf/xcf-load.h
+++ b/app/xcf/xcf-load.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __XCF_LOAD_H__
-#define __XCF_LOAD_H__
+#pragma once
GimpImage * xcf_load_image (Gimp *gimp,
XcfInfo *info,
GError **error);
-
-
-#endif /* __XCF_LOAD_H__ */
diff --git a/app/xcf/xcf-private.h b/app/xcf/xcf-private.h
index f54badfcea..85d855aadf 100644
--- a/app/xcf/xcf-private.h
+++ b/app/xcf/xcf-private.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __XCF_PRIVATE_H__
-#define __XCF_PRIVATE_H__
+#pragma once
#define XCF_TILE_WIDTH 64
@@ -147,6 +146,3 @@ struct _XcfInfo
XcfCompressionType compression;
gint file_version;
};
-
-
-#endif /* __XCF_PRIVATE_H__ */
diff --git a/app/xcf/xcf-read.h b/app/xcf/xcf-read.h
index 2a75a76169..be8a7c6b60 100644
--- a/app/xcf/xcf-read.h
+++ b/app/xcf/xcf-read.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __XCF_READ_H__
-#define __XCF_READ_H__
+#pragma once
guint xcf_read_int8 (XcfInfo *info,
@@ -48,6 +47,3 @@ guint xcf_read_component (XcfInfo *info,
void xcf_read_from_be (gint bpc,
guint8 *data,
gint count);
-
-
-#endif /* __XCF_READ_H__ */
diff --git a/app/xcf/xcf-save.h b/app/xcf/xcf-save.h
index d3af16952a..3821ab86ca 100644
--- a/app/xcf/xcf-save.h
+++ b/app/xcf/xcf-save.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __XCF_SAVE_H__
-#define __XCF_SAVE_H__
+#pragma once
gboolean xcf_save_image (XcfInfo *info,
GimpImage *image,
GError **error);
-
-
-#endif /* __XCF_SAVE_H__ */
diff --git a/app/xcf/xcf-seek.h b/app/xcf/xcf-seek.h
index 02d629f965..1018925c3c 100644
--- a/app/xcf/xcf-seek.h
+++ b/app/xcf/xcf-seek.h
@@ -15,13 +15,9 @@
* along with this program. If not, see .
*/
-#ifndef __XCF_SEEK_H__
-#define __XCF_SEEK_H__
+#pragma once
gboolean xcf_seek_pos (XcfInfo *info,
goffset pos,
GError **error);
-
-
-#endif /* __XCF_SEEK_H__ */
diff --git a/app/xcf/xcf-utils.h b/app/xcf/xcf-utils.h
index 5f4673fc23..ab3617da57 100644
--- a/app/xcf/xcf-utils.h
+++ b/app/xcf/xcf-utils.h
@@ -15,12 +15,8 @@
* along with this program. If not, see .
*/
-#ifndef __XCF_UTILS_H__
-#define __XCF_UTILS_H__
+#pragma once
gboolean xcf_data_is_zero (const void *data,
gint size);
-
-
-#endif /* __XCF_UTILS_H__ */
diff --git a/app/xcf/xcf-write.h b/app/xcf/xcf-write.h
index 63ec15df92..e7424583f0 100644
--- a/app/xcf/xcf-write.h
+++ b/app/xcf/xcf-write.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __XCF_WRITE_H__
-#define __XCF_WRITE_H__
+#pragma once
guint xcf_write_int8 (XcfInfo *info,
@@ -59,6 +58,3 @@ guint xcf_write_component (XcfInfo *info,
void xcf_write_to_be (gint bpc,
guint8 *data,
gint count);
-
-
-#endif /* __XCF_WRITE_H__ */
diff --git a/app/xcf/xcf.h b/app/xcf/xcf.h
index b3c5e41dd6..e08c095053 100644
--- a/app/xcf/xcf.h
+++ b/app/xcf/xcf.h
@@ -15,8 +15,7 @@
* along with this program. If not, see .
*/
-#ifndef __XCF_H__
-#define __XCF_H__
+#pragma once
void xcf_init (Gimp *gimp);
@@ -34,5 +33,3 @@ gboolean xcf_save_stream (Gimp *gimp,
GFile *output_file,
GimpProgress *progress,
GError **error);
-
-#endif /* __XCF_H__ */
diff --git a/libgimp/gimp-debug.h b/libgimp/gimp-debug.h
index e5fd4b5b4d..d18e3446b3 100644
--- a/libgimp/gimp-debug.h
+++ b/libgimp/gimp-debug.h
@@ -18,12 +18,10 @@
* .
*/
-#ifndef __GIMP_DEBUG_H__
-#define __GIMP_DEBUG_H__
+#pragma once
G_BEGIN_DECLS
-
typedef enum
{
GIMP_DEBUG_PID = 1 << 0,
@@ -42,7 +40,5 @@ void _gimp_debug_configure (GimpStackTraceMode stack_trace_mode);
guint _gimp_get_debug_flags (void);
void _gimp_debug_stop (void);
-
G_END_DECLS
-#endif /* __GIMP_DEBUG_H__ */
diff --git a/libgimp/gimp-private.h b/libgimp/gimp-private.h
index b5e4e9594d..9f63ef4b98 100644
--- a/libgimp/gimp-private.h
+++ b/libgimp/gimp-private.h
@@ -18,15 +18,10 @@
* .
*/
-#ifndef __GIMP_PRIVATE_H__
-#define __GIMP_PRIVATE_H__
+#pragma once
G_BEGIN_DECLS
-
void _gimp_config (GPConfig *config);
-
G_END_DECLS
-
-#endif /* __GIMP_PRIVATE_H__ */
diff --git a/libgimp/gimp-shm.h b/libgimp/gimp-shm.h
index f81437c719..5a51f23226 100644
--- a/libgimp/gimp-shm.h
+++ b/libgimp/gimp-shm.h
@@ -18,18 +18,13 @@
* .
*/
-#ifndef __GIMP_SHM_H__
-#define __GIMP_SHM_H__
+#pragma once
G_BEGIN_DECLS
-
guchar * _gimp_shm_addr (void);
void _gimp_shm_open (gint shm_ID);
void _gimp_shm_close (void);
-
G_END_DECLS
-
-#endif /* __GIMP_SHM_H__ */
diff --git a/libgimp/gimp_pdb.h b/libgimp/gimp_pdb.h
index 84785a95e8..7e1a73a886 100644
--- a/libgimp/gimp_pdb.h
+++ b/libgimp/gimp_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_GIMP_PDB_H__
-#define __GIMP_GIMP_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -40,7 +39,4 @@ GimpParasite* gimp_get_parasite (const gchar *name);
gchar** gimp_get_parasite_list (void);
GFile* gimp_temp_file (const gchar *extension);
-
G_END_DECLS
-
-#endif /* __GIMP_GIMP_PDB_H__ */
diff --git a/libgimp/gimpbrush_pdb.h b/libgimp/gimpbrush_pdb.h
index fa693f1af4..e8423e5393 100644
--- a/libgimp/gimpbrush_pdb.h
+++ b/libgimp/gimpbrush_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_BRUSH_PDB_H__
-#define __GIMP_BRUSH_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -81,7 +80,4 @@ gboolean gimp_brush_set_angle (GimpBrush *
gdouble angle_in,
gdouble *angle_out);
-
G_END_DECLS
-
-#endif /* __GIMP_BRUSH_PDB_H__ */
diff --git a/libgimp/gimpbrushes_pdb.h b/libgimp/gimpbrushes_pdb.h
index 37127b90ee..4b18f9b06e 100644
--- a/libgimp/gimpbrushes_pdb.h
+++ b/libgimp/gimpbrushes_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_BRUSHES_PDB_H__
-#define __GIMP_BRUSHES_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -35,7 +34,4 @@ G_BEGIN_DECLS
gboolean gimp_brushes_refresh (void);
GimpBrush** gimp_brushes_get_list (const gchar *filter);
-
G_END_DECLS
-
-#endif /* __GIMP_BRUSHES_PDB_H__ */
diff --git a/libgimp/gimpbrushselect_pdb.h b/libgimp/gimpbrushselect_pdb.h
index ed7c607638..4bf0e199b1 100644
--- a/libgimp/gimpbrushselect_pdb.h
+++ b/libgimp/gimpbrushselect_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_BRUSH_SELECT_PDB_H__
-#define __GIMP_BRUSH_SELECT_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -40,7 +39,4 @@ gboolean gimp_brushes_close_popup (const gchar *brush_callback);
gboolean gimp_brushes_set_popup (const gchar *brush_callback,
GimpBrush *brush);
-
G_END_DECLS
-
-#endif /* __GIMP_BRUSH_SELECT_PDB_H__ */
diff --git a/libgimp/gimpbuffer_pdb.h b/libgimp/gimpbuffer_pdb.h
index 8e9a593fba..894e22eeee 100644
--- a/libgimp/gimpbuffer_pdb.h
+++ b/libgimp/gimpbuffer_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_BUFFER_PDB_H__
-#define __GIMP_BUFFER_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -41,7 +40,4 @@ gint gimp_buffer_get_height (const gchar *buffer_name);
gint gimp_buffer_get_bytes (const gchar *buffer_name);
GimpImageType gimp_buffer_get_image_type (const gchar *buffer_name);
-
G_END_DECLS
-
-#endif /* __GIMP_BUFFER_PDB_H__ */
diff --git a/libgimp/gimpchannel_pdb.h b/libgimp/gimpchannel_pdb.h
index c358bc5312..61abc98ec0 100644
--- a/libgimp/gimpchannel_pdb.h
+++ b/libgimp/gimpchannel_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_CHANNEL_PDB_H__
-#define __GIMP_CHANNEL_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -57,7 +56,4 @@ GeglColor* gimp_channel_get_color (GimpChannel *channel);
gboolean gimp_channel_set_color (GimpChannel *channel,
GeglColor *color);
-
G_END_DECLS
-
-#endif /* __GIMP_CHANNEL_PDB_H__ */
diff --git a/libgimp/gimpcontext_pdb.h b/libgimp/gimpcontext_pdb.h
index da8eb7443c..dc5ba4d5fd 100644
--- a/libgimp/gimpcontext_pdb.h
+++ b/libgimp/gimpcontext_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_CONTEXT_PDB_H__
-#define __GIMP_CONTEXT_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -155,7 +154,4 @@ gdouble gimp_context_get_ink_blob_angle (void)
gboolean gimp_context_set_ink_blob_angle (gdouble angle);
G_GNUC_INTERNAL GimpResource* _gimp_context_get_resource (const gchar *type_name);
-
G_END_DECLS
-
-#endif /* __GIMP_CONTEXT_PDB_H__ */
diff --git a/libgimp/gimpdebug_pdb.h b/libgimp/gimpdebug_pdb.h
index 234dc18128..94c0c03704 100644
--- a/libgimp/gimpdebug_pdb.h
+++ b/libgimp/gimpdebug_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_DEBUG_PDB_H__
-#define __GIMP_DEBUG_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -35,7 +34,4 @@ G_BEGIN_DECLS
gboolean gimp_debug_timer_start (void);
gdouble gimp_debug_timer_end (void);
-
G_END_DECLS
-
-#endif /* __GIMP_DEBUG_PDB_H__ */
diff --git a/libgimp/gimpdisplay_pdb.h b/libgimp/gimpdisplay_pdb.h
index d5fac224ad..369f356926 100644
--- a/libgimp/gimpdisplay_pdb.h
+++ b/libgimp/gimpdisplay_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_DISPLAY_PDB_H__
-#define __GIMP_DISPLAY_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -41,7 +40,4 @@ gboolean gimp_displays_flush (void);
gboolean gimp_displays_reconnect (GimpImage *old_image,
GimpImage *new_image);
-
G_END_DECLS
-
-#endif /* __GIMP_DISPLAY_PDB_H__ */
diff --git a/libgimp/gimpdrawable_pdb.h b/libgimp/gimpdrawable_pdb.h
index 396fbe82b5..69bbcd4b43 100644
--- a/libgimp/gimpdrawable_pdb.h
+++ b/libgimp/gimpdrawable_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_DRAWABLE_PDB_H__
-#define __GIMP_DRAWABLE_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -107,7 +106,4 @@ gboolean gimp_drawable_foreground_extract (GimpDrawable
GimpForegroundExtractMode mode,
GimpDrawable *mask);
-
G_END_DECLS
-
-#endif /* __GIMP_DRAWABLE_PDB_H__ */
diff --git a/libgimp/gimpdrawablecolor_pdb.h b/libgimp/gimpdrawablecolor_pdb.h
index d4fb5e9737..219529a34e 100644
--- a/libgimp/gimpdrawablecolor_pdb.h
+++ b/libgimp/gimpdrawablecolor_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_DRAWABLE_COLOR_PDB_H__
-#define __GIMP_DRAWABLE_COLOR_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -104,7 +103,4 @@ gboolean gimp_drawable_threshold (GimpDrawable *drawable,
gdouble low_threshold,
gdouble high_threshold);
-
G_END_DECLS
-
-#endif /* __GIMP_DRAWABLE_COLOR_PDB_H__ */
diff --git a/libgimp/gimpdrawableedit_pdb.h b/libgimp/gimpdrawableedit_pdb.h
index 4ee15bb99a..c2a0c40418 100644
--- a/libgimp/gimpdrawableedit_pdb.h
+++ b/libgimp/gimpdrawableedit_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_DRAWABLE_EDIT_PDB_H__
-#define __GIMP_DRAWABLE_EDIT_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -54,7 +53,4 @@ gboolean gimp_drawable_edit_stroke_selection (GimpDrawable *drawable);
gboolean gimp_drawable_edit_stroke_item (GimpDrawable *drawable,
GimpItem *item);
-
G_END_DECLS
-
-#endif /* __GIMP_DRAWABLE_EDIT_PDB_H__ */
diff --git a/libgimp/gimpdrawablefilter_pdb.h b/libgimp/gimpdrawablefilter_pdb.h
index 844c256927..3ef1f57953 100644
--- a/libgimp/gimpdrawablefilter_pdb.h
+++ b/libgimp/gimpdrawablefilter_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_DRAWABLE_FILTER_PDB_H__
-#define __GIMP_DRAWABLE_FILTER_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -60,7 +59,4 @@ G_GNUC_INTERNAL gchar** _gimp_drawable_filter_get_arguments (GimpDraw
GimpValueArray **values);
gboolean gimp_drawable_filter_delete (GimpDrawableFilter *filter);
-
G_END_DECLS
-
-#endif /* __GIMP_DRAWABLE_FILTER_PDB_H__ */
diff --git a/libgimp/gimpdrawableselect_pdb.h b/libgimp/gimpdrawableselect_pdb.h
index b873daf841..381b46c778 100644
--- a/libgimp/gimpdrawableselect_pdb.h
+++ b/libgimp/gimpdrawableselect_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_DRAWABLE_SELECT_PDB_H__
-#define __GIMP_DRAWABLE_SELECT_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -41,7 +40,4 @@ gboolean gimp_drawables_close_popup (const gchar *callback);
gboolean gimp_drawables_set_popup (const gchar *callback,
GimpDrawable *drawable);
-
G_END_DECLS
-
-#endif /* __GIMP_DRAWABLE_SELECT_PDB_H__ */
diff --git a/libgimp/gimpdynamics_pdb.h b/libgimp/gimpdynamics_pdb.h
index c46b5961fd..67325f45e8 100644
--- a/libgimp/gimpdynamics_pdb.h
+++ b/libgimp/gimpdynamics_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_DYNAMICS_PDB_H__
-#define __GIMP_DYNAMICS_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -35,7 +34,4 @@ G_BEGIN_DECLS
gboolean gimp_dynamics_refresh (void);
gchar** gimp_dynamics_get_name_list (const gchar *filter);
-
G_END_DECLS
-
-#endif /* __GIMP_DYNAMICS_PDB_H__ */
diff --git a/libgimp/gimpedit_pdb.h b/libgimp/gimpedit_pdb.h
index 0fb6dc519e..31c98ebbc5 100644
--- a/libgimp/gimpedit_pdb.h
+++ b/libgimp/gimpedit_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_EDIT_PDB_H__
-#define __GIMP_EDIT_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -49,7 +48,4 @@ GimpLayer* gimp_edit_named_paste (GimpDrawable *drawable
gboolean paste_into);
GimpImage* gimp_edit_named_paste_as_new_image (const gchar *buffer_name);
-
G_END_DECLS
-
-#endif /* __GIMP_EDIT_PDB_H__ */
diff --git a/libgimp/gimpfile_pdb.h b/libgimp/gimpfile_pdb.h
index 004548e147..7ae02f615c 100644
--- a/libgimp/gimpfile_pdb.h
+++ b/libgimp/gimpfile_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_FILE_PDB_H__
-#define __GIMP_FILE_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -47,7 +46,4 @@ gboolean gimp_file_save (GimpRunMode run_mode,
gboolean gimp_file_create_thumbnail (GimpImage *image,
GFile *file);
-
G_END_DECLS
-
-#endif /* __GIMP_FILE_PDB_H__ */
diff --git a/libgimp/gimpfloatingsel_pdb.h b/libgimp/gimpfloatingsel_pdb.h
index 598e9df3d4..ce1d9f2eff 100644
--- a/libgimp/gimpfloatingsel_pdb.h
+++ b/libgimp/gimpfloatingsel_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_FLOATING_SEL_PDB_H__
-#define __GIMP_FLOATING_SEL_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -38,7 +37,4 @@ gboolean gimp_floating_sel_to_layer (GimpLayer *floating_sel);
gboolean gimp_floating_sel_attach (GimpLayer *layer,
GimpDrawable *drawable);
-
G_END_DECLS
-
-#endif /* __GIMP_FLOATING_SEL_PDB_H__ */
diff --git a/libgimp/gimpfont_pdb.h b/libgimp/gimpfont_pdb.h
index 1ea45b3a1c..3b99d94d8d 100644
--- a/libgimp/gimpfont_pdb.h
+++ b/libgimp/gimpfont_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_FONT_PDB_H__
-#define __GIMP_FONT_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -35,7 +34,4 @@ G_BEGIN_DECLS
G_GNUC_INTERNAL gchar* _gimp_font_get_lookup_name (GimpFont *font);
GimpFont* gimp_font_get_by_name (const gchar *name);
-
G_END_DECLS
-
-#endif /* __GIMP_FONT_PDB_H__ */
diff --git a/libgimp/gimpfonts_pdb.h b/libgimp/gimpfonts_pdb.h
index 5496525bf3..e7bd2f2d83 100644
--- a/libgimp/gimpfonts_pdb.h
+++ b/libgimp/gimpfonts_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_FONTS_PDB_H__
-#define __GIMP_FONTS_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -38,7 +37,4 @@ G_GNUC_INTERNAL gchar* _gimp_fonts_get_custom_configs (gchar **sysconfig,
gchar ***dirs);
GimpFont** gimp_fonts_get_list (const gchar *filter);
-
G_END_DECLS
-
-#endif /* __GIMP_FONTS_PDB_H__ */
diff --git a/libgimp/gimpfontselect_pdb.h b/libgimp/gimpfontselect_pdb.h
index 3cb1d50992..f7bed5f904 100644
--- a/libgimp/gimpfontselect_pdb.h
+++ b/libgimp/gimpfontselect_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_FONT_SELECT_PDB_H__
-#define __GIMP_FONT_SELECT_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -40,7 +39,4 @@ gboolean gimp_fonts_close_popup (const gchar *font_callback);
gboolean gimp_fonts_set_popup (const gchar *font_callback,
GimpFont *font);
-
G_END_DECLS
-
-#endif /* __GIMP_FONT_SELECT_PDB_H__ */
diff --git a/libgimp/gimpgimprc_pdb.h b/libgimp/gimpgimprc_pdb.h
index 5d75a48515..ec39f45657 100644
--- a/libgimp/gimpgimprc_pdb.h
+++ b/libgimp/gimpgimprc_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_GIMPRC_PDB_H__
-#define __GIMP_GIMPRC_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -42,7 +41,4 @@ gboolean gimp_get_monitor_resolution (gdouble *xres,
G_GNUC_INTERNAL gchar* _gimp_get_color_configuration (void);
gchar* gimp_get_module_load_inhibit (void);
-
G_END_DECLS
-
-#endif /* __GIMP_GIMPRC_PDB_H__ */
diff --git a/libgimp/gimpgradient_pdb.h b/libgimp/gimpgradient_pdb.h
index 22bd32ad39..956e5489c0 100644
--- a/libgimp/gimpgradient_pdb.h
+++ b/libgimp/gimpgradient_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_GRADIENT_PDB_H__
-#define __GIMP_GRADIENT_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -119,7 +118,4 @@ gdouble gimp_gradient_segment_range_move (GimpGradient
gdouble delta,
gboolean control_compress);
-
G_END_DECLS
-
-#endif /* __GIMP_GRADIENT_PDB_H__ */
diff --git a/libgimp/gimpgradients_pdb.h b/libgimp/gimpgradients_pdb.h
index 0db2d9748f..606eb0a6f1 100644
--- a/libgimp/gimpgradients_pdb.h
+++ b/libgimp/gimpgradients_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_GRADIENTS_PDB_H__
-#define __GIMP_GRADIENTS_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -35,7 +34,4 @@ G_BEGIN_DECLS
gboolean gimp_gradients_refresh (void);
GimpGradient** gimp_gradients_get_list (const gchar *filter);
-
G_END_DECLS
-
-#endif /* __GIMP_GRADIENTS_PDB_H__ */
diff --git a/libgimp/gimpgradientselect_pdb.h b/libgimp/gimpgradientselect_pdb.h
index ee9912cf4f..7e8c36c425 100644
--- a/libgimp/gimpgradientselect_pdb.h
+++ b/libgimp/gimpgradientselect_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_GRADIENT_SELECT_PDB_H__
-#define __GIMP_GRADIENT_SELECT_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -40,7 +39,4 @@ gboolean gimp_gradients_close_popup (const gchar *gradient_callback);
gboolean gimp_gradients_set_popup (const gchar *gradient_callback,
GimpGradient *gradient);
-
G_END_DECLS
-
-#endif /* __GIMP_GRADIENT_SELECT_PDB_H__ */
diff --git a/libgimp/gimpgrouplayer_pdb.h b/libgimp/gimpgrouplayer_pdb.h
index 7699b7a84b..87ccf47a3d 100644
--- a/libgimp/gimpgrouplayer_pdb.h
+++ b/libgimp/gimpgrouplayer_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_GROUP_LAYER_PDB_H__
-#define __GIMP_GROUP_LAYER_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -36,7 +35,4 @@ GimpGroupLayer* gimp_group_layer_new (GimpImage *image,
const gchar *name);
GimpLayer* gimp_group_layer_merge (GimpGroupLayer *group_layer);
-
G_END_DECLS
-
-#endif /* __GIMP_GROUP_LAYER_PDB_H__ */
diff --git a/libgimp/gimphelp_pdb.h b/libgimp/gimphelp_pdb.h
index 850bab4706..508e3998df 100644
--- a/libgimp/gimphelp_pdb.h
+++ b/libgimp/gimphelp_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_HELP_PDB_H__
-#define __GIMP_HELP_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -35,7 +34,4 @@ G_BEGIN_DECLS
gboolean gimp_help (const gchar *help_domain,
const gchar *help_id);
-
G_END_DECLS
-
-#endif /* __GIMP_HELP_PDB_H__ */
diff --git a/libgimp/gimpimage_pdb.h b/libgimp/gimpimage_pdb.h
index 946790e5b8..2379359257 100644
--- a/libgimp/gimpimage_pdb.h
+++ b/libgimp/gimpimage_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_IMAGE_PDB_H__
-#define __GIMP_IMAGE_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -204,7 +203,4 @@ gboolean gimp_image_policy_rotate (GimpImage
gboolean gimp_image_policy_color_profile (GimpImage *image,
gboolean interactive);
-
G_END_DECLS
-
-#endif /* __GIMP_IMAGE_PDB_H__ */
diff --git a/libgimp/gimpimageautocrop_pdb.h b/libgimp/gimpimageautocrop_pdb.h
index 6c0813ddb4..93e8ec3fee 100644
--- a/libgimp/gimpimageautocrop_pdb.h
+++ b/libgimp/gimpimageautocrop_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_IMAGE_AUTOCROP_PDB_H__
-#define __GIMP_IMAGE_AUTOCROP_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -37,7 +36,4 @@ gboolean gimp_image_autocrop (GimpImage *image,
gboolean gimp_image_autocrop_selected_layers (GimpImage *image,
GimpDrawable *drawable);
-
G_END_DECLS
-
-#endif /* __GIMP_IMAGE_AUTOCROP_PDB_H__ */
diff --git a/libgimp/gimpimagecolorprofile_pdb.h b/libgimp/gimpimagecolorprofile_pdb.h
index c47a1fb5bc..08492dd22e 100644
--- a/libgimp/gimpimagecolorprofile_pdb.h
+++ b/libgimp/gimpimagecolorprofile_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_IMAGE_COLOR_PROFILE_PDB_H__
-#define __GIMP_IMAGE_COLOR_PROFILE_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -58,7 +57,4 @@ gboolean gimp_image_convert_color_profile_from_file (GimpImage
GimpColorRenderingIntent intent,
gboolean bpc);
-
G_END_DECLS
-
-#endif /* __GIMP_IMAGE_COLOR_PROFILE_PDB_H__ */
diff --git a/libgimp/gimpimageconvert_pdb.h b/libgimp/gimpimageconvert_pdb.h
index 51a6c5383f..5eee48739e 100644
--- a/libgimp/gimpimageconvert_pdb.h
+++ b/libgimp/gimpimageconvert_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_IMAGE_CONVERT_PDB_H__
-#define __GIMP_IMAGE_CONVERT_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -47,7 +46,4 @@ gboolean gimp_image_convert_set_dither_matrix (gint width,
gboolean gimp_image_convert_precision (GimpImage *image,
GimpPrecision precision);
-
G_END_DECLS
-
-#endif /* __GIMP_IMAGE_CONVERT_PDB_H__ */
diff --git a/libgimp/gimpimagegrid_pdb.h b/libgimp/gimpimagegrid_pdb.h
index e0dfbdb282..46e3048eb4 100644
--- a/libgimp/gimpimagegrid_pdb.h
+++ b/libgimp/gimpimagegrid_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_IMAGE_GRID_PDB_H__
-#define __GIMP_IMAGE_GRID_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -54,7 +53,4 @@ GimpGridStyle gimp_image_grid_get_style (GimpImage *image);
gboolean gimp_image_grid_set_style (GimpImage *image,
GimpGridStyle style);
-
G_END_DECLS
-
-#endif /* __GIMP_IMAGE_GRID_PDB_H__ */
diff --git a/libgimp/gimpimageguides_pdb.h b/libgimp/gimpimageguides_pdb.h
index 38a6baf42f..f1b871d952 100644
--- a/libgimp/gimpimageguides_pdb.h
+++ b/libgimp/gimpimageguides_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_IMAGE_GUIDES_PDB_H__
-#define __GIMP_IMAGE_GUIDES_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -45,7 +44,4 @@ GimpOrientationType gimp_image_get_guide_orientation (GimpImage *image,
gint gimp_image_get_guide_position (GimpImage *image,
guint guide);
-
G_END_DECLS
-
-#endif /* __GIMP_IMAGE_GUIDES_PDB_H__ */
diff --git a/libgimp/gimpimagesamplepoints_pdb.h b/libgimp/gimpimagesamplepoints_pdb.h
index 7c12a4fde6..15c61c1a8c 100644
--- a/libgimp/gimpimagesamplepoints_pdb.h
+++ b/libgimp/gimpimagesamplepoints_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_IMAGE_SAMPLE_POINTS_PDB_H__
-#define __GIMP_IMAGE_SAMPLE_POINTS_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -43,7 +42,4 @@ gint gimp_image_get_sample_point_position (GimpImage *image,
guint sample_point,
gint *position_y);
-
G_END_DECLS
-
-#endif /* __GIMP_IMAGE_SAMPLE_POINTS_PDB_H__ */
diff --git a/libgimp/gimpimageselect_pdb.h b/libgimp/gimpimageselect_pdb.h
index dc8b887a9f..2121c59a4a 100644
--- a/libgimp/gimpimageselect_pdb.h
+++ b/libgimp/gimpimageselect_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_IMAGE_SELECT_PDB_H__
-#define __GIMP_IMAGE_SELECT_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -69,7 +68,4 @@ gboolean gimp_image_select_item (GimpImage *image,
GimpChannelOps operation,
GimpItem *item);
-
G_END_DECLS
-
-#endif /* __GIMP_IMAGE_SELECT_PDB_H__ */
diff --git a/libgimp/gimpimagetransform_pdb.h b/libgimp/gimpimagetransform_pdb.h
index f82c018682..fce239fb8d 100644
--- a/libgimp/gimpimagetransform_pdb.h
+++ b/libgimp/gimpimagetransform_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_IMAGE_TRANSFORM_PDB_H__
-#define __GIMP_IMAGE_TRANSFORM_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -51,7 +50,4 @@ gboolean gimp_image_flip (GimpImage *image,
gboolean gimp_image_rotate (GimpImage *image,
GimpRotationType rotate_type);
-
G_END_DECLS
-
-#endif /* __GIMP_IMAGE_TRANSFORM_PDB_H__ */
diff --git a/libgimp/gimpimageundo_pdb.h b/libgimp/gimpimageundo_pdb.h
index 3caa0f2227..17f0ed16f5 100644
--- a/libgimp/gimpimageundo_pdb.h
+++ b/libgimp/gimpimageundo_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_IMAGE_UNDO_PDB_H__
-#define __GIMP_IMAGE_UNDO_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -40,7 +39,4 @@ gboolean gimp_image_undo_enable (GimpImage *image);
gboolean gimp_image_undo_freeze (GimpImage *image);
gboolean gimp_image_undo_thaw (GimpImage *image);
-
G_END_DECLS
-
-#endif /* __GIMP_IMAGE_UNDO_PDB_H__ */
diff --git a/libgimp/gimpitem_pdb.h b/libgimp/gimpitem_pdb.h
index 58a858ef4e..a869b215a2 100644
--- a/libgimp/gimpitem_pdb.h
+++ b/libgimp/gimpitem_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_ITEM_PDB_H__
-#define __GIMP_ITEM_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -78,7 +77,4 @@ GimpParasite* gimp_item_get_parasite (GimpItem *item,
const gchar *name);
gchar** gimp_item_get_parasite_list (GimpItem *item);
-
G_END_DECLS
-
-#endif /* __GIMP_ITEM_PDB_H__ */
diff --git a/libgimp/gimpitemtransform_pdb.h b/libgimp/gimpitemtransform_pdb.h
index 02890ea773..995bfda8a7 100644
--- a/libgimp/gimpitemtransform_pdb.h
+++ b/libgimp/gimpitemtransform_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_ITEM_TRANSFORM_PDB_H__
-#define __GIMP_ITEM_TRANSFORM_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -90,7 +89,4 @@ GimpItem* gimp_item_transform_matrix (GimpItem *item,
gdouble coeff_2_1,
gdouble coeff_2_2);
-
G_END_DECLS
-
-#endif /* __GIMP_ITEM_TRANSFORM_PDB_H__ */
diff --git a/libgimp/gimplayer_pdb.h b/libgimp/gimplayer_pdb.h
index d1f3bf8b19..a2ed8cc645 100644
--- a/libgimp/gimplayer_pdb.h
+++ b/libgimp/gimplayer_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_LAYER_PDB_H__
-#define __GIMP_LAYER_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -97,7 +96,4 @@ GimpLayerCompositeMode gimp_layer_get_composite_mode (GimpLayer *
gboolean gimp_layer_set_composite_mode (GimpLayer *layer,
GimpLayerCompositeMode composite_mode);
-
G_END_DECLS
-
-#endif /* __GIMP_LAYER_PDB_H__ */
diff --git a/libgimp/gimpmessage_pdb.h b/libgimp/gimpmessage_pdb.h
index a23fe59ce1..20874c84aa 100644
--- a/libgimp/gimpmessage_pdb.h
+++ b/libgimp/gimpmessage_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_MESSAGE_PDB_H__
-#define __GIMP_MESSAGE_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -36,7 +35,4 @@ gboolean gimp_message (const gchar *message
GimpMessageHandlerType gimp_message_get_handler (void);
gboolean gimp_message_set_handler (GimpMessageHandlerType handler);
-
G_END_DECLS
-
-#endif /* __GIMP_MESSAGE_PDB_H__ */
diff --git a/libgimp/gimppainttools_pdb.h b/libgimp/gimppainttools_pdb.h
index 3c42379a26..2dd04add33 100644
--- a/libgimp/gimppainttools_pdb.h
+++ b/libgimp/gimppainttools_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_PAINT_TOOLS_PDB_H__
-#define __GIMP_PAINT_TOOLS_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -103,7 +102,4 @@ gboolean gimp_smudge_default (GimpDrawable *drawable,
gsize num_strokes,
const gdouble *strokes);
-
G_END_DECLS
-
-#endif /* __GIMP_PAINT_TOOLS_PDB_H__ */
diff --git a/libgimp/gimppalette_pdb.h b/libgimp/gimppalette_pdb.h
index cd277f24fa..248f4d8f2e 100644
--- a/libgimp/gimppalette_pdb.h
+++ b/libgimp/gimppalette_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_PALETTE_PDB_H__
-#define __GIMP_PALETTE_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -63,7 +62,4 @@ G_GNUC_INTERNAL gboolean _gimp_palette_set_bytes (GimpPalette *palette,
const Babl *format,
GBytes *colormap);
-
G_END_DECLS
-
-#endif /* __GIMP_PALETTE_PDB_H__ */
diff --git a/libgimp/gimppalettes_pdb.h b/libgimp/gimppalettes_pdb.h
index c49207dc29..b3b0759ab6 100644
--- a/libgimp/gimppalettes_pdb.h
+++ b/libgimp/gimppalettes_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_PALETTES_PDB_H__
-#define __GIMP_PALETTES_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -35,7 +34,4 @@ G_BEGIN_DECLS
gboolean gimp_palettes_refresh (void);
GimpPalette** gimp_palettes_get_list (const gchar *filter);
-
G_END_DECLS
-
-#endif /* __GIMP_PALETTES_PDB_H__ */
diff --git a/libgimp/gimppaletteselect_pdb.h b/libgimp/gimppaletteselect_pdb.h
index 31f62dff45..14703a4b12 100644
--- a/libgimp/gimppaletteselect_pdb.h
+++ b/libgimp/gimppaletteselect_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_PALETTE_SELECT_PDB_H__
-#define __GIMP_PALETTE_SELECT_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -40,7 +39,4 @@ gboolean gimp_palettes_close_popup (const gchar *palette_callback);
gboolean gimp_palettes_set_popup (const gchar *palette_callback,
GimpPalette *palette);
-
G_END_DECLS
-
-#endif /* __GIMP_PALETTE_SELECT_PDB_H__ */
diff --git a/libgimp/gimppath_pdb.h b/libgimp/gimppath_pdb.h
index 7b1ca34c59..ec29aad936 100644
--- a/libgimp/gimppath_pdb.h
+++ b/libgimp/gimppath_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_PATH_PDB_H__
-#define __GIMP_PATH_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -122,7 +121,4 @@ gint gimp_path_bezier_stroke_new_ellipse (GimpPath *pa
gdouble radius_y,
gdouble angle);
-
G_END_DECLS
-
-#endif /* __GIMP_PATH_PDB_H__ */
diff --git a/libgimp/gimppattern_pdb.h b/libgimp/gimppattern_pdb.h
index 1b917a198e..a765407743 100644
--- a/libgimp/gimppattern_pdb.h
+++ b/libgimp/gimppattern_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_PATTERN_PDB_H__
-#define __GIMP_PATTERN_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -43,7 +42,4 @@ G_GNUC_INTERNAL gboolean _gimp_pattern_get_pixels (GimpPattern *pattern,
gint *bpp,
GBytes **color_bytes);
-
G_END_DECLS
-
-#endif /* __GIMP_PATTERN_PDB_H__ */
diff --git a/libgimp/gimppatterns_pdb.h b/libgimp/gimppatterns_pdb.h
index 91e8156240..c278522e9e 100644
--- a/libgimp/gimppatterns_pdb.h
+++ b/libgimp/gimppatterns_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_PATTERNS_PDB_H__
-#define __GIMP_PATTERNS_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -35,7 +34,4 @@ G_BEGIN_DECLS
gboolean gimp_patterns_refresh (void);
GimpPattern** gimp_patterns_get_list (const gchar *filter);
-
G_END_DECLS
-
-#endif /* __GIMP_PATTERNS_PDB_H__ */
diff --git a/libgimp/gimppatternselect_pdb.h b/libgimp/gimppatternselect_pdb.h
index 6c29d5ee86..68b3284177 100644
--- a/libgimp/gimppatternselect_pdb.h
+++ b/libgimp/gimppatternselect_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_PATTERN_SELECT_PDB_H__
-#define __GIMP_PATTERN_SELECT_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -40,7 +39,4 @@ gboolean gimp_patterns_close_popup (const gchar *pattern_callback);
gboolean gimp_patterns_set_popup (const gchar *pattern_callback,
GimpPattern *pattern);
-
G_END_DECLS
-
-#endif /* __GIMP_PATTERN_SELECT_PDB_H__ */
diff --git a/libgimp/gimppdb_pdb.h b/libgimp/gimppdb_pdb.h
index 03d37e6564..66fe09c053 100644
--- a/libgimp/gimppdb_pdb.h
+++ b/libgimp/gimppdb_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_PDB_PDB_H__
-#define __GIMP_PDB_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -104,7 +103,4 @@ G_GNUC_INTERNAL gboolean _gimp_pdb_get_data (const gcha
G_GNUC_INTERNAL gboolean _gimp_pdb_set_data (const gchar *identifier,
GBytes *data);
-
G_END_DECLS
-
-#endif /* __GIMP_PDB_PDB_H__ */
diff --git a/libgimp/gimpplugin-private.h b/libgimp/gimpplugin-private.h
index a8a6953d40..157e30e88a 100644
--- a/libgimp/gimpplugin-private.h
+++ b/libgimp/gimpplugin-private.h
@@ -19,12 +19,10 @@
* .
*/
-#ifndef __GIMP_PLUG_IN_PRIVATE_H__
-#define __GIMP_PLUG_IN_PRIVATE_H__
+#pragma once
G_BEGIN_DECLS
-
G_GNUC_INTERNAL void _gimp_plug_in_query (GimpPlugIn *plug_in);
G_GNUC_INTERNAL void _gimp_plug_in_init (GimpPlugIn *plug_in);
G_GNUC_INTERNAL void _gimp_plug_in_run (GimpPlugIn *plug_in);
@@ -61,7 +59,4 @@ G_GNUC_INTERNAL GimpResource * _gimp_plug_in_get_resource (GimpPlugIn
G_GNUC_INTERNAL gboolean _gimp_plug_in_manage_memory_manually (GimpPlugIn *plug_in);
-
G_END_DECLS
-
-#endif /* __GIMP_PLUG_IN_PRIVATE_H__ */
diff --git a/libgimp/gimpplugin_pdb.h b/libgimp/gimpplugin_pdb.h
index 6852ed6ffa..f63a0ccea0 100644
--- a/libgimp/gimpplugin_pdb.h
+++ b/libgimp/gimpplugin_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_PLUG_IN_PDB_H__
-#define __GIMP_PLUG_IN_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -39,7 +38,4 @@ G_GNUC_INTERNAL gboolean _gimp_plug_in_menu_branch_register (const g
G_GNUC_INTERNAL gboolean _gimp_plug_in_set_pdb_error_handler (GimpPDBErrorHandler handler);
G_GNUC_INTERNAL GimpPDBErrorHandler _gimp_plug_in_get_pdb_error_handler (void);
-
G_END_DECLS
-
-#endif /* __GIMP_PLUG_IN_PDB_H__ */
diff --git a/libgimp/gimpprogress_pdb.h b/libgimp/gimpprogress_pdb.h
index 6a2060360c..ccf72c70aa 100644
--- a/libgimp/gimpprogress_pdb.h
+++ b/libgimp/gimpprogress_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_PROGRESS_PDB_H__
-#define __GIMP_PROGRESS_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -43,7 +42,4 @@ G_GNUC_INTERNAL gboolean _gimp_progress_install (const gchar *progress_
G_GNUC_INTERNAL gboolean _gimp_progress_uninstall (const gchar *progress_callback);
gboolean gimp_progress_cancel (const gchar *progress_callback);
-
G_END_DECLS
-
-#endif /* __GIMP_PROGRESS_PDB_H__ */
diff --git a/libgimp/gimpresource_pdb.h b/libgimp/gimpresource_pdb.h
index 3722440b51..efe56088f1 100644
--- a/libgimp/gimpresource_pdb.h
+++ b/libgimp/gimpresource_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_RESOURCE_PDB_H__
-#define __GIMP_RESOURCE_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -54,7 +53,4 @@ gboolean gimp_resource_rename (GimpResource *
const gchar *new_name);
gboolean gimp_resource_delete (GimpResource *resource);
-
G_END_DECLS
-
-#endif /* __GIMP_RESOURCE_PDB_H__ */
diff --git a/libgimp/gimpselection_pdb.h b/libgimp/gimpselection_pdb.h
index 8c1c96597f..db092451e8 100644
--- a/libgimp/gimpselection_pdb.h
+++ b/libgimp/gimpselection_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_SELECTION_PDB_H__
-#define __GIMP_SELECTION_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -63,7 +62,4 @@ gboolean gimp_selection_shrink (GimpImage *image,
gboolean gimp_selection_flood (GimpImage *image);
GimpChannel* gimp_selection_save (GimpImage *image);
-
G_END_DECLS
-
-#endif /* __GIMP_SELECTION_PDB_H__ */
diff --git a/libgimp/gimptextlayer_pdb.h b/libgimp/gimptextlayer_pdb.h
index 8b3ad5b0da..4ca30a2766 100644
--- a/libgimp/gimptextlayer_pdb.h
+++ b/libgimp/gimptextlayer_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_TEXT_LAYER_PDB_H__
-#define __GIMP_TEXT_LAYER_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -85,7 +84,4 @@ gboolean gimp_text_layer_resize (GimpTextLayer
gdouble width,
gdouble height);
-
G_END_DECLS
-
-#endif /* __GIMP_TEXT_LAYER_PDB_H__ */
diff --git a/libgimp/gimptexttool_pdb.h b/libgimp/gimptexttool_pdb.h
index 458cf78200..fc3c722074 100644
--- a/libgimp/gimptexttool_pdb.h
+++ b/libgimp/gimptexttool_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_TEXT_TOOL_PDB_H__
-#define __GIMP_TEXT_TOOL_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -49,7 +48,4 @@ gboolean gimp_text_get_extents_font (const gchar *text,
gint *ascent,
gint *descent);
-
G_END_DECLS
-
-#endif /* __GIMP_TEXT_TOOL_PDB_H__ */
diff --git a/libgimp/gimpunit_pdb.h b/libgimp/gimpunit_pdb.h
index d5f9d70081..936f73fc5a 100644
--- a/libgimp/gimpunit_pdb.h
+++ b/libgimp/gimpunit_pdb.h
@@ -20,13 +20,12 @@
/* NOTE: This file is auto-generated by pdbgen.pl */
+#pragma once
+
#if !defined (__GIMP_H_INSIDE__) && !defined (GIMP_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIMP_UNIT_PDB_H__
-#define __GIMP_UNIT_PDB_H__
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -46,7 +45,4 @@ G_GNUC_INTERNAL gboolean _gimp_unit_get_deletion_flag (GimpUnit *unit);
G_GNUC_INTERNAL gboolean _gimp_unit_set_deletion_flag (GimpUnit *unit,
gboolean deletion_flag);
-
G_END_DECLS
-
-#endif /* __GIMP_UNIT_PDB_H__ */
diff --git a/libgimpbase/gimpbase-private.h b/libgimpbase/gimpbase-private.h
index e8db03afb3..017581467c 100644
--- a/libgimpbase/gimpbase-private.h
+++ b/libgimpbase/gimpbase-private.h
@@ -19,9 +19,7 @@
* .
*/
-#ifndef __GIMP_BASE_PRIVATE_H__
-#define __GIMP_BASE_PRIVATE_H__
-
+#pragma once
#include
#include
@@ -74,5 +72,3 @@ void gimp_base_exit (void);
void gimp_base_compat_enums_init (void);
G_END_DECLS
-
-#endif /* __GIMP_BASE_PRIVATE_H__ */
diff --git a/libgimpbase/gimpbase.h b/libgimpbase/gimpbase.h
index b0f01a5c0a..f58823b02c 100644
--- a/libgimpbase/gimpbase.h
+++ b/libgimpbase/gimpbase.h
@@ -16,8 +16,7 @@
* .
*/
-#ifndef __GIMP_BASE_H__
-#define __GIMP_BASE_H__
+#pragma once
#define __GIMP_BASE_H_INSIDE__
@@ -42,5 +41,3 @@
#include
#undef __GIMP_BASE_H_INSIDE__
-
-#endif /* __GIMP_BASE_H__ */
diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h
index f8ff4a3187..9771217c20 100644
--- a/libgimpbase/gimpbaseenums.h
+++ b/libgimpbase/gimpbaseenums.h
@@ -16,8 +16,7 @@
* .
*/
-#ifndef __GIMP_BASE_ENUMS_H__
-#define __GIMP_BASE_ENUMS_H__
+#pragma once
/**
@@ -1364,7 +1363,4 @@ typedef enum
GIMP_FILE_CHOOSER_ACTION_CREATE_FOLDER = 3,
} GimpFileChooserAction;
-
G_END_DECLS
-
-#endif /* __GIMP_BASE_ENUMS_H__ */
diff --git a/libgimpbase/gimpbasetypes.h b/libgimpbase/gimpbasetypes.h
index be1612147f..c3109ed982 100644
--- a/libgimpbase/gimpbasetypes.h
+++ b/libgimpbase/gimpbasetypes.h
@@ -16,9 +16,7 @@
* .
*/
-#ifndef __GIMP_BASE_TYPES_H__
-#define __GIMP_BASE_TYPES_H__
-
+#pragma once
#include
#include
@@ -104,7 +102,4 @@ void gimp_flags_set_value_descriptions (GType fl
const GimpFlagsDesc *descriptions);
const GimpFlagsDesc * gimp_flags_get_value_descriptions (GType flags_type);
-
G_END_DECLS
-
-#endif /* __GIMP_BASE_TYPES_H__ */
diff --git a/libgimpbase/gimpcpuaccel-private.h b/libgimpbase/gimpcpuaccel-private.h
index df46b7a4c6..1436544ddf 100644
--- a/libgimpbase/gimpcpuaccel-private.h
+++ b/libgimpbase/gimpcpuaccel-private.h
@@ -18,15 +18,10 @@
* .
*/
-#ifndef __GIMP_CPU_ACCEL_PRIVATE_H__
-#define __GIMP_CPU_ACCEL_PRIVATE_H__
+#pragma once
G_BEGIN_DECLS
-
void gimp_cpu_accel_set_use (gboolean use);
-
G_END_DECLS
-
-#endif /* __GIMP_CPU_ACCEL_PRIVATE_H__ */
diff --git a/libgimpbase/gimpunit.h b/libgimpbase/gimpunit.h
index 96b33d6df3..e1b725b276 100644
--- a/libgimpbase/gimpunit.h
+++ b/libgimpbase/gimpunit.h
@@ -23,8 +23,7 @@
#error "Only can be included directly."
#endif
-#ifndef __GIMP_UNIT_H__
-#define __GIMP_UNIT_H__
+#pragma once
G_BEGIN_DECLS
@@ -104,5 +103,3 @@ gboolean gimp_param_spec_unit_pixel_allowed (GParamSpec *pspec);
gboolean gimp_param_spec_unit_percent_allowed (GParamSpec *pspec);
G_END_DECLS
-
-#endif /* __GIMP_UNIT_H__ */
diff --git a/pdb/app.pl b/pdb/app.pl
index 3294a06ba3..3007de613e 100644
--- a/pdb/app.pl
+++ b/pdb/app.pl
@@ -1209,10 +1209,9 @@ GPL
my $internal = "$builddir/internal-procs.h$FILE_EXT";
open IFILE, "> $internal" or die "Can't open $internal: $!\n";
print IFILE $gpl;
- my $guard = "__INTERNAL_PROCS_H__";
print IFILE < can be included directly."
#endif
-#ifndef $guard
-#define $guard
-
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@@ -796,10 +794,7 @@ G_BEGIN_DECLS
$body
-
G_END_DECLS
-
-#endif /* $guard */
HEADER
close HFILE;
&write_file($hfile, $destdir);