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



commit c461e436b773d2fef694c505b8a7debd1ac39b42
Author: Robert Ancell <robert ancell canonical com>
Date:   Thu May 31 10:44:37 2018 +1200

    user-accounts: Replace ifdefs with #pragma once

 panels/user-accounts/cc-crop-area.h          | 5 +----
 panels/user-accounts/fingerprint-strings.h   | 2 ++
 panels/user-accounts/pw-utils.h              | 2 ++
 panels/user-accounts/run-passwd.h            | 5 +----
 panels/user-accounts/um-account-dialog.h     | 5 +----
 panels/user-accounts/um-account-type.h       | 5 +----
 panels/user-accounts/um-carousel.h           | 5 +----
 panels/user-accounts/um-fingerprint-dialog.h | 2 ++
 panels/user-accounts/um-history-dialog.h     | 5 +----
 panels/user-accounts/um-password-dialog.h    | 5 +----
 panels/user-accounts/um-photo-dialog.h       | 5 +----
 panels/user-accounts/um-realm-manager.h      | 5 +----
 panels/user-accounts/um-user-image.h         | 5 +----
 panels/user-accounts/um-user-panel.h         | 5 +----
 panels/user-accounts/um-utils.h              | 5 +----
 15 files changed, 18 insertions(+), 48 deletions(-)
---
diff --git a/panels/user-accounts/cc-crop-area.h b/panels/user-accounts/cc-crop-area.h
index 1cc1788b7..d2bfab54f 100644
--- a/panels/user-accounts/cc-crop-area.h
+++ b/panels/user-accounts/cc-crop-area.h
@@ -17,8 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _CC_CROP_AREA_H_
-#define _CC_CROP_AREA_H_
+#pragma once
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -39,5 +38,3 @@ void       cc_crop_area_set_constrain_aspect (CcCropArea *area,
                                               gboolean    constrain);
 
 G_END_DECLS
