Use #pragma once in headers

7 files changed, 7 insertions, 50 deletions

diff --git a/src/gcm-cell-renderer-color.h b/src/gcm-cell-renderer-color.h
index ce02dc8..59dc60c 100644
--- a/src/gcm-cell-renderer-color.h
+++ b/src/gcm-cell-renderer-color.h
@@ -19,8 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef GCM_CELL_RENDERER_COLOR_H
-#define GCM_CELL_RENDERER_COLOR_H
+#pragma once
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -33,8 +32,6 @@
 #define GCM_IS_CELL_RENDERER_COLOR_CLASS(cls)	(G_TYPE_CHECK_CLASS_TYPE((cls), GCM_TYPE_CELL_RENDERER_COLOR))
 #define GCM_CELL_RENDERER_COLOR_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GCM_TYPE_CELL_RENDERER_COLOR, GcmCellRendererColorClass))
 
-G_BEGIN_DECLS
-
 typedef struct _GcmCellRendererColor		GcmCellRendererColor;
 typedef struct _GcmCellRendererColorClass	GcmCellRendererColorClass;
 
@@ -53,8 +50,3 @@ struct _GcmCellRendererColorClass
 
 GType		 gcm_cell_renderer_color_get_type	(void);
 GtkCellRenderer	*gcm_cell_renderer_color_new		(void);
-
-G_END_DECLS
-
-#endif /* GCM_CELL_RENDERER_COLOR_H */
-
diff --git a/src/gcm-cell-renderer-profile-text.h b/src/gcm-cell-renderer-profile-text.h
index 2cd228a..5e04232 100644
--- a/src/gcm-cell-renderer-profile-text.h
+++ b/src/gcm-cell-renderer-profile-text.h
@@ -19,8 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef GCM_CELL_RENDERER_PROFILE_TEXT_H
-#define GCM_CELL_RENDERER_PROFILE_TEXT_H
+#pragma once
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -33,8 +32,6 @@
 #define GCM_IS_CELL_RENDERER_PROFILE_TEXT_CLASS(cls)	(G_TYPE_CHECK_CLASS_TYPE((cls), GCM_TYPE_CELL_RENDERER_PROFILE_TEXT))
 #define GCM_CELL_RENDERER_PROFILE_TEXT_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GCM_TYPE_CELL_RENDERER_PROFILE_TEXT, GcmCellRendererProfileTextClass))
 
-G_BEGIN_DECLS
-
 typedef struct _GcmCellRendererProfileText		GcmCellRendererProfileText;
 typedef struct _GcmCellRendererProfileTextClass		GcmCellRendererProfileTextClass;
 
@@ -53,8 +50,3 @@ struct _GcmCellRendererProfileTextClass
 
 GType		 gcm_cell_renderer_profile_text_get_type	(void);
 GtkCellRenderer	*gcm_cell_renderer_profile_text_new		(void);
-
-G_END_DECLS
-
-#endif /* GCM_CELL_RENDERER_PROFILE_TEXT_H */
-
diff --git a/src/gcm-cie-widget.h b/src/gcm-cie-widget.h
index 054872d..68c990d 100644
--- a/src/gcm-cie-widget.h
+++ b/src/gcm-cie-widget.h
@@ -19,14 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __GCM_CIE_WIDGET_H__
-#define __GCM_CIE_WIDGET_H__
+#pragma once
 
 #include <gtk/gtk.h>
 #include <colord.h>
 
-G_BEGIN_DECLS
-
 #define GCM_TYPE_CIE_WIDGET		(gcm_cie_widget_get_type ())
 #define GCM_CIE_WIDGET(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GCM_TYPE_CIE_WIDGET, GcmCieWidget))
 #define GCM_CIE_WIDGET_CLASS(obj)	(G_TYPE_CHECK_CLASS_CAST ((obj), GCM_CIE_WIDGET, GcmCieWidgetClass))
@@ -53,7 +50,3 @@ GType		 gcm_cie_widget_get_type		(void);
 GtkWidget	*gcm_cie_widget_new			(void);
 void		 gcm_cie_widget_set_from_profile	(GtkWidget	*widget,
 							 CdIcc		*profile);
-
-G_END_DECLS
-
-#endif
diff --git a/src/gcm-debug.h b/src/gcm-debug.h
index 7ecae69..9fe9859 100644
--- a/src/gcm-debug.h
+++ b/src/gcm-debug.h
@@ -19,13 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __GCM_DEBUG_H__
-#define __GCM_DEBUG_H__
+#pragma once
 
 #include <glib.h>
 
 gboolean	 gcm_debug_is_verbose		(void);
 GOptionGroup	*gcm_debug_get_option_group	(void);
 void		 gcm_debug_setup		(gboolean	 enabled);
-
-#endif /* __GCM_DEBUG_H__ */
diff --git a/src/gcm-gamma-widget.h b/src/gcm-gamma-widget.h
index 080e506..08d3568 100644
--- a/src/gcm-gamma-widget.h
+++ b/src/gcm-gamma-widget.h
@@ -19,13 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __GCM_GAMMA_WIDGET_H__
-#define __GCM_GAMMA_WIDGET_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS
-
 #define GCM_TYPE_GAMMA_WIDGET		(gcm_gamma_widget_get_type ())
 #define GCM_GAMMA_WIDGET(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GCM_TYPE_GAMMA_WIDGET, GcmGammaWidget))
 #define GCM_GAMMA_WIDGET_CLASS(obj)	(G_TYPE_CHECK_CLASS_CAST ((obj), GCM_GAMMA_WIDGET, GcmGammaWidgetClass))
@@ -50,7 +47,3 @@ struct GcmGammaWidgetClass
 
 GType		 gcm_gamma_widget_get_type		(void);
 GtkWidget	*gcm_gamma_widget_new			(void);
-
-G_END_DECLS
-
-#endif
diff --git a/src/gcm-trc-widget.h b/src/gcm-trc-widget.h
index 9d2b400..2c66317 100644
--- a/src/gcm-trc-widget.h
+++ b/src/gcm-trc-widget.h
@@ -19,13 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __GCM_TRC_WIDGET_H__
-#define __GCM_TRC_WIDGET_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS
-
 #define GCM_TYPE_TRC_WIDGET		(gcm_trc_widget_get_type ())
 #define GCM_TRC_WIDGET(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GCM_TYPE_TRC_WIDGET, GcmTrcWidget))
 #define GCM_TRC_WIDGET_CLASS(obj)	(G_TYPE_CHECK_CLASS_CAST ((obj), GCM_TRC_WIDGET, GcmTrcWidgetClass))
@@ -50,7 +47,3 @@ struct GcmTrcWidgetClass
 
 GType		 gcm_trc_widget_get_type		(void);
 GtkWidget	*gcm_trc_widget_new			(void);
-
-G_END_DECLS
-
-#endif
diff --git a/src/gcm-utils.h b/src/gcm-utils.h
index 393f447..0d1135e 100644
--- a/src/gcm-utils.h
+++ b/src/gcm-utils.h
@@ -19,8 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __GCM_UTILS_H
-#define __GCM_UTILS_H
+#pragma once
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -44,5 +43,3 @@ gboolean	 gcm_utils_image_convert		(GtkImage		*image,
 							 CdIcc			*output,
 							 GError			**error);
 
-#endif /* __GCM_UTILS_H */
-