diff options
| author | Ernestas Kulik <ernestas.kulik@gmail.com> | 2018-03-19 18:03:11 +0000 |
|---|---|---|
| committer | Ernestas Kulik <ernestas.kulik@gmail.com> | 2018-03-19 18:03:11 +0000 |
| commit | fb4ebc0c250aee9698ed29e7b5310c353bee42bd (patch) | |
| tree | ef0ff35f792e7fb8524df500661cb5027a6a6aff | |
| parent | 089801d503e9232d0809744b24c67834a6c9971a (diff) | |
| parent | aa7cfcf01c64cf0cea64dd2af036ea5c9d0d63e5 (diff) | |
| download | nautilus-fb4ebc0c250aee9698ed29e7b5310c353bee42bd.tar.gz | |
Merge branch 'AlexFazakas/include-guards-for-pragma-once' into 'master'
Replace include guards with pragma once functionality
Closes #294
See merge request GNOME/nautilus!141
147 files changed, 290 insertions, 720 deletions
diff --git a/eel/eel-accessibility.h b/eel/eel-accessibility.h index 3176f41c3..740719ded 100644 --- a/eel/eel-accessibility.h +++ b/eel/eel-accessibility.h @@ -19,8 +19,7 @@ Authors: Anders Carlsson <andersca@gnu.org> */ -#ifndef EEL_ACCESSIBILITY_H -#define EEL_ACCESSIBILITY_H +#pragma once #include <glib-object.h> #include <atk/atkobject.h> @@ -74,6 +73,4 @@ typedef struct { PangoLayout *(*get_layout) (GObject *text); } EelAccessibleTextIface; -GType eel_accessible_text_get_type (void); - -#endif /* EEL_ACCESSIBILITY_H */ +GType eel_accessible_text_get_type (void);
\ No newline at end of file diff --git a/eel/eel-art-extensions.h b/eel/eel-art-extensions.h index df6643d2c..b9dde534e 100644 --- a/eel/eel-art-extensions.h +++ b/eel/eel-art-extensions.h @@ -21,8 +21,7 @@ Ramiro Estrugo <ramiro@eazel.com> */ -#ifndef EEL_ART_EXTENSIONS_H -#define EEL_ART_EXTENSIONS_H +#pragma once #include <glib.h> @@ -59,6 +58,4 @@ void eel_drect_union (EelDRect *dest, const EelDRect *src1, const EelDRect *src2); -G_END_DECLS - -#endif /* EEL_ART_EXTENSIONS_H */ +G_END_DECLS
\ No newline at end of file diff --git a/eel/eel-canvas.h b/eel/eel-canvas.h index 5f104f045..62e50a857 100644 --- a/eel/eel-canvas.h +++ b/eel/eel-canvas.h @@ -32,8 +32,7 @@ * Raph Levien <raph@gimp.org> */ -#ifndef EEL_CANVAS_H -#define EEL_CANVAS_H +#pragma once #include <gtk/gtk.h> #include <gtk/gtk-a11y.h> @@ -495,6 +494,4 @@ struct _EelCanvasItemAccessibleClass GtkAccessibleClass parent_class; }; -G_END_DECLS - -#endif +G_END_DECLS
\ No newline at end of file diff --git a/eel/eel-debug.h b/eel/eel-debug.h index 0abc1a07d..5d659322b 100644 --- a/eel/eel-debug.h +++ b/eel/eel-debug.h @@ -19,8 +19,7 @@ Author: Darin Adler <darin@eazel.com> */ -#ifndef EEL_DEBUG_H -#define EEL_DEBUG_H +#pragma once #include <glib.h> @@ -38,6 +37,4 @@ void eel_debug_call_at_shutdown (EelFunction function); void eel_debug_call_at_shutdown_with_data (GFreeFunc function, gpointer data); -G_END_DECLS - -#endif /* EEL_DEBUG_H */ +G_END_DECLS
\ No newline at end of file diff --git a/eel/eel-glib-extensions.h b/eel/eel-glib-extensions.h index 73249f14a..8b09cbd10 100644 --- a/eel/eel-glib-extensions.h +++ b/eel/eel-glib-extensions.h @@ -22,8 +22,7 @@ Authors: John Sullivan <sullivan@eazel.com> */ -#ifndef EEL_GLIB_EXTENSIONS_H -#define EEL_GLIB_EXTENSIONS_H +#pragma once #include <glib.h> @@ -36,6 +35,4 @@ gboolean eel_g_lists_sort_and_check_for_intersection (GList ** /* NULL terminated string arrays (strv). */ gboolean eel_g_strv_equal (char **a, - char **b); - -#endif /* EEL_GLIB_EXTENSIONS_H */ + char **b);
\ No newline at end of file diff --git a/eel/eel-graphic-effects.h b/eel/eel-graphic-effects.h index 850ba7605..b67a754a3 100644 --- a/eel/eel-graphic-effects.h +++ b/eel/eel-graphic-effects.h @@ -19,8 +19,7 @@ Authors: Andy Hertzfeld <andy@eazel.com> */ -#ifndef EEL_GRAPHIC_EFFECTS_H -#define EEL_GRAPHIC_EFFECTS_H +#pragma once #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk/gdk.h> @@ -30,6 +29,4 @@ GdkPixbuf *eel_create_spotlight_pixbuf (GdkPixbuf *source_pixbuf); /* return a pixbuf colorized with the color specified by the parameters */ GdkPixbuf* eel_create_colorized_pixbuf (GdkPixbuf *source_pixbuf, - GdkRGBA *color); - -#endif /* EEL_GRAPHIC_EFFECTS_H */ + GdkRGBA *color);
\ No newline at end of file diff --git a/eel/eel-gtk-extensions.h b/eel/eel-gtk-extensions.h index 1efb9b3d8..0a5eac1dc 100644 --- a/eel/eel-gtk-extensions.h +++ b/eel/eel-gtk-extensions.h @@ -23,8 +23,7 @@ Ramiro Estrugo <ramiro@eazel.com> */ -#ifndef EEL_GTK_EXTENSIONS_H -#define EEL_GTK_EXTENSIONS_H +#pragma once #include <gdk-pixbuf/gdk-pixbuf.h> #include <gtk/gtk.h> @@ -35,6 +34,4 @@ char * eel_gtk_window_get_geometry_string (GtkWindow /* GtkMenu and GtkMenuItem */ GtkMenuItem * eel_gtk_menu_append_separator (GtkMenu *menu); GtkMenuItem * eel_gtk_menu_insert_separator (GtkMenu *menu, - int index); - -#endif /* EEL_GTK_EXTENSIONS_H */ + int index);
\ No newline at end of file diff --git a/eel/eel-lib-self-check-functions.h b/eel/eel-lib-self-check-functions.h index da8fd43f0..3a2143004 100644 --- a/eel/eel-lib-self-check-functions.h +++ b/eel/eel-lib-self-check-functions.h @@ -20,6 +20,8 @@ Author: Darin Adler <darin@eazel.com> */ +#pragma once + #include "eel-self-checks.h" void eel_run_lib_self_checks (void); diff --git a/eel/eel-self-checks.h b/eel/eel-self-checks.h index ba5d07695..ac48e1fb5 100644 --- a/eel/eel-self-checks.h +++ b/eel/eel-self-checks.h @@ -19,63 +19,60 @@ Author: Darin Adler <darin@eazel.com> */ -#ifndef EEL_SELF_CHECKS_H -#define EEL_SELF_CHECKS_H +#pragma once #include <glib.h> #include <eel/eel-art-extensions.h> #define EEL_CHECK_RESULT(type, expression, expected_value) \ G_STMT_START { \ - eel_before_check (#expression, __FILE__, __LINE__); \ - eel_check_##type##_result (expression, expected_value); \ + eel_before_check (#expression, __FILE__, __LINE__); \ + eel_check_##type##_result (expression, expected_value); \ } G_STMT_END #define EEL_CHECK_BOOLEAN_RESULT(expression, expected_value) \ - EEL_CHECK_RESULT(boolean, expression, expected_value) + EEL_CHECK_RESULT(boolean, expression, expected_value) #define EEL_CHECK_INTEGER_RESULT(expression, expected_value) \ - EEL_CHECK_RESULT(integer, expression, expected_value) + EEL_CHECK_RESULT(integer, expression, expected_value) #define EEL_CHECK_DOUBLE_RESULT(expression, expected_value) \ - EEL_CHECK_RESULT(double, expression, expected_value) + EEL_CHECK_RESULT(double, expression, expected_value) #define EEL_CHECK_STRING_RESULT(expression, expected_value) \ - EEL_CHECK_RESULT(string, expression, expected_value) + EEL_CHECK_RESULT(string, expression, expected_value) #define EEL_CHECK_RECTANGLE_RESULT(expression, expected_x0, expected_y0, expected_x1, expected_y1) \ G_STMT_START { \ - eel_before_check (#expression, __FILE__, __LINE__); \ - eel_check_rectangle_result (expression, expected_x0, expected_y0, expected_x1, expected_y1); \ + eel_before_check (#expression, __FILE__, __LINE__); \ + eel_check_rectangle_result (expression, expected_x0, expected_y0, expected_x1, expected_y1); \ } G_STMT_END void eel_exit_if_self_checks_failed (void); void eel_before_check_function (const char *name); void eel_after_check_function (void); void eel_before_check (const char *expression, - const char *file_name, - int line_number); + const char *file_name, + int line_number); void eel_after_check (void); /* Both 'result' and 'expected' get freed with g_free */ void eel_report_check_failure (char *result, - char *expected); + char *expected); void eel_check_boolean_result (gboolean result, - gboolean expected_value); + gboolean expected_value); void eel_check_integer_result (long result, - long expected_value); + long expected_value); void eel_check_double_result (double result, - double expected_value); + double expected_value); void eel_check_rectangle_result (EelIRect result, - int expected_x0, - int expected_y0, - int expected_x1, - int expected_y1); + int expected_x0, + int expected_y0, + int expected_x1, + int expected_y1); void eel_check_string_result (char *result, - const char *expected_value); + const char *expected_value); #define EEL_SELF_CHECK_FUNCTION_PROTOTYPE(function) \ - void function (void); + void function (void); #define EEL_CALL_SELF_CHECK_FUNCTION(function) \ - eel_before_check_function (#function); \ - function (); \ - eel_after_check_function (); - -#endif /* EEL_SELF_CHECKS_H */ + eel_before_check_function (#function); \ + function (); \ + eel_after_check_function (); diff --git a/eel/eel-stock-dialogs.h b/eel/eel-stock-dialogs.h index 25ab1ca2f..792686152 100644 --- a/eel/eel-stock-dialogs.h +++ b/eel/eel-stock-dialogs.h @@ -20,8 +20,7 @@ Authors: Darin Adler <darin@eazel.com> */ -#ifndef EEL_STOCK_DIALOGS_H -#define EEL_STOCK_DIALOGS_H +#pragma once #include <gtk/gtk.h> @@ -73,6 +72,4 @@ GtkDialog *eel_create_question_dialog (const char *primary_text, int response_one, const char *answer_two, int response_two, - GtkWindow *parent); - -#endif /* EEL_STOCK_DIALOGS_H */ + GtkWindow *parent);
\ No newline at end of file diff --git a/eel/eel-string.h b/eel/eel-string.h index 91c370aa1..63147d1cc 100644 --- a/eel/eel-string.h +++ b/eel/eel-string.h @@ -20,8 +20,7 @@ Authors: Darin Adler <darin@eazel.com> */ -#ifndef EEL_STRING_H -#define EEL_STRING_H +#pragma once #include <glib.h> #include <string.h> @@ -86,6 +85,4 @@ eel_ref_str eel_ref_str_get_unique (const char *string); eel_ref_str eel_ref_str_ref (eel_ref_str str); void eel_ref_str_unref (eel_ref_str str); -#define eel_ref_str_peek(__str) ((const char *)(__str)) - -#endif /* EEL_STRING_H */ +#define eel_ref_str_peek(__str) ((const char *)(__str))
\ No newline at end of file diff --git a/eel/eel-vfs-extensions.h b/eel/eel-vfs-extensions.h index 7de2bc0b8..b2687af26 100644 --- a/eel/eel-vfs-extensions.h +++ b/eel/eel-vfs-extensions.h @@ -24,8 +24,7 @@ John Sullivan <sullivan@eazel.com> */ -#ifndef EEL_VFS_EXTENSIONS_H -#define EEL_VFS_EXTENSIONS_H +#pragma once #include <glib.h> @@ -48,5 +47,3 @@ void eel_filename_get_rename_region (const char * char * eel_filename_get_extension_offset (const char *filename); G_END_DECLS - -#endif /* EEL_VFS_EXTENSIONS_H */ @@ -20,8 +20,7 @@ Authors: Maciej Stachowiak <mjs@eazel.com> */ -#ifndef EEL_H -#define EEL_H +#pragma once #include <eel/eel-art-extensions.h> #include <eel/eel-glib-extensions.h> @@ -30,6 +29,4 @@ #include <eel/eel-self-checks.h> #include <eel/eel-stock-dialogs.h> #include <eel/eel-string.h> -#include <eel/eel-vfs-extensions.h> - -#endif /* EEL_H */ +#include <eel/eel-vfs-extensions.h>
\ No newline at end of file diff --git a/extensions/image-properties/nautilus-image-properties-page-provider.h b/extensions/image-properties/nautilus-image-properties-page-provider.h index 90e41597a..59fd6f905 100644 --- a/extensions/image-properties/nautilus-image-properties-page-provider.h +++ b/extensions/image-properties/nautilus-image-properties-page-provider.h @@ -16,8 +16,7 @@ * along with Nautilus. If not, see <https://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_IMAGE_PROPERTIES_PAGE_PROVIDER_H -#define NAUTILUS_IMAGE_PROPERTIES_PAGE_PROVIDER_H +#pragma once #include <glib-object.h> @@ -28,6 +27,4 @@ G_DECLARE_FINAL_TYPE (NautilusImagesPropertiesPageProvider, NAUTILUS, IMAGE_PROPERTIES_PAGE_PROVIDER, GObject) -void nautilus_image_properties_page_provider_load (GTypeModule *module); - -#endif +void nautilus_image_properties_page_provider_load (GTypeModule *module);
\ No newline at end of file diff --git a/extensions/image-properties/nautilus-image-properties-page.h b/extensions/image-properties/nautilus-image-properties-page.h index 0b3c5db81..5a2c3580a 100644 --- a/extensions/image-properties/nautilus-image-properties-page.h +++ b/extensions/image-properties/nautilus-image-properties-page.h @@ -16,8 +16,7 @@ * Author: Alexander Larsson <alexl@redhat.com> */ -#ifndef NAUTILUS_IMAGE_PROPERTIES_PAGE_H -#define NAUTILUS_IMAGE_PROPERTIES_PAGE_H +#pragma once #include <gtk/gtk.h> @@ -33,6 +32,4 @@ G_DECLARE_FINAL_TYPE (NautilusImagesPropertiesPage, void nautilus_image_properties_page_load_from_file_info (NautilusImagesPropertiesPage *page, NautilusFileInfo *file_info); -NautilusImagesPropertiesPage *nautilus_image_properties_page_new (void); - -#endif +NautilusImagesPropertiesPage *nautilus_image_properties_page_new (void);
\ No newline at end of file diff --git a/extensions/sendto/nautilus-nste.h b/extensions/sendto/nautilus-nste.h index f29885a20..46f71040b 100644 --- a/extensions/sendto/nautilus-nste.h +++ b/extensions/sendto/nautilus-nste.h @@ -20,8 +20,7 @@ * */ -#ifndef NAUTILUS_NSTE_H -#define NAUTILUS_NSTE_H +#pragma once #include <glib-object.h> @@ -33,6 +32,4 @@ G_DECLARE_FINAL_TYPE (NautilusNste, nautilus_nste, NAUTILUS, NSTE, GObject) void nautilus_nste_load (GTypeModule *module); -G_END_DECLS - -#endif /* NAUTILUS_NSTE_H */ +G_END_DECLS
\ No newline at end of file diff --git a/libgd b/libgd new file mode 160000 +Subproject 752f65e91ea0d9a2ee8a2d21343bbd97bd0d038 diff --git a/libnautilus-extension/nautilus-column-provider.h b/libnautilus-extension/nautilus-column-provider.h index 2873c66b7..e3b44565f 100644 --- a/libnautilus-extension/nautilus-column-provider.h +++ b/libnautilus-extension/nautilus-column-provider.h @@ -27,8 +27,7 @@ * returned column refers to a string attribute which can be filled in * by NautilusInfoProvider */ -#ifndef NAUTILUS_COLUMN_PROVIDER_H -#define NAUTILUS_COLUMN_PROVIDER_H +#pragma once #if !defined (NAUTILUS_EXTENSION_H) && !defined (NAUTILUS_COMPILATION) #warning "Only <nautilus-extension.h> should be included directly." @@ -68,6 +67,4 @@ struct _NautilusColumnProviderInterface /* Interface Functions */ GList *nautilus_column_provider_get_columns (NautilusColumnProvider *provider); -G_END_DECLS - -#endif +G_END_DECLS
\ No newline at end of file diff --git a/libnautilus-extension/nautilus-column.h b/libnautilus-extension/nautilus-column.h index fa919471b..11fb81e9d 100644 --- a/libnautilus-extension/nautilus-column.h +++ b/libnautilus-extension/nautilus-column.h @@ -21,8 +21,7 @@ * */ -#ifndef NAUTILUS_COLUMN_H -#define NAUTILUS_COLUMN_H +#pragma once #if !defined (NAUTILUS_EXTENSION_H) && !defined (NAUTILUS_COMPILATION) #warning "Only <nautilus-extension.h> should be included directly." @@ -54,5 +53,3 @@ NautilusColumn *nautilus_column_new (const char *name, */ G_END_DECLS - -#endif diff --git a/libnautilus-extension/nautilus-extension-private.h b/libnautilus-extension/nautilus-extension-private.h index e3841f7fe..775e892a5 100644 --- a/libnautilus-extension/nautilus-extension-private.h +++ b/libnautilus-extension/nautilus-extension-private.h @@ -20,8 +20,7 @@ * */ -#ifndef NAUTILUS_EXTENSION_PRIVATE_H -#define NAUTILUS_EXTENSION_PRIVATE_H +#pragma once #include <libnautilus-extension/nautilus-file-info.h> @@ -29,6 +28,4 @@ G_BEGIN_DECLS extern NautilusFileInfo *(*nautilus_file_info_getter) (GFile *location, gboolean create); -G_END_DECLS - -#endif +G_END_DECLS
\ No newline at end of file diff --git a/libnautilus-extension/nautilus-extension-types.h b/libnautilus-extension/nautilus-extension-types.h index 33d6f5223..7f2eab3ce 100644 --- a/libnautilus-extension/nautilus-extension-types.h +++ b/libnautilus-extension/nautilus-extension-types.h @@ -24,13 +24,10 @@ * needs information about a file. They are passed a NautilusFileInfo * object which should be filled with relevant information */ -#ifndef NAUTILUS_EXTENSION_TYPES_H -#define NAUTILUS_EXTENSION_TYPES_H +#pragma once #if !defined (NAUTILUS_EXTENSION_H) && !defined (NAUTILUS_COMPILATION) #warning "This header is deprecated, include <nautilus-extension.h> instead." #endif #include <nautilus-extension.h> - -#endif diff --git a/libnautilus-extension/nautilus-extension.h b/libnautilus-extension/nautilus-extension.h index 26159d1e8..7723f453a 100644 --- a/libnautilus-extension/nautilus-extension.h +++ b/libnautilus-extension/nautilus-extension.h @@ -15,7 +15,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with libnautilus-extension. If not, see <https://www.gnu.org/licenses/>. */ - #ifndef NAUTILUS_EXTENSION_H #define NAUTILUS_EXTENSION_H @@ -40,4 +39,4 @@ void nautilus_module_shutdown (void); void nautilus_module_list_types (const GType **types, int *num_types); -#endif +#endif
\ No newline at end of file diff --git a/libnautilus-extension/nautilus-file-info.h b/libnautilus-extension/nautilus-file-info.h index 0e7ea8539..a7da8ec6b 100644 --- a/libnautilus-extension/nautilus-file-info.h +++ b/libnautilus-extension/nautilus-file-info.h @@ -22,8 +22,7 @@ * provides access to the asynchronous data in the NautilusFile. * Extensions are passed objects of this type for operations. */ -#ifndef NAUTILUS_FILE_INFO_H -#define NAUTILUS_FILE_INFO_H +#pragma once #if !defined (NAUTILUS_EXTENSION_H) && !defined (NAUTILUS_COMPILATION) #warning "Only <nautilus-extension.h> should be included directly." @@ -171,6 +170,4 @@ NautilusFileInfo *nautilus_file_info_create (GFile *location); NautilusFileInfo *nautilus_file_info_lookup_for_uri (const char *uri); NautilusFileInfo *nautilus_file_info_create_for_uri (const char *uri); -G_END_DECLS - -#endif +G_END_DECLS
\ No newline at end of file diff --git a/libnautilus-extension/nautilus-info-provider.h b/libnautilus-extension/nautilus-info-provider.h index 2f54490af..19f48f125 100644 --- a/libnautilus-extension/nautilus-info-provider.h +++ b/libnautilus-extension/nautilus-info-provider.h @@ -26,8 +26,7 @@ * needs information about a file. They are passed a NautilusFileInfo * object which should be filled with relevant information */ -#ifndef NAUTILUS_INFO_PROVIDER_H -#define NAUTILUS_INFO_PROVIDER_H +#pragma once #if !defined (NAUTILUS_EXTENSION_H) && !defined (NAUTILUS_COMPILATION) #warning "Only <nautilus-extension.h> should be included directly." @@ -124,6 +123,4 @@ void nautilus_info_provider_update_complete_invoke (GClosure NautilusOperationHandle *handle, NautilusOperationResult result); -G_END_DECLS - -#endif +G_END_DECLS
\ No newline at end of file diff --git a/libnautilus-extension/nautilus-location-widget-provider.h b/libnautilus-extension/nautilus-location-widget-provider.h index 656de7fdb..a6f656cce 100644 --- a/libnautilus-extension/nautilus-location-widget-provider.h +++ b/libnautilus-extension/nautilus-location-widget-provider.h @@ -28,8 +28,7 @@ * Extensions are called when Nautilus displays a location. */ -#ifndef NAUTILUS_LOCATION_WIDGET_PROVIDER_H -#define NAUTILUS_LOCATION_WIDGET_PROVIDER_H +#pragma once #if !defined (NAUTILUS_EXTENSION_H) && !defined (NAUTILUS_COMPILATION) #warning "Only <nautilus-extension.h> should be included directly." @@ -73,6 +72,4 @@ GtkWidget *nautilus_location_widget_provider_get_widget (NautilusLocationWidgetP const char *uri, GtkWidget *window); -G_END_DECLS - -#endif +G_END_DECLS
\ No newline at end of file diff --git a/libnautilus-extension/nautilus-menu-item.h b/libnautilus-extension/nautilus-menu-item.h index 9e867444b..bf7b9e6e7 100644 --- a/libnautilus-extension/nautilus-menu-item.h +++ b/libnautilus-extension/nautilus-menu-item.h @@ -21,13 +21,10 @@ * */ -#ifndef NAUTILUS_MENU_ITEM_H -#define NAUTILUS_MENU_ITEM_H +#pragma once #if !defined (NAUTILUS_EXTENSION_H) && !defined (NAUTILUS_COMPILATION) #warning "Only <nautilus-extension.h> should be included directly." #endif -#include "nautilus-menu.h" - -#endif +#include "nautilus-menu.h"
\ No newline at end of file diff --git a/libnautilus-extension/nautilus-menu-provider.h b/libnautilus-extension/nautilus-menu-provider.h index 3633e19a4..311e2c10f 100644 --- a/libnautilus-extension/nautilus-menu-provider.h +++ b/libnautilus-extension/nautilus-menu-provider.h @@ -26,8 +26,7 @@ * Nautilus constructs the context menu for a file. They are passed a * list of NautilusFileInfo objects which holds the current selection */ -#ifndef NAUTILUS_MENU_PROVIDER_H -#define NAUTILUS_MENU_PROVIDER_H +#pragma once #if !defined (NAUTILUS_EXTENSION_H) && !defined (NAUTILUS_COMPILATION) #warning "Only <nautilus-extension.h> should be included directly." @@ -85,5 +84,3 @@ GList *nautilus_menu_provider_get_background_items (NautilusMenuProvider *p void nautilus_menu_provider_emit_items_updated_signal (NautilusMenuProvider *provider); G_END_DECLS - -#endif diff --git a/libnautilus-extension/nautilus-menu.h b/libnautilus-extension/nautilus-menu.h index bea8956d4..bbf71fa88 100644 --- a/libnautilus-extension/nautilus-menu.h +++ b/libnautilus-extension/nautilus-menu.h @@ -22,17 +22,16 @@ * */ -#ifndef NAUTILUS_MENU_H -#define NAUTILUS_MENU_H - -#include <glib-object.h> -/* This should be removed at some point. */ -#include "nautilus-extension-types.h" +#pragma once #if !defined (NAUTILUS_EXTENSION_H) && !defined (NAUTILUS_COMPILATION) #warning "Only <nautilus-extension.h> should be included directly." #endif +#include <glib-object.h> +/* This should be removed at some point. */ +#include "nautilus-extension-types.h" + G_BEGIN_DECLS #define NAUTILUS_TYPE_MENU (nautilus_menu_get_type ()) @@ -80,6 +79,4 @@ void nautilus_menu_item_set_submenu (NautilusMenuItem *item, * menu (NautilusMenu) - The menu belonging to this item. May be null. */ -G_END_DECLS - -#endif /* NAUTILUS_MENU_H */ +G_END_DECLS
\ No newline at end of file diff --git a/libnautilus-extension/nautilus-property-page-provider.h b/libnautilus-extension/nautilus-property-page-provider.h index 7198a1b78..e3c9416f8 100644 --- a/libnautilus-extension/nautilus-property-page-provider.h +++ b/libnautilus-extension/nautilus-property-page-provider.h @@ -27,8 +27,7 @@ * list of NautilusFileInfo objects for which information should * be displayed */ -#ifndef NAUTILUS_PROPERTY_PAGE_PROVIDER_H -#define NAUTILUS_PROPERTY_PAGE_PROVIDER_H +#pragma once #if !defined (NAUTILUS_EXTENSION_H) && !defined (NAUTILUS_COMPILATION) #warning "Only <nautilus-extension.h> should be included directly." @@ -72,6 +71,4 @@ struct _NautilusPropertyPageProviderInterface GList *nautilus_property_page_provider_get_pages (NautilusPropertyPageProvider *provider, GList *files); -G_END_DECLS - -#endif +G_END_DECLS
\ No newline at end of file diff --git a/libnautilus-extension/nautilus-property-page.h b/libnautilus-extension/nautilus-property-page.h index 0393c9b81..70e31925a 100644 --- a/libnautilus-extension/nautilus-property-page.h +++ b/libnautilus-extension/nautilus-property-page.h @@ -21,8 +21,7 @@ * */ -#ifndef NAUTILUS_PROPERTY_PAGE_H -#define NAUTILUS_PROPERTY_PAGE_H +#pragma once #if !defined (NAUTILUS_EXTENSION_H) && !defined (NAUTILUS_COMPILATION) #warning "Only <nautilus-extension.h> should be included directly." @@ -51,6 +50,4 @@ NautilusPropertyPage *nautilus_property_page_new (const char *name, * page (widget) - the property page to display */ -G_END_DECLS - -#endif +G_END_DECLS
\ No newline at end of file diff --git a/src/animation/egg-animation.h b/src/animation/egg-animation.h index 62d979e55..45b4f3960 100644 --- a/src/animation/egg-animation.h +++ b/src/animation/egg-animation.h @@ -16,8 +16,7 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef EGG_ANIMATION_H -#define EGG_ANIMATION_H +#pragma once #include <gdk/gdk.h> @@ -72,6 +71,4 @@ EggAnimation* egg_object_animate_full (gpointer object, const gchar *first_property, ...) G_GNUC_NULL_TERMINATED; -G_END_DECLS - -#endif /* EGG_ANIMATION_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/animation/egg-frame-source.h b/src/animation/egg-frame-source.h index 3ba234fd0..376d54534 100644 --- a/src/animation/egg-frame-source.h +++ b/src/animation/egg-frame-source.h @@ -16,8 +16,7 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef EGG_FRAME_SOURCE_H -#define EGG_FRAME_SOURCE_H +#pragma once #include <glib.h> @@ -27,6 +26,4 @@ guint egg_frame_source_add (guint frames_per_sec, GSourceFunc callback, gpointer user_data); -G_END_DECLS - -#endif /* EGG_FRAME_SOURCE_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/animation/ide-box-theatric.h b/src/animation/ide-box-theatric.h index d2545f0e2..9eb81c131 100644 --- a/src/animation/ide-box-theatric.h +++ b/src/animation/ide-box-theatric.h @@ -16,8 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef IDE_BOX_THEATRIC_H -#define IDE_BOX_THEATRIC_H +#pragma once #include <gtk/gtk.h> @@ -28,6 +27,4 @@ G_BEGIN_DECLS G_DECLARE_FINAL_TYPE (IdeBoxTheatric, ide_box_theatric, IDE, BOX_THEATRIC, GObject) -G_END_DECLS - -#endif /* IDE_BOX_THEATRIC_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/animation/ide-cairo.h b/src/animation/ide-cairo.h index 703821b1d..5d3bb2943 100644 --- a/src/animation/ide-cairo.h +++ b/src/animation/ide-cairo.h @@ -16,8 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef IDE_CAIRO_H -#define IDE_CAIRO_H +#pragma once #include <gtk/gtk.h> @@ -63,6 +62,4 @@ _ide_cairo_rectangle_contains_rectangle (const cairo_rectangle_int_t *a, a->y + (int) a->height >= b->y + (int) b->height); } -G_END_DECLS - -#endif /* IDE_CAIRO_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/gtk/nautilusgtkplacesviewprivate.h b/src/gtk/nautilusgtkplacesviewprivate.h index 92f1dd92f..b9506b73a 100644 --- a/src/gtk/nautilusgtkplacesviewprivate.h +++ b/src/gtk/nautilusgtkplacesviewprivate.h @@ -22,7 +22,6 @@ #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) #endif - G_BEGIN_DECLS #define NAUTILUS_TYPE_GTK_PLACES_VIEW (nautilus_gtk_places_view_get_type ()) @@ -80,4 +79,4 @@ GtkWidget * nautilus_gtk_places_view_new (void) G_END_DECLS -#endif /* NAUTILUS_GTK_PLACES_VIEW_H */ +#endif
\ No newline at end of file diff --git a/src/gtk/nautilusgtkplacesviewrowprivate.h b/src/gtk/nautilusgtkplacesviewrowprivate.h index fb32e1c67..8d6fb9fcd 100644 --- a/src/gtk/nautilusgtkplacesviewrowprivate.h +++ b/src/gtk/nautilusgtkplacesviewrowprivate.h @@ -16,12 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_GTK_PLACES_VIEW_ROW_H -#define NAUTILUS_GTK_PLACES_VIEW_ROW_H - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#endif - +#pragma once G_BEGIN_DECLS @@ -56,6 +51,4 @@ void nautilus_gtk_places_view_row_set_path_size_group (Nauti void nautilus_gtk_places_view_row_set_space_size_group (NautilusGtkPlacesViewRow *row, GtkSizeGroup *group); -G_END_DECLS - -#endif /* NAUTILUS_GTK_PLACES_VIEW_ROW_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-application.h b/src/nautilus-application.h index 197a276ae..0f0a2391c 100644 --- a/src/nautilus-application.h +++ b/src/nautilus-application.h @@ -18,8 +18,7 @@ * License along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef __NAUTILUS_APPLICATION_H__ -#define __NAUTILUS_APPLICATION_H__ +#pragma once #include <gdk/gdk.h> #include <gio/gio.h> @@ -89,6 +88,4 @@ void nautilus_application_search (NautilusApplication *application, const gchar *uri, const gchar *text); void nautilus_application_startup_common (NautilusApplication *application); -G_END_DECLS - -#endif /* __NAUTILUS_APPLICATION_H__ */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-batch-rename-dialog.h b/src/nautilus-batch-rename-dialog.h index 97bb4a381..0749fa3c4 100644 --- a/src/nautilus-batch-rename-dialog.h +++ b/src/nautilus-batch-rename-dialog.h @@ -16,8 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_BATCH_RENAME_DIALOG_H -#define NAUTILUS_BATCH_RENAME_DIALOG_H +#pragma once #include <glib.h> #include <glib/gprintf.h> @@ -230,6 +229,4 @@ void nautilus_batch_rename_dialog_query_finished (NautilusB GHashTable *hash_table, GList *selection_metadata); -G_END_DECLS - -#endif +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-batch-rename-utilities.h b/src/nautilus-batch-rename-utilities.h index 6c6a60e6d..9b163aa05 100644 --- a/src/nautilus-batch-rename-utilities.h +++ b/src/nautilus-batch-rename-utilities.h @@ -16,8 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_BATCH_RENAME_UTILITIES_H -#define NAUTILUS_BATCH_RENAME_UTILITIES_H +#pragma once #include <gio/gio.h> #include <gtk/gtk.h> @@ -68,6 +67,4 @@ void batch_rename_sort_lists_for_rename (GList **selection, GList **old_names, GList **new_files, GList **old_files, - gboolean is_undo_redo); - -#endif /* NAUTILUS_BATCH_RENAME_UTILITIES_H */ + gboolean is_undo_redo);
\ No newline at end of file diff --git a/src/nautilus-bookmark-list.h b/src/nautilus-bookmark-list.h index c3f1f5d97..4849ea84b 100644 --- a/src/nautilus-bookmark-list.h +++ b/src/nautilus-bookmark-list.h @@ -23,8 +23,7 @@ /* nautilus-bookmark-list.h - interface for centralized list of bookmarks. */ -#ifndef NAUTILUS_BOOKMARK_LIST_H -#define NAUTILUS_BOOKMARK_LIST_H +#pragma once #include "nautilus-bookmark.h" #include <gio/gio.h> @@ -45,6 +44,4 @@ gboolean nautilus_bookmark_list_can_bookmark_location (NautilusBo GFile *location); GList * nautilus_bookmark_list_get_all (NautilusBookmarkList *bookmarks); -G_END_DECLS - -#endif /* NAUTILUS_BOOKMARK_LIST_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-bookmark.h b/src/nautilus-bookmark.h index 1875551bd..ae03bbe88 100644 --- a/src/nautilus-bookmark.h +++ b/src/nautilus-bookmark.h @@ -22,8 +22,7 @@ * Cosimo Cecchi <cosimoc@redhat.com> */ -#ifndef NAUTILUS_BOOKMARK_H -#define NAUTILUS_BOOKMARK_H +#pragma once #include <gtk/gtk.h> #include <gio/gio.h> @@ -55,6 +54,4 @@ char * nautilus_bookmark_get_scroll_pos (NautilusBookmark /* Helper functions for displaying bookmarks */ GtkWidget * nautilus_bookmark_menu_item_new (NautilusBookmark *bookmark); -G_END_DECLS - -#endif /* NAUTILUS_BOOKMARK_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-canvas-container.h b/src/nautilus-canvas-container.h index 87f5338ec..d27de7186 100644 --- a/src/nautilus-canvas-container.h +++ b/src/nautilus-canvas-container.h @@ -21,8 +21,7 @@ Authors: Ettore Perazzoli <ettore@gnu.org>, Darin Adler <darin@bentspoon.com> */ -#ifndef NAUTILUS_CANVAS_CONTAINER_H -#define NAUTILUS_CANVAS_CONTAINER_H +#pragma once #include <eel/eel-canvas.h> #include "nautilus-icon-info.h" @@ -292,5 +291,3 @@ guint nautilus_canvas_container_get_icon_size_for_zoom_level (Nautil #define CANVAS_HEIGHT(container,allocation) (allocation.height \ / EEL_CANVAS (container)->pixels_per_unit) - -#endif /* NAUTILUS_CANVAS_CONTAINER_H */ diff --git a/src/nautilus-canvas-dnd.h b/src/nautilus-canvas-dnd.h index 7b659e38c..0e8b980e3 100644 --- a/src/nautilus-canvas-dnd.h +++ b/src/nautilus-canvas-dnd.h @@ -23,8 +23,7 @@ Andy Hertzfeld <andy@eazel.com> */ -#ifndef NAUTILUS_CANVAS_DND_H -#define NAUTILUS_CANVAS_DND_H +#pragma once #include "nautilus-canvas-container.h" #include "nautilus-dnd.h" @@ -55,5 +54,3 @@ void nautilus_canvas_dnd_end_drag (NautilusCanvasContainer *conta NautilusDragInfo* nautilus_canvas_dnd_get_drag_source_data (NautilusCanvasContainer *container, GdkDragContext *context); - -#endif /* NAUTILUS_CANVAS_DND_H */ diff --git a/src/nautilus-canvas-item.h b/src/nautilus-canvas-item.h index 89dfe8709..f20b6f13b 100644 --- a/src/nautilus-canvas-item.h +++ b/src/nautilus-canvas-item.h @@ -19,8 +19,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_CANVAS_ITEM_H -#define NAUTILUS_CANVAS_ITEM_H +#pragma once #include <eel/eel-canvas.h> #include <eel/eel-art-extensions.h> @@ -94,6 +93,4 @@ void nautilus_canvas_item_set_is_visible (NautilusCanvasItem void nautilus_canvas_item_set_entire_text (NautilusCanvasItem *canvas_item, gboolean entire_text); -G_END_DECLS - -#endif /* NAUTILUS_CANVAS_ITEM_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-canvas-private.h b/src/nautilus-canvas-private.h index e9ae3b638..d79354c6d 100644 --- a/src/nautilus-canvas-private.h +++ b/src/nautilus-canvas-private.h @@ -20,8 +20,7 @@ Author: Ettore Perazzoli <ettore@gnu.org> */ -#ifndef NAUTILUS_CANVAS_CONTAINER_PRIVATE_H -#define NAUTILUS_CANVAS_CONTAINER_PRIVATE_H +#pragma once #include <eel/eel-glib-extensions.h> #include "nautilus-canvas-item.h" @@ -223,5 +222,3 @@ gboolean nautilus_canvas_container_scroll (NautilusCan int delta_x, int delta_y); void nautilus_canvas_container_update_scroll_region (NautilusCanvasContainer *container); - -#endif /* NAUTILUS_CANVAS_CONTAINER_PRIVATE_H */ diff --git a/src/nautilus-canvas-view-container.h b/src/nautilus-canvas-view-container.h index 26bcefe05..6e8e50dae 100644 --- a/src/nautilus-canvas-view-container.h +++ b/src/nautilus-canvas-view-container.h @@ -20,8 +20,7 @@ Author: Michael Meeks <michael@ximian.com> */ -#ifndef NAUTILUS_CANVAS_VIEW_CONTAINER_H -#define NAUTILUS_CANVAS_VIEW_CONTAINER_H +#pragma once #include "nautilus-canvas-view.h" @@ -60,5 +59,3 @@ GType nautilus_canvas_view_container_get_type (void); NautilusCanvasContainer *nautilus_canvas_view_container_construct (NautilusCanvasViewContainer *canvas_container, NautilusCanvasView *view); NautilusCanvasContainer *nautilus_canvas_view_container_new (NautilusCanvasView *view); - -#endif /* NAUTILUS_CANVAS_VIEW_CONTAINER_H */ diff --git a/src/nautilus-canvas-view.h b/src/nautilus-canvas-view.h index 86fbc2ea5..390d565da 100644 --- a/src/nautilus-canvas-view.h +++ b/src/nautilus-canvas-view.h @@ -22,8 +22,7 @@ * */ -#ifndef NAUTILUS_CANVAS_VIEW_H -#define NAUTILUS_CANVAS_VIEW_H +#pragma once #include "nautilus-files-view.h" #include "nautilus-canvas-container.h" @@ -42,6 +41,4 @@ NautilusFilesView * nautilus_canvas_view_new (NautilusWindowSlot *slot); NautilusCanvasContainer * nautilus_canvas_view_get_canvas_container (NautilusCanvasView *view); -G_END_DECLS - -#endif /* NAUTILUS_CANVAS_VIEW_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-clipboard.h b/src/nautilus-clipboard.h index 613e98341..1dd26d7c2 100644 --- a/src/nautilus-clipboard.h +++ b/src/nautilus-clipboard.h @@ -20,8 +20,7 @@ * Author: Rebecca Schulman <rebecka@eazel.com> */ -#ifndef NAUTILUS_CLIPBOARD_H -#define NAUTILUS_CLIPBOARD_H +#pragma once #include <gtk/gtk.h> @@ -34,5 +33,3 @@ void nautilus_clipboard_prepare_for_files (GtkClipboard *clipboard, GList *files, gboolean cut); GdkAtom nautilus_clipboard_get_atom (void); - -#endif /* NAUTILUS_CLIPBOARD_H */ diff --git a/src/nautilus-column-chooser.h b/src/nautilus-column-chooser.h index 8a1b5df88..c52efe4c6 100644 --- a/src/nautilus-column-chooser.h +++ b/src/nautilus-column-chooser.h @@ -20,8 +20,7 @@ Authors: Dave Camp <dave@ximian.com> */ -#ifndef NAUTILUS_COLUMN_CHOOSER_H -#define NAUTILUS_COLUMN_CHOOSER_H +#pragma once #include <gtk/gtk.h> #include "nautilus-file.h" @@ -37,5 +36,3 @@ void nautilus_column_chooser_set_settings (NautilusColumnChooser *cho void nautilus_column_chooser_get_settings (NautilusColumnChooser *chooser, char ***visible_columns, char ***column_order); - -#endif /* NAUTILUS_COLUMN_CHOOSER_H */ diff --git a/src/nautilus-column-utilities.h b/src/nautilus-column-utilities.h index 6d07aa3e5..56a363f80 100644 --- a/src/nautilus-column-utilities.h +++ b/src/nautilus-column-utilities.h @@ -20,8 +20,7 @@ Authors: Dave Camp <dave@ximian.com> */ -#ifndef NAUTILUS_COLUMN_UTILITIES_H -#define NAUTILUS_COLUMN_UTILITIES_H +#pragma once #include "nautilus-file.h" @@ -33,6 +32,3 @@ void nautilus_column_list_free (GList *columns); GList *nautilus_sort_columns (GList *columns, char **column_order); - - -#endif /* NAUTILUS_COLUMN_UTILITIES_H */ diff --git a/src/nautilus-compress-dialog-controller.h b/src/nautilus-compress-dialog-controller.h index bb89413f1..2421b8115 100644 --- a/src/nautilus-compress-dialog-controller.h +++ b/src/nautilus-compress-dialog-controller.h @@ -17,8 +17,7 @@ * */ -#ifndef NAUTILUS_COMPRESS_DIALOG_CONTROLLER_H -#define NAUTILUS_COMPRESS_DIALOG_CONTROLLER_H +#pragma once #include <glib.h> #include <gtk/gtk.h> @@ -32,5 +31,3 @@ G_DECLARE_FINAL_TYPE (NautilusCompressDialogController, nautilus_compress_dialog NautilusCompressDialogController * nautilus_compress_dialog_controller_new (GtkWindow *parent_window, NautilusDirectory *destination_directory, gchar *initial_name); - -#endif /* NAUTILUS_COMPRESS_DIALOG_CONTROLLER_H */ diff --git a/src/nautilus-container-max-width.h b/src/nautilus-container-max-width.h index 935721d4c..19621f9dc 100644 --- a/src/nautilus-container-max-width.h +++ b/src/nautilus-container-max-width.h @@ -1,5 +1,4 @@ -#ifndef NAUTILUS_CONTAINER_MAX_WIDTH_H -#define NAUTILUS_CONTAINER_MAX_WIDTH_H +#pragma once #include <glib.h> #include <gtk/gtk.h> @@ -16,7 +15,4 @@ void nautilus_container_max_width_set_max_width (NautilusContainerMaxWidth *self guint max_width); guint nautilus_container_max_width_get_max_width (NautilusContainerMaxWidth *self); -G_END_DECLS - -#endif /* NAUTILUS_CONTAINER_MAX_WIDTH_H */ - +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-dbus-manager.h b/src/nautilus-dbus-manager.h index ce83979a4..ff59f34f7 100644 --- a/src/nautilus-dbus-manager.h +++ b/src/nautilus-dbus-manager.h @@ -20,8 +20,7 @@ * */ -#ifndef __NAUTILUS_DBUS_MANAGER_H__ -#define __NAUTILUS_DBUS_MANAGER_H__ +#pragma once #include <glib-object.h> #include <gio/gio.h> @@ -36,5 +35,3 @@ gboolean nautilus_dbus_manager_register (NautilusDBusManager *self, GDBusConnection *connection, GError **error); void nautilus_dbus_manager_unregister (NautilusDBusManager *self); - -#endif /* __NAUTILUS_DBUS_MANAGER_H__ */ diff --git a/src/nautilus-debug.h b/src/nautilus-debug.h index 8c9eb8859..b6fb2da16 100644 --- a/src/nautilus-debug.h +++ b/src/nautilus-debug.h @@ -21,8 +21,7 @@ * Based on Empathy's empathy-debug. */ -#ifndef __NAUTILUS_DEBUG_H__ -#define __NAUTILUS_DEBUG_H__ +#pragma once #include <config.h> #include <glib.h> @@ -75,5 +74,3 @@ void nautilus_debug_files (DebugFlags flag, GList *files, #endif /* DEBUG_FLAG */ G_END_DECLS - -#endif /* __NAUTILUS_DEBUG_H__ */ diff --git a/src/nautilus-desktop-item-properties.h b/src/nautilus-desktop-item-properties.h index 90522c3ae..77158b694 100644 --- a/src/nautilus-desktop-item-properties.h +++ b/src/nautilus-desktop-item-properties.h @@ -20,8 +20,7 @@ * */ -#ifndef NAUTILUS_DESKTOP_ITEM_PROPERTIES_H -#define NAUTILUS_DESKTOP_ITEM_PROPERTIES_H +#pragma once #include <glib.h> #include <glib-object.h> @@ -42,5 +41,3 @@ GtkWidget *nautilus_desktop_item_properties_make_box (GtkSizeGroup *label_size_g gboolean nautilus_desktop_item_properties_should_show (GList *files); G_END_DECLS - -#endif /* NAUTILUS_DESKTOP_ITEM_PROPERTIES_H */ diff --git a/src/nautilus-directory-notify.h b/src/nautilus-directory-notify.h index 92130e749..48a559a60 100644 --- a/src/nautilus-directory-notify.h +++ b/src/nautilus-directory-notify.h @@ -19,6 +19,8 @@ Author: Darin Adler <darin@bentspoon.com> */ +#pragma once + #include <gdk/gdk.h> #include "nautilus-file.h" diff --git a/src/nautilus-directory-private.h b/src/nautilus-directory-private.h index f60387049..fa6a4a395 100644 --- a/src/nautilus-directory-private.h +++ b/src/nautilus-directory-private.h @@ -19,6 +19,8 @@ Author: Darin Adler <darin@bentspoon.com> */ +#pragma once + #include <gio/gio.h> #include <eel/eel-vfs-extensions.h> #include "nautilus-directory.h" diff --git a/src/nautilus-directory.h b/src/nautilus-directory.h index a16b9c43d..66daa34f7 100644 --- a/src/nautilus-directory.h +++ b/src/nautilus-directory.h @@ -19,8 +19,7 @@ Author: Darin Adler <darin@bentspoon.com> */ -#ifndef NAUTILUS_DIRECTORY_H -#define NAUTILUS_DIRECTORY_H +#pragma once #include <gtk/gtk.h> #include <gio/gio.h> @@ -251,5 +250,3 @@ void nautilus_directory_dump (NautilusDirector NautilusFile * nautilus_directory_new_file_from_filename (NautilusDirectory *directory, const char *filename, gboolean self_owned); - -#endif /* NAUTILUS_DIRECTORY_H */ diff --git a/src/nautilus-dnd.h b/src/nautilus-dnd.h index 507dbf8a9..6e101b529 100644 --- a/src/nautilus-dnd.h +++ b/src/nautilus-dnd.h @@ -22,8 +22,7 @@ Ettore Perazzoli <ettore@gnu.org> */ -#ifndef NAUTILUS_DND_H -#define NAUTILUS_DND_H +#pragma once #include <gtk/gtk.h> #include "nautilus-file.h" @@ -139,5 +138,3 @@ void nautilus_drag_autoscroll_stop (NautilusDragInfo *drag_info); NautilusDragInfo * nautilus_drag_get_source_data (GdkDragContext *context); GList * nautilus_drag_file_list_from_selection_list (const GList *selection_list); - -#endif diff --git a/src/nautilus-error-reporting.h b/src/nautilus-error-reporting.h index e60c06f71..1d9a2292a 100644 --- a/src/nautilus-error-reporting.h +++ b/src/nautilus-error-reporting.h @@ -21,8 +21,7 @@ Authors: John Sullivan <sullivan@eazel.com> */ -#ifndef NAUTILUS_ERROR_REPORTING_H -#define NAUTILUS_ERROR_REPORTING_H +#pragma once #include <gtk/gtk.h> #include "nautilus-file.h" @@ -51,6 +50,4 @@ void nautilus_report_error_setting_group (NautilusFile *file, void nautilus_rename_file (NautilusFile *file, const char *new_name, NautilusFileOperationCallback callback, - gpointer callback_data); - -#endif /* NAUTILUS_ERROR_REPORTING_H */ + gpointer callback_data);
\ No newline at end of file diff --git a/src/nautilus-file-attributes.h b/src/nautilus-file-attributes.h index 13002dc19..1cbde777c 100644 --- a/src/nautilus-file-attributes.h +++ b/src/nautilus-file-attributes.h @@ -19,8 +19,7 @@ Author: Darin Adler <darin@bentspoon.com> */ -#ifndef NAUTILUS_FILE_ATTRIBUTES_H -#define NAUTILUS_FILE_ATTRIBUTES_H +#pragma once /* Names for NautilusFile attributes. These are used when registering * interest in changes to the attributes or when waiting for them. @@ -37,5 +36,3 @@ typedef enum { NAUTILUS_FILE_ATTRIBUTE_MOUNT = 1 << 7, NAUTILUS_FILE_ATTRIBUTE_FILESYSTEM_INFO = 1 << 8, } NautilusFileAttributes; - -#endif /* NAUTILUS_FILE_ATTRIBUTES_H */ diff --git a/src/nautilus-file-changes-queue.h b/src/nautilus-file-changes-queue.h index f851b4cbf..8f49bc972 100644 --- a/src/nautilus-file-changes-queue.h +++ b/src/nautilus-file-changes-queue.h @@ -17,8 +17,7 @@ Author: Pavel Cisler <pavel@eazel.com> */ -#ifndef NAUTILUS_FILE_CHANGES_QUEUE_H -#define NAUTILUS_FILE_CHANGES_QUEUE_H +#pragma once #include <gdk/gdk.h> #include <gio/gio.h> @@ -30,6 +29,3 @@ void nautilus_file_changes_queue_file_moved (GFile *fr GFile *to); void nautilus_file_changes_consume_changes (gboolean consume_all); - - -#endif /* NAUTILUS_FILE_CHANGES_QUEUE_H */ diff --git a/src/nautilus-file-conflict-dialog.h b/src/nautilus-file-conflict-dialog.h index 206d10031..e54071b02 100644 --- a/src/nautilus-file-conflict-dialog.h +++ b/src/nautilus-file-conflict-dialog.h @@ -20,8 +20,7 @@ Authors: Cosimo Cecchi <cosimoc@gnome.org> */ -#ifndef NAUTILUS_FILE_CONFLICT_DIALOG_H -#define NAUTILUS_FILE_CONFLICT_DIALOG_H +#pragma once #include <glib-object.h> #include <gio/gio.h> @@ -56,6 +55,4 @@ void nautilus_file_conflict_dialog_disable_apply_to_all (NautilusFileConflictDia char* nautilus_file_conflict_dialog_get_new_name (NautilusFileConflictDialog *dialog); gboolean nautilus_file_conflict_dialog_get_apply_to_all (NautilusFileConflictDialog *dialog); -G_END_DECLS - -#endif /* NAUTILUS_FILE_CONFLICT_DIALOG_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-file-name-widget-controller.h b/src/nautilus-file-name-widget-controller.h index 1331c5644..94b23b880 100644 --- a/src/nautilus-file-name-widget-controller.h +++ b/src/nautilus-file-name-widget-controller.h @@ -17,8 +17,7 @@ * */ -#ifndef NAUTILUS_FILE_NAME_WIDGET_CONTROLLER_H -#define NAUTILUS_FILE_NAME_WIDGET_CONTROLLER_H +#pragma once #include <glib.h> #include <gtk/gtk.h> @@ -46,6 +45,3 @@ struct _NautilusFileNameWidgetControllerClass }; gchar * nautilus_file_name_widget_controller_get_new_name (NautilusFileNameWidgetController *controller); - - -#endif /* NAUTILUS_FILE_NAME_WIDGET_CONTROLLER_H */ diff --git a/src/nautilus-file-operations.h b/src/nautilus-file-operations.h index e8c6ed393..b84124a5a 100644 --- a/src/nautilus-file-operations.h +++ b/src/nautilus-file-operations.h @@ -21,8 +21,7 @@ Pavel Cisler <pavel@eazel.com> */ -#ifndef NAUTILUS_FILE_OPERATIONS_H -#define NAUTILUS_FILE_OPERATIONS_H +#pragma once #include <gtk/gtk.h> #include <gio/gio.h> @@ -154,7 +153,4 @@ void nautilus_file_operations_compress (GList *files, AutoarFilter filter, GtkWindow *parent_window, NautilusCreateCallback done_callback, - gpointer done_callback_data); - - -#endif /* NAUTILUS_FILE_OPERATIONS_H */ + gpointer done_callback_data);
\ No newline at end of file diff --git a/src/nautilus-file-private.h b/src/nautilus-file-private.h index bf2be36b5..fa53c5c33 100644 --- a/src/nautilus-file-private.h +++ b/src/nautilus-file-private.h @@ -19,8 +19,7 @@ Author: Darin Adler <darin@bentspoon.com> */ -#ifndef NAUTILUS_FILE_PRIVATE_H -#define NAUTILUS_FILE_PRIVATE_H +#pragma once #include "nautilus-directory.h" #include "nautilus-file.h" @@ -287,6 +286,4 @@ void nautilus_file_operation_free (NautilusFileOperation void nautilus_file_operation_complete (NautilusFileOperation *op, GFile *result_location, GError *error); -void nautilus_file_operation_cancel (NautilusFileOperation *op); - -#endif +void nautilus_file_operation_cancel (NautilusFileOperation *op);
\ No newline at end of file diff --git a/src/nautilus-file-queue.h b/src/nautilus-file-queue.h index b7aae0b38..28c7b17ae 100644 --- a/src/nautilus-file-queue.h +++ b/src/nautilus-file-queue.h @@ -17,8 +17,7 @@ Author: Maciej Stachowiak <mjs@noisehavoc.org> */ -#ifndef NAUTILUS_FILE_QUEUE_H -#define NAUTILUS_FILE_QUEUE_H +#pragma once #include "nautilus-file.h" @@ -45,5 +44,3 @@ void nautilus_file_queue_remove (NautilusFileQueue *queue, NautilusFile * nautilus_file_queue_head (NautilusFileQueue *queue); gboolean nautilus_file_queue_is_empty (NautilusFileQueue *queue); - -#endif /* NAUTILUS_FILE_CHANGES_QUEUE_H */ diff --git a/src/nautilus-file-undo-manager.h b/src/nautilus-file-undo-manager.h index 834860b7b..fc857ac6f 100644 --- a/src/nautilus-file-undo-manager.h +++ b/src/nautilus-file-undo-manager.h @@ -19,8 +19,7 @@ * Author: Amos Brocco <amos.brocco@gmail.com> */ -#ifndef __NAUTILUS_FILE_UNDO_MANAGER_H__ -#define __NAUTILUS_FILE_UNDO_MANAGER_H__ +#pragma once #include <glib.h> #include <glib-object.h> @@ -52,5 +51,3 @@ void nautilus_file_undo_manager_undo (GtkWindow *parent_window); void nautilus_file_undo_manager_redo (GtkWindow *parent_window); gboolean nautilus_file_undo_manager_is_operating (void); - -#endif /* __NAUTILUS_FILE_UNDO_MANAGER_H__ */ diff --git a/src/nautilus-file-undo-operations.h b/src/nautilus-file-undo-operations.h index 3963a6323..e20bc25e5 100644 --- a/src/nautilus-file-undo-operations.h +++ b/src/nautilus-file-undo-operations.h @@ -22,8 +22,7 @@ * */ -#ifndef __NAUTILUS_FILE_UNDO_OPERATIONS_H__ -#define __NAUTILUS_FILE_UNDO_OPERATIONS_H__ +#pragma once #include <gio/gio.h> #include <gtk/gtk.h> @@ -408,7 +407,4 @@ GType nautilus_file_undo_info_compress_get_type (void) G_GNUC_CONST; NautilusFileUndoInfo * nautilus_file_undo_info_compress_new (GList *sources, GFile *output, AutoarFormat format, - AutoarFilter filter); - - -#endif /* __NAUTILUS_FILE_UNDO_OPERATIONS_H__ */ + AutoarFilter filter);
\ No newline at end of file diff --git a/src/nautilus-file-utilities.h b/src/nautilus-file-utilities.h index 4b2124b3b..528dd418c 100644 --- a/src/nautilus-file-utilities.h +++ b/src/nautilus-file-utilities.h @@ -20,8 +20,7 @@ Authors: John Sullivan <sullivan@eazel.com> */ -#ifndef NAUTILUS_FILE_UTILITIES_H -#define NAUTILUS_FILE_UTILITIES_H +#pragma once #include <gio/gio.h> #include <gtk/gtk.h> @@ -127,5 +126,3 @@ gboolean nautilus_file_can_rename_files (GList *files); GList * nautilus_file_list_from_uri_list (GList *uris); gchar * nautilus_uri_to_native_uri (const gchar *uri); - -#endif /* NAUTILUS_FILE_UTILITIES_H */ diff --git a/src/nautilus-file.h b/src/nautilus-file.h index bbf7906fa..147ad4649 100644 --- a/src/nautilus-file.h +++ b/src/nautilus-file.h @@ -19,8 +19,7 @@ Author: Darin Adler <darin@bentspoon.com> */ -#ifndef NAUTILUS_FILE_H -#define NAUTILUS_FILE_H +#pragma once #include <gtk/gtk.h> #include <gio/gio.h> @@ -616,5 +615,3 @@ typedef struct { void (* poll_for_media) (NautilusFile *file); } NautilusFileClass; - -#endif /* NAUTILUS_FILE_H */ diff --git a/src/nautilus-files-view-dnd.h b/src/nautilus-files-view-dnd.h index 0b946d994..73ea5c778 100644 --- a/src/nautilus-files-view-dnd.h +++ b/src/nautilus-files-view-dnd.h @@ -24,8 +24,7 @@ * Pavel Cisler <pavel@eazel.com> */ -#ifndef __NAUTILUS_FILES_VIEW_DND_H__ -#define __NAUTILUS_FILES_VIEW_DND_H__ +#pragma once #include "nautilus-files-view.h" @@ -53,7 +52,4 @@ void nautilus_files_view_handle_hover (NautilusFilesView *view, void nautilus_files_view_drop_proxy_received_uris (NautilusFilesView *view, const GList *uris, const char *target_location, - GdkDragAction action); - - -#endif /* __NAUTILUS_FILES_VIEW_DND_H__ */ + GdkDragAction action);
\ No newline at end of file diff --git a/src/nautilus-files-view.h b/src/nautilus-files-view.h index f9775b6f4..b774b983c 100644 --- a/src/nautilus-files-view.h +++ b/src/nautilus-files-view.h @@ -22,8 +22,7 @@ * Pavel Cisler <pavel@eazel.com> */ -#ifndef NAUTILUS_FILES_VIEW_H -#define NAUTILUS_FILES_VIEW_H +#pragma once #include <gtk/gtk.h> #include <gio/gio.h> @@ -330,6 +329,4 @@ void nautilus_files_view_action_show_hidden_files (NautilusFilesV GActionGroup * nautilus_files_view_get_action_group (NautilusFilesView *view); GtkWidget* nautilus_files_view_get_content_widget (NautilusFilesView *view); -G_END_DECLS - -#endif /* NAUTILUS_FILES_VIEW_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-floating-bar.h b/src/nautilus-floating-bar.h index 2eb0e6462..893e1dc1b 100644 --- a/src/nautilus-floating-bar.h +++ b/src/nautilus-floating-bar.h @@ -20,8 +20,7 @@ * */ -#ifndef __NAUTILUS_FLOATING_BAR_H__ -#define __NAUTILUS_FLOATING_BAR_H__ +#pragma once #include <gtk/gtk.h> @@ -49,7 +48,4 @@ void nautilus_floating_bar_add_action (NautilusFloatingBar *self, gint action_id); void nautilus_floating_bar_cleanup_actions (NautilusFloatingBar *self); -void nautilus_floating_bar_remove_hover_timeout (NautilusFloatingBar *self); - -#endif /* __NAUTILUS_FLOATING_BAR_H__ */ - +void nautilus_floating_bar_remove_hover_timeout (NautilusFloatingBar *self);
\ No newline at end of file diff --git a/src/nautilus-freedesktop-dbus.h b/src/nautilus-freedesktop-dbus.h index 410c420ac..57dfef718 100644 --- a/src/nautilus-freedesktop-dbus.h +++ b/src/nautilus-freedesktop-dbus.h @@ -18,9 +18,7 @@ * Federico Mena Quintero <federico@gnome.org> */ - -#ifndef __NAUTILUS_FREEDESKTOP_DBUS_H__ -#define __NAUTILUS_FREEDESKTOP_DBUS_H__ +#pragma once #include <glib-object.h> @@ -47,5 +45,3 @@ GType nautilus_freedesktop_dbus_get_type (void); NautilusFreedesktopDBus * nautilus_freedesktop_dbus_new (void); void nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb, const gchar **locations); - -#endif /* __NAUTILUS_FREEDESKTOP_DBUS_H__ */ diff --git a/src/nautilus-global-preferences.h b/src/nautilus-global-preferences.h index 89e6b2045..0ccc1937b 100644 --- a/src/nautilus-global-preferences.h +++ b/src/nautilus-global-preferences.h @@ -21,8 +21,7 @@ Authors: Ramiro Estrugo <ramiro@eazel.com> */ -#ifndef NAUTILUS_GLOBAL_PREFERENCES_H -#define NAUTILUS_GLOBAL_PREFERENCES_H +#pragma once #include "nautilus-global-preferences.h" #include <gio/gio.h> @@ -169,6 +168,4 @@ extern GSettings *gnome_lockdown_preferences; extern GSettings *gnome_background_preferences; extern GSettings *gnome_interface_preferences; -G_END_DECLS - -#endif /* NAUTILUS_GLOBAL_PREFERENCES_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-icon-info.h b/src/nautilus-icon-info.h index 505a7be0f..b026b4409 100644 --- a/src/nautilus-icon-info.h +++ b/src/nautilus-icon-info.h @@ -1,5 +1,4 @@ -#ifndef NAUTILUS_ICON_INFO_H -#define NAUTILUS_ICON_INFO_H +#pragma once #include <glib-object.h> #include <gdk-pixbuf/gdk-pixbuf.h> @@ -75,7 +74,4 @@ void nautilus_icon_info_clear_caches (void); gint nautilus_get_icon_size_for_stock_size (GtkIconSize size); -G_END_DECLS - -#endif /* NAUTILUS_ICON_INFO_H */ - +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-icon-names.h b/src/nautilus-icon-names.h index ee584e32a..4e2624c43 100644 --- a/src/nautilus-icon-names.h +++ b/src/nautilus-icon-names.h @@ -1,5 +1,4 @@ -#ifndef NAUTILUS_ICON_NAMES_H -#define NAUTILUS_ICON_NAMES_H +#pragma once /* Icons for places */ #define NAUTILUS_ICON_FILESYSTEM "drive-harddisk-symbolic" @@ -24,7 +23,4 @@ #define NAUTILUS_ICON_FULLCOLOR_FOLDER_PICTURES "folder-pictures" #define NAUTILUS_ICON_FULLCOLOR_FOLDER_PUBLIC_SHARE "folder-publicshare" #define NAUTILUS_ICON_FULLCOLOR_FOLDER_TEMPLATES "folder-templates" -#define NAUTILUS_ICON_FULLCOLOR_FOLDER_VIDEOS "folder-videos" - -#endif /* NAUTILUS_ICON_NAMES_H */ - +#define NAUTILUS_ICON_FULLCOLOR_FOLDER_VIDEOS "folder-videos"
\ No newline at end of file diff --git a/src/nautilus-keyfile-metadata.h b/src/nautilus-keyfile-metadata.h index f9dede523..c09f132e2 100644 --- a/src/nautilus-keyfile-metadata.h +++ b/src/nautilus-keyfile-metadata.h @@ -20,8 +20,7 @@ * Authors: Cosimo Cecchi <cosimoc@redhat.com> */ -#ifndef __NAUTILUS_KEYFILE_METADATA_H__ -#define __NAUTILUS_KEYFILE_METADATA_H__ +#pragma once #include <glib.h> @@ -41,6 +40,4 @@ void nautilus_keyfile_metadata_set_stringv (NautilusFile *file, gboolean nautilus_keyfile_metadata_update_from_keyfile (NautilusFile *file, const char *keyfile_filename, - const gchar *name); - -#endif /* __NAUTILUS_KEYFILE_METADATA_H__ */ + const gchar *name);
\ No newline at end of file diff --git a/src/nautilus-lib-self-check-functions.h b/src/nautilus-lib-self-check-functions.h index 77dcd2152..93850c9c9 100644 --- a/src/nautilus-lib-self-check-functions.h +++ b/src/nautilus-lib-self-check-functions.h @@ -20,6 +20,8 @@ Author: Darin Adler <darin@bentspoon.com> */ +#pragma once + #include <eel/eel-self-checks.h> void nautilus_run_lib_self_checks (void); diff --git a/src/nautilus-link.h b/src/nautilus-link.h index be0c691ce..d8ad3b1be 100644 --- a/src/nautilus-link.h +++ b/src/nautilus-link.h @@ -19,8 +19,7 @@ Authors: Jonathan Blandford <jrb@redhat.com> */ -#ifndef NAUTILUS_LINK_H -#define NAUTILUS_LINK_H +#pragma once #include <gdk/gdk.h> @@ -43,6 +42,4 @@ void nautilus_link_get_link_info_given_file_contents (const char char **uri, char **name, GIcon **icon, - gboolean *is_launcher); - -#endif /* NAUTILUS_LINK_H */ + gboolean *is_launcher);
\ No newline at end of file diff --git a/src/nautilus-list-model.h b/src/nautilus-list-model.h index 9f00dd198..ba771b8c2 100644 --- a/src/nautilus-list-model.h +++ b/src/nautilus-list-model.h @@ -20,15 +20,14 @@ Authors: Anders Carlsson <andersca@gnu.org> */ +#pragma once + #include <gtk/gtk.h> #include <gdk/gdk.h> #include "nautilus-file.h" #include "nautilus-directory.h" #include <nautilus-extension.h> -#ifndef NAUTILUS_LIST_MODEL_H -#define NAUTILUS_LIST_MODEL_H - #define NAUTILUS_TYPE_LIST_MODEL nautilus_list_model_get_type() G_DECLARE_DERIVABLE_TYPE (NautilusListModel, nautilus_list_model, NAUTILUS, LIST_MODEL, GObject); @@ -111,6 +110,4 @@ void nautilus_list_model_subdirectory_done_loading (NautilusListMod NautilusDirectory *directory); void nautilus_list_model_set_highlight_for_files (NautilusListModel *model, - GList *files); - -#endif /* NAUTILUS_LIST_MODEL_H */ + GList *files);
\ No newline at end of file diff --git a/src/nautilus-list-view-dnd.h b/src/nautilus-list-view-dnd.h index 0022daf8a..e3828e37f 100644 --- a/src/nautilus-list-view-dnd.h +++ b/src/nautilus-list-view-dnd.h @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_LIST_VIEW_DND_H -#define NAUTILUS_LIST_VIEW_DND_H + +#pragma once #include <gdk/gdk.h> @@ -29,6 +29,4 @@ gboolean nautilus_list_view_dnd_drag_begin (NautilusListView *list_view, GdkEventMotion *event); NautilusDragInfo * nautilus_list_view_dnd_get_drag_source_data (NautilusListView *list_view, - GdkDragContext *context); - -#endif /* NAUTILUS_LIST_VIEW_DND_H */ + GdkDragContext *context);
\ No newline at end of file diff --git a/src/nautilus-list-view-private.h b/src/nautilus-list-view-private.h index 7e247a783..8080e8218 100644 --- a/src/nautilus-list-view-private.h +++ b/src/nautilus-list-view-private.h @@ -18,6 +18,8 @@ /* Data and functions shared between list view and list view dnd */ +#pragma once + #include "nautilus-list-model.h" #include "nautilus-tree-view-drag-dest.h" #include "nautilus-dnd.h" diff --git a/src/nautilus-list-view.h b/src/nautilus-list-view.h index 04989fa95..7e19621e8 100644 --- a/src/nautilus-list-view.h +++ b/src/nautilus-list-view.h @@ -22,8 +22,7 @@ Anders Carlsson <andersca@gnu.org> */ -#ifndef NAUTILUS_LIST_VIEW_H -#define NAUTILUS_LIST_VIEW_H +#pragma once #include "nautilus-files-view.h" @@ -38,6 +37,4 @@ struct _NautilusListView NautilusListViewDetails *details; }; -NautilusFilesView * nautilus_list_view_new (NautilusWindowSlot *slot); - -#endif /* NAUTILUS_LIST_VIEW_H */ +NautilusFilesView * nautilus_list_view_new (NautilusWindowSlot *slot);
\ No newline at end of file diff --git a/src/nautilus-location-entry.h b/src/nautilus-location-entry.h index 5c1948154..bdff5388a 100644 --- a/src/nautilus-location-entry.h +++ b/src/nautilus-location-entry.h @@ -22,8 +22,7 @@ * Ettore Perazzoli <ettore@gnu.org> */ -#ifndef NAUTILUS_LOCATION_ENTRY_H -#define NAUTILUS_LOCATION_ENTRY_H +#pragma once #include <gtk/gtk.h> @@ -49,6 +48,4 @@ void nautilus_location_entry_set_special_text (NautilusLocationEntry * void nautilus_location_entry_set_secondary_action (NautilusLocationEntry *entry, NautilusLocationEntryAction secondary_action); void nautilus_location_entry_set_location (NautilusLocationEntry *entry, - GFile *location); - -#endif /* NAUTILUS_LOCATION_ENTRY_H */ + GFile *location);
\ No newline at end of file diff --git a/src/nautilus-metadata.h b/src/nautilus-metadata.h index 4f291012c..9eeaeb6e1 100644 --- a/src/nautilus-metadata.h +++ b/src/nautilus-metadata.h @@ -19,8 +19,7 @@ Author: John Sullivan <sullivan@eazel.com> */ -#ifndef NAUTILUS_METADATA_H -#define NAUTILUS_METADATA_H +#pragma once /* Keys for getting/setting Nautilus metadata. All metadata used in Nautilus * should define its key here, so we can keep track of the whole set easily. @@ -45,6 +44,4 @@ #define NAUTILUS_METADATA_KEY_DESKTOP_FILE_TRUSTED "trusted" -guint nautilus_metadata_get_id (const char *metadata); - -#endif /* NAUTILUS_METADATA_H */ +guint nautilus_metadata_get_id (const char *metadata);
\ No newline at end of file diff --git a/src/nautilus-mime-actions.h b/src/nautilus-mime-actions.h index 93475648e..f3ed233e3 100644 --- a/src/nautilus-mime-actions.h +++ b/src/nautilus-mime-actions.h @@ -20,8 +20,7 @@ Authors: Maciej Stachowiak <mjs@eazel.com> */ -#ifndef NAUTILUS_MIME_ACTIONS_H -#define NAUTILUS_MIME_ACTIONS_H +#pragma once #include <gio/gio.h> #include <glib/gi18n.h> @@ -53,7 +52,4 @@ void nautilus_mime_activate_file (GtkWi NautilusWindowOpenFlags flags); gint nautilus_mime_types_get_number_of_groups (void); const gchar* nautilus_mime_types_group_get_name (gint group_index); -GList* nautilus_mime_types_group_get_mimetypes (gint group_index); - - -#endif /* NAUTILUS_MIME_ACTIONS_H */ +GList* nautilus_mime_types_group_get_mimetypes (gint group_index);
\ No newline at end of file diff --git a/src/nautilus-mime-application-chooser.h b/src/nautilus-mime-application-chooser.h index ea23203d7..2cae6d0ad 100644 --- a/src/nautilus-mime-application-chooser.h +++ b/src/nautilus-mime-application-chooser.h @@ -21,8 +21,7 @@ Authors: Dave Camp <dave@novell.com> */ -#ifndef NAUTILUS_MIME_APPLICATION_CHOOSER_H -#define NAUTILUS_MIME_APPLICATION_CHOOSER_H +#pragma once #include <gtk/gtk.h> @@ -36,5 +35,3 @@ GtkWidget * nautilus_mime_application_chooser_new (GList *files, const char *mime_type); G_END_DECLS - -#endif /* NAUTILUS_MIME_APPLICATION_CHOOSER_H */ diff --git a/src/nautilus-module.h b/src/nautilus-module.h index b4854a8b0..1f70a9195 100644 --- a/src/nautilus-module.h +++ b/src/nautilus-module.h @@ -20,8 +20,7 @@ * */ -#ifndef NAUTILUS_MODULE_H -#define NAUTILUS_MODULE_H +#pragma once #include <glib-object.h> @@ -37,5 +36,3 @@ void nautilus_module_extension_list_free (GList *list); void nautilus_module_add_type (GType type); G_END_DECLS - -#endif diff --git a/src/nautilus-monitor.h b/src/nautilus-monitor.h index 29faa2318..ad0386d4e 100644 --- a/src/nautilus-monitor.h +++ b/src/nautilus-monitor.h @@ -22,8 +22,7 @@ Carlos Soriano <csoriano@gnome.org> */ -#ifndef NAUTILUS_MONITOR_H -#define NAUTILUS_MONITOR_H +#pragma once #include <glib.h> #include <gio/gio.h> @@ -31,6 +30,4 @@ typedef struct NautilusMonitor NautilusMonitor; NautilusMonitor *nautilus_monitor_directory (GFile *location); -void nautilus_monitor_cancel (NautilusMonitor *monitor); - -#endif /* NAUTILUS_MONITOR_H */ +void nautilus_monitor_cancel (NautilusMonitor *monitor);
\ No newline at end of file diff --git a/src/nautilus-new-folder-dialog-controller.h b/src/nautilus-new-folder-dialog-controller.h index 9b1a83b74..a4a22a60a 100644 --- a/src/nautilus-new-folder-dialog-controller.h +++ b/src/nautilus-new-folder-dialog-controller.h @@ -17,8 +17,7 @@ * */ -#ifndef NAUTILUS_NEW_FOLDER_DIALOG_CONTROLLER_H -#define NAUTILUS_NEW_FOLDER_DIALOG_CONTROLLER_H +#pragma once #include <glib.h> #include <gtk/gtk.h> @@ -34,6 +33,4 @@ NautilusNewFolderDialogController * nautilus_new_folder_dialog_controller_new (G gboolean with_selection, gchar *initial_name); -gboolean nautilus_new_folder_dialog_controller_get_with_selection (NautilusNewFolderDialogController *controller); - -#endif /* NAUTILUS_NEW_FOLDER_DIALOG_CONTROLLER_H */ +gboolean nautilus_new_folder_dialog_controller_get_with_selection (NautilusNewFolderDialogController *controller);
\ No newline at end of file diff --git a/src/nautilus-notebook.h b/src/nautilus-notebook.h index 5a999f776..5f2d63faa 100644 --- a/src/nautilus-notebook.h +++ b/src/nautilus-notebook.h @@ -22,8 +22,7 @@ * */ -#ifndef NAUTILUS_NOTEBOOK_H -#define NAUTILUS_NOTEBOOK_H +#pragma once #include <glib.h> #include <gtk/gtk.h> @@ -55,7 +54,4 @@ void nautilus_notebook_next_page (NautilusNotebook *notebook); gboolean nautilus_notebook_contains_slot (NautilusNotebook *notebook, NautilusWindowSlot *slot); -G_END_DECLS - -#endif /* NAUTILUS_NOTEBOOK_H */ - +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-operations-ui-manager.h b/src/nautilus-operations-ui-manager.h index edfcbe793..032ffb5bd 100644 --- a/src/nautilus-operations-ui-manager.h +++ b/src/nautilus-operations-ui-manager.h @@ -1,5 +1,4 @@ -#ifndef NAUTILUS_OPERATIONS_UI_MANAGER -#define NAUTILUS_OPERATIONS_UI_MANAGER +#pragma once #include <gio/gio.h> #include <gtk/gtk.h> @@ -25,6 +24,4 @@ enum }; void handle_unsupported_compressed_file (GtkWindow *parent_window, - GFile *compressed_file); - -#endif /* NAUTILUS_OPERATIONS_UI_MANAGER */ + GFile *compressed_file);
\ No newline at end of file diff --git a/src/nautilus-other-locations-window-slot.h b/src/nautilus-other-locations-window-slot.h index 24f6d44e7..abd7dcfd6 100644 --- a/src/nautilus-other-locations-window-slot.h +++ b/src/nautilus-other-locations-window-slot.h @@ -16,8 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_OTHER_LOCATIONS_WINDOW_SLOT_H -#define NAUTILUS_OTHER_LOCATIONS_WINDOW_SLOT_H +#pragma once #include "nautilus-window-slot.h" #include "nautilus-window.h" @@ -30,7 +29,4 @@ G_DECLARE_FINAL_TYPE (NautilusOtherLocationsWindowSlot, nautilus_other_locations NautilusOtherLocationsWindowSlot *nautilus_other_locations_window_slot_new (NautilusWindow *window); -G_END_DECLS - -#endif /* NAUTILUS_OTHER_LOCATIONS_WINDOW_SLOT_H */ - +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-pathbar.h b/src/nautilus-pathbar.h index 8651b7bc2..814d7dd55 100644 --- a/src/nautilus-pathbar.h +++ b/src/nautilus-pathbar.h @@ -16,8 +16,7 @@ * */ -#ifndef NAUTILUS_PATHBAR_H -#define NAUTILUS_PATHBAR_H +#pragma once #include <gtk/gtk.h> #include <gio/gio.h> @@ -35,6 +34,4 @@ struct _NautilusPathBarClass GFile *location, GtkPlacesOpenFlags flags); }; -void nautilus_path_bar_set_path (NautilusPathBar *self, GFile *file); - -#endif /* NAUTILUS_PATHBAR_H */ +void nautilus_path_bar_set_path (NautilusPathBar *self, GFile *file);
\ No newline at end of file diff --git a/src/nautilus-places-view.h b/src/nautilus-places-view.h index 51939103e..fe7888611 100644 --- a/src/nautilus-places-view.h +++ b/src/nautilus-places-view.h @@ -16,8 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_PLACES_VIEW_H -#define NAUTILUS_PLACES_VIEW_H +#pragma once #include <glib.h> #include <gtk/gtk.h> @@ -33,5 +32,3 @@ G_DECLARE_FINAL_TYPE (NautilusPlacesView, nautilus_places_view, NAUTILUS, PLACES NautilusPlacesView* nautilus_places_view_new (void); G_END_DECLS - -#endif /* NAUTILUS_PLACES_VIEW_H */ diff --git a/src/nautilus-preferences-window.h b/src/nautilus-preferences-window.h index b8069ef6a..dfd64d6d1 100644 --- a/src/nautilus-preferences-window.h +++ b/src/nautilus-preferences-window.h @@ -22,8 +22,7 @@ Authors: Jan Arne Petersen <jpetersen@uni-bonn.de> */ -#ifndef NAUTILUS_PREFERENCES_WINDOW_H -#define NAUTILUS_PREFERENCES_WINDOW_H +#pragma once #include <glib-object.h> #include <gtk/gtk.h> @@ -32,6 +31,4 @@ G_BEGIN_DECLS void nautilus_preferences_window_show(GtkWindow *window); -G_END_DECLS - -#endif /* NAUTILUS_PREFERENCES_WINDOW_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-previewer.h b/src/nautilus-previewer.h index 8134d0255..1c45653b1 100644 --- a/src/nautilus-previewer.h +++ b/src/nautilus-previewer.h @@ -20,8 +20,7 @@ * */ -#ifndef __NAUTILUS_PREVIEWER_H__ -#define __NAUTILUS_PREVIEWER_H__ +#pragma once #include <glib.h> @@ -33,5 +32,3 @@ void nautilus_previewer_call_show_file (const gchar *uri, void nautilus_previewer_call_close (void); G_END_DECLS - -#endif /* __NAUTILUS_PREVIEWER_H__ */ diff --git a/src/nautilus-profile.h b/src/nautilus-profile.h index 583d2963e..47f81317a 100644 --- a/src/nautilus-profile.h +++ b/src/nautilus-profile.h @@ -23,8 +23,7 @@ * See: http://www.gnome.org/~federico/news-2006-03.html#09 */ -#ifndef __NAUTILUS_PROFILE_H -#define __NAUTILUS_PROFILE_H +#pragma once #include <glib.h> @@ -51,6 +50,4 @@ void _nautilus_profile_log (const char *func, const char *format, ...) G_GNUC_PRINTF (3, 4); -G_END_DECLS - -#endif /* __NAUTILUS_PROFILE_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-program-choosing.h b/src/nautilus-program-choosing.h index ded108aba..51881ff17 100644 --- a/src/nautilus-program-choosing.h +++ b/src/nautilus-program-choosing.h @@ -21,8 +21,7 @@ Author: John Sullivan <sullivan@eazel.com> */ -#ifndef NAUTILUS_PROGRAM_CHOOSING_H -#define NAUTILUS_PROGRAM_CHOOSING_H +#pragma once #include <gtk/gtk.h> #include <gio/gio.h> @@ -58,6 +57,4 @@ void nautilus_launch_default_for_uri_async (const char GAsyncReadyCallback callback, gpointer callback_data); gboolean nautilus_launch_default_for_uri_finish (GAsyncResult *result, - GError **error); - -#endif /* NAUTILUS_PROGRAM_CHOOSING_H */ + GError **error);
\ No newline at end of file diff --git a/src/nautilus-progress-info-manager.h b/src/nautilus-progress-info-manager.h index 9eeba7e55..9ffc6f405 100644 --- a/src/nautilus-progress-info-manager.h +++ b/src/nautilus-progress-info-manager.h @@ -20,8 +20,7 @@ * Author: Cosimo Cecchi <cosimoc@redhat.com> */ -#ifndef __NAUTILUS_PROGRESS_INFO_MANAGER_H__ -#define __NAUTILUS_PROGRESS_INFO_MANAGER_H__ +#pragma once #include <glib-object.h> @@ -42,6 +41,4 @@ void nautilus_progress_manager_add_viewer (NautilusProgressInfoManager *self, GO void nautilus_progress_manager_remove_viewer (NautilusProgressInfoManager *self, GObject *viewer); gboolean nautilus_progress_manager_has_viewers (NautilusProgressInfoManager *self); -G_END_DECLS - -#endif /* __NAUTILUS_PROGRESS_INFO_MANAGER_H__ */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-progress-info-widget.h b/src/nautilus-progress-info-widget.h index 74c5a4d9c..62fe7ca37 100644 --- a/src/nautilus-progress-info-widget.h +++ b/src/nautilus-progress-info-widget.h @@ -21,8 +21,7 @@ * */ -#ifndef __NAUTILUS_PROGRESS_INFO_WIDGET_H__ -#define __NAUTILUS_PROGRESS_INFO_WIDGET_H__ +#pragma once #include <gtk/gtk.h> @@ -55,6 +54,4 @@ typedef struct { GType nautilus_progress_info_widget_get_type (void); -GtkWidget * nautilus_progress_info_widget_new (NautilusProgressInfo *info); - -#endif /* __NAUTILUS_PROGRESS_INFO_WIDGET_H__ */ +GtkWidget * nautilus_progress_info_widget_new (NautilusProgressInfo *info);
\ No newline at end of file diff --git a/src/nautilus-progress-info.h b/src/nautilus-progress-info.h index c42b6c85b..8f274b867 100644 --- a/src/nautilus-progress-info.h +++ b/src/nautilus-progress-info.h @@ -19,8 +19,7 @@ Author: Alexander Larsson <alexl@redhat.com> */ -#ifndef NAUTILUS_PROGRESS_INFO_H -#define NAUTILUS_PROGRESS_INFO_H +#pragma once #include <glib-object.h> #include <gio/gio.h> @@ -80,8 +79,4 @@ gdouble nautilus_progress_info_get_total_elapsed_time (NautilusProgressInf void nautilus_progress_info_set_destination (NautilusProgressInfo *info, GFile *file); -GFile *nautilus_progress_info_get_destination (NautilusProgressInfo *info); - - - -#endif /* NAUTILUS_PROGRESS_INFO_H */ +GFile *nautilus_progress_info_get_destination (NautilusProgressInfo *info);
\ No newline at end of file diff --git a/src/nautilus-progress-persistence-handler.h b/src/nautilus-progress-persistence-handler.h index fa5f2b943..3fce9df3d 100644 --- a/src/nautilus-progress-persistence-handler.h +++ b/src/nautilus-progress-persistence-handler.h @@ -21,8 +21,7 @@ * */ -#ifndef __NAUTILUS_PROGRESS_PERSISTENCE_HANDLER_H__ -#define __NAUTILUS_PROGRESS_PERSISTENCE_HANDLER_H__ +#pragma once #include <glib-object.h> @@ -35,6 +34,4 @@ G_DECLARE_FINAL_TYPE (NautilusProgressPersistenceHandler, nautilus_progress_pers NautilusProgressPersistenceHandler * nautilus_progress_persistence_handler_new (GObject *app); void nautilus_progress_persistence_handler_make_persistent (NautilusProgressPersistenceHandler *self); -G_END_DECLS - -#endif /* __NAUTILUS_PROGRESS_PERSISTENCE_HANDLER_H__ */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-properties-window.h b/src/nautilus-properties-window.h index 9eff54c4e..5fac0ff50 100644 --- a/src/nautilus-properties-window.h +++ b/src/nautilus-properties-window.h @@ -21,8 +21,7 @@ Authors: Darin Adler <darin@bentspoon.com> */ -#ifndef NAUTILUS_PROPERTIES_WINDOW_H -#define NAUTILUS_PROPERTIES_WINDOW_H +#pragma once #include <gtk/gtk.h> #include "nautilus-file.h" @@ -61,6 +60,4 @@ GType nautilus_properties_window_get_type (void); void nautilus_properties_window_present (GList *files, GtkWidget *parent_widget, - const gchar *startup_id); - -#endif /* NAUTILUS_PROPERTIES_WINDOW_H */ + const gchar *startup_id);
\ No newline at end of file diff --git a/src/nautilus-query-editor.h b/src/nautilus-query-editor.h index 9d20dfc58..d5d298e8d 100644 --- a/src/nautilus-query-editor.h +++ b/src/nautilus-query-editor.h @@ -19,8 +19,7 @@ * */ -#ifndef NAUTILUS_QUERY_EDITOR_H -#define NAUTILUS_QUERY_EDITOR_H +#pragma once #include <gtk/gtk.h> @@ -82,6 +81,4 @@ void nautilus_query_editor_set_location (NautilusQueryEditor *editor, * @text: (not nullable) (transfer none): The search text. */ void nautilus_query_editor_set_text (NautilusQueryEditor *editor, - const gchar *text); - -#endif /* NAUTILUS_QUERY_EDITOR_H */ + const gchar *text);
\ No newline at end of file diff --git a/src/nautilus-query.h b/src/nautilus-query.h index 2264f505f..1fda5e394 100644 --- a/src/nautilus-query.h +++ b/src/nautilus-query.h @@ -19,8 +19,7 @@ * */ -#ifndef NAUTILUS_QUERY_H -#define NAUTILUS_QUERY_H +#pragma once #include <glib-object.h> #include <gio/gio.h> @@ -81,6 +80,4 @@ gdouble nautilus_query_matches_string (NautilusQuery *query, const gc char * nautilus_query_to_readable_string (NautilusQuery *query); -gboolean nautilus_query_is_empty (NautilusQuery *query); - -#endif /* NAUTILUS_QUERY_H */ +gboolean nautilus_query_is_empty (NautilusQuery *query);
\ No newline at end of file diff --git a/src/nautilus-recent.h b/src/nautilus-recent.h index 5c64f6c09..2567e83f9 100644 --- a/src/nautilus-recent.h +++ b/src/nautilus-recent.h @@ -1,13 +1,8 @@ - - -#ifndef __NAUTILUS_RECENT_H__ -#define __NAUTILUS_RECENT_H__ +#pragma once #include <gtk/gtk.h> #include "nautilus-file.h" #include <gio/gio.h> void nautilus_recent_add_file (NautilusFile *file, - GAppInfo *application); - -#endif + GAppInfo *application);
\ No newline at end of file diff --git a/src/nautilus-rename-file-popover-controller.h b/src/nautilus-rename-file-popover-controller.h index 2445ae341..3b55ffdb7 100644 --- a/src/nautilus-rename-file-popover-controller.h +++ b/src/nautilus-rename-file-popover-controller.h @@ -17,8 +17,7 @@ * */ -#ifndef NAUTILUS_RENAME_FILE_POPOVER_CONTROLLER_H -#define NAUTILUS_RENAME_FILE_POPOVER_CONTROLLER_H +#pragma once #include <glib.h> #include <gtk/gtk.h> @@ -33,6 +32,4 @@ NautilusRenameFilePopoverController * nautilus_rename_file_popover_controller_ne GdkRectangle *pointing_to, GtkWidget *relative_to); -NautilusFile * nautilus_rename_file_popover_controller_get_target_file (NautilusRenameFilePopoverController *controller); - -#endif /* NAUTILUS_RENAME_FILE_POPOVER_CONTROLLER_H */ +NautilusFile * nautilus_rename_file_popover_controller_get_target_file (NautilusRenameFilePopoverController *controller);
\ No newline at end of file diff --git a/src/nautilus-search-directory-file.h b/src/nautilus-search-directory-file.h index 5f47c3baf..8cd90d444 100644 --- a/src/nautilus-search-directory-file.h +++ b/src/nautilus-search-directory-file.h @@ -20,8 +20,7 @@ Author: Alexander Larsson <alexl@redhat.com> */ -#ifndef NAUTILUS_SEARCH_DIRECTORY_FILE_H -#define NAUTILUS_SEARCH_DIRECTORY_FILE_H +#pragma once #include "nautilus-file.h" @@ -49,6 +48,4 @@ typedef struct { } NautilusSearchDirectoryFileClass; GType nautilus_search_directory_file_get_type (void); -void nautilus_search_directory_file_update_display_name (NautilusSearchDirectoryFile *search_file); - -#endif /* NAUTILUS_SEARCH_DIRECTORY_FILE_H */ +void nautilus_search_directory_file_update_display_name (NautilusSearchDirectoryFile *search_file);
\ No newline at end of file diff --git a/src/nautilus-search-directory.h b/src/nautilus-search-directory.h index 761dbb7d3..9328a1202 100644 --- a/src/nautilus-search-directory.h +++ b/src/nautilus-search-directory.h @@ -19,8 +19,7 @@ License along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_SEARCH_DIRECTORY_H -#define NAUTILUS_SEARCH_DIRECTORY_H +#pragma once #include "nautilus-directory.h" #include "nautilus-query.h" @@ -40,6 +39,4 @@ void nautilus_search_directory_set_query (NautilusSearchDirector NautilusDirectory * nautilus_search_directory_get_base_model (NautilusSearchDirectory *self); void nautilus_search_directory_set_base_model (NautilusSearchDirectory *self, - NautilusDirectory *base_model); - -#endif /* NAUTILUS_SEARCH_DIRECTORY_H */ + NautilusDirectory *base_model);
\ No newline at end of file diff --git a/src/nautilus-search-engine-model.h b/src/nautilus-search-engine-model.h index 3c98edf21..4babc5432 100644 --- a/src/nautilus-search-engine-model.h +++ b/src/nautilus-search-engine-model.h @@ -19,8 +19,7 @@ * */ -#ifndef NAUTILUS_SEARCH_ENGINE_MODEL_H -#define NAUTILUS_SEARCH_ENGINE_MODEL_H +#pragma once #include "nautilus-directory.h" @@ -30,6 +29,4 @@ G_DECLARE_FINAL_TYPE (NautilusSearchEngineModel, nautilus_search_engine_model, N NautilusSearchEngineModel* nautilus_search_engine_model_new (void); void nautilus_search_engine_model_set_model (NautilusSearchEngineModel *model, NautilusDirectory *directory); -NautilusDirectory * nautilus_search_engine_model_get_model (NautilusSearchEngineModel *model); - -#endif /* NAUTILUS_SEARCH_ENGINE_MODEL_H */ +NautilusDirectory * nautilus_search_engine_model_get_model (NautilusSearchEngineModel *model);
\ No newline at end of file diff --git a/src/nautilus-search-engine-simple.h b/src/nautilus-search-engine-simple.h index dd6953f55..9a215713b 100644 --- a/src/nautilus-search-engine-simple.h +++ b/src/nautilus-search-engine-simple.h @@ -19,8 +19,7 @@ * */ -#ifndef NAUTILUS_SEARCH_ENGINE_SIMPLE_H -#define NAUTILUS_SEARCH_ENGINE_SIMPLE_H +#pragma once G_BEGIN_DECLS @@ -30,6 +29,4 @@ G_DECLARE_FINAL_TYPE (NautilusSearchEngineSimple, nautilus_search_engine_simple, NautilusSearchEngineSimple* nautilus_search_engine_simple_new (void); -G_END_DECLS - -#endif /* NAUTILUS_SEARCH_ENGINE_SIMPLE_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-search-engine-tracker.h b/src/nautilus-search-engine-tracker.h index 206bb0edb..efc3038f1 100644 --- a/src/nautilus-search-engine-tracker.h +++ b/src/nautilus-search-engine-tracker.h @@ -19,14 +19,11 @@ * */ -#ifndef NAUTILUS_SEARCH_ENGINE_TRACKER_H -#define NAUTILUS_SEARCH_ENGINE_TRACKER_H +#pragma once #include "nautilus-search-engine.h" #define NAUTILUS_TYPE_SEARCH_ENGINE_TRACKER (nautilus_search_engine_tracker_get_type ()) G_DECLARE_FINAL_TYPE (NautilusSearchEngineTracker, nautilus_search_engine_tracker, NAUTILUS, SEARCH_ENGINE_TRACKER, GObject) -NautilusSearchEngineTracker* nautilus_search_engine_tracker_new (void); - -#endif /* NAUTILUS_SEARCH_ENGINE_TRACKER_H */ +NautilusSearchEngineTracker* nautilus_search_engine_tracker_new (void);
\ No newline at end of file diff --git a/src/nautilus-search-engine.h b/src/nautilus-search-engine.h index 0416e8306..a0393618a 100644 --- a/src/nautilus-search-engine.h +++ b/src/nautilus-search-engine.h @@ -19,8 +19,7 @@ * */ -#ifndef NAUTILUS_SEARCH_ENGINE_H -#define NAUTILUS_SEARCH_ENGINE_H +#pragma once #include <glib-object.h> @@ -45,6 +44,4 @@ NautilusSearchEngineModel * NautilusSearchEngineSimple * nautilus_search_engine_get_simple_provider (NautilusSearchEngine *engine); -G_END_DECLS - -#endif /* NAUTILUS_SEARCH_ENGINE_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-search-hit.h b/src/nautilus-search-hit.h index 1aecf7798..33c7990f5 100644 --- a/src/nautilus-search-hit.h +++ b/src/nautilus-search-hit.h @@ -17,8 +17,7 @@ * */ -#ifndef NAUTILUS_SEARCH_HIT_H -#define NAUTILUS_SEARCH_HIT_H +#pragma once #include <glib-object.h> #include "nautilus-query.h" @@ -47,5 +46,3 @@ gdouble nautilus_search_hit_get_relevance (NautilusSearchHit const gchar * nautilus_search_hit_get_fts_snippet (NautilusSearchHit *hit); G_END_DECLS - -#endif /* NAUTILUS_SEARCH_HIT_H */ diff --git a/src/nautilus-search-popover.h b/src/nautilus-search-popover.h index 91845cd4c..2137592b5 100644 --- a/src/nautilus-search-popover.h +++ b/src/nautilus-search-popover.h @@ -16,8 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_SEARCH_POPOVER_H -#define NAUTILUS_SEARCH_POPOVER_H +#pragma once #include <glib.h> #include <gtk/gtk.h> @@ -50,6 +49,4 @@ gboolean nautilus_search_popover_get_fts_enabled (NautilusSearch void nautilus_search_popover_set_fts_sensitive (NautilusSearchPopover *popover, gboolean sensitive); -G_END_DECLS - -#endif /* NAUTILUS_SEARCH_POPOVER_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-search-provider.h b/src/nautilus-search-provider.h index d019c6690..c25d16161 100644 --- a/src/nautilus-search-provider.h +++ b/src/nautilus-search-provider.h @@ -15,8 +15,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_SEARCH_PROVIDER_H -#define NAUTILUS_SEARCH_PROVIDER_H +#pragma once #include <glib-object.h> #include "nautilus-query.h" @@ -92,6 +91,4 @@ void nautilus_search_provider_error (NautilusSearchProvider gboolean nautilus_search_provider_is_running (NautilusSearchProvider *provider); -G_END_DECLS - -#endif +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-selection-canvas-item.h b/src/nautilus-selection-canvas-item.h index c5c2778dd..6c13fe2a8 100644 --- a/src/nautilus-selection-canvas-item.h +++ b/src/nautilus-selection-canvas-item.h @@ -21,8 +21,7 @@ * Cosimo Cecchi <cosimoc@redhat.com> */ -#ifndef __NAUTILUS_SELECTION_CANVAS_ITEM_H__ -#define __NAUTILUS_SELECTION_CANVAS_ITEM_H__ +#pragma once #include <eel/eel-canvas.h> @@ -60,6 +59,4 @@ GType nautilus_selection_canvas_item_get_type (void); void nautilus_selection_canvas_item_fade_out (NautilusSelectionCanvasItem *self, guint transition_time); -G_END_DECLS - -#endif /* __NAUTILUS_SELECTION_CANVAS_ITEM_H__ */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-self-check-functions.h b/src/nautilus-self-check-functions.h index 9cb08fec2..ccbea3991 100644 --- a/src/nautilus-self-check-functions.h +++ b/src/nautilus-self-check-functions.h @@ -23,7 +23,8 @@ /* nautilus-self-check-functions.h: Wrapper and prototypes for all self * check functions in Nautilus proper. */ - + +#pragma once void nautilus_run_self_checks (void); diff --git a/src/nautilus-shell-search-provider.h b/src/nautilus-shell-search-provider.h index 821663132..8eaa675cb 100644 --- a/src/nautilus-shell-search-provider.h +++ b/src/nautilus-shell-search-provider.h @@ -21,8 +21,7 @@ * */ -#ifndef __NAUTILUS_SHELL_SEARCH_PROVIDER_H__ -#define __NAUTILUS_SHELL_SEARCH_PROVIDER_H__ +#pragma once #define NAUTILUS_TYPE_SHELL_SEARCH_PROVIDER nautilus_shell_search_provider_get_type() #define NAUTILUS_SHELL_SEARCH_PROVIDER(obj) \ @@ -37,6 +36,4 @@ NautilusShellSearchProvider * nautilus_shell_search_provider_new (void); gboolean nautilus_shell_search_provider_register (NautilusShellSearchProvider *self, GDBusConnection *connection, GError **error); -void nautilus_shell_search_provider_unregister (NautilusShellSearchProvider *self); - -#endif /* __NAUTILUS_SHELL_SEARCH_PROVIDER_H__ */ +void nautilus_shell_search_provider_unregister (NautilusShellSearchProvider *self);
\ No newline at end of file diff --git a/src/nautilus-signaller.h b/src/nautilus-signaller.h index fee17195a..df9aeea46 100644 --- a/src/nautilus-signaller.h +++ b/src/nautilus-signaller.h @@ -24,8 +24,7 @@ * correspond to any particular object. */ -#ifndef NAUTILUS_SIGNALLER_H -#define NAUTILUS_SIGNALLER_H +#pragma once #include <glib-object.h> @@ -39,6 +38,4 @@ */ /* Get the one and only NautilusSignaller to connect with or emit signals for */ -GObject *nautilus_signaller_get_current (void); - -#endif /* NAUTILUS_SIGNALLER_H */ +GObject *nautilus_signaller_get_current (void);
\ No newline at end of file diff --git a/src/nautilus-special-location-bar.h b/src/nautilus-special-location-bar.h index aa0303f4a..d5772c103 100644 --- a/src/nautilus-special-location-bar.h +++ b/src/nautilus-special-location-bar.h @@ -16,8 +16,7 @@ * */ -#ifndef __NAUTILUS_SPECIAL_LOCATION_BAR_H -#define __NAUTILUS_SPECIAL_LOCATION_BAR_H +#pragma once #include <gtk/gtk.h> #include <gio/gio.h> @@ -34,6 +33,4 @@ typedef enum { GtkWidget *nautilus_special_location_bar_new (NautilusSpecialLocation location); -G_END_DECLS - -#endif /* __NAUTILUS_SPECIAL_LOCATION_BAR_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-starred-directory.h b/src/nautilus-starred-directory.h index e426aa74f..0ced846c9 100644 --- a/src/nautilus-starred-directory.h +++ b/src/nautilus-starred-directory.h @@ -16,8 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_STARRED_DIRECTORY_H -#define NAUTILUS_STARRED_DIRECTORY_H +#pragma once #include "nautilus-directory.h" @@ -31,6 +30,4 @@ G_DECLARE_FINAL_TYPE (NautilusFavoriteDirectory, nautilus_starred_directory, NAU NautilusFavoriteDirectory* nautilus_starred_directory_new (void); -G_END_DECLS - -#endif +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-tag-manager.h b/src/nautilus-tag-manager.h index 5cc36a4d9..7c91bf987 100644 --- a/src/nautilus-tag-manager.h +++ b/src/nautilus-tag-manager.h @@ -16,8 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_TAG_MANAGER_H -#define NAUTILUS_TAG_MANAGER_H +#pragma once #include <glib.h> #include <glib-object.h> @@ -52,6 +51,4 @@ void nautilus_tag_manager_unstar_files (NautilusTagManager gboolean nautilus_tag_manager_file_is_starred (NautilusTagManager *self, const gchar *file_name); -G_END_DECLS - -#endif
\ No newline at end of file +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-thumbnails.h b/src/nautilus-thumbnails.h index 7bd381cda..6babe6848 100644 --- a/src/nautilus-thumbnails.h +++ b/src/nautilus-thumbnails.h @@ -19,8 +19,7 @@ Author: Andy Hertzfeld <andy@eazel.com> */ -#ifndef NAUTILUS_THUMBNAILS_H -#define NAUTILUS_THUMBNAILS_H +#pragma once #include <gdk-pixbuf/gdk-pixbuf.h> #include "nautilus-file.h" @@ -33,7 +32,4 @@ gboolean nautilus_thumbnail_is_mimetype_limited_by_size /* Queue handling: */ void nautilus_thumbnail_remove_from_queue (const char *file_uri); -void nautilus_thumbnail_prioritize (const char *file_uri); - - -#endif /* NAUTILUS_THUMBNAILS_H */ +void nautilus_thumbnail_prioritize (const char *file_uri);
\ No newline at end of file diff --git a/src/nautilus-toolbar-menu-sections.h b/src/nautilus-toolbar-menu-sections.h index 26b405139..c7864eac8 100644 --- a/src/nautilus-toolbar-menu-sections.h +++ b/src/nautilus-toolbar-menu-sections.h @@ -14,8 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_TOOLBAR_MENU_SECTIONS_H -#define NAUTILUS_TOOLBAR_MENU_SECTIONS_H + +#pragma once #include <glib.h> @@ -29,6 +29,4 @@ struct _NautilusToolbarMenuSections { gboolean supports_undo_redo; }; -G_END_DECLS - -#endif /* NAUTILUS_TOOLBAR_MENU_SECTIONS_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-toolbar.h b/src/nautilus-toolbar.h index 2ae1b7454..36ce4f080 100644 --- a/src/nautilus-toolbar.h +++ b/src/nautilus-toolbar.h @@ -21,8 +21,7 @@ * */ -#ifndef __NAUTILUS_TOOLBAR_H__ -#define __NAUTILUS_TOOLBAR_H__ +#pragma once #include <gtk/gtk.h> @@ -51,6 +50,4 @@ gboolean nautilus_toolbar_is_operations_button_active (NautilusToolbar *toolba void nautilus_toolbar_on_window_constructed (NautilusToolbar *toolbar); -G_END_DECLS - -#endif /* __NAUTILUS_TOOLBAR_H__ */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-trash-bar.h b/src/nautilus-trash-bar.h index 3da0a7136..f838cbdaf 100644 --- a/src/nautilus-trash-bar.h +++ b/src/nautilus-trash-bar.h @@ -18,8 +18,7 @@ * */ -#ifndef __NAUTILUS_TRASH_BAR_H -#define __NAUTILUS_TRASH_BAR_H +#pragma once #include "nautilus-files-view.h" @@ -33,6 +32,4 @@ G_DECLARE_FINAL_TYPE (NautilusTrashBar, nautilus_trash_bar, NAUTILUS, TRASH_BAR, GtkWidget *nautilus_trash_bar_new (NautilusFilesView *view); -G_END_DECLS - -#endif /* __GS_TRASH_BAR_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-trash-monitor.h b/src/nautilus-trash-monitor.h index a5282819a..e8f844e7f 100644 --- a/src/nautilus-trash-monitor.h +++ b/src/nautilus-trash-monitor.h @@ -20,8 +20,7 @@ Author: Pavel Cisler <pavel@eazel.com> */ -#ifndef NAUTILUS_TRASH_MONITOR_H -#define NAUTILUS_TRASH_MONITOR_H +#pragma once #include <gtk/gtk.h> #include <gio/gio.h> @@ -58,6 +57,4 @@ GType nautilus_trash_monitor_get_type (void); NautilusTrashMonitor *nautilus_trash_monitor_get (void); gboolean nautilus_trash_monitor_is_empty (void); -GIcon *nautilus_trash_monitor_get_icon (void); - -#endif +GIcon *nautilus_trash_monitor_get_icon (void);
\ No newline at end of file diff --git a/src/nautilus-tree-view-drag-dest.h b/src/nautilus-tree-view-drag-dest.h index 92d2f70cc..b2134c681 100644 --- a/src/nautilus-tree-view-drag-dest.h +++ b/src/nautilus-tree-view-drag-dest.h @@ -24,8 +24,7 @@ * contain a hierarchy of files */ -#ifndef NAUTILUS_TREE_VIEW_DRAG_DEST_H -#define NAUTILUS_TREE_VIEW_DRAG_DEST_H +#pragma once #include <gtk/gtk.h> @@ -94,6 +93,4 @@ struct _NautilusTreeViewDragDestClass { GType nautilus_tree_view_drag_dest_get_type (void); NautilusTreeViewDragDest *nautilus_tree_view_drag_dest_new (GtkTreeView *tree_view); -G_END_DECLS - -#endif +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-ui-utilities.h b/src/nautilus-ui-utilities.h index dd8471c51..a35aaec6e 100644 --- a/src/nautilus-ui-utilities.h +++ b/src/nautilus-ui-utilities.h @@ -19,8 +19,8 @@ Authors: Alexander Larsson <alexl@redhat.com> */ -#ifndef NAUTILUS_UI_UTILITIES_H -#define NAUTILUS_UI_UTILITIES_H + +#pragma once #include <gtk/gtk.h> @@ -48,6 +48,4 @@ gchar* get_text_for_date_range (GPtrArray *date_rang GtkDialog * show_error_dialog (const gchar *primary_text, const gchar *secondary_text, - GtkWindow *parent); - -#endif /* NAUTILUS_UI_UTILITIES_H */ + GtkWindow *parent);
\ No newline at end of file diff --git a/src/nautilus-undo-private.h b/src/nautilus-undo-private.h index 84f03eee6..2a9be283c 100644 --- a/src/nautilus-undo-private.h +++ b/src/nautilus-undo-private.h @@ -19,8 +19,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_UNDO_PRIVATE_H -#define NAUTILUS_UNDO_PRIVATE_H +#pragma once #include "nautilus-undo.h" #include "nautilus-undo-manager.h" @@ -28,6 +27,4 @@ NautilusUndoManager * nautilus_undo_get_undo_manager (GObject *attached_object); void nautilus_undo_attach_undo_manager (GObject *object, - NautilusUndoManager *manager); - -#endif /* NAUTILUS_UNDO_PRIVATE_H */ + NautilusUndoManager *manager);
\ No newline at end of file diff --git a/src/nautilus-vfs-directory.h b/src/nautilus-vfs-directory.h index 621e4161c..4bdd6ff03 100644 --- a/src/nautilus-vfs-directory.h +++ b/src/nautilus-vfs-directory.h @@ -20,8 +20,7 @@ Author: Darin Adler <darin@bentspoon.com> */ -#ifndef NAUTILUS_VFS_DIRECTORY_H -#define NAUTILUS_VFS_DIRECTORY_H +#pragma once #include "nautilus-directory.h" @@ -47,6 +46,4 @@ typedef struct { NautilusDirectoryClass parent_slot; } NautilusVFSDirectoryClass; -GType nautilus_vfs_directory_get_type (void); - -#endif /* NAUTILUS_VFS_DIRECTORY_H */ +GType nautilus_vfs_directory_get_type (void);
\ No newline at end of file diff --git a/src/nautilus-vfs-file.h b/src/nautilus-vfs-file.h index a6786d93e..cbb21abaa 100644 --- a/src/nautilus-vfs-file.h +++ b/src/nautilus-vfs-file.h @@ -20,8 +20,7 @@ Author: Darin Adler <darin@bentspoon.com> */ -#ifndef NAUTILUS_VFS_FILE_H -#define NAUTILUS_VFS_FILE_H +#pragma once #include "nautilus-file.h" @@ -47,6 +46,4 @@ typedef struct { NautilusFileClass parent_slot; } NautilusVFSFileClass; -GType nautilus_vfs_file_get_type (void); - -#endif /* NAUTILUS_VFS_FILE_H */ +GType nautilus_vfs_file_get_type (void);
\ No newline at end of file diff --git a/src/nautilus-view-icon-controller.h b/src/nautilus-view-icon-controller.h index 814d6d635..e52162416 100644 --- a/src/nautilus-view-icon-controller.h +++ b/src/nautilus-view-icon-controller.h @@ -1,5 +1,4 @@ -#ifndef NAUTILUS_VIEW_ICON_CONTROLLER_H -#define NAUTILUS_VIEW_ICON_CONTROLLER_H +#pragma once #include <glib.h> #include <gtk/gtk.h> @@ -18,7 +17,4 @@ NautilusViewIconController *nautilus_view_icon_controller_new (NautilusWindowSlo NautilusViewModel * nautilus_view_icon_controller_get_model (NautilusViewIconController *self); -G_END_DECLS - -#endif /* NAUTILUS_VIEW_ICON_CONTROLLER_H */ - +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-view-icon-item-ui.h b/src/nautilus-view-icon-item-ui.h index a28eca137..55b09b1f1 100644 --- a/src/nautilus-view-icon-item-ui.h +++ b/src/nautilus-view-icon-item-ui.h @@ -1,5 +1,4 @@ -#ifndef NAUTILUS_VIEW_ICON_ITEM_UI_H -#define NAUTILUS_VIEW_ICON_ITEM_UI_H +#pragma once #include <glib.h> #include <gtk/gtk.h> @@ -17,6 +16,3 @@ NautilusViewIconItemUi * nautilus_view_icon_item_ui_new (NautilusViewItemModel * NautilusViewItemModel * nautilus_view_icon_item_ui_get_model (NautilusViewIconItemUi *self); G_END_DECLS - -#endif /* NAUTILUS_VIEW_ICON_ITEM_UI_H */ - diff --git a/src/nautilus-view-icon-ui.h b/src/nautilus-view-icon-ui.h index e8832759a..4e1871d23 100644 --- a/src/nautilus-view-icon-ui.h +++ b/src/nautilus-view-icon-ui.h @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAUTILUS_VIEW_ICON_UI_H -#define NAUTILUS_VIEW_ICON_UI_H + +#pragma once #include <glib.h> #include <gtk/gtk.h> @@ -35,7 +35,4 @@ NautilusViewIconUi * nautilus_view_icon_ui_new (NautilusViewIconController *cont void nautilus_view_icon_ui_set_selection (NautilusViewIconUi *self, GQueue *selection); -G_END_DECLS - -#endif /* NAUTILUS_VIEW_ICON_UI_H */ - +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-view-item-model.h b/src/nautilus-view-item-model.h index 16870de7a..75299010b 100644 --- a/src/nautilus-view-item-model.h +++ b/src/nautilus-view-item-model.h @@ -1,5 +1,4 @@ -#ifndef NAUTILUS_VIEW_ITEM_MODEL_H -#define NAUTILUS_VIEW_ITEM_MODEL_H +#pragma once #include <glib.h> #include <gtk/gtk.h> @@ -30,7 +29,4 @@ void nautilus_view_item_model_set_item_ui (NautilusViewItemModel *self, GtkWidget * nautilus_view_item_model_get_item_ui (NautilusViewItemModel *self); -G_END_DECLS - -#endif /* NAUTILUS_VIEW_ITEM_MODEL_H */ - +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-view-model.h b/src/nautilus-view-model.h index 5e64d842e..9bc8a8d7a 100644 --- a/src/nautilus-view-model.h +++ b/src/nautilus-view-model.h @@ -1,5 +1,4 @@ -#ifndef NAUTILUS_VIEW_MODEL_H -#define NAUTILUS_VIEW_MODEL_H +#pragma once #include <glib.h> #include "nautilus-file.h" @@ -39,7 +38,4 @@ void nautilus_view_model_add_items (NautilusViewModel *self, GQueue *items); void nautilus_view_model_set_items (NautilusViewModel *self, GQueue *items); -G_END_DECLS - -#endif /* NAUTILUS_VIEW_MODEL_H */ - +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-view.h b/src/nautilus-view.h index dcd39e0ad..56452ef89 100644 --- a/src/nautilus-view.h +++ b/src/nautilus-view.h @@ -16,9 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -#ifndef NAUTILUS_VIEW_H -#define NAUTILUS_VIEW_H +#pragma once #include <glib.h> #include <gtk/gtk.h> @@ -99,6 +97,4 @@ gboolean nautilus_view_is_loading (Nautilus gboolean nautilus_view_is_searching (NautilusView *view); -G_END_DECLS - -#endif /* NAUTILUS_VIEW_H */ +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-window-slot-dnd.h b/src/nautilus-window-slot-dnd.h index f9de9b0c8..2b7b05f37 100644 --- a/src/nautilus-window-slot-dnd.h +++ b/src/nautilus-window-slot-dnd.h @@ -23,8 +23,7 @@ * Ettore Perazzoli <ettore@gnu.org> */ -#ifndef __NAUTILUS_WINDOW_SLOT_DND_H__ -#define __NAUTILUS_WINDOW_SLOT_DND_H__ +#pragma once #include <gio/gio.h> #include <gtk/gtk.h> @@ -35,6 +34,4 @@ void nautilus_drag_slot_proxy_init (GtkWidget *widget, NautilusFile *target_file, - NautilusWindowSlot *target_slot); - -#endif /* __NAUTILUS_WINDOW_SLOT_DND_H__ */ + NautilusWindowSlot *target_slot);
\ No newline at end of file diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h index 573357d9b..f62454e48 100644 --- a/src/nautilus-window-slot.h +++ b/src/nautilus-window-slot.h @@ -19,8 +19,7 @@ Author: Christian Neumair <cneumair@gnome.org> */ -#ifndef NAUTILUS_WINDOW_SLOT_H -#define NAUTILUS_WINDOW_SLOT_H +#pragma once #include <gdk/gdk.h> #include <gio/gio.h> @@ -123,6 +122,4 @@ void nautilus_window_slot_restore_from_data (NautilusWindowSlot *self, RestoreTabData* nautilus_window_slot_get_restore_tab_data (NautilusWindowSlot *self); /* Only used by slot-dnd */ -NautilusView* nautilus_window_slot_get_current_view (NautilusWindowSlot *slot); - -#endif /* NAUTILUS_WINDOW_SLOT_H */ +NautilusView* nautilus_window_slot_get_current_view (NautilusWindowSlot *slot);
\ No newline at end of file diff --git a/src/nautilus-window.h b/src/nautilus-window.h index 39b16e7d9..2a218278a 100644 --- a/src/nautilus-window.h +++ b/src/nautilus-window.h @@ -24,8 +24,7 @@ */ /* nautilus-window.h: Interface of the main window object */ -#ifndef NAUTILUS_WINDOW_H -#define NAUTILUS_WINDOW_H +#pragma once #include <gtk/gtk.h> #include <eel/eel-glib-extensions.h> @@ -141,6 +140,4 @@ void nautilus_window_initialize_slot (NautilusWindow *window, NautilusWindowSlot *slot, NautilusWindowOpenFlags flags); -G_END_DECLS - -#endif +G_END_DECLS
\ No newline at end of file diff --git a/src/nautilus-x-content-bar.h b/src/nautilus-x-content-bar.h index dd3795048..78872c884 100644 --- a/src/nautilus-x-content-bar.h +++ b/src/nautilus-x-content-bar.h @@ -20,8 +20,7 @@ * */ -#ifndef __NAUTILUS_X_CONTENT_BAR_H -#define __NAUTILUS_X_CONTENT_BAR_H +#pragma once #include <gtk/gtk.h> #include <gio/gio.h> @@ -35,6 +34,4 @@ G_DECLARE_FINAL_TYPE (NautilusXContentBar, nautilus_x_content_bar, NAUTILUS, X_C GtkWidget *nautilus_x_content_bar_new (GMount *mount, const char * const *x_content_types); -G_END_DECLS - -#endif /* __NAUTILUS_X_CONTENT_BAR_H */ +G_END_DECLS
\ No newline at end of file diff --git a/test/interactive/test.h b/test/interactive/test.h index 8d9b8a293..fc20a7727 100644 --- a/test/interactive/test.h +++ b/test/interactive/test.h @@ -1,5 +1,4 @@ -#ifndef TEST_H -#define TEST_H +#pragma once #include <config.h> #include <gtk/gtk.h> @@ -33,6 +32,4 @@ void test_pixbuf_draw_rectangle_tiled (GdkPixbuf *pi int y1, int opacity); void test_window_set_title_with_pid (GtkWindow *window, - const char *title); - -#endif /* TEST_H */ + const char *title);
\ No newline at end of file |