From 837897ffba5a5e4e5685c1ffdeb1d4d87083a052 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Fri, 07 May 2010 11:05:07 +0000 Subject: [libdocument] Use G_DEFINE_INTERFACE instead of out own macro --- diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c index dc57cdd..272761f 100644 --- a/backend/comics/comics-document.c +++ b/backend/comics/comics-document.c @@ -119,7 +119,7 @@ static const ComicBookDecompressCommand command_usage_def[] = { {"%s -xOf" , "%s -tf %s" , NULL , NO_OFFSET} }; -static void comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface); +static void comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface); static GSList* get_supported_image_extensions (void); static void get_page_size_area_prepared_cb (GdkPixbufLoader *loader, @@ -820,7 +820,7 @@ comics_document_thumbnails_get_dimensions (EvDocumentThumbnails *document, } static void -comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface) +comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface) { iface->get_thumbnail = comics_document_thumbnails_get_thumbnail; iface->get_dimensions = comics_document_thumbnails_get_dimensions; diff --git a/backend/djvu/djvu-document.c b/backend/djvu/djvu-document.c index 776d0dc..8a747de 100644 --- a/backend/djvu/djvu-document.c +++ b/backend/djvu/djvu-document.c @@ -51,11 +51,11 @@ struct _DjvuDocumentClass typedef struct _DjvuDocumentClass DjvuDocumentClass; -static void djvu_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface); -static void djvu_document_file_exporter_iface_init (EvFileExporterIface *iface); -static void djvu_document_find_iface_init (EvDocumentFindIface *iface); -static void djvu_document_document_links_iface_init (EvDocumentLinksIface *iface); -static void djvu_selection_iface_init (EvSelectionIface *iface); +static void djvu_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface); +static void djvu_document_file_exporter_iface_init (EvFileExporterInterface *iface); +static void djvu_document_find_iface_init (EvDocumentFindInterface *iface); +static void djvu_document_document_links_iface_init (EvDocumentLinksInterface *iface); +static void djvu_selection_iface_init (EvSelectionInterface *iface); EV_BACKEND_REGISTER_WITH_CODE (DjvuDocument, djvu_document, { @@ -468,7 +468,7 @@ djvu_selection_get_selected_text (EvSelection *selection, } static void -djvu_selection_iface_init (EvSelectionIface *iface) +djvu_selection_iface_init (EvSelectionInterface *iface) { iface->get_selected_text = djvu_selection_get_selected_text; } @@ -541,7 +541,7 @@ djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, } static void -djvu_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface) +djvu_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface) { iface->get_thumbnail = djvu_document_thumbnails_get_thumbnail; iface->get_dimensions = djvu_document_thumbnails_get_dimensions; @@ -605,7 +605,7 @@ djvu_document_file_exporter_get_capabilities (EvFileExporter *exporter) } static void -djvu_document_file_exporter_iface_init (EvFileExporterIface *iface) +djvu_document_file_exporter_iface_init (EvFileExporterInterface *iface) { iface->begin = djvu_document_file_exporter_begin; iface->do_page = djvu_document_file_exporter_do_page; @@ -684,7 +684,7 @@ djvu_document_find_find_text (EvDocumentFind *document, } static void -djvu_document_find_iface_init (EvDocumentFindIface *iface) +djvu_document_find_iface_init (EvDocumentFindInterface *iface) { iface->find_text = djvu_document_find_find_text; } @@ -697,7 +697,7 @@ djvu_document_links_get_links (EvDocumentLinks *document_links, } static void -djvu_document_document_links_iface_init (EvDocumentLinksIface *iface) +djvu_document_document_links_iface_init (EvDocumentLinksInterface *iface) { iface->has_document_links = djvu_links_has_document_links; iface->get_links_model = djvu_links_get_links_model; diff --git a/backend/dvi/dvi-document.c b/backend/dvi/dvi-document.c index fb578a4..2365c1e 100644 --- a/backend/dvi/dvi-document.c +++ b/backend/dvi/dvi-document.c @@ -74,11 +74,11 @@ struct _DviDocument typedef struct _DviDocumentClass DviDocumentClass; -static void dvi_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface); -static void dvi_document_file_exporter_iface_init (EvFileExporterIface *iface); -static void dvi_document_do_color_special (DviContext *dvi, - const char *prefix, - const char *arg); +static void dvi_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface); +static void dvi_document_file_exporter_iface_init (EvFileExporterInterface *iface); +static void dvi_document_do_color_special (DviContext *dvi, + const char *prefix, + const char *arg); EV_BACKEND_REGISTER_WITH_CODE (DviDocument, dvi_document, { @@ -337,7 +337,7 @@ dvi_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, } static void -dvi_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface) +dvi_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface) { iface->get_thumbnail = dvi_document_thumbnails_get_thumbnail; iface->get_dimensions = dvi_document_thumbnails_get_dimensions; @@ -413,7 +413,7 @@ dvi_document_file_exporter_get_capabilities (EvFileExporter *exporter) } static void -dvi_document_file_exporter_iface_init (EvFileExporterIface *iface) +dvi_document_file_exporter_iface_init (EvFileExporterInterface *iface) { iface->begin = dvi_document_file_exporter_begin; iface->do_page = dvi_document_file_exporter_do_page; diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc index cc4999e..ac1fce8 100644 --- a/backend/pdf/ev-poppler.cc +++ b/backend/pdf/ev-poppler.cc @@ -122,27 +122,27 @@ struct _PdfDocument GList *layers; }; -static void pdf_document_security_iface_init (EvDocumentSecurityIface *iface); -static void pdf_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface); -static void pdf_document_document_links_iface_init (EvDocumentLinksIface *iface); -static void pdf_document_document_images_iface_init (EvDocumentImagesIface *iface); -static void pdf_document_document_forms_iface_init (EvDocumentFormsIface *iface); -static void pdf_document_document_fonts_iface_init (EvDocumentFontsIface *iface); -static void pdf_document_document_layers_iface_init (EvDocumentLayersIface *iface); +static void pdf_document_security_iface_init (EvDocumentSecurityInterface *iface); +static void pdf_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface); +static void pdf_document_document_links_iface_init (EvDocumentLinksInterface *iface); +static void pdf_document_document_images_iface_init (EvDocumentImagesInterface *iface); +static void pdf_document_document_forms_iface_init (EvDocumentFormsInterface *iface); +static void pdf_document_document_fonts_iface_init (EvDocumentFontsInterface *iface); +static void pdf_document_document_layers_iface_init (EvDocumentLayersInterface *iface); #ifdef HAVE_POPPLER_PAGE_RENDER -static void pdf_document_document_print_iface_init (EvDocumentPrintIface *iface); +static void pdf_document_document_print_iface_init (EvDocumentPrintInterface *iface); #endif -static void pdf_document_document_annotations_iface_init (EvDocumentAnnotationsIface *iface); -static void pdf_document_document_attachments_iface_init (EvDocumentAttachmentsIface *iface); -static void pdf_document_find_iface_init (EvDocumentFindIface *iface); -static void pdf_document_file_exporter_iface_init (EvFileExporterIface *iface); -static void pdf_selection_iface_init (EvSelectionIface *iface); -static void pdf_document_page_transition_iface_init (EvDocumentTransitionIface *iface); -static void pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnails, - EvRenderContext *rc, - gint *width, - gint *height); -static int pdf_document_get_n_pages (EvDocument *document); +static void pdf_document_document_annotations_iface_init (EvDocumentAnnotationsInterface *iface); +static void pdf_document_document_attachments_iface_init (EvDocumentAttachmentsInterface *iface); +static void pdf_document_find_iface_init (EvDocumentFindInterface *iface); +static void pdf_document_file_exporter_iface_init (EvFileExporterInterface *iface); +static void pdf_selection_iface_init (EvSelectionInterface *iface); +static void pdf_document_page_transition_iface_init (EvDocumentTransitionInterface *iface); +static void pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnails, + EvRenderContext *rc, + gint *width, + gint *height); +static int pdf_document_get_n_pages (EvDocument *document); static EvLinkDest *ev_link_dest_from_dest (PdfDocument *pdf_document, PopplerDest *dest); @@ -893,7 +893,7 @@ pdf_document_set_password (EvDocumentSecurity *document_security, } static void -pdf_document_security_iface_init (EvDocumentSecurityIface *iface) +pdf_document_security_iface_init (EvDocumentSecurityInterface *iface) { iface->has_document_security = pdf_document_has_document_security; iface->set_password = pdf_document_set_password; @@ -1013,7 +1013,7 @@ pdf_document_fonts_fill_model (EvDocumentFonts *document_fonts, } static void -pdf_document_document_fonts_iface_init (EvDocumentFontsIface *iface) +pdf_document_document_fonts_iface_init (EvDocumentFontsInterface *iface) { iface->fill_model = pdf_document_fonts_fill_model; iface->scan = pdf_document_fonts_scan; @@ -1340,7 +1340,7 @@ pdf_document_links_find_link_dest (EvDocumentLinks *document_links, } static void -pdf_document_document_links_iface_init (EvDocumentLinksIface *iface) +pdf_document_document_links_iface_init (EvDocumentLinksInterface *iface) { iface->has_document_links = pdf_document_links_has_document_links; iface->get_links_model = pdf_document_links_get_links_model; @@ -1410,7 +1410,7 @@ pdf_document_images_get_image (EvDocumentImages *document_images, } static void -pdf_document_document_images_iface_init (EvDocumentImagesIface *iface) +pdf_document_document_images_iface_init (EvDocumentImagesInterface *iface) { iface->get_image_mapping = pdf_document_images_get_image_mapping; iface->get_image = pdf_document_images_get_image; @@ -1531,7 +1531,7 @@ pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnail } static void -pdf_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface) +pdf_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface) { iface->get_thumbnail = pdf_document_thumbnails_get_thumbnail; iface->get_dimensions = pdf_document_thumbnails_get_dimensions; @@ -1571,7 +1571,7 @@ pdf_document_find_find_text (EvDocumentFind *document_find, } static void -pdf_document_find_iface_init (EvDocumentFindIface *iface) +pdf_document_find_iface_init (EvDocumentFindInterface *iface) { iface->find_text = pdf_document_find_find_text; } @@ -1855,7 +1855,7 @@ pdf_document_file_exporter_get_capabilities (EvFileExporter *exporter) } static void -pdf_document_file_exporter_iface_init (EvFileExporterIface *iface) +pdf_document_file_exporter_iface_init (EvFileExporterInterface *iface) { iface->begin = pdf_document_file_exporter_begin; iface->begin_page = pdf_document_file_exporter_begin_page; @@ -1878,7 +1878,7 @@ pdf_document_print_print_page (EvDocumentPrint *document, } static void -pdf_document_document_print_iface_init (EvDocumentPrintIface *iface) +pdf_document_document_print_iface_init (EvDocumentPrintInterface *iface) { iface->print_page = pdf_document_print_print_page; } @@ -2057,7 +2057,7 @@ pdf_selection_get_selection_map (EvSelection *selection, } static void -pdf_selection_iface_init (EvSelectionIface *iface) +pdf_selection_iface_init (EvSelectionInterface *iface) { iface->render_selection = pdf_selection_render_selection; iface->get_selected_text = pdf_selection_get_selected_text; @@ -2124,7 +2124,7 @@ pdf_document_get_effect (EvDocumentTransition *trans, } static void -pdf_document_page_transition_iface_init (EvDocumentTransitionIface *iface) +pdf_document_page_transition_iface_init (EvDocumentTransitionInterface *iface) { iface->get_page_duration = pdf_document_get_page_duration; iface->get_effect = pdf_document_get_effect; @@ -2490,7 +2490,7 @@ pdf_document_forms_form_field_choice_get_text (EvDocumentForms *document, } static void -pdf_document_document_forms_iface_init (EvDocumentFormsIface *iface) +pdf_document_document_forms_iface_init (EvDocumentFormsInterface *iface) { iface->get_form_fields = pdf_document_forms_get_form_fields; iface->form_field_text_get_text = pdf_document_forms_form_field_text_get_text; @@ -2724,7 +2724,7 @@ pdf_document_annotations_annotation_set_contents (EvDocumentAnnotations *documen } static void -pdf_document_document_annotations_iface_init (EvDocumentAnnotationsIface *iface) +pdf_document_document_annotations_iface_init (EvDocumentAnnotationsInterface *iface) { iface->get_annotations = pdf_document_annotations_get_annotations; iface->annotation_set_contents = pdf_document_annotations_annotation_set_contents; @@ -2841,7 +2841,7 @@ pdf_document_attachments_has_attachments (EvDocumentAttachments *document) } static void -pdf_document_document_attachments_iface_init (EvDocumentAttachmentsIface *iface) +pdf_document_document_attachments_iface_init (EvDocumentAttachmentsInterface *iface) { iface->has_attachments = pdf_document_attachments_has_attachments; iface->get_attachments = pdf_document_attachments_get_attachments; @@ -2971,7 +2971,7 @@ pdf_document_layers_layer_is_visible (EvDocumentLayers *document, } static void -pdf_document_document_layers_iface_init (EvDocumentLayersIface *iface) +pdf_document_document_layers_iface_init (EvDocumentLayersInterface *iface) { iface->has_layers = pdf_document_layers_has_layers; iface->get_layers = pdf_document_layers_get_layers; diff --git a/backend/pixbuf/pixbuf-document.c b/backend/pixbuf/pixbuf-document.c index 0621f28..065fe49 100644 --- a/backend/pixbuf/pixbuf-document.c +++ b/backend/pixbuf/pixbuf-document.c @@ -41,7 +41,7 @@ struct _PixbufDocument typedef struct _PixbufDocumentClass PixbufDocumentClass; -static void pixbuf_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface); +static void pixbuf_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface); EV_BACKEND_REGISTER_WITH_CODE (PixbufDocument, pixbuf_document, { @@ -195,7 +195,7 @@ pixbuf_document_thumbnails_get_dimensions (EvDocumentThumbnails *document, } static void -pixbuf_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface) +pixbuf_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface) { iface->get_thumbnail = pixbuf_document_thumbnails_get_thumbnail; iface->get_dimensions = pixbuf_document_thumbnails_get_dimensions; diff --git a/backend/ps/ev-spectre.c b/backend/ps/ev-spectre.c index 8560fbe..54807f0 100644 --- a/backend/ps/ev-spectre.c +++ b/backend/ps/ev-spectre.c @@ -41,8 +41,8 @@ struct _PSDocumentClass { EvDocumentClass parent_class; }; -static void ps_document_file_exporter_iface_init (EvFileExporterIface *iface); -static void ps_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface); +static void ps_document_file_exporter_iface_init (EvFileExporterInterface *iface); +static void ps_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface); EV_BACKEND_REGISTER_WITH_CODE (PSDocument, ps_document, { @@ -401,7 +401,7 @@ ps_document_thumbnails_get_dimensions (EvDocumentThumbnails *document_thumbnails } static void -ps_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface) +ps_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface) { iface->get_thumbnail = ps_document_thumbnails_get_thumbnail; iface->get_dimensions = ps_document_thumbnails_get_dimensions; @@ -464,7 +464,7 @@ ps_document_file_exporter_get_capabilities (EvFileExporter *exporter) } static void -ps_document_file_exporter_iface_init (EvFileExporterIface *iface) +ps_document_file_exporter_iface_init (EvFileExporterInterface *iface) { iface->begin = ps_document_file_exporter_begin; iface->do_page = ps_document_file_exporter_do_page; diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c index 25a961e..9c113b4 100644 --- a/backend/tiff/tiff-document.c +++ b/backend/tiff/tiff-document.c @@ -53,8 +53,8 @@ struct _TiffDocument typedef struct _TiffDocumentClass TiffDocumentClass; -static void tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface); -static void tiff_document_document_file_exporter_iface_init (EvFileExporterIface *iface); +static void tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface); +static void tiff_document_document_file_exporter_iface_init (EvFileExporterInterface *iface); EV_BACKEND_REGISTER_WITH_CODE (TiffDocument, tiff_document, { @@ -468,7 +468,7 @@ tiff_document_thumbnails_get_dimensions (EvDocumentThumbnails *document, } static void -tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface) +tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface) { iface->get_thumbnail = tiff_document_thumbnails_get_thumbnail; iface->get_dimensions = tiff_document_thumbnails_get_dimensions; @@ -518,7 +518,7 @@ tiff_document_file_exporter_get_capabilities (EvFileExporter *exporter) } static void -tiff_document_document_file_exporter_iface_init (EvFileExporterIface *iface) +tiff_document_document_file_exporter_iface_init (EvFileExporterInterface *iface) { iface->begin = tiff_document_file_exporter_begin; iface->do_page = tiff_document_file_exporter_do_page; diff --git a/libdocument/ev-async-renderer.c b/libdocument/ev-async-renderer.c index 0a65aa2..3b8d7b7 100644 --- a/libdocument/ev-async-renderer.c +++ b/libdocument/ev-async-renderer.c @@ -31,10 +31,10 @@ enum static guint signals[LAST_SIGNAL] = { 0 }; -EV_DEFINE_INTERFACE (EvAsyncRenderer, ev_async_renderer, 0) +G_DEFINE_INTERFACE (EvAsyncRenderer, ev_async_renderer, 0) static void -ev_async_renderer_class_init (EvAsyncRendererIface *klass) +ev_async_renderer_default_init (EvAsyncRendererInterface *klass) { static gboolean initialized = FALSE; @@ -43,7 +43,7 @@ ev_async_renderer_class_init (EvAsyncRendererIface *klass) g_signal_new ("render_finished", EV_TYPE_ASYNC_RENDERER, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EvAsyncRendererIface, render_finished), + G_STRUCT_OFFSET (EvAsyncRendererInterface, render_finished), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, @@ -59,7 +59,7 @@ ev_async_renderer_render_pixbuf (EvAsyncRenderer *async_renderer, double scale, int rotation) { - EvAsyncRendererIface *iface = EV_ASYNC_RENDERER_GET_IFACE (async_renderer); + EvAsyncRendererInterface *iface = EV_ASYNC_RENDERER_GET_IFACE (async_renderer); iface->render_pixbuf (async_renderer, page, scale, rotation); } diff --git a/libdocument/ev-async-renderer.h b/libdocument/ev-async-renderer.h index 9ada10c..4ce3caa 100644 --- a/libdocument/ev-async-renderer.h +++ b/libdocument/ev-async-renderer.h @@ -33,15 +33,15 @@ G_BEGIN_DECLS #define EV_TYPE_ASYNC_RENDERER (ev_async_renderer_get_type ()) #define EV_ASYNC_RENDERER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_ASYNC_RENDERER, EvAsyncRenderer)) -#define EV_ASYNC_RENDERER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_ASYNC_RENDERER, EvAsyncRendererIface)) +#define EV_ASYNC_RENDERER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_ASYNC_RENDERER, EvAsyncRendererInterface)) #define EV_IS_ASYNC_RENDERER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_ASYNC_RENDERER)) #define EV_IS_ASYNC_RENDERER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_ASYNC_RENDERER)) -#define EV_ASYNC_RENDERER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_ASYNC_RENDERER, EvAsyncRendererIface)) +#define EV_ASYNC_RENDERER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_ASYNC_RENDERER, EvAsyncRendererInterface)) -typedef struct _EvAsyncRenderer EvAsyncRenderer; -typedef struct _EvAsyncRendererIface EvAsyncRendererIface; +typedef struct _EvAsyncRenderer EvAsyncRenderer; +typedef struct _EvAsyncRendererInterface EvAsyncRendererInterface; -struct _EvAsyncRendererIface +struct _EvAsyncRendererInterface { GTypeInterface base_iface; diff --git a/libdocument/ev-document-annotations.c b/libdocument/ev-document-annotations.c index 61dad6b..4523fb4 100644 --- a/libdocument/ev-document-annotations.c +++ b/libdocument/ev-document-annotations.c @@ -21,10 +21,10 @@ #include "ev-document-annotations.h" -EV_DEFINE_INTERFACE (EvDocumentAnnotations, ev_document_annotations, 0) +G_DEFINE_INTERFACE (EvDocumentAnnotations, ev_document_annotations, 0) static void -ev_document_annotations_class_init (EvDocumentAnnotationsIface *klass) +ev_document_annotations_default_init (EvDocumentAnnotationsInterface *klass) { } @@ -32,7 +32,7 @@ GList * ev_document_annotations_get_annotations (EvDocumentAnnotations *document_annots, EvPage *page) { - EvDocumentAnnotationsIface *iface = EV_DOCUMENT_ANNOTATIONS_GET_IFACE (document_annots); + EvDocumentAnnotationsInterface *iface = EV_DOCUMENT_ANNOTATIONS_GET_IFACE (document_annots); return iface->get_annotations (document_annots, page); } @@ -42,7 +42,7 @@ ev_document_annotations_annotation_set_contents (EvDocumentAnnotations *document EvAnnotation *annot, const gchar *contents) { - EvDocumentAnnotationsIface *iface = EV_DOCUMENT_ANNOTATIONS_GET_IFACE (document_annots); + EvDocumentAnnotationsInterface *iface = EV_DOCUMENT_ANNOTATIONS_GET_IFACE (document_annots); iface->annotation_set_contents (document_annots, annot, contents); } diff --git a/libdocument/ev-document-annotations.h b/libdocument/ev-document-annotations.h index 9349675..8f06b11 100644 --- a/libdocument/ev-document-annotations.h +++ b/libdocument/ev-document-annotations.h @@ -34,15 +34,15 @@ G_BEGIN_DECLS #define EV_TYPE_DOCUMENT_ANNOTATIONS (ev_document_annotations_get_type ()) #define EV_DOCUMENT_ANNOTATIONS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_ANNOTATIONS, EvDocumentAnnotations)) -#define EV_DOCUMENT_ANNOTATIONS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_ANNOTATIONS, EvDocumentAnnotationsIface)) +#define EV_DOCUMENT_ANNOTATIONS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_ANNOTATIONS, EvDocumentAnnotationsInterface)) #define EV_IS_DOCUMENT_ANNOTATIONS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT_ANNOTATIONS)) #define EV_IS_DOCUMENT_ANNOTATIONS_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT_ANNOTATIONS)) -#define EV_DOCUMENT_ANNOTATIONS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_ANNOTATIONS, EvDocumentAnnotationsIface)) +#define EV_DOCUMENT_ANNOTATIONS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_ANNOTATIONS, EvDocumentAnnotationsInterface)) -typedef struct _EvDocumentAnnotations EvDocumentAnnotations; -typedef struct _EvDocumentAnnotationsIface EvDocumentAnnotationsIface; +typedef struct _EvDocumentAnnotations EvDocumentAnnotations; +typedef struct _EvDocumentAnnotationsInterface EvDocumentAnnotationsInterface; -struct _EvDocumentAnnotationsIface +struct _EvDocumentAnnotationsInterface { GTypeInterface base_iface; diff --git a/libdocument/ev-document-attachments.c b/libdocument/ev-document-attachments.c index e9775f2..3e4ce09 100644 --- a/libdocument/ev-document-attachments.c +++ b/libdocument/ev-document-attachments.c @@ -23,17 +23,17 @@ #include "ev-document-attachments.h" #include "ev-document.h" -EV_DEFINE_INTERFACE (EvDocumentAttachments, ev_document_attachments, 0) +G_DEFINE_INTERFACE (EvDocumentAttachments, ev_document_attachments, 0) static void -ev_document_attachments_class_init (EvDocumentAttachmentsIface *klass) +ev_document_attachments_default_init (EvDocumentAttachmentsInterface *klass) { } gboolean ev_document_attachments_has_attachments (EvDocumentAttachments *document_attachments) { - EvDocumentAttachmentsIface *iface = EV_DOCUMENT_ATTACHMENTS_GET_IFACE (document_attachments); + EvDocumentAttachmentsInterface *iface = EV_DOCUMENT_ATTACHMENTS_GET_IFACE (document_attachments); return iface->has_attachments (document_attachments); } @@ -41,7 +41,7 @@ ev_document_attachments_has_attachments (EvDocumentAttachments *document_attachm GList * ev_document_attachments_get_attachments (EvDocumentAttachments *document_attachments) { - EvDocumentAttachmentsIface *iface = EV_DOCUMENT_ATTACHMENTS_GET_IFACE (document_attachments); + EvDocumentAttachmentsInterface *iface = EV_DOCUMENT_ATTACHMENTS_GET_IFACE (document_attachments); return iface->get_attachments (document_attachments); } diff --git a/libdocument/ev-document-attachments.h b/libdocument/ev-document-attachments.h index b7cbff5..e699a82 100644 --- a/libdocument/ev-document-attachments.h +++ b/libdocument/ev-document-attachments.h @@ -32,15 +32,15 @@ G_BEGIN_DECLS #define EV_TYPE_DOCUMENT_ATTACHMENTS (ev_document_attachments_get_type ()) #define EV_DOCUMENT_ATTACHMENTS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_ATTACHMENTS, EvDocumentAttachments)) -#define EV_DOCUMENT_ATTACHMENTS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_ATTACHMENTS, EvDocumentAttachmentsIface)) +#define EV_DOCUMENT_ATTACHMENTS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_ATTACHMENTS, EvDocumentAttachmentsInterface)) #define EV_IS_DOCUMENT_ATTACHMENTS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT_ATTACHMENTS)) #define EV_IS_DOCUMENT_ATTACHMENTS_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT_ATTACHMENTS)) -#define EV_DOCUMENT_ATTACHMENTS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_ATTACHMENTS, EvDocumentAttachmentsIface)) +#define EV_DOCUMENT_ATTACHMENTS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_ATTACHMENTS, EvDocumentAttachmentsInterface)) -typedef struct _EvDocumentAttachments EvDocumentAttachments; -typedef struct _EvDocumentAttachmentsIface EvDocumentAttachmentsIface; +typedef struct _EvDocumentAttachments EvDocumentAttachments; +typedef struct _EvDocumentAttachmentsInterface EvDocumentAttachmentsInterface; -struct _EvDocumentAttachmentsIface +struct _EvDocumentAttachmentsInterface { GTypeInterface base_iface; diff --git a/libdocument/ev-document-find.c b/libdocument/ev-document-find.c index 3fbc8bf..0b5fac0 100644 --- a/libdocument/ev-document-find.c +++ b/libdocument/ev-document-find.c @@ -22,10 +22,10 @@ #include "ev-document-find.h" -EV_DEFINE_INTERFACE (EvDocumentFind, ev_document_find, 0) +G_DEFINE_INTERFACE (EvDocumentFind, ev_document_find, 0) static void -ev_document_find_class_init (EvDocumentFindIface *klass) +ev_document_find_default_init (EvDocumentFindInterface *klass) { } @@ -35,7 +35,7 @@ ev_document_find_find_text (EvDocumentFind *document_find, const gchar *text, gboolean case_sensitive) { - EvDocumentFindIface *iface = EV_DOCUMENT_FIND_GET_IFACE (document_find); + EvDocumentFindInterface *iface = EV_DOCUMENT_FIND_GET_IFACE (document_find); return iface->find_text (document_find, page, text, case_sensitive); } diff --git a/libdocument/ev-document-find.h b/libdocument/ev-document-find.h index 03c5a39..dcc3438 100644 --- a/libdocument/ev-document-find.h +++ b/libdocument/ev-document-find.h @@ -35,15 +35,15 @@ G_BEGIN_DECLS #define EV_TYPE_DOCUMENT_FIND (ev_document_find_get_type ()) #define EV_DOCUMENT_FIND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_FIND, EvDocumentFind)) -#define EV_DOCUMENT_FIND_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_FIND, EvDocumentFindIface)) +#define EV_DOCUMENT_FIND_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_FIND, EvDocumentFindInterface)) #define EV_IS_DOCUMENT_FIND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT_FIND)) #define EV_IS_DOCUMENT_FIND_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT_FIND)) -#define EV_DOCUMENT_FIND_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_FIND, EvDocumentFindIface)) +#define EV_DOCUMENT_FIND_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_FIND, EvDocumentFindInterface)) -typedef struct _EvDocumentFind EvDocumentFind; -typedef struct _EvDocumentFindIface EvDocumentFindIface; +typedef struct _EvDocumentFind EvDocumentFind; +typedef struct _EvDocumentFindInterface EvDocumentFindInterface; -struct _EvDocumentFindIface +struct _EvDocumentFindInterface { GTypeInterface base_iface; diff --git a/libdocument/ev-document-fonts.c b/libdocument/ev-document-fonts.c index 9cf2866..7622f72 100644 --- a/libdocument/ev-document-fonts.c +++ b/libdocument/ev-document-fonts.c @@ -25,17 +25,17 @@ #include "ev-document-fonts.h" -EV_DEFINE_INTERFACE (EvDocumentFonts, ev_document_fonts, 0) +G_DEFINE_INTERFACE (EvDocumentFonts, ev_document_fonts, 0) static void -ev_document_fonts_class_init (EvDocumentFontsIface *klass) +ev_document_fonts_default_init (EvDocumentFontsInterface *klass) { } double ev_document_fonts_get_progress (EvDocumentFonts *document_fonts) { - EvDocumentFontsIface *iface = EV_DOCUMENT_FONTS_GET_IFACE (document_fonts); + EvDocumentFontsInterface *iface = EV_DOCUMENT_FONTS_GET_IFACE (document_fonts); return iface->get_progress (document_fonts); } @@ -44,7 +44,7 @@ gboolean ev_document_fonts_scan (EvDocumentFonts *document_fonts, int n_pages) { - EvDocumentFontsIface *iface = EV_DOCUMENT_FONTS_GET_IFACE (document_fonts); + EvDocumentFontsInterface *iface = EV_DOCUMENT_FONTS_GET_IFACE (document_fonts); return iface->scan (document_fonts, n_pages); } @@ -53,7 +53,7 @@ void ev_document_fonts_fill_model (EvDocumentFonts *document_fonts, GtkTreeModel *model) { - EvDocumentFontsIface *iface = EV_DOCUMENT_FONTS_GET_IFACE (document_fonts); + EvDocumentFontsInterface *iface = EV_DOCUMENT_FONTS_GET_IFACE (document_fonts); iface->fill_model (document_fonts, model); } diff --git a/libdocument/ev-document-fonts.h b/libdocument/ev-document-fonts.h index e7c2de6..8cabe35 100644 --- a/libdocument/ev-document-fonts.h +++ b/libdocument/ev-document-fonts.h @@ -40,13 +40,13 @@ G_BEGIN_DECLS #define EV_TYPE_DOCUMENT_FONTS (ev_document_fonts_get_type ()) #define EV_DOCUMENT_FONTS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_FONTS, EvDocumentFonts)) -#define EV_DOCUMENT_FONTS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_FONTS, EvDocumentFontsIface)) +#define EV_DOCUMENT_FONTS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_FONTS, EvDocumentFontsInterface)) #define EV_IS_DOCUMENT_FONTS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT_FONTS)) #define EV_IS_DOCUMENT_FONTS_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT_FONTS)) -#define EV_DOCUMENT_FONTS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_FONTS, EvDocumentFontsIface)) +#define EV_DOCUMENT_FONTS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_FONTS, EvDocumentFontsInterface)) -typedef struct _EvDocumentFonts EvDocumentFonts; -typedef struct _EvDocumentFontsIface EvDocumentFontsIface; +typedef struct _EvDocumentFonts EvDocumentFonts; +typedef struct _EvDocumentFontsInterface EvDocumentFontsInterface; enum { EV_DOCUMENT_FONTS_COLUMN_NAME, @@ -54,7 +54,7 @@ enum { EV_DOCUMENT_FONTS_COLUMN_NUM_COLUMNS }; -struct _EvDocumentFontsIface +struct _EvDocumentFontsInterface { GTypeInterface base_iface; diff --git a/libdocument/ev-document-forms.c b/libdocument/ev-document-forms.c index c557d87..9e8fb0e 100644 --- a/libdocument/ev-document-forms.c +++ b/libdocument/ev-document-forms.c @@ -21,10 +21,10 @@ #include #include "ev-document-forms.h" -EV_DEFINE_INTERFACE (EvDocumentForms, ev_document_forms, 0) +G_DEFINE_INTERFACE (EvDocumentForms, ev_document_forms, 0) static void -ev_document_forms_class_init (EvDocumentFormsIface *klass) +ev_document_forms_default_init (EvDocumentFormsInterface *klass) { } @@ -32,7 +32,7 @@ GList * ev_document_forms_get_form_fields (EvDocumentForms *document_forms, EvPage *page) { - EvDocumentFormsIface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); + EvDocumentFormsInterface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); return iface->get_form_fields (document_forms, page); } @@ -41,7 +41,7 @@ gchar * ev_document_forms_form_field_text_get_text (EvDocumentForms *document_forms, EvFormField *field) { - EvDocumentFormsIface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); + EvDocumentFormsInterface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); return iface->form_field_text_get_text (document_forms, field); } @@ -51,7 +51,7 @@ ev_document_forms_form_field_text_set_text (EvDocumentForms *document_forms, EvFormField *field, const gchar *text) { - EvDocumentFormsIface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); + EvDocumentFormsInterface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); iface->form_field_text_set_text (document_forms, field, text); } @@ -60,7 +60,7 @@ gboolean ev_document_forms_form_field_button_get_state (EvDocumentForms *document_forms, EvFormField *field) { - EvDocumentFormsIface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); + EvDocumentFormsInterface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); return iface->form_field_button_get_state (document_forms, field); } @@ -70,7 +70,7 @@ ev_document_forms_form_field_button_set_state (EvDocumentForms *document_forms EvFormField *field, gboolean state) { - EvDocumentFormsIface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); + EvDocumentFormsInterface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); iface->form_field_button_set_state (document_forms, field, state); } @@ -80,7 +80,7 @@ ev_document_forms_form_field_choice_get_item (EvDocumentForms *document_forms, EvFormField *field, gint index) { - EvDocumentFormsIface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); + EvDocumentFormsInterface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); return iface->form_field_choice_get_item (document_forms, field, index); } @@ -89,7 +89,7 @@ gint ev_document_forms_form_field_choice_get_n_items (EvDocumentForms *document_forms, EvFormField *field) { - EvDocumentFormsIface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); + EvDocumentFormsInterface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); return iface->form_field_choice_get_n_items (document_forms, field); } @@ -99,7 +99,7 @@ ev_document_forms_form_field_choice_is_item_selected (EvDocumentForms *documen EvFormField *field, gint index) { - EvDocumentFormsIface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); + EvDocumentFormsInterface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); return iface->form_field_choice_is_item_selected (document_forms, field, index); } @@ -109,7 +109,7 @@ ev_document_forms_form_field_choice_select_item (EvDocumentForms *document_for EvFormField *field, gint index) { - EvDocumentFormsIface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); + EvDocumentFormsInterface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); iface->form_field_choice_select_item (document_forms, field, index); } @@ -119,7 +119,7 @@ ev_document_forms_form_field_choice_toggle_item (EvDocumentForms *document_for EvFormField *field, gint index) { - EvDocumentFormsIface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); + EvDocumentFormsInterface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); iface->form_field_choice_toggle_item (document_forms, field, index); } @@ -128,7 +128,7 @@ void ev_document_forms_form_field_choice_unselect_all (EvDocumentForms *document_forms, EvFormField *field) { - EvDocumentFormsIface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); + EvDocumentFormsInterface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); iface->form_field_choice_unselect_all (document_forms, field); } @@ -138,7 +138,7 @@ ev_document_forms_form_field_choice_set_text (EvDocumentForms *document_forms, EvFormField *field, const gchar *text) { - EvDocumentFormsIface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); + EvDocumentFormsInterface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); iface->form_field_choice_set_text (document_forms, field, text); } @@ -147,7 +147,7 @@ gchar * ev_document_forms_form_field_choice_get_text (EvDocumentForms *document_forms, EvFormField *field) { - EvDocumentFormsIface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); + EvDocumentFormsInterface *iface = EV_DOCUMENT_FORMS_GET_IFACE (document_forms); return iface->form_field_choice_get_text (document_forms, field); } diff --git a/libdocument/ev-document-forms.h b/libdocument/ev-document-forms.h index 7567633..3552467 100644 --- a/libdocument/ev-document-forms.h +++ b/libdocument/ev-document-forms.h @@ -34,15 +34,15 @@ G_BEGIN_DECLS #define EV_TYPE_DOCUMENT_FORMS (ev_document_forms_get_type ()) #define EV_DOCUMENT_FORMS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_FORMS, EvDocumentForms)) -#define EV_DOCUMENT_FORMS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_FORMS, EvDocumentFormsIface)) +#define EV_DOCUMENT_FORMS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_FORMS, EvDocumentFormsInterface)) #define EV_IS_DOCUMENT_FORMS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT_FORMS)) #define EV_IS_DOCUMENT_FORMS_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT_FORMS)) -#define EV_DOCUMENT_FORMS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_FORMS, EvDocumentFormsIface)) +#define EV_DOCUMENT_FORMS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_FORMS, EvDocumentFormsInterface)) -typedef struct _EvDocumentForms EvDocumentForms; -typedef struct _EvDocumentFormsIface EvDocumentFormsIface; +typedef struct _EvDocumentForms EvDocumentForms; +typedef struct _EvDocumentFormsInterface EvDocumentFormsInterface; -struct _EvDocumentFormsIface +struct _EvDocumentFormsInterface { GTypeInterface base_iface; diff --git a/libdocument/ev-document-images.c b/libdocument/ev-document-images.c index 0b367d6..c03b8f9 100644 --- a/libdocument/ev-document-images.c +++ b/libdocument/ev-document-images.c @@ -21,10 +21,10 @@ #include #include "ev-document-images.h" -EV_DEFINE_INTERFACE (EvDocumentImages, ev_document_images, 0) +G_DEFINE_INTERFACE (EvDocumentImages, ev_document_images, 0) static void -ev_document_images_class_init (EvDocumentImagesIface *klass) +ev_document_images_default_init (EvDocumentImagesInterface *klass) { } @@ -32,7 +32,7 @@ GList * ev_document_images_get_image_mapping (EvDocumentImages *document_images, EvPage *page) { - EvDocumentImagesIface *iface = EV_DOCUMENT_IMAGES_GET_IFACE (document_images); + EvDocumentImagesInterface *iface = EV_DOCUMENT_IMAGES_GET_IFACE (document_images); return iface->get_image_mapping (document_images, page); } @@ -41,7 +41,7 @@ GdkPixbuf * ev_document_images_get_image (EvDocumentImages *document_images, EvImage *image) { - EvDocumentImagesIface *iface = EV_DOCUMENT_IMAGES_GET_IFACE (document_images); + EvDocumentImagesInterface *iface = EV_DOCUMENT_IMAGES_GET_IFACE (document_images); return iface->get_image (document_images, image); } diff --git a/libdocument/ev-document-images.h b/libdocument/ev-document-images.h index 7c38a30..d9f6b02 100644 --- a/libdocument/ev-document-images.h +++ b/libdocument/ev-document-images.h @@ -35,15 +35,15 @@ G_BEGIN_DECLS #define EV_TYPE_DOCUMENT_IMAGES (ev_document_images_get_type ()) #define EV_DOCUMENT_IMAGES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_IMAGES, EvDocumentImages)) -#define EV_DOCUMENT_IMAGES_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_IMAGES, EvDocumentImagesIface)) +#define EV_DOCUMENT_IMAGES_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_IMAGES, EvDocumentImagesInterface)) #define EV_IS_DOCUMENT_IMAGES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT_IMAGES)) #define EV_IS_DOCUMENT_IMAGES_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT_IMAGES)) -#define EV_DOCUMENT_IMAGES_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_IMAGES, EvDocumentImagesIface)) +#define EV_DOCUMENT_IMAGES_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_IMAGES, EvDocumentImagesInterface)) -typedef struct _EvDocumentImages EvDocumentImages; -typedef struct _EvDocumentImagesIface EvDocumentImagesIface; +typedef struct _EvDocumentImages EvDocumentImages; +typedef struct _EvDocumentImagesInterface EvDocumentImagesInterface; -struct _EvDocumentImagesIface { +struct _EvDocumentImagesInterface { GTypeInterface base_iface; /* Methods */ diff --git a/libdocument/ev-document-layers.c b/libdocument/ev-document-layers.c index 209bd12..38c8885 100644 --- a/libdocument/ev-document-layers.c +++ b/libdocument/ev-document-layers.c @@ -23,17 +23,17 @@ #include "ev-document-layers.h" #include "ev-document.h" -EV_DEFINE_INTERFACE (EvDocumentLayers, ev_document_layers, 0) +G_DEFINE_INTERFACE (EvDocumentLayers, ev_document_layers, 0) static void -ev_document_layers_class_init (EvDocumentLayersIface *klass) +ev_document_layers_default_init (EvDocumentLayersInterface *klass) { } gboolean ev_document_layers_has_layers (EvDocumentLayers *document_layers) { - EvDocumentLayersIface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers); + EvDocumentLayersInterface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers); return iface->has_layers (document_layers); } @@ -41,7 +41,7 @@ ev_document_layers_has_layers (EvDocumentLayers *document_layers) GtkTreeModel * ev_document_layers_get_layers (EvDocumentLayers *document_layers) { - EvDocumentLayersIface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers); + EvDocumentLayersInterface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers); return iface->get_layers (document_layers); } @@ -50,7 +50,7 @@ void ev_document_layers_show_layer (EvDocumentLayers *document_layers, EvLayer *layer) { - EvDocumentLayersIface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers); + EvDocumentLayersInterface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers); iface->show_layer (document_layers, layer); } @@ -59,7 +59,7 @@ void ev_document_layers_hide_layer (EvDocumentLayers *document_layers, EvLayer *layer) { - EvDocumentLayersIface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers); + EvDocumentLayersInterface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers); iface->hide_layer (document_layers, layer); } @@ -68,7 +68,7 @@ gboolean ev_document_layers_layer_is_visible (EvDocumentLayers *document_layers, EvLayer *layer) { - EvDocumentLayersIface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers); + EvDocumentLayersInterface *iface = EV_DOCUMENT_LAYERS_GET_IFACE (document_layers); return iface->layer_is_visible (document_layers, layer); } diff --git a/libdocument/ev-document-layers.h b/libdocument/ev-document-layers.h index d020a45..22b339f 100644 --- a/libdocument/ev-document-layers.h +++ b/libdocument/ev-document-layers.h @@ -35,13 +35,13 @@ G_BEGIN_DECLS #define EV_TYPE_DOCUMENT_LAYERS (ev_document_layers_get_type ()) #define EV_DOCUMENT_LAYERS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_LAYERS, EvDocumentLayers)) -#define EV_DOCUMENT_LAYERS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_LAYERS, EvDocumentLayersIface)) +#define EV_DOCUMENT_LAYERS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_LAYERS, EvDocumentLayersInterface)) #define EV_IS_DOCUMENT_LAYERS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT_LAYERS)) #define EV_IS_DOCUMENT_LAYERS_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT_LAYERS)) -#define EV_DOCUMENT_LAYERS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_LAYERS, EvDocumentLayersIface)) +#define EV_DOCUMENT_LAYERS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_LAYERS, EvDocumentLayersInterface)) -typedef struct _EvDocumentLayers EvDocumentLayers; -typedef struct _EvDocumentLayersIface EvDocumentLayersIface; +typedef struct _EvDocumentLayers EvDocumentLayers; +typedef struct _EvDocumentLayersInterface EvDocumentLayersInterface; enum { EV_DOCUMENT_LAYERS_COLUMN_TITLE, @@ -53,7 +53,7 @@ enum { EV_DOCUMENT_LAYERS_N_COLUMNS }; -struct _EvDocumentLayersIface +struct _EvDocumentLayersInterface { GTypeInterface base_iface; diff --git a/libdocument/ev-document-links.c b/libdocument/ev-document-links.c index 16e0d9a..7b31c4d 100644 --- a/libdocument/ev-document-links.c +++ b/libdocument/ev-document-links.c @@ -25,17 +25,17 @@ #include "ev-document-links.h" -EV_DEFINE_INTERFACE (EvDocumentLinks, ev_document_links, 0) +G_DEFINE_INTERFACE (EvDocumentLinks, ev_document_links, 0) static void -ev_document_links_class_init (EvDocumentLinksIface *klass) +ev_document_links_default_init (EvDocumentLinksInterface *klass) { } gboolean ev_document_links_has_document_links (EvDocumentLinks *document_links) { - EvDocumentLinksIface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links); + EvDocumentLinksInterface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links); gboolean retval; retval = iface->has_document_links (document_links); @@ -46,7 +46,7 @@ ev_document_links_has_document_links (EvDocumentLinks *document_links) GtkTreeModel * ev_document_links_get_links_model (EvDocumentLinks *document_links) { - EvDocumentLinksIface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links); + EvDocumentLinksInterface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links); GtkTreeModel *retval; retval = iface->get_links_model (document_links); @@ -58,7 +58,7 @@ GList * ev_document_links_get_links (EvDocumentLinks *document_links, EvPage *page) { - EvDocumentLinksIface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links); + EvDocumentLinksInterface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links); GList *retval; retval = iface->get_links (document_links, page); @@ -70,7 +70,7 @@ EvLinkDest * ev_document_links_find_link_dest (EvDocumentLinks *document_links, const gchar *link_name) { - EvDocumentLinksIface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links); + EvDocumentLinksInterface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links); EvLinkDest *retval; ev_document_doc_mutex_lock (); diff --git a/libdocument/ev-document-links.h b/libdocument/ev-document-links.h index 6aa43ae..e6d9020 100644 --- a/libdocument/ev-document-links.h +++ b/libdocument/ev-document-links.h @@ -39,13 +39,13 @@ G_BEGIN_DECLS #define EV_TYPE_DOCUMENT_LINKS (ev_document_links_get_type ()) #define EV_DOCUMENT_LINKS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_LINKS, EvDocumentLinks)) -#define EV_DOCUMENT_LINKS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_LINKS, EvDocumentLinksIface)) +#define EV_DOCUMENT_LINKS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_LINKS, EvDocumentLinksInterface)) #define EV_IS_DOCUMENT_LINKS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT_LINKS)) #define EV_IS_DOCUMENT_LINKS_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT_LINKS)) -#define EV_DOCUMENT_LINKS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_LINKS, EvDocumentLinksIface)) +#define EV_DOCUMENT_LINKS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_LINKS, EvDocumentLinksInterface)) -typedef struct _EvDocumentLinks EvDocumentLinks; -typedef struct _EvDocumentLinksIface EvDocumentLinksIface; +typedef struct _EvDocumentLinks EvDocumentLinks; +typedef struct _EvDocumentLinksInterface EvDocumentLinksInterface; enum { EV_DOCUMENT_LINKS_COLUMN_MARKUP, @@ -55,7 +55,7 @@ enum { EV_DOCUMENT_LINKS_COLUMN_NUM_COLUMNS }; -struct _EvDocumentLinksIface +struct _EvDocumentLinksInterface { GTypeInterface base_iface; diff --git a/libdocument/ev-document-print.c b/libdocument/ev-document-print.c index f82d478..03cb448 100644 --- a/libdocument/ev-document-print.c +++ b/libdocument/ev-document-print.c @@ -23,10 +23,10 @@ #include "ev-document.h" #include "ev-document-print.h" -EV_DEFINE_INTERFACE (EvDocumentPrint, ev_document_print, 0) +G_DEFINE_INTERFACE (EvDocumentPrint, ev_document_print, 0) static void -ev_document_print_class_init (EvDocumentPrintIface *klass) +ev_document_print_default_init (EvDocumentPrintInterface *klass) { } @@ -35,7 +35,7 @@ ev_document_print_print_page (EvDocumentPrint *document_print, EvPage *page, cairo_t *cr) { - EvDocumentPrintIface *iface = EV_DOCUMENT_PRINT_GET_IFACE (document_print); + EvDocumentPrintInterface *iface = EV_DOCUMENT_PRINT_GET_IFACE (document_print); iface->print_page (document_print, page, cr); } diff --git a/libdocument/ev-document-print.h b/libdocument/ev-document-print.h index 39f0984..26ed0b5 100644 --- a/libdocument/ev-document-print.h +++ b/libdocument/ev-document-print.h @@ -30,15 +30,15 @@ G_BEGIN_DECLS #define EV_TYPE_DOCUMENT_PRINT (ev_document_print_get_type ()) #define EV_DOCUMENT_PRINT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_PRINT, EvDocumentPrint)) -#define EV_DOCUMENT_PRINT_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_PRINT, EvDocumentPrintIface)) +#define EV_DOCUMENT_PRINT_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_PRINT, EvDocumentPrintInterface)) #define EV_IS_DOCUMENT_PRINT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT_PRINT)) #define EV_IS_DOCUMENT_PRINT_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT_PRINT)) -#define EV_DOCUMENT_PRINT_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_PRINT, EvDocumentPrintIface)) +#define EV_DOCUMENT_PRINT_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_PRINT, EvDocumentPrintInterface)) -typedef struct _EvDocumentPrint EvDocumentPrint; -typedef struct _EvDocumentPrintIface EvDocumentPrintIface; +typedef struct _EvDocumentPrint EvDocumentPrint; +typedef struct _EvDocumentPrintInterface EvDocumentPrintInterface; -struct _EvDocumentPrintIface +struct _EvDocumentPrintInterface { GTypeInterface base_iface; diff --git a/libdocument/ev-document-security.c b/libdocument/ev-document-security.c index cf4ce66..7ae88f7 100644 --- a/libdocument/ev-document-security.c +++ b/libdocument/ev-document-security.c @@ -25,17 +25,17 @@ #include "ev-document-security.h" -EV_DEFINE_INTERFACE (EvDocumentSecurity, ev_document_security, 0) +G_DEFINE_INTERFACE (EvDocumentSecurity, ev_document_security, 0) static void -ev_document_security_class_init (EvDocumentSecurityIface *klass) +ev_document_security_default_init (EvDocumentSecurityInterface *klass) { } gboolean ev_document_security_has_document_security (EvDocumentSecurity *document_security) { - EvDocumentSecurityIface *iface = EV_DOCUMENT_SECURITY_GET_IFACE (document_security); + EvDocumentSecurityInterface *iface = EV_DOCUMENT_SECURITY_GET_IFACE (document_security); return iface->has_document_security (document_security); } @@ -43,6 +43,6 @@ void ev_document_security_set_password (EvDocumentSecurity *document_security, const char *password) { - EvDocumentSecurityIface *iface = EV_DOCUMENT_SECURITY_GET_IFACE (document_security); + EvDocumentSecurityInterface *iface = EV_DOCUMENT_SECURITY_GET_IFACE (document_security); iface->set_password (document_security, password); } diff --git a/libdocument/ev-document-security.h b/libdocument/ev-document-security.h index 119b406..b4fbab6 100644 --- a/libdocument/ev-document-security.h +++ b/libdocument/ev-document-security.h @@ -39,15 +39,15 @@ G_BEGIN_DECLS #define EV_TYPE_DOCUMENT_SECURITY (ev_document_security_get_type ()) #define EV_DOCUMENT_SECURITY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_SECURITY, EvDocumentSecurity)) -#define EV_DOCUMENT_SECURITY_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_SECURITY, EvDocumentSecurityIface)) +#define EV_DOCUMENT_SECURITY_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_SECURITY, EvDocumentSecurityInterface)) #define EV_IS_DOCUMENT_SECURITY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT_SECURITY)) #define EV_IS_DOCUMENT_SECURITY_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT_SECURITY)) -#define EV_DOCUMENT_SECURITY_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_SECURITY, EvDocumentSecurityIface)) +#define EV_DOCUMENT_SECURITY_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_SECURITY, EvDocumentSecurityInterface)) -typedef struct _EvDocumentSecurity EvDocumentSecurity; -typedef struct _EvDocumentSecurityIface EvDocumentSecurityIface; +typedef struct _EvDocumentSecurity EvDocumentSecurity; +typedef struct _EvDocumentSecurityInterface EvDocumentSecurityInterface; -struct _EvDocumentSecurityIface +struct _EvDocumentSecurityInterface { GTypeInterface base_iface; diff --git a/libdocument/ev-document-thumbnails.c b/libdocument/ev-document-thumbnails.c index 95384df..9482e09 100644 --- a/libdocument/ev-document-thumbnails.c +++ b/libdocument/ev-document-thumbnails.c @@ -22,10 +22,10 @@ #include "ev-document-thumbnails.h" #include "ev-document.h" -EV_DEFINE_INTERFACE (EvDocumentThumbnails, ev_document_thumbnails, 0) +G_DEFINE_INTERFACE (EvDocumentThumbnails, ev_document_thumbnails, 0) static void -ev_document_thumbnails_class_init (EvDocumentThumbnailsIface *klass) +ev_document_thumbnails_default_init (EvDocumentThumbnailsInterface *klass) { } @@ -34,7 +34,7 @@ ev_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, EvRenderContext *rc, gboolean border) { - EvDocumentThumbnailsIface *iface; + EvDocumentThumbnailsInterface *iface; g_return_val_if_fail (EV_IS_DOCUMENT_THUMBNAILS (document), NULL); g_return_val_if_fail (EV_IS_RENDER_CONTEXT (rc), NULL); @@ -50,7 +50,7 @@ ev_document_thumbnails_get_dimensions (EvDocumentThumbnails *document, gint *width, gint *height) { - EvDocumentThumbnailsIface *iface; + EvDocumentThumbnailsInterface *iface; g_return_if_fail (EV_IS_DOCUMENT_THUMBNAILS (document)); g_return_if_fail (EV_IS_RENDER_CONTEXT (rc)); diff --git a/libdocument/ev-document-thumbnails.h b/libdocument/ev-document-thumbnails.h index 3914624..bf663ee 100644 --- a/libdocument/ev-document-thumbnails.h +++ b/libdocument/ev-document-thumbnails.h @@ -33,15 +33,15 @@ G_BEGIN_DECLS #define EV_TYPE_DOCUMENT_THUMBNAILS (ev_document_thumbnails_get_type ()) #define EV_DOCUMENT_THUMBNAILS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_THUMBNAILS, EvDocumentThumbnails)) -#define EV_DOCUMENT_THUMBNAILS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_THUMBNAILS, EvDocumentThumbnailsIface)) +#define EV_DOCUMENT_THUMBNAILS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_THUMBNAILS, EvDocumentThumbnailsInterface)) #define EV_IS_DOCUMENT_THUMBNAILS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT_THUMBNAILS)) #define EV_IS_DOCUMENT_THUMBNAILS_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT_THUMBNAILS)) -#define EV_DOCUMENT_THUMBNAILS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_THUMBNAILS, EvDocumentThumbnailsIface)) +#define EV_DOCUMENT_THUMBNAILS_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_THUMBNAILS, EvDocumentThumbnailsInterface)) -typedef struct _EvDocumentThumbnails EvDocumentThumbnails; -typedef struct _EvDocumentThumbnailsIface EvDocumentThumbnailsIface; +typedef struct _EvDocumentThumbnails EvDocumentThumbnails; +typedef struct _EvDocumentThumbnailsInterface EvDocumentThumbnailsInterface; -struct _EvDocumentThumbnailsIface { +struct _EvDocumentThumbnailsInterface { GTypeInterface base_iface; /* Methods */ diff --git a/libdocument/ev-document-transition.c b/libdocument/ev-document-transition.c index d365ff4..e5d8050 100644 --- a/libdocument/ev-document-transition.c +++ b/libdocument/ev-document-transition.c @@ -21,10 +21,10 @@ #include #include "ev-document-transition.h" -EV_DEFINE_INTERFACE (EvDocumentTransition, ev_document_transition, 0) +G_DEFINE_INTERFACE (EvDocumentTransition, ev_document_transition, 0) static void -ev_document_transition_class_init (EvDocumentTransitionIface *klass) +ev_document_transition_default_init (EvDocumentTransitionInterface *klass) { } @@ -32,7 +32,7 @@ gdouble ev_document_transition_get_page_duration (EvDocumentTransition *document_trans, gint page) { - EvDocumentTransitionIface *iface = EV_DOCUMENT_TRANSITION_GET_IFACE (document_trans); + EvDocumentTransitionInterface *iface = EV_DOCUMENT_TRANSITION_GET_IFACE (document_trans); if (iface->get_page_duration) return iface->get_page_duration (document_trans, page); @@ -44,7 +44,7 @@ EvTransitionEffect * ev_document_transition_get_effect (EvDocumentTransition *document_trans, gint page) { - EvDocumentTransitionIface *iface = EV_DOCUMENT_TRANSITION_GET_IFACE (document_trans); + EvDocumentTransitionInterface *iface = EV_DOCUMENT_TRANSITION_GET_IFACE (document_trans); EvTransitionEffect *effect = NULL; if (iface->get_effect) diff --git a/libdocument/ev-document-transition.h b/libdocument/ev-document-transition.h index bd99f1f..f297903 100644 --- a/libdocument/ev-document-transition.h +++ b/libdocument/ev-document-transition.h @@ -34,15 +34,15 @@ G_BEGIN_DECLS #define EV_TYPE_DOCUMENT_TRANSITION (ev_document_transition_get_type ()) #define EV_DOCUMENT_TRANSITION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_TRANSITION, EvDocumentTransition)) -#define EV_DOCUMENT_TRANSITION_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_TRANSITION, EvDocumentTransitionIface)) +#define EV_DOCUMENT_TRANSITION_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_TRANSITION, EvDocumentTransitionInterface)) #define EV_IS_DOCUMENT_TRANSITION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT_TRANSITION)) #define EV_IS_DOCUMENT_TRANSITION_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT_TRANSITION)) -#define EV_DOCUMENT_TRANSITION_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_TRANSITION, EvDocumentTransitionIface)) +#define EV_DOCUMENT_TRANSITION_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_TRANSITION, EvDocumentTransitionInterface)) -typedef struct _EvDocumentTransition EvDocumentTransition; -typedef struct _EvDocumentTransitionIface EvDocumentTransitionIface; +typedef struct _EvDocumentTransition EvDocumentTransition; +typedef struct _EvDocumentTransitionInterface EvDocumentTransitionInterface; -struct _EvDocumentTransitionIface +struct _EvDocumentTransitionInterface { GTypeInterface base_iface; diff --git a/libdocument/ev-file-exporter.c b/libdocument/ev-file-exporter.c index e3b7cf7..23a5deb 100644 --- a/libdocument/ev-file-exporter.c +++ b/libdocument/ev-file-exporter.c @@ -24,10 +24,10 @@ #include "ev-file-exporter.h" #include "ev-document.h" -EV_DEFINE_INTERFACE (EvFileExporter, ev_file_exporter, 0) +G_DEFINE_INTERFACE (EvFileExporter, ev_file_exporter, 0) static void -ev_file_exporter_class_init (EvFileExporterIface *klass) +ev_file_exporter_default_init (EvFileExporterInterface *klass) { } @@ -35,7 +35,7 @@ void ev_file_exporter_begin (EvFileExporter *exporter, EvFileExporterContext *fc) { - EvFileExporterIface *iface = EV_FILE_EXPORTER_GET_IFACE (exporter); + EvFileExporterInterface *iface = EV_FILE_EXPORTER_GET_IFACE (exporter); iface->begin (exporter, fc); } @@ -43,7 +43,7 @@ ev_file_exporter_begin (EvFileExporter *exporter, void ev_file_exporter_begin_page (EvFileExporter *exporter) { - EvFileExporterIface *iface = EV_FILE_EXPORTER_GET_IFACE (exporter); + EvFileExporterInterface *iface = EV_FILE_EXPORTER_GET_IFACE (exporter); if (iface->begin_page) iface->begin_page (exporter); @@ -53,7 +53,7 @@ void ev_file_exporter_do_page (EvFileExporter *exporter, EvRenderContext *rc) { - EvFileExporterIface *iface = EV_FILE_EXPORTER_GET_IFACE (exporter); + EvFileExporterInterface *iface = EV_FILE_EXPORTER_GET_IFACE (exporter); iface->do_page (exporter, rc); } @@ -61,7 +61,7 @@ ev_file_exporter_do_page (EvFileExporter *exporter, void ev_file_exporter_end_page (EvFileExporter *exporter) { - EvFileExporterIface *iface = EV_FILE_EXPORTER_GET_IFACE (exporter); + EvFileExporterInterface *iface = EV_FILE_EXPORTER_GET_IFACE (exporter); if (iface->end_page) iface->end_page (exporter); @@ -70,7 +70,7 @@ ev_file_exporter_end_page (EvFileExporter *exporter) void ev_file_exporter_end (EvFileExporter *exporter) { - EvFileExporterIface *iface = EV_FILE_EXPORTER_GET_IFACE (exporter); + EvFileExporterInterface *iface = EV_FILE_EXPORTER_GET_IFACE (exporter); iface->end (exporter); } @@ -78,7 +78,7 @@ ev_file_exporter_end (EvFileExporter *exporter) EvFileExporterCapabilities ev_file_exporter_get_capabilities (EvFileExporter *exporter) { - EvFileExporterIface *iface = EV_FILE_EXPORTER_GET_IFACE (exporter); + EvFileExporterInterface *iface = EV_FILE_EXPORTER_GET_IFACE (exporter); return iface->get_capabilities (exporter); } diff --git a/libdocument/ev-file-exporter.h b/libdocument/ev-file-exporter.h index db642b0..d993278 100644 --- a/libdocument/ev-file-exporter.h +++ b/libdocument/ev-file-exporter.h @@ -64,15 +64,15 @@ typedef struct { #define EV_TYPE_FILE_EXPORTER (ev_file_exporter_get_type ()) #define EV_FILE_EXPORTER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_FILE_EXPORTER, EvFileExporter)) -#define EV_FILE_EXPORTER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_FILE_EXPORTER, EvFileExporterIface)) +#define EV_FILE_EXPORTER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_FILE_EXPORTER, EvFileExporterInterface)) #define EV_IS_FILE_EXPORTER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_FILE_EXPORTER)) #define EV_IS_FILE_EXPORTER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_FILE_EXPORTER)) -#define EV_FILE_EXPORTER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_FILE_EXPORTER, EvFileExporterIface)) +#define EV_FILE_EXPORTER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_FILE_EXPORTER, EvFileExporterInterface)) -typedef struct _EvFileExporter EvFileExporter; -typedef struct _EvFileExporterIface EvFileExporterIface; +typedef struct _EvFileExporter EvFileExporter; +typedef struct _EvFileExporterInterface EvFileExporterInterface; -struct _EvFileExporterIface { +struct _EvFileExporterInterface { GTypeInterface base_iface; /* Methods */ diff --git a/libdocument/ev-selection.c b/libdocument/ev-selection.c index e087af6..260a9ca 100644 --- a/libdocument/ev-selection.c +++ b/libdocument/ev-selection.c @@ -22,10 +22,10 @@ #include "ev-selection.h" -EV_DEFINE_INTERFACE (EvSelection, ev_selection, 0) +G_DEFINE_INTERFACE (EvSelection, ev_selection, 0) static void -ev_selection_class_init (EvSelectionIface *klass) +ev_selection_default_init (EvSelectionInterface *klass) { } @@ -39,7 +39,7 @@ ev_selection_render_selection (EvSelection *selection, GdkColor *text, GdkColor *base) { - EvSelectionIface *iface = EV_SELECTION_GET_IFACE (selection); + EvSelectionInterface *iface = EV_SELECTION_GET_IFACE (selection); if (!iface->render_selection) return; @@ -57,7 +57,7 @@ ev_selection_get_selected_text (EvSelection *selection, EvSelectionStyle style, EvRectangle *points) { - EvSelectionIface *iface = EV_SELECTION_GET_IFACE (selection); + EvSelectionInterface *iface = EV_SELECTION_GET_IFACE (selection); return iface->get_selected_text (selection, rc, style, points); } @@ -68,7 +68,7 @@ ev_selection_get_selection_region (EvSelection *selection, EvSelectionStyle style, EvRectangle *points) { - EvSelectionIface *iface = EV_SELECTION_GET_IFACE (selection); + EvSelectionInterface *iface = EV_SELECTION_GET_IFACE (selection); if (!iface->get_selection_region) return NULL; @@ -80,7 +80,7 @@ GdkRegion * ev_selection_get_selection_map (EvSelection *selection, EvPage *page) { - EvSelectionIface *iface = EV_SELECTION_GET_IFACE (selection); + EvSelectionInterface *iface = EV_SELECTION_GET_IFACE (selection); if (!iface->get_selection_map) return NULL; diff --git a/libdocument/ev-selection.h b/libdocument/ev-selection.h index 581cbe7..65e0c15 100644 --- a/libdocument/ev-selection.h +++ b/libdocument/ev-selection.h @@ -34,10 +34,10 @@ G_BEGIN_DECLS #define EV_TYPE_SELECTION (ev_selection_get_type ()) #define EV_SELECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_SELECTION, EvSelection)) -#define EV_SELECTION_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_SELECTION, EvSelectionIface)) +#define EV_SELECTION_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_SELECTION, EvSelectionInterface)) #define EV_IS_SELECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_SELECTION)) #define EV_IS_SELECTION_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_SELECTION)) -#define EV_SELECTION_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_SELECTION, EvSelectionIface)) +#define EV_SELECTION_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_SELECTION, EvSelectionInterface)) typedef enum { EV_SELECTION_STYLE_GLYPH, @@ -45,10 +45,10 @@ typedef enum { EV_SELECTION_STYLE_LINE } EvSelectionStyle; -typedef struct _EvSelection EvSelection; -typedef struct _EvSelectionIface EvSelectionIface; +typedef struct _EvSelection EvSelection; +typedef struct _EvSelectionInterface EvSelectionInterface; -struct _EvSelectionIface +struct _EvSelectionInterface { GTypeInterface base_iface; -- cgit v0.9.1