From af42daf4b1d031b9eb7a389f790bceb376ce5707 Mon Sep 17 00:00:00 2001 From: Jakob Truelsen Date: Mon, 21 Mar 2011 09:45:54 +0100 Subject: [PATCH] Merge visualstudio compilation patch by htoothrot --- include/wkhtmltox/dllbegin.inc | 4 +-- include/wkhtmltox/image.h | 46 ++++++++++++++--------------- include/wkhtmltox/pdf.h | 54 +++++++++++++++++----------------- src/lib/dllbegin.inc | 4 +-- src/lib/image.h | 46 ++++++++++++++--------------- src/lib/image_c_bindings.cc | 46 ++++++++++++++--------------- src/lib/loadsettings.cc | 4 +++ src/lib/pdf.h | 54 +++++++++++++++++----------------- src/lib/pdf_c_bindings.cc | 54 +++++++++++++++++----------------- src/lib/pdfsettings.cc | 4 +++ src/lib/reflect.hh | 4 +++ 11 files changed, 166 insertions(+), 154 deletions(-) diff --git a/include/wkhtmltox/dllbegin.inc b/include/wkhtmltox/dllbegin.inc index bed5bcb8f..4f623f800 100644 --- a/include/wkhtmltox/dllbegin.inc +++ b/include/wkhtmltox/dllbegin.inc @@ -44,9 +44,9 @@ #endif #ifdef __cplusplus - #define CAPI extern "C" DLL_PUBLIC CALLTYPE + #define CAPI(type) extern "C" DLL_PUBLIC type CALLTYPE #else - #define CAPI DLL_PUBLIC CALLTYPE + #define CAPI(type) DLL_PUBLIC type CALLTYPE #endif #endif /*__WKHTMLTOPDF_DLLBEGIN__*/ diff --git a/include/wkhtmltox/image.h b/include/wkhtmltox/image.h index 965e22302..59e8bb270 100644 --- a/include/wkhtmltox/image.h +++ b/include/wkhtmltox/image.h @@ -31,34 +31,34 @@ typedef void (*wkhtmltoimage_str_callback)(wkhtmltoimage_converter * converter, typedef void (*wkhtmltoimage_int_callback)(wkhtmltoimage_converter * converter, const int val); typedef void (*wkhtmltoimage_void_callback)(wkhtmltoimage_converter * converter); -CAPI int wkhtmltoimage_init(int use_graphics); -CAPI int wkhtmltoimage_deinit(); -CAPI int wkhtmltoimage_extended_qt(); -CAPI const char * wkhtmltoimage_version(); +CAPI(int) wkhtmltoimage_init(int use_graphics); +CAPI(int) wkhtmltoimage_deinit(); +CAPI(int) wkhtmltoimage_extended_qt(); +CAPI(const char *) wkhtmltoimage_version(); -CAPI wkhtmltoimage_global_settings * wkhtmltoimage_create_global_settings(); +CAPI(wkhtmltoimage_global_settings *) wkhtmltoimage_create_global_settings(); -CAPI int wkhtmltoimage_set_global_setting(wkhtmltoimage_global_settings * settings, const char * name, const char * value); -CAPI int wkhtmltoimage_get_global_setting(wkhtmltoimage_global_settings * settings, const char * name, char * value, int vs); +CAPI(int) wkhtmltoimage_set_global_setting(wkhtmltoimage_global_settings * settings, const char * name, const char * value); +CAPI(int) wkhtmltoimage_get_global_setting(wkhtmltoimage_global_settings * settings, const char * name, char * value, int vs); -CAPI wkhtmltoimage_converter * wkhtmltoimage_create_converter(wkhtmltoimage_global_settings * settings, const char * data); -CAPI void wkhtmltoimage_destroy_converter(wkhtmltoimage_converter * converter); +CAPI(wkhtmltoimage_converter *) wkhtmltoimage_create_converter(wkhtmltoimage_global_settings * settings, const char * data); +CAPI(void) wkhtmltoimage_destroy_converter(wkhtmltoimage_converter * converter); -CAPI void wkhtmltoimage_set_warning_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb); -CAPI void wkhtmltoimage_set_error_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb); -CAPI void wkhtmltoimage_set_phase_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_void_callback cb); -CAPI void wkhtmltoimage_set_progress_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb); -CAPI void wkhtmltoimage_set_finished_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb); -CAPI int wkhtmltoimage_convert(wkhtmltoimage_converter * converter); -/* CAPI void wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter); */ -/* CAPI void wkhtmltoimage_cancel(wkhtmltoimage_converter * converter); */ +CAPI(void) wkhtmltoimage_set_warning_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb); +CAPI(void) wkhtmltoimage_set_error_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb); +CAPI(void) wkhtmltoimage_set_phase_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_void_callback cb); +CAPI(void) wkhtmltoimage_set_progress_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb); +CAPI(void) wkhtmltoimage_set_finished_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb); +CAPI(int) wkhtmltoimage_convert(wkhtmltoimage_converter * converter); +/* CAPI(void) wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter); */ +/* CAPI(void) wkhtmltoimage_cancel(wkhtmltoimage_converter * converter); */ -CAPI int wkhtmltoimage_current_phase(wkhtmltoimage_converter * converter); -CAPI int wkhtmltoimage_phase_count(wkhtmltoimage_converter * converter); -CAPI const char * wkhtmltoimage_phase_description(wkhtmltoimage_converter * converter, int phase); -CAPI const char * wkhtmltoimage_progress_string(wkhtmltoimage_converter * converter); -CAPI int wkhtmltoimage_http_error_code(wkhtmltoimage_converter * converter); -CAPI long wkhtmltoimage_get_output(wkhtmltoimage_converter * converter, const unsigned char **); +CAPI(int) wkhtmltoimage_current_phase(wkhtmltoimage_converter * converter); +CAPI(int) wkhtmltoimage_phase_count(wkhtmltoimage_converter * converter); +CAPI(const char *) wkhtmltoimage_phase_description(wkhtmltoimage_converter * converter, int phase); +CAPI(const char *) wkhtmltoimage_progress_string(wkhtmltoimage_converter * converter); +CAPI(int) wkhtmltoimage_http_error_code(wkhtmltoimage_converter * converter); +CAPI(long) wkhtmltoimage_get_output(wkhtmltoimage_converter * converter, const unsigned char **); #include #endif /*__IMAGE_H__*/ diff --git a/include/wkhtmltox/pdf.h b/include/wkhtmltox/pdf.h index 11b735126..7b07079c2 100644 --- a/include/wkhtmltox/pdf.h +++ b/include/wkhtmltox/pdf.h @@ -34,40 +34,40 @@ typedef void (*wkhtmltopdf_str_callback)(wkhtmltopdf_converter * converter, cons typedef void (*wkhtmltopdf_int_callback)(wkhtmltopdf_converter * converter, const int val); typedef void (*wkhtmltopdf_void_callback)(wkhtmltopdf_converter * converter); -CAPI int wkhtmltopdf_init(int use_graphics); -CAPI int wkhtmltopdf_deinit(); -CAPI int wkhtmltopdf_extended_qt(); -CAPI const char * wkhtmltopdf_version(); +CAPI(int) wkhtmltopdf_init(int use_graphics); +CAPI(int) wkhtmltopdf_deinit(); +CAPI(int) wkhtmltopdf_extended_qt(); +CAPI(const char *) wkhtmltopdf_version(); -CAPI wkhtmltopdf_global_settings * wkhtmltopdf_create_global_settings(); -CAPI wkhtmltopdf_object_settings * wkhtmltopdf_create_object_settings(); +CAPI(wkhtmltopdf_global_settings *) wkhtmltopdf_create_global_settings(); +CAPI(wkhtmltopdf_object_settings *) wkhtmltopdf_create_object_settings(); -CAPI int wkhtmltopdf_set_global_setting(wkhtmltopdf_global_settings * settings, const char * name, const char * value); -CAPI int wkhtmltopdf_get_global_setting(wkhtmltopdf_global_settings * settings, const char * name, char * value, int vs); -CAPI int wkhtmltopdf_set_object_setting(wkhtmltopdf_object_settings * settings, const char * name, const char * value); -CAPI int wkhtmltopdf_get_object_setting(wkhtmltopdf_object_settings * settings, const char * name, char * value, int vs); +CAPI(int) wkhtmltopdf_set_global_setting(wkhtmltopdf_global_settings * settings, const char * name, const char * value); +CAPI(int) wkhtmltopdf_get_global_setting(wkhtmltopdf_global_settings * settings, const char * name, char * value, int vs); +CAPI(int) wkhtmltopdf_set_object_setting(wkhtmltopdf_object_settings * settings, const char * name, const char * value); +CAPI(int) wkhtmltopdf_get_object_setting(wkhtmltopdf_object_settings * settings, const char * name, char * value, int vs); -CAPI wkhtmltopdf_converter * wkhtmltopdf_create_converter(wkhtmltopdf_global_settings * settings); -CAPI void wkhtmltopdf_destroy_converter(wkhtmltopdf_converter * converter); +CAPI(wkhtmltopdf_converter *) wkhtmltopdf_create_converter(wkhtmltopdf_global_settings * settings); +CAPI(void) wkhtmltopdf_destroy_converter(wkhtmltopdf_converter * converter); -CAPI void wkhtmltopdf_set_warning_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb); -CAPI void wkhtmltopdf_set_error_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb); -CAPI void wkhtmltopdf_set_phase_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_void_callback cb); -CAPI void wkhtmltopdf_set_progress_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb); -CAPI void wkhtmltopdf_set_finished_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb); -/* CAPI void wkhtmltopdf_begin_convertion(wkhtmltopdf_converter * converter); */ -/* CAPI void wkhtmltopdf_cancel(wkhtmltopdf_converter * converter); */ -CAPI int wkhtmltopdf_convert(wkhtmltopdf_converter * converter); -CAPI void wkhtmltopdf_add_object( +CAPI(void) wkhtmltopdf_set_warning_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb); +CAPI(void) wkhtmltopdf_set_error_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb); +CAPI(void) wkhtmltopdf_set_phase_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_void_callback cb); +CAPI(void) wkhtmltopdf_set_progress_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb); +CAPI(void) wkhtmltopdf_set_finished_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb); +/* CAPI(void) wkhtmltopdf_begin_convertion(wkhtmltopdf_converter * converter); */ +/* CAPI(void) wkhtmltopdf_cancel(wkhtmltopdf_converter * converter); */ +CAPI(int) wkhtmltopdf_convert(wkhtmltopdf_converter * converter); +CAPI(void) wkhtmltopdf_add_object( wkhtmltopdf_converter * converter, wkhtmltopdf_object_settings * setting, const char * data); -CAPI int wkhtmltopdf_current_phase(wkhtmltopdf_converter * converter); -CAPI int wkhtmltopdf_phase_count(wkhtmltopdf_converter * converter); -CAPI const char * wkhtmltopdf_phase_description(wkhtmltopdf_converter * converter, int phase); -CAPI const char * wkhtmltopdf_progress_string(wkhtmltopdf_converter * converter); -CAPI int wkhtmltopdf_http_error_code(wkhtmltopdf_converter * converter); -CAPI long wkhtmltopdf_get_output(wkhtmltopdf_converter * converter, const unsigned char **); +CAPI(int) wkhtmltopdf_current_phase(wkhtmltopdf_converter * converter); +CAPI(int) wkhtmltopdf_phase_count(wkhtmltopdf_converter * converter); +CAPI(const char *) wkhtmltopdf_phase_description(wkhtmltopdf_converter * converter, int phase); +CAPI(const char *) wkhtmltopdf_progress_string(wkhtmltopdf_converter * converter); +CAPI(int) wkhtmltopdf_http_error_code(wkhtmltopdf_converter * converter); +CAPI(long) wkhtmltopdf_get_output(wkhtmltopdf_converter * converter, const unsigned char **); #include #endif /*__PDF_H__*/ diff --git a/src/lib/dllbegin.inc b/src/lib/dllbegin.inc index 0fe649f6a..c62ea464a 100644 --- a/src/lib/dllbegin.inc +++ b/src/lib/dllbegin.inc @@ -46,9 +46,9 @@ #endif #ifdef __cplusplus - #define CAPI extern "C" DLL_PUBLIC CALLTYPE + #define CAPI(type) extern "C" DLL_PUBLIC type CALLTYPE #else - #define CAPI DLL_PUBLIC CALLTYPE + #define CAPI(type) DLL_PUBLIC type CALLTYPE #endif #endif /*__WKHTMLTOPDF_DLLBEGIN__*/ diff --git a/src/lib/image.h b/src/lib/image.h index 8c19525f3..ac9a87547 100644 --- a/src/lib/image.h +++ b/src/lib/image.h @@ -33,34 +33,34 @@ typedef void (*wkhtmltoimage_str_callback)(wkhtmltoimage_converter * converter, typedef void (*wkhtmltoimage_int_callback)(wkhtmltoimage_converter * converter, const int val); typedef void (*wkhtmltoimage_void_callback)(wkhtmltoimage_converter * converter); -CAPI int wkhtmltoimage_init(int use_graphics); -CAPI int wkhtmltoimage_deinit(); -CAPI int wkhtmltoimage_extended_qt(); -CAPI const char * wkhtmltoimage_version(); +CAPI(int) wkhtmltoimage_init(int use_graphics); +CAPI(int) wkhtmltoimage_deinit(); +CAPI(int) wkhtmltoimage_extended_qt(); +CAPI(const char *)wkhtmltoimage_version(); -CAPI wkhtmltoimage_global_settings * wkhtmltoimage_create_global_settings(); +CAPI(wkhtmltoimage_global_settings *) wkhtmltoimage_create_global_settings(); -CAPI int wkhtmltoimage_set_global_setting(wkhtmltoimage_global_settings * settings, const char * name, const char * value); -CAPI int wkhtmltoimage_get_global_setting(wkhtmltoimage_global_settings * settings, const char * name, char * value, int vs); +CAPI(int) wkhtmltoimage_set_global_setting(wkhtmltoimage_global_settings * settings, const char * name, const char * value); +CAPI(int) wkhtmltoimage_get_global_setting(wkhtmltoimage_global_settings * settings, const char * name, char * value, int vs); -CAPI wkhtmltoimage_converter * wkhtmltoimage_create_converter(wkhtmltoimage_global_settings * settings, const char * data); -CAPI void wkhtmltoimage_destroy_converter(wkhtmltoimage_converter * converter); +CAPI(wkhtmltoimage_converter *) wkhtmltoimage_create_converter(wkhtmltoimage_global_settings * settings, const char * data); +CAPI(void) wkhtmltoimage_destroy_converter(wkhtmltoimage_converter * converter); -CAPI void wkhtmltoimage_set_warning_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb); -CAPI void wkhtmltoimage_set_error_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb); -CAPI void wkhtmltoimage_set_phase_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_void_callback cb); -CAPI void wkhtmltoimage_set_progress_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb); -CAPI void wkhtmltoimage_set_finished_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb); -CAPI int wkhtmltoimage_convert(wkhtmltoimage_converter * converter); -/* CAPI void wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter); */ -/* CAPI void wkhtmltoimage_cancel(wkhtmltoimage_converter * converter); */ +CAPI(void) wkhtmltoimage_set_warning_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb); +CAPI(void) wkhtmltoimage_set_error_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb); +CAPI(void) wkhtmltoimage_set_phase_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_void_callback cb); +CAPI(void) wkhtmltoimage_set_progress_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb); +CAPI(void) wkhtmltoimage_set_finished_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb); +CAPI(int) wkhtmltoimage_convert(wkhtmltoimage_converter * converter); +/* CAPI(void) wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter); */ +/* CAPI(void) wkhtmltoimage_cancel(wkhtmltoimage_converter * converter); */ -CAPI int wkhtmltoimage_current_phase(wkhtmltoimage_converter * converter); -CAPI int wkhtmltoimage_phase_count(wkhtmltoimage_converter * converter); -CAPI const char * wkhtmltoimage_phase_description(wkhtmltoimage_converter * converter, int phase); -CAPI const char * wkhtmltoimage_progress_string(wkhtmltoimage_converter * converter); -CAPI int wkhtmltoimage_http_error_code(wkhtmltoimage_converter * converter); -CAPI long wkhtmltoimage_get_output(wkhtmltoimage_converter * converter, const unsigned char **); +CAPI(int) wkhtmltoimage_current_phase(wkhtmltoimage_converter * converter); +CAPI(int) wkhtmltoimage_phase_count(wkhtmltoimage_converter * converter); +CAPI(const char *) wkhtmltoimage_phase_description(wkhtmltoimage_converter * converter, int phase); +CAPI(const char *) wkhtmltoimage_progress_string(wkhtmltoimage_converter * converter); +CAPI(int) wkhtmltoimage_http_error_code(wkhtmltoimage_converter * converter); +CAPI(long) wkhtmltoimage_get_output(wkhtmltoimage_converter * converter, const unsigned char **); #include #endif /*__IMAGE_H__*/ diff --git a/src/lib/image_c_bindings.cc b/src/lib/image_c_bindings.cc index 0afed1a45..958807ad7 100644 --- a/src/lib/image_c_bindings.cc +++ b/src/lib/image_c_bindings.cc @@ -88,100 +88,100 @@ MyImageConverter::~MyImageConverter() { delete globalSettings; } -CAPI int wkhtmltoimage_extended_qt() { +CAPI(int) wkhtmltoimage_extended_qt() { return wkhtmltopdf_extended_qt(); } -CAPI const char * wkhtmltoimage_version() { +CAPI(const char *) wkhtmltoimage_version() { return "NOT IMPLEMENTED"; } -CAPI int wkhtmltoimage_init(int use_graphics) { +CAPI(int) wkhtmltoimage_init(int use_graphics) { return wkhtmltopdf_init(use_graphics); } -CAPI int wkhtmltoimage_deinit() { +CAPI(int) wkhtmltoimage_deinit() { return wkhtmltopdf_deinit(); } -CAPI wkhtmltoimage_global_settings * wkhtmltoimage_create_global_settings() { +CAPI(wkhtmltoimage_global_settings *) wkhtmltoimage_create_global_settings() { return reinterpret_cast(new settings::ImageGlobal()); } -CAPI int wkhtmltoimage_set_global_setting(wkhtmltoimage_global_settings * settings, const char * name, const char * value) { +CAPI(int) wkhtmltoimage_set_global_setting(wkhtmltoimage_global_settings * settings, const char * name, const char * value) { return reinterpret_cast(settings)->set(name, value); } -CAPI int wkhtmltoimage_get_global_setting(wkhtmltoimage_global_settings * settings, const char * name, char * value, int vs) { +CAPI(int) wkhtmltoimage_get_global_setting(wkhtmltoimage_global_settings * settings, const char * name, char * value, int vs) { QString res = reinterpret_cast(settings)->get(name); if (res.isNull()) return 0; qstrncpy(value, res.toUtf8().constData(), vs); return 1; } -CAPI wkhtmltoimage_converter * wkhtmltoimage_create_converter(wkhtmltoimage_global_settings * settings, const char * data) { +CAPI(wkhtmltoimage_converter *) wkhtmltoimage_create_converter(wkhtmltoimage_global_settings * settings, const char * data) { QString str= QString::fromUtf8(data); return reinterpret_cast( new MyImageConverter(reinterpret_cast(settings), &str)); } -CAPI void wkhtmltoimage_destroy_converter(wkhtmltoimage_converter * converter) { +CAPI(void) wkhtmltoimage_destroy_converter(wkhtmltoimage_converter * converter) { delete reinterpret_cast(converter); } -CAPI void wkhtmltoimage_set_warning_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb) { +CAPI(void) wkhtmltoimage_set_warning_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb) { reinterpret_cast(converter)->warning_cb = cb; } -CAPI void wkhtmltoimage_set_error_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb) { +CAPI(void) wkhtmltoimage_set_error_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_str_callback cb) { reinterpret_cast(converter)->error_cb = cb; } -CAPI void wkhtmltoimage_set_phase_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_void_callback cb) { +CAPI(void) wkhtmltoimage_set_phase_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_void_callback cb) { reinterpret_cast(converter)->phase_changed = cb; } -CAPI void wkhtmltoimage_set_progress_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb) { +CAPI(void) wkhtmltoimage_set_progress_changed_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb) { reinterpret_cast(converter)->progress_changed = cb; } -CAPI void wkhtmltoimage_set_finished_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb) { +CAPI(void) wkhtmltoimage_set_finished_callback(wkhtmltoimage_converter * converter, wkhtmltoimage_int_callback cb) { reinterpret_cast(converter)->finished_cb = cb; } -/*CAPI void wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter) { +/*CAPI(void) wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter) { reinterpret_cast(converter)->converter.beginConvertion(); }*/ -CAPI int wkhtmltoimage_convert(wkhtmltoimage_converter * converter) { +CAPI(int) wkhtmltoimage_convert(wkhtmltoimage_converter * converter) { return reinterpret_cast(converter)->converter.convert(); } -/*CAPI void wkhtmltoimage_cancel(wkhtmltoimage_converter * converter) { +/*CAPI(void) wkhtmltoimage_cancel(wkhtmltoimage_converter * converter) { reinterpret_cast(converter)->converter.cancel(); }*/ -CAPI int wkhtmltoimage_current_phase(wkhtmltoimage_converter * converter) { +CAPI(int) wkhtmltoimage_current_phase(wkhtmltoimage_converter * converter) { return reinterpret_cast(converter)->converter.currentPhase(); } -CAPI int wkhtmltoimage_phase_count(wkhtmltoimage_converter * converter) { +CAPI(int) wkhtmltoimage_phase_count(wkhtmltoimage_converter * converter) { return reinterpret_cast(converter)->converter.phaseCount(); } -CAPI const char * wkhtmltoimage_phase_description(wkhtmltoimage_converter * converter, int phase) { +CAPI(const char *) wkhtmltoimage_phase_description(wkhtmltoimage_converter * converter, int phase) { return reinterpret_cast(converter)->converter.phaseDescription(phase).toUtf8().constData(); } -CAPI const char * wkhtmltoimage_progress_string(wkhtmltoimage_converter * converter) { +CAPI(const char *) wkhtmltoimage_progress_string(wkhtmltoimage_converter * converter) { return reinterpret_cast(converter)->converter.progressString().toUtf8().constData(); } -CAPI int wkhtmltoimage_http_error_code(wkhtmltoimage_converter * converter) { +CAPI(int) wkhtmltoimage_http_error_code(wkhtmltoimage_converter * converter) { return reinterpret_cast(converter)->converter.httpErrorCode(); } -CAPI long wkhtmltoimage_get_output(wkhtmltoimage_converter * converter, const unsigned char ** d) { +CAPI(long) wkhtmltoimage_get_output(wkhtmltoimage_converter * converter, const unsigned char ** d) { const QByteArray & out = reinterpret_cast(converter)->converter.output(); *d = (const unsigned char*)out.constData(); return out.size(); diff --git a/src/lib/loadsettings.cc b/src/lib/loadsettings.cc index 820a21b46..bba559d70 100644 --- a/src/lib/loadsettings.cc +++ b/src/lib/loadsettings.cc @@ -24,6 +24,10 @@ #endif #endif +#ifdef _MSC_VER +#define strcasecmp _stricmp +#endif + #include "loadsettings.hh" #include #include diff --git a/src/lib/pdf.h b/src/lib/pdf.h index 34093adea..b971d606e 100644 --- a/src/lib/pdf.h +++ b/src/lib/pdf.h @@ -36,40 +36,40 @@ typedef void (*wkhtmltopdf_str_callback)(wkhtmltopdf_converter * converter, cons typedef void (*wkhtmltopdf_int_callback)(wkhtmltopdf_converter * converter, const int val); typedef void (*wkhtmltopdf_void_callback)(wkhtmltopdf_converter * converter); -CAPI int wkhtmltopdf_init(int use_graphics); -CAPI int wkhtmltopdf_deinit(); -CAPI int wkhtmltopdf_extended_qt(); -CAPI const char * wkhtmltopdf_version(); +CAPI(int) wkhtmltopdf_init(int use_graphics); +CAPI(int) wkhtmltopdf_deinit(); +CAPI(int) wkhtmltopdf_extended_qt(); +CAPI(const char *) wkhtmltopdf_version(); -CAPI wkhtmltopdf_global_settings * wkhtmltopdf_create_global_settings(); -CAPI wkhtmltopdf_object_settings * wkhtmltopdf_create_object_settings(); +CAPI(wkhtmltopdf_global_settings *) wkhtmltopdf_create_global_settings(); +CAPI(wkhtmltopdf_object_settings *) wkhtmltopdf_create_object_settings(); -CAPI int wkhtmltopdf_set_global_setting(wkhtmltopdf_global_settings * settings, const char * name, const char * value); -CAPI int wkhtmltopdf_get_global_setting(wkhtmltopdf_global_settings * settings, const char * name, char * value, int vs); -CAPI int wkhtmltopdf_set_object_setting(wkhtmltopdf_object_settings * settings, const char * name, const char * value); -CAPI int wkhtmltopdf_get_object_setting(wkhtmltopdf_object_settings * settings, const char * name, char * value, int vs); +CAPI(int) wkhtmltopdf_set_global_setting(wkhtmltopdf_global_settings * settings, const char * name, const char * value); +CAPI(int) wkhtmltopdf_get_global_setting(wkhtmltopdf_global_settings * settings, const char * name, char * value, int vs); +CAPI(int) wkhtmltopdf_set_object_setting(wkhtmltopdf_object_settings * settings, const char * name, const char * value); +CAPI(int) wkhtmltopdf_get_object_setting(wkhtmltopdf_object_settings * settings, const char * name, char * value, int vs); -CAPI wkhtmltopdf_converter * wkhtmltopdf_create_converter(wkhtmltopdf_global_settings * settings); -CAPI void wkhtmltopdf_destroy_converter(wkhtmltopdf_converter * converter); +CAPI(wkhtmltopdf_converter *) wkhtmltopdf_create_converter(wkhtmltopdf_global_settings * settings); +CAPI(void) wkhtmltopdf_destroy_converter(wkhtmltopdf_converter * converter); -CAPI void wkhtmltopdf_set_warning_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb); -CAPI void wkhtmltopdf_set_error_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb); -CAPI void wkhtmltopdf_set_phase_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_void_callback cb); -CAPI void wkhtmltopdf_set_progress_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb); -CAPI void wkhtmltopdf_set_finished_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb); -/* CAPI void wkhtmltopdf_begin_convertion(wkhtmltopdf_converter * converter); */ -/* CAPI void wkhtmltopdf_cancel(wkhtmltopdf_converter * converter); */ -CAPI int wkhtmltopdf_convert(wkhtmltopdf_converter * converter); -CAPI void wkhtmltopdf_add_object( +CAPI(void) wkhtmltopdf_set_warning_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb); +CAPI(void) wkhtmltopdf_set_error_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb); +CAPI(void) wkhtmltopdf_set_phase_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_void_callback cb); +CAPI(void) wkhtmltopdf_set_progress_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb); +CAPI(void) wkhtmltopdf_set_finished_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb); +/* CAPI(void) wkhtmltopdf_begin_convertion(wkhtmltopdf_converter * converter); */ +/* CAPI(void) wkhtmltopdf_cancel(wkhtmltopdf_converter * converter); */ +CAPI(int) wkhtmltopdf_convert(wkhtmltopdf_converter * converter); +CAPI(void) wkhtmltopdf_add_object( wkhtmltopdf_converter * converter, wkhtmltopdf_object_settings * setting, const char * data); -CAPI int wkhtmltopdf_current_phase(wkhtmltopdf_converter * converter); -CAPI int wkhtmltopdf_phase_count(wkhtmltopdf_converter * converter); -CAPI const char * wkhtmltopdf_phase_description(wkhtmltopdf_converter * converter, int phase); -CAPI const char * wkhtmltopdf_progress_string(wkhtmltopdf_converter * converter); -CAPI int wkhtmltopdf_http_error_code(wkhtmltopdf_converter * converter); -CAPI long wkhtmltopdf_get_output(wkhtmltopdf_converter * converter, const unsigned char **); +CAPI(int) wkhtmltopdf_current_phase(wkhtmltopdf_converter * converter); +CAPI(int) wkhtmltopdf_phase_count(wkhtmltopdf_converter * converter); +CAPI(const char *) wkhtmltopdf_phase_description(wkhtmltopdf_converter * converter, int phase); +CAPI(const char *) wkhtmltopdf_progress_string(wkhtmltopdf_converter * converter); +CAPI(int) wkhtmltopdf_http_error_code(wkhtmltopdf_converter * converter); +CAPI(long) wkhtmltopdf_get_output(wkhtmltopdf_converter * converter, const unsigned char **); #include #endif /*__PDF_H__*/ diff --git a/src/lib/pdf_c_bindings.cc b/src/lib/pdf_c_bindings.cc index 826aab32d..400b2107d 100644 --- a/src/lib/pdf_c_bindings.cc +++ b/src/lib/pdf_c_bindings.cc @@ -255,7 +255,7 @@ MyPdfConverter::~MyPdfConverter() { * * \return 1 if the library was build against the wkhtmltopdf version of QT and 0 otherwise */ -CAPI int wkhtmltopdf_extended_qt() { +CAPI(int) wkhtmltopdf_extended_qt() { #ifdef __EXTENSIVE_WKHTMLTOPDF_QT_HACK__ return 1; #else @@ -272,7 +272,7 @@ CAPI int wkhtmltopdf_extended_qt() { * * \return Qt version */ -CAPI const char * wkhtmltopdf_version() { +CAPI(const char *) wkhtmltopdf_version() { return STRINGIZE(MAJOR_VERSION)"."STRINGIZE(MINOR_VERSION)"."STRINGIZE(PATCH_VERSION) #ifdef BUILD "_"STRINGIZE(BUILD) @@ -290,7 +290,7 @@ CAPI const char * wkhtmltopdf_version() { * * \sa wkhtmltopdf_deinit */ -CAPI int wkhtmltopdf_init(int use_graphics) { +CAPI(int) wkhtmltopdf_init(int use_graphics) { ++usage; if (qApp == 0) { @@ -323,7 +323,7 @@ CAPI int wkhtmltopdf_init(int use_graphics) { * * \sa wkhtmltopdf_init */ -CAPI int wkhtmltopdf_deinit() { +CAPI(int) wkhtmltopdf_deinit() { --usage; if (usage != 0) return 1; if (a != 0) delete a; @@ -339,7 +339,7 @@ CAPI int wkhtmltopdf_deinit() { * * \returns A wkhtmltopdf global settings object */ -CAPI wkhtmltopdf_global_settings * wkhtmltopdf_create_global_settings() { +CAPI(wkhtmltopdf_global_settings *) wkhtmltopdf_create_global_settings() { return reinterpret_cast(new settings::PdfGlobal()); } @@ -353,7 +353,7 @@ CAPI wkhtmltopdf_global_settings * wkhtmltopdf_create_global_settings() { * \param value The new value for the setting * \returns 1 if the setting was updated successfully and 0 otherwise. */ -CAPI int wkhtmltopdf_set_global_setting(wkhtmltopdf_global_settings * settings, const char * name, const char * value) { +CAPI(int) wkhtmltopdf_set_global_setting(wkhtmltopdf_global_settings * settings, const char * name, const char * value) { return reinterpret_cast(settings)->set(name, value); } @@ -368,7 +368,7 @@ CAPI int wkhtmltopdf_set_global_setting(wkhtmltopdf_global_settings * settings, * \param vs The length of \a value * \returns 1 If the the setting exists and was read successfully and 0 otherwise */ -CAPI int wkhtmltopdf_get_global_setting(wkhtmltopdf_global_settings * settings, const char * name, char * value, int vs) { +CAPI(int) wkhtmltopdf_get_global_setting(wkhtmltopdf_global_settings * settings, const char * name, char * value, int vs) { QString res = reinterpret_cast(settings)->get(name); if (res.isNull()) return 0; qstrncpy(value, res.toUtf8().constData(), vs); @@ -385,7 +385,7 @@ CAPI int wkhtmltopdf_get_global_setting(wkhtmltopdf_global_settings * settings, * * \returns an object settings instance */ -CAPI wkhtmltopdf_object_settings * wkhtmltopdf_create_object_settings() { +CAPI(wkhtmltopdf_object_settings *) wkhtmltopdf_create_object_settings() { return reinterpret_cast(new settings::PdfObject()); } @@ -399,7 +399,7 @@ CAPI wkhtmltopdf_object_settings * wkhtmltopdf_create_object_settings() { * \param value The new value for the setting * \returns 1 if the setting was updated successfully and 0 otherwise. */ -CAPI int wkhtmltopdf_set_object_setting(wkhtmltopdf_object_settings * settings, const char * name, const char * value) { +CAPI(int) wkhtmltopdf_set_object_setting(wkhtmltopdf_object_settings * settings, const char * name, const char * value) { return reinterpret_cast(settings)->set(name, value); } @@ -414,7 +414,7 @@ CAPI int wkhtmltopdf_set_object_setting(wkhtmltopdf_object_settings * settings, * \param vs The length of \a value * \returns 1 If the the setting exists and was read successfully and 0 otherwise */ -CAPI int wkhtmltopdf_get_object_setting(wkhtmltopdf_object_settings * settings, const char * name, char * value, int vs) { +CAPI(int) wkhtmltopdf_get_object_setting(wkhtmltopdf_object_settings * settings, const char * name, char * value, int vs) { QString res = reinterpret_cast(settings)->get(name); if (res.isNull()) return 0; qstrncpy(value, res.toUtf8().constData(), vs); @@ -431,7 +431,7 @@ CAPI int wkhtmltopdf_get_object_setting(wkhtmltopdf_object_settings * settings, * \param settings The global settings to use during conversion. * \returns A wkhtmltopdf converter object */ -CAPI wkhtmltopdf_converter * wkhtmltopdf_create_converter(wkhtmltopdf_global_settings * settings) { +CAPI(wkhtmltopdf_converter *) wkhtmltopdf_create_converter(wkhtmltopdf_global_settings * settings) { return reinterpret_cast( new MyPdfConverter(reinterpret_cast(settings))); @@ -445,7 +445,7 @@ CAPI wkhtmltopdf_converter * wkhtmltopdf_create_converter(wkhtmltopdf_global_set * * \param settings The converter object to destroy */ -CAPI void wkhtmltopdf_destroy_converter(wkhtmltopdf_converter * converter) { +CAPI(void) wkhtmltopdf_destroy_converter(wkhtmltopdf_converter * converter) { delete reinterpret_cast(converter); } @@ -455,7 +455,7 @@ CAPI void wkhtmltopdf_destroy_converter(wkhtmltopdf_converter * converter) { * \param converter The converter object on which errors we want the callback to be called * \param cb The function to call when an error occurs */ -CAPI void wkhtmltopdf_set_warning_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb) { +CAPI(void) wkhtmltopdf_set_warning_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb) { reinterpret_cast(converter)->warning_cb = cb; } @@ -466,7 +466,7 @@ CAPI void wkhtmltopdf_set_warning_callback(wkhtmltopdf_converter * converter, wk * \param cb The function to call when warning message is issued * */ -CAPI void wkhtmltopdf_set_error_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb) { +CAPI(void) wkhtmltopdf_set_error_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_str_callback cb) { reinterpret_cast(converter)->error_cb = cb; } @@ -480,7 +480,7 @@ CAPI void wkhtmltopdf_set_error_callback(wkhtmltopdf_converter * converter, wkht * * \sa wkhtmltopdf_current_phase, wkhtmltopdf_phase_count, wkhtmltopdf_phase_description */ -CAPI void wkhtmltopdf_set_phase_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_void_callback cb) { +CAPI(void) wkhtmltopdf_set_phase_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_void_callback cb) { reinterpret_cast(converter)->phase_changed = cb; } @@ -494,7 +494,7 @@ CAPI void wkhtmltopdf_set_phase_changed_callback(wkhtmltopdf_converter * convert * * \sa wkhtmltopdf_progress_description */ -CAPI void wkhtmltopdf_set_progress_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb) { +CAPI(void) wkhtmltopdf_set_progress_changed_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb) { reinterpret_cast(converter)->progress_changed = cb; } @@ -507,11 +507,11 @@ CAPI void wkhtmltopdf_set_progress_changed_callback(wkhtmltopdf_converter * conv * * \sa wkhtmltopdf_convert */ -CAPI void wkhtmltopdf_set_finished_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb) { +CAPI(void) wkhtmltopdf_set_finished_callback(wkhtmltopdf_converter * converter, wkhtmltopdf_int_callback cb) { reinterpret_cast(converter)->finished_cb = cb; } -//CAPI void wkhtmltopdf_begin_conversion(wkhtmltopdf_converter * converter) { +//CAPI(void) wkhtmltopdf_begin_conversion(wkhtmltopdf_converter * converter) { // reinterpret_cast(converter)->converter.beginConvertion(); //} @@ -529,11 +529,11 @@ CAPI void wkhtmltopdf_set_finished_callback(wkhtmltopdf_converter * converter, w * * \returns 1 on success and 0 otherwise */ -CAPI int wkhtmltopdf_convert(wkhtmltopdf_converter * converter) { +CAPI(int) wkhtmltopdf_convert(wkhtmltopdf_converter * converter) { return reinterpret_cast(converter)->converter.convert(); } -//CAPI void wkhtmltopdf_cancel(wkhtmltopdf_converter * converter) { +//CAPI(void) wkhtmltopdf_cancel(wkhtmltopdf_converter * converter) { // reinterpret_cast(converter)->converter.cancel(); //} @@ -550,7 +550,7 @@ CAPI int wkhtmltopdf_convert(wkhtmltopdf_converter * converter) { * \param settings The setting describing the object to add * \param data HTML content of the object to convert or NULL */ -CAPI void wkhtmltopdf_add_object(wkhtmltopdf_converter * converter, wkhtmltopdf_object_settings * settings, const char * data) { +CAPI(void) wkhtmltopdf_add_object(wkhtmltopdf_converter * converter, wkhtmltopdf_object_settings * settings, const char * data) { QString str= QString::fromUtf8(data); reinterpret_cast(converter)->converter.addResource( *reinterpret_cast(settings), &str); @@ -570,7 +570,7 @@ CAPI void wkhtmltopdf_add_object(wkhtmltopdf_converter * converter, wkhtmltopdf_ * \param converter The converter to find the current phase of * \returns The current phase of the supplied converter */ -CAPI int wkhtmltopdf_current_phase(wkhtmltopdf_converter * converter) { +CAPI(int) wkhtmltopdf_current_phase(wkhtmltopdf_converter * converter) { return reinterpret_cast(converter)->converter.currentPhase(); } @@ -582,7 +582,7 @@ CAPI int wkhtmltopdf_current_phase(wkhtmltopdf_converter * converter) { * * \sa wkhtmltopdf_current_phase, wkhtmltopdf_phase_description */ -CAPI int wkhtmltopdf_phase_count(wkhtmltopdf_converter * converter) { +CAPI(int) wkhtmltopdf_phase_count(wkhtmltopdf_converter * converter) { return reinterpret_cast(converter)->converter.phaseCount(); } @@ -596,7 +596,7 @@ CAPI int wkhtmltopdf_phase_count(wkhtmltopdf_converter * converter) { * * \sa wkhtmltopdf_current_phase, wkhtmltopdf_phase_description */ -CAPI const char * wkhtmltopdf_phase_description(wkhtmltopdf_converter * converter, int phase) { +CAPI(const char *) wkhtmltopdf_phase_description(wkhtmltopdf_converter * converter, int phase) { return reinterpret_cast(converter)->converter.phaseDescription(phase).toUtf8().constData(); } @@ -610,7 +610,7 @@ CAPI const char * wkhtmltopdf_phase_description(wkhtmltopdf_converter * converte * * \sa wkhtmltopdf_set_progress_changed_callback */ -CAPI const char * wkhtmltopdf_progress_string(wkhtmltopdf_converter * converter) { +CAPI(const char *) wkhtmltopdf_progress_string(wkhtmltopdf_converter * converter) { return reinterpret_cast(converter)->converter.progressString().toUtf8().constData(); } @@ -624,7 +624,7 @@ CAPI const char * wkhtmltopdf_progress_string(wkhtmltopdf_converter * converter) * \param converter The converter to query * \returns The HTTP error code. */ -CAPI int wkhtmltopdf_http_error_code(wkhtmltopdf_converter * converter) { +CAPI(int) wkhtmltopdf_http_error_code(wkhtmltopdf_converter * converter) { return reinterpret_cast(converter)->converter.httpErrorCode(); } @@ -638,7 +638,7 @@ CAPI int wkhtmltopdf_http_error_code(wkhtmltopdf_converter * converter) { * \param d A pointer to a pointer that will be made to point to the output data * \returns The length of the output data */ -CAPI long wkhtmltopdf_get_output(wkhtmltopdf_converter * converter, const unsigned char ** d) { +CAPI(long) wkhtmltopdf_get_output(wkhtmltopdf_converter * converter, const unsigned char ** d) { const QByteArray & out = reinterpret_cast(converter)->converter.output(); *d = (const unsigned char*)out.constData(); return out.size(); diff --git a/src/lib/pdfsettings.cc b/src/lib/pdfsettings.cc index 7d7cda3a4..7db9be7cc 100644 --- a/src/lib/pdfsettings.cc +++ b/src/lib/pdfsettings.cc @@ -24,6 +24,10 @@ #endif #endif +#ifdef _MSC_VER +#define strcasecmp _stricmp +#endif + #include "pdfsettings.hh" #include "reflect.hh" #include diff --git a/src/lib/reflect.hh b/src/lib/reflect.hh index f683779b7..f3324a6b5 100644 --- a/src/lib/reflect.hh +++ b/src/lib/reflect.hh @@ -26,6 +26,10 @@ #endif #endif +#if defined(_MSC_VER) && _MSC_VER>=1600 +#define typeof decltype +#endif + #include "loadsettings.hh" #include "websettings.hh" #include