Reactivate some generator

generators/CMakeLists.txt

@@ -108,9 +108,9 @@ endif(TIFF_FOUND)
 
 add_subdirectory(xps)
 
-#add_subdirectory(ooo)
+add_subdirectory(ooo)
 
-#add_subdirectory(fictionbook)
+add_subdirectory(fictionbook)
 
 add_subdirectory(comicbook)
 

generators/fictionbook/converter.cpp

@@ -763,7 +763,7 @@ bool Converter::convertLink( const QDomElement &element )
         mLocalLinks.insert( href.mid( 1 ), QPair<int, int>( startPosition, endPosition ) );
     } else {
         // external link
-        Okular::BrowseAction *action = new Okular::BrowseAction( href );
+        Okular::BrowseAction *action = new Okular::BrowseAction( QUrl(href) );
         emit addAction( action, startPosition, endPosition );
     }
 

generators/fictionbook/generator_fb.cpp

@@ -43,3 +43,5 @@ void FictionBookGenerator::addPages( KConfigDialog* dlg )
 
     dlg->addPage( widget, generalSettings(), i18n("FictionBook"), "okular-fb2", i18n("FictionBook Backend Configuration") );
 }
+#include "generator_fb.moc"
+

generators/ooo/converter.cpp

@@ -553,7 +553,7 @@ bool Converter::convertLink( QTextCursor *cursor, const QDomElement &element, co
 
   int endPosition = cursor->position();
 
-  Okular::Action *action = new Okular::BrowseAction( element.attribute( "href" ) );
+  Okular::Action *action = new Okular::BrowseAction( QUrl(element.attribute( "href" )) );
   emit addAction( action, startPosition, endPosition );
 
   return true;

generators/ooo/generator_ooo.cpp

@@ -51,3 +51,4 @@ void KOOOGenerator::walletDataForFile( const QString &fileName, QString *walletN
     *walletName = KWallet::Wallet::LocalWallet();
     *walletFolder = KWallet::Wallet::PasswordFolder();
 }
+#include "generator_ooo.moc"