typo fixes

scripts/release.sh

@@ -60,7 +60,7 @@ BUILD=\"$4\"
 DEFINES += MAJOR_VERSION=\$\$MAJOR_VERSION MINOR_VERSION=\$\$MINOR_VERSION PATCH_VERSION=\$\$PATCH_VERSION BUILD=\$\$BUILD" > version.pri
 
 HEAD="$(git log --pretty=oneline  -n 1 | sed -e 's/ .*//')"
-git commit -m "TEMPORERY DO NOT COMMIT $v" version.pri
+git commit -m "TEMPORARY DO NOT COMMIT $v" version.pri
 
 rm -rf bin
 mkdir bin

src/image/imagearguments.cc

@@ -36,10 +36,10 @@ ImageCommandLineParser::ImageCommandLineParser(wkhtmltopdf::settings::ImageGloba
 	// addarg("scale-w",0,"Set width for resizing", new IntSetter(s.scale.width,"int"));
 	// addarg("scale-h",0,"Set height for resizing", new IntSetter(s.scale.height,"int"));
 
-	addarg("crop-x",0,"Set x coordinate for croping", new IntSetter(s.crop.left,"int"));
-	addarg("crop-y",0,"Set y coordinate for croping", new IntSetter(s.crop.top,"int"));
-	addarg("crop-w",0,"Set width for croping", new IntSetter(s.crop.width,"int"));
-	addarg("crop-h",0,"Set height for croping", new IntSetter(s.crop.height,"int"));
+	addarg("crop-x",0,"Set x coordinate for cropping", new IntSetter(s.crop.left,"int"));
+	addarg("crop-y",0,"Set y coordinate for cropping", new IntSetter(s.crop.top,"int"));
+	addarg("crop-w",0,"Set width for cropping", new IntSetter(s.crop.width,"int"));
+	addarg("crop-h",0,"Set height for cropping", new IntSetter(s.crop.height,"int"));
 	addarg("format",'f',"Output file format", new QStrSetter(s.fmt, "format") );
 	addarg("quality",0,"Output image quality (between 0 and 100)", new IntSetter(s.quality, "int") );
 

src/image/imagecommandlineparser.cc

@@ -91,7 +91,7 @@ void ImageCommandLineParser::readme(FILE * fd, bool html) const {
 // 	foreach (ArgHandler * h, d->longToHandler)
 // 		h->useDefault(*d);
 
-// 	//Load configuration from enviornment
+// 	//Load configuration from environment
 // 	char * val;
 // 	const char * vars[] = {"proxy","all_proxy","http_proxy", NULL};
 // 	for (int i=0; vars[i]; ++i) {

src/image/imagecommandlineparser.hh

@@ -24,7 +24,7 @@
 #include <cstdio>
 #include <wkhtmltox/imagesettings.hh>
 
-/*! \brief The class is responcible for parsing command line information
+/*! \brief The class is responsible for parsing command line information
 */
 class ImageCommandLineParser: public CommandLineParserBase {
 public:

src/lib/converter.cc

@@ -47,7 +47,7 @@ void ConverterPrivate::updateWebSettings(QWebSettings * ws, const settings::Web
 	ws->setAttribute(QWebSettings::JavascriptCanAccessClipboard, false);
 	ws->setFontSize(QWebSettings::MinimumFontSize, s.minimumFontSize);
 #if QT_VERSION >= 0x040500
-	//Newer vertions of QT have even more settings to change
+	//Newer versions of QT have even more settings to change
 	ws->setAttribute(QWebSettings::PrintElementBackgrounds, s.background);
 	ws->setAttribute(QWebSettings::AutoLoadImages, s.loadImages);
 	ws->setAttribute(QWebSettings::PluginsEnabled, s.enablePlugins);

src/lib/doc.cc

@@ -75,7 +75,7 @@
  *
  * \section RESTH The rest of the headers.
  *
- * The rest of the headers directly exposes the C++ QT dependant class
+ * The rest of the headers directly exposes the C++ QT dependent class
  * used internally by wkhtmltopdf and wkhtmltoimage. They are not
  * fairly well documented and are not guaranteed to remain stable.
  * unless you know what you are doing you should not use these bindings.

src/lib/image.h

@@ -52,7 +52,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);

src/lib/image_c_bindings.cc

@@ -25,14 +25,14 @@
  * - \b crop.left left/x coordinate of the window to capture in pixels. E.g. "200"
  * - \b crop.top top/y coordinate of the window to capture in pixels. E.g. "200"
  * - \b crop.width Width of the window to capture in pixels. E.g. "200"
- * - \b crop.height Heigt of the window to capture in pixels. E.g. "200"
+ * - \b crop.height Height of the window to capture in pixels. E.g. "200"
  * - \b load.cookieJar Path of file used to load and store cookies.
  * - \b load.* Page specific settings related to loading content, see \ref pageLoad.
  * - \b web.* See \ref pageWeb.
  * - \b transparent When outputting a PNG or SVG, make the white background transparent.
  *      Must be either "true" or "false"
  * - \b in The URL or path of the input file, if "-" stdin is used. E.g. "http://google.com"
- * - \b out The path of the output file, if "-" stdout is used, if empty the content is storred
+ * - \b out The path of the output file, if "-" stdout is used, if empty the content is stored
  *      to a internalBuffer.
  * - \b fmt The output format to use, must be either "", "jpg", "png", "bmp" or "svg".
  * - \b screenWidth The with of the screen used to render is pixels, e.g "800".
@@ -149,8 +149,8 @@ CAPI(void) wkhtmltoimage_set_finished_callback(wkhtmltoimage_converter * convert
 	reinterpret_cast<MyImageConverter *>(converter)->finished_cb = cb;
 }
 
-/*CAPI(void) wkhtmltoimage_begin_convertion(wkhtmltoimage_converter * converter) {
-	reinterpret_cast<MyImageConverter *>(converter)->converter.beginConvertion();
+/*CAPI(void) wkhtmltoimage_begin_conversion(wkhtmltoimage_converter * converter) {
+	reinterpret_cast<MyImageConverter *>(converter)->converter.beginConversion();
 	}*/
 
 CAPI(int) wkhtmltoimage_convert(wkhtmltoimage_converter * converter) {

src/lib/imageconverter.cc

@@ -98,7 +98,7 @@ void ImageConverterPrivate::pagesLoaded(bool ok) {
 //	test.setFormat(settings.fmt);
 //	if (!test.canWrite()) {
 //		if (!settings.quiet)printf("error: file format not supported\n");
-//		httpErrorCode=EFAULT;
+//		httpErrorCode=DEFAULT;
 //		return false;
 //	}
 	// create webkit frame and load website

src/lib/lib.pro

@@ -26,7 +26,7 @@ DEF_FILE = lib.def
 DEFINES += __WKHTMLTOX_UNDEF_QT_DLL__
 
 unix {
-   headers.targit=headers
+   headers.target=headers
    headers.files=../../include/wkhtmltox/*
    headers.path=$$INSTALLBASE/include/wkhtmltox
 

src/lib/loadsettings.hh

@@ -33,7 +33,7 @@
 namespace wkhtmltopdf {
 namespace settings {
 
-/*! \brief Settings consdering proxy */
+/*! \brief Settings considering proxy */
 struct DLL_PUBLIC Proxy {
 	Proxy();
 	//! Type of proxy to use
@@ -85,7 +85,7 @@ struct DLL_PUBLIC LoadPage {
 	// 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

src/lib/multipageloader.cc

@@ -138,7 +138,7 @@ ResourceObject::ResourceObject(MultiPageLoaderPrivate & mpl, const QUrl & u, con
 	connect(&webPage, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
 	connect(&webPage, SIGNAL(printRequested(QWebFrame*)), this, SLOT(printRequested(QWebFrame*)));
 
-	//If some ssl error occures we want sslErrors to be called, so the we can ignore it
+	//If some ssl error occurs we want sslErrors to be called, so the we can ignore it
 	connect(&networkAccessManager, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)),this,
 	        SLOT(sslErrors(QNetworkReply*, const QList<QSslError>&)));
 
@@ -245,7 +245,7 @@ void ResourceObject::loadDone() {
 }
 
 /*!
- * Called when the page requires authentication, filles in the username
+ * Called when the page requires authentication, fills in the username
  * and password supplied on the command line
  */
 void ResourceObject::handleAuthenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator) {
@@ -285,7 +285,7 @@ void ResourceObject::amfinished(QNetworkReply * reply) {
 }
 
 /*!
- * Handel any ssl error by ignoring
+ * Handle any ssl error by ignoring
  */
 void ResourceObject::sslErrors(QNetworkReply *reply, const QList<QSslError> &) {
 	//We ignore any ssl error, as it is next to impossible to send or receive
@@ -492,7 +492,7 @@ LoaderObject * MultiPageLoader::addResource(const QString & string, const settin
 		url = d->tempIn.create(".html");
 		QFile tmp(url);
 		if (!tmp.open(QIODevice::WriteOnly) || tmp.write(data->toUtf8())==0) {
-			emit error("Unable to create temporery file");
+			emit error("Unable to create temporary file");
 			return NULL;
 		}
 	} else if (url == "-") {
@@ -501,7 +501,7 @@ LoaderObject * MultiPageLoader::addResource(const QString & string, const settin
 		url = d->tempIn.create(".html");
 		QFile tmp(url);
 		if (!tmp.open(QIODevice::WriteOnly) || !copyFile(in, tmp)) {
-			emit error("Unable to create temporery file");
+			emit error("Unable to create temporary file");
 			return NULL;
 		}
 	}
@@ -612,30 +612,30 @@ void MultiPageLoader::cancel() {
 
 /*!
   \fn MultiPageLoader::loadFinished(bool ok)
-  \brief Signal emmited when all pages have been loaded
+  \brief Signal emitted when all pages have been loaded
   \param ok True if all the pages have been loaded sucessfully
 */
 
 /*!
   \fn MultiPageLoader::loadProgress(int progress)
-  \brief Signal emmited once load has progressed
+  \brief Signal emitted once load has progressed
   \param progress Progress in percent
 */
 
 /*!
   \fn MultiPageLoader::loadStarted()
-  \brief Signal emmited when loading has started
+  \brief Signal emitted when loading has started
 */
 
 /*!
   \fn void MultiPageLoader::warning(QString text)
-  \brief Signal emmitted when a none fatal warning has occured
-  \param text A string descripting the warning
+  \brief Signal emitted when a none fatal warning has occured
+  \param text A string describing the warning
 */
 
 /*!
   \fn void MultiPageLoader::error(QString text)
-  \brief Signal emmitted when a fatel error has occured
+  \brief Signal emitted when a fatal error has occured
   \param text A string describing the error
 */
 }

src/lib/outline.cc

@@ -95,7 +95,7 @@ bool OutlineItem::differentFrom(const OutlineItem * other) const {
 
 /*!
   \class OutlinePrivate
-  \brief Class providing implemenation details of Outline
+  \brief Class providing implementation details of Outline
 */
 
 OutlinePrivate::OutlinePrivate(const settings::PdfGlobal & s):
@@ -167,12 +167,12 @@ void Outline::dump(QTextStream & stream, const QString & xsl) const {
 
 /*!
   \file outline.hh
-  \brief Defiens the Outline class
+  \brief Defines the Outline class
 */
 
 /*!
   \class Outline
-  \brief Class responcible for building and keeping an outline of a document.
+  \brief Class responsible for building and keeping an outline of a document.
 */
 
 /*!
@@ -203,7 +203,7 @@ bool Outline::replaceWebPage(int document,
 		headings[ qMakePair(location.first, qMakePair(location.second.y(), location.second.x()) ) ] = e;
 	}
 
-	//This huristic is a little strange, it tries to create a real tree,
+	//This heuristic is a little strange, it tries to create a real tree,
 	//even though someone puts a h5 below a h1 or stuff like that
 	//The way this is handled is having a level stack, indicating what h-tags
 	//a level level in the tree currently represents

src/lib/pdf.h

@@ -58,7 +58,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(

src/lib/pdf_c_bindings.cc

@@ -37,8 +37,8 @@
 /**
  * \page pagesettings Setting
  * Settings can be supplied to PDF and image c-bindings using utf-8 encoded strings.
- * This is done by relatively simple reflection on the CropSettins, HeaderFooter, Margin,
- * ImageGlobal, PdfGlobal, PdfObject, Size, and TabelOfContent classes.
+ * This is done by relatively simple reflection on the CropSettings, HeaderFooter, Margin,
+ * ImageGlobal, PdfGlobal, PdfObject, Size, and TableOfContent classes.
  *
  * - The \ref wkhtmltopdf_global_settings corresponds to the PdfGlobal class and is documented in \ref pagePdfGlobal.
  * - The \ref wkhtmltopdf_object_settings corresponds to the PdfGlobal class and is documented in \ref pagePdfObject.
@@ -55,7 +55,7 @@
  * - \b web.printMediaType Should the content be printed using the print media type instead
  *      of the screen media type. Must be either "true" or "false". Has no effect for wkhtmltoimage.
  * - \b web.defaultEncoding What encoding should we guess content is using if they do not
- *      specify it propperly? E.g. "utf-8"
+ *      specify it properly? E.g. "utf-8"
  * - \b web.userStyleSheet Url er path to a user specified style sheet.
  * - \b web.enablePlugins Should we enable NS plugins, must be either "true" or "false".
  *      Enabling this will have limited success.
@@ -65,24 +65,24 @@
  * - \b load.username The user name to use when loging into a website, E.g. "bart"
  * - \b load.password The password to used when logging into a website, E.g. "elbarto"
  * - \b load.jsdelay The mount of time in milliseconds to wait after a page has done loading until
- *      it is actualy printed. E.g. "1200". We will wait this amount of time or until, javascript
- *      calles window.print().
+ *      it is actually printed. E.g. "1200". We will wait this amount of time or until, javascript
+ *      calls window.print().
  * - \b load.zoomFactor How much should we zoom in on the content? E.g. "2.2".
  * - \b load.customHeaders TODO
- * - \b load.repertCustomHeaders Should the custom headers be sendt all elements loaded instead of
+ * - \b load.repertCustomHeaders Should the custom headers be sent all elements loaded instead of
  *       only the main page? Must be either "true" or "false".
  * - \b load.cookies TODO
  * - \b load.post TODO
- * - \b load.blockLocalFileAccess Dissalow local and piped files to acces other local files. Must
+ * - \b load.blockLocalFileAccess Disallow local and piped files to access other local files. Must
  *      be either "true" or "false".
  * - \b load.stopSlowScript Stop slow running javascript. Must be either "true" or "false".
  * - \b load.debugJavascript Forward javascript warnings and errors to the warning callback.
  *      Must be either "true" or "false".
- * - \b load.loadErrorHandling How should we handel obejcts that fail to load. Must be one of:
+ * - \b load.loadErrorHandling How should we handle obejcts that fail to load. Must be one of:
  *      - "abort" Abort the convertion process
  *      - "skip" Do not add the object to the final output
  *      - "ignore" Try to add the object to the final output.
- * - \b load.proxy String describing whact proxy to use when loading the object.
+ * - \b load.proxy String describing what proxy to use when loading the object.
  * - \b load.runScript TODO
  *
  * \section pageHeaderFooter Header and footer settings
@@ -647,8 +647,8 @@ CAPI(long) wkhtmltopdf_get_output(wkhtmltopdf_converter * converter, const unsig
 //  LocalWords:  eval progn stroustrup innamespace sts sw noet wkhtmltopdf DLL
 //  LocalWords:  ifdef WKHTMLTOX UNDEF undef endif pdf dllbegin namespace const
 //  LocalWords:  QString cb bool ok globalSettings phaseChanged progressChanged
-//  LocalWords:  objectSettings utf CropSettins HeaderFooter ImageGlobal dpi sa
-//  LocalWords:  PdfGlobal PdfObject TabelOfContent pagePdfGlobal pagePdfObject
+//  LocalWords:  objectSettings utf CropSettings HeaderFooter ImageGlobal dpi sa
+//  LocalWords:  PdfGlobal PdfObject TableOfContent pagePdfGlobal pagePdfObject
 //  LocalWords:  pageImageGlobal pageGlobalLoad paperSize colorMode Grayscale
 //  LocalWords:  pageOffset outlineDepth dumpOutline stdout pageLoad pageWeb aa
 //  LocalWords:  includeInOutline pagesCount tocXsl xsl struct typedef str CAPI

src/lib/pdfsettings.hh

@@ -38,7 +38,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
@@ -62,7 +62,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?
@@ -114,7 +114,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

src/lib/tempfile.cc

@@ -38,7 +38,7 @@
 
 /*!
   \class TempFile
-  \brief Class responsible for creating and deleting temporery files
+  \brief Class responsible for creating and deleting temporary files
 */
 TempFile::TempFile() {
 }
@@ -48,9 +48,9 @@ TempFile::~TempFile() {
 }
 
 /*!
-  \brief Create a new temporery file, deleteing the old if one exists
-  \param ext The extention of the temporery file
-  \returns Path of the new temporery file
+  \brief Create a new temporary file, deleting the old if one exists
+  \param ext The extention of the temporary file
+  \returns Path of the new temporary file
 */
 QString TempFile::create(const QString & ext) {
 	remove();
@@ -59,7 +59,7 @@ QString TempFile::create(const QString & ext) {
 }
 
 /*!
-  \brief Remove the temporery file hold by this object it it exists
+  \brief Remove the temporary file hold by this object it it exists
 */
 void TempFile::remove() {
 	if (!path.isEmpty())

src/lib/utilities.cc

@@ -34,7 +34,7 @@ void loadSvg(QSvgRenderer * & ptr, const QString & path, const char * def, int w
 	 if (path != "") {
 	 	ptr = new QSvgRenderer(path);
 		if (ptr->isValid()) return;
-		qWarning() << "Faild to load " << path;
+		qWarning() << "Failed to load " << path;
 		delete ptr;
 	 }
 

src/pdf/pdfarguments.cc

@@ -300,7 +300,7 @@ PdfCommandLineParser::PdfCommandLineParser(PdfGlobal & s, QList<PdfObject> & ps)
 
 	addarg("toc-header-text",0,"The header text of the toc", new QStrSetter(od.toc.captionText, "text"));
 	addarg("disable-toc-links",0,"Do not link from toc to sections", new ConstSetter<bool>(od.toc.forwardLinks, false));
-	addarg("disable-dotted-lines",0,"Do not use dottet lines in the toc", new ConstSetter<bool>(od.toc.useDottedLines,false));
-	addarg("toc-text-size-shrink",0,"For each level of headings in the toc the font is scaled by this facter", new FloatSetter(od.toc.fontScale, "real"));
+	addarg("disable-dotted-lines",0,"Do not use dotted lines in the toc", new ConstSetter<bool>(od.toc.useDottedLines,false));
+	addarg("toc-text-size-shrink",0,"For each level of headings in the toc the font is scaled by this factor", new FloatSetter(od.toc.fontScale, "real"));
 	addarg("toc-level-indentation",0,"For each level of headings in the toc indent by this length", new QStrSetter(od.toc.indentation, "width"));
 }