[gnome-control-center] sharing: Replace ifdefs with #pragma once
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] sharing: Replace ifdefs with #pragma once
- Date: Fri, 1 Jun 2018 21:34:01 +0000 (UTC)
commit a91ef6c7d70d1efa308401b871f9ad7043aaa04f
Author: Robert Ancell <robert ancell canonical com>
Date: Fri Jun 1 09:31:56 2018 +1200
sharing: Replace ifdefs with #pragma once
panels/sharing/cc-media-sharing.h | 5 +----
panels/sharing/cc-remote-login.h | 5 +----
panels/sharing/cc-sharing-networks.h | 5 +----
panels/sharing/cc-sharing-panel.h | 5 +----
panels/sharing/cc-sharing-switch.h | 5 +----
panels/sharing/file-share-properties.h | 5 +----
panels/sharing/gsd-sharing-enums.h | 5 +----
panels/sharing/vino-preferences.h | 5 +----
8 files changed, 8 insertions(+), 32 deletions(-)
---
diff --git a/panels/sharing/cc-media-sharing.h b/panels/sharing/cc-media-sharing.h
index 1c91b6f5d..7923db0fd 100644
--- a/panels/sharing/cc-media-sharing.h
+++ b/panels/sharing/cc-media-sharing.h
@@ -19,12 +19,9 @@
*
*/
-#ifndef __CC_MEDIA_SHARING_H__
-#define __CC_MEDIA_SHARING_H__
+#pragma once
#include <glib.h>
void cc_media_sharing_get_preferences (gchar ***folders);
void cc_media_sharing_set_preferences (gchar **folders);
-
-#endif /* __CC_MEDIA_SHARING_H__ */
diff --git a/panels/sharing/cc-remote-login.h b/panels/sharing/cc-remote-login.h
index 91879b773..c23ddcf08 100644
--- a/panels/sharing/cc-remote-login.h
+++ b/panels/sharing/cc-remote-login.h
@@ -19,8 +19,7 @@
*
*/
-#ifndef __CC_REMOTE_LOGIN_H__
-#define __CC_REMOTE_LOGIN_H__
+#pragma once
#include <gtk/gtk.h>
@@ -29,5 +28,3 @@ void cc_remote_login_get_enabled (GCancellable *cancellable,
GtkWidget *button);
void cc_remote_login_set_enabled (GCancellable *cancellable,
GtkSwitch *gtkswitch);
-
-#endif /* __CC_REMOTE_LOGIN_H__ **/
diff --git a/panels/sharing/cc-sharing-networks.h b/panels/sharing/cc-sharing-networks.h
index 8abe10bf1..03918ab04 100644
--- a/panels/sharing/cc-sharing-networks.h
+++ b/panels/sharing/cc-sharing-networks.h
@@ -17,8 +17,7 @@
*
*/
-#ifndef __CC_SHARING_NETWORKS_H__
-#define __CC_SHARING_NETWORKS_H__
+#pragma once
#include <gtk/gtkgrid.h>
@@ -38,5 +37,3 @@ GtkWidget * cc_sharing_networks_new (GDBusProxy *proxy,
const char *service_name);
G_END_DECLS
-
-#endif /* __CC_SHARING_NETWORKS_H__ */
diff --git a/panels/sharing/cc-sharing-panel.h b/panels/sharing/cc-sharing-panel.h
index 17f84dbde..b8b69abc5 100644
--- a/panels/sharing/cc-sharing-panel.h
+++ b/panels/sharing/cc-sharing-panel.h
@@ -19,8 +19,7 @@
*
*/
-#ifndef __CC_SHARING_PANEL_H__
-#define __CC_SHARING_PANEL_H__
+#pragma once
#include <shell/cc-shell.h>
@@ -32,5 +31,3 @@ G_DECLARE_FINAL_TYPE (CcSharingPanel, cc_sharing_panel, CC, SHARING_PANEL, CcPan
CcSharingPanel *cc_sharing_panel_new (void);
G_END_DECLS
-
-#endif /* __CC_SHARING_PANEL_H__ */
diff --git a/panels/sharing/cc-sharing-switch.h b/panels/sharing/cc-sharing-switch.h
index 9a42f0ffc..36920d816 100644
--- a/panels/sharing/cc-sharing-switch.h
+++ b/panels/sharing/cc-sharing-switch.h
@@ -17,8 +17,7 @@
*
*/
-#ifndef __CC_SHARING_SWITCH_H__
-#define __CC_SHARING_SWITCH_H__
+#pragma once
#include <gtk/gtkswitch.h>
@@ -30,5 +29,3 @@ G_DECLARE_FINAL_TYPE (CcSharingSwitch, cc_sharing_switch, CC, SHARING_SWITCH, Gt
GtkWidget * cc_sharing_switch_new (GtkWidget *widget);
G_END_DECLS
-
-#endif /* __CC_SHARING_SWITCH_H__ */
diff --git a/panels/sharing/file-share-properties.h b/panels/sharing/file-share-properties.h
index d82455c57..b29d23f4e 100644
--- a/panels/sharing/file-share-properties.h
+++ b/panels/sharing/file-share-properties.h
@@ -17,9 +17,6 @@
*
*/
-#ifndef __FILE_SHARE_PROPERTIES_H__
-#define __FILE_SHARE_PROPERTIES_H__
+#pragma once
void file_share_write_out_password (const char *password);
-
-#endif /* __FILE_SHARE_PROPERTIES_H__ */
diff --git a/panels/sharing/gsd-sharing-enums.h b/panels/sharing/gsd-sharing-enums.h
index e9b2fc7d8..d11784588 100644
--- a/panels/sharing/gsd-sharing-enums.h
+++ b/panels/sharing/gsd-sharing-enums.h
@@ -17,8 +17,7 @@
*
*/
-#ifndef __GSD_SHARING_ENUMS_H
-#define __GSD_SHARING_ENUMS_H
+#pragma once
G_BEGIN_DECLS
@@ -30,5 +29,3 @@ typedef enum {
} GsdSharingStatus;
G_END_DECLS
-
-#endif /* __GSD_SHARING_ENUMS_H */
diff --git a/panels/sharing/vino-preferences.h b/panels/sharing/vino-preferences.h
index 118854ea5..f992d8d7c 100644
--- a/panels/sharing/vino-preferences.h
+++ b/panels/sharing/vino-preferences.h
@@ -23,8 +23,7 @@
* Ryan Lortie <desrt desrt ca>
*/
-#ifndef __VINO_PREFERENCES_H__
-#define __VINO_PREFERENCES_H__
+#pragma once
#include <glib.h>
#include <glib-object.h>
@@ -44,5 +43,3 @@ gboolean
vino_get_password (GValue *value,
GVariant *variant,
gpointer user_data);
-
-#endif /* __VINO_PREFERENCES_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]