qimage generator is working again but seems kimgio is not plugging correctly the plugins

svn path=/branches/work/kde4/kdegraphics/kpdf/; revision=422396

core/Makefile.am

@@ -1,10 +1,10 @@
-SUBDIRS = generator_pdf # generator_kimgio
+SUBDIRS = generator_pdf generator_kimgio
 
 INCLUDES = -I$(srcdir)/generator_pdf -I$(srcdir)/.. -I$(srcdir)/../xpdf -I$(srcdir)/../xpdf/goo -I$(top_builddir)/kpdf $(all_includes)
 
 METASOURCES = AUTO
 
-libkpdfcore_la_LIBADD = ./generator_pdf/libgeneratorpdf.la # ./generator_kimgio/libgeneratorkimgio.la
+libkpdfcore_la_LIBADD = ./generator_pdf/libgeneratorpdf.la ./generator_kimgio/libgeneratorkimgio.la
 libkpdfcore_la_SOURCES = document.cpp link.cpp page.cpp pagetransition.cpp
 
 noinst_LTLIBRARIES = libkpdfcore.la

core/document.cpp

@@ -13,6 +13,7 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qimage.h>
+#include <qimagereader.h>
 #include <qtextstream.h>
 #include <qvector.h>
 #include <qtimer.h>
@@ -34,7 +35,7 @@
 #include "page.h"
 #include "link.h"
 #include "generator_pdf/generator_pdf.h"  // PDF generator
-//#include "generator_kimgio/generator_kimgio.h"  // KIMGIO generator
+#include "generator_kimgio/generator_kimgio.h"  // KIMGIO generator
 #include "conf/settings.h"
 
 // structures used internally by KPDFDocument for local variables storage
@@ -112,15 +113,14 @@ KPDFDocument::KPDFDocument()
     d->allocatedPixmapsTotalMemory = 0;
     d->memCheckTimer = 0;
     d->saveBookmarksTimer = 0;
-#warning kimgio generator disabled ATM
-/*    KImageIO::registerFormats();
-    QStringList list = QImage::inputFormatList();
-    QStringList::Iterator it = list.begin();
+    KImageIO::registerFormats();
+    QList<QByteArray> list = QImageReader::supportedImageFormats();
+    QList<QByteArray>::Iterator it = list.begin();
     while( it != list.end() )
     {
-        d->kimgioMimes << KMimeType::findByPath(QString("foo.%1").arg(*it), 0, true)->name();
+        d->kimgioMimes << KMimeType::findByPath("foo." + QString(*it), 0, true)->name();
         ++it;
-    }*/
+    }
 }
 
 KPDFDocument::~KPDFDocument()
@@ -156,7 +156,7 @@ bool KPDFDocument::openDocument( const QString & docFile, const KURL & url )
         generator = new PDFGenerator( this );
 //    else if ( mimeName == "application/postscript" )
 //        kdError() << "PS generator not available" << endl;
-/*    else
+    else
     {
         QStringList::Iterator it = d->kimgioMimes.begin();
         while( it != d->kimgioMimes.end() )
@@ -174,7 +174,7 @@ bool KPDFDocument::openDocument( const QString & docFile, const KURL & url )
             kdWarning() << "Unknown mimetype '" << mime->name() << "'." << endl;
             return false;
         }
-    }*/
+    }
 
     // 1. load Document (and set busy cursor while loading)
     QApplication::setOverrideCursor( Qt::waitCursor );

core/generator_kimgio/generator_kimgio.cpp

@@ -23,7 +23,7 @@ KIMGIOGenerator::~KIMGIOGenerator()
     delete m_pix;
 }
 
-bool KIMGIOGenerator::loadDocument( const QString & fileName, QValueVector<KPDFPage*> & pagesVector )
+bool KIMGIOGenerator::loadDocument( const QString & fileName, QVector<KPDFPage*> & pagesVector )
 {
     m_pix = new QPixmap(fileName);
 

core/generator_kimgio/generator_kimgio.h

@@ -19,7 +19,7 @@ class KIMGIOGenerator : public Generator
         virtual ~KIMGIOGenerator();
 
         // [INHERITED] load a document and fill up the pagesVector
-        bool loadDocument( const QString & fileName, QValueVector<KPDFPage*> & pagesVector );
+        bool loadDocument( const QString & fileName, QVector<KPDFPage*> & pagesVector );
 
         // [INHERITED] perform actions on document / pages
         bool canGeneratePixmap();