summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2014-10-07 11:18:22 (GMT)
committerMontel Laurent <montel@kde.org>2014-10-07 11:20:16 (GMT)
commit49129b788a5e0981697e8a45cb9415327f05ed32 (patch)
treea9e8205a080085c0ae3246878e99f6ba47565f31
parent4ec78fa5df29bdf4da9e258aa816e8fcc2063d41 (diff)
Reactivate it
-rw-r--r--generators/CMakeLists.txt10
-rw-r--r--generators/fax/faxexpand.cpp2
-rw-r--r--generators/plucker/generator_plucker.cpp2
-rw-r--r--generators/plucker/unpluck/image.cpp2
-rw-r--r--generators/plucker/unpluck/qunpluck.cpp2
5 files changed, 9 insertions, 9 deletions
diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
index f1ffb47..0e0d44a 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 4fbe956..4e8a47d 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 <QtCore/QDebug>
#include "faxexpand.h"
-
+#include <KDebug>
//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 ab11fff..444b93f 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 e04bc73..36c4729 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 a3ce1b8..47e166f 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) );
}
}