'[calligra/frameworks] krita/plugins: make missing Krita plugins build and convert to json'

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

List:       kde-commits
Subject:    [calligra/frameworks] krita/plugins: make missing Krita plugins build and convert to json
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2015-04-05 19:55:10
Message-ID: E1YeqdS-0000Ie-0h () scm ! kde ! org
[Download RAW message or body]

Git commit f8030beec29e47b51672154f6a634c8e008518f5 by Sven Langkamp.
Committed on 05/04/2015 at 19:54.
Pushed by langkamp into branch 'frameworks'.

make missing Krita plugins build and convert to json

M  +1    -0    krita/plugins/colorspaces/extensions/CMakeLists.txt
M  +1    -2    krita/plugins/colorspaces/extensions/extensions_plugin.cc
M  +4    -4    krita/plugins/extensions/dockers/CMakeLists.txt
M  +3    -1    krita/plugins/extensions/dockers/artisticcolorselector/artis=
ticcolorselector_plugin.cpp
M  +1    -1    krita/plugins/extensions/dockers/colorslider/kis_color_slide=
r.cpp
M  +2    -0    krita/plugins/extensions/dockers/imagedocker/imagedocker.cpp
M  +1    -1    krita/plugins/extensions/dockers/specificcolorselector/speci=
ficcolorselector.cc
M  +1    -0    krita/plugins/formats/odg/CMakeLists.txt
M  +1    -2    krita/plugins/formats/odg/kis_odg_import.cc
M  +2    -1    krita/plugins/formats/ora/CMakeLists.txt
M  +1    -2    krita/plugins/formats/ora/ora_export.cc
M  +1    -2    krita/plugins/formats/ora/ora_import.cc
M  +3    -0    krita/plugins/formats/psd/CMakeLists.txt
M  +1    -2    krita/plugins/formats/psd/psd_export.cc
M  +1    -2    krita/plugins/formats/psd/psd_import.cc
M  +1    -0    krita/plugins/formats/qml/CMakeLists.txt
M  +1    -2    krita/plugins/formats/qml/qml_export.cc
M  +2    -0    krita/plugins/formats/tga/CMakeLists.txt
M  +1    -2    krita/plugins/formats/tga/kis_tga_export.cpp
M  +1    -2    krita/plugins/formats/tga/kis_tga_import.cpp
M  +1    -1    krita/plugins/generators/pattern/CMakeLists.txt
M  +1    -2    krita/plugins/generators/pattern/patterngenerator.cpp
M  +1    -1    krita/plugins/generators/solid/CMakeLists.txt
M  +1    -2    krita/plugins/generators/solid/colorgenerator.cpp

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

diff --git a/krita/plugins/colorspaces/extensions/CMakeLists.txt b/krita/pl=
ugins/colorspaces/extensions/CMakeLists.txt
index f3aaf99..6dbad58 100644
--- a/krita/plugins/colorspaces/extensions/CMakeLists.txt
+++ b/krita/plugins/colorspaces/extensions/CMakeLists.txt
@@ -12,6 +12,7 @@ set( extensions_plugin_PART_SRCS
 )
 =

 add_library(krita_colorspaces_extensions MODULE ${extensions_plugin_PART_S=
RCS} )
+kcoreaddons_desktop_to_json(krita_colorspaces_extensions krita_colorspaces=
_extensions_plugin.desktop)
 =

 target_link_libraries(krita_colorspaces_extensions pigmentcms ${OPENEXR_LI=
BRARIES})
 =

diff --git a/krita/plugins/colorspaces/extensions/extensions_plugin.cc b/kr=
ita/plugins/colorspaces/extensions/extensions_plugin.cc
index f2713c4..ba962eb 100644
--- a/krita/plugins/colorspaces/extensions/extensions_plugin.cc
+++ b/krita/plugins/colorspaces/extensions/extensions_plugin.cc
@@ -33,8 +33,7 @@
 #include "kis_color_balance_adjustment.h"
 #include "kis_desaturate_adjustment.h"
 =

-K_PLUGIN_FACTORY(ExtensionsPluginFactory, registerPlugin<ExtensionsPlugin>=
();)
-K_EXPORT_PLUGIN(ExtensionsPluginFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(ExtensionsPluginFactory, "krita_colorspaces_ext=
ensions_plugin.json", registerPlugin<ExtensionsPlugin>();)
 =

 ExtensionsPlugin::ExtensionsPlugin(QObject *parent, const QVariantList &)
 {
diff --git a/krita/plugins/extensions/dockers/CMakeLists.txt b/krita/plugin=
s/extensions/dockers/CMakeLists.txt
index d4d2fdb..40da8db 100644
--- a/krita/plugins/extensions/dockers/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/CMakeLists.txt
@@ -1,13 +1,13 @@
 add_subdirectory(defaultdockers)
 add_subdirectory(smallcolorselector)
-# add_subdirectory(specificcolorselector)
+add_subdirectory(specificcolorselector)
 add_subdirectory(digitalmixer)
 add_subdirectory(advancedcolorselector)
 add_subdirectory(presetdocker)
 add_subdirectory(historydocker)
 add_subdirectory(channeldocker)
-#add_subdirectory(imagedocker)
-#add_subdirectory(artisticcolorselector)
+add_subdirectory(imagedocker)
+add_subdirectory(artisticcolorselector)
 add_subdirectory(tasksetdocker)
 add_subdirectory(compositiondocker)
 add_subdirectory(patterndocker)
@@ -16,4 +16,4 @@ if(HAVE_OCIO)
 endif()
 add_subdirectory(overview)
 add_subdirectory(palettedocker)
-#add_subdirectory(colorslider)
+add_subdirectory(colorslider)
diff --git a/krita/plugins/extensions/dockers/artisticcolorselector/artisti=
ccolorselector_plugin.cpp b/krita/plugins/extensions/dockers/artisticcolors=
elector/artisticcolorselector_plugin.cpp
index 18622f0..031d2e5 100644
--- a/krita/plugins/extensions/dockers/artisticcolorselector/artisticcolors=
elector_plugin.cpp
+++ b/krita/plugins/extensions/dockers/artisticcolorselector/artisticcolors=
elector_plugin.cpp
@@ -23,7 +23,7 @@
 #include <KoDockFactoryBase.h>
 #include <KoDockRegistry.h>
 =

-K_PLUGIN_FACTORY_WITH_JSON(PaletteDockPluginFactory, "kritaartisticcolorse=
lector.json", registerPlugin<ArtisticColorSelectorPlugin>();)
+K_PLUGIN_FACTORY_WITH_JSON(PaletteDockPluginFactory, "krita_artisticcolors=
elector.json", registerPlugin<ArtisticColorSelectorPlugin>();)
 =

 class ArtisticColorSelectorDockFactory: public KoDockFactoryBase
 {
@@ -53,3 +53,5 @@ ArtisticColorSelectorPlugin::ArtisticColorSelectorPlugin(=
QObject* parent, const
 {
     KoDockRegistry::instance()->add(new ArtisticColorSelectorDockFactory()=
);
 }
+
+#include "artisticcolorselector_plugin.moc"
\ No newline at end of file
diff --git a/krita/plugins/extensions/dockers/colorslider/kis_color_slider.=
cpp b/krita/plugins/extensions/dockers/colorslider/kis_color_slider.cpp
index ed3a824..66b7692 100644
--- a/krita/plugins/extensions/dockers/colorslider/kis_color_slider.cpp
+++ b/krita/plugins/extensions/dockers/colorslider/kis_color_slider.cpp
@@ -79,4 +79,4 @@ ColorSliderPlugin::~ColorSliderPlugin()
 {
 }
 =

-#include "moc_kis_color_slider.cpp"
+#include "kis_color_slider.moc"
diff --git a/krita/plugins/extensions/dockers/imagedocker/imagedocker.cpp b=
/krita/plugins/extensions/dockers/imagedocker/imagedocker.cpp
index 519a20f..f2f251a 100644
--- a/krita/plugins/extensions/dockers/imagedocker/imagedocker.cpp
+++ b/krita/plugins/extensions/dockers/imagedocker/imagedocker.cpp
@@ -57,3 +57,5 @@ ImageDockerPlugin::ImageDockerPlugin(QObject* parent, con=
st QVariantList&):
 {
     KoDockRegistry::instance()->add(new ImageDockerDockFactory());
 }
+
+#include "imagedocker.moc"
\ No newline at end of file
diff --git a/krita/plugins/extensions/dockers/specificcolorselector/specifi=
ccolorselector.cc b/krita/plugins/extensions/dockers/specificcolorselector/=
specificcolorselector.cc
index 8607de2..13d47ac 100644
--- a/krita/plugins/extensions/dockers/specificcolorselector/specificcolors=
elector.cc
+++ b/krita/plugins/extensions/dockers/specificcolorselector/specificcolors=
elector.cc
@@ -79,4 +79,4 @@ SpecificColorSelectorPlugin::~SpecificColorSelectorPlugin=
()
 {
 }
 =

-#include "moc_specificcolorselector.cpp"
+#include "specificcolorselector.moc"
diff --git a/krita/plugins/formats/odg/CMakeLists.txt b/krita/plugins/forma=
ts/odg/CMakeLists.txt
index f85ea4f..cd7b36f 100644
--- a/krita/plugins/formats/odg/CMakeLists.txt
+++ b/krita/plugins/formats/odg/CMakeLists.txt
@@ -6,6 +6,7 @@ set(kritaodgimport_PART_SRCS
     )
 =

 add_library(kritaodgimport MODULE ${kritaodgimport_PART_SRCS})
+kcoreaddons_desktop_to_json(kritaodgimport krita_odg_import.desktop)
 =

 include_directories(${PNG_INCLUDE_DIR})
 =

diff --git a/krita/plugins/formats/odg/kis_odg_import.cc b/krita/plugins/fo=
rmats/odg/kis_odg_import.cc
index 26b05b5..62afa3f 100644
--- a/krita/plugins/formats/odg/kis_odg_import.cc
+++ b/krita/plugins/formats/odg/kis_odg_import.cc
@@ -41,8 +41,7 @@
 #include <KoShapeBasedDocumentBase.h>
 #include <KoColorSpaceRegistry.h>
 =

-K_PLUGIN_FACTORY(ODGImportFactory, registerPlugin<KisODGImport>();)
-K_EXPORT_PLUGIN(ODGImportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(ODGImportFactory, "krita_odg_import.json", regi=
sterPlugin<KisODGImport>();)
 =

 KisODGImport::KisODGImport(QObject *parent, const QVariantList &) : KisImp=
ortExportFilter(parent)
 {
diff --git a/krita/plugins/formats/ora/CMakeLists.txt b/krita/plugins/forma=
ts/ora/CMakeLists.txt
index e37d9ac..a897ec6 100644
--- a/krita/plugins/formats/ora/CMakeLists.txt
+++ b/krita/plugins/formats/ora/CMakeLists.txt
@@ -11,6 +11,7 @@ set(kritaoraimport_PART_SRCS
     )
 =

 add_library(kritaoraimport MODULE ${kritaoraimport_PART_SRCS})
+kcoreaddons_desktop_to_json(kritaoraimport krita_ora_import.desktop)
 =

 target_link_libraries(kritaoraimport kritaui )
 =

@@ -24,7 +25,7 @@ set(kritaoraexport_PART_SRCS
     )
 =

 add_library(kritaoraexport MODULE ${kritaoraexport_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritaoraexport krita_ora_export.desktop)
 =

 target_link_libraries(kritaoraexport kritaui )
 =

diff --git a/krita/plugins/formats/ora/ora_export.cc b/krita/plugins/format=
s/ora/ora_export.cc
index 84d50b0..5bd8c18 100644
--- a/krita/plugins/formats/ora/ora_export.cc
+++ b/krita/plugins/formats/ora/ora_export.cc
@@ -42,8 +42,7 @@
 =

 class KisExternalLayer;
 =

-K_PLUGIN_FACTORY(ExportFactory, registerPlugin<OraExport>();)
-K_EXPORT_PLUGIN(ExportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(ExportFactory, "krita_ora_export.json", registe=
rPlugin<OraExport>();)
 =

 OraExport::OraExport(QObject *parent, const QVariantList &) : KisImportExp=
ortFilter(parent)
 {
diff --git a/krita/plugins/formats/ora/ora_import.cc b/krita/plugins/format=
s/ora/ora_import.cc
index 93aa6a7..3acaa80 100644
--- a/krita/plugins/formats/ora/ora_import.cc
+++ b/krita/plugins/formats/ora/ora_import.cc
@@ -26,8 +26,7 @@
 =

 #include "ora_converter.h"
 =

-K_PLUGIN_FACTORY(ImportFactory, registerPlugin<OraImport>();)
-K_EXPORT_PLUGIN(ImportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(ImportFactory, "krita_ora_import.json", registe=
rPlugin<OraImport>();)
 =

 OraImport::OraImport(QObject *parent, const QVariantList &) : KisImportExp=
ortFilter(parent)
 {
diff --git a/krita/plugins/formats/psd/CMakeLists.txt b/krita/plugins/forma=
ts/psd/CMakeLists.txt
index 2b6e29e..eb3a097 100644
--- a/krita/plugins/formats/psd/CMakeLists.txt
+++ b/krita/plugins/formats/psd/CMakeLists.txt
@@ -26,6 +26,8 @@ set(kritapsdimport_PART_SRCS
 )
 =

 add_library(kritapsdimport MODULE ${kritapsdimport_PART_SRCS})
+kcoreaddons_desktop_to_json(kritapsdimport krita_psd_import.desktop)
+
 if (WIN32)
 	target_link_libraries(kritapsdimport kritaui ${WIN32_PLATFORM_NET_LIBS})
 else ()
@@ -43,6 +45,7 @@ set(kritapsdexport_PART_SRCS
 )
 =

 add_library(kritapsdexport MODULE ${kritapsdexport_PART_SRCS})
+kcoreaddons_desktop_to_json(kritapsdexport krita_psd_export.desktop)
 =

 if (WIN32)
     target_link_libraries(kritapsdexport kritaui ${WIN32_PLATFORM_NET_LIBS=
})
diff --git a/krita/plugins/formats/psd/psd_export.cc b/krita/plugins/format=
s/psd/psd_export.cc
index 21dfaa5..2ee8228 100644
--- a/krita/plugins/formats/psd/psd_export.cc
+++ b/krita/plugins/formats/psd/psd_export.cc
@@ -38,8 +38,7 @@
 =

 class KisExternalLayer;
 =

-K_PLUGIN_FACTORY(ExportFactory, registerPlugin<psdExport>();)
-K_EXPORT_PLUGIN(ExportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(ExportFactory, "krita_psd_export.json", registe=
rPlugin<psdExport>();)
 =

 bool checkHomogenity(KisNodeSP root, const KoColorSpace* cs)
 {
diff --git a/krita/plugins/formats/psd/psd_import.cc b/krita/plugins/format=
s/psd/psd_import.cc
index d94416f..44f7289 100644
--- a/krita/plugins/formats/psd/psd_import.cc
+++ b/krita/plugins/formats/psd/psd_import.cc
@@ -27,8 +27,7 @@
 =

 #include "psd_loader.h"
 =

-K_PLUGIN_FACTORY(ImportFactory, registerPlugin<psdImport>();)
-K_EXPORT_PLUGIN(ImportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(ImportFactory, "krita_psd_import.json", registe=
rPlugin<psdImport>();)
 =

         psdImport::psdImport(QObject *parent, const QVariantList &) : KisI=
mportExportFilter(parent)
 {
diff --git a/krita/plugins/formats/qml/CMakeLists.txt b/krita/plugins/forma=
ts/qml/CMakeLists.txt
index b701a81..0631d55 100644
--- a/krita/plugins/formats/qml/CMakeLists.txt
+++ b/krita/plugins/formats/qml/CMakeLists.txt
@@ -7,6 +7,7 @@ set(kritaqmlexport_PART_SRCS
     )
 =

 add_library(kritaqmlexport MODULE ${kritaqmlexport_PART_SRCS})
+kcoreaddons_desktop_to_json(kritaqmlexport krita_qml_export.desktop)
 =

 target_link_libraries(kritaqmlexport kritaui )
 =

diff --git a/krita/plugins/formats/qml/qml_export.cc b/krita/plugins/format=
s/qml/qml_export.cc
index dad76b3..cf6addd 100644
--- a/krita/plugins/formats/qml/qml_export.cc
+++ b/krita/plugins/formats/qml/qml_export.cc
@@ -30,8 +30,7 @@
 =

 #include "qml_converter.h"
 =

-K_PLUGIN_FACTORY(ExportFactory, registerPlugin<QMLExport>();)
-K_EXPORT_PLUGIN(ExportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(ExportFactory, "krita_qml_export.json", registe=
rPlugin<QMLExport>();)
 =

 QMLExport::QMLExport(QObject *parent, const QVariantList &) : KisImportExp=
ortFilter(parent)
 {
diff --git a/krita/plugins/formats/tga/CMakeLists.txt b/krita/plugins/forma=
ts/tga/CMakeLists.txt
index c7c87d9..821e74b 100644
--- a/krita/plugins/formats/tga/CMakeLists.txt
+++ b/krita/plugins/formats/tga/CMakeLists.txt
@@ -5,6 +5,7 @@ set(kritatgaexport_PART_SRCS
 ki18n_wrap_ui(kritatgaexport_PART_SRCS )
 =

 add_library(kritatgaexport MODULE ${kritatgaexport_PART_SRCS})
+kcoreaddons_desktop_to_json(kritatgaexport krita_tga_export.desktop)
 =

 target_link_libraries(kritatgaexport kritaui)
 =

@@ -18,6 +19,7 @@ set(kritatgaimport_PART_SRCS
 ki18n_wrap_ui(kritatgaimport_PART_SRCS )
 =

 add_library(kritatgaimport MODULE ${kritatgaimport_PART_SRCS})
+kcoreaddons_desktop_to_json(kritatgaimport krita_tga_import.desktop)
 =

 target_link_libraries(kritatgaimport kritaui)
 =

diff --git a/krita/plugins/formats/tga/kis_tga_export.cpp b/krita/plugins/f=
ormats/tga/kis_tga_export.cpp
index 2d818a8..a98d577 100644
--- a/krita/plugins/formats/tga/kis_tga_export.cpp
+++ b/krita/plugins/formats/tga/kis_tga_export.cpp
@@ -35,8 +35,7 @@
 =

 #include "tga.h"
 =

-K_PLUGIN_FACTORY(KisTGAExportFactory, registerPlugin<KisTGAExport>();)
-K_EXPORT_PLUGIN(KisTGAExportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(KisTGAExportFactory, "krita_tga_export.json", r=
egisterPlugin<KisTGAExport>();)
 =

 KisTGAExport::KisTGAExport(QObject *parent, const QVariantList &) : KisImp=
ortExportFilter(parent)
 {
diff --git a/krita/plugins/formats/tga/kis_tga_import.cpp b/krita/plugins/f=
ormats/tga/kis_tga_import.cpp
index 68cdd52..d86881b 100644
--- a/krita/plugins/formats/tga/kis_tga_import.cpp
+++ b/krita/plugins/formats/tga/kis_tga_import.cpp
@@ -43,8 +43,7 @@
 =

 #include <tga.h>
 =

-K_PLUGIN_FACTORY(KisTGAImportFactory, registerPlugin<KisTGAImport>();)
-K_EXPORT_PLUGIN(KisTGAImportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(KisTGAImportFactory, "krita_tga_import.json", r=
egisterPlugin<KisTGAImport>();)
 =

 KisTGAImport::KisTGAImport(QObject *parent, const QVariantList &) : KisImp=
ortExportFilter(parent)
 {
diff --git a/krita/plugins/generators/pattern/CMakeLists.txt b/krita/plugin=
s/generators/pattern/CMakeLists.txt
index 88abf8a..ebf2fc3 100644
--- a/krita/plugins/generators/pattern/CMakeLists.txt
+++ b/krita/plugins/generators/pattern/CMakeLists.txt
@@ -9,7 +9,7 @@ ki18n_wrap_ui(kritapatterngenerator_PART_SRCS
     )
 =

 add_library(kritapatterngenerator MODULE ${kritapatterngenerator_PART_SRCS=
})
-
+kcoreaddons_desktop_to_json(kritapatterngenerator kritapatterngenerator.de=
sktop)
 =

 target_link_libraries(kritapatterngenerator kritaui)
 =

diff --git a/krita/plugins/generators/pattern/patterngenerator.cpp b/krita/=
plugins/generators/pattern/patterngenerator.cpp
index 88594d3..ff8d418 100644
--- a/krita/plugins/generators/pattern/patterngenerator.cpp
+++ b/krita/plugins/generators/pattern/patterngenerator.cpp
@@ -48,8 +48,7 @@
 #include "kis_wdg_pattern.h"
 #include "ui_wdgpatternoptions.h"
 =

-K_PLUGIN_FACTORY(KritaPatternGeneratorFactory, registerPlugin<KritaPattern=
Generator>();)
-K_EXPORT_PLUGIN(KritaPatternGeneratorFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KritaPatternGeneratorFactory, "kritapatterngene=
rator.json", registerPlugin<KritaPatternGenerator>();)
 =

 KritaPatternGenerator::KritaPatternGenerator(QObject *parent, const QVaria=
ntList &)
         : QObject(parent)
diff --git a/krita/plugins/generators/solid/CMakeLists.txt b/krita/plugins/=
generators/solid/CMakeLists.txt
index fed8ab1..b9c42ea 100644
--- a/krita/plugins/generators/solid/CMakeLists.txt
+++ b/krita/plugins/generators/solid/CMakeLists.txt
@@ -9,7 +9,7 @@ ki18n_wrap_ui(kritacolorgenerator_PART_SRCS
     )
 =

 add_library(kritacolorgenerator MODULE ${kritacolorgenerator_PART_SRCS})
-
+kcoreaddons_desktop_to_json(kritacolorgenerator kritacolorgenerator.deskto=
p)
 =

 target_link_libraries(kritacolorgenerator kritaui)
 =

diff --git a/krita/plugins/generators/solid/colorgenerator.cpp b/krita/plug=
ins/generators/solid/colorgenerator.cpp
index 053f57b..ae285ac 100644
--- a/krita/plugins/generators/solid/colorgenerator.cpp
+++ b/krita/plugins/generators/solid/colorgenerator.cpp
@@ -41,8 +41,7 @@
 #include "kis_wdg_color.h"
 #include "ui_wdgcoloroptions.h"
 =

-K_PLUGIN_FACTORY(KritaColorGeneratorFactory, registerPlugin<KritaColorGene=
rator>();)
-K_EXPORT_PLUGIN(KritaColorGeneratorFactory("krita"))
+K_PLUGIN_FACTORY_WITH_JSON(KritaColorGeneratorFactory, "kritacolorgenerato=
r.json", registerPlugin<KritaColorGenerator>();)
 =

 KritaColorGenerator::KritaColorGenerator(QObject *parent, const QVariantLi=
st &)
         : QObject(parent)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic