[seahorse/wip/nielsdg/cleanup-pgp] pgp: Cleanup: use `#pragma once`

From: Niels De Graef <nielsdg src gnome org>
To: commits-list gnome org
Cc:
Subject: [seahorse/wip/nielsdg/cleanup-pgp] pgp: Cleanup: use `#pragma once`
Date: Fri, 4 Jan 2019 12:07:41 +0000 (UTC)
commit d09b5d95ceea8c957f96fcef8aa4504594fa2d1b
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Fri Jan 4 13:06:29 2019 +0100

    pgp: Cleanup: use `#pragma once`
    
    Something that I've wanted to do for a while now, so it's an ideal thing
    to do over lunch break.

 pgp/seahorse-combo-keys.h           | 5 +----
 pgp/seahorse-discovery.h            | 5 +----
 pgp/seahorse-gpg-op.h               | 5 +----
 pgp/seahorse-gpg-options.h          | 9 +++------
 pgp/seahorse-gpgme-data.h           | 7 ++-----
 pgp/seahorse-gpgme-dialogs.h        | 9 +++------
 pgp/seahorse-gpgme-exporter.h       | 6 +-----
 pgp/seahorse-gpgme-key-deleter.h    | 5 +----
 pgp/seahorse-gpgme-key-op.h         | 5 +----
 pgp/seahorse-gpgme-key.h            | 5 +----
 pgp/seahorse-gpgme-keyring.h        | 5 +----
 pgp/seahorse-gpgme-photo.h          | 5 +----
 pgp/seahorse-gpgme-secret-deleter.h | 5 +----
 pgp/seahorse-gpgme-subkey.h         | 5 +----
 pgp/seahorse-gpgme-uid.h            | 5 +----
 pgp/seahorse-gpgme.h                | 5 +----
 pgp/seahorse-hkp-source.h           | 7 ++-----
 pgp/seahorse-keyserver-results.h    | 5 +----
 pgp/seahorse-keyserver-search.h     | 5 +----
 pgp/seahorse-keyserver-sync.h       | 5 +----
 pgp/seahorse-ldap-source.h          | 7 ++-----
 pgp/seahorse-pgp-actions.h          | 5 +----
 pgp/seahorse-pgp-dialogs.h          | 7 ++-----
 pgp/seahorse-pgp-key.h              | 5 +----
 pgp/seahorse-pgp-photo.h            | 5 +----
 pgp/seahorse-pgp-signature.h        | 5 +----
 pgp/seahorse-pgp-subkey.h           | 8 ++------
 pgp/seahorse-pgp-uid.h              | 5 +----
 pgp/seahorse-server-source.h        | 7 ++-----
 pgp/seahorse-transfer.h             | 5 +----
 pgp/seahorse-unknown-source.h       | 5 +----
 pgp/seahorse-unknown.h              | 5 +----
 32 files changed, 42 insertions(+), 140 deletions(-)
---
diff --git a/pgp/seahorse-combo-keys.h b/pgp/seahorse-combo-keys.h
index 63e0bdce..1a2c32b9 100644
--- a/pgp/seahorse-combo-keys.h
+++ b/pgp/seahorse-combo-keys.h
@@ -24,8 +24,7 @@
  * - Gets its list of keys from a SeahorseSet.
  */
 
-#ifndef __SEAHORSE_COMBO_KEYS_H__
-#define __SEAHORSE_COMBO_KEYS_H__
+#pragma once
 
 #include "seahorse-pgp-key.h"
 
