'[calligra/frameworks] krita/plugins: convert krita filters to json'

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

List:       kde-commits
Subject:    [calligra/frameworks] krita/plugins: convert krita filters to json
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2015-04-04 22:11:10
Message-ID: E1YeWHW-0005fw-HG () scm ! kde ! org
[Download RAW message or body]

Git commit 5a168de628e2782168a1c9dc4ebe556b8507f372 by Sven Langkamp.
Committed on 04/04/2015 at 22:09.
Pushed by langkamp into branch 'frameworks'.

convert krita filters to json

M  +1    -1    krita/plugins/filters/blur/CMakeLists.txt
M  +1    -2    krita/plugins/filters/blur/blur.cpp
M  +1    -0    krita/plugins/filters/colors/CMakeLists.txt
M  +1    -2    krita/plugins/filters/colors/colors.cpp
M  +1    -0    krita/plugins/filters/colorsfilters/CMakeLists.txt
M  +1    -2    krita/plugins/filters/colorsfilters/colorsfilters.cpp
M  +1    -1    krita/plugins/filters/convolutionfilters/CMakeLists.txt
M  +1    -2    krita/plugins/filters/convolutionfilters/convolutionfilters.=
cpp
M  +1    -0    krita/plugins/filters/dodgeburn/CMakeLists.txt
M  +1    -2    krita/plugins/filters/dodgeburn/DodgeBurnPlugin.cpp
M  +1    -1    krita/plugins/filters/embossfilter/CMakeLists.txt
M  +1    -2    krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.=
cpp
M  +1    -1    krita/plugins/filters/example/CMakeLists.txt
M  +1    -2    krita/plugins/filters/example/example.cpp
M  +1    -1    krita/plugins/filters/fastcolortransfer/CMakeLists.txt
M  +1    -2    krita/plugins/filters/fastcolortransfer/fastcolortransfer.cpp
M  +1    -1    krita/plugins/filters/imageenhancement/CMakeLists.txt
M  +1    -2    krita/plugins/filters/imageenhancement/imageenhancement.cpp
M  +1    -0    krita/plugins/filters/indexcolors/CMakeLists.txt
M  +1    -2    krita/plugins/filters/indexcolors/indexcolors.cpp
M  +1    -1    krita/plugins/filters/levelfilter/CMakeLists.txt
M  +1    -2    krita/plugins/filters/levelfilter/levelfilter.cpp
M  +1    -1    krita/plugins/filters/noisefilter/CMakeLists.txt
M  +1    -2    krita/plugins/filters/noisefilter/noisefilter.cpp
M  +1    -0    krita/plugins/filters/oilpaintfilter/CMakeLists.txt
M  +1    -2    krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plu=
gin.cpp
M  +1    -0    krita/plugins/filters/phongbumpmap/CMakeLists.txt
M  +1    -2    krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_plugin.=
cpp
M  +1    -1    krita/plugins/filters/pixelizefilter/CMakeLists.txt
M  +1    -2    krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plu=
gin.cpp
M  +1    -1    krita/plugins/filters/posterize/CMakeLists.txt
M  +1    -2    krita/plugins/filters/posterize/posterize.cpp
M  +1    -0    krita/plugins/filters/raindropsfilter/CMakeLists.txt
M  +1    -2    krita/plugins/filters/raindropsfilter/kis_raindrops_filter_p=
lugin.cpp
M  +1    -1    krita/plugins/filters/randompickfilter/CMakeLists.txt
M  +1    -2    krita/plugins/filters/randompickfilter/randompickfilter.cpp
M  +1    -1    krita/plugins/filters/roundcorners/CMakeLists.txt
M  +1    -2    krita/plugins/filters/roundcorners/kis_round_corners_filter_=
plugin.cpp
M  +1    -1    krita/plugins/filters/smalltilesfilter/CMakeLists.txt
M  +1    -2    krita/plugins/filters/smalltilesfilter/kis_small_tiles_filte=
r_plugin.cpp
M  +1    -1    krita/plugins/filters/sobelfilter/CMakeLists.txt
M  +1    -2    krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp
M  +1    -1    krita/plugins/filters/unsharp/CMakeLists.txt
M  +1    -2    krita/plugins/filters/unsharp/unsharp.cpp
M  +1    -1    krita/plugins/filters/wavefilter/CMakeLists.txt
M  +1    -2    krita/plugins/filters/wavefilter/wavefilter.cpp
M  +1    -0    krita/plugins/formats/xcf/CMakeLists.txt
M  +1    -2    krita/plugins/formats/xcf/kis_xcf_import.cpp

http://commits.kde.org/calligra/5a168de628e2782168a1c9dc4ebe556b8507f372

