Minor changes

Doxyfile

@@ -1257,7 +1257,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator
 # instead of the = operator.
 
-PREDEFINED             =
+PREDEFINED             = __EXTENSIVE_WKHTMLTOPDF_QT_HACK__=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.

src/outline.hh

@@ -27,11 +27,10 @@ public:
 	Outline(const Settings & settings);
 	~Outline();
 	void addWebPage(const QString & name, QWebPrinter & wp, QWebFrame * frame);
-	void fillHeaderFooterParms(int d, int page, QHash<QString, QString> & parms);
+	void fillHeaderFooterParms(int page, QHash<QString, QString> & parms);
 	void fillAnchors(int d, QHash<QString, QWebElement> & anchors);
 	int pageCount();
 	void printOutline(QPrinter * printer);
-	void addOffset(int d);
 private:
 	OutlinePrivate * d;
 };

wkhtmltopdf.pro

@@ -58,10 +58,12 @@ target.path=$$INSTALLBASE/bin
 QT += webkit network
 
 # Input
-HEADERS += src/wkhtmltopdf.hh src/toc.hh src/pageconverter_p.hh src/pageconverter.hh \
+HEADERS += src/wkhtmltopdf.hh src/pageconverter_p.hh src/pageconverter.hh \
            src/multipageloader_p.hh src/multipageloader.hh src/progressfeedback.hh
 
-SOURCES += src/wkhtmltopdf.cc src/toc.cc src/arguments.cc src/commandlineparser.cc \
+SOURCES += src/wkhtmltopdf.cc src/arguments.cc src/commandlineparser.cc \
            src/docparts.cc src/outputter.cc src/manoutputter.cc src/settings.cc \
            src/htmloutputter.cc src/textoutputter.cc src/tempfile.cc \
-           src/multipageloader.cc src/pageconverter.cc src/progressfeedback.cc
+           src/multipageloader.cc src/pageconverter.cc src/progressfeedback.cc \
+           src/outline.cc 
+