@@ -45,5 +44,3 @@ void                        seahorse_combo_keys_set_active          (GtkComboBox
 SeahorsePgpKey *            seahorse_combo_keys_get_active          (GtkComboBox *combo);
 
 const gchar *               seahorse_combo_keys_get_active_id       (GtkComboBox *combo);
-
-#endif /* __SEAHORSE_COMBO_KEYS_H__ */
diff --git a/pgp/seahorse-discovery.h b/pgp/seahorse-discovery.h
index cfdb0c96..73bd15c8 100644
--- a/pgp/seahorse-discovery.h
+++ b/pgp/seahorse-discovery.h
@@ -17,8 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_DNS_SD_H__
-#define __SEAHORSE_DNS_SD_H__
+#pragma once
 
 #include <glib.h>
 #include <glib-object.h>
@@ -77,5 +76,3 @@ const gchar*                seahorse_discovery_get_uri   (SeahorseDiscovery *ssd
 
 gchar **                    seahorse_discovery_get_uris  (SeahorseDiscovery *ssd,
                                                           const gchar **services);
-
-#endif /* __SEAHORSE_DISCOVERY_H__ */
diff --git a/pgp/seahorse-gpg-op.h b/pgp/seahorse-gpg-op.h
index 38135a13..8c71e14a 100644
--- a/pgp/seahorse-gpg-op.h
+++ b/pgp/seahorse-gpg-op.h
@@ -17,8 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_GPG_OP_H__
-#define __SEAHORSE_GPG_OP_H__
+#pragma once
 
 #include "config.h"
 
@@ -31,5 +30,3 @@ gpgme_error_t seahorse_gpg_op_export_secret  (gpgme_ctx_t ctx,
 gpgme_error_t seahorse_gpg_op_num_uids       (gpgme_ctx_t ctx, 
                                               const char *pattern,
                                               guint *number);
-
-#endif /* __SEAHORSE_GPG_OP_H__ */
diff --git a/pgp/seahorse-gpg-options.h b/pgp/seahorse-gpg-options.h
index 0602fbd4..73c53c2f 100644
--- a/pgp/seahorse-gpg-options.h
+++ b/pgp/seahorse-gpg-options.h
@@ -21,8 +21,7 @@
  * A collection of functions for changing options in gpg.conf.
  */
 
-#ifndef __SEAHORSE_GPG_OPTIONS_H__
-#define __SEAHORSE_GPG_OPTIONS_H__
+#pragma once
 
 #include <glib.h>
 
@@ -30,14 +29,12 @@ const gchar * seahorse_gpg_homedir (void);
 
 gboolean seahorse_gpg_options_find(const gchar* option, 
                                 gchar** value, GError** err);
-                                
+
 gboolean seahorse_gpg_options_find_vals(const gchar* options[], 
                                 gchar* values[], GError** err);
 
 gboolean seahorse_gpg_options_change(const gchar* option, 
                                 const gchar* value, GError** err);
-                                
+
 gboolean seahorse_gpg_options_change_vals(const gchar* options[], 
                                 gchar* values[], GError** err);
-
-#endif /* __SEAHORSE_WIDGET_H__ */
diff --git a/pgp/seahorse-gpgme-data.h b/pgp/seahorse-gpgme-data.h
index 4d470de1..33b4e5dc 100644
--- a/pgp/seahorse-gpgme-data.h
+++ b/pgp/seahorse-gpgme-data.h
@@ -22,9 +22,8 @@
  * A gpgme_data_t implementation which maps to a gio handle.
  * Allows for accessing data on remote machines (ie: smb, sftp)
  */
- 
-#ifndef __SEAHORSE_GPGME_IO__
-#define __SEAHORSE_GPGME_IO__
+
+#pragma once
 
 #include <gpgme.h>
 #include <gio/gio.h>
@@ -45,5 +44,3 @@ void                seahorse_gpgme_data_release      (gpgme_data_t data);
 int                 seahorse_gpgme_data_write_all    (gpgme_data_t data, const void* buffer, size_t len);
 
 gpgme_data_t        seahorse_gpgme_data_new_from_mem (const char *buffer, size_t size, gboolean copy);
-
-#endif /* __SEAHORSE_GPGME_IO__ */
diff --git a/pgp/seahorse-gpgme-dialogs.h b/pgp/seahorse-gpgme-dialogs.h
index a3ec3fc1..9b53c05f 100644
--- a/pgp/seahorse-gpgme-dialogs.h
+++ b/pgp/seahorse-gpgme-dialogs.h
@@ -21,9 +21,8 @@
 /*
  * Various UI elements and dialogs used in pgp component.
  */
- 
-#ifndef __SEAHORSE_GPGME_DIALOGS_H__
-#define __SEAHORSE_GPGME_DIALOGS_H__
+
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -75,8 +74,6 @@ void            seahorse_gpgme_revoke_new           (SeahorseGpgmeSubkey *subkey
 gboolean        seahorse_gpgme_photo_add            (SeahorseGpgmeKey *pkey, 
                                                      GtkWindow *parent,
                                                      const gchar *path);
-                                         
+
 gboolean        seahorse_gpgme_photo_delete         (SeahorseGpgmePhoto *photo,
                                                      GtkWindow *parent);
-
-#endif /* __SEAHORSE_GPGME_DIALOGS_H__ */
diff --git a/pgp/seahorse-gpgme-exporter.h b/pgp/seahorse-gpgme-exporter.h
index c70f05c1..cd02f6ef 100644
--- a/pgp/seahorse-gpgme-exporter.h
+++ b/pgp/seahorse-gpgme-exporter.h
@@ -19,8 +19,7 @@
  * Author: Stef Walter <stefw collabora co uk>
  */
 
-#ifndef __SEAHORSE_GPGME_EXPORTER_H__
-#define __SEAHORSE_GPGME_EXPORTER_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -40,6 +39,3 @@ SeahorseExporter *        seahorse_gpgme_exporter_new          (GObject *object,
 
 SeahorseExporter *        seahorse_gpgme_exporter_new_multiple (GList *keys,
                                                                 gboolean armor);
-
-
-#endif /* __SEAHORSE_GPGME_EXPORTER_H__ */
diff --git a/pgp/seahorse-gpgme-key-deleter.h b/pgp/seahorse-gpgme-key-deleter.h
index 2ac0d362..6ae7d8c3 100644
--- a/pgp/seahorse-gpgme-key-deleter.h
+++ b/pgp/seahorse-gpgme-key-deleter.h
@@ -20,8 +20,7 @@
  * Author: Stef Walter <stefw collabora co uk>
  */
 
-#ifndef __SEAHORSE_GPGME_KEY_DELETER_H__
-#define __SEAHORSE_GPGME_KEY_DELETER_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -37,5 +36,3 @@ typedef struct _SeahorseGpgmeKeyDeleter SeahorseGpgmeKeyDeleter;
 GType              seahorse_gpgme_key_deleter_get_type   (void) G_GNUC_CONST;
 
 SeahorseDeleter *  seahorse_gpgme_key_deleter_new        (SeahorseGpgmeKey *key);
-
-#endif /* __SEAHORSE_GPGME_KEY_DELETER_H__ */
diff --git a/pgp/seahorse-gpgme-key-op.h b/pgp/seahorse-gpgme-key-op.h
index 0acbfc0a..7eedadab 100644
--- a/pgp/seahorse-gpgme-key-op.h
+++ b/pgp/seahorse-gpgme-key-op.h
@@ -17,8 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_GPGME_KEY_OP_H__
-#define __SEAHORSE_GPGME_KEY_OP_H__
+#pragma once
 
 #include <glib.h>
 #include <gpgme.h>
@@ -170,5 +169,3 @@ gpgme_error_t         seahorse_gpgme_key_op_photo_delete     (SeahorseGpgmePhoto
 gpgme_error_t         seahorse_gpgme_key_op_photos_load      (SeahorseGpgmeKey *key);
 
 gpgme_error_t         seahorse_gpgme_key_op_photo_primary    (SeahorseGpgmePhoto *photo);
-
-#endif /* __SEAHORSE_GPGME_KEY_OP_H__ */
diff --git a/pgp/seahorse-gpgme-key.h b/pgp/seahorse-gpgme-key.h
index de22d932..1f7f825d 100644
--- a/pgp/seahorse-gpgme-key.h
+++ b/pgp/seahorse-gpgme-key.h
@@ -17,8 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_GPGME_KEY_H__
-#define __SEAHORSE_GPGME_KEY_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -74,5 +73,3 @@ void              seahorse_gpgme_key_refresh_matching     (gpgme_key_t key);
 SeahorseValidity  seahorse_gpgme_key_get_validity         (SeahorseGpgmeKey *self);
 
 SeahorseValidity  seahorse_gpgme_key_get_trust            (SeahorseGpgmeKey *self);
-
-#endif /* __SEAHORSE_KEY_H__ */
diff --git a/pgp/seahorse-gpgme-keyring.h b/pgp/seahorse-gpgme-keyring.h
index 3ce41bc3..6d71c0b3 100644
--- a/pgp/seahorse-gpgme-keyring.h
+++ b/pgp/seahorse-gpgme-keyring.h
@@ -33,8 +33,7 @@
  *         keyring. (ie: SEAHORSE_LOCATION_LOCAL, SEAHORSE_LOCATION_REMOTE)
  */
 
-#ifndef __SEAHORSE_GPGME_KEYRING_H__
-#define __SEAHORSE_GPGME_KEYRING_H__
+#pragma once
 
 #include <gpgme.h>
 
@@ -85,5 +84,3 @@ void                   seahorse_gpgme_keyring_import_async   (SeahorseGpgmeKeyri
 GList *                seahorse_gpgme_keyring_import_finish  (SeahorseGpgmeKeyring *self,
                                                               GAsyncResult *result,
                                                               GError **error);
-
-#endif /* __SEAHORSE_GPGME_KEYRING_H__ */
diff --git a/pgp/seahorse-gpgme-photo.h b/pgp/seahorse-gpgme-photo.h
index 0cae2d35..3c2bb64e 100644
--- a/pgp/seahorse-gpgme-photo.h
+++ b/pgp/seahorse-gpgme-photo.h
@@ -17,8 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_GPGME_PHOTO_H__
-#define __SEAHORSE_GPGME_PHOTO_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -59,5 +58,3 @@ guint               seahorse_gpgme_photo_get_index       (SeahorseGpgmePhoto *se
 
 void                seahorse_gpgme_photo_set_index       (SeahorseGpgmePhoto *self,
                                                           guint index);
-
-#endif /* __SEAHORSE_GPGME_PHOTO_H__ */
diff --git a/pgp/seahorse-gpgme-secret-deleter.h b/pgp/seahorse-gpgme-secret-deleter.h
index 3ba60c7e..dc8b9751 100644
--- a/pgp/seahorse-gpgme-secret-deleter.h
+++ b/pgp/seahorse-gpgme-secret-deleter.h
@@ -20,8 +20,7 @@
  * Author: Stef Walter <stefw collabora co uk>
  */
 
-#ifndef __SEAHORSE_GPGME_SECRET_DELETER_H__
-#define __SEAHORSE_GPGME_SECRET_DELETER_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -37,5 +36,3 @@ typedef struct _SeahorseGpgmeSecretDeleter SeahorseGpgmeSecretDeleter;
 GType              seahorse_gpgme_secret_deleter_get_type   (void) G_GNUC_CONST;
 
 SeahorseDeleter *  seahorse_gpgme_secret_deleter_new        (SeahorseGpgmeKey *key);
-
-#endif /* __SEAHORSE_GPGME_SECRET_DELETER_H__ */
diff --git a/pgp/seahorse-gpgme-subkey.h b/pgp/seahorse-gpgme-subkey.h
index 7d7fc7d7..5bd4e447 100644
--- a/pgp/seahorse-gpgme-subkey.h
+++ b/pgp/seahorse-gpgme-subkey.h
@@ -17,8 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_GPGME_SUBKEY_H__
-#define __SEAHORSE_GPGME_SUBKEY_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -57,5 +56,3 @@ gpgme_subkey_t        seahorse_gpgme_subkey_get_subkey        (SeahorseGpgmeSubk
 
 void                  seahorse_gpgme_subkey_set_subkey        (SeahorseGpgmeSubkey *self,
                                                                gpgme_subkey_t subkey);
-
-#endif /* __SEAHORSE_GPGME_SUBKEY_H__ */
diff --git a/pgp/seahorse-gpgme-uid.h b/pgp/seahorse-gpgme-uid.h
index 5eddfb14..2c09e65d 100644
--- a/pgp/seahorse-gpgme-uid.h
+++ b/pgp/seahorse-gpgme-uid.h
@@ -17,8 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_GPGME_UID_H__
-#define __SEAHORSE_GPGME_UID_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -77,5 +76,3 @@ gchar*              seahorse_gpgme_uid_calc_markup          (gpgme_user_id_t use
 
 gboolean            seahorse_gpgme_uid_is_same              (SeahorseGpgmeUid *self,
                                                              gpgme_user_id_t userid);
-
-#endif /* __SEAHORSE_GPGME_UID_H__ */
diff --git a/pgp/seahorse-gpgme.h b/pgp/seahorse-gpgme.h
index 5fe40f67..a47e8dca 100644
--- a/pgp/seahorse-gpgme.h
+++ b/pgp/seahorse-gpgme.h
@@ -19,8 +19,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SEAHORSEGPGME_H_
-#define SEAHORSEGPGME_H_
+#pragma once
 
 #include <glib.h>
 #include <glib-object.h>
@@ -60,5 +59,3 @@ gpgme_error_t      seahorse_gpgme_get_keytype_table (SeahorseKeyTypeTable *table
 
 GSource *          seahorse_gpgme_gsource_new       (gpgme_ctx_t gctx,
                                                      GCancellable *cancellable);
-
-#endif /* SEAHORSEGPGME_H_ */
diff --git a/pgp/seahorse-hkp-source.h b/pgp/seahorse-hkp-source.h
index d39bea04..357e9645 100644
--- a/pgp/seahorse-hkp-source.h
+++ b/pgp/seahorse-hkp-source.h
@@ -24,9 +24,8 @@
  * - Adds found keys to SeahorseContext. 
  * - Used by SeahorseServiceDiscovery for retrieving shared keys.
  */
- 
-#ifndef __SEAHORSE_HKP_SOURCE_H__
-#define __SEAHORSE_HKP_SOURCE_H__
+
+#pragma once
 
 #include "config.h"
 #include "seahorse-server-source.h"
@@ -61,5 +60,3 @@ SeahorseHKPSource*    seahorse_hkp_source_new      (const gchar *uri,
 gboolean              seahorse_hkp_is_valid_uri    (const gchar *uri);
 
 #endif /* WITH_HKP */
-
-#endif /* __SEAHORSE_HKP_SOURCE_H__ */
diff --git a/pgp/seahorse-keyserver-results.h b/pgp/seahorse-keyserver-results.h
index fc9f9b93..f68c1e2e 100644
--- a/pgp/seahorse-keyserver-results.h
+++ b/pgp/seahorse-keyserver-results.h
@@ -19,8 +19,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_KEYSERVER_RESULTS_H__
-#define __SEAHORSE_KEYSERVER_RESULTS_H__
+#pragma once
 
 #include <glib.h>
 #include <glib-object.h>
@@ -59,5 +58,3 @@ const gchar*     seahorse_keyserver_results_get_search       (SeahorseKeyserverR
 
 
 G_END_DECLS
-
-#endif
diff --git a/pgp/seahorse-keyserver-search.h b/pgp/seahorse-keyserver-search.h
index 2da53748..9650b1e4 100644
--- a/pgp/seahorse-keyserver-search.h
+++ b/pgp/seahorse-keyserver-search.h
@@ -19,11 +19,8 @@
  * Author: Stef Walter <stefw collabora co uk>
  */
 
-#ifndef __SEAHORSE_KEYSERVER_SEARCH_H__
-#define __SEAHORSE_KEYSERVER_SEARCH_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
 GtkWindow *  seahorse_keyserver_search_show      (GtkWindow *parent);
-
-#endif
diff --git a/pgp/seahorse-keyserver-sync.h b/pgp/seahorse-keyserver-sync.h
index 04a10e34..43bf5394 100644
--- a/pgp/seahorse-keyserver-sync.h
+++ b/pgp/seahorse-keyserver-sync.h
@@ -17,8 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_KEYSERVER_SYNC_H__
-#define __SEAHORSE_KEYSERVER_SYNC_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -27,5 +26,3 @@ void        seahorse_keyserver_sync             (GList *keys);
 
 GtkWindow*  seahorse_keyserver_sync_show        (GList *keys,
                                                  GtkWindow *parent);
-
-#endif
diff --git a/pgp/seahorse-ldap-source.h b/pgp/seahorse-ldap-source.h
index c056be6c..b3c15923 100644
--- a/pgp/seahorse-ldap-source.h
+++ b/pgp/seahorse-ldap-source.h
@@ -23,9 +23,8 @@
  * - Derived from SeahorseServerSource.
  * - Adds found keys to SeahorseContext. 
  */
- 
-#ifndef __SEAHORSE_LDAP_SOURCE_H__
-#define __SEAHORSE_LDAP_SOURCE_H__
+
+#pragma once
 
 #include "seahorse-server-source.h"
 
@@ -59,5 +58,3 @@ SeahorseLDAPSource*   seahorse_ldap_source_new     (const gchar *uri,
 gboolean              seahorse_ldap_is_valid_uri   (const gchar *uri);
 
 #endif /* WITH_LDAP */
-
-#endif /* __SEAHORSE_SERVER_SOURCE_H__ */
diff --git a/pgp/seahorse-pgp-actions.h b/pgp/seahorse-pgp-actions.h
index 53932a28..2e131442 100644
--- a/pgp/seahorse-pgp-actions.h
+++ b/pgp/seahorse-pgp-actions.h
@@ -19,13 +19,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_PGP_ACTIONS_H__
-#define __SEAHORSE_PGP_ACTIONS_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
 GtkActionGroup *      seahorse_pgp_backend_actions_instance    (void);
 
 GtkActionGroup *      seahorse_gpgme_key_actions_instance      (void);
-
-#endif
diff --git a/pgp/seahorse-pgp-dialogs.h b/pgp/seahorse-pgp-dialogs.h
index d730a3d5..43a2694b 100644
--- a/pgp/seahorse-pgp-dialogs.h
+++ b/pgp/seahorse-pgp-dialogs.h
@@ -21,9 +21,8 @@
 /*
  * Various UI elements and dialogs used in pgp component.
  */
- 
-#ifndef __SEAHORSE_PGP_DIALOGS_H__
-#define __SEAHORSE_PGP_DIALOGS_H__
+
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -33,5 +32,3 @@ SeahorsePgpKey* seahorse_signer_get                 (GtkWindow *parent);
 
 GtkWindow *     seahorse_pgp_key_properties_show    (SeahorsePgpKey *pkey,
                                                      GtkWindow *parent);
-
-#endif /* __SEAHORSE_PGP_DIALOGS_H__ */
diff --git a/pgp/seahorse-pgp-key.h b/pgp/seahorse-pgp-key.h
index 1f17825d..87f5bd31 100644
--- a/pgp/seahorse-pgp-key.h
+++ b/pgp/seahorse-pgp-key.h
@@ -17,8 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_PGP_KEY_H__
-#define __SEAHORSE_PGP_KEY_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -104,5 +103,3 @@ guint             seahorse_pgp_keyid_hash               (gconstpointer v);
 
 gboolean          seahorse_pgp_keyid_equal              (gconstpointer v1,
                                                          gconstpointer v2);
-
-#endif /* __SEAHORSE_KEY_H__ */
diff --git a/pgp/seahorse-pgp-photo.h b/pgp/seahorse-pgp-photo.h
index 7340d9f0..513fa9da 100644
--- a/pgp/seahorse-pgp-photo.h
+++ b/pgp/seahorse-pgp-photo.h
@@ -17,8 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_PGP_PHOTO_H__
-#define __SEAHORSE_PGP_PHOTO_H__
+#pragma once
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -51,5 +50,3 @@ GdkPixbuf*          seahorse_pgp_photo_get_pixbuf        (SeahorsePgpPhoto *self
 
 void                seahorse_pgp_photo_set_pixbuf        (SeahorsePgpPhoto *self,
                                                           GdkPixbuf *pixbuf);
-
-#endif /* __SEAHORSE_PGP_PHOTO_H__ */
diff --git a/pgp/seahorse-pgp-signature.h b/pgp/seahorse-pgp-signature.h
index 1bc84849..50853c9c 100644
--- a/pgp/seahorse-pgp-signature.h
+++ b/pgp/seahorse-pgp-signature.h
@@ -17,8 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_PGP_SIGNATURE_H__
-#define __SEAHORSE_PGP_SIGNATURE_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -60,5 +59,3 @@ void                   seahorse_pgp_signature_set_flags      (SeahorsePgpSignatu
                                                               guint flags);
 
 guint                  seahorse_pgp_signature_get_sigtype    (SeahorsePgpSignature *self);
-
-#endif /* __SEAHORSE_PGP_SIGNATURE_H__ */
diff --git a/pgp/seahorse-pgp-subkey.h b/pgp/seahorse-pgp-subkey.h
index 7aa4804e..f4ed26f4 100644
--- a/pgp/seahorse-pgp-subkey.h
+++ b/pgp/seahorse-pgp-subkey.h
@@ -17,8 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_PGP_SUBKEY_H__
-#define __SEAHORSE_PGP_SUBKEY_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -99,7 +98,4 @@ const gchar*        seahorse_pgp_subkey_get_fingerprint   (SeahorsePgpSubkey *se
 void                seahorse_pgp_subkey_set_fingerprint   (SeahorsePgpSubkey *self,
                                                            const gchar *description);
 
-gchar*              seahorse_pgp_subkey_calc_fingerprint  (const gchar *raw_fingerprint); 
-
-
-#endif /* __SEAHORSE_PGP_SUBKEY_H__ */
+gchar*              seahorse_pgp_subkey_calc_fingerprint  (const gchar *raw_fingerprint);
diff --git a/pgp/seahorse-pgp-uid.h b/pgp/seahorse-pgp-uid.h
index 77e59b9d..3346bdf2 100644
--- a/pgp/seahorse-pgp-uid.h
+++ b/pgp/seahorse-pgp-uid.h
@@ -17,8 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_PGP_UID_H__
-#define __SEAHORSE_PGP_UID_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -92,5 +91,3 @@ gchar*            seahorse_pgp_uid_calc_markup          (const gchar *name,
 
 GQuark            seahorse_pgp_uid_calc_id              (GQuark key_id,
                                                          guint index);
-
-#endif /* __SEAHORSE_PGP_UID_H__ */
diff --git a/pgp/seahorse-server-source.h b/pgp/seahorse-server-source.h
index e4c55472..feaf218f 100644
--- a/pgp/seahorse-server-source.h
+++ b/pgp/seahorse-server-source.h
@@ -35,9 +35,8 @@
  *   uri: (gchar*) Only for remote key sources. The full URI of the keyserver 
  *        being used. 
  */
- 
-#ifndef __SEAHORSE_SERVER_SOURCE_H__
-#define __SEAHORSE_SERVER_SOURCE_H__
+
+#pragma once
 
 #include "seahorse-pgp-key.h"
 
@@ -130,5 +129,3 @@ gpointer               seahorse_server_source_export_finish    (SeahorseServerSo
                                                                 GAsyncResult *result,
                                                                 gsize *size,
                                                                 GError **error);
-
-#endif /* __SEAHORSE_SERVER_SOURCE_H__ */
diff --git a/pgp/seahorse-transfer.h b/pgp/seahorse-transfer.h
index 8e136e24..05e5e469 100644
--- a/pgp/seahorse-transfer.h
+++ b/pgp/seahorse-transfer.h
@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_TRANSFER_H__
-#define __SEAHORSE_TRANSFER_H__
+#pragma once
 
 #include "seahorse-common.h"
 
@@ -41,5 +40,3 @@ void            seahorse_transfer_keys_async    (SeahorsePlace *from,
 
 gboolean        seahorse_transfer_finish        (GAsyncResult *result,
                                                  GError **error);
-
-#endif /* __SEAHORSE_TRANSFER_H__ */
diff --git a/pgp/seahorse-unknown-source.h b/pgp/seahorse-unknown-source.h
index cf502bb0..a9f6a1b2 100644
--- a/pgp/seahorse-unknown-source.h
+++ b/pgp/seahorse-unknown-source.h
@@ -18,8 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_UNKNOWN_SOURCE_H__
-#define __SEAHORSE_UNKNOWN_SOURCE_H__
+#pragma once
 
 #include "seahorse-common.h"
 
@@ -41,5 +40,3 @@ SeahorseUnknownSource*   seahorse_unknown_source_new           (void);
 SeahorseObject*          seahorse_unknown_source_add_object    (SeahorseUnknownSource *self,
                                                                 const gchar *keyid,
                                                                 GCancellable *cancellable);
-
-#endif /* __SEAHORSE_UNKNOWN_SOURCE_H__ */
diff --git a/pgp/seahorse-unknown.h b/pgp/seahorse-unknown.h
index eb12b3cf..304b2398 100644
--- a/pgp/seahorse-unknown.h
+++ b/pgp/seahorse-unknown.h
@@ -17,8 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SEAHORSE_UNKNOWN_H__
-#define __SEAHORSE_UNKNOWN_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -51,5 +50,3 @@ GType                seahorse_unknown_get_type         (void);
 SeahorseUnknown*     seahorse_unknown_new              (SeahorseUnknownSource *usrc,
                                                         const gchar *keyid,
                                                         const gchar *display);
-
-#endif /* __SEAHORSE_UNKNOWN_H__ */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]