regenerate the public headers

include/wkhtmltox/image.h

@@ -34,7 +34,7 @@ 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(const char *)wkhtmltoimage_version();
 
 CAPI(wkhtmltoimage_global_settings *) wkhtmltoimage_create_global_settings();
 
@@ -50,7 +50,7 @@ CAPI(void) wkhtmltoimage_set_phase_changed_callback(wkhtmltoimage_converter * co
 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_begin_conversion(wkhtmltoimage_converter * converter); */
 /* CAPI(void) wkhtmltoimage_cancel(wkhtmltoimage_converter * converter); */
 
 CAPI(int) wkhtmltoimage_current_phase(wkhtmltoimage_converter * converter);

include/wkhtmltox/loadsettings.hh

@@ -1,4 +1,4 @@
-// Copyright 2010 wkhtmltopdf authors
+// Copyright 2010, 2012 wkhtmltopdf authors
 //
 // This file is part of wkhtmltopdf.
 //
@@ -30,7 +30,7 @@
 namespace wkhtmltopdf {
 namespace settings {
 
-/*! \brief Settings consdering proxy */
+/*! \brief Settings considering proxy */
 struct DLL_PUBLIC Proxy {
 	Proxy();
 	//! Type of proxy to use
@@ -77,12 +77,12 @@ struct DLL_PUBLIC LoadPage {
 
 	//! What window.status value should we wait for
 	QString windowStatus;
-	
+
 	//! What zoom factor should we apply when printing
 	// TODO MOVE
 	float zoomFactor;
 
-	//! Map of custum header variables
+	//! Map of custom header variables
 	QList< QPair<QString, QString> > customHeaders;
 
 	//! Set if the custom header should be repeated for each resource request

include/wkhtmltox/pdf.h

@@ -56,7 +56,7 @@ CAPI(void) wkhtmltopdf_set_error_callback(wkhtmltopdf_converter * converter, wkh
 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_begin_conversion(wkhtmltopdf_converter * converter); */
 /* CAPI(void) wkhtmltopdf_cancel(wkhtmltopdf_converter * converter); */
 CAPI(int) wkhtmltopdf_convert(wkhtmltopdf_converter * converter);
 CAPI(void) wkhtmltopdf_add_object(

include/wkhtmltox/pdfconverter.hh

@@ -42,6 +42,7 @@ public:
 	void addResource(const settings::PdfObject & pageSettings, const QString * data=0);
 	const settings::PdfGlobal & globalSettings() const;
 	const QByteArray & output();
+    static const qreal millimeterToPointMultiplier;
 private:
 	PdfConverterPrivate * d;
 	virtual ConverterPrivate & priv();

include/wkhtmltox/pdfsettings.hh

@@ -35,7 +35,7 @@ namespace settings {
 
 typedef QPair<qreal, QPrinter::Unit> UnitReal;
 
-/*! \brief Settings consdering margins */
+/*! \brief Settings considering margins */
 struct DLL_PUBLIC Margin {
 	Margin();
 	//!Margin applied to the top of the page
@@ -59,7 +59,7 @@ struct DLL_PUBLIC Size {
 	UnitReal width;
 };
 
-/*! \brief Settings considdirng the table of content */
+/*! \brief Settings considering the table of content */
 struct DLL_PUBLIC TableOfContent {
 	TableOfContent();
 	//! Should we print dots between the name and the page number?
@@ -111,7 +111,7 @@ struct DLL_PUBLIC PdfGlobal {
 	//! How many copies do we wan to print
 	int copies;
 
-	//! Should be print a whole copy before beginnig the next
+	//! Should be print a whole copy before beginning the next
 	bool collate;
 
 	//! Should we generate an outline and put it into the pdf file