general: Remove include guards in favor of pragma once

The traditional include guards are not as easy to handle
and require extra thought into the names.

Pragma once is an easier, more contributor friendly approach.

Closes https://gitlab.gnome.org/GNOME/nautilus/issues/294

general: Remove include guards in favor of pragma once

The traditional include guards are not as easy to handle
and require extra thought into the names.

Pragma once is an easier, more contributor friendly approach.

Closes https://gitlab.gnome.org/GNOME/nautilus/issues/294

13 files changed, 28 insertions, 64 deletions

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..43d90df5a 100644
--- a/libnautilus-extension/nautilus-extension.h
+++ b/libnautilus-extension/nautilus-extension.h
@@ -16,6 +16,8 @@
  * License along with libnautilus-extension.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #ifndef NAUTILUS_EXTENSION_H
 #define NAUTILUS_EXTENSION_H
 
@@ -38,6 +40,4 @@
 void nautilus_module_initialize (GTypeModule  *module);
 void nautilus_module_shutdown   (void);
 void nautilus_module_list_types (const GType **types,
-                                 int          *num_types);
-
-#endif
+                                 int          *num_types);
\ 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