Browse Source

sync public headers to remove the __WKHTMLTOX_UNDEF_QT_DLL__ hack

This should have been done in c22928d1517ca05ac0c6433272dc51d7d68aaed5.
Ashish Kulkarni 11 years ago
parent
commit
08b081740f

+ 0 - 5
include/wkhtmltox/converter.hh

@@ -17,11 +17,6 @@
 
 
 #ifndef __CONVERTER_HH__
 #ifndef __CONVERTER_HH__
 #define __CONVERTER_HH__
 #define __CONVERTER_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 
 #include <QObject>
 #include <QObject>
 #include <wkhtmltox/loadsettings.hh>
 #include <wkhtmltox/loadsettings.hh>

+ 0 - 5
include/wkhtmltox/imageconverter.hh

@@ -17,11 +17,6 @@
 
 
 #ifndef __IMAGECONVERTER_HH__
 #ifndef __IMAGECONVERTER_HH__
 #define __IMAGECONVERTER_HH__
 #define __IMAGECONVERTER_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 
 #include <wkhtmltox/converter.hh>
 #include <wkhtmltox/converter.hh>
 #include <wkhtmltox/imagesettings.hh>
 #include <wkhtmltox/imagesettings.hh>

+ 0 - 5
include/wkhtmltox/imagesettings.hh

@@ -17,11 +17,6 @@
 
 
 #ifndef __IMAGESETTINGS_HH__
 #ifndef __IMAGESETTINGS_HH__
 #define __IMAGESETTINGS_HH__
 #define __IMAGESETTINGS_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 
 #include <QString>
 #include <QString>
 #include <wkhtmltox/loadsettings.hh>
 #include <wkhtmltox/loadsettings.hh>

+ 0 - 5
include/wkhtmltox/loadsettings.hh

@@ -17,11 +17,6 @@
 
 
 #ifndef __LOADSETTINGS_HH__
 #ifndef __LOADSETTINGS_HH__
 #define __LOADSETTINGS_HH__
 #define __LOADSETTINGS_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 
 #include <QNetworkProxy>
 #include <QNetworkProxy>
 #include <QString>
 #include <QString>

+ 0 - 5
include/wkhtmltox/multipageloader.hh

@@ -17,11 +17,6 @@
 
 
 #ifndef __MULTIPAGELOADER_HH__
 #ifndef __MULTIPAGELOADER_HH__
 #define __MULTIPAGELOADER_HH__
 #define __MULTIPAGELOADER_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 
 #include <QFile>
 #include <QFile>
 #include <QObject>
 #include <QObject>

+ 0 - 5
include/wkhtmltox/pdfconverter.hh

@@ -17,11 +17,6 @@
 
 
 #ifndef __PDFCONVERTER_HH__
 #ifndef __PDFCONVERTER_HH__
 #define __PDFCONVERTER_HH__
 #define __PDFCONVERTER_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 
 #include <wkhtmltox/converter.hh>
 #include <wkhtmltox/converter.hh>
 #include <wkhtmltox/pdfsettings.hh>
 #include <wkhtmltox/pdfsettings.hh>

+ 0 - 5
include/wkhtmltox/pdfsettings.hh

@@ -17,11 +17,6 @@
 
 
 #ifndef __PDFSETTINGS_HH__
 #ifndef __PDFSETTINGS_HH__
 #define __PDFSETTINGS_HH__
 #define __PDFSETTINGS_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 
 #include <QNetworkProxy>
 #include <QNetworkProxy>
 #include <QPrinter>
 #include <QPrinter>

+ 0 - 5
include/wkhtmltox/utilities.hh

@@ -17,11 +17,6 @@
 
 
 #ifndef __UTILITIES_HH__
 #ifndef __UTILITIES_HH__
 #define __UTILITIES_HH__
 #define __UTILITIES_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 
 #include <QProxyStyle>
 #include <QProxyStyle>
 #include <QFile>
 #include <QFile>

+ 0 - 5
include/wkhtmltox/websettings.hh

@@ -17,11 +17,6 @@
 
 
 #ifndef __WEBSETTINGS_HH__
 #ifndef __WEBSETTINGS_HH__
 #define __WEBSETTINGS_HH__
 #define __WEBSETTINGS_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 
 #include <QNetworkProxy>
 #include <QNetworkProxy>
 #include <QString>
 #include <QString>