fix compilation errors due to renaming

src/image/image.pro

@@ -20,8 +20,8 @@ include(../../common.pri)
 TEMPLATE = app
 TARGET = wkhtmltoimage
 DESTDIR = ../../bin
-DEPENDPATH += . ../shared
-INCLUDEPATH += . ../shared
+DEPENDPATH += ../lib ../shared
+INCLUDEPATH += ../lib ../shared
 
 unix {
     man.path=$$INSTALLBASE/share/man/man1
@@ -47,4 +47,4 @@ CONFIG(shared, shared|static) {
 }
 
 # Input
-SOURCES += wkhtmltoimage.cc imagearguments.cc imagecommandlineparser.cc imagedocparts.cc
+SOURCES += wkhtmltoimage.cpp imagearguments.cpp imagecommandlineparser.cpp imagedocparts.cpp

src/image/imagearguments.cpp

@@ -19,7 +19,7 @@
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "arghandler.inl"
-#include "imagecommandlineparser.hh"
+#include "imagecommandlineparser.h"
 #include <qglobal.h>
 
 ImageCommandLineParser::ImageCommandLineParser(wkhtmltopdf::settings::ImageGlobal & s):

src/image/imagecommandlineparser.cpp

@@ -18,8 +18,8 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "imagecommandlineparser.hh"
-#include "outputter.hh"
+#include "imagecommandlineparser.h"
+#include "outputter.h"
 #include <qwebframe.h>
 
 /*!

src/image/imagecommandlineparser.h

@@ -20,7 +20,7 @@
 
 #ifndef __IMAGECOMMANDLINEPARSER_HH__
 #define __IMAGECOMMANDLINEPARSER_HH__
-#include "commandlineparserbase.hh"
+#include "commandlineparserbase.h"
 #include <cstdio>
 #include <wkhtmltox/imagesettings.hh>
 

src/image/imagedocparts.cpp

@@ -18,8 +18,8 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "imagecommandlineparser.hh"
-#include "outputter.hh"
+#include "imagecommandlineparser.h"
+#include "outputter.h"
 #include <QWebFrame>
 
 #define STRINGIZE_(x) #x

src/image/wkhtmltoimage.cpp

@@ -18,8 +18,8 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "imagecommandlineparser.hh"
-#include "progressfeedback.hh"
+#include "imagecommandlineparser.h"
+#include "progressfeedback.h"
 #include <QApplication>
 #include <QWebFrame>
 #include <wkhtmltox/imageconverter.hh>

src/lib/converter.cpp

@@ -19,8 +19,8 @@
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "converter_p.hh"
-#include "multipageloader.hh"
+#include "converter_p.h"
+#include "multipageloader.h"
 #include <QWebFrame>
 #include <qapplication.h>
 

src/lib/converter_p.h

@@ -21,8 +21,8 @@
 #ifndef __CONVERTER_P_HH__
 #define __CONVERTER_P_HH__
 
-#include "converter.hh"
-#include "websettings.hh"
+#include "converter.h"
+#include "websettings.h"
 #include <QFile>
 #include <QWebSettings>
 

src/lib/image_c_bindings.cpp

@@ -42,7 +42,7 @@
  */
 
 
-#include "image_c_bindings_p.hh"
+#include "image_c_bindings_p.h"
 #include "pdf.h"
 
 #include "dllbegin.inc"

src/lib/image_c_bindings_p.h

@@ -22,7 +22,7 @@
 #define __IMAGE_C_BINDINGS_P_HH__
 
 #include "image.h"
-#include "imageconverter.hh"
+#include "imageconverter.h"
 #include <QObject>
 
 #include "dllbegin.inc"

src/lib/imageconverter.cpp

@@ -19,8 +19,8 @@
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "imageconverter_p.hh"
-#include "imagesettings.hh"
+#include "imageconverter_p.h"
+#include "imagesettings.h"
 #include <QBuffer>
 #include <QDebug>
 #include <QEventLoop>

src/lib/imageconverter_p.h

@@ -21,9 +21,9 @@
 #ifndef __IMAGECONVERTER_P_HH__
 #define __IMAGECONVERTER_P_HH__
 
-#include "converter_p.hh"
-#include "imageconverter.hh"
-#include "multipageloader.hh"
+#include "converter_p.h"
+#include "imageconverter.h"
+#include "multipageloader.h"
 
 #include "dllbegin.inc"
 namespace wkhtmltopdf {

src/lib/imagesettings.cpp

@@ -19,8 +19,8 @@
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "imagesettings.hh"
-#include "reflect.hh"
+#include "imagesettings.h"
+#include "reflect.h"
 
 #include "dllbegin.inc"
 namespace wkhtmltopdf {

src/lib/lib.pri

@@ -18,28 +18,28 @@
 DEFINES += BUILDING_DLL
 
 #Shared
-PUBLIC_HEADERS += ../lib/converter.hh ../lib/multipageloader.hh ../lib/dllbegin.inc
-PUBLIC_HEADERS += ../lib/dllend.inc ../lib/loadsettings.hh ../lib/websettings.hh
-PUBLIC_HEADERS += ../lib/utilities.hh
-HEADERS += ../lib/multipageloader_p.hh  ../lib/converter_p.hh
-SOURCES += ../lib/loadsettings.cc ../lib/multipageloader.cc ../lib/tempfile.cc \
-	   ../lib/converter.cc ../lib/websettings.cc  \
-  	   ../lib/reflect.cc ../lib/utilities.cc
+PUBLIC_HEADERS += ../lib/converter.h ../lib/multipageloader.h ../lib/dllbegin.inc
+PUBLIC_HEADERS += ../lib/dllend.inc ../lib/loadsettings.h ../lib/websettings.h
+PUBLIC_HEADERS += ../lib/utilities.h
+HEADERS += ../lib/multipageloader_p.h  ../lib/converter_p.h
+SOURCES += ../lib/loadsettings.cpp ../lib/multipageloader.cpp ../lib/tempfile.cpp \
+           ../lib/converter.cpp ../lib/websettings.cpp  \
+           ../lib/reflect.cpp ../lib/utilities.cpp
 
 #Pdf
-PUBLIC_HEADERS += ../lib/pdfconverter.hh ../lib/pdfsettings.hh
-HEADERS += ../lib/pdfconverter_p.hh
-SOURCES += ../lib/pdfsettings.cc ../lib/pdfconverter.cc \
-           ../lib/outline.cc ../lib/tocstylesheet.cc
+PUBLIC_HEADERS += ../lib/pdfconverter.h ../lib/pdfsettings.h
+HEADERS += ../lib/pdfconverter_p.h
+SOURCES += ../lib/pdfsettings.cpp ../lib/pdfconverter.cpp \
+           ../lib/outline.cpp ../lib/tocstylesheet.cpp
 
-PUBLIC_HEADERS += ../lib/imageconverter.hh ../lib/imagesettings.hh
-HEADERS += ../lib/imageconverter_p.hh
-SOURCES += ../lib/imagesettings.cc ../lib/imageconverter.cc
+PUBLIC_HEADERS += ../lib/imageconverter.h ../lib/imagesettings.h
+HEADERS += ../lib/imageconverter_p.h
+SOURCES += ../lib/imagesettings.cpp ../lib/imageconverter.cpp
 
 #C-Bindings
 PUBLIC_HEADERS += ../lib/pdf.h ../lib/image.h
-HEADERS += ../lib/pdf_c_bindings_p.hh ../lib/image_c_bindings_p.hh
-SOURCES += ../lib/pdf_c_bindings.cc ../lib/image_c_bindings.cc
+HEADERS += ../lib/pdf_c_bindings_p.h ../lib/image_c_bindings_p.h
+SOURCES += ../lib/pdf_c_bindings.cpp ../lib/image_c_bindings.cpp
 
 
 HEADERS += $$PUBLIC_HEADERS

src/lib/loadsettings.cpp

@@ -23,7 +23,7 @@
 #define strcasecmp _stricmp
 #endif
 
-#include "loadsettings.hh"
+#include "loadsettings.h"
 #include <QMap>
 #include <stdexcept>
 namespace wkhtmltopdf {

src/lib/multipageloader.cpp

@@ -19,7 +19,7 @@
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "multipageloader_p.hh"
+#include "multipageloader_p.h"
 #include <QFile>
 #include <QFileInfo>
 #include <QNetworkCookie>

src/lib/multipageloader_p.h

@@ -21,8 +21,8 @@
 #ifndef __MULTIPAGELOADER_P_HH__
 #define __MULTIPAGELOADER_P_HH__
 
-#include "multipageloader.hh"
-#include "tempfile.hh"
+#include "multipageloader.h"
+#include "tempfile.h"
 #include <QAtomicInt>
 #include <QAuthenticator>
 #include <QFile>

src/lib/outline.cpp

@@ -19,7 +19,7 @@
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "outline_p.hh"
+#include "outline_p.h"
 #include <fstream>
 #include <iostream>
 using namespace std;

src/lib/outline.h

@@ -21,7 +21,7 @@
 #ifndef __OUTLINE_HH__
 #define __OUTLINE_HH__
 
-#include "pdfsettings.hh"
+#include "pdfsettings.h"
 #include <QWebElement>
 #include <QWebFrame>
 

src/lib/outline_p.h

@@ -21,7 +21,7 @@
 #ifndef __OUTLINE_P_HH__
 #define __OUTLINE_P_HH__
 
-#include "outline.hh"
+#include "outline.h"
 #ifdef __EXTENSIVE_WKHTMLTOPDF_QT_HACK__
 #include "dllbegin.inc"
 namespace wkhtmltopdf {

src/lib/pdf_c_bindings.cpp

@@ -23,8 +23,8 @@
  * \file pdf.h
  * \brief Provides C bindings for pdf conversion
  */
-#include "pdf_c_bindings_p.hh"
-#include "utilities.hh"
+#include "pdf_c_bindings_p.h"
+#include "utilities.h"
 #include <QApplication>
 #include <QWebFrame>
 

src/lib/pdf_c_bindings_p.h

@@ -22,7 +22,7 @@
 #define __PDF_C_BINDINGS_P_HH__
 
 #include "pdf.h"
-#include "pdfconverter.hh"
+#include "pdfconverter.h"
 #include <QObject>
 #include <QHash>
 #include <vector>

src/lib/pdfconverter.cpp

@@ -19,7 +19,7 @@
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "pdfconverter_p.hh"
+#include "pdfconverter_p.h"
 #include <QAuthenticator>
 #include <QDateTime>
 #include <QDir>

src/lib/pdfconverter_p.h

@@ -21,12 +21,12 @@
 #ifndef __PDFCONVERTER_P_HH__
 #define __PDFCONVERTER_P_HH__
 
-#include "converter_p.hh"
-#include "multipageloader.hh"
-#include "outline.hh"
-#include "pdfconverter.hh"
-#include "pdfsettings.hh"
-#include "tempfile.hh"
+#include "converter_p.h"
+#include "multipageloader.h"
+#include "outline.h"
+#include "pdfconverter.h"
+#include "pdfsettings.h"
+#include "tempfile.h"
 #include <QAtomicInt>
 #include <QFile>
 #include <QMutex>

src/lib/pdfsettings.cpp

@@ -23,8 +23,8 @@
 #define strcasecmp _stricmp
 #endif
 
-#include "pdfsettings.hh"
-#include "reflect.hh"
+#include "pdfsettings.h"
+#include "reflect.h"
 #include <QMap>
 #include <stdexcept>
 

src/lib/reflect.cpp

@@ -19,7 +19,7 @@
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "reflect.hh"
+#include "reflect.h"
 
 namespace wkhtmltopdf {
 namespace settings {

src/lib/reflect.h

@@ -25,8 +25,8 @@
 #define typeof decltype
 #endif
 
-#include "loadsettings.hh"
-#include "websettings.hh"
+#include "loadsettings.h"
+#include "websettings.h"
 #include <QStringList>
 #include <cstring>
 

src/lib/tempfile.cpp

@@ -19,7 +19,7 @@
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "tempfile.hh"
+#include "tempfile.h"
 #include <QDir>
 #include <QFile>
 #include <QUuid>

src/lib/tocstylesheet.cpp

@@ -19,8 +19,8 @@
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "outline_p.hh"
-#include "pdfsettings.hh"
+#include "outline_p.h"
+#include "pdfsettings.h"
 #include <QTextStream>
 
 namespace wkhtmltopdf {

src/lib/utilities.cpp

@@ -19,7 +19,7 @@
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "utilities.hh"
+#include "utilities.h"
 #include <QDebug>
 #include <QTextStream>
 #include <QMetaEnum>

src/lib/websettings.cpp

@@ -19,7 +19,7 @@
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "websettings.hh"
+#include "websettings.h"
 namespace wkhtmltopdf {
 namespace settings {
 

src/pdf/pdf.pro

@@ -20,8 +20,8 @@ include(../../common.pri)
 TEMPLATE = app
 TARGET = wkhtmltopdf
 DESTDIR = ../../bin
-DEPENDPATH += . ../shared
-INCLUDEPATH += . ../shared
+DEPENDPATH += ../lib ../shared
+INCLUDEPATH += ../lib ../shared
 
 unix {
     man.path=$$INSTALLBASE/share/man/man1
@@ -47,5 +47,5 @@ CONFIG(shared, shared|static) {
 }
 
 #Application part
-SOURCES += wkhtmltopdf.cc pdfarguments.cc pdfcommandlineparser.cc \
-           pdfdocparts.cc
+SOURCES += wkhtmltopdf.cpp pdfarguments.cpp pdfcommandlineparser.cpp \
+           pdfdocparts.cpp

src/pdf/pdfarguments.cpp

@@ -19,7 +19,7 @@
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "arghandler.inl"
-#include "pdfcommandlineparser.hh"
+#include "pdfcommandlineparser.h"
 #include <QFile>
 #include <qglobal.h>
 #include <wkhtmltox/pdfconverter.hh>

src/pdf/pdfcommandlineparser.cpp

@@ -18,8 +18,8 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "outputter.hh"
-#include "pdfcommandlineparser.hh"
+#include "outputter.h"
+#include "pdfcommandlineparser.h"
 #include <qwebframe.h>
 
 using namespace wkhtmltopdf::settings;

src/pdf/pdfcommandlineparser.h

@@ -20,7 +20,7 @@
 
 #ifndef __PDFCOMMANDLINEPARSER_HH__
 #define __PDFCOMMANDLINEPARSER_HH__
-#include "commandlineparserbase.hh"
+#include "commandlineparserbase.h"
 #include <cstdio>
 #include <wkhtmltox/pdfsettings.hh>
 

src/pdf/pdfdocparts.cpp

@@ -18,8 +18,8 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "outputter.hh"
-#include "pdfcommandlineparser.hh"
+#include "outputter.h"
+#include "pdfcommandlineparser.h"
 #include <QWebFrame>
 
 #define STRINGIZE_(x) #x

src/pdf/wkhtmltopdf.cpp

@@ -18,8 +18,8 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "pdfcommandlineparser.hh"
-#include "progressfeedback.hh"
+#include "pdfcommandlineparser.h"
+#include "progressfeedback.h"
 #include <QCommonStyle>
 #include <QPainter>
 #include <QStyleOption>

src/shared/arghandler.cpp

@@ -18,7 +18,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "outputter.hh"
+#include "outputter.h"
 
 /*!
   \fn ArgHandler::getDesc() const

src/shared/arghandler.inl

@@ -20,8 +20,8 @@
 
 #ifndef __ARGHANDLER_INL__
 #define __ARGHANDLER_INL__
-#include "commandlineparserbase.hh"
-#include <wkhtmltox/loadsettings.hh>
+#include "commandlineparserbase.h"
+#include "loadsettings.h"
 
 template <typename T> class DstArgHandler: public ArgHandler {
 public:

src/shared/commandlineparserbase.cpp

@@ -18,8 +18,8 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "commandlineparserbase.hh"
-#include "outputter.hh"
+#include "commandlineparserbase.h"
+#include "outputter.h"
 #include <qwebframe.h>
 
 bool ahsort(const ArgHandler * a, const ArgHandler * b) {

src/shared/commonarguments.cpp

@@ -19,7 +19,7 @@
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "arghandler.inl"
-#include "commandlineparserbase.hh"
+#include "commandlineparserbase.h"
 #include <wkhtmltox/loadsettings.hh>
 using namespace wkhtmltopdf::settings;
 

src/shared/commondocparts.cpp

@@ -18,8 +18,8 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "commandlineparserbase.hh"
-#include "outputter.hh"
+#include "commandlineparserbase.h"
+#include "outputter.h"
 #include <QFile>
 
 /*!

src/shared/htmloutputter.cpp

@@ -18,7 +18,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "outputter.hh"
+#include "outputter.h"
 #include <QTextDocument>
 
 #if QT_VERSION >= 0x050000

src/shared/manoutputter.cpp

@@ -18,7 +18,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "outputter.hh"
+#include "outputter.h"
 #include <QStringList>
 #define S(x) ((x).toUtf8().constData())
 

src/shared/outputter.cpp

@@ -18,7 +18,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "outputter.hh"
+#include "outputter.h"
 
 /*!
   \class Outputter

src/shared/outputter.h

@@ -20,7 +20,7 @@
 
 #ifndef __OUTPUTTER_HH__
 #define __OUTPUTTER_HH__
-#include "commandlineparserbase.hh"
+#include "commandlineparserbase.h"
 #include <QString>
 #include <QVector>
 #include <stdio.h>

src/shared/progressfeedback.cpp

@@ -18,7 +18,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "progressfeedback.hh"
+#include "progressfeedback.h"
 #include <cstdio>
 namespace wkhtmltopdf {
 /*!

src/shared/shared.pri

@@ -15,9 +15,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
-HEADERS +=  ../shared/progressfeedback.hh
+HEADERS +=  ../shared/progressfeedback.h
 
-SOURCES += ../shared/outputter.cc ../shared/manoutputter.cc ../shared/htmloutputter.cc \
-           ../shared/textoutputter.cc ../shared/arghandler.cc ../shared/commondocparts.cc \
- 	   ../shared/commandlineparserbase.cc ../shared/commonarguments.cc \
-	   ../shared/progressfeedback.cc
+SOURCES += ../shared/outputter.cpp ../shared/manoutputter.cpp ../shared/htmloutputter.cpp \
+           ../shared/textoutputter.cpp ../shared/arghandler.cpp ../shared/commondocparts.cpp \
+           ../shared/commandlineparserbase.cpp ../shared/commonarguments.cpp \
+           ../shared/progressfeedback.cpp

src/shared/textoutputter.cpp

@@ -18,7 +18,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "outputter.hh"
+#include "outputter.h"
 #include <qstringlist.h>
 
 #define S(t) (doc?(t).toUtf8().constData():(t).toLocal8Bit().constData())