Commit 67d0af41 authored by Moritz Lipp's avatar Moritz Lipp

Remove zathura_page_data and zathura_document_data

parent 647f26a7
...@@ -8,8 +8,6 @@ ...@@ -8,8 +8,6 @@
#include "version.h" #include "version.h"
typedef struct zathura_document_functions_s zathura_document_functions_t; typedef struct zathura_document_functions_s zathura_document_functions_t;
typedef struct zathura_document_data_s zathura_document_data_t;
typedef struct zathura_page_data_s zathura_page_data_t;
/** /**
* Functions register function * Functions register function
...@@ -73,32 +71,32 @@ struct zathura_document_functions_s ...@@ -73,32 +71,32 @@ struct zathura_document_functions_s
/** /**
* Frees the document * Frees the document
*/ */
zathura_error_t (*document_free)(zathura_document_t* document, zathura_document_data_t* data); zathura_error_t (*document_free)(zathura_document_t* document, void* data);
/** /**
* Generates the document index * Generates the document index
*/ */
girara_tree_node_t* (*document_index_generate)(zathura_document_t* document, zathura_document_data_t* data, zathura_error_t* error); girara_tree_node_t* (*document_index_generate)(zathura_document_t* document, void* data, zathura_error_t* error);
/** /**
* Save the document * Save the document
*/ */
zathura_error_t (*document_save_as)(zathura_document_t* document, zathura_document_data_t* data, const char* path); zathura_error_t (*document_save_as)(zathura_document_t* document, void* data, const char* path);
/** /**
* Get list of attachments * Get list of attachments
*/ */
girara_list_t* (*document_attachments_get)(zathura_document_t* document, zathura_document_data_t* data, zathura_error_t* error); girara_list_t* (*document_attachments_get)(zathura_document_t* document, void* data, zathura_error_t* error);
/** /**
* Save attachment to a file * Save attachment to a file
*/ */
zathura_error_t (*document_attachment_save)(zathura_document_t* document, zathura_document_data_t* data, const char* attachment, const char* file); zathura_error_t (*document_attachment_save)(zathura_document_t* document, void* data, const char* attachment, const char* file);
/** /**
* Get document information * Get document information
*/ */
char* (*document_meta_get)(zathura_document_t* document, zathura_document_data_t* data, zathura_document_meta_t info, zathura_error_t* error); char* (*document_meta_get)(zathura_document_t* document, void* data, zathura_document_meta_t info, zathura_error_t* error);
/** /**
* Gets the page object * Gets the page object
...@@ -108,47 +106,47 @@ struct zathura_document_functions_s ...@@ -108,47 +106,47 @@ struct zathura_document_functions_s
/** /**
* Free page * Free page
*/ */
zathura_error_t (*page_clear)(zathura_page_t* page, zathura_page_data_t* data); zathura_error_t (*page_clear)(zathura_page_t* page, void* data);
/** /**
* Search text * Search text
*/ */
girara_list_t* (*page_search_text)(zathura_page_t* page, zathura_page_data_t* data, const char* text, zathura_error_t* error); girara_list_t* (*page_search_text)(zathura_page_t* page, void* data, const char* text, zathura_error_t* error);
/** /**
* Get links on a page * Get links on a page
*/ */
girara_list_t* (*page_links_get)(zathura_page_t* page, zathura_page_data_t* data, zathura_error_t* error); girara_list_t* (*page_links_get)(zathura_page_t* page, void* data, zathura_error_t* error);
/** /**
* Get form fields * Get form fields
*/ */
girara_list_t* (*page_form_fields_get)(zathura_page_t* page, zathura_page_data_t* data, zathura_error_t* error); girara_list_t* (*page_form_fields_get)(zathura_page_t* page, void* data, zathura_error_t* error);
/** /**
* Get list of images * Get list of images
*/ */
girara_list_t* (*page_images_get)(zathura_page_t* page, zathura_page_data_t* data, zathura_error_t* error); girara_list_t* (*page_images_get)(zathura_page_t* page, void* data, zathura_error_t* error);
/** /**
* Get the image * Get the image
*/ */
cairo_surface_t* (*page_image_get_cairo)(zathura_page_t* page, zathura_page_data_t* data, zathura_image_t* image, zathura_error_t* error); cairo_surface_t* (*page_image_get_cairo)(zathura_page_t* page, void* data, zathura_image_t* image, zathura_error_t* error);
/** /**
* Get text for selection * Get text for selection
*/ */
char* (*page_get_text)(zathura_page_t* page, zathura_page_data_t* data, zathura_rectangle_t rectangle, zathura_error_t* error); char* (*page_get_text)(zathura_page_t* page, void* data, zathura_rectangle_t rectangle, zathura_error_t* error);
/** /**
* Renders the page * Renders the page
*/ */
zathura_image_buffer_t* (*page_render)(zathura_page_t* page, zathura_page_data_t* data, zathura_error_t* error); zathura_image_buffer_t* (*page_render)(zathura_page_t* page, void* data, zathura_error_t* error);
/** /**
* Renders the page * Renders the page
*/ */
zathura_error_t (*page_render_cairo)(zathura_page_t* page, zathura_page_data_t* data, cairo_t* cairo, bool printing); zathura_error_t (*page_render_cairo)(zathura_page_t* page, void* data, cairo_t* cairo, bool printing);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment