[gnome-control-center] color: Replace ifdefs with #pragma once



commit 04e36953ff8c3b16ff455f82b96faa2404e0f860
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed May 30 15:09:55 2018 +1200

    color: Replace ifdefs with #pragma once

 panels/color/cc-color-calibrate.h          | 6 +-----
 panels/color/cc-color-cell-renderer-text.h | 5 +----
 panels/color/cc-color-common.h             | 5 +----
 panels/color/cc-color-device.h             | 6 +-----
 panels/color/cc-color-panel.h              | 6 +-----
 panels/color/cc-color-profile.h            | 5 +----
 6 files changed, 6 insertions(+), 27 deletions(-)
---
diff --git a/panels/color/cc-color-calibrate.h b/panels/color/cc-color-calibrate.h
index 4fb6d3749..15ea06d2a 100644
--- a/panels/color/cc-color-calibrate.h
+++ b/panels/color/cc-color-calibrate.h
@@ -19,8 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __CC_COLOR_CALIBRATE_H
-#define __CC_COLOR_CALIBRATE_H
+#pragma once
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -53,6 +52,3 @@ gboolean  cc_color_calibrate_setup          (CcColorCalibrate *calibrate,
 CdProfile *cc_color_calibrate_get_profile   (CcColorCalibrate *calibrate);
 
 G_END_DECLS
-
-#endif /* __CC_COLOR_CALIBRATE_H */
-
diff --git a/panels/color/cc-color-cell-renderer-text.h b/panels/color/cc-color-cell-renderer-text.h
index f30936173..241663acf 100644
--- a/panels/color/cc-color-cell-renderer-text.h
+++ b/panels/color/cc-color-cell-renderer-text.h
@@ -19,8 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef CC_COLOR_CELL_RENDERER_TEXT_H
-#define CC_COLOR_CELL_RENDERER_TEXT_H
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -31,5 +30,3 @@ GtkCellRenderer *cc_color_cell_renderer_text_new (void);
 
 G_END_DECLS
 
-#endif /* CC_COLOR_CELL_RENDERER_TEXT_H */
-
diff --git a/panels/color/cc-color-common.h b/panels/color/cc-color-common.h
index fc611ac74..c90193e08 100644
--- a/panels/color/cc-color-common.h
+++ b/panels/color/cc-color-common.h
@@ -19,8 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef CC_COLOR_COMMON_H
-#define CC_COLOR_COMMON_H
+#pragma once
 
 #include <colord.h>
 
@@ -31,5 +30,3 @@ gchar   *cc_color_device_get_title         (CdDevice *device);
 
 G_END_DECLS
 
-#endif /* CC_COLOR_COMMON_H */
-
diff --git a/panels/color/cc-color-device.h b/panels/color/cc-color-device.h
index 736dcbd33..41e0d635e 100644
--- a/panels/color/cc-color-device.h
+++ b/panels/color/cc-color-device.h
@@ -19,8 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef CC_COLOR_DEVICE_H
-#define CC_COLOR_DEVICE_H
+#pragma once
 
 #include <gtk/gtk.h>
 #include <colord.h>
@@ -37,6 +36,3 @@ void         cc_color_device_set_expanded  (CcColorDevice  *color_device,
                                             gboolean        expanded);
 
 G_END_DECLS
-
-#endif /* CC_COLOR_DEVICE_H */
-
diff --git a/panels/color/cc-color-panel.h b/panels/color/cc-color-panel.h
index cd5f7a6cd..27861d170 100644
--- a/panels/color/cc-color-panel.h
+++ b/panels/color/cc-color-panel.h
@@ -18,9 +18,7 @@
  *
  */
 
-
-#ifndef _CC_COLOR_PANEL_H
-#define _CC_COLOR_PANEL_H
+#pragma once
 
 #include <shell/cc-panel.h>
 
@@ -30,5 +28,3 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (CcColorPanel, cc_color_panel, CC, COLOR_PANEL, CcPanel)
 
 G_END_DECLS
-
-#endif /* _CC_COLOR_PANEL_H */
diff --git a/panels/color/cc-color-profile.h b/panels/color/cc-color-profile.h
index 48065117b..c749addfd 100644
--- a/panels/color/cc-color-profile.h
+++ b/panels/color/cc-color-profile.h
@@ -19,8 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef CC_COLOR_PROFILE_H
-#define CC_COLOR_PROFILE_H
+#pragma once
 
 #include <gtk/gtk.h>
 #include <colord.h>
@@ -42,5 +41,3 @@ const gchar *cc_color_profile_get_sortable     (CcColorProfile  *color_profile);
 
 G_END_DECLS
 
-#endif /* CC_COLOR_PROFILE_H */
-


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]