diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt index f1ffb474e..0e0d44a7c 100644 --- a/generators/CMakeLists.txt +++ b/generators/CMakeLists.txt @@ -79,7 +79,6 @@ set_package_properties("libqmobipocket" PROPERTIES # let's enable the generators properly configured -message("KF5 enable generators") if(POPPLER_FOUND) add_subdirectory(poppler) endif(POPPLER_FOUND) @@ -114,11 +113,11 @@ add_subdirectory(fictionbook) add_subdirectory(comicbook) -#add_subdirectory(fax) +add_subdirectory(fax) -#if(JPEG_FOUND AND ZLIB_FOUND) -# add_subdirectory(plucker) -#endif(JPEG_FOUND AND ZLIB_FOUND) +if(JPEG_FOUND AND ZLIB_FOUND) + add_subdirectory(plucker) +endif(JPEG_FOUND AND ZLIB_FOUND) if(EPUB_FOUND) add_subdirectory(epub) @@ -126,6 +125,7 @@ endif(EPUB_FOUND) add_subdirectory(txt) +message("KF5 enable mobipocket generator") #if(QMOBIPOCKET_FOUND) # add_subdirectory(mobipocket) #endif() diff --git a/generators/fax/faxexpand.cpp b/generators/fax/faxexpand.cpp index 4fbe95607..4e8a47d6a 100644 --- a/generators/fax/faxexpand.cpp +++ b/generators/fax/faxexpand.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #include #include "faxexpand.h" - +#include //Uncomment this for verbose debug output //#define DEBUG_FAX #define verbose false diff --git a/generators/plucker/generator_plucker.cpp b/generators/plucker/generator_plucker.cpp index ab11fff7e..444b93fbd 100644 --- a/generators/plucker/generator_plucker.cpp +++ b/generators/plucker/generator_plucker.cpp @@ -181,7 +181,7 @@ Okular::ExportFormat::List PluckerGenerator::exportFormats() const bool PluckerGenerator::exportTo( const QString &fileName, const Okular::ExportFormat &format ) { - if ( format.mimeType()->name() == QLatin1String( "text/plain" ) ) { + if ( format.mimeType().name() == QLatin1String( "text/plain" ) ) { QFile file( fileName ); if ( !file.open( QIODevice::WriteOnly ) ) return false; diff --git a/generators/plucker/unpluck/image.cpp b/generators/plucker/unpluck/image.cpp index e04bc736e..36c4729d3 100644 --- a/generators/plucker/unpluck/image.cpp +++ b/generators/plucker/unpluck/image.cpp @@ -250,7 +250,7 @@ bool TranscribePalmImageToJPEG QTemporaryFile tempFile; tempFile.open(); - FILE *outfile = fopen( QFile::encodeName( tempFile.fileName() ), "w" ); + FILE *outfile = fopen( QFile::encodeName( tempFile.fileName() ).constData(), "w" ); if ( !outfile ) return false; diff --git a/generators/plucker/unpluck/qunpluck.cpp b/generators/plucker/unpluck/qunpluck.cpp index a3ce1b88c..47e166f75 100644 --- a/generators/plucker/unpluck/qunpluck.cpp +++ b/generators/plucker/unpluck/qunpluck.cpp @@ -206,7 +206,7 @@ bool QUnpluck::open( const QString &fileName ) mLinks[ i ].link = new Okular::GotoAction( QString(), viewport ); } else { - mLinks[ i ].link = new Okular::BrowseAction( mLinks[ i ].url ); + mLinks[ i ].link = new Okular::BrowseAction( QUrl(mLinks[ i ].url) ); } }