[epiphany] Start using #pragma once
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Start using #pragma once
- Date: Sun, 11 Sep 2016 02:19:24 +0000 (UTC)
commit e797e97dabed7a8ff7a6cd809d9cc8f4cab8b0bb
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sat Sep 10 21:18:30 2016 -0500
Start using #pragma once
It's now required by WebKit, so no reason not to.
Also, clean up a couple places that are missing G_BEGIN_DECLS. Not that
it matters at all, since we don't use any C++.
embed/ephy-about-handler.h | 5 +----
embed/ephy-download.h | 5 +----
embed/ephy-downloads-manager.h | 5 +----
embed/ephy-embed-container.h | 5 +----
embed/ephy-embed-event.h | 5 +----
embed/ephy-embed-prefs.h | 5 +----
embed/ephy-embed-private.h | 8 ++------
embed/ephy-embed-shell.h | 5 +----
embed/ephy-embed-utils.h | 5 +----
embed/ephy-embed.h | 5 +----
embed/ephy-encoding.h | 5 +----
embed/ephy-encodings.h | 5 +----
embed/ephy-file-monitor.h | 5 +----
embed/ephy-find-toolbar.h | 5 +----
embed/ephy-web-extension-proxy.h | 5 +----
embed/ephy-web-view.h | 5 +----
embed/web-extension/ephy-embed-form-auth.h | 5 +----
embed/web-extension/ephy-uri-tester.h | 5 +----
embed/web-extension/ephy-web-dom-utils.h | 5 +----
embed/web-extension/ephy-web-extension-names.h | 5 +----
embed/web-extension/ephy-web-extension.h | 5 +----
embed/web-extension/ephy-web-overview-model.h | 5 +----
embed/web-extension/ephy-web-overview.h | 5 +----
lib/ephy-dbus-util.h | 5 +----
lib/ephy-debug.h | 5 +----
lib/ephy-dnd.h | 5 +----
lib/ephy-favicon-helpers.h | 5 +----
lib/ephy-file-helpers.h | 5 +----
lib/ephy-form-auth-data.h | 5 +----
lib/ephy-gui.h | 5 +----
lib/ephy-initial-state.h | 5 +----
lib/ephy-langs.h | 5 +----
lib/ephy-node-common.h | 7 ++++---
lib/ephy-node-db.h | 5 +----
lib/ephy-node-filter.h | 5 +----
lib/ephy-node.h | 5 +----
lib/ephy-prefs.h | 5 +----
lib/ephy-profile-utils.h | 7 ++++---
lib/ephy-security-levels.h | 5 +----
lib/ephy-settings.h | 7 ++++---
lib/ephy-signal-accumulator.h | 5 +----
lib/ephy-smaps.h | 7 ++++---
lib/ephy-snapshot-service.h | 5 +----
lib/ephy-sqlite-connection.h | 6 +-----
lib/ephy-sqlite-statement.h | 6 +-----
lib/ephy-sqlite.h | 5 +----
lib/ephy-string.h | 5 +----
lib/ephy-time-helpers.h | 5 +----
lib/ephy-uri-helpers.h | 7 +------
lib/ephy-web-app-utils.h | 5 +----
lib/ephy-zoom.h | 5 +----
lib/history/ephy-history-service-private.h | 7 ++++---
lib/history/ephy-history-service.h | 6 +-----
lib/history/ephy-history-types.h | 5 +----
lib/widgets/ephy-certificate-dialog.h | 5 +----
lib/widgets/ephy-download-widget.h | 5 +----
lib/widgets/ephy-downloads-popover.h | 5 +----
lib/widgets/ephy-downloads-progress-icon.h | 5 +----
lib/widgets/ephy-file-chooser.h | 5 +----
lib/widgets/ephy-location-entry.h | 5 +----
lib/widgets/ephy-middle-clickable-button.h | 5 +----
lib/widgets/ephy-node-view.h | 5 +----
lib/widgets/ephy-security-popover.h | 5 +----
lib/widgets/ephy-tree-model-node.h | 5 +----
lib/widgets/ephy-tree-model-sort.h | 5 +----
lib/widgets/nautilus-floating-bar.h | 6 +-----
src/bookmarks/ephy-bookmark-action-group.h | 5 +----
src/bookmarks/ephy-bookmark-action.h | 5 +----
src/bookmarks/ephy-bookmark-properties.h | 5 +----
src/bookmarks/ephy-bookmarks-editor.h | 5 +----
src/bookmarks/ephy-bookmarks-export.h | 5 +----
src/bookmarks/ephy-bookmarks-import.h | 5 +----
src/bookmarks/ephy-bookmarks-menu.h | 7 ++++---
src/bookmarks/ephy-bookmarks-ui.h | 5 +----
src/bookmarks/ephy-bookmarks.h | 5 +----
src/bookmarks/ephy-link-action.h | 5 +----
src/bookmarks/ephy-nodes-cover.h | 5 +----
src/bookmarks/ephy-open-tabs-action.h | 7 ++++---
src/bookmarks/ephy-topic-action-group.h | 5 +----
src/bookmarks/ephy-topic-action.h | 5 +----
src/bookmarks/ephy-topics-entry.h | 5 +----
src/bookmarks/ephy-topics-palette.h | 5 +----
src/bookmarks/ephy-window-action.h | 5 +----
src/clear-data-dialog.h | 5 +----
src/cookies-dialog.h | 5 +----
src/ephy-action-helper.h | 5 +----
src/ephy-completion-model.h | 5 +----
src/ephy-encoding-dialog.h | 5 +----
src/ephy-encoding-row.h | 5 +----
src/ephy-history-window.h | 5 +----
src/ephy-link.h | 5 +----
src/ephy-location-controller.h | 5 +----
src/ephy-lockdown.h | 5 +----
src/ephy-notebook.h | 5 +----
src/ephy-private.h | 8 ++++----
src/ephy-search-provider.h | 5 +----
src/ephy-session.h | 5 +----
src/ephy-shell.h | 5 +----
src/ephy-title-box.h | 5 +----
src/ephy-toolbar.h | 5 +----
src/ephy-window.h | 5 +----
src/languages.h | 2 ++
src/passwords-dialog.h | 5 +----
src/popup-commands.h | 5 +----
src/prefs-dialog.h | 5 +----
src/window-commands.h | 5 +----
106 files changed, 132 insertions(+), 421 deletions(-)
---
diff --git a/embed/ephy-about-handler.h b/embed/ephy-about-handler.h
index d75be82..9fdfd5f 100644
--- a/embed/ephy-about-handler.h
+++ b/embed/ephy-about-handler.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_ABOUT_HANDLER_H
-#define EPHY_ABOUT_HANDLER_H
+#pragma once
#include <webkit2/webkit2.h>
@@ -35,5 +34,3 @@ EphyAboutHandler *ephy_about_handler_new (void);
void ephy_about_handler_handle_request (EphyAboutHandler *handler,
WebKitURISchemeRequest *request);
G_END_DECLS
-
-#endif /* EPHY_ABOUT_HANDLER_H */
diff --git a/embed/ephy-download.h b/embed/ephy-download.h
index e0b8afb..a387816 100644
--- a/embed/ephy-download.h
+++ b/embed/ephy-download.h
@@ -20,8 +20,7 @@
* along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _EPHY_DOWNLOAD_H
-#define _EPHY_DOWNLOAD_H
+#pragma once
#include <glib-object.h>
#include <webkit2/webkit2.h>
@@ -65,5 +64,3 @@ gboolean ephy_download_do_download_action (EphyDownload *download,
EphyDownloadActionType action);
G_END_DECLS
-
-#endif /* _EPHY_DOWNLOAD_H */
diff --git a/embed/ephy-downloads-manager.h b/embed/ephy-downloads-manager.h
index 8d5149f..08ef83c 100644
--- a/embed/ephy-downloads-manager.h
+++ b/embed/ephy-downloads-manager.h
@@ -18,8 +18,7 @@
*
*/
-#ifndef EPHY_DOWNLOADS_MANAGER_H
-#define EPHY_DOWNLOADS_MANAGER_H
+#pragma once
#include "ephy-download.h"
@@ -38,5 +37,3 @@ GList *ephy_downloads_manager_get_downloads (EphyDownloadsManager *ma
gdouble ephy_downloads_manager_get_estimated_progress (EphyDownloadsManager *manager);
G_END_DECLS
-
-#endif /* EPHY_DOWNLOADS_MANAGER_H */
diff --git a/embed/ephy-embed-container.h b/embed/ephy-embed-container.h
index 596b7ae..8f986bd 100644
--- a/embed/ephy-embed-container.h
+++ b/embed/ephy-embed-container.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_EMBED_CONTAINER_H
-#define EPHY_EMBED_CONTAINER_H
+#pragma once
#include "ephy-embed.h"
#include "ephy-web-view.h"
@@ -65,5 +64,3 @@ GList * ephy_embed_container_get_children (EphyEmbedContainer *con
gboolean ephy_embed_container_get_is_popup (EphyEmbedContainer *container);
G_END_DECLS
-
-#endif
diff --git a/embed/ephy-embed-event.h b/embed/ephy-embed-event.h
index f208102..aed209f 100644
--- a/embed/ephy-embed-event.h
+++ b/embed/ephy-embed-event.h
@@ -18,8 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_EMBED_EVENT_H
-#define EPHY_EMBED_EVENT_H
+#pragma once
#include <webkit2/webkit2.h>
@@ -45,5 +44,3 @@ gboolean ephy_embed_event_has_property (EphyEmbedEvent *
WebKitHitTestResult *ephy_embed_event_get_hit_test_result (EphyEmbedEvent *event);
G_END_DECLS
-
-#endif
diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h
index 500c440..f262256 100644
--- a/embed/ephy-embed-prefs.h
+++ b/embed/ephy-embed-prefs.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __EPHY_EMBED_PREFS_H__
-#define __EPHY_EMBED_PREFS_H__
+#pragma once
#include "ephy-embed.h"
@@ -33,5 +32,3 @@ void ephy_embed_prefs_set_cookie_accept_policy (WebKitCookieManager *co
const char *settings_policy);
G_END_DECLS
-
-#endif /* __EPHY_EMBED_PREFS_H__ */
diff --git a/embed/ephy-embed-private.h b/embed/ephy-embed-private.h
index a591125..7469a72 100644
--- a/embed/ephy-embed-private.h
+++ b/embed/ephy-embed-private.h
@@ -16,13 +16,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#pragma once
+
#include "ephy-embed-shell.h"
#include "ephy-history-types.h"
#include "ephy-web-view.h"
-#ifndef EPHY_EMBED_PRIVATE_H
-#define EPHY_EMBED_PRIVATE_H
-
G_BEGIN_DECLS
/* EphyWebView */
@@ -52,6 +51,3 @@ char * ephy_web_view_create_web_application (EphyWebView
const char *title,
GdkPixbuf *icon);
G_END_DECLS
-
-#endif
-
diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h
index 1617d45..d826d80 100644
--- a/embed/ephy-embed-shell.h
+++ b/embed/ephy-embed-shell.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_EMBED_SHELL_H
-#define EPHY_EMBED_SHELL_H
+#pragma once
#include <webkit2/webkit2.h>
#include "ephy-downloads-manager.h"
@@ -75,5 +74,3 @@ WebKitUserContentManager *ephy_embed_shell_get_user_content_manager (EphyEmbedSh
EphyDownloadsManager *ephy_embed_shell_get_downloads_manager (EphyEmbedShell *shell);
G_END_DECLS
-
-#endif /* !EPHY_EMBED_SHELL_H */
diff --git a/embed/ephy-embed-utils.h b/embed/ephy-embed-utils.h
index 64841c3..83ab436 100644
--- a/embed/ephy-embed-utils.h
+++ b/embed/ephy-embed-utils.h
@@ -19,8 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_EMBED_UTILS_H
-#define EPHY_EMBED_UTILS_H
+#pragma once
#include "ephy-web-view.h"
#include <webkit2/webkit2.h>
@@ -49,5 +48,3 @@ double ephy_embed_utils_get_js_result_as_number (WebKitJavascrip
void ephy_embed_utils_shutdown (void);
G_END_DECLS
-
-#endif
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index 22f85bf..6a8013f 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_EMBED_H
-#define EPHY_EMBED_H
+#pragma once
#include "ephy-find-toolbar.h"
#include "ephy-web-view.h"
@@ -48,5 +47,3 @@ gboolean ephy_embed_inspector_is_loaded (EphyEmbed *embed);
const char *ephy_embed_get_title (EphyEmbed *embed);
G_END_DECLS
-
-#endif
diff --git a/embed/ephy-encoding.h b/embed/ephy-encoding.h
index 728a1e4..d912ebb 100644
--- a/embed/ephy-encoding.h
+++ b/embed/ephy-encoding.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_ENCODING_H
-#define EPHY_ENCODING_H
+#pragma once
#include <glib-object.h>
#include <glib.h>
@@ -65,5 +64,3 @@ const char * ephy_encoding_get_collation_key (EphyEncoding *encoding);
int ephy_encoding_get_language_groups (EphyEncoding *encoding);
G_END_DECLS
-
-#endif
diff --git a/embed/ephy-encodings.h b/embed/ephy-encodings.h
index 980fc09..63e210f 100644
--- a/embed/ephy-encodings.h
+++ b/embed/ephy-encodings.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_ENCODINGS_H
-#define EPHY_ENCODINGS_H
+#pragma once
#include <glib-object.h>
#include <glib.h>
@@ -43,5 +42,3 @@ void ephy_encodings_add_recent (EphyEncodings *encodings,
GList *ephy_encodings_get_recent (EphyEncodings *encodings);
G_END_DECLS
-
-#endif
diff --git a/embed/ephy-file-monitor.h b/embed/ephy-file-monitor.h
index b232175..81285d9 100644
--- a/embed/ephy-file-monitor.h
+++ b/embed/ephy-file-monitor.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_FILE_MONITOR_H
-#define EPHY_FILE_MONITOR_H
+#pragma once
#include "ephy-web-view.h"
@@ -33,5 +32,3 @@ void ephy_file_monitor_update_location (EphyFileMonitor *monitor,
const char *address);
G_END_DECLS
-
-#endif
diff --git a/embed/ephy-find-toolbar.h b/embed/ephy-find-toolbar.h
index 3a1985e..a9cb672 100644
--- a/embed/ephy-find-toolbar.h
+++ b/embed/ephy-find-toolbar.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_FIND_TOOLBAR_H
-#define EPHY_FIND_TOOLBAR_H
+#pragma once
#include <gtk/gtk.h>
@@ -48,5 +47,3 @@ void ephy_find_toolbar_request_close (EphyFindToolbar *toolbar);
void ephy_find_toolbar_toggle_state (EphyFindToolbar *toolbar);
G_END_DECLS
-
-#endif /* EPHY_FIND_TOOLBAR_H */
diff --git a/embed/ephy-web-extension-proxy.h b/embed/ephy-web-extension-proxy.h
index b5ec077..39c01e0 100644
--- a/embed/ephy-web-extension-proxy.h
+++ b/embed/ephy-web-extension-proxy.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_WEB_EXTENSION_PROXY_H
-#define EPHY_WEB_EXTENSION_PROXY_H
+#pragma once
#include <gio/gio.h>
@@ -73,5 +72,3 @@ void ephy_web_extension_proxy_history_delete_host
void ephy_web_extension_proxy_history_clear
(EphyWebExtensionProxy *web_extension);
G_END_DECLS
-
-#endif /* !EPHY_WEB_EXTENSION_PROXY_H */
diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h
index ca0b04a..3b2b104 100644
--- a/embed/ephy-web-view.h
+++ b/embed/ephy-web-view.h
@@ -18,8 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_WEB_VIEW_H
-#define EPHY_WEB_VIEW_H
+#pragma once
#include <webkit2/webkit2.h>
@@ -117,5 +116,3 @@ char *ephy_web_view_get_web_app_title_finish (EphyWebView
GError **error);
G_END_DECLS
-
-#endif
diff --git a/embed/web-extension/ephy-embed-form-auth.h b/embed/web-extension/ephy-embed-form-auth.h
index 256ff1c..ccf45ad 100644
--- a/embed/web-extension/ephy-embed-form-auth.h
+++ b/embed/web-extension/ephy-embed-form-auth.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_EMBED_FORM_AUTH_H
-#define EPHY_EMBED_FORM_AUTH_H
+#pragma once
#include <glib-object.h>
#include <libsoup/soup.h>
@@ -41,5 +40,3 @@ const char *ephy_embed_form_auth_get_username (EphyEmbedFormAuth *fo
WebKitDOMDocument *ephy_embed_form_auth_get_owner_document(EphyEmbedFormAuth *form_auth);
G_END_DECLS
-
-#endif /* EPHY_EMBED_FORM_AUTH_H */
diff --git a/embed/web-extension/ephy-uri-tester.h b/embed/web-extension/ephy-uri-tester.h
index 2c0497e..753673f 100644
--- a/embed/web-extension/ephy-uri-tester.h
+++ b/embed/web-extension/ephy-uri-tester.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef URI_TESTER_H
-#define URI_TESTER_H
+#pragma once
#include <glib-object.h>
#include <glib.h>
@@ -37,5 +36,3 @@ void ephy_uri_tester_set_filters (EphyUriTester *tester,
GSList *filters);
G_END_DECLS
-
-#endif /* URI_TESTER_H */
diff --git a/embed/web-extension/ephy-web-dom-utils.h b/embed/web-extension/ephy-web-dom-utils.h
index 5c7aea9..262e65f 100644
--- a/embed/web-extension/ephy-web-dom-utils.h
+++ b/embed/web-extension/ephy-web-dom-utils.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_WEB_DOM_UTILS_H
-#define EPHY_WEB_DOM_UTILS_H
+#pragma once
#include <webkitdom/webkitdom.h>
#define WEBKIT_DOM_USE_UNSTABLE_API
@@ -48,5 +47,3 @@ void ephy_web_dom_utils_get_absolute_position_for_element(WebKitDOMElement *elem
char *ephy_web_dom_utils_get_selection_as_string (WebKitDOMDOMSelection *selection);
G_END_DECLS
-
-#endif
diff --git a/embed/web-extension/ephy-web-extension-names.h b/embed/web-extension/ephy-web-extension-names.h
index 93bbcf8..a4cccdd 100644
--- a/embed/web-extension/ephy-web-extension-names.h
+++ b/embed/web-extension/ephy-web-extension-names.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_WEB_EXTENSION_NAMES_H
-#define EPHY_WEB_EXTENSION_NAMES_H
+#pragma once
G_BEGIN_DECLS
@@ -25,5 +24,3 @@ G_BEGIN_DECLS
#define EPHY_WEB_EXTENSION_INTERFACE "org.gnome.Epiphany.WebExtension"
G_END_DECLS
-
-#endif /* EPHY_WEB_EXTENSION_NAMES_H */
diff --git a/embed/web-extension/ephy-web-extension.h b/embed/web-extension/ephy-web-extension.h
index f3535f4..502251c 100644
--- a/embed/web-extension/ephy-web-extension.h
+++ b/embed/web-extension/ephy-web-extension.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_WEB_EXTENSION_H
-#define EPHY_WEB_EXTENSION_H
+#pragma once
#include <glib-object.h>
#include <webkit2/webkit-web-extension.h>
@@ -36,5 +35,3 @@ void ephy_web_extension_initialize (EphyWebExtension *extensi
G_END_DECLS
-
-#endif /* EPHY_WEB_EXTENSION_H */
diff --git a/embed/web-extension/ephy-web-overview-model.h b/embed/web-extension/ephy-web-overview-model.h
index be9c4bd..865cb02 100644
--- a/embed/web-extension/ephy-web-overview-model.h
+++ b/embed/web-extension/ephy-web-overview-model.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _EPHY_WEB_OVERVIEW_MODEL_H
-#define _EPHY_WEB_OVERVIEW_MODEL_H
+#pragma once
#include <glib-object.h>
@@ -58,5 +57,3 @@ EphyWebOverviewModelItem *ephy_web_overview_model_item_new (const char
void ephy_web_overview_model_item_free (EphyWebOverviewModelItem *item);
G_END_DECLS
-
-#endif /* _EPHY_WEB_OVERVIEW_MODEL_H */
diff --git a/embed/web-extension/ephy-web-overview.h b/embed/web-extension/ephy-web-overview.h
index 7d67c84..6bb84e3 100644
--- a/embed/web-extension/ephy-web-overview.h
+++ b/embed/web-extension/ephy-web-overview.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _EPHY_WEB_OVERVIEW_H
-#define _EPHY_WEB_OVERVIEW_H
+#pragma once
#include "ephy-web-overview-model.h"
#include <webkit2/webkit-web-extension.h>
@@ -35,5 +34,3 @@ void ephy_web_overview_init_js (EphyWebOverview *overview,
JSGlobalContextRef context);
G_END_DECLS
-
-#endif /* _EPHY_WEB_OVERVIEW_H */
diff --git a/lib/ephy-dbus-util.h b/lib/ephy-dbus-util.h
index 0da7bb7..b22e26d 100644
--- a/lib/ephy-dbus-util.h
+++ b/lib/ephy-dbus-util.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_DBUS_UTIL_H
-#define EPHY_DBUS_UTIL_H
+#pragma once
#include <gio/gio.h>
@@ -25,5 +24,3 @@ G_BEGIN_DECLS
gboolean ephy_dbus_peer_is_authorized (GCredentials *peer_credentials);
G_END_DECLS
-
-#endif
diff --git a/lib/ephy-debug.h b/lib/ephy-debug.h
index 4225642..259fac7 100644
--- a/lib/ephy-debug.h
+++ b/lib/ephy-debug.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_DEBUG_H
-#define EPHY_DEBUG_H
+#pragma once
#include <glib.h>
@@ -77,5 +76,3 @@ void ephy_profiler_stop (const char *name);
#endif
G_END_DECLS
-
-#endif
diff --git a/lib/ephy-dnd.h b/lib/ephy-dnd.h
index 275740a..ac4b030 100644
--- a/lib/ephy-dnd.h
+++ b/lib/ephy-dnd.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_DND_H
-#define EPHY_DND_H
+#pragma once
#include <glib.h>
#include <gtk/gtk.h>
@@ -45,5 +44,3 @@ gboolean ephy_dnd_drag_data_get (GtkWidget *widget,
EphyDragEachSelectedItemIterator
each_selected_item_iterator);
G_END_DECLS
-
-#endif
diff --git a/lib/ephy-favicon-helpers.h b/lib/ephy-favicon-helpers.h
index 8ae228f..514a408 100644
--- a/lib/ephy-favicon-helpers.h
+++ b/lib/ephy-favicon-helpers.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_FAVICON_HELPERS_H
-#define EPHY_FAVICON_HELPERS_H
+#pragma once
#include <cairo.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
@@ -26,5 +25,3 @@ G_BEGIN_DECLS
GdkPixbuf *ephy_pixbuf_get_from_surface_scaled (cairo_surface_t *surface, int width, int height);
G_END_DECLS
-
-#endif /* EPHY_FAVICON_HELPERS_H */
diff --git a/lib/ephy-file-helpers.h b/lib/ephy-file-helpers.h
index 650ff0f..1ccf06f 100644
--- a/lib/ephy-file-helpers.h
+++ b/lib/ephy-file-helpers.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_FILE_HELPERS_H
-#define EPHY_FILE_HELPERS_H
+#pragma once
#include <glib.h>
#include <gio/gio.h>
@@ -94,5 +93,3 @@ GAppInfo * ephy_file_launcher_get_app_info_for_file (GFile
void ephy_open_incognito_window (const char *uri);
G_END_DECLS
-
-#endif /* EPHY_FILE_HELPERS_H */
diff --git a/lib/ephy-form-auth-data.h b/lib/ephy-form-auth-data.h
index 5ec13d7..b89def3 100644
--- a/lib/ephy-form-auth-data.h
+++ b/lib/ephy-form-auth-data.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_FORM_AUTH_DATA_H
-#define EPHY_FORM_AUTH_DATA_H
+#pragma once
#define SECRET_API_SUBJECT_TO_CHANGE
@@ -72,5 +71,3 @@ void ephy_form_auth_data_cache_add (EphyFormAuthDataCache
const char *username);
GSList *ephy_form_auth_data_cache_get_list (EphyFormAuthDataCache *cache,
const char *uri);
-
-#endif
diff --git a/lib/ephy-gui.h b/lib/ephy-gui.h
index f10a794..7748422 100644
--- a/lib/ephy-gui.h
+++ b/lib/ephy-gui.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_GUI_H
-#define EPHY_GUI_H
+#pragma once
#include <gdk/gdkkeysyms.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
@@ -59,5 +58,3 @@ void ephy_gui_window_update_user_time (GtkWidget *window,
guint32 user_time);
G_END_DECLS
-
-#endif
diff --git a/lib/ephy-initial-state.h b/lib/ephy-initial-state.h
index 74d7a8a..18f64be 100644
--- a/lib/ephy-initial-state.h
+++ b/lib/ephy-initial-state.h
@@ -18,8 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_STATE_H
-#define EPHY_STATE_H
+#pragma once
#include <gtk/gtk.h>
@@ -47,5 +46,3 @@ void ephy_initial_state_add_expander (GtkWidget *widget,
void ephy_initial_state_save (void);
G_END_DECLS
-
-#endif /* EPHY_STATE_H */
diff --git a/lib/ephy-langs.h b/lib/ephy-langs.h
index bfe82d1..8f494a3 100644
--- a/lib/ephy-langs.h
+++ b/lib/ephy-langs.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_LANGS_H
-#define EPHY_LANGS_H
+#pragma once
#include <glib.h>
@@ -37,5 +36,3 @@ GHashTable *ephy_langs_iso_639_table (void);
GHashTable *ephy_langs_iso_3166_table (void);
G_END_DECLS
-
-#endif
diff --git a/lib/ephy-node-common.h b/lib/ephy-node-common.h
index 7c5b372..8fb7fbd 100644
--- a/lib/ephy-node-common.h
+++ b/lib/ephy-node-common.h
@@ -15,8 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __EPHY_NODE_COMMON_H
-#define __EPHY_NODE_COMMON_H
+#pragma once
+
+G_BEGIN_DECLS
/* Databases */
#define EPHY_NODE_DB_HISTORY "EphyHistory"
@@ -46,4 +47,4 @@ typedef enum
EPHY_NODE_NORMAL_PRIORITY
} EphyNodePriority;
-#endif /* EPHY_NODE_COMMON_H */
+G_END_DECLS
diff --git a/lib/ephy-node-db.h b/lib/ephy-node-db.h
index 52f4a1f..cf3a63c 100644
--- a/lib/ephy-node-db.h
+++ b/lib/ephy-node-db.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_NODE_DB_H
-#define EPHY_NODE_DB_H
+#pragma once
#include <glib-object.h>
@@ -64,5 +63,3 @@ void _ephy_node_db_remove_id (EphyNodeDb *db,
guint id);
G_END_DECLS
-
-#endif /* __EPHY_NODE_DB_H */
diff --git a/lib/ephy-node-filter.h b/lib/ephy-node-filter.h
index a047221..639015d 100644
--- a/lib/ephy-node-filter.h
+++ b/lib/ephy-node-filter.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_NODE_FILTER_H
-#define EPHY_NODE_FILTER_H
+#pragma once
#include <glib-object.h>
@@ -74,5 +73,3 @@ EphyNodeFilterExpression *ephy_node_filter_expression_new (EphyNodeFilterExpres
void ephy_node_filter_expression_free (EphyNodeFilterExpression *expression);
G_END_DECLS
-
-#endif /* EPHY_NODE_FILTER_H */
diff --git a/lib/ephy-node.h b/lib/ephy-node.h
index 14b43ce..3c1cd42 100644
--- a/lib/ephy-node.h
+++ b/lib/ephy-node.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_NODE_H
-#define EPHY_NODE_H
+#pragma once
#include <libxml/tree.h>
#include <libxml/xmlwriter.h>
@@ -152,5 +151,3 @@ void ephy_node_set_is_drag_dest (EphyNode *node,
gboolean ephy_node_get_is_drag_dest (EphyNode *node);
G_END_DECLS
-
-#endif /* __EPHY_NODE_H */
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index f6d61c2..5ac7ed9 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_PREFS_H
-#define EPHY_PREFS_H
+#pragma once
G_BEGIN_DECLS
@@ -125,5 +124,3 @@ typedef enum
#define EPHY_PREFS_LOCKDOWN_JAVASCRIPT_CHROME "disable-javascript-chrome"
G_END_DECLS
-
-#endif
diff --git a/lib/ephy-profile-utils.h b/lib/ephy-profile-utils.h
index a68387d..105496c 100644
--- a/lib/ephy-profile-utils.h
+++ b/lib/ephy-profile-utils.h
@@ -15,11 +15,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_PROFILE_UTILS_H
-#define EPHY_PROFILE_UTILS_H
+#pragma once
#include <glib.h>
+G_BEGIN_DECLS
+
#define EPHY_PROFILE_MIGRATION_VERSION 10
#define EPHY_HISTORY_FILE "ephy-history.db"
@@ -32,4 +33,4 @@ gboolean ephy_profile_utils_set_migration_version (int version);
gboolean ephy_profile_utils_do_migration (const char *profile_directory, int test_to_run, gboolean debug);
-#endif
+G_END_DECLS
diff --git a/lib/ephy-security-levels.h b/lib/ephy-security-levels.h
index 033f330..78e0ce8 100644
--- a/lib/ephy-security-levels.h
+++ b/lib/ephy-security-levels.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_SECURITY_LEVELS_H
-#define EPHY_SECURITY_LEVELS_H
+#pragma once
#include "glib.h"
@@ -43,5 +42,3 @@ typedef enum
const char *ephy_security_level_to_icon_name (EphySecurityLevel level);
G_END_DECLS
-
-#endif
diff --git a/lib/ephy-settings.h b/lib/ephy-settings.h
index e05821e..e5d33db 100644
--- a/lib/ephy-settings.h
+++ b/lib/ephy-settings.h
@@ -17,14 +17,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_SETTINGS_H
-#define EPHY_SETTINGS_H
+#pragma once
#include <glib.h>
#include <gio/gio.h>
#include "ephy-prefs.h"
+G_BEGIN_DECLS
+
#define EPHY_SETTINGS_MAIN ephy_settings_get (EPHY_PREFS_SCHEMA)
#define EPHY_SETTINGS_UI ephy_settings_get (EPHY_PREFS_UI_SCHEMA)
#define EPHY_SETTINGS_WEB ephy_settings_get (EPHY_PREFS_WEB_SCHEMA)
@@ -35,4 +36,4 @@ GSettings *ephy_settings_get (const char *schema);
void ephy_settings_shutdown (void);
-#endif /* EPHY_SETTINGS_H */
+G_END_DECLS
diff --git a/lib/ephy-signal-accumulator.h b/lib/ephy-signal-accumulator.h
index 68a0f50..4225678 100644
--- a/lib/ephy-signal-accumulator.h
+++ b/lib/ephy-signal-accumulator.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_SIGNAL_ACCUMULATORS_H
-#define EPHY_SIGNAL_ACCUMULATORS_H
+#pragma once
#include <glib-object.h>
@@ -33,5 +32,3 @@ gboolean ephy_signal_accumulator_string (GSignalInvocationHint *ihint,
gpointer accu_data);
G_END_DECLS
-
-#endif /* EPHY_SIGNAL_ACCUMULATORS_H */
diff --git a/lib/ephy-smaps.h b/lib/ephy-smaps.h
index 24768db..8eb5d5c 100644
--- a/lib/ephy-smaps.h
+++ b/lib/ephy-smaps.h
@@ -17,11 +17,12 @@
*
*/
-#ifndef EPHY_SMAPS_H
-#define EPHY_SMAPS_H
+#pragma once
#include <glib-object.h>
+G_BEGIN_DECLS
+
#define EPHY_TYPE_SMAPS (ephy_smaps_get_type ())
G_DECLARE_FINAL_TYPE (EphySMaps, ephy_smaps, EPHY, SMAPS, GObject)
@@ -29,4 +30,4 @@ G_DECLARE_FINAL_TYPE (EphySMaps, ephy_smaps, EPHY, SMAPS, GObject)
EphySMaps * ephy_smaps_new (void);
char * ephy_smaps_to_html (EphySMaps *smaps);
-#endif /* EPHY_SMAPS_H */
+G_END_DECLS
diff --git a/lib/ephy-snapshot-service.h b/lib/ephy-snapshot-service.h
index 5194b33..3c784c3 100644
--- a/lib/ephy-snapshot-service.h
+++ b/lib/ephy-snapshot-service.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _EPHY_SNAPSHOT_SERVICE_H
-#define _EPHY_SNAPSHOT_SERVICE_H
+#pragma once
#include <gtk/gtk.h>
#include <webkit2/webkit2.h>
@@ -72,5 +71,3 @@ char *ephy_snapshot_service_get_snapshot_path_finish (Eph
GError **error);
G_END_DECLS
-
-#endif /* _EPHY_SNAPSHOT_SERVICE_H */
diff --git a/lib/ephy-sqlite-connection.h b/lib/ephy-sqlite-connection.h
index a4b971c..f84c644 100644
--- a/lib/ephy-sqlite-connection.h
+++ b/lib/ephy-sqlite-connection.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_SQLITE_CONNECTION_H
-#define EPHY_SQLITE_CONNECTION_H
+#pragma once
#include <glib-object.h>
#include "ephy-sqlite-statement.h"
@@ -45,6 +44,3 @@ gboolean ephy_sqlite_connection_commit_transaction (EphySQLi
gboolean ephy_sqlite_connection_table_exists (EphySQLiteConnection *self, const
char *table_name);
G_END_DECLS
-
-#endif /* EPHY_SQLITE_CONNECTION_H */
-
diff --git a/lib/ephy-sqlite-statement.h b/lib/ephy-sqlite-statement.h
index 8f7411e..8b83254 100644
--- a/lib/ephy-sqlite-statement.h
+++ b/lib/ephy-sqlite-statement.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_SQLITE_STATEMENT_H
-#define EPHY_SQLITE_STATEMENT_H
+#pragma once
#include <glib-object.h>
#include "ephy-sqlite.h"
@@ -49,6 +48,3 @@ const void* ephy_sqlite_statement_get_column_as_blob (EphySQLite
char* ephy_sqlite_create_match_pattern (const char *match_string);
G_END_DECLS
-
-#endif /* EPHY_SQLITE_STATEMENT_H */
-
diff --git a/lib/ephy-sqlite.h b/lib/ephy-sqlite.h
index db70cf3..6813da1 100644
--- a/lib/ephy-sqlite.h
+++ b/lib/ephy-sqlite.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_SQLITE_H
-#define EPHY_SQLITE_H
+#pragma once
G_BEGIN_DECLS
@@ -31,5 +30,3 @@ typedef enum {
#define EPHY_SQLITE_LIMIT_LIKE_PATTERN_LENGTH 50000
G_END_DECLS
-
-#endif /* EPHY_SQLITE_H */
diff --git a/lib/ephy-string.h b/lib/ephy-string.h
index 04a5be0..fe67fb4 100644
--- a/lib/ephy-string.h
+++ b/lib/ephy-string.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_STRING_H
-#define EPHY_STRING_H
+#pragma once
#include <glib.h>
#include <glib-object.h>
@@ -40,5 +39,3 @@ char **ephy_string_commandline_args_to_uris (char **arguments, GError **error
G_END_DECLS
-
-#endif
diff --git a/lib/ephy-time-helpers.h b/lib/ephy-time-helpers.h
index 19a6cac..922f222 100644
--- a/lib/ephy-time-helpers.h
+++ b/lib/ephy-time-helpers.h
@@ -19,8 +19,7 @@
/* Following code is copied from Rhythmbox rb-cut-and-paste-code.h */
-#ifndef EPHY_TIME_HELPERS_H
-#define EPHY_TIME_HELPERS_H
+#pragma once
#include <time.h>
@@ -32,5 +31,3 @@ char *eel_strdup_strftime (const char *format,
char * ephy_time_helpers_utf_friendly_time (time_t date);
G_END_DECLS
-
-#endif /* EPHY_TIME_HELPERS_H */
diff --git a/lib/ephy-uri-helpers.h b/lib/ephy-uri-helpers.h
index e7fffa1..0e1a2ce 100644
--- a/lib/ephy-uri-helpers.h
+++ b/lib/ephy-uri-helpers.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_URI_HELPERS_H
-#define EPHY_URI_HELPERS_H
+#pragma once
#include <glib.h>
@@ -28,7 +27,3 @@ char *ephy_uri_decode (const char *uri);
char *ephy_uri_normalize (const char *uri);
G_END_DECLS
-
-#endif /* EPHY_URI_HELPERS_H */
-
-/* vim: set sw=2 ts=2 sts=2 et: */
diff --git a/lib/ephy-web-app-utils.h b/lib/ephy-web-app-utils.h
index 8b92a24..e31db88 100644
--- a/lib/ephy-web-app-utils.h
+++ b/lib/ephy-web-app-utils.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_WEB_APP_UTILS_H
-#define EPHY_WEB_APP_UTILS_H
+#pragma once
#include <gio/gdesktopappinfo.h>
#include <glib.h>
@@ -56,5 +55,3 @@ gboolean ephy_web_application_exists (const char *name);
G_END_DECLS
-#endif
-
diff --git a/lib/ephy-zoom.h b/lib/ephy-zoom.h
index 1e0afc8..d32eaa6 100644
--- a/lib/ephy-zoom.h
+++ b/lib/ephy-zoom.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_ZOOM_H
-#define EPHY_ZOOM_H
+#pragma once
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -60,5 +59,3 @@ float ephy_zoom_get_changed_zoom_level (float level,
float ephy_zoom_get_nearest_zoom_level (float level);
G_END_DECLS
-
-#endif
diff --git a/lib/history/ephy-history-service-private.h b/lib/history/ephy-history-service-private.h
index 668de58..cbe0f45 100644
--- a/lib/history/ephy-history-service-private.h
+++ b/lib/history/ephy-history-service-private.h
@@ -16,11 +16,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_HISTORY_SERVICE_PRIVATE_H
-#define EPHY_HISTORY_SERVICE_PRIVATE_H
+#pragma once
#include "ephy-sqlite-connection.h"
+G_BEGIN_DECLS
+
struct _EphyHistoryService {
GObject parent_instance;
char *history_filename;
@@ -55,4 +56,4 @@ EphyHistoryHost * ephy_history_service_get_host_row_from_url (EphyHisto
void ephy_history_service_delete_host_row (EphyHistoryService *self,
EphyHistoryHost *host);
void ephy_history_service_delete_orphan_hosts (EphyHistoryService *self);
-#endif /* EPHY_HISTORY_SERVICE_PRIVATE_H */
+G_END_DECLS
diff --git a/lib/history/ephy-history-service.h b/lib/history/ephy-history-service.h
index 0436fdc..dc760a3 100644
--- a/lib/history/ephy-history-service.h
+++ b/lib/history/ephy-history-service.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_HISTORY_SERVICE_H
-#define EPHY_HISTORY_SERVICE_H
+#pragma once
#include <glib-object.h>
#include <gio/gio.h>
@@ -55,6 +54,3 @@ void ephy_history_service_clear (EphyHisto
void ephy_history_service_find_hosts (EphyHistoryService *self, gint64
from, gint64 to, GCancellable *cancellable, EphyHistoryJobCallback callback, gpointer user_data);
G_END_DECLS
-
-#endif /* EPHY_HISTORY_SERVICE_H */
-
diff --git a/lib/history/ephy-history-types.h b/lib/history/ephy-history-types.h
index 18ee968..74a2029 100644
--- a/lib/history/ephy-history-types.h
+++ b/lib/history/ephy-history-types.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_HISTORY_TYPES_H
-#define EPHY_HISTORY_TYPES_H
+#pragma once
#include <glib.h>
@@ -123,5 +122,3 @@ void ephy_history_query_free (EphyHistoryQuery *query
EphyHistoryQuery * ephy_history_query_copy (EphyHistoryQuery *query);
G_END_DECLS
-
-#endif /* EPHY_HISTORY_TYPES_H */
diff --git a/lib/widgets/ephy-certificate-dialog.h b/lib/widgets/ephy-certificate-dialog.h
index 47bfe39..b663beb 100644
--- a/lib/widgets/ephy-certificate-dialog.h
+++ b/lib/widgets/ephy-certificate-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_CERTIFICATE_DIALOG_H
-#define EPHY_CERTIFICATE_DIALOG_H
+#pragma once
#include "ephy-security-levels.h"
@@ -36,5 +35,3 @@ GtkWidget *ephy_certificate_dialog_new (GtkWindow *parent,
EphySecurityLevel security_level);
G_END_DECLS
-
-#endif
diff --git a/lib/widgets/ephy-download-widget.h b/lib/widgets/ephy-download-widget.h
index 0cd3a35..10db352 100644
--- a/lib/widgets/ephy-download-widget.h
+++ b/lib/widgets/ephy-download-widget.h
@@ -20,8 +20,7 @@
* along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _EPHY_DOWNLOAD_WIDGET_H
-#define _EPHY_DOWNLOAD_WIDGET_H
+#pragma once
#include <glib-object.h>
#include "ephy-download.h"
@@ -37,5 +36,3 @@ GtkWidget *ephy_download_widget_new (EphyDownload *ephy_download);
EphyDownload *ephy_download_widget_get_download (EphyDownloadWidget *widget);
G_END_DECLS
-
-#endif /* _EPHY_DOWNLOAD_WIDGET_H */
diff --git a/lib/widgets/ephy-downloads-popover.h b/lib/widgets/ephy-downloads-popover.h
index 3a8e8b2..d3de7ce 100644
--- a/lib/widgets/ephy-downloads-popover.h
+++ b/lib/widgets/ephy-downloads-popover.h
@@ -17,8 +17,7 @@
*
*/
-#ifndef EPHY_DOWNLOADS_POPOVER_H
-#define EPHY_DOWNLOADS_POPOVER_H
+#pragma once
#include <gtk/gtk.h>
@@ -33,5 +32,3 @@ G_DECLARE_FINAL_TYPE (EphyDownloadsPopover, ephy_downloads_popover, EPHY, DOWNLO
GtkWidget *ephy_downloads_popover_new (GtkWidget *relative_to);
G_END_DECLS
-
-#endif
diff --git a/lib/widgets/ephy-downloads-progress-icon.h b/lib/widgets/ephy-downloads-progress-icon.h
index 283e366..5d84b1a 100644
--- a/lib/widgets/ephy-downloads-progress-icon.h
+++ b/lib/widgets/ephy-downloads-progress-icon.h
@@ -17,8 +17,7 @@
*
*/
-#ifndef EPHY_DOWNLOADS_PROGRESS_ICON_H
-#define EPHY_DOWNLOADS_PROGRESS_ICON_H
+#pragma once
#include <gtk/gtk.h>
@@ -33,5 +32,3 @@ G_DECLARE_FINAL_TYPE (EphyDownloadsProgressIcon, ephy_downloads_progress_icon, E
GtkWidget *ephy_downloads_progress_icon_new (void);
G_END_DECLS
-
-#endif
diff --git a/lib/widgets/ephy-file-chooser.h b/lib/widgets/ephy-file-chooser.h
index 0301682..fc277ec 100644
--- a/lib/widgets/ephy-file-chooser.h
+++ b/lib/widgets/ephy-file-chooser.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_FILE_CHOOSER_H
-#define EPHY_FILE_CHOOSER_H
+#pragma once
#include <glib-object.h>
@@ -54,5 +53,3 @@ GtkFileFilter *ephy_file_chooser_add_mime_filter (EphyFileChooser *dialog,
...);
G_END_DECLS
-
-#endif
diff --git a/lib/widgets/ephy-location-entry.h b/lib/widgets/ephy-location-entry.h
index 52fcfc6..9aa5c28 100644
--- a/lib/widgets/ephy-location-entry.h
+++ b/lib/widgets/ephy-location-entry.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_LOCATION_ENTRY_H
-#define EPHY_LOCATION_ENTRY_H
+#pragma once
#include <gtk/gtk.h>
@@ -77,5 +76,3 @@ void ephy_location_entry_set_lock_tooltip (EphyLocationEntry *entry,
const char *tooltip);
G_END_DECLS
-
-#endif
diff --git a/lib/widgets/ephy-middle-clickable-button.h b/lib/widgets/ephy-middle-clickable-button.h
index 1b9a69a..737c9ef 100644
--- a/lib/widgets/ephy-middle-clickable-button.h
+++ b/lib/widgets/ephy-middle-clickable-button.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __EPHY_MIDDLE_CLICKABLE_BUTTON_H__
-#define __EPHY_MIDDLE_CLICKABLE_BUTTON_H__
+#pragma once
#include <gtk/gtk.h>
@@ -31,5 +30,3 @@ G_DECLARE_FINAL_TYPE (EphyMiddleClickableButton, ephy_middle_clickable_button, E
GtkWidget *ephy_middle_clickable_button_new (void);
G_END_DECLS
-
-#endif
diff --git a/lib/widgets/ephy-node-view.h b/lib/widgets/ephy-node-view.h
index 109ae3f..7910449 100644
--- a/lib/widgets/ephy-node-view.h
+++ b/lib/widgets/ephy-node-view.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __EPHY_NODE_VIEW_H
-#define __EPHY_NODE_VIEW_H
+#pragma once
#include <gtk/gtk.h>
@@ -114,5 +113,3 @@ gboolean ephy_node_view_get_iter_for_node (EphyNodeView *view,
EphyNode *node);
G_END_DECLS
-
-#endif /* EPHY_NODE_VIEW_H */
diff --git a/lib/widgets/ephy-security-popover.h b/lib/widgets/ephy-security-popover.h
index 3467016..f5a2953 100644
--- a/lib/widgets/ephy-security-popover.h
+++ b/lib/widgets/ephy-security-popover.h
@@ -17,8 +17,7 @@
*
*/
-#ifndef EPHY_SECURITY_POPOVER_H
-#define EPHY_SECURITY_POPOVER_H
+#pragma once
#include <gio/gio.h>
#include <gtk/gtk.h>
@@ -38,5 +37,3 @@ GtkWidget *ephy_security_popover_new (GtkWidget *relative_to,
EphySecurityLevel security_level);
G_END_DECLS
-
-#endif
diff --git a/lib/widgets/ephy-tree-model-node.h b/lib/widgets/ephy-tree-model-node.h
index 8643956..894cca1 100644
--- a/lib/widgets/ephy-tree-model-node.h
+++ b/lib/widgets/ephy-tree-model-node.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __EPHY_TREE_MODEL_NODE_H
-#define __EPHY_TREE_MODEL_NODE_H
+#pragma once
#include <gtk/gtk.h>
@@ -55,5 +54,3 @@ void ephy_tree_model_node_iter_from_node (EphyTreeModelNode *mod
GtkTreeIter *iter);
G_END_DECLS
-
-#endif /* EPHY_TREE_MODEL_NODE_H */
diff --git a/lib/widgets/ephy-tree-model-sort.h b/lib/widgets/ephy-tree-model-sort.h
index d3893ed..942c35a 100644
--- a/lib/widgets/ephy-tree-model-sort.h
+++ b/lib/widgets/ephy-tree-model-sort.h
@@ -14,8 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_TREE_MODEL_SORT_H
-#define EPHY_TREE_MODEL_SORT_H
+#pragma once
#include <glib-object.h>
@@ -35,5 +34,3 @@ void ephy_tree_model_sort_set_extra_drag_column_id (EphyTreeModelSort *ms,
int id);
G_END_DECLS
-
-#endif /* EPHY_TREE_MODEL_SORT_H */
diff --git a/lib/widgets/nautilus-floating-bar.h b/lib/widgets/nautilus-floating-bar.h
index b5c8bbf..2406527 100644
--- a/lib/widgets/nautilus-floating-bar.h
+++ b/lib/widgets/nautilus-floating-bar.h
@@ -21,8 +21,7 @@
*
*/
-#ifndef __NAUTILUS_FLOATING_BAR_H__
-#define __NAUTILUS_FLOATING_BAR_H__
+#pragma once
#include <gtk/gtk.h>
@@ -74,6 +73,3 @@ void nautilus_floating_bar_add_action (NautilusFloatingBar *self,
const gchar *icon_name,
gint action_id);
void nautilus_floating_bar_cleanup_actions (NautilusFloatingBar *self);
-
-#endif /* __NAUTILUS_FLOATING_BAR_H__ */
-
diff --git a/src/bookmarks/ephy-bookmark-action-group.h b/src/bookmarks/ephy-bookmark-action-group.h
index 6ec3f1e..31e94ca 100644
--- a/src/bookmarks/ephy-bookmark-action-group.h
+++ b/src/bookmarks/ephy-bookmark-action-group.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_BOOKMARK_ACTION_GROUP_H
-#define EPHY_BOOKMARK_ACTION_GROUP_H
+#pragma once
#include "ephy-link-action.h"
#include "ephy-node.h"
@@ -28,5 +27,3 @@ G_BEGIN_DECLS
GtkActionGroup * ephy_bookmark_group_new (EphyNode *node);
G_END_DECLS
-
-#endif
diff --git a/src/bookmarks/ephy-bookmark-action.h b/src/bookmarks/ephy-bookmark-action.h
index 5c780e6..c27440f 100644
--- a/src/bookmarks/ephy-bookmark-action.h
+++ b/src/bookmarks/ephy-bookmark-action.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_BOOKMARK_ACTION_H
-#define EPHY_BOOKMARK_ACTION_H
+#pragma once
#include "ephy-link.h"
#include "ephy-link-action.h"
@@ -69,5 +68,3 @@ void ephy_bookmark_action_activate (EphyBookmarkAction *action,
EphyLinkFlags flags);
G_END_DECLS
-
-#endif
diff --git a/src/bookmarks/ephy-bookmark-properties.h b/src/bookmarks/ephy-bookmark-properties.h
index 68c55d0..2283be8 100644
--- a/src/bookmarks/ephy-bookmark-properties.h
+++ b/src/bookmarks/ephy-bookmark-properties.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_BOOKMARK_PROPERTIES_H
-#define EPHY_BOOKMARK_PROPERTIES_H
+#pragma once
#include "ephy-bookmarks.h"
@@ -36,5 +35,3 @@ GtkWidget *ephy_bookmark_properties_new (EphyBookmarks *bookmarks,
EphyNode *ephy_bookmark_properties_get_node (EphyBookmarkProperties *properties);
G_END_DECLS
-
-#endif /* EPHY_BOOKMARK_PROPERTIES_H */
diff --git a/src/bookmarks/ephy-bookmarks-editor.h b/src/bookmarks/ephy-bookmarks-editor.h
index 071202e..f39ec3c 100644
--- a/src/bookmarks/ephy-bookmarks-editor.h
+++ b/src/bookmarks/ephy-bookmarks-editor.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_BOOKMARKS_EDITOR_H
-#define EPHY_BOOKMARKS_EDITOR_H
+#pragma once
#include <gtk/gtk.h>
@@ -35,5 +34,3 @@ void ephy_bookmarks_editor_set_parent (EphyBookmarksEditor *ebe,
GtkWidget *window);
G_END_DECLS
-
-#endif /* EPHY_BOOKMARKS_EDITOR_H */
diff --git a/src/bookmarks/ephy-bookmarks-export.h b/src/bookmarks/ephy-bookmarks-export.h
index 469ffbd..4083248 100644
--- a/src/bookmarks/ephy-bookmarks-export.h
+++ b/src/bookmarks/ephy-bookmarks-export.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_BOOKMARKS_EXPORT_H
-#define EPHY_BOOKMARKS_EXPORT_H
+#pragma once
#include "ephy-bookmarks.h"
@@ -29,5 +28,3 @@ void ephy_bookmarks_export_mozilla (EphyBookmarks *bookmarks,
const char *filename);
G_END_DECLS
-
-#endif
diff --git a/src/bookmarks/ephy-bookmarks-import.h b/src/bookmarks/ephy-bookmarks-import.h
index a5221af..e10fac9 100644
--- a/src/bookmarks/ephy-bookmarks-import.h
+++ b/src/bookmarks/ephy-bookmarks-import.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_BOOKMARKS_IMPORT_H
-#define EPHY_BOOKMARKS_IMPORT_H
+#pragma once
#include "ephy-bookmarks.h"
@@ -43,5 +42,3 @@ gboolean ephy_bookmarks_import_rdf (EphyBookmarks *bookmarks,
const char *filename);
G_END_DECLS
-
-#endif
diff --git a/src/bookmarks/ephy-bookmarks-menu.h b/src/bookmarks/ephy-bookmarks-menu.h
index eaa3e61..a1331ea 100644
--- a/src/bookmarks/ephy-bookmarks-menu.h
+++ b/src/bookmarks/ephy-bookmarks-menu.h
@@ -17,14 +17,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_BOOKMARKS_MENU_H
-#define EPHY_BOOKMARKS_MENU_H
+#pragma once
#include "ephy-window.h"
#include "ephy-node.h"
#include <gtk/gtk.h>
+G_BEGIN_DECLS
+
void ephy_bookmarks_menu_build (GMenu *menu, EphyNode *parent);
-#endif
+G_END_DECLS
diff --git a/src/bookmarks/ephy-bookmarks-ui.h b/src/bookmarks/ephy-bookmarks-ui.h
index df9f1e7..148ccfe 100644
--- a/src/bookmarks/ephy-bookmarks-ui.h
+++ b/src/bookmarks/ephy-bookmarks-ui.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_BOOKMARKS_UI_H
-#define EPHY_BOOKMARKS_UI_H
+#pragma once
#include "ephy-window.h"
#include "ephy-node.h"
@@ -57,5 +56,3 @@ void ephy_bookmarks_ui_show_bookmark (GtkWindow *parent,
EphyNode *bookmark);
G_END_DECLS
-
-#endif
diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h
index 37c0b12..8c5bbad 100644
--- a/src/bookmarks/ephy-bookmarks.h
+++ b/src/bookmarks/ephy-bookmarks.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_BOOKMARKS_H
-#define EPHY_BOOKMARKS_H
+#pragma once
#include <glib-object.h>
@@ -131,5 +130,3 @@ int ephy_bookmarks_compare_bookmarks (gconstpointer a, gconst
int ephy_bookmarks_compare_bookmark_pointers (gconstpointer a, gconstpointer b);
G_END_DECLS
-
-#endif
diff --git a/src/bookmarks/ephy-link-action.h b/src/bookmarks/ephy-link-action.h
index c75f5a3..1a6e1fd 100644
--- a/src/bookmarks/ephy-link-action.h
+++ b/src/bookmarks/ephy-link-action.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_LINK_ACTION_H
-#define EPHY_LINK_ACTION_H
+#pragma once
#include "ephy-window-action.h"
@@ -75,5 +74,3 @@ GType ephy_link_action_group_get_type (void);
EphyLinkActionGroup * ephy_link_action_group_new (const char *name);
G_END_DECLS
-
-#endif
diff --git a/src/bookmarks/ephy-nodes-cover.h b/src/bookmarks/ephy-nodes-cover.h
index 4acbffb..9de73e3 100644
--- a/src/bookmarks/ephy-nodes-cover.h
+++ b/src/bookmarks/ephy-nodes-cover.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_NODES_COVER_H
-#define EPHY_NODES_COVER_H
+#pragma once
#include "ephy-bookmarks.h"
@@ -36,5 +35,3 @@ GPtrArray * ephy_nodes_get_covering (const GPtrArray *parents, const GPtrArray *
GPtrArray *_covering, GPtrArray *_uncovered, GArray *_sizes);
G_END_DECLS
-
-#endif /* EPHY_NODES_COVER_H */
diff --git a/src/bookmarks/ephy-open-tabs-action.h b/src/bookmarks/ephy-open-tabs-action.h
index a0b42be..fc6cffb 100644
--- a/src/bookmarks/ephy-open-tabs-action.h
+++ b/src/bookmarks/ephy-open-tabs-action.h
@@ -15,13 +15,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_OPEN_TABS_ACTION_H
-#define EPHY_OPEN_TABS_ACTION_H
+#pragma once
#include <gtk/gtk.h>
#include "ephy-node.h"
+G_BEGIN_DECLS
+
GtkActionGroup *ephy_open_tabs_group_new (EphyNode *node);
-#endif
+G_END_DECLS
diff --git a/src/bookmarks/ephy-topic-action-group.h b/src/bookmarks/ephy-topic-action-group.h
index c652b40..2f71e87 100644
--- a/src/bookmarks/ephy-topic-action-group.h
+++ b/src/bookmarks/ephy-topic-action-group.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_TOPIC_ACTION_GROUP_H
-#define EPHY_TOPIC_ACTION_GROUP_H
+#pragma once
#include "ephy-link-action.h"
#include "ephy-node.h"
@@ -29,5 +28,3 @@ GtkActionGroup *ephy_topic_action_group_new (EphyNode *node,
GtkUIManager *manager);
G_END_DECLS
-
-#endif
diff --git a/src/bookmarks/ephy-topic-action.h b/src/bookmarks/ephy-topic-action.h
index 5dc6615..269a40c 100644
--- a/src/bookmarks/ephy-topic-action.h
+++ b/src/bookmarks/ephy-topic-action.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_TOPIC_ACTION_H
-#define EPHY_TOPIC_ACTION_H
+#pragma once
#include "ephy-link-action.h"
#include "ephy-node.h"
@@ -65,5 +64,3 @@ EphyNode *ephy_topic_action_get_topic (EphyTopicAction *action);
void ephy_topic_action_updated (EphyTopicAction *action);
G_END_DECLS
-
-#endif
diff --git a/src/bookmarks/ephy-topics-entry.h b/src/bookmarks/ephy-topics-entry.h
index 185cfe3..6237b2a 100644
--- a/src/bookmarks/ephy-topics-entry.h
+++ b/src/bookmarks/ephy-topics-entry.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_TOPICS_ENTRY_H
-#define EPHY_TOPICS_ENTRY_H
+#pragma once
#include "ephy-bookmarks.h"
@@ -30,5 +29,3 @@ G_DECLARE_FINAL_TYPE (EphyTopicsEntry, ephy_topics_entry, EPHY, TOPICS_ENTRY, Gt
GtkWidget *ephy_topics_entry_new (EphyBookmarks *bookmarks, EphyNode *bookmark);
G_END_DECLS
-
-#endif /* EPHY_TOPICS_ENTRY_H */
diff --git a/src/bookmarks/ephy-topics-palette.h b/src/bookmarks/ephy-topics-palette.h
index 3880ed1..21b91a8 100644
--- a/src/bookmarks/ephy-topics-palette.h
+++ b/src/bookmarks/ephy-topics-palette.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_TOPICS_PALETTE_H
-#define EPHY_TOPICS_PALETTE_H
+#pragma once
#include "ephy-bookmarks.h"
#include <gtk/gtk.h>
@@ -40,5 +39,3 @@ EphyTopicsPalette *ephy_topics_palette_new (EphyBookmarks *bookmarks
void ephy_topics_palette_update_list (EphyTopicsPalette *self);
G_END_DECLS
-
-#endif /* EPHY_TOPICS_PALETTE_H */
diff --git a/src/bookmarks/ephy-window-action.h b/src/bookmarks/ephy-window-action.h
index c000950..9be1920 100644
--- a/src/bookmarks/ephy-window-action.h
+++ b/src/bookmarks/ephy-window-action.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_WINDOW_ACTION_H
-#define EPHY_WINDOW_ACTION_H
+#pragma once
#include "ephy-window.h"
@@ -52,5 +51,3 @@ GType ephy_window_action_get_type (void);
EphyWindow *ephy_window_action_get_window (EphyWindowAction *action);
G_END_DECLS
-
-#endif
diff --git a/src/clear-data-dialog.h b/src/clear-data-dialog.h
index 49025f7..91921ed 100644
--- a/src/clear-data-dialog.h
+++ b/src/clear-data-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef CLEAR_DATA_DIALOG_H
-#define CLEAR_DATA_DIALOG_H
+#pragma once
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -28,5 +27,3 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (ClearDataDialog, clear_data_dialog, EPHY, CLEAR_DATA_DIALOG, GtkDialog)
G_END_DECLS
-
-#endif
diff --git a/src/cookies-dialog.h b/src/cookies-dialog.h
index 0302bbd..42f645e 100644
--- a/src/cookies-dialog.h
+++ b/src/cookies-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef COOKIES_DIALOG_H
-#define COOKIES_DIALOG_H
+#pragma once
G_BEGIN_DECLS
@@ -26,5 +25,3 @@ G_DECLARE_FINAL_TYPE (EphyCookiesDialog, ephy_cookies_dialog, EPHY, COOKIES_DIAL
EphyCookiesDialog *ephy_cookies_dialog_new (void);
G_END_DECLS
-
-#endif /* COOKIES_DIALOG_H */
diff --git a/src/ephy-action-helper.h b/src/ephy-action-helper.h
index f51bfa1..ad9e303 100644
--- a/src/ephy-action-helper.h
+++ b/src/ephy-action-helper.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_ACTION_HELPER_H
-#define EPHY_ACTION_HELPER_H
+#pragma once
#include <gtk/gtk.h>
@@ -32,5 +31,3 @@ void ephy_action_change_sensitivity_flags (GSimpleAction *action,
gboolean set);
G_END_DECLS
-
-#endif /* !EPHY_ACTION_HELPER_H */
diff --git a/src/ephy-completion-model.h b/src/ephy-completion-model.h
index f07a852..5735044 100644
--- a/src/ephy-completion-model.h
+++ b/src/ephy-completion-model.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_COMPLETION_MODEL_H
-#define EPHY_COMPLETION_MODEL_H
+#pragma once
#include "ephy-bookmarks.h"
#include "ephy-history-service.h"
@@ -49,5 +48,3 @@ void ephy_completion_model_update_for_string (EphyCompletionMode
EphyHistoryJobCallback callback,
gpointer data);
G_END_DECLS
-
-#endif /* EPHY_COMPLETION_MODEL_H */
diff --git a/src/ephy-encoding-dialog.h b/src/ephy-encoding-dialog.h
index b5d9e85..aac354a 100644
--- a/src/ephy-encoding-dialog.h
+++ b/src/ephy-encoding-dialog.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_ENCODING_DIALOG_H
-#define EPHY_ENCODING_DIALOG_H
+#pragma once
#include "ephy-window.h"
#include <gtk/gtk.h>
@@ -30,5 +29,3 @@ G_DECLARE_FINAL_TYPE (EphyEncodingDialog, ephy_encoding_dialog, EPHY, ENCODING_D
EphyEncodingDialog *ephy_encoding_dialog_new (EphyWindow *window);
G_END_DECLS
-
-#endif /* EPHY_ENCODING_DIALOG_H */
diff --git a/src/ephy-encoding-row.h b/src/ephy-encoding-row.h
index 4b85361..819ff0a 100644
--- a/src/ephy-encoding-row.h
+++ b/src/ephy-encoding-row.h
@@ -17,8 +17,7 @@
*
*/
-#ifndef EPHY_ENCODING_ROW_H
-#define EPHY_ENCODING_ROW_H
+#pragma once
#include "ephy-encoding.h"
#include <gtk/gtk.h>
@@ -36,5 +35,3 @@ void ephy_encoding_row_set_selected (EphyEncodingRow *row,
gboolean selected);
G_END_DECLS
-
-#endif /* EPHY_ENCODING_ROW_H */
diff --git a/src/ephy-history-window.h b/src/ephy-history-window.h
index a812831..9c7988c 100644
--- a/src/ephy-history-window.h
+++ b/src/ephy-history-window.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_HISTORY_WINDOW_H
-#define EPHY_HISTORY_WINDOW_H
+#pragma once
#include <gtk/gtk.h>
@@ -31,5 +30,3 @@ G_DECLARE_FINAL_TYPE (EphyHistoryWindow, ephy_history_window, EPHY, HISTORY_WIND
GtkWidget *ephy_history_window_new (EphyHistoryService *history_service);
G_END_DECLS
-
-#endif /* EPHY_HISTORY_WINDOW_H */
diff --git a/src/ephy-link.h b/src/ephy-link.h
index fd4c68d..10d12d8 100644
--- a/src/ephy-link.h
+++ b/src/ephy-link.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_LINK_H
-#define EPHY_LINK_H
+#pragma once
#include <glib-object.h>
@@ -59,5 +58,3 @@ EphyEmbed *ephy_link_open (EphyLink *link,
EphyLinkFlags ephy_link_flags_from_current_event (void);
G_END_DECLS
-
-#endif /* EPHY_LINK_H */
diff --git a/src/ephy-location-controller.h b/src/ephy-location-controller.h
index cc7ab15..644ead9 100644
--- a/src/ephy-location-controller.h
+++ b/src/ephy-location-controller.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_LOCATION_CONTROLLER_H
-#define EPHY_LOCATION_CONTROLLER_H
+#pragma once
#include <glib-object.h>
@@ -32,5 +31,3 @@ void ephy_location_controller_set_address (EphyLocationController *controller,
const char *address);
G_END_DECLS
-
-#endif
diff --git a/src/ephy-lockdown.h b/src/ephy-lockdown.h
index 7b01aa0..3d655c4 100644
--- a/src/ephy-lockdown.h
+++ b/src/ephy-lockdown.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_LOCKDOWN_H
-#define EPHY_LOCKDOWN_H
+#pragma once
#include <glib.h>
#include <glib-object.h>
@@ -30,5 +29,3 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (EphyLockdown, ephy_lockdown, EPHY, LOCKDOWN, GObject)
G_END_DECLS
-
-#endif
diff --git a/src/ephy-notebook.h b/src/ephy-notebook.h
index bda06d0..a94a214 100644
--- a/src/ephy-notebook.h
+++ b/src/ephy-notebook.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_NOTEBOOK_H
-#define EPHY_NOTEBOOK_H
+#pragma once
#include <glib.h>
#include <gtk/gtk.h>
@@ -44,5 +43,3 @@ void ephy_notebook_next_page (EphyNotebook *notebook);
void ephy_notebook_prev_page (EphyNotebook *notebook);
G_END_DECLS
-
-#endif /* EPHY_NOTEBOOK_H */
diff --git a/src/ephy-private.h b/src/ephy-private.h
index cc3d695..9041ae6 100644
--- a/src/ephy-private.h
+++ b/src/ephy-private.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_PRIVATE_H
-#define EPHY_PRIVATE_H
+#pragma once
#include "ephy-embed.h"
#include "ephy-embed-event.h"
@@ -29,6 +28,8 @@
#include <gtk/gtk.h>
+G_BEGIN_DECLS
+
/* EphyWindow */
EphyLocationController *ephy_window_get_location_controller (EphyWindow *window);
@@ -59,5 +60,4 @@ void _ephy_shell_create_instance (EphyEmbedShellMod
void ephy_session_clear (EphySession *session);
-#endif
-
+G_END_DECLS
diff --git a/src/ephy-search-provider.h b/src/ephy-search-provider.h
index 1f7e69d..2b5bc14 100644
--- a/src/ephy-search-provider.h
+++ b/src/ephy-search-provider.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _EPHY_SEARCH_PROVIDER_H
-#define _EPHY_SEARCH_PROVIDER_H
+#pragma once
#include "ephy-shell-search-provider-generated.h"
@@ -32,5 +31,3 @@ G_DECLARE_FINAL_TYPE (EphySearchProvider, ephy_search_provider, EPHY, SEARCH_PRO
EphySearchProvider *ephy_search_provider_new (void);
G_END_DECLS
-
-#endif /* _EPHY_SEARCH_PROVIDER_H */
diff --git a/src/ephy-session.h b/src/ephy-session.h
index 225f5ca..49e2da6 100644
--- a/src/ephy-session.h
+++ b/src/ephy-session.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_SESSION_H
-#define EPHY_SESSION_H
+#pragma once
#include "ephy-window.h"
@@ -66,5 +65,3 @@ void ephy_session_undo_close_tab (EphySession *session);
gboolean ephy_session_get_can_undo_tab_closed (EphySession *session);
G_END_DECLS
-
-#endif
diff --git a/src/ephy-shell.h b/src/ephy-shell.h
index f06bbdc..1bd29d1 100644
--- a/src/ephy-shell.h
+++ b/src/ephy-shell.h
@@ -18,8 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_SHELL_H
-#define EPHY_SHELL_H
+#pragma once
#include "ephy-bookmarks.h"
#include "ephy-embed-shell.h"
@@ -115,5 +114,3 @@ void ephy_shell_open_uris (EphyShell *shell,
EphyStartupFlags startup_flags,
guint32 user_time);
G_END_DECLS
-
-#endif
diff --git a/src/ephy-title-box.h b/src/ephy-title-box.h
index bfdd497..0b71bf5 100644
--- a/src/ephy-title-box.h
+++ b/src/ephy-title-box.h
@@ -17,8 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __EPHY_TITLE_BOX_H__
-#define __EPHY_TITLE_BOX_H__
+#pragma once
#include <gtk/gtk.h>
#include <webkit2/webkit2.h>
@@ -56,5 +55,3 @@ void ephy_title_box_set_address (EphyTitleBox *t
const char *address);
G_END_DECLS
-
-#endif /* __EPHY_TITLE_BOX_H__ */
diff --git a/src/ephy-toolbar.h b/src/ephy-toolbar.h
index 2428ecb..af10200 100644
--- a/src/ephy-toolbar.h
+++ b/src/ephy-toolbar.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_TOOLBAR_H
-#define EPHY_TOOLBAR_H
+#pragma once
#include <gtk/gtk.h>
@@ -42,5 +41,3 @@ GtkWidget *ephy_toolbar_get_page_menu_button (EphyToolbar *toolb
GtkWidget *ephy_toolbar_get_new_tab_button (EphyToolbar *toolbar);
G_END_DECLS
-
-#endif /* EPHY_TOOLBAR_H */
diff --git a/src/ephy-window.h b/src/ephy-window.h
index 2ddee6d..a1acab1 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef EPHY_WINDOW_H
-#define EPHY_WINDOW_H
+#pragma once
#include "ephy-web-view.h"
@@ -57,5 +56,3 @@ gboolean ephy_window_close (EphyWindow *window);
EphyWindowChrome ephy_window_get_chrome (EphyWindow *window);
G_END_DECLS
-
-#endif
diff --git a/src/languages.h b/src/languages.h
index 93dad50..0c081df 100644
--- a/src/languages.h
+++ b/src/languages.h
@@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#pragma once
+
static const char languages[][7] =
{
/* If you're missing your language/locale combination, file a bug at
diff --git a/src/passwords-dialog.h b/src/passwords-dialog.h
index 4415279..9a156ea 100644
--- a/src/passwords-dialog.h
+++ b/src/passwords-dialog.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef PASSWORDS_DIALOG_H
-#define PASSWORDS_DIALOG_H
+#pragma once
G_BEGIN_DECLS
@@ -26,5 +25,3 @@ G_DECLARE_FINAL_TYPE (EphyPasswordsDialog, ephy_passwords_dialog, EPHY, PASSWORD
EphyPasswordsDialog *ephy_passwords_dialog_new (void);
G_END_DECLS
-
-#endif /* PASSWORDS_DIALOG_H */
diff --git a/src/popup-commands.h b/src/popup-commands.h
index 2424e3b..1b6e37c 100644
--- a/src/popup-commands.h
+++ b/src/popup-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef POPUP_COMMANDS_H
-#define POPUP_COMMANDS_H
+#pragma once
#include <gtk/gtk.h>
@@ -80,5 +79,3 @@ void popup_cmd_search_selection (GSimpleAction *action,
gpointer user_data);
G_END_DECLS
-
-#endif
diff --git a/src/prefs-dialog.h b/src/prefs-dialog.h
index 0a0943c..ff43a78 100644
--- a/src/prefs-dialog.h
+++ b/src/prefs-dialog.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef PREFS_DIALOG_H
-#define PREFS_DIALOG_H
+#pragma once
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -29,5 +28,3 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (PrefsDialog, prefs_dialog, EPHY, PREFS_DIALOG, GtkDialog)
G_END_DECLS
-
-#endif
diff --git a/src/window-commands.h b/src/window-commands.h
index deaaa4c..66359cb 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef WINDOW_COMMANDS_H
-#define WINDOW_COMMANDS_H
+#pragma once
#include "ephy-window.h"
@@ -178,5 +177,3 @@ void window_cmd_tabs_close (GSimpleAction *action,
GVariant *parameter,
gpointer user_data);
G_END_DECLS
-
-#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
