From kde-commits  Mon Mar 30 14:52:31 2015
From: Inge Wallin <inge () lysator ! liu ! se>
Date: Mon, 30 Mar 2015 14:52:31 +0000
To: kde-commits
Subject: [calligra/frameworks] filters/words/ascii: Port the odt2ascii filter to PLUGIN_WITH_JSON
Message-Id: <E1Ycb3H-0000VR-QX () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=142772716129224

Git commit ea44c9740d3bfcafdea64757fd21c759eaed0c2b by Inge Wallin.
Committed on 30/03/2015 at 02:07.
Pushed by ingwa into branch 'frameworks'.

Port the odt2ascii filter to PLUGIN_WITH_JSON

M  +2    -1    filters/words/ascii/AsciiExport.cpp
M  +1    -6    filters/words/ascii/CMakeLists.txt

http://commits.kde.org/calligra/ea44c9740d3bfcafdea64757fd21c759eaed0c2b

diff --git a/filters/words/ascii/AsciiExport.cpp b/filters/words/ascii/Asci=
iExport.cpp
index f335b49..914d4d2 100644
--- a/filters/words/ascii/AsciiExport.cpp
+++ b/filters/words/ascii/AsciiExport.cpp
@@ -44,7 +44,8 @@
 #include "OdfReaderAsciiContext.h"
 =

 =

-K_PLUGIN_FACTORY(AsciiExportFactory, registerPlugin<AsciiExport>();)
+K_PLUGIN_FACTORY_WITH_JSON(AsciiExportFactory, "calligra_filter_odt2ascii.=
json",
+			   registerPlugin<AsciiExport>();)
 =

 // Needed to instantiate the plugin factory.
 #include "AsciiExport.moc"
diff --git a/filters/words/ascii/CMakeLists.txt b/filters/words/ascii/CMake=
Lists.txt
index ec1fbd7..b368f30 100644
--- a/filters/words/ascii/CMakeLists.txt
+++ b/filters/words/ascii/CMakeLists.txt
@@ -34,13 +34,8 @@ add_library(calligra_filter_odt2ascii MODULE ${odt2ascii=
_PART_SRCS})
 target_link_libraries(calligra_filter_odt2ascii koodfreader komain koodf k=
oodf2)
 install(TARGETS calligra_filter_odt2ascii DESTINATION ${PLUGIN_INSTALL_DIR=
})
 =

-install( FILES calligra_filter_odt2ascii.desktop DESTINATION ${SERVICES_IN=
STALL_DIR}/calligra)
-
+kcoreaddons_desktop_to_json(calligra_filter_odt2ascii calligra_filter_odt2=
ascii.desktop)
 =

 install( PROGRAMS  calligrawords_ascii.desktop  DESTINATION ${XDG_APPS_INS=
TALL_DIR})
 =

 endif()
-
-
-
-