diff --git a/krita/plugins/filters/blur/CMakeLists.txt b/krita/plugins/filt=
ers/blur/CMakeLists.txt
index acb58b1..31dd93f 100644
--- a/krita/plugins/filters/blur/CMakeLists.txt
+++ b/krita/plugins/filters/blur/CMakeLists.txt
@@ -20,7 +20,7 @@ ki18n_wrap_ui(kritablurfilter_PART_SRCS
     )
 =

 add_library(kritablurfilter MODULE ${kritablurfilter_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritablurfilter kritablurfilter.desktop)
 =

 =

 target_link_libraries(kritablurfilter kritaui)
diff --git a/krita/plugins/filters/blur/blur.cpp b/krita/plugins/filters/bl=
ur/blur.cpp
index 7d0e4e1..2c14066 100644
--- a/krita/plugins/filters/blur/blur.cpp
+++ b/krita/plugins/filters/blur/blur.cpp
@@ -27,8 +27,7 @@
 #include "kis_lens_blur_filter.h"
 #include "filter/kis_filter_registry.h"
 =

-K_PLUGIN_FACTORY(BlurFilterPluginFactory, registerPlugin<BlurFilterPlugin>=
();)
-K_EXPORT_PLUGIN(BlurFilterPluginFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(BlurFilterPluginFactory, "kritablurfilter.json"=
, registerPlugin<BlurFilterPlugin>();)
 =

 BlurFilterPlugin::BlurFilterPlugin(QObject *parent, const QVariantList &)
         : QObject(parent)
diff --git a/krita/plugins/filters/colors/CMakeLists.txt b/krita/plugins/fi=
lters/colors/CMakeLists.txt
index a63f56c..ff04a41 100644
--- a/krita/plugins/filters/colors/CMakeLists.txt
+++ b/krita/plugins/filters/colors/CMakeLists.txt
@@ -13,6 +13,7 @@ ki18n_wrap_ui(kritaextensioncolorsfilters_PART_SRCS
     )
 =

 add_library(kritaextensioncolorsfilters MODULE ${kritaextensioncolorsfilte=
rs_PART_SRCS})
+kcoreaddons_desktop_to_json(kritaextensioncolorsfilters kritaextensioncolo=
rsfilters.desktop)
 =

 =

 =

diff --git a/krita/plugins/filters/colors/colors.cpp b/krita/plugins/filter=
s/colors/colors.cpp
index a8e039b..f93dfe5 100644
--- a/krita/plugins/filters/colors/colors.cpp
+++ b/krita/plugins/filters/colors/colors.cpp
@@ -25,8 +25,7 @@
 #include "kis_color_to_alpha.h"
 #include <filter/kis_filter_registry.h>
 =

-K_PLUGIN_FACTORY(KritaExtensionsColorsFactory, registerPlugin<KritaExtensi=
onsColors>();)
-K_EXPORT_PLUGIN(KritaExtensionsColorsFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KritaExtensionsColorsFactory, "kritaextensionco=
lorsfilters.json", registerPlugin<KritaExtensionsColors>();)
 =

 KritaExtensionsColors::KritaExtensionsColors(QObject *parent, const QVaria=
ntList &)
         : QObject(parent)
diff --git a/krita/plugins/filters/colorsfilters/CMakeLists.txt b/krita/plu=
gins/filters/colorsfilters/CMakeLists.txt
index cb65965..142de98 100644
--- a/krita/plugins/filters/colorsfilters/CMakeLists.txt
+++ b/krita/plugins/filters/colorsfilters/CMakeLists.txt
@@ -18,6 +18,7 @@ ki18n_wrap_ui(kritacolorsfilters_PART_SRCS
 )
 =

 add_library(kritacolorsfilters MODULE ${kritacolorsfilters_PART_SRCS})
+kcoreaddons_desktop_to_json(kritacolorsfilters kritacolorsfilter.desktop)
 =

 =

 =

diff --git a/krita/plugins/filters/colorsfilters/colorsfilters.cpp b/krita/=
plugins/filters/colorsfilters/colorsfilters.cpp
index 2dbd8c4..e57d376 100644
--- a/krita/plugins/filters/colorsfilters/colorsfilters.cpp
+++ b/krita/plugins/filters/colorsfilters/colorsfilters.cpp
@@ -62,8 +62,7 @@
 #include "kis_color_balance_filter.h"
 #include "kis_desaturate_filter.h"
 =

-K_PLUGIN_FACTORY(ColorsFiltersFactory, registerPlugin<ColorsFilters>();)
-K_EXPORT_PLUGIN(ColorsFiltersFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(ColorsFiltersFactory, "kritacolorsfilter.json",=
 registerPlugin<ColorsFilters>();)
 =

 ColorsFilters::ColorsFilters(QObject *parent, const QVariantList &)
         : QObject(parent)
diff --git a/krita/plugins/filters/convolutionfilters/CMakeLists.txt b/krit=
a/plugins/filters/convolutionfilters/CMakeLists.txt
index 71da354..9248292 100644
--- a/krita/plugins/filters/convolutionfilters/CMakeLists.txt
+++ b/krita/plugins/filters/convolutionfilters/CMakeLists.txt
@@ -5,7 +5,7 @@ set(kritaconvolutionfilters_PART_SRCS
 =

 =

 add_library(kritaconvolutionfilters MODULE ${kritaconvolutionfilters_PART_=
SRCS})
-
+kcoreaddons_desktop_to_json(kritaconvolutionfilters kritaconvolutionfilter=
s.desktop)
 =

 =

 target_link_libraries(kritaconvolutionfilters kritaui)
diff --git a/krita/plugins/filters/convolutionfilters/convolutionfilters.cp=
p b/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp
index 24d5efd..7e511d1 100644
--- a/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp
+++ b/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp
@@ -38,8 +38,7 @@
 =

 using namespace Eigen;
 =

-K_PLUGIN_FACTORY(KritaConvolutionFiltersFactory, registerPlugin<KritaConvo=
lutionFilters>();)
-K_EXPORT_PLUGIN(KritaConvolutionFiltersFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KritaConvolutionFiltersFactory, "kritaconvoluti=
onfilters.json", registerPlugin<KritaConvolutionFilters>();)
 =

 KritaConvolutionFilters::KritaConvolutionFilters(QObject *parent, const QV=
ariantList &)
         : QObject(parent)
diff --git a/krita/plugins/filters/dodgeburn/CMakeLists.txt b/krita/plugins=
/filters/dodgeburn/CMakeLists.txt
index 89dabbf..dd2f9dc 100644
--- a/krita/plugins/filters/dodgeburn/CMakeLists.txt
+++ b/krita/plugins/filters/dodgeburn/CMakeLists.txt
@@ -7,6 +7,7 @@ ki18n_wrap_ui(kritadodgeburn_PART_SRCS
     )
 =

 add_library(kritadodgeburn MODULE ${kritadodgeburn_PART_SRCS})
+kcoreaddons_desktop_to_json(kritadodgeburn kritadodgeburn.desktop)
 =

 target_link_libraries(kritadodgeburn kritaui)
 =

diff --git a/krita/plugins/filters/dodgeburn/DodgeBurnPlugin.cpp b/krita/pl=
ugins/filters/dodgeburn/DodgeBurnPlugin.cpp
index 143a467..4f1dc7d 100644
--- a/krita/plugins/filters/dodgeburn/DodgeBurnPlugin.cpp
+++ b/krita/plugins/filters/dodgeburn/DodgeBurnPlugin.cpp
@@ -22,8 +22,7 @@
 =

 #include "DodgeBurn.h"
 =

-K_PLUGIN_FACTORY(DodgeBurnPluginFactory, registerPlugin<DodgeBurnPlugin>()=
;)
-K_EXPORT_PLUGIN(DodgeBurnPluginFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(DodgeBurnPluginFactory, "kritadodgeburn.json", =
registerPlugin<DodgeBurnPlugin>();)
 =

 DodgeBurnPlugin::DodgeBurnPlugin(QObject *parent, const QVariantList &)
 {
diff --git a/krita/plugins/filters/embossfilter/CMakeLists.txt b/krita/plug=
ins/filters/embossfilter/CMakeLists.txt
index ccb355b..8c80548 100644
--- a/krita/plugins/filters/embossfilter/CMakeLists.txt
+++ b/krita/plugins/filters/embossfilter/CMakeLists.txt
@@ -3,7 +3,7 @@ set(kritaembossfilter_PART_SRCS kis_emboss_filter_plugin.cp=
p kis_emboss_filter.c
 =

 =

 add_library(kritaembossfilter MODULE ${kritaembossfilter_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritaembossfilter kritaembossfilter.desktop)
 =

 =

 target_link_libraries(kritaembossfilter kritaui)
diff --git a/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.cp=
p b/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.cpp
index f05be65..23b155f 100644
--- a/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.cpp
+++ b/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.cpp
@@ -25,8 +25,7 @@
 #include "kis_global.h"
 #include "filter/kis_filter_registry.h"
 =

-K_PLUGIN_FACTORY(KisEmbossFilterPluginFactory, registerPlugin<KisEmbossFil=
terPlugin>();)
-K_EXPORT_PLUGIN(KisEmbossFilterPluginFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KisEmbossFilterPluginFactory, "kritaembossfilte=
r.json", registerPlugin<KisEmbossFilterPlugin>();)
 =

 KisEmbossFilterPlugin::KisEmbossFilterPlugin(QObject *parent, const QVaria=
ntList &) : QObject(parent)
 {
diff --git a/krita/plugins/filters/example/CMakeLists.txt b/krita/plugins/f=
ilters/example/CMakeLists.txt
index 7e93d62..e2ceba7 100644
--- a/krita/plugins/filters/example/CMakeLists.txt
+++ b/krita/plugins/filters/example/CMakeLists.txt
@@ -3,7 +3,7 @@
 set(kritaexample_PART_SRCS example.cpp )
 =

 add_library(kritaexample MODULE ${kritaexample_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritaexample kritaexample.desktop)
 =

 =

 target_link_libraries(kritaexample kritaui)
diff --git a/krita/plugins/filters/example/example.cpp b/krita/plugins/filt=
ers/example/example.cpp
index 16d1bc8..5614c63 100644
--- a/krita/plugins/filters/example/example.cpp
+++ b/krita/plugins/filters/example/example.cpp
@@ -36,8 +36,7 @@
 #include <filter/kis_filter_registry.h>
 #include <kis_global.h>
 =

-K_PLUGIN_FACTORY(KritaExampleFactory, registerPlugin<KritaExample>();)
-K_EXPORT_PLUGIN(KritaExampleFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KritaExampleFactory, "kritaexample.json", regis=
terPlugin<KritaExample>();)
 =

 KritaExample::KritaExample(QObject *parent, const QVariantList &)
         : QObject(parent)
diff --git a/krita/plugins/filters/fastcolortransfer/CMakeLists.txt b/krita=
/plugins/filters/fastcolortransfer/CMakeLists.txt
index 5954111..6dd6950 100644
--- a/krita/plugins/filters/fastcolortransfer/CMakeLists.txt
+++ b/krita/plugins/filters/fastcolortransfer/CMakeLists.txt
@@ -11,7 +11,7 @@ ki18n_wrap_ui(kritafastcolortransferfilter_PART_SRCS
     )
 =

 add_library(kritafastcolortransferfilter MODULE ${kritafastcolortransferfi=
lter_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritafastcolortransferfilter kritafastcolortra=
nsfer.desktop)
 =

 =

 target_link_libraries(kritafastcolortransferfilter kritaui)
diff --git a/krita/plugins/filters/fastcolortransfer/fastcolortransfer.cpp =
b/krita/plugins/filters/fastcolortransfer/fastcolortransfer.cpp
index b96334d..813e1c0 100644
--- a/krita/plugins/filters/fastcolortransfer/fastcolortransfer.cpp
+++ b/krita/plugins/filters/fastcolortransfer/fastcolortransfer.cpp
@@ -40,8 +40,7 @@
 #include "ui_wdgfastcolortransfer.h"
 #include <kis_iterator_ng.h>
 =

-K_PLUGIN_FACTORY(KritaFastColorTransferFactory, registerPlugin<FastColorTr=
ansferPlugin>();)
-K_EXPORT_PLUGIN(KritaFastColorTransferFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KritaFastColorTransferFactory, "kritafastcolort=
ransfer.json", registerPlugin<FastColorTransferPlugin>();)
 =

 =

 FastColorTransferPlugin::FastColorTransferPlugin(QObject *parent, const QV=
ariantList &)
diff --git a/krita/plugins/filters/imageenhancement/CMakeLists.txt b/krita/=
plugins/filters/imageenhancement/CMakeLists.txt
index 1a4b8fc..480e5bc 100644
--- a/krita/plugins/filters/imageenhancement/CMakeLists.txt
+++ b/krita/plugins/filters/imageenhancement/CMakeLists.txt
@@ -8,7 +8,7 @@ set(kritaimageenhancement_PART_SRCS
     )
 =

 add_library(kritaimageenhancement MODULE ${kritaimageenhancement_PART_SRCS=
})
-
+kcoreaddons_desktop_to_json(kritaimageenhancement kritaimageenhancement.de=
sktop)
 =

 =

 target_link_libraries(kritaimageenhancement kritaui)
diff --git a/krita/plugins/filters/imageenhancement/imageenhancement.cpp b/=
krita/plugins/filters/imageenhancement/imageenhancement.cpp
index 33831971..7c077c3 100644
--- a/krita/plugins/filters/imageenhancement/imageenhancement.cpp
+++ b/krita/plugins/filters/imageenhancement/imageenhancement.cpp
@@ -38,8 +38,7 @@
 #include "kis_simple_noise_reducer.h"
 #include "kis_wavelet_noise_reduction.h"
 =

-K_PLUGIN_FACTORY(KritaImageEnhancementFactory, registerPlugin<KritaImageEn=
hancement>();)
-K_EXPORT_PLUGIN(KritaImageEnhancementFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KritaImageEnhancementFactory, "kritaimageenhanc=
ement.json", registerPlugin<KritaImageEnhancement>();)
 =

 KritaImageEnhancement::KritaImageEnhancement(QObject *parent, const QVaria=
ntList &)
         : QObject(parent)
diff --git a/krita/plugins/filters/indexcolors/CMakeLists.txt b/krita/plugi=
ns/filters/indexcolors/CMakeLists.txt
index 63adcef..0f0acde 100644
--- a/krita/plugins/filters/indexcolors/CMakeLists.txt
+++ b/krita/plugins/filters/indexcolors/CMakeLists.txt
@@ -3,6 +3,7 @@ set(INDEXCOLORS_SOURCE kiswdgindexcolors.cpp indexcolors.cp=
p indexcolorpalette.c
 ki18n_wrap_ui(INDEXCOLORS_SOURCE kiswdgindexcolors.ui)
 =

 add_library(kritaindexcolors MODULE ${INDEXCOLORS_SOURCE})
+kcoreaddons_desktop_to_json(kritaindexcolors kritaindexcolors.desktop)
 target_link_libraries(kritaindexcolors kritaui)
 =

 install(TARGETS kritaindexcolors          DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
diff --git a/krita/plugins/filters/indexcolors/indexcolors.cpp b/krita/plug=
ins/filters/indexcolors/indexcolors.cpp
index cd23ec7..f91c578 100644
--- a/krita/plugins/filters/indexcolors/indexcolors.cpp
+++ b/krita/plugins/filters/indexcolors/indexcolors.cpp
@@ -33,8 +33,7 @@
 #include "kiswdgindexcolors.h"
 #include "palettegeneratorconfig.h"
 =

-K_PLUGIN_FACTORY(IndexColorsFactory, registerPlugin<IndexColors>();)
-K_EXPORT_PLUGIN(IndexColorsFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(IndexColorsFactory, "kritaindexcolors.json", re=
gisterPlugin<IndexColors>();)
 =

 IndexColors::IndexColors(QObject *parent, const QVariantList &)
     : QObject(parent)
diff --git a/krita/plugins/filters/levelfilter/CMakeLists.txt b/krita/plugi=
ns/filters/levelfilter/CMakeLists.txt
index 2dc27bf..be58abf 100644
--- a/krita/plugins/filters/levelfilter/CMakeLists.txt
+++ b/krita/plugins/filters/levelfilter/CMakeLists.txt
@@ -8,7 +8,7 @@ ki18n_wrap_ui(kritalevelfilter_PART_SRCS
     )
 =

 add_library(kritalevelfilter MODULE ${kritalevelfilter_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritalevelfilter kritalevelfilter.desktop)
 =

 =

 target_link_libraries(kritalevelfilter kritaui)
diff --git a/krita/plugins/filters/levelfilter/levelfilter.cpp b/krita/plug=
ins/filters/levelfilter/levelfilter.cpp
index de1f442..9e99761 100644
--- a/krita/plugins/filters/levelfilter/levelfilter.cpp
+++ b/krita/plugins/filters/levelfilter/levelfilter.cpp
@@ -25,8 +25,7 @@
 #include "kis_level_filter.h"
 #include "filter/kis_filter_registry.h"
 =

-K_PLUGIN_FACTORY(LevelFilterFactory, registerPlugin<LevelFilter>();)
-K_EXPORT_PLUGIN(LevelFilterFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(LevelFilterFactory, "kritalevelfilter.json", re=
gisterPlugin<LevelFilter>();)
 =

 LevelFilter::LevelFilter(QObject *parent, const QVariantList &)
         : QObject(parent)
diff --git a/krita/plugins/filters/noisefilter/CMakeLists.txt b/krita/plugi=
ns/filters/noisefilter/CMakeLists.txt
index 5c9b270..8d28149 100644
--- a/krita/plugins/filters/noisefilter/CMakeLists.txt
+++ b/krita/plugins/filters/noisefilter/CMakeLists.txt
@@ -11,7 +11,7 @@ ki18n_wrap_ui(kritanoisefilter_PART_SRCS
     )
 =

 add_library(kritanoisefilter MODULE ${kritanoisefilter_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritanoisefilter kritanoisefilter.desktop)
 =

 =

 target_link_libraries(kritanoisefilter kritaui)
diff --git a/krita/plugins/filters/noisefilter/noisefilter.cpp b/krita/plug=
ins/filters/noisefilter/noisefilter.cpp
index 8c4e69c..a06fec2 100644
--- a/krita/plugins/filters/noisefilter/noisefilter.cpp
+++ b/krita/plugins/filters/noisefilter/noisefilter.cpp
@@ -48,8 +48,7 @@
 #include <kis_iterator_ng.h>
 =

 =

-K_PLUGIN_FACTORY(KritaNoiseFilterFactory, registerPlugin<KritaNoiseFilter>=
();)
-K_EXPORT_PLUGIN(KritaNoiseFilterFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KritaNoiseFilterFactory, "kritanoisefilter.json=
", registerPlugin<KritaNoiseFilter>();)
 =

 KritaNoiseFilter::KritaNoiseFilter(QObject *parent, const QVariantList &)
         : QObject(parent)
diff --git a/krita/plugins/filters/oilpaintfilter/CMakeLists.txt b/krita/pl=
ugins/filters/oilpaintfilter/CMakeLists.txt
index 0ab81c7..2a1410b 100644
--- a/krita/plugins/filters/oilpaintfilter/CMakeLists.txt
+++ b/krita/plugins/filters/oilpaintfilter/CMakeLists.txt
@@ -3,6 +3,7 @@ set(kritaoilpaintfilter_PART_SRCS kis_oilpaint_filter_plugi=
n.cpp kis_oilpaint_fi
 =

 =

 add_library(kritaoilpaintfilter MODULE ${kritaoilpaintfilter_PART_SRCS})
+kcoreaddons_desktop_to_json(kritaoilpaintfilter kritaoilpaintfilter.deskto=
p)
 =

 =

 =

diff --git a/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugi=
n.cpp b/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cpp
index 4632795..d988fd2 100644
--- a/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cpp
+++ b/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cpp
@@ -26,8 +26,7 @@
 #include "kis_global.h"
 #include "filter/kis_filter_registry.h"
 =

-K_PLUGIN_FACTORY(KisOilPaintFilterPluginFactory, registerPlugin<KisOilPain=
tFilterPlugin>();)
-K_EXPORT_PLUGIN(KisOilPaintFilterPluginFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KisOilPaintFilterPluginFactory, "kritaoilpaintf=
ilter.json", registerPlugin<KisOilPaintFilterPlugin>();)
 =

 KisOilPaintFilterPlugin::KisOilPaintFilterPlugin(QObject *parent, const QV=
ariantList &) : QObject(parent)
 {
diff --git a/krita/plugins/filters/phongbumpmap/CMakeLists.txt b/krita/plug=
ins/filters/phongbumpmap/CMakeLists.txt
index f6a2cea..9028cdc 100644
--- a/krita/plugins/filters/phongbumpmap/CMakeLists.txt
+++ b/krita/plugins/filters/phongbumpmap/CMakeLists.txt
@@ -8,6 +8,7 @@ set(kritaphongbumpmap_PART_SRCS
 ki18n_wrap_ui(kritaphongbumpmap_PART_SRCS wdgphongbumpmap.ui)
 =

 add_library(kritaphongbumpmap MODULE ${kritaphongbumpmap_PART_SRCS})
+kcoreaddons_desktop_to_json(kritaphongbumpmap kritaphongbumpmapfilter.desk=
top)
 =

 target_link_libraries(kritaphongbumpmap kritaui)
 =

diff --git a/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_plugin.cp=
p b/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_plugin.cpp
index b6ee21d..64d4096 100644
--- a/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_plugin.cpp
+++ b/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_plugin.cpp
@@ -22,8 +22,7 @@
 #include <kpluginfactory.h>
 #include <filter/kis_filter_registry.h>
 =

-K_PLUGIN_FACTORY (KisPhongBumpmapFactory, registerPlugin<KisPhongBumpmapPl=
ugin>();)
-K_EXPORT_PLUGIN (KisPhongBumpmapFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KisPhongBumpmapFactory, "kritaphongbumpmapfilte=
r.json", registerPlugin<KisPhongBumpmapPlugin>();)
 =

 KisPhongBumpmapPlugin::KisPhongBumpmapPlugin(QObject *parent, const QVaria=
ntList &)
         : QObject(parent)
diff --git a/krita/plugins/filters/pixelizefilter/CMakeLists.txt b/krita/pl=
ugins/filters/pixelizefilter/CMakeLists.txt
index b8b12f4..9bad1a3 100644
--- a/krita/plugins/filters/pixelizefilter/CMakeLists.txt
+++ b/krita/plugins/filters/pixelizefilter/CMakeLists.txt
@@ -3,7 +3,7 @@ set(kritapixelizefilter_PART_SRCS kis_pixelize_filter_plugi=
n.cpp kis_pixelize_fi
 =

 =

 add_library(kritapixelizefilter MODULE ${kritapixelizefilter_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritapixelizefilter kritapixelizefilter.deskto=
p)
 =

 =

 target_link_libraries(kritapixelizefilter kritaui)
diff --git a/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugi=
n.cpp b/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cpp
index 5e9d62d..b04e6fb 100644
--- a/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cpp
+++ b/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cpp
@@ -29,8 +29,7 @@
 =

 #include "kis_pixelize_filter.h"
 =

-K_PLUGIN_FACTORY(KisPixelizeFilterPluginFactory, registerPlugin<KisPixeliz=
eFilterPlugin>();)
-K_EXPORT_PLUGIN(KisPixelizeFilterPluginFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KisPixelizeFilterPluginFactory, "kritapixelizef=
ilter.json", registerPlugin<KisPixelizeFilterPlugin>();)
 =

 KisPixelizeFilterPlugin::KisPixelizeFilterPlugin(QObject *parent, const QV=
ariantList &)
         : QObject(parent)
diff --git a/krita/plugins/filters/posterize/CMakeLists.txt b/krita/plugins=
/filters/posterize/CMakeLists.txt
index 13bb920..9e92e00 100644
--- a/krita/plugins/filters/posterize/CMakeLists.txt
+++ b/krita/plugins/filters/posterize/CMakeLists.txt
@@ -3,7 +3,7 @@
 set(kritaposterize_PART_SRCS posterize.cpp )
 =

 add_library(kritaposterize MODULE ${kritaposterize_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritaposterize kritaposterize.desktop)
 =

 =

 target_link_libraries(kritaposterize kritaui)
diff --git a/krita/plugins/filters/posterize/posterize.cpp b/krita/plugins/=
filters/posterize/posterize.cpp
index ac9a124..52167f2 100644
--- a/krita/plugins/filters/posterize/posterize.cpp
+++ b/krita/plugins/filters/posterize/posterize.cpp
@@ -39,8 +39,7 @@
 #include <filter/kis_filter_configuration.h>
 #include <widgets/kis_multi_integer_filter_widget.h>
 =

-K_PLUGIN_FACTORY(PosterizeFactory, registerPlugin<Posterize>();)
-K_EXPORT_PLUGIN(PosterizeFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(PosterizeFactory, "kritaposterize.json", regist=
erPlugin<Posterize>();)
 =

 Posterize::Posterize(QObject *parent, const QVariantList &)
     : QObject(parent)
diff --git a/krita/plugins/filters/raindropsfilter/CMakeLists.txt b/krita/p=
lugins/filters/raindropsfilter/CMakeLists.txt
index 101ae71..4f41148 100644
--- a/krita/plugins/filters/raindropsfilter/CMakeLists.txt
+++ b/krita/plugins/filters/raindropsfilter/CMakeLists.txt
@@ -3,6 +3,7 @@ set(kritaraindropsfilter_PART_SRCS kis_raindrops_filter_plu=
gin.cpp kis_raindrops
 =

 =

 add_library(kritaraindropsfilter MODULE ${kritaraindropsfilter_PART_SRCS})
+kcoreaddons_desktop_to_json(kritaraindropsfilter kritaraindropsfilter.desk=
top)
 =

 =

 =

diff --git a/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plu=
gin.cpp b/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin=
.cpp
index 8f14ee2..14b2f7b 100644
--- a/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cpp
+++ b/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cpp
@@ -27,8 +27,7 @@
 =

 #include "kis_raindrops_filter.h"
 =

-K_PLUGIN_FACTORY(KisRainDropsFilterPluginFactory, registerPlugin<KisRainDr=
opsFilterPlugin>();)
-K_EXPORT_PLUGIN(KisRainDropsFilterPluginFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KisRainDropsFilterPluginFactory, "kritaraindrop=
sfilter.json", registerPlugin<KisRainDropsFilterPlugin>();)
 =

 KisRainDropsFilterPlugin::KisRainDropsFilterPlugin(QObject *parent, const =
QVariantList &) : QObject(parent)
 {
diff --git a/krita/plugins/filters/randompickfilter/CMakeLists.txt b/krita/=
plugins/filters/randompickfilter/CMakeLists.txt
index 0938496..86d19ba 100644
--- a/krita/plugins/filters/randompickfilter/CMakeLists.txt
+++ b/krita/plugins/filters/randompickfilter/CMakeLists.txt
@@ -11,7 +11,7 @@ ki18n_wrap_ui(kritarandompickfilter_PART_SRCS
     )
 =

 add_library(kritarandompickfilter MODULE ${kritarandompickfilter_PART_SRCS=
})
-
+kcoreaddons_desktop_to_json(kritarandompickfilter kritarandompickfilter.de=
sktop)
 =

 =

 target_link_libraries(kritarandompickfilter kritaui)
diff --git a/krita/plugins/filters/randompickfilter/randompickfilter.cpp b/=
krita/plugins/filters/randompickfilter/randompickfilter.cpp
index e2cabc6..f17e1ac 100644
--- a/krita/plugins/filters/randompickfilter/randompickfilter.cpp
+++ b/krita/plugins/filters/randompickfilter/randompickfilter.cpp
@@ -49,8 +49,7 @@
 #include "ui_wdgrandompickoptions.h"
 #include <kis_iterator_ng.h>
 =

-K_PLUGIN_FACTORY(KritaRandomPickFilterFactory, registerPlugin<KritaRandomP=
ickFilter>();)
-K_EXPORT_PLUGIN(KritaRandomPickFilterFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KritaRandomPickFilterFactory, "kritarandompickf=
ilter.json", registerPlugin<KritaRandomPickFilter>();)
 =

 KritaRandomPickFilter::KritaRandomPickFilter(QObject *parent, const QVaria=
ntList &)
         : QObject(parent)
diff --git a/krita/plugins/filters/roundcorners/CMakeLists.txt b/krita/plug=
ins/filters/roundcorners/CMakeLists.txt
index 877e25c..e5a17dd 100644
--- a/krita/plugins/filters/roundcorners/CMakeLists.txt
+++ b/krita/plugins/filters/roundcorners/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(kritaroundcornersfilter_PART_SRCS kis_round_corners_filter_plugin.cpp =
kis_round_corners_filter.cpp )
 =

 add_library(kritaroundcornersfilter MODULE ${kritaroundcornersfilter_PART_=
SRCS})
-
+kcoreaddons_desktop_to_json(kritaroundcornersfilter kritaroundcornersfilte=
r.desktop)
 =

 =

 target_link_libraries(kritaroundcornersfilter kritaui)
diff --git a/krita/plugins/filters/roundcorners/kis_round_corners_filter_pl=
ugin.cpp b/krita/plugins/filters/roundcorners/kis_round_corners_filter_plug=
in.cpp
index 8f45935..dcec16e 100644
--- a/krita/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cpp
+++ b/krita/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cpp
@@ -26,8 +26,7 @@
 #include "kis_global.h"
 #include "filter/kis_filter_registry.h"
 =

-K_PLUGIN_FACTORY(KisRoundCornersFilterPluginFactory, registerPlugin<KisRou=
ndCornersFilterPlugin>();)
-K_EXPORT_PLUGIN(KisRoundCornersFilterPluginFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KisRoundCornersFilterPluginFactory, "kritaround=
cornersfilter.json", registerPlugin<KisRoundCornersFilterPlugin>();)
 =

 KisRoundCornersFilterPlugin::KisRoundCornersFilterPlugin(QObject *parent, =
const QVariantList &)
         : QObject(parent)
diff --git a/krita/plugins/filters/smalltilesfilter/CMakeLists.txt b/krita/=
plugins/filters/smalltilesfilter/CMakeLists.txt
index 016fe0f..ab3598b 100644
--- a/krita/plugins/filters/smalltilesfilter/CMakeLists.txt
+++ b/krita/plugins/filters/smalltilesfilter/CMakeLists.txt
@@ -3,7 +3,7 @@ set(kritasmalltilesfilter_PART_SRCS kis_small_tiles_filter_=
plugin.cpp kis_small_
 =

 =

 add_library(kritasmalltilesfilter MODULE ${kritasmalltilesfilter_PART_SRCS=
})
-
+kcoreaddons_desktop_to_json(kritasmalltilesfilter kritasmalltilesfilter.de=
sktop)
 =

 =

 target_link_libraries(kritasmalltilesfilter kritaui)
diff --git a/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_=
plugin.cpp b/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_=
plugin.cpp
index e88e2ac..b986fcd 100644
--- a/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.=
cpp
+++ b/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.=
cpp
@@ -26,8 +26,7 @@
 #include "kis_global.h"
 #include "filter/kis_filter_registry.h"
 =

-K_PLUGIN_FACTORY(KisSmallTilesFilterPluginFactory, registerPlugin<KisSmall=
TilesFilterPlugin>();)
-K_EXPORT_PLUGIN(KisSmallTilesFilterPluginFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KisSmallTilesFilterPluginFactory, "kritasmallti=
lesfilter.json", registerPlugin<KisSmallTilesFilterPlugin>();)
 =

 KisSmallTilesFilterPlugin::KisSmallTilesFilterPlugin(QObject *parent, cons=
t QVariantList &)
         : QObject(parent)
diff --git a/krita/plugins/filters/sobelfilter/CMakeLists.txt b/krita/plugi=
ns/filters/sobelfilter/CMakeLists.txt
index 5af402e..713a2a0 100644
--- a/krita/plugins/filters/sobelfilter/CMakeLists.txt
+++ b/krita/plugins/filters/sobelfilter/CMakeLists.txt
@@ -9,7 +9,7 @@ set(kritasobelfilter_PART_SRCS kis_sobel_filter_plugin.cpp =
kis_sobel_filter.cpp
 =

 =

 add_library(kritasobelfilter MODULE ${kritasobelfilter_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritasobelfilter kritasobelfilter.desktop)
 =

 =

 target_link_libraries(kritasobelfilter kritaui)
diff --git a/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp =
b/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp
index ce83be6..0d453e5 100644
--- a/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp
+++ b/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp
@@ -26,8 +26,7 @@
 #include "filter/kis_filter_registry.h"
 #include "kis_global.h"
 =

-K_PLUGIN_FACTORY(KisSobelFilterPluginFactory, registerPlugin<KisSobelFilte=
rPlugin>();)
-K_EXPORT_PLUGIN(KisSobelFilterPluginFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KisSobelFilterPluginFactory, "kritasobelfilter.=
json", registerPlugin<KisSobelFilterPlugin>();)
 =

 KisSobelFilterPlugin::KisSobelFilterPlugin(QObject *parent, const QVariant=
List &)
         : QObject(parent)
diff --git a/krita/plugins/filters/unsharp/CMakeLists.txt b/krita/plugins/f=
ilters/unsharp/CMakeLists.txt
index 7de4a75..267d442 100644
--- a/krita/plugins/filters/unsharp/CMakeLists.txt
+++ b/krita/plugins/filters/unsharp/CMakeLists.txt
@@ -11,7 +11,7 @@ ki18n_wrap_ui(kritaunsharpfilter_PART_SRCS
     )
 =

 add_library(kritaunsharpfilter MODULE ${kritaunsharpfilter_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritaunsharpfilter kritaunsharpfilter.desktop)
 =

 =

 target_link_libraries(kritaunsharpfilter kritaui)
diff --git a/krita/plugins/filters/unsharp/unsharp.cpp b/krita/plugins/filt=
ers/unsharp/unsharp.cpp
index c9445e1..a829881 100644
--- a/krita/plugins/filters/unsharp/unsharp.cpp
+++ b/krita/plugins/filters/unsharp/unsharp.cpp
@@ -25,8 +25,7 @@
 =

 #include <filter/kis_filter_registry.h>
 =

-K_PLUGIN_FACTORY(UnsharpPluginFactory, registerPlugin<UnsharpPlugin>();)
-K_EXPORT_PLUGIN(UnsharpPluginFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(UnsharpPluginFactory, "kritaunsharpfilter.json"=
, registerPlugin<UnsharpPlugin>();)
 =

 UnsharpPlugin::UnsharpPlugin(QObject *parent, const QVariantList &)
         : QObject(parent)
diff --git a/krita/plugins/filters/wavefilter/CMakeLists.txt b/krita/plugin=
s/filters/wavefilter/CMakeLists.txt
index 325dedf..a65beb3 100644
--- a/krita/plugins/filters/wavefilter/CMakeLists.txt
+++ b/krita/plugins/filters/wavefilter/CMakeLists.txt
@@ -11,7 +11,7 @@ ki18n_wrap_ui(kritawavefilter_PART_SRCS
     )
 =

 add_library(kritawavefilter MODULE ${kritawavefilter_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritawavefilter kritawavefilter.desktop)
 =

 =

 target_link_libraries(kritawavefilter kritaui)
diff --git a/krita/plugins/filters/wavefilter/wavefilter.cpp b/krita/plugin=
s/filters/wavefilter/wavefilter.cpp
index 780c971..58be445 100644
--- a/krita/plugins/filters/wavefilter/wavefilter.cpp
+++ b/krita/plugins/filters/wavefilter/wavefilter.cpp
@@ -45,8 +45,7 @@
 #include "ui_wdgwaveoptions.h"
 #include <kis_iterator_ng.h>
 =

-K_PLUGIN_FACTORY(KritaWaveFilterFactory, registerPlugin<KritaWaveFilter>()=
;)
-K_EXPORT_PLUGIN(KritaWaveFilterFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KritaWaveFilterFactory, "kritawavefilter.json",=
 registerPlugin<KritaWaveFilter>();)
 =

 class KisWaveCurve
 {
diff --git a/krita/plugins/formats/xcf/CMakeLists.txt b/krita/plugins/forma=
ts/xcf/CMakeLists.txt
index a9d9f43..e89a4dc 100644
--- a/krita/plugins/formats/xcf/CMakeLists.txt
+++ b/krita/plugins/formats/xcf/CMakeLists.txt
@@ -19,6 +19,7 @@ set(kritaxcfimport_PART_SRCS
     )
 =

 add_library(kritaxcfimport MODULE ${kritaxcfimport_PART_SRCS})
+kcoreaddons_desktop_to_json(kritaxcfimport krita_xcf_import.desktop)
 =

 target_link_libraries(kritaxcfimport kritaui )
 =

diff --git a/krita/plugins/formats/xcf/kis_xcf_import.cpp b/krita/plugins/f=
ormats/xcf/kis_xcf_import.cpp
index 5f8b522..a19f6a9 100644
--- a/krita/plugins/formats/xcf/kis_xcf_import.cpp
+++ b/krita/plugins/formats/xcf/kis_xcf_import.cpp
@@ -62,8 +62,7 @@ extern "C" {
 #define GET_ALPHA(x) (x >> ALPHA_SHIFT)
 }
 =

-K_PLUGIN_FACTORY(XCFImportFactory, registerPlugin<KisXCFImport>();)
-K_EXPORT_PLUGIN(XCFImportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(XCFImportFactory, "krita_xcf_import.json", regi=
sterPlugin<KisXCFImport>();)
 =

 KisXCFImport::KisXCFImport(QObject *parent, const QVariantList &) : KisImp=
ortExportFilter(parent)
 {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic