[evince/wip/chpe/pragma-once] all: Replace include guards with pragma once
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince/wip/chpe/pragma-once] all: Replace include guards with pragma once
- Date: Wed, 1 Dec 2021 20:29:26 +0000 (UTC)
commit b93b32a1193225e1a1005e67df04cc898bd4da6a
Author: Christian Persch <chpe src gnome org>
Date: Wed Dec 1 21:27:24 2021 +0100
all: Replace include guards with pragma once
Instead of using the "#ifndef FOO_H", "#define FOO_H", …, "#endif FOO_H"
guards around the header file, use the "#pragma once".
backend/comics/comics-document.h | 5 +----
backend/comics/ev-archive.h | 5 +----
backend/djvu/djvu-document-private.h | 5 +----
backend/djvu/djvu-document.h | 5 +----
backend/djvu/djvu-links.h | 5 +----
backend/djvu/djvu-text-page.h | 6 +-----
backend/dvi/dvi-document.h | 5 +----
backend/pdf/ev-poppler.h | 5 +----
backend/ps/ev-spectre.h | 5 +----
backend/tiff/tiff-document.h | 5 +----
backend/tiff/tiff2ps.h | 2 ++
backend/xps/xps-document.h | 5 +----
evince-document.h | 5 +----
evince-view.h | 5 +----
libdocument/ev-annotation.h | 7 ++-----
libdocument/ev-async-renderer.h | 7 ++-----
libdocument/ev-attachment.h | 7 ++-----
libdocument/ev-backend-info.h | 7 ++-----
libdocument/ev-backends-manager.h | 7 ++-----
libdocument/ev-debug.h | 7 ++-----
libdocument/ev-document-annotations.h | 8 ++------
libdocument/ev-document-attachments.h | 7 ++-----
libdocument/ev-document-factory.h | 7 ++-----
libdocument/ev-document-find.h | 9 ++-------
libdocument/ev-document-fonts.h | 7 ++-----
libdocument/ev-document-forms.h | 7 ++-----
libdocument/ev-document-images.h | 7 ++-----
libdocument/ev-document-info.h | 7 ++-----
libdocument/ev-document-layers.h | 7 ++-----
libdocument/ev-document-links.h | 7 ++-----
libdocument/ev-document-media.h | 7 ++-----
libdocument/ev-document-misc.h | 9 ++-------
libdocument/ev-document-print.h | 9 +++++----
libdocument/ev-document-security.h | 6 ++----
libdocument/ev-document-text.h | 9 ++-------
libdocument/ev-document-transition.h | 7 ++-----
libdocument/ev-document-type-builtins.h.template | 7 ++-----
libdocument/ev-document.h | 9 ++-------
libdocument/ev-file-exporter.h | 7 ++-----
libdocument/ev-file-helpers.h | 7 ++-----
libdocument/ev-form-field-private.h | 8 ++------
libdocument/ev-form-field.h | 8 ++------
libdocument/ev-image.h | 8 ++------
libdocument/ev-init.h | 7 ++-----
libdocument/ev-layer.h | 7 ++-----
libdocument/ev-link-action.h | 7 ++-----
libdocument/ev-link-dest.h | 7 ++-----
libdocument/ev-link.h | 7 ++-----
libdocument/ev-macros.h | 5 +----
libdocument/ev-mapping-list.h | 7 ++-----
libdocument/ev-media.h | 7 ++-----
libdocument/ev-module.h | 7 ++-----
libdocument/ev-page.h | 6 ++----
libdocument/ev-render-context.h | 7 ++-----
libdocument/ev-selection.h | 7 ++-----
libdocument/ev-transition-effect.h | 7 ++-----
libdocument/ev-version.h.in | 5 +----
libmisc/ev-page-action-widget.h | 5 +----
libmisc/ev-search-box.h | 5 +----
libview/ev-annotation-window.h | 8 +++-----
libview/ev-color-contrast.h | 7 ++-----
libview/ev-document-model.h | 7 ++-----
libview/ev-form-field-accessible.h | 7 ++-----
libview/ev-image-accessible.h | 7 ++-----
libview/ev-job-scheduler.h | 7 ++-----
libview/ev-jobs.h | 7 ++-----
libview/ev-link-accessible.h | 8 ++------
libview/ev-media-player.h | 5 +----
libview/ev-page-accessible.h | 8 ++------
libview/ev-page-cache.h | 7 ++-----
libview/ev-pixbuf-cache.h | 7 ++-----
libview/ev-print-operation.h | 7 ++-----
libview/ev-stock-icons.h | 7 ++-----
libview/ev-timeline.h | 7 ++-----
libview/ev-transition-animation.h | 8 ++------
libview/ev-view-accessible.h | 8 ++------
libview/ev-view-cursor.h | 7 ++-----
libview/ev-view-presentation.h | 7 ++-----
libview/ev-view-private.h | 8 ++------
libview/ev-view-type-builtins.h.template | 7 ++-----
libview/ev-view.h | 7 ++-----
previewer/ev-previewer-toolbar.h | 5 +----
previewer/ev-previewer-window.h | 5 +----
properties/ev-properties-view.h | 5 +----
shell/ev-annotation-properties-dialog.h | 5 +----
shell/ev-annotations-toolbar.h | 5 +----
shell/ev-application.h | 6 +-----
shell/ev-bookmarks.h | 7 +------
shell/ev-file-monitor.h | 5 +----
shell/ev-find-sidebar.h | 6 +-----
shell/ev-history.h | 5 +----
shell/ev-keyring.h | 5 +----
shell/ev-loading-message.h | 5 +----
shell/ev-media-player-keys.h | 5 +----
shell/ev-message-area.h | 5 +----
shell/ev-metadata.h | 5 +----
shell/ev-password-view.h | 5 +----
shell/ev-progress-message-area.h | 5 +----
shell/ev-properties-dialog.h | 5 +----
shell/ev-properties-fonts.h | 5 +----
shell/ev-properties-license.h | 5 +----
shell/ev-recent-view.h | 5 +----
shell/ev-sidebar-annotations.h | 6 ++----
shell/ev-sidebar-attachments.h | 5 +----
shell/ev-sidebar-bookmarks.h | 5 +----
shell/ev-sidebar-layers.h | 5 +----
shell/ev-sidebar-links.h | 7 +------
shell/ev-sidebar-page.h | 5 +----
shell/ev-sidebar-thumbnails.h | 7 +------
shell/ev-sidebar.h | 7 +------
shell/ev-toolbar.h | 5 +----
shell/ev-utils.h | 5 +----
shell/ev-window-title.h | 5 +----
shell/ev-window.h | 5 +----
shell/ev-zoom-action.h | 5 +----
115 files changed, 183 insertions(+), 543 deletions(-)
---
diff --git a/backend/comics/comics-document.h b/backend/comics/comics-document.h
index 227e71f31..31549beb8 100644
--- a/backend/comics/comics-document.h
+++ b/backend/comics/comics-document.h
@@ -16,8 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __COMICS_DOCUMENT_H__
-#define __COMICS_DOCUMENT_H__
+#pragma once
#include "ev-macros.h"
#include "ev-document.h"
@@ -36,5 +35,3 @@ EV_PUBLIC
GType register_evince_backend (GTypeModule *module);
G_END_DECLS
-
-#endif /* __COMICS_DOCUMENT_H__ */
diff --git a/backend/comics/ev-archive.h b/backend/comics/ev-archive.h
index 53affa5f9..0b84d82c8 100644
--- a/backend/comics/ev-archive.h
+++ b/backend/comics/ev-archive.h
@@ -17,8 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_ARCHIVE_H__
-#define __EV_ARCHIVE_H__
+#pragma once
#include <glib-object.h>
@@ -55,5 +54,3 @@ gssize ev_archive_read_data (EvArchive *archive,
void ev_archive_reset (EvArchive *archive);
G_END_DECLS
-
-#endif /* __EV_ARCHIVE_H__ */
diff --git a/backend/djvu/djvu-document-private.h b/backend/djvu/djvu-document-private.h
index 07b27d98a..41bc7ab4a 100644
--- a/backend/djvu/djvu-document-private.h
+++ b/backend/djvu/djvu-document-private.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __DJVU_DOCUMENT_INTERNAL_H__
-#define __DJVU_DOCUMENT_INTERNAL_H__
+#pragma once
#include "djvu-document.h"
@@ -47,5 +46,3 @@ int djvu_document_get_n_pages (EvDocument *document);
void djvu_handle_events (DjvuDocument *djvu_document,
int wait,
GError **error);
-
-#endif /* __DJVU_DOCUMENT_INTERNAL_H__ */
diff --git a/backend/djvu/djvu-document.h b/backend/djvu/djvu-document.h
index 6ba3a1897..d9afa3928 100644
--- a/backend/djvu/djvu-document.h
+++ b/backend/djvu/djvu-document.h
@@ -16,8 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __DJVU_DOCUMENT_H__
-#define __DJVU_DOCUMENT_H__
+#pragma once
#include "ev-macros.h"
#include "ev-document.h"
@@ -36,5 +35,3 @@ EV_PUBLIC
GType register_evince_backend (GTypeModule *module);
G_END_DECLS
-
-#endif /* __DJVU_DOCUMENT_H__ */
diff --git a/backend/djvu/djvu-links.h b/backend/djvu/djvu-links.h
index 6cacdd36f..59e13cfc3 100644
--- a/backend/djvu/djvu-links.h
+++ b/backend/djvu/djvu-links.h
@@ -16,8 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __DJVU_LINK_H__
-#define __DJVU_LINK_H__
+#pragma once
#include "ev-document-links.h"
#include "djvu-document.h"
@@ -33,5 +32,3 @@ EvLinkDest *djvu_links_find_link_dest (EvDocumentLinks *document_links,
gint djvu_links_find_link_page (EvDocumentLinks *document_links,
const gchar *link_name);
gboolean djvu_links_has_document_links (EvDocumentLinks *document_links);
-
-#endif /* __DJVU_LINK_H__ */
diff --git a/backend/djvu/djvu-text-page.h b/backend/djvu/djvu-text-page.h
index 40cbfc20a..45867a487 100644
--- a/backend/djvu/djvu-text-page.h
+++ b/backend/djvu/djvu-text-page.h
@@ -16,8 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __DJVU_TEXT_PAGE_H__
-#define __DJVU_TEXT_PAGE_H__
+#pragma once
#include "ev-document.h"
@@ -61,6 +60,3 @@ void djvu_text_page_search (DjvuTextPage *page,
const char *text);
DjvuTextPage *djvu_text_page_new (miniexp_t text);
void djvu_text_page_free (DjvuTextPage *page);
-
-#endif /* __DJVU_TEXT_PAGE_H__ */
-
diff --git a/backend/dvi/dvi-document.h b/backend/dvi/dvi-document.h
index 4afd288b0..204389ad4 100644
--- a/backend/dvi/dvi-document.h
+++ b/backend/dvi/dvi-document.h
@@ -16,8 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __DVI_DOCUMENT_H__
-#define __DVI_DOCUMENT_H__
+#pragma once
#include "ev-macros.h"
#include "ev-document.h"
@@ -36,5 +35,3 @@ EV_PUBLIC
GType register_evince_backend (GTypeModule *module);
G_END_DECLS
-
-#endif /* __DVI_DOCUMENT_H__ */
diff --git a/backend/pdf/ev-poppler.h b/backend/pdf/ev-poppler.h
index 45d1a12db..77ade253a 100644
--- a/backend/pdf/ev-poppler.h
+++ b/backend/pdf/ev-poppler.h
@@ -16,8 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __PDF_DOCUMENT_H__
-#define __PDF_DOCUMENT_H__
+#pragma once
#include "ev-macros.h"
#include "ev-document.h"
@@ -37,5 +36,3 @@ EV_PUBLIC
GType register_evince_backend (GTypeModule *module);
G_END_DECLS
-
-#endif /* __PDF_DOCUMENT_H__ */
diff --git a/backend/ps/ev-spectre.h b/backend/ps/ev-spectre.h
index 9ece58015..a05d81098 100644
--- a/backend/ps/ev-spectre.h
+++ b/backend/ps/ev-spectre.h
@@ -21,8 +21,7 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __PS_DOCUMENT_H__
-#define __PS_DOCUMENT_H__
+#pragma once
#include <glib-object.h>
@@ -46,5 +45,3 @@ EV_PUBLIC
GType register_evince_backend (GTypeModule *module);
G_END_DECLS
-
-#endif /* __PS_DOCUMENT_H__ */
diff --git a/backend/tiff/tiff-document.h b/backend/tiff/tiff-document.h
index 6e9cc0fc1..9c8a56aca 100644
--- a/backend/tiff/tiff-document.h
+++ b/backend/tiff/tiff-document.h
@@ -17,8 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __TIFF_DOCUMENT_H__
-#define __TIFF_DOCUMENT_H__
+#pragma once
#include "ev-macros.h"
#include "ev-document.h"
@@ -37,5 +36,3 @@ EV_PUBLIC
GType register_evince_backend (GTypeModule *module);
G_END_DECLS
-
-#endif /* __TIFF_DOCUMENT_H__ */
diff --git a/backend/tiff/tiff2ps.h b/backend/tiff/tiff2ps.h
index 575b881b0..e9be84b6e 100644
--- a/backend/tiff/tiff2ps.h
+++ b/backend/tiff/tiff2ps.h
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#include <glib.h>
#include <stdio.h>
#include "tiffio.h"
diff --git a/backend/xps/xps-document.h b/backend/xps/xps-document.h
index 7cafa72c6..3b6af15b7 100644
--- a/backend/xps/xps-document.h
+++ b/backend/xps/xps-document.h
@@ -17,8 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __XPS_DOCUMENT_H__
-#define __XPS_DOCUMENT_H__
+#pragma once
#include <glib-object.h>
@@ -42,5 +41,3 @@ EV_PUBLIC
GType register_evince_backend (GTypeModule *module);
G_END_DECLS
-
-#endif /* __XPS_DOCUMENT_H__ */
diff --git a/evince-document.h b/evince-document.h
index 6065f5370..20c8ead47 100644
--- a/evince-document.h
+++ b/evince-document.h
@@ -16,8 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EVINCE_DOCUMENT_H
-#define EVINCE_DOCUMENT_H
+#pragma once
#define __EV_EVINCE_DOCUMENT_H_INSIDE__
@@ -62,5 +61,3 @@
#include <libdocument/ev-version.h>
#undef __EV_EVINCE_DOCUMENT_H_INSIDE__
-
-#endif /* !EVINCE_DOCUMENT_H */
diff --git a/evince-view.h b/evince-view.h
index 8b8d28682..3b869f9f3 100644
--- a/evince-view.h
+++ b/evince-view.h
@@ -16,8 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EVINCE_VIEW_H
-#define EVINCE_VIEW_H
+#pragma once
#define __EV_EVINCE_VIEW_H_INSIDE__
@@ -30,5 +29,3 @@
#include <libview/ev-stock-icons.h>
#undef __EV_EVINCE_VIEW_H_INSIDE__
-
-#endif /* !EVINCE_VIEW_H */
diff --git a/libdocument/ev-annotation.h b/libdocument/ev-annotation.h
index 3f9075d7c..ab5c96245 100644
--- a/libdocument/ev-annotation.h
+++ b/libdocument/ev-annotation.h
@@ -19,13 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_ANNOTATION_H
-#define EV_ANNOTATION_H
-
#include <glib-object.h>
#include "ev-document.h"
@@ -252,5 +251,3 @@ gboolean ev_annotation_text_markup_set_markup_type (EvAnnotati
EvAnnotationTextMarkupType
markup_type);
G_END_DECLS
-
-#endif /* EV_ANNOTATION_H */
diff --git a/libdocument/ev-async-renderer.h b/libdocument/ev-async-renderer.h
index e1fe00dba..fc2c7e1be 100644
--- a/libdocument/ev-async-renderer.h
+++ b/libdocument/ev-async-renderer.h
@@ -18,13 +18,12 @@
*
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_ASYNC_RENDERER_H
-#define EV_ASYNC_RENDERER_H
-
#include <glib-object.h>
#include <glib.h>
#include <gdk/gdk.h>
@@ -65,5 +64,3 @@ void ev_async_renderer_render_pixbuf (EvAsyncRenderer *renderer,
int rotation);
G_END_DECLS
-
-#endif
diff --git a/libdocument/ev-attachment.h b/libdocument/ev-attachment.h
index 28736ef3e..022d23a14 100644
--- a/libdocument/ev-attachment.h
+++ b/libdocument/ev-attachment.h
@@ -17,13 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef __EV_ATTACHMENT_H__
-#define __EV_ATTACHMENT_H__
-
#include <glib-object.h>
#include <gio/gio.h>
@@ -91,5 +90,3 @@ gboolean ev_attachment_open (EvAttachment *attachment,
GError **error);
G_END_DECLS
-
-#endif /* __EV_ATTACHMENT_H__ */
diff --git a/libdocument/ev-backend-info.h b/libdocument/ev-backend-info.h
index 27737d02b..c7d73d005 100644
--- a/libdocument/ev-backend-info.h
+++ b/libdocument/ev-backend-info.h
@@ -17,13 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef EV_BACKEND_INFO
-#define EV_BACKEND_INFO
-
#include <glib.h>
G_BEGIN_DECLS
@@ -51,5 +50,3 @@ EvBackendInfo *_ev_backend_info_new_from_file (const char *file,
GList *_ev_backend_info_load_from_dir (const char *path);
G_END_DECLS
-
-#endif /* !EV_BACKEND_INFO */
diff --git a/libdocument/ev-backends-manager.h b/libdocument/ev-backends-manager.h
index 43939a3aa..723533aa7 100644
--- a/libdocument/ev-backends-manager.h
+++ b/libdocument/ev-backends-manager.h
@@ -17,13 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_BACKENDS_MANAGER
-#define EV_BACKENDS_MANAGER
-
#include <glib.h>
#include "ev-document.h"
@@ -50,5 +49,3 @@ EV_PUBLIC
GList *ev_backends_manager_get_all_types_info (void);
G_END_DECLS
-
-#endif /* EV_BACKENDS_MANAGER */
diff --git a/libdocument/ev-debug.h b/libdocument/ev-debug.h
index 689decae8..560beff3f 100644
--- a/libdocument/ev-debug.h
+++ b/libdocument/ev-debug.h
@@ -32,13 +32,12 @@
/* Modified by Evince Team */
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef __EV_DEBUG_H__
-#define __EV_DEBUG_H__
-
#include <glib-object.h>
#include "ev-macros.h"
@@ -124,5 +123,3 @@ EvDebugBorders ev_debug_get_debug_borders (void);
#endif /* EV_ENABLE_DEBUG */
G_END_DECLS
-
-#endif /* __EV_DEBUG_H__ */
diff --git a/libdocument/ev-document-annotations.h b/libdocument/ev-document-annotations.h
index 98fdd7ab0..b49fda2a5 100644
--- a/libdocument/ev-document-annotations.h
+++ b/libdocument/ev-document-annotations.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_ANNOTATIONS_H
-#define EV_DOCUMENT_ANNOTATIONS_H
-
#include <glib-object.h>
#include "ev-macros.h"
@@ -129,6 +128,3 @@ EvAnnotationsOverMarkup ev_document_annotations_over_markup (EvDocumentAnnotati
gdouble y);
G_END_DECLS
-
-#endif /* EV_DOCUMENT_ANNOTATIONS_H */
-
diff --git a/libdocument/ev-document-attachments.h b/libdocument/ev-document-attachments.h
index 6ca43a2ed..1addb3c9f 100644
--- a/libdocument/ev-document-attachments.h
+++ b/libdocument/ev-document-attachments.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_ATTACHMENTS_H
-#define EV_DOCUMENT_ATTACHMENTS_H
-
#include <glib-object.h>
#include <glib.h>
@@ -60,5 +59,3 @@ EV_PUBLIC
GList *ev_document_attachments_get_attachments (EvDocumentAttachments *document_attachments);
G_END_DECLS
-
-#endif /* EV_DOCUMENT_ATTACHMENTS_H */
diff --git a/libdocument/ev-document-factory.h b/libdocument/ev-document-factory.h
index 60d9c29ea..a071a4179 100644
--- a/libdocument/ev-document-factory.h
+++ b/libdocument/ev-document-factory.h
@@ -18,13 +18,12 @@
*
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_FACTORY_H
-#define EV_DOCUMENT_FACTORY_H
-
#include <gtk/gtk.h>
#include "ev-macros.h"
@@ -57,5 +56,3 @@ EV_PUBLIC
void ev_document_factory_add_filters (GtkWidget *chooser, EvDocument *document);
G_END_DECLS
-
-#endif
diff --git a/libdocument/ev-document-find.h b/libdocument/ev-document-find.h
index b598452fa..0b929f52a 100644
--- a/libdocument/ev-document-find.h
+++ b/libdocument/ev-document-find.h
@@ -15,17 +15,14 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $Id$
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_FIND_H
-#define EV_DOCUMENT_FIND_H
-
#include <glib-object.h>
#include <glib.h>
@@ -82,5 +79,3 @@ EV_PUBLIC
EvFindOptions ev_document_find_get_supported_options (EvDocumentFind *document_find);
G_END_DECLS
-
-#endif /* EV_DOCUMENT_FIND_H */
diff --git a/libdocument/ev-document-fonts.h b/libdocument/ev-document-fonts.h
index 94e3e838c..beaabdd04 100644
--- a/libdocument/ev-document-fonts.h
+++ b/libdocument/ev-document-fonts.h
@@ -21,13 +21,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_FONTS_H
-#define EV_DOCUMENT_FONTS_H
-
#include <glib-object.h>
#include <glib.h>
#include <gtk/gtk.h>
@@ -82,5 +81,3 @@ EV_PUBLIC
const gchar *ev_document_fonts_get_fonts_summary (EvDocumentFonts *document_fonts);
G_END_DECLS
-
-#endif
diff --git a/libdocument/ev-document-forms.h b/libdocument/ev-document-forms.h
index 552a74af8..0f05f32b0 100644
--- a/libdocument/ev-document-forms.h
+++ b/libdocument/ev-document-forms.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_FORMS_H
-#define EV_DOCUMENT_FORMS_H
-
#include <glib-object.h>
#include "ev-macros.h"
@@ -145,5 +144,3 @@ void ev_document_forms_reset_form (EvDocumentF
EvLinkAction *action);
G_END_DECLS
-
-#endif /* EV_DOCUMENT_FORMS_H */
diff --git a/libdocument/ev-document-images.h b/libdocument/ev-document-images.h
index 7440e2dea..0e255f2b1 100644
--- a/libdocument/ev-document-images.h
+++ b/libdocument/ev-document-images.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_IMAGES_H
-#define EV_DOCUMENT_IMAGES_H
-
#include <glib-object.h>
#include <glib.h>
@@ -65,5 +64,3 @@ GdkPixbuf *ev_document_images_get_image (EvDocumentImages *document_
EvImage *image);
G_END_DECLS
-
-#endif /* EV_DOCUMENT_IMAGES_H */
diff --git a/libdocument/ev-document-info.h b/libdocument/ev-document-info.h
index b75a970d3..67cd11d64 100644
--- a/libdocument/ev-document-info.h
+++ b/libdocument/ev-document-info.h
@@ -18,13 +18,12 @@
*
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_INFO_H
-#define EV_DOCUMENT_INFO_H
-
#include <glib-object.h>
#include <glib.h>
@@ -173,5 +172,3 @@ EV_PUBLIC
const gchar *ev_document_license_get_web_statement (EvDocumentLicense *license);
G_END_DECLS
-
-#endif /* EV_DOCUMENT_INFO_H */
diff --git a/libdocument/ev-document-layers.h b/libdocument/ev-document-layers.h
index 2ba11927e..60f291827 100644
--- a/libdocument/ev-document-layers.h
+++ b/libdocument/ev-document-layers.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_LAYERS_H
-#define EV_DOCUMENT_LAYERS_H
-
#include <glib-object.h>
#include <glib.h>
#include <gtk/gtk.h>
@@ -88,5 +87,3 @@ gboolean ev_document_layers_layer_is_visible (EvDocumentLayers *document_la
EvLayer *layer);
G_END_DECLS
-
-#endif /* EV_DOCUMENT_LAYERS_H */
diff --git a/libdocument/ev-document-links.h b/libdocument/ev-document-links.h
index 2e6dc5d8a..fc164a5fe 100644
--- a/libdocument/ev-document-links.h
+++ b/libdocument/ev-document-links.h
@@ -21,13 +21,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_LINKS_H
-#define EV_DOCUMENT_LINKS_H
-
#include <glib-object.h>
#include <glib.h>
#include <gtk/gtk.h>
@@ -102,5 +101,3 @@ gchar *ev_document_links_get_link_page_label (EvDocumentLinks *document_
EvLink *link);
G_END_DECLS
-
-#endif
diff --git a/libdocument/ev-document-media.h b/libdocument/ev-document-media.h
index db00f3cb3..e73300001 100644
--- a/libdocument/ev-document-media.h
+++ b/libdocument/ev-document-media.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_MEDIA_H
-#define EV_DOCUMENT_MEDIA_H
-
#include <glib-object.h>
#include <glib.h>
@@ -60,5 +59,3 @@ EvMappingList *ev_document_media_get_media_mapping (EvDocumentMedia *document_me
EvPage *page);
G_END_DECLS
-
-#endif /* EV_DOCUMENT_MEDIA_H */
diff --git a/libdocument/ev-document-misc.h b/libdocument/ev-document-misc.h
index ea52a06ef..29d1a6792 100644
--- a/libdocument/ev-document-misc.h
+++ b/libdocument/ev-document-misc.h
@@ -15,17 +15,14 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $Id$
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_MISC_H
-#define EV_DOCUMENT_MISC_H
-
#include <cairo.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
@@ -115,5 +112,3 @@ void ev_document_misc_get_pointer_position (GtkWidget *widget,
gint *y);
G_END_DECLS
-
-#endif /* EV_DOCUMENT_MISC_H */
diff --git a/libdocument/ev-document-print.h b/libdocument/ev-document-print.h
index 31bbda0b5..56160e963 100644
--- a/libdocument/ev-document-print.h
+++ b/libdocument/ev-document-print.h
@@ -18,8 +18,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_DOCUMENT_PRINT_H
-#define EV_DOCUMENT_PRINT_H
+#pragma once
+
+#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
+#error "Only <evince-document.h> can be included directly."
+#endif
#include <glib-object.h>
#include <cairo.h>
@@ -58,5 +61,3 @@ void ev_document_print_print_page (EvDocumentPrint *document_print,
cairo_t *cr);
G_END_DECLS
-
-#endif /* EV_DOCUMENT_PRINT_H */
diff --git a/libdocument/ev-document-security.h b/libdocument/ev-document-security.h
index 3b5385a92..d737e993d 100644
--- a/libdocument/ev-document-security.h
+++ b/libdocument/ev-document-security.h
@@ -21,12 +21,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_SECURITY_H
-#define EV_DOCUMENT_SECURITY_H
#include <glib-object.h>
#include <glib.h>
@@ -67,5 +67,3 @@ void ev_document_security_set_password (EvDocumentSecurity *documen
const char *password);
G_END_DECLS
-
-#endif
diff --git a/libdocument/ev-document-text.h b/libdocument/ev-document-text.h
index 6a2a06ec0..00472539b 100644
--- a/libdocument/ev-document-text.h
+++ b/libdocument/ev-document-text.h
@@ -15,17 +15,14 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $Id$
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_TEXT_H
-#define EV_DOCUMENT_TEXT_H
-
#include <glib-object.h>
#include <glib.h>
#include <gdk/gdk.h>
@@ -80,5 +77,3 @@ EV_PUBLIC
PangoAttrList *ev_document_text_get_text_attrs (EvDocumentText *document_text,
EvPage *page);
G_END_DECLS
-
-#endif /* EV_DOCUMENT_TEXT_H */
diff --git a/libdocument/ev-document-transition.h b/libdocument/ev-document-transition.h
index 893520594..3c172477e 100644
--- a/libdocument/ev-document-transition.h
+++ b/libdocument/ev-document-transition.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_TRANSITION_H
-#define EV_DOCUMENT_TRANSITION_H
-
#include <glib-object.h>
#include "ev-macros.h"
@@ -64,5 +63,3 @@ EvTransitionEffect * ev_document_transition_get_effect (EvDocumentTransit
gint page);
G_END_DECLS
-
-#endif /* EV_DOCUMENT_TRANSITION_H */
diff --git a/libdocument/ev-document-type-builtins.h.template
b/libdocument/ev-document-type-builtins.h.template
index 97483a620..35916d7bb 100644
--- a/libdocument/ev-document-type-builtins.h.template
+++ b/libdocument/ev-document-type-builtins.h.template
@@ -1,12 +1,11 @@
/*** BEGIN file-header ***/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_TYPE_BUILTINS_H
-#define EV_DOCUMENT_TYPE_BUILTINS_H
-
#include <glib-object.h>
#include "ev-macros.h"
@@ -27,6 +26,4 @@ GType @enum_name@_get_type (void) G_GNUC_CONST;
/*** BEGIN file-tail ***/
G_END_DECLS
-
-#endif /* !EV_DOCUMENT_TYPE_BUILTINS_H */
/*** END file-tail ***/
diff --git a/libdocument/ev-document.h b/libdocument/ev-document.h
index b3a5fce18..6bce0ada8 100644
--- a/libdocument/ev-document.h
+++ b/libdocument/ev-document.h
@@ -16,17 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $Id$
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_DOCUMENT_H
-#define EV_DOCUMENT_H
-
#include <glib-object.h>
#include <glib.h>
#include <gio/gio.h>
@@ -386,5 +383,3 @@ register_evince_backend (GTypeModule *module) \
EV_BACKEND_REGISTER_WITH_CODE(BackendName, backend_name, ;)
G_END_DECLS
-
-#endif /* EV_DOCUMENT_H */
diff --git a/libdocument/ev-file-exporter.h b/libdocument/ev-file-exporter.h
index b3776d9bd..18d89828b 100644
--- a/libdocument/ev-file-exporter.h
+++ b/libdocument/ev-file-exporter.h
@@ -20,13 +20,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_FILE_EXPORTER_H
-#define EV_FILE_EXPORTER_H
-
#include <glib-object.h>
#include "ev-macros.h"
@@ -107,5 +106,3 @@ EV_PUBLIC
EvFileExporterCapabilities ev_file_exporter_get_capabilities (EvFileExporter *exporter);
G_END_DECLS
-
-#endif
diff --git a/libdocument/ev-file-helpers.h b/libdocument/ev-file-helpers.h
index 8f58e324e..ea7b488b2 100644
--- a/libdocument/ev-file-helpers.h
+++ b/libdocument/ev-file-helpers.h
@@ -17,13 +17,12 @@
*
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_FILE_HELPERS_H
-#define EV_FILE_HELPERS_H
-
#include <glib.h>
#include <gio/gio.h>
@@ -84,5 +83,3 @@ gchar *ev_file_compress (const gchar *uri,
GError **error);
G_END_DECLS
-
-#endif /* EV_FILE_HELPERS_H */
diff --git a/libdocument/ev-form-field-private.h b/libdocument/ev-form-field-private.h
index 647968297..ef40cf6f9 100644
--- a/libdocument/ev-form-field-private.h
+++ b/libdocument/ev-form-field-private.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_FORM_FIELD_PRIVATE_H
-#define EV_FORM_FIELD_PRIVATE_H
-
//#include <glib-object.h>
#include "ev-macros.h"
@@ -40,6 +39,3 @@ void ev_form_field_set_alternate_name (EvFormField *field,
gchar *alternative_text);
G_END_DECLS
-
-#endif /* !EV_FORM_FIELD_PRIVATE_H */
-
diff --git a/libdocument/ev-form-field.h b/libdocument/ev-form-field.h
index ffbd17c52..e05868a46 100644
--- a/libdocument/ev-form-field.h
+++ b/libdocument/ev-form-field.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_FORM_FIELD_H
-#define EV_FORM_FIELD_H
-
#include <glib-object.h>
#include "ev-macros.h"
@@ -221,6 +220,3 @@ EvFormField *ev_form_field_signature_new (gint id);
G_END_DECLS
-
-#endif /* !EV_FORM_FIELD_H */
-
diff --git a/libdocument/ev-image.h b/libdocument/ev-image.h
index e8b99108d..7195deb65 100644
--- a/libdocument/ev-image.h
+++ b/libdocument/ev-image.h
@@ -17,13 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef __EV_IMAGE_H__
-#define __EV_IMAGE_H__
-
#include <glib-object.h>
#include <gdk/gdk.h>
@@ -72,7 +71,4 @@ const gchar *ev_image_save_tmp (EvImage *image,
EV_PUBLIC
const gchar *ev_image_get_tmp_uri (EvImage *image);
-
G_END_DECLS
-
-#endif /* __EV_IMAGE_H__ */
diff --git a/libdocument/ev-init.h b/libdocument/ev-init.h
index db66d4531..1833e9137 100644
--- a/libdocument/ev-init.h
+++ b/libdocument/ev-init.h
@@ -17,13 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_INIT_H
-#define EV_INIT_H
-
#include <glib.h>
#include "ev-macros.h"
@@ -42,5 +41,3 @@ void ev_shutdown (void);
gboolean _ev_is_initialized (void);
G_END_DECLS
-
-#endif /* EV_INIT_H */
diff --git a/libdocument/ev-layer.h b/libdocument/ev-layer.h
index 60e9ce864..2def0f30b 100644
--- a/libdocument/ev-layer.h
+++ b/libdocument/ev-layer.h
@@ -17,13 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef __EV_LAYER_H__
-#define __EV_LAYER_H__
-
#include <glib-object.h>
#include "ev-macros.h"
@@ -62,5 +61,3 @@ EV_PUBLIC
gint ev_layer_get_rb_group (EvLayer *layer);
G_END_DECLS
-
-#endif /* __EV_LAYER_H__ */
diff --git a/libdocument/ev-link-action.h b/libdocument/ev-link-action.h
index 113361cfd..990cd3da1 100644
--- a/libdocument/ev-link-action.h
+++ b/libdocument/ev-link-action.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_LINK_ACTION_H
-#define EV_LINK_ACTION_H
-
#include <glib-object.h>
#include "ev-macros.h"
@@ -106,5 +105,3 @@ gboolean ev_link_action_equal (EvLinkAction *a,
EvLinkAction *b);
G_END_DECLS
-
-#endif /* EV_LINK_ACTION_H */
diff --git a/libdocument/ev-link-dest.h b/libdocument/ev-link-dest.h
index 1ac0389e4..80db5de4a 100644
--- a/libdocument/ev-link-dest.h
+++ b/libdocument/ev-link-dest.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_LINK_DEST_H
-#define EV_LINK_DEST_H
-
#include <glib-object.h>
#include "ev-macros.h"
@@ -115,5 +114,3 @@ gboolean ev_link_dest_equal (EvLinkDest *a,
EvLinkDest *b);
G_END_DECLS
-
-#endif /* EV_LINK_DEST_H */
diff --git a/libdocument/ev-link.h b/libdocument/ev-link.h
index fd97cdeb8..2709f7086 100644
--- a/libdocument/ev-link.h
+++ b/libdocument/ev-link.h
@@ -17,13 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_LINK_H
-#define EV_LINK_H
-
#include <glib-object.h>
#include "ev-macros.h"
@@ -56,5 +55,3 @@ EV_PUBLIC
EvLinkAction *ev_link_get_action (EvLink *self);
G_END_DECLS
-
-#endif /* !EV_LINK_H */
diff --git a/libdocument/ev-macros.h b/libdocument/ev-macros.h
index 43a7f0d28..416d87693 100644
--- a/libdocument/ev-macros.h
+++ b/libdocument/ev-macros.h
@@ -16,8 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_MACROS_H
-#define EV_MACROS_H
+#pragma once
#if defined(EV_DISABLE_DEPRECATION_WARNINGS) || defined(EVINCE_COMPILATION)
#define EV_DEPRECATED
@@ -39,5 +38,3 @@
#endif
#define EV_PRIVATE EV_PUBLIC
-
-#endif /* #ifndef EV_MACROS_H */
diff --git a/libdocument/ev-mapping-list.h b/libdocument/ev-mapping-list.h
index e2c9c9aa5..cadc3b1c5 100644
--- a/libdocument/ev-mapping-list.h
+++ b/libdocument/ev-mapping-list.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_MAPPING_LIST_H
-#define EV_MAPPING_LIST_H
-
#include "ev-macros.h"
#include "ev-document.h"
@@ -74,5 +73,3 @@ EV_PUBLIC
guint ev_mapping_list_length (EvMappingList *mapping_list);
G_END_DECLS
-
-#endif /* EV_MAPPING_LIST_H */
diff --git a/libdocument/ev-media.h b/libdocument/ev-media.h
index dd8866598..9c67f7e0f 100644
--- a/libdocument/ev-media.h
+++ b/libdocument/ev-media.h
@@ -17,13 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef __EV_MEDIA_H__
-#define __EV_MEDIA_H__
-
#include <glib-object.h>
#include "ev-macros.h"
@@ -69,5 +68,3 @@ void ev_media_set_show_controls (EvMedia *media,
gboolean show_controls);
G_END_DECLS
-
-#endif /* __EV_MEDIA_H__ */
diff --git a/libdocument/ev-module.h b/libdocument/ev-module.h
index 9b8510769..b7fc7cbfe 100644
--- a/libdocument/ev-module.h
+++ b/libdocument/ev-module.h
@@ -38,13 +38,12 @@
/* Modified by Evince Team */
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef EV_MODULE_H
-#define EV_MODULE_H
-
#include <glib-object.h>
G_BEGIN_DECLS
@@ -70,5 +69,3 @@ GObject *_ev_module_new_object (EvModule *module);
GType _ev_module_get_object_type (EvModule *module);
G_END_DECLS
-
-#endif /* EV_MODULE_H */
diff --git a/libdocument/ev-page.h b/libdocument/ev-page.h
index 98cae8de5..866ea510c 100644
--- a/libdocument/ev-page.h
+++ b/libdocument/ev-page.h
@@ -17,12 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_PAGE_H
-#define EV_PAGE_H
#include <glib-object.h>
@@ -63,5 +63,3 @@ EV_PUBLIC
EvPage *ev_page_new (gint index);
G_END_DECLS
-
-#endif /* EV_PAGE_H */
diff --git a/libdocument/ev-render-context.h b/libdocument/ev-render-context.h
index 218a0a3db..4bd389c78 100644
--- a/libdocument/ev-render-context.h
+++ b/libdocument/ev-render-context.h
@@ -17,13 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_RENDER_CONTEXT_H
-#define EV_RENDER_CONTEXT_H
-
#include <glib-object.h>
#include "ev-macros.h"
@@ -95,5 +94,3 @@ void ev_render_context_compute_scales (EvRenderContext *rc,
double *scale_y);
G_END_DECLS
-
-#endif /* !EV_RENDER_CONTEXT */
diff --git a/libdocument/ev-selection.h b/libdocument/ev-selection.h
index b9f8603fe..8dabc2f77 100644
--- a/libdocument/ev-selection.h
+++ b/libdocument/ev-selection.h
@@ -18,13 +18,12 @@
*
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef EV_SELECTION_H
-#define EV_SELECTION_H
-
#include <glib-object.h>
#include <glib.h>
#include <gdk/gdk.h>
@@ -95,5 +94,3 @@ cairo_region_t *ev_selection_get_selection_region (EvSelection *selection,
EvRectangle *points);
G_END_DECLS
-
-#endif
diff --git a/libdocument/ev-transition-effect.h b/libdocument/ev-transition-effect.h
index a8a1691eb..cd7f6b402 100644
--- a/libdocument/ev-transition-effect.h
+++ b/libdocument/ev-transition-effect.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_DOCUMENT_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-document.h> can be included directly."
#endif
-#ifndef __EV_TRANSITION_EFFECT_H__
-#define __EV_TRANSITION_EFFECT_H__
-
#include <glib-object.h>
#include "ev-macros.h"
@@ -86,5 +85,3 @@ EvTransitionEffect *ev_transition_effect_new (EvTransitionEffec
...);
G_END_DECLS
-
-#endif /* __EV_TRANSITION_EFFECT_H__ */
diff --git a/libdocument/ev-version.h.in b/libdocument/ev-version.h.in
index a8a3db28e..65989b0e7 100644
--- a/libdocument/ev-version.h.in
+++ b/libdocument/ev-version.h.in
@@ -16,8 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_VERSION_H
-#define EV_VERSION_H
+#pragma once
/**
* SECTION:ev-version
@@ -55,5 +54,3 @@
#define EV_CHECK_VERSION(major,minor) \
(EV_MAJOR_VERSION > (major) || \
(EV_MAJOR_VERSION == (major) && EV_MINOR_VERSION > (minor))
-
-#endif /* #ifndef EV_VERSION_H */
diff --git a/libmisc/ev-page-action-widget.h b/libmisc/ev-page-action-widget.h
index da70a3a8b..23a94144d 100644
--- a/libmisc/ev-page-action-widget.h
+++ b/libmisc/ev-page-action-widget.h
@@ -18,8 +18,7 @@
*
*/
-#ifndef __EV_PAGE_ACTION_WIDET_H__
-#define __EV_PAGE_ACTION_WIDET_H__
+#pragma once
#include <evince-view.h>
@@ -51,5 +50,3 @@ void ev_page_action_widget_set_model (EvPageActionWidget *action_widget
void ev_page_action_widget_grab_focus (EvPageActionWidget *proxy);
G_END_DECLS
-
-#endif /* __EV_PAGE_ACTION_WIDET_H__ */
diff --git a/libmisc/ev-search-box.h b/libmisc/ev-search-box.h
index 0b17ff820..a147faf4b 100644
--- a/libmisc/ev-search-box.h
+++ b/libmisc/ev-search-box.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_SEARCH_BOX_H
-#define EV_SEARCH_BOX_H
+#pragma once
#include <gtk/gtk.h>
#include <evince-document.h>
@@ -53,5 +52,3 @@ gboolean ev_search_box_has_results (EvSearchBox *box);
void ev_search_box_restart (EvSearchBox *box);
G_END_DECLS
-
-#endif
diff --git a/libview/ev-annotation-window.h b/libview/ev-annotation-window.h
index 85d8906fa..4dc166e4f 100644
--- a/libview/ev-annotation-window.h
+++ b/libview/ev-annotation-window.h
@@ -19,13 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef EV_ANNOTATION_WINDOW_H
-#define EV_ANNOTATION_WINDOW_H
-
#include <gtk/gtk.h>
#include "ev-annotation.h"
@@ -58,6 +57,5 @@ void ev_annotation_window_ungrab_focus (EvAnnotationWindow *window);
void ev_annotation_window_set_enable_spellchecking (EvAnnotationWindow *window,
gboolean spellcheck);
gboolean ev_annotation_window_get_enable_spellchecking (EvAnnotationWindow *window);
-G_END_DECLS
-#endif /* EV_ANNOTATION_WINDOW_H */
+G_END_DECLS
diff --git a/libview/ev-color-contrast.h b/libview/ev-color-contrast.h
index 300215c2c..b7054c94a 100644
--- a/libview/ev-color-contrast.h
+++ b/libview/ev-color-contrast.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef __EV_COLOR_CONTRAST_H__
-#define __EV_COLOR_CONTRAST_H__
-
#include <gdk/gdk.h>
GdkRGBA *ev_color_contrast_get_most_readable_color (const GdkRGBA *bg_color,
@@ -32,5 +31,3 @@ GdkRGBA *ev_color_contrast_get_most_readable_color (const GdkRGBA *bg_color,
GdkRGBA *second_color);
GdkRGBA *ev_color_contrast_get_best_foreground_color (const GdkRGBA *bg_color);
-
-#endif /* __EV_COLOR_CONTRAST_H__ */
diff --git a/libview/ev-document-model.h b/libview/ev-document-model.h
index daa88d9aa..b92b71dc3 100644
--- a/libview/ev-document-model.h
+++ b/libview/ev-document-model.h
@@ -17,13 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-view.h> can be included directly."
#endif
-#ifndef __EV_DOCUMENT_MODEL_H__
-#define __EV_DOCUMENT_MODEL_H__
-
#include <glib-object.h>
#include <evince-document.h>
@@ -141,5 +140,3 @@ EV_PUBLIC
gboolean ev_document_model_get_dual_page (EvDocumentModel *model);
G_END_DECLS
-
-#endif /* __EV_DOCUMENT_MODEL_H__ */
diff --git a/libview/ev-form-field-accessible.h b/libview/ev-form-field-accessible.h
index 572e1ef68..fa003f592 100644
--- a/libview/ev-form-field-accessible.h
+++ b/libview/ev-form-field-accessible.h
@@ -19,13 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef __EV_FORM_FIELD_ACCESSIBLE_H__
-#define __EV_FORM_FIELD_ACCESSIBLE_H__
-
#include <gtk/gtk-a11y.h>
#include "ev-page-accessible.h"
#include "ev-form-field.h"
@@ -53,5 +52,3 @@ EvFormFieldAccessible *ev_form_field_accessible_new (EvPageAccessible *page,
EvRectangle *area);
EvFormField *ev_form_field_accessible_get_field (EvFormFieldAccessible *accessible);
void ev_form_field_accessible_update_state (EvFormFieldAccessible *accessible);
-
-#endif /* __EV_FORM_FIELD_ACCESSIBLE_H__ */
diff --git a/libview/ev-image-accessible.h b/libview/ev-image-accessible.h
index 5f637a417..9776d6413 100644
--- a/libview/ev-image-accessible.h
+++ b/libview/ev-image-accessible.h
@@ -19,13 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef __EV_IMAGE_ACCESSIBLE_H__
-#define __EV_IMAGE_ACCESSIBLE_H__
-
#include <gtk/gtk-a11y.h>
#include "ev-page-accessible.h"
#include "ev-image.h"
@@ -51,5 +50,3 @@ GType ev_image_accessible_get_type (void);
EvImageAccessible *ev_image_accessible_new (EvPageAccessible *page,
EvImage *image,
EvRectangle *area);
-
-#endif /* __EV_IMAGE_ACCESSIBLE_H__ */
diff --git a/libview/ev-job-scheduler.h b/libview/ev-job-scheduler.h
index eb5c4fb13..3804fc4c1 100644
--- a/libview/ev-job-scheduler.h
+++ b/libview/ev-job-scheduler.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-view.h> can be included directly."
#endif
-#ifndef EV_JOB_SCHEDULER_H
-#define EV_JOB_SCHEDULER_H
-
#include <glib.h>
#include <evince-document.h>
@@ -50,5 +49,3 @@ EV_PUBLIC
EvJob *ev_job_scheduler_get_running_thread_job (void);
G_END_DECLS
-
-#endif /* EV_JOB_SCHEDULER_H */
diff --git a/libview/ev-jobs.h b/libview/ev-jobs.h
index dda9778d3..3bec145fe 100644
--- a/libview/ev-jobs.h
+++ b/libview/ev-jobs.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-view.h> can be included directly."
#endif
-#ifndef __EV_JOBS_H__
-#define __EV_JOBS_H__
-
#include <gio/gio.h>
#include <gtk/gtk.h>
#include <cairo.h>
@@ -690,5 +689,3 @@ void ev_job_print_set_cairo (EvJobPrint *job,
cairo_t *cr);
G_END_DECLS
-
-#endif /* __EV_JOBS_H__ */
diff --git a/libview/ev-link-accessible.h b/libview/ev-link-accessible.h
index 519016e42..69540dd15 100644
--- a/libview/ev-link-accessible.h
+++ b/libview/ev-link-accessible.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef __EV_LINK_ACCESSIBLE_H__
-#define __EV_LINK_ACCESSIBLE_H__
-
#include <gtk/gtk-a11y.h>
#include "ev-page-accessible.h"
#include "ev-link.h"
@@ -51,6 +50,3 @@ GType ev_link_accessible_get_type (void);
EvLinkAccessible *ev_link_accessible_new (EvPageAccessible *page,
EvLink *link,
EvRectangle *area);
-
-#endif /* __EV_LINK_ACCESSIBLE_H__ */
-
diff --git a/libview/ev-media-player.h b/libview/ev-media-player.h
index ef7b686df..d4f4cf205 100644
--- a/libview/ev-media-player.h
+++ b/libview/ev-media-player.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_MEDIA_PLAYER_H
-#define EV_MEDIA_PLAYER_H
+#pragma once
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -47,5 +46,3 @@ GtkWidget *ev_media_player_new (EvMedia *media);
EvMedia *ev_media_player_get_media (EvMediaPlayer *player);
G_END_DECLS
-
-#endif /* EV_MEDIA_PLAYER_H */
diff --git a/libview/ev-page-accessible.h b/libview/ev-page-accessible.h
index 6b285d231..45edeeb68 100644
--- a/libview/ev-page-accessible.h
+++ b/libview/ev-page-accessible.h
@@ -20,13 +20,12 @@
* Author: Alejandro Piñeiro Iglesias <apinheiro igalia com>
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef __EV_PAGE_ACCESSIBLE_H__
-#define __EV_PAGE_ACCESSIBLE_H__
-
#include <gtk/gtk-a11y.h>
#include "ev-view-accessible.h"
#include "ev-view.h"
@@ -59,6 +58,3 @@ AtkObject *ev_page_accessible_get_accessible_for_mapping (EvPageAccessibl
EvMapping *mapping);
void ev_page_accessible_update_element_state (EvPageAccessible *page_accessible,
EvMapping *mapping);
-
-#endif /* __EV_PAGE_ACCESSIBLE_H__ */
-
diff --git a/libview/ev-page-cache.h b/libview/ev-page-cache.h
index 0ccc48965..e6c6d0b0f 100644
--- a/libview/ev-page-cache.h
+++ b/libview/ev-page-cache.h
@@ -17,13 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef EV_PAGE_CACHE_H
-#define EV_PAGE_CACHE_H
-
#include <glib-object.h>
#include <gdk/gdk.h>
#include <evince-document.h>
@@ -82,5 +81,3 @@ void ev_page_cache_ensure_page (EvPageCache *cach
gboolean ev_page_cache_is_page_cached (EvPageCache *cache,
gint page);
G_END_DECLS
-
-#endif /* EV_PAGE_CACHE_H */
diff --git a/libview/ev-pixbuf-cache.h b/libview/ev-pixbuf-cache.h
index bfd495f2d..b3aed18a8 100644
--- a/libview/ev-pixbuf-cache.h
+++ b/libview/ev-pixbuf-cache.h
@@ -21,13 +21,12 @@
* ev-view.c from exploding.
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef __EV_PIXBUF_CACHE_H__
-#define __EV_PIXBUF_CACHE_H__
-
#include <gtk/gtk.h>
#include <evince-document.h>
@@ -89,5 +88,3 @@ void ev_pixbuf_cache_set_selection_list (EvPixbufCache *pixbuf_cache
GList *ev_pixbuf_cache_get_selection_list (EvPixbufCache *pixbuf_cache);
G_END_DECLS
-
-#endif /* __EV_PIXBUF_CACHE_H__ */
diff --git a/libview/ev-print-operation.h b/libview/ev-print-operation.h
index 371a055bb..2a47240ae 100644
--- a/libview/ev-print-operation.h
+++ b/libview/ev-print-operation.h
@@ -17,13 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-view.h> can be included directly."
#endif
-#ifndef __EV_PRINT_OPERATION_H__
-#define __EV_PRINT_OPERATION_H__
-
#include <gtk/gtk.h>
#include <glib-object.h>
@@ -85,5 +84,3 @@ EV_PUBLIC
gdouble ev_print_operation_get_progress (EvPrintOperation *op);
G_END_DECLS
-
-#endif /* __EV_PRINT_OPERATION_H__ */
diff --git a/libview/ev-stock-icons.h b/libview/ev-stock-icons.h
index 5048c2734..b8c1486c8 100644
--- a/libview/ev-stock-icons.h
+++ b/libview/ev-stock-icons.h
@@ -21,13 +21,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-view.h> can be included directly."
#endif
-#ifndef __EV_STOCK_ICONS_H__
-#define __EV_STOCK_ICONS_H__
-
#include <gdk/gdk.h>
#include <evince-document.h>
@@ -64,5 +63,3 @@ EV_PUBLIC
void ev_stock_icons_set_screen (GdkScreen *screen);
G_END_DECLS
-
-#endif /* __EV_STOCK_ICONS_H__ */
diff --git a/libview/ev-timeline.h b/libview/ev-timeline.h
index 942a6fc6b..2783b4327 100644
--- a/libview/ev-timeline.h
+++ b/libview/ev-timeline.h
@@ -19,13 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef __EV_TIMELINE_H__
-#define __EV_TIMELINE_H__
-
#include <glib-object.h>
G_BEGIN_DECLS
@@ -86,5 +85,3 @@ gdouble ev_timeline_get_progress (EvTimeline *ti
G_END_DECLS
-
-#endif /* __EV_TIMELINE_H__ */
diff --git a/libview/ev-transition-animation.h b/libview/ev-transition-animation.h
index 520d26d67..97ebdbd23 100644
--- a/libview/ev-transition-animation.h
+++ b/libview/ev-transition-animation.h
@@ -19,13 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef __EV_TRANSITION_ANIMATION_H__
-#define __EV_TRANSITION_ANIMATION_H__
-
#include <evince-document.h>
#include "ev-timeline.h"
#include "ev-transition-effect.h"
@@ -67,7 +66,4 @@ void ev_transition_animation_paint (EvTransition
GdkRectangle page_area);
gboolean ev_transition_animation_ready (EvTransitionAnimation *animation);
-
G_END_DECLS
-
-#endif /* __EV_TRANSITION_ANIMATION_H__ */
diff --git a/libview/ev-view-accessible.h b/libview/ev-view-accessible.h
index 14c3ac9ef..e3d4f999a 100644
--- a/libview/ev-view-accessible.h
+++ b/libview/ev-view-accessible.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef __EV_VIEW_ACCESSIBLE_H__
-#define __EV_VIEW_ACCESSIBLE_H__
-
#include <gtk/gtk-a11y.h>
#include "ev-document-model.h"
@@ -71,6 +70,3 @@ void ev_view_accessible_set_focused_element (EvViewAccessible *accessible,
void ev_view_accessible_update_element_state (EvViewAccessible *accessible,
EvMapping *element,
gint element_page);
-
-#endif /* __EV_VIEW_ACCESSIBLE_H__ */
-
diff --git a/libview/ev-view-cursor.h b/libview/ev-view-cursor.h
index 6690b590c..4e2e8c9ff 100644
--- a/libview/ev-view-cursor.h
+++ b/libview/ev-view-cursor.h
@@ -17,13 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef __EV_VIEW_CURSOR_H__
-#define __EV_VIEW_CURSOR_H__
-
#include <gtk/gtk.h>
G_BEGIN_DECLS
@@ -43,5 +42,3 @@ GdkCursor *ev_view_cursor_new (GdkDisplay *display,
EvViewCursor cursor);
G_END_DECLS
-
-#endif /* __EV_VIEW_CURSOR_H__ */
diff --git a/libview/ev-view-presentation.h b/libview/ev-view-presentation.h
index 441879591..5fe2616a3 100644
--- a/libview/ev-view-presentation.h
+++ b/libview/ev-view-presentation.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-view.h> can be included directly."
#endif
-#ifndef __EV_VIEW_PRESENTATION_H__
-#define __EV_VIEW_PRESENTATION_H__
-
#include <gtk/gtk.h>
#include <evince-document.h>
@@ -62,5 +61,3 @@ EV_PUBLIC
guint ev_view_presentation_get_rotation (EvViewPresentation *pview);
G_END_DECLS
-
-#endif /* __EV_VIEW_PRESENTATION_H__ */
diff --git a/libview/ev-view-private.h b/libview/ev-view-private.h
index bc71fa758..c73e2f482 100644
--- a/libview/ev-view-private.h
+++ b/libview/ev-view-private.h
@@ -18,13 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (EVINCE_COMPILATION)
#error "This is a private header."
#endif
-#ifndef __EV_VIEW_PRIVATE_H__
-#define __EV_VIEW_PRIVATE_H__
-
#include "ev-view.h"
#include "ev-document-model.h"
#include "ev-pixbuf-cache.h"
@@ -355,6 +354,3 @@ void _ev_view_focus_form_field (EvView *view,
void _ev_view_ensure_rectangle_is_visible (EvView *view,
GdkRectangle *rect);
-
-#endif /* __EV_VIEW_PRIVATE_H__ */
-
diff --git a/libview/ev-view-type-builtins.h.template b/libview/ev-view-type-builtins.h.template
index d3facb5b3..87223721b 100644
--- a/libview/ev-view-type-builtins.h.template
+++ b/libview/ev-view-type-builtins.h.template
@@ -1,12 +1,11 @@
/*** BEGIN file-header ***/
+#pragma once
+
#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-view.h> can be included directly."
#endif
-#ifndef EV_VIEW_TYPE_BUILTINS_H
-#define EV_VIEW_TYPE_BUILTINS_H
-
#include <glib-object.h>
#include <evince-document.h>
@@ -27,6 +26,4 @@ GType @enum_name@_get_type (void) G_GNUC_CONST;
/*** BEGIN file-tail ***/
G_END_DECLS
-
-#endif /* !EV_VIEW_TYPE_BUILTINS_H */
/*** END file-tail ***/
diff --git a/libview/ev-view.h b/libview/ev-view.h
index 4834073e1..1ade3b731 100644
--- a/libview/ev-view.h
+++ b/libview/ev-view.h
@@ -17,13 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#pragma once
+
#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION)
#error "Only <evince-view.h> can be included directly."
#endif
-#ifndef __EV_VIEW_H__
-#define __EV_VIEW_H__
-
#include <gtk/gtk.h>
#include <evince-document.h>
@@ -193,5 +192,3 @@ void ev_view_set_caret_cursor_position (EvView *view,
guint page,
guint offset);
G_END_DECLS
-
-#endif /* __EV_VIEW_H__ */
diff --git a/previewer/ev-previewer-toolbar.h b/previewer/ev-previewer-toolbar.h
index 7a3ac4b98..dd35e739b 100644
--- a/previewer/ev-previewer-toolbar.h
+++ b/previewer/ev-previewer-toolbar.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_PREVIEWER_TOOLBAR_H__
-#define __EV_PREVIEWER_TOOLBAR_H__
+#pragma once
#include <gtk/gtk.h>
#include "ev-previewer-window.h"
@@ -50,5 +49,3 @@ GtkWidget *ev_previewer_toolbar_new (EvPreviewerWindow *window
GtkWidget *ev_previewer_toolbar_get_page_selector (EvPreviewerToolbar *ev_previewer_toolbar);
G_END_DECLS
-
-#endif /* __EV_PREVIEWER_TOOLBAR_H__ */
diff --git a/previewer/ev-previewer-window.h b/previewer/ev-previewer-window.h
index 7449e8f5c..df01162c7 100644
--- a/previewer/ev-previewer-window.h
+++ b/previewer/ev-previewer-window.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_PREVIEWER_WINDOW_H
-#define EV_PREVIEWER_WINDOW_H
+#pragma once
#include <gtk/gtk.h>
@@ -49,5 +48,3 @@ void ev_previewer_window_set_source_file (EvPreviewerWindow *window,
const gchar *source_file);
G_END_DECLS
-
-#endif /* EV_PREVIEWER_WINDOW_H */
diff --git a/properties/ev-properties-view.h b/properties/ev-properties-view.h
index ca2a3710a..8d27d5b50 100644
--- a/properties/ev-properties-view.h
+++ b/properties/ev-properties-view.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_PROPERTIES_VIEW_H__
-#define __EV_PROPERTIES_VIEW_H__
+#pragma once
#include <gtk/gtk.h>
@@ -46,5 +45,3 @@ void ev_properties_view_set_info (EvPropertiesView *properties,
const EvDocumentInfo *info);
G_END_DECLS
-
-#endif /* __EV_PROPERTIES_VIEW_H__ */
diff --git a/shell/ev-annotation-properties-dialog.h b/shell/ev-annotation-properties-dialog.h
index acd55bd84..b1d2316c2 100644
--- a/shell/ev-annotation-properties-dialog.h
+++ b/shell/ev-annotation-properties-dialog.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_ANNOTATION_PROPERTIES_DIALOG_H__
-#define __EV_ANNOTATION_PROPERTIES_DIALOG_H__
+#pragma once
#include <gtk/gtk.h>
#include <glib-object.h>
@@ -51,5 +50,3 @@ EvAnnotationTextIcon ev_annotation_properties_dialog_get_text_icon
EvAnnotationTextMarkupType ev_annotation_properties_dialog_get_text_markup_type
(EvAnnotationPropertiesDialog *dialog);
G_END_DECLS
-
-#endif /* __EV_ANNOTATION_PROPERTIES_DIALOG_H__ */
diff --git a/shell/ev-annotations-toolbar.h b/shell/ev-annotations-toolbar.h
index 7690ac332..6edac3998 100644
--- a/shell/ev-annotations-toolbar.h
+++ b/shell/ev-annotations-toolbar.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __EV_ANNOTATIONS_TOOLBAR_H__
-#define __EV_ANNOTATIONS_TOOLBAR_H__
+#pragma once
#include <gtk/gtk.h>
@@ -40,5 +39,3 @@ GtkWidget *ev_annotations_toolbar_new (void);
void ev_annotations_toolbar_add_annot_finished (EvAnnotationsToolbar *toolbar);
G_END_DECLS
-
-#endif /* __EV_ANNOTATIONS_TOOLBAR_H__ */
diff --git a/shell/ev-application.h b/shell/ev-application.h
index f9b43ab35..22d21a57c 100644
--- a/shell/ev-application.h
+++ b/shell/ev-application.h
@@ -20,8 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_APPLICATION_H
-#define EV_APPLICATION_H
+#pragma once
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -76,6 +75,3 @@ void ev_application_new_window (EvApplication *application
guint32 timestamp);
G_END_DECLS
-
-#endif /* !EV_APPLICATION_H */
-
diff --git a/shell/ev-bookmarks.h b/shell/ev-bookmarks.h
index c86135268..493cec144 100644
--- a/shell/ev-bookmarks.h
+++ b/shell/ev-bookmarks.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_BOOKMARKS_H
-#define EV_BOOKMARKS_H
+#pragma once
#include <glib-object.h>
@@ -51,8 +50,4 @@ void ev_bookmarks_delete (EvBookmarks *bookmarks,
void ev_bookmarks_update (EvBookmarks *bookmarks,
EvBookmark *bookmark);
-
-
G_END_DECLS
-
-#endif /* EV_BOOKMARKS_H */
diff --git a/shell/ev-file-monitor.h b/shell/ev-file-monitor.h
index 67a60f3f3..dd4ead8d4 100644
--- a/shell/ev-file-monitor.h
+++ b/shell/ev-file-monitor.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_FILE_MONITOR_H
-#define EV_FILE_MONITOR_H
+#pragma once
#include <glib-object.h>
@@ -50,5 +49,3 @@ GType ev_file_monitor_get_type (void) G_GNUC_CONST;
EvFileMonitor *ev_file_monitor_new (const gchar *uri);
G_END_DECLS
-
-#endif /* EV_FILE_MONITOR_H */
diff --git a/shell/ev-find-sidebar.h b/shell/ev-find-sidebar.h
index 65178bb28..7f477fd63 100644
--- a/shell/ev-find-sidebar.h
+++ b/shell/ev-find-sidebar.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_FIND_SIDEBAR_H
-#define EV_FIND_SIDEBAR_H
+#pragma once
#include <gtk/gtk.h>
@@ -59,6 +58,3 @@ void ev_find_sidebar_previous (EvFindSidebar *find_sidebar);
void ev_find_sidebar_next (EvFindSidebar *find_sidebar);
G_END_DECLS
-
-#endif /* EV_FIND_SIDEBAR_H */
-
diff --git a/shell/ev-history.h b/shell/ev-history.h
index af633b94a..9ebfde681 100644
--- a/shell/ev-history.h
+++ b/shell/ev-history.h
@@ -17,8 +17,7 @@
*
*/
-#ifndef EV_HISTORY_H
-#define EV_HISTORY_H
+#pragma once
#include <glib-object.h>
#include <evince-document.h>
@@ -70,5 +69,3 @@ void ev_history_thaw (EvHistory *history);
gboolean ev_history_is_frozen (EvHistory *history);
G_END_DECLS
-
-#endif
diff --git a/shell/ev-keyring.h b/shell/ev-keyring.h
index f53fb5611..cfdda8c23 100644
--- a/shell/ev-keyring.h
+++ b/shell/ev-keyring.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_KEYRING_H__
-#define __EV_KEYRING_H__
+#pragma once
#include <glib.h>
#include <gio/gio.h>
@@ -33,5 +32,3 @@ gboolean ev_keyring_save_password (const gchar *uri,
GPasswordSave flags);
G_END_DECLS
-
-#endif /* __EV_KEYRING_H__ */
diff --git a/shell/ev-loading-message.h b/shell/ev-loading-message.h
index 38428640e..af3f4972e 100644
--- a/shell/ev-loading-message.h
+++ b/shell/ev-loading-message.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_LOADING_MESSAGE_H
-#define EV_LOADING_MESSAGE_H
+#pragma once
#include <gtk/gtk.h>
@@ -40,5 +39,3 @@ GType ev_loading_message_get_type (void) G_GNUC_CONST;
GtkWidget *ev_loading_message_new (void);
G_END_DECLS
-
-#endif /* EV_LOADING_MESSAGE_H */
diff --git a/shell/ev-media-player-keys.h b/shell/ev-media-player-keys.h
index 8e2d62bec..589bce5ed 100644
--- a/shell/ev-media-player-keys.h
+++ b/shell/ev-media-player-keys.h
@@ -19,8 +19,7 @@
*
*/
-#ifndef EV_MEDIA_PLAYER_KEYS_H
-#define EV_MEDIA_PLAYER_KEYS_H
+#pragma once
#include <glib-object.h>
#include <gio/gio.h>
@@ -45,5 +44,3 @@ EvMediaPlayerKeys *ev_media_player_keys_new (void);
void ev_media_player_keys_focused (EvMediaPlayerKeys *keys);
G_END_DECLS
-
-#endif /* !EV_MEDIA_PLAYER_KEYS_H */
diff --git a/shell/ev-message-area.h b/shell/ev-message-area.h
index b8783d2b2..5acc78d49 100644
--- a/shell/ev-message-area.h
+++ b/shell/ev-message-area.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_MESSAGE_AREA_H
-#define EV_MESSAGE_AREA_H
+#pragma once
#include <gtk/gtk.h>
@@ -64,5 +63,3 @@ void _ev_message_area_add_buttons_valist (EvMessageArea *area,
GtkWidget *_ev_message_area_get_main_box (EvMessageArea *area);
G_END_DECLS
-
-#endif /* EV_MESSAGE_AREA_H */
diff --git a/shell/ev-metadata.h b/shell/ev-metadata.h
index 7fd4f054e..66f223d78 100644
--- a/shell/ev-metadata.h
+++ b/shell/ev-metadata.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_METADATA_H
-#define EV_METADATA_H
+#pragma once
#include <glib-object.h>
#include <gio/gio.h>
@@ -68,5 +67,3 @@ gboolean ev_metadata_has_key (EvMetadata *metadata,
gboolean ev_is_metadata_supported_for_file (GFile *file);
G_END_DECLS
-
-#endif /* EV_METADATA_H */
diff --git a/shell/ev-password-view.h b/shell/ev-password-view.h
index e279c612e..a68ff2a72 100644
--- a/shell/ev-password-view.h
+++ b/shell/ev-password-view.h
@@ -17,8 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_PASSWORD_VIEW_H__
-#define __EV_PASSWORD_VIEW_H__
+#pragma once
#include <gtk/gtk.h>
#include <gio/gio.h>
@@ -53,5 +52,3 @@ const gchar *ev_password_view_get_password (EvPasswordView *password
GPasswordSave ev_password_view_get_password_save_flags (EvPasswordView *password_view);
G_END_DECLS
-
-#endif /* __EV_PASSWORD_VIEW_H__ */
diff --git a/shell/ev-progress-message-area.h b/shell/ev-progress-message-area.h
index 7a2faae0b..fe6b6bcb4 100644
--- a/shell/ev-progress-message-area.h
+++ b/shell/ev-progress-message-area.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_PROGRESS_MESSAGE_AREA_H
-#define EV_PROGRESS_MESSAGE_AREA_H
+#pragma once
#include <gtk/gtk.h>
@@ -57,5 +56,3 @@ void ev_progress_message_area_set_fraction (EvProgressMessageArea *area
gdouble fraction);
G_END_DECLS
-
-#endif /* EV_PROGRESS_MESSAGE_AREA_H */
diff --git a/shell/ev-properties-dialog.h b/shell/ev-properties-dialog.h
index 83bea3aab..2d9d5c526 100644
--- a/shell/ev-properties-dialog.h
+++ b/shell/ev-properties-dialog.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_PROPERTIES_DIALOG_H__
-#define __EV_PROPERTIES_DIALOG_H__
+#pragma once
#include "ev-document.h"
@@ -43,5 +42,3 @@ void ev_properties_dialog_set_document (EvPropertiesDialog *properties,
EvDocument *document);
G_END_DECLS
-
-#endif /* __EV_PROPERTIES_DIALOG_H__ */
diff --git a/shell/ev-properties-fonts.h b/shell/ev-properties-fonts.h
index 50a4ce041..694483daf 100644
--- a/shell/ev-properties-fonts.h
+++ b/shell/ev-properties-fonts.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_PROPERTIES_FONTS_H__
-#define __EV_PROPERTIES_FONTS_H__
+#pragma once
#include "ev-document.h"
@@ -44,5 +43,3 @@ void ev_properties_fonts_set_document (EvPropertiesFonts *properties,
EvDocument *document);
G_END_DECLS
-
-#endif /* __EV_PROPERTIES_FONTS_H__ */
diff --git a/shell/ev-properties-license.h b/shell/ev-properties-license.h
index 287a1a6ed..7764df3e0 100644
--- a/shell/ev-properties-license.h
+++ b/shell/ev-properties-license.h
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_PROPERTIES_LICENSE_VIEW_H__
-#define __EV_PROPERTIES_LICENSE_VIEW_H__
+#pragma once
#include <gtk/gtk.h>
@@ -46,5 +45,3 @@ void ev_properties_license_set_license (EvPropertiesLicense *properties_li
EvDocumentLicense *license);
G_END_DECLS
-
-#endif /* __EV_PROPERTIES_LICENSE_VIEW_H__ */
diff --git a/shell/ev-recent-view.h b/shell/ev-recent-view.h
index d9b6677dd..ea1186cc7 100644
--- a/shell/ev-recent-view.h
+++ b/shell/ev-recent-view.h
@@ -17,8 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_RECENT_VIEW_H__
-#define __EV_RECENT_VIEW_H__
+#pragma once
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -49,5 +48,3 @@ GType ev_recent_view_get_type (void) G_GNUC_CONST;
GtkWidget *ev_recent_view_new (void);
G_END_DECLS
-
-#endif /* __EV_RECENT_VIEW_H__ */
diff --git a/shell/ev-sidebar-annotations.h b/shell/ev-sidebar-annotations.h
index bb0dd96b2..f9e192a52 100644
--- a/shell/ev-sidebar-annotations.h
+++ b/shell/ev-sidebar-annotations.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_SIDEBAR_ANNOTATIONS_H__
-#define __EV_SIDEBAR_ANNOTATIONS_H__
+#pragma once
#include <gtk/gtk.h>
#include <glib-object.h>
@@ -57,6 +56,5 @@ void ev_sidebar_annotations_annot_added (EvSidebarAnnotations *sidebar_a
void ev_sidebar_annotations_annot_changed (EvSidebarAnnotations *sidebar_annots,
EvAnnotation *annot);
void ev_sidebar_annotations_annot_removed (EvSidebarAnnotations *sidebar_annots);
-G_END_DECLS
-#endif /* __EV_SIDEBAR_ANNOTATIONS_H__ */
+G_END_DECLS
diff --git a/shell/ev-sidebar-attachments.h b/shell/ev-sidebar-attachments.h
index 43d7333f1..a9011387d 100644
--- a/shell/ev-sidebar-attachments.h
+++ b/shell/ev-sidebar-attachments.h
@@ -21,8 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_SIDEBAR_ATTACHMENTS_H__
-#define __EV_SIDEBAR_ATTACHMENTS_H__
+#pragma once
#include "ev-attachment.h"
#include "ev-document.h"
@@ -61,5 +60,3 @@ GType ev_sidebar_attachments_get_type (void) G_GNUC_CONST;
GtkWidget *ev_sidebar_attachments_new (void);
G_END_DECLS
-
-#endif /* __EV_SIDEBAR_ATTACHMENTS_H__ */
diff --git a/shell/ev-sidebar-bookmarks.h b/shell/ev-sidebar-bookmarks.h
index 4efd133f4..a6412a932 100644
--- a/shell/ev-sidebar-bookmarks.h
+++ b/shell/ev-sidebar-bookmarks.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_SIDEBAR_BOOKMARKS_H__
-#define __EV_SIDEBAR_BOOKMARKS_H__
+#pragma once
#include <gtk/gtk.h>
#include <glib-object.h>
@@ -59,5 +58,3 @@ GtkWidget *ev_sidebar_bookmarks_new (void);
void ev_sidebar_bookmarks_set_bookmarks (EvSidebarBookmarks *sidebar_bookmarks,
EvBookmarks *bookmarks);
G_END_DECLS
-
-#endif /* __EV_SIDEBAR_BOOKMARKS_H__ */
diff --git a/shell/ev-sidebar-layers.h b/shell/ev-sidebar-layers.h
index a610b802e..e19093ed8 100644
--- a/shell/ev-sidebar-layers.h
+++ b/shell/ev-sidebar-layers.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_SIDEBAR_LAYERS_H__
-#define __EV_SIDEBAR_LAYERS_H__
+#pragma once
#include <gtk/gtk.h>
#include <glib-object.h>
@@ -55,5 +54,3 @@ GtkWidget *ev_sidebar_layers_new (void);
void ev_sidebar_layers_update_layers_state (EvSidebarLayers *sidebar_layers);
G_END_DECLS
-
-#endif /* __EV_SIDEBAR_LAYERS_H__ */
diff --git a/shell/ev-sidebar-links.h b/shell/ev-sidebar-links.h
index 12da4d1eb..09c265caa 100644
--- a/shell/ev-sidebar-links.h
+++ b/shell/ev-sidebar-links.h
@@ -21,8 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_SIDEBAR_LINKS_H__
-#define __EV_SIDEBAR_LINKS_H__
+#pragma once
#include <gtk/gtk.h>
@@ -60,7 +59,3 @@ GType ev_sidebar_links_get_type (void);
GtkWidget *ev_sidebar_links_new (void);
G_END_DECLS
-
-#endif /* __EV_SIDEBAR_LINKS_H__ */
-
-
diff --git a/shell/ev-sidebar-page.h b/shell/ev-sidebar-page.h
index 21ef92cfc..eb4f0054e 100644
--- a/shell/ev-sidebar-page.h
+++ b/shell/ev-sidebar-page.h
@@ -18,8 +18,7 @@
*
*/
-#ifndef EV_SIDEBAR_PAGE_H
-#define EV_SIDEBAR_PAGE_H
+#pragma once
#include <glib-object.h>
#include <glib.h>
@@ -60,5 +59,3 @@ const gchar* ev_sidebar_page_get_label (EvSidebarPage *page);
G_END_DECLS
-
-#endif /* EV_SIDEBAR_PAGE */
diff --git a/shell/ev-sidebar-thumbnails.h b/shell/ev-sidebar-thumbnails.h
index b989a3b7e..9aba0454a 100644
--- a/shell/ev-sidebar-thumbnails.h
+++ b/shell/ev-sidebar-thumbnails.h
@@ -21,8 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_SIDEBAR_THUMBNAILS_H__
-#define __EV_SIDEBAR_THUMBNAILS_H__
+#pragma once
#include <gtk/gtk.h>
@@ -53,7 +52,3 @@ GType ev_sidebar_thumbnails_get_type (void) G_GNUC_CONST;
GtkWidget *ev_sidebar_thumbnails_new (void);
G_END_DECLS
-
-#endif /* __EV_SIDEBAR_THUMBNAILS_H__ */
-
-
diff --git a/shell/ev-sidebar.h b/shell/ev-sidebar.h
index 74ba1cdcf..b0e1e5574 100644
--- a/shell/ev-sidebar.h
+++ b/shell/ev-sidebar.h
@@ -23,8 +23,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_SIDEBAR_H__
-#define __EV_SIDEBAR_H__
+#pragma once
#include <gtk/gtk.h>
@@ -64,7 +63,3 @@ void ev_sidebar_set_model (EvSidebar *ev_sidebar,
GtkWidget *ev_sidebar_get_current_page (EvSidebar *ev_sidebar);
G_END_DECLS
-
-#endif /* __EV_SIDEBAR_H__ */
-
-
diff --git a/shell/ev-toolbar.h b/shell/ev-toolbar.h
index 9ad76fc5b..432563e75 100644
--- a/shell/ev-toolbar.h
+++ b/shell/ev-toolbar.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_TOOLBAR_H__
-#define __EV_TOOLBAR_H__
+#pragma once
#include <gtk/gtk.h>
#include "ev-window.h"
@@ -60,5 +59,3 @@ void ev_toolbar_set_mode (EvToolbar *ev_toolbar,
EvToolbarMode ev_toolbar_get_mode (EvToolbar *ev_toolbar);
G_END_DECLS
-
-#endif /* __EV_TOOLBAR_H__ */
diff --git a/shell/ev-utils.h b/shell/ev-utils.h
index 846df37c4..8eb6bdff3 100644
--- a/shell/ev-utils.h
+++ b/shell/ev-utils.h
@@ -18,8 +18,7 @@
*
*/
-#ifndef __EV_UTILS_H__
-#define __EV_UTILS_H__
+#pragma once
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtk.h>
@@ -39,5 +38,3 @@ GdkPixbufFormat* get_gdk_pixbuf_format_by_extension (const gchar *uri);
gchar* ev_str_replace (const char *str, const char *substr, const char *repl);
G_END_DECLS
-
-#endif /* __EV_VIEW_H__ */
diff --git a/shell/ev-window-title.h b/shell/ev-window-title.h
index a25ace47d..1e585704b 100644
--- a/shell/ev-window-title.h
+++ b/shell/ev-window-title.h
@@ -17,8 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __EV_WINDOW_TITLE_H__
-#define __EV_WINDOW_TITLE_H__
+#pragma once
#include "ev-window.h"
#include "ev-document.h"
@@ -44,5 +43,3 @@ void ev_window_title_set_filename (EvWindowTitle *window_title,
void ev_window_title_free (EvWindowTitle *window_title);
G_END_DECLS
-
-#endif /* __EV_WINDOW_TITLE_H__ */
diff --git a/shell/ev-window.h b/shell/ev-window.h
index 65fe322b7..50edb11e0 100644
--- a/shell/ev-window.h
+++ b/shell/ev-window.h
@@ -21,8 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_WINDOW_H
-#define EV_WINDOW_H
+#pragma once
#include <glib.h>
#include <gtk/gtk.h>
@@ -105,5 +104,3 @@ void ev_window_set_divider_position (EvWindow *ev_window,
gint sidebar_width);
G_END_DECLS
-
-#endif /* !EV_WINDOW_H */
diff --git a/shell/ev-zoom-action.h b/shell/ev-zoom-action.h
index 0d962176c..d01dc11c7 100644
--- a/shell/ev-zoom-action.h
+++ b/shell/ev-zoom-action.h
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef EV_ZOOM_ACTION_H
-#define EV_ZOOM_ACTION_H
+#pragma once
#include <gtk/gtk.h>
#include <evince-document.h>
@@ -52,5 +51,3 @@ GtkWidget *ev_zoom_action_new (EvDocumentModel *model,
gboolean ev_zoom_action_get_popup_shown (EvZoomAction *action);
G_END_DECLS
-
-#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