-
-#endif /* _CC_CROP_AREA_H_ */
diff --git a/panels/user-accounts/fingerprint-strings.h b/panels/user-accounts/fingerprint-strings.h
index f9fd99323..4336130bf 100644
--- a/panels/user-accounts/fingerprint-strings.h
+++ b/panels/user-accounts/fingerprint-strings.h
@@ -20,6 +20,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#pragma once
+
 struct {
        const char *dbus_name;
        const char *place_str_generic;
diff --git a/panels/user-accounts/pw-utils.h b/panels/user-accounts/pw-utils.h
index 2a3cc4289..d7df49100 100644
--- a/panels/user-accounts/pw-utils.h
+++ b/panels/user-accounts/pw-utils.h
@@ -18,6 +18,8 @@
  * Written by: Matthias Clasen <mclasen redhat com>
  */
 
+#pragma once
+
 #include <glib.h>
 
 gint     pw_min_length (void);
diff --git a/panels/user-accounts/run-passwd.h b/panels/user-accounts/run-passwd.h
index e1ab0e109..c0362bd2b 100644
--- a/panels/user-accounts/run-passwd.h
+++ b/panels/user-accounts/run-passwd.h
@@ -20,8 +20,7 @@
  * Authors: Milan Bouchet-Valat <nalimilan club fr>
  */
 
-#ifndef _RUN_PASSWD_H
-#define _RUN_PASSWD_H
+#pragma once
 
 struct PasswdHandler;
 
@@ -53,5 +52,3 @@ gboolean       passwd_change_password     (PasswdHandler *passwd_handler,
                                            PasswdCallback cb,
                                            const gpointer user_data);
 
-#endif /* _RUN_PASSWD_H */
-
diff --git a/panels/user-accounts/um-account-dialog.h b/panels/user-accounts/um-account-dialog.h
index 44a356c29..73c21da5d 100644
--- a/panels/user-accounts/um-account-dialog.h
+++ b/panels/user-accounts/um-account-dialog.h
@@ -18,8 +18,7 @@
  * Written by: Matthias Clasen <mclasen redhat com>
  */
 
-#ifndef __UM_ACCOUNT_DIALOG_H__
-#define __UM_ACCOUNT_DIALOG_H__
+#pragma once
 
 #include <act/act.h>
 #include <gtk/gtk.h>
@@ -39,5 +38,3 @@ ActUser *        um_account_dialog_finish   (UmAccountDialog     *self,
                                              GAsyncResult        *result);
 
 G_END_DECLS
-
-#endif
diff --git a/panels/user-accounts/um-account-type.h b/panels/user-accounts/um-account-type.h
index 65827f765..c4da98f30 100644
--- a/panels/user-accounts/um-account-type.h
+++ b/panels/user-accounts/um-account-type.h
@@ -18,8 +18,7 @@
  * Written by: Matthias Clasen <mclasen redhat com>
  */
 
-#ifndef __UM_ACCOUNT_TYPE__
-#define __UM_ACCOUNT_TYPE__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -31,5 +30,3 @@ typedef enum {
 const gchar *um_account_type_get_name (UmAccountType account_type);
 
 G_END_DECLS
-
-#endif
diff --git a/panels/user-accounts/um-carousel.h b/panels/user-accounts/um-carousel.h
index 5f3e8fe4e..d6da5cd88 100644
--- a/panels/user-accounts/um-carousel.h
+++ b/panels/user-accounts/um-carousel.h
@@ -18,8 +18,7 @@
  * Author: Felipe Borges <felipeborges gnome org>
  */
 
-#ifndef UM_CAROUSEL_H
-#define UM_CAROUSEL_H
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -49,5 +48,3 @@ void             um_carousel_select_item (UmCarousel     *self,
 guint            um_carousel_get_item_count (UmCarousel  *self);
 
 G_END_DECLS
-
-#endif /* UM_CAROUSEL_H */
diff --git a/panels/user-accounts/um-fingerprint-dialog.h b/panels/user-accounts/um-fingerprint-dialog.h
index 7028aa14e..426078f17 100644
--- a/panels/user-accounts/um-fingerprint-dialog.h
+++ b/panels/user-accounts/um-fingerprint-dialog.h
@@ -15,6 +15,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include <gtk/gtk.h>
 #include <act/act.h>
 
diff --git a/panels/user-accounts/um-history-dialog.h b/panels/user-accounts/um-history-dialog.h
index 5af632952..403f62431 100644
--- a/panels/user-accounts/um-history-dialog.h
+++ b/panels/user-accounts/um-history-dialog.h
@@ -18,8 +18,7 @@
  * Written by: Ondrej Holy <oholy redhat com>
  */
 
-#ifndef __UM_HISTORY_DIALOG_H__
-#define __UM_HISTORY_DIALOG_H__
+#pragma once
 
 #include <gtk/gtk.h>
 #include <act/act-user.h>
@@ -36,5 +35,3 @@ void             um_history_dialog_show     (UmHistoryDialog *dialog,
                                              GtkWindow       *parent);
 
 G_END_DECLS
-
-#endif
diff --git a/panels/user-accounts/um-password-dialog.h b/panels/user-accounts/um-password-dialog.h
index 96ccf5278..f6fca5e81 100644
--- a/panels/user-accounts/um-password-dialog.h
+++ b/panels/user-accounts/um-password-dialog.h
@@ -18,8 +18,7 @@
  * Written by: Matthias Clasen <mclasen redhat com>
  */
 
-#ifndef __UM_PASSWORD_DIALOG_H__
-#define __UM_PASSWORD_DIALOG_H__
+#pragma once
 
 #include <gtk/gtk.h>
 #include <act/act.h>
@@ -36,5 +35,3 @@ void              um_password_dialog_show     (UmPasswordDialog *dialog,
                                                GtkWindow        *parent);
 
 G_END_DECLS
-
-#endif
diff --git a/panels/user-accounts/um-photo-dialog.h b/panels/user-accounts/um-photo-dialog.h
index fc74a2ed6..ce52f9798 100644
--- a/panels/user-accounts/um-photo-dialog.h
+++ b/panels/user-accounts/um-photo-dialog.h
@@ -18,8 +18,7 @@
  * Written by: Matthias Clasen <mclasen redhat com>
  */
 
-#ifndef __UM_PHOTO_DIALOG_H__
-#define __UM_PHOTO_DIALOG_H__
+#pragma once
 
 #include <gtk/gtk.h>
 #include <act/act.h>
@@ -38,5 +37,3 @@ void           um_photo_dialog_set_user (UmPhotoDialog *dialog,
                                          ActUser       *user);
 
 G_END_DECLS
-
-#endif
diff --git a/panels/user-accounts/um-realm-manager.h b/panels/user-accounts/um-realm-manager.h
index 82f44acd4..8f7292909 100644
--- a/panels/user-accounts/um-realm-manager.h
+++ b/panels/user-accounts/um-realm-manager.h
@@ -18,8 +18,7 @@
  * Written by: Stef Walter <stefw gnome org>
  */
 
-#ifndef __UM_REALM_MANAGER_H__
-#define __UM_REALM_MANAGER_H__
+#pragma once
 
 #include "um-realm-generated.h"
 
@@ -96,5 +95,3 @@ gchar *          um_realm_calculate_login         (UmRealmCommon *realm,
                                                    const gchar *username);
 
 G_END_DECLS
-
-#endif /* __UM_REALM_H__ */
diff --git a/panels/user-accounts/um-user-image.h b/panels/user-accounts/um-user-image.h
index 081a4841c..9239fb968 100644
--- a/panels/user-accounts/um-user-image.h
+++ b/panels/user-accounts/um-user-image.h
@@ -16,8 +16,7 @@
  * (C) Copyright 2015 Red Hat, Inc.
  */
 
-#ifndef _UM_USER_IMAGE_H
-#define _UM_USER_IMAGE_H
+#pragma once
 
 #include <gtk/gtk.h>
 #include <act/act.h>
@@ -31,5 +30,3 @@ GtkWidget *um_user_image_new      (void);
 void       um_user_image_set_user (UmUserImage *image, ActUser *user);
 
 G_END_DECLS
-
-#endif /* _UM_USER_IMAGE_H */
diff --git a/panels/user-accounts/um-user-panel.h b/panels/user-accounts/um-user-panel.h
index a5cc79dae..65f8dd7a9 100644
--- a/panels/user-accounts/um-user-panel.h
+++ b/panels/user-accounts/um-user-panel.h
@@ -18,8 +18,7 @@
  * Written by: Matthias Clasen <mclasen redhat com>
  */
 
-#ifndef _UM_USER_PANEL_H
-#define _UM_USER_PANEL_H
+#pragma once
 
 #include <shell/cc-panel.h>
 
@@ -29,5 +28,3 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (CcUserPanel, cc_user_panel, UM, USER_PANEL, CcPanel)
 
 G_END_DECLS
-
-#endif /* _UM_USER_PANEL_H */
diff --git a/panels/user-accounts/um-utils.h b/panels/user-accounts/um-utils.h
index fb405a08f..aa9e6fbb0 100644
--- a/panels/user-accounts/um-utils.h
+++ b/panels/user-accounts/um-utils.h
@@ -18,8 +18,7 @@
  * Written by: Matthias Clasen <mclasen redhat com>
  */
 
-#ifndef __UM_UTILS_H__
-#define __UM_UTILS_H__
+#pragma once
 
 #include <gtk/gtk.h>
 #include <act/act.h>
@@ -77,5 +76,3 @@ void     set_user_icon_data               (ActUser         *user,
 gboolean would_demote_only_admin          (ActUser *user);
 
 G_END_DECLS
-
-#endif


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