[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/frameworks] /: Readd the FILTER_ODT_TO_ASCII to the build.
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2015-03-28 21:15:10
Message-ID: E1Yby4U-0003ur-4V () scm ! kde ! org
[Download RAW message or body]

Git commit 764bd4b886aa3a579b052c7cf0fce11b8fae461f by Inge Wallin.
Committed on 23/03/2015 at 05:17.
Pushed by ingwa into branch 'frameworks'.

Readd the FILTER_ODT_TO_ASCII to the build.

It builds and runs. It doesn't work yet, though. There is still some magic
needed with mimetypes. One suggestion is to convert the desktop file to jso=
n.

M  +1    -1    CalligraProducts.cmake
M  +3    -1    filters/words/ascii/AsciiExport.cpp

http://commits.kde.org/calligra/764bd4b886aa3a579b052c7cf0fce11b8fae461f

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index ed56407..723a962 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -170,7 +170,7 @@ calligra_define_product(FILTER_WORDPERFECT_TO_ODT "Word=
 Perfect to ODT filter" U
 calligra_define_product(FILTER_WORKS_TO_ODT "MS Works to ODT filter" UNPOR=
TED  REQUIRES LIB_CALLIGRA)
 calligra_define_product(FILTER_APPLIXWORD_TO_ODT "Applixword to ODT filter=
" UNPORTED  REQUIRES LIB_CALLIGRA)
 calligra_define_product(FILTER_ASCII_TO_WORDS "Words ASCII import filter" =
UNPORTED  REQUIRES PART_WORDS LIB_KOODF2)
-calligra_define_product(FILTER_ODT_TO_ASCII "ODT to ASCII filter" UNPORTED=
  REQUIRES LIB_KOODFREADER LIB_CALLIGRA)
+calligra_define_product(FILTER_ODT_TO_ASCII "ODT to ASCII filter" REQUIRES=
 LIB_KOODFREADER LIB_CALLIGRA)
 calligra_define_product(FILTER_RTF_TO_ODT "RTF to ODT filter" UNPORTED  RE=
QUIRES LIB_CALLIGRA)
 calligra_define_product(FILTER_ODT_TO_MOBI "Mobi export filter" UNPORTED  =
REQUIRES LIB_CALLIGRA)
 calligra_define_product(FILTER_ODT_TO_EPUB2 "ODT Epub2 export filter" UNPO=
RTED  REQUIRES LIB_KOVECTORIMAGE LIB_CALLIGRA)
diff --git a/filters/words/ascii/AsciiExport.cpp b/filters/words/ascii/Asci=
iExport.cpp
index 138b735..f335b49 100644
--- a/filters/words/ascii/AsciiExport.cpp
+++ b/filters/words/ascii/AsciiExport.cpp
@@ -45,7 +45,9 @@
 =

 =

 K_PLUGIN_FACTORY(AsciiExportFactory, registerPlugin<AsciiExport>();)
-K_EXPORT_PLUGIN(AsciiExportFactory("wordsasciiexportng", "calligrafilters"=
))
+
+// Needed to instantiate the plugin factory.
+#include "AsciiExport.moc"
 =

 =

 AsciiExport::AsciiExport(QObject *parent, const QVariantList &)
[prev in list] [next in list] [prev in thread] [next in thread]