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



commit 72a3516389a0809956a324097610ed88c528db29
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue May 29 14:53:49 2018 +1200

    display: Replace ifdefs with #pragma once

 panels/display/cc-display-config-dbus.h         | 5 +----
 panels/display/cc-display-config-manager-dbus.h | 5 +----
 panels/display/cc-display-config-manager.h      | 5 +----
 panels/display/cc-display-config.h              | 5 +----
 panels/display/cc-display-panel.h               | 6 +-----
 panels/display/cc-night-light-widget.h          | 5 +----
 6 files changed, 6 insertions(+), 25 deletions(-)
---
diff --git a/panels/display/cc-display-config-dbus.h b/panels/display/cc-display-config-dbus.h
index 9809652b4..8609087c7 100644
--- a/panels/display/cc-display-config-dbus.h
+++ b/panels/display/cc-display-config-dbus.h
@@ -17,8 +17,7 @@
  *
  */
 
-#ifndef _CC_DISPLAY_CONFIG_DBUS_H
-#define _CC_DISPLAY_CONFIG_DBUS_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -39,5 +38,3 @@ G_DECLARE_FINAL_TYPE (CcDisplayConfigDBus, cc_display_config_dbus,
                       CC, DISPLAY_CONFIG_DBUS, CcDisplayConfig)
 
 G_END_DECLS
-
-#endif /* _CC_DISPLAY_CONFIG_DBUS_H */
diff --git a/panels/display/cc-display-config-manager-dbus.h b/panels/display/cc-display-config-manager-dbus.h
index a9b85e6be..a09959813 100644
--- a/panels/display/cc-display-config-manager-dbus.h
+++ b/panels/display/cc-display-config-manager-dbus.h
@@ -17,8 +17,7 @@
  *
  */
 
-#ifndef _CC_DISPLAY_CONFIG_MANAGER_DBUS_H
-#define _CC_DISPLAY_CONFIG_MANAGER_DBUS_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -33,5 +32,3 @@ G_DECLARE_FINAL_TYPE (CcDisplayConfigManagerDBus, cc_display_config_manager_dbus
 CcDisplayConfigManager * cc_display_config_manager_dbus_new (void);
 
 G_END_DECLS
-
-#endif /* _CC_DISPLAY_CONFIG_MANAGER_DBUS_H */
diff --git a/panels/display/cc-display-config-manager.h b/panels/display/cc-display-config-manager.h
index 134cea0a1..1e1b36373 100644
--- a/panels/display/cc-display-config-manager.h
+++ b/panels/display/cc-display-config-manager.h
@@ -17,8 +17,7 @@
  *
  */
 
-#ifndef _CC_DISPLAY_CONFIG_MANAGER_H
-#define _CC_DISPLAY_CONFIG_MANAGER_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -42,5 +41,3 @@ CcDisplayConfig * cc_display_config_manager_get_current (CcDisplayConfigManager
 void _cc_display_config_manager_emit_changed (CcDisplayConfigManager *self);
 
 G_END_DECLS
-
-#endif /* _CC_DISPLAY_CONFIG_MANAGER_H */
diff --git a/panels/display/cc-display-config.h b/panels/display/cc-display-config.h
index 15bfbf35b..e74422705 100644
--- a/panels/display/cc-display-config.h
+++ b/panels/display/cc-display-config.h
@@ -17,8 +17,7 @@
  *
  */
 
-#ifndef _CC_DISPLAY_CONFIG_H
-#define _CC_DISPLAY_CONFIG_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -232,5 +231,3 @@ int               cc_display_mode_get_freq                  (CcDisplayMode     *
 double            cc_display_mode_get_freq_f                (CcDisplayMode     *mode);
 
 G_END_DECLS
-
-#endif /* _CC_DISPLAY_CONFIG_H */
diff --git a/panels/display/cc-display-panel.h b/panels/display/cc-display-panel.h
index a6b932b03..a7ade28dc 100644
--- a/panels/display/cc-display-panel.h
+++ b/panels/display/cc-display-panel.h
@@ -18,9 +18,7 @@
  *
  */
 
-
-#ifndef _CC_DISPLAY_PANEL_H
-#define _CC_DISPLAY_PANEL_H
+#pragma once
 
 #include <shell/cc-panel.h>
 
@@ -30,5 +28,3 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (CcDisplayPanel, cc_display_panel, CC, DISPLAY_PANEL, CcPanel)
 
 G_END_DECLS
-
-#endif /* _CC_DISPLAY_PANEL_H */
diff --git a/panels/display/cc-night-light-widget.h b/panels/display/cc-night-light-widget.h
index 979c20aab..dda6d648e 100644
--- a/panels/display/cc-night-light-widget.h
+++ b/panels/display/cc-night-light-widget.h
@@ -18,8 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __CC_NIGHT_LIGHT_WIDGET_H__
-#define __CC_NIGHT_LIGHT_WIDGET_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -45,5 +44,3 @@ void         cc_night_light_widget_set_mode   (CcNightLightWidget *self,
                                                CcNightLightWidgetMode mode);
 
 G_END_DECLS
-
-#endif


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