[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra] krita: Remove useless calls to setComponentData
From: Boudewijn Rempt <boud () valdyas ! org>
Date: 2012-03-29 17:41:15
Message-ID: 20120329174115.454F9A60A9 () git ! kde ! org
[Download RAW message or body]
Git commit 37385eebdb3b2bb5a32e41661c647a1968cf8577 by Boudewijn Rempt.
Committed on 21/03/2012 at 10:34.
Pushed by rempt into branch 'master'.
Remove useless calls to setComponentData
Conflicts:
krita/ui/kis_view2.cpp
M +0 -2 krita/plugins/extensions/backgrounds/backgrounds.cpp
M +0 -2 krita/plugins/extensions/bigbrother/bigbrother.cc
M +0 -2 krita/plugins/extensions/bracketing2hdr/bracketing2hdr.cc
M +0 -2 krita/plugins/extensions/colorrange/colorrange.cc
M +0 -3 krita/plugins/extensions/colorspaceconversion/colorspaceconversion.cc
M +0 -2 krita/plugins/extensions/compose/kis_layer_compose_plugin.cpp
M +0 -3 krita/plugins/extensions/dropshadow/kis_dropshadow_plugin.cc
M +0 -3 krita/plugins/extensions/extensionsmanager/ExtensionsManagerPlugin.cc
M +0 -3 krita/plugins/extensions/histogram/histogram.cc
M +0 -2 krita/plugins/extensions/imagesize/imagesize.cc
M +0 -1 krita/plugins/extensions/imagesplit/imagesplit.cpp
M +0 -2 krita/plugins/extensions/metadataeditor/metadataeditor.cc
M +0 -2 krita/plugins/extensions/modify_selection/modify_selection.cc
M +0 -1 krita/plugins/extensions/painterlyframework/painterlymixer.cpp
M +0 -2 krita/plugins/extensions/rotateimage/rotateimage.cc
M +0 -2 krita/plugins/extensions/scripting/scriptingpart.cpp
M +0 -2 krita/plugins/extensions/separate_channels/kis_separate_channels_plugin.cc
M +0 -2 krita/plugins/extensions/shearimage/shearimage.cc
M +0 -2 krita/plugins/extensions/together/together.cc
M +0 -2 krita/plugins/extensions/tonemapping/tonemapping.cc
M +0 -2 krita/plugins/paintops/waterymixbrush/waterymix_paintop_plugin.cpp
M +0 -2 krita/plugins/tools/tool_curves/tool_curves.cc
M +0 -1 krita/sdk/templates/docker/APPNAMELC.cc
M +0 -2 krita/sdk/templates/view/APPNAMELC.cc
M +0 -2 krita/ui/kis_view2.cpp
http://commits.kde.org/calligra/37385eebdb3b2bb5a32e41661c647a1968cf8577
diff --git a/krita/plugins/extensions/backgrounds/backgrounds.cpp \
b/krita/plugins/extensions/backgrounds/backgrounds.cpp index f4a1d28..be825c9 100644
--- a/krita/plugins/extensions/backgrounds/backgrounds.cpp
+++ b/krita/plugins/extensions/backgrounds/backgrounds.cpp
@@ -44,8 +44,6 @@ Backgrounds::Backgrounds(QObject *parent, const QVariantList &)
: KParts::Plugin(parent)
{
if (parent->inherits("KisView2")) {
- setComponentData(BackgroundsFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", "kritaplugins/backgrounds.rc"), \
true);
KAction *action = new KAction(i18n("Select Image Background..."), this);
diff --git a/krita/plugins/extensions/bigbrother/bigbrother.cc \
b/krita/plugins/extensions/bigbrother/bigbrother.cc index b128fa9..f13c7ac 100644
--- a/krita/plugins/extensions/bigbrother/bigbrother.cc
+++ b/krita/plugins/extensions/bigbrother/bigbrother.cc
@@ -78,8 +78,6 @@ BigBrotherPlugin::BigBrotherPlugin(QObject *parent, const \
QVariantList &) if (parent->inherits("KisView2")) {
m_view = (KisView2*) parent;
- setComponentData(BigBrotherPluginFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", "kritaplugins/bigbrother.rc"), \
true);
KAction* action = 0;
diff --git a/krita/plugins/extensions/bracketing2hdr/bracketing2hdr.cc \
b/krita/plugins/extensions/bracketing2hdr/bracketing2hdr.cc index a06c84a..351024e \
100644
--- a/krita/plugins/extensions/bracketing2hdr/bracketing2hdr.cc
+++ b/krita/plugins/extensions/bracketing2hdr/bracketing2hdr.cc
@@ -78,8 +78,6 @@ Bracketing2HDRPlugin::Bracketing2HDRPlugin(QObject *parent, const \
QVariantList & if (parent->inherits("KisView2")) {
m_view = (KisView2*) parent;
- setComponentData(Bracketing2HDRPluginFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", "kritaplugins/bracketing2hdr.rc"), \
true);
KAction *action = new KAction(i18n("HDR Layer from bracketing"), this);
diff --git a/krita/plugins/extensions/colorrange/colorrange.cc \
b/krita/plugins/extensions/colorrange/colorrange.cc index d2237b8..41e11c3 100644
--- a/krita/plugins/extensions/colorrange/colorrange.cc
+++ b/krita/plugins/extensions/colorrange/colorrange.cc
@@ -58,8 +58,6 @@ ColorRange::ColorRange(QObject *parent, const QVariantList &)
: KParts::Plugin(parent)
{
if (parent->inherits("KisView2")) {
- setComponentData(ColorRangeFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", "kritaplugins/colorrange.rc"),
true);
m_view = dynamic_cast<KisView2*>(parent);
diff --git a/krita/plugins/extensions/colorspaceconversion/colorspaceconversion.cc \
b/krita/plugins/extensions/colorspaceconversion/colorspaceconversion.cc index \
ba3d783..3bb48a8 100644
--- a/krita/plugins/extensions/colorspaceconversion/colorspaceconversion.cc
+++ b/krita/plugins/extensions/colorspaceconversion/colorspaceconversion.cc
@@ -69,9 +69,6 @@ ColorSpaceConversion::ColorSpaceConversion(QObject *parent, const \
QVariantList & {
if (parent->inherits("KisView2")) {
m_view = (KisView2*) parent;
-
- setComponentData(ColorSpaceConversionFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", \
"kritaplugins/colorspaceconversion.rc"), true);
diff --git a/krita/plugins/extensions/compose/kis_layer_compose_plugin.cpp \
b/krita/plugins/extensions/compose/kis_layer_compose_plugin.cpp index \
9ec2c65..e4130ad 100644
--- a/krita/plugins/extensions/compose/kis_layer_compose_plugin.cpp
+++ b/krita/plugins/extensions/compose/kis_layer_compose_plugin.cpp
@@ -44,8 +44,6 @@ KisLayerComposePlugin::KisLayerComposePlugin(QObject *parent, const \
QVariantList : KParts::Plugin(parent)
{
if (parent->inherits("KisView2")) {
- setComponentData(KisLayerComposePluginFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", "kritaplugins/imageseparate.rc"), \
true); m_view = (KisView2*) parent;
KAction *action = new KAction(i18n("Compose Layer..."), this);
diff --git a/krita/plugins/extensions/dropshadow/kis_dropshadow_plugin.cc \
b/krita/plugins/extensions/dropshadow/kis_dropshadow_plugin.cc index \
aa555914..6bfff9c 100644
--- a/krita/plugins/extensions/dropshadow/kis_dropshadow_plugin.cc
+++ b/krita/plugins/extensions/dropshadow/kis_dropshadow_plugin.cc
@@ -51,9 +51,6 @@ KisDropshadowPlugin::KisDropshadowPlugin(QObject *parent, const \
QVariantList &) : KParts::Plugin(parent)
{
if (parent->inherits("KisView2")) {
-
- setComponentData(KisDropshadowPluginFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", "kritaplugins/dropshadow.rc"), \
true);
m_view = (KisView2*) parent;
diff --git a/krita/plugins/extensions/extensionsmanager/ExtensionsManagerPlugin.cc \
b/krita/plugins/extensions/extensionsmanager/ExtensionsManagerPlugin.cc index \
8f8cc3f..ec33a65 100644
--- a/krita/plugins/extensions/extensionsmanager/ExtensionsManagerPlugin.cc
+++ b/krita/plugins/extensions/extensionsmanager/ExtensionsManagerPlugin.cc
@@ -42,9 +42,6 @@ ExtensionsManagerPlugin::ExtensionsManagerPlugin(QObject *parent, \
const QVariant {
if (parent->inherits("KisView2")) {
m_view = (KisView2*) parent;
-
- setComponentData(ExtensionsManagerPluginFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", \
"kritaplugins/extensionsmanager.rc"), true);
KAction *action = new KAction(i18n("Extensions manager..."), this);
diff --git a/krita/plugins/extensions/histogram/histogram.cc \
b/krita/plugins/extensions/histogram/histogram.cc index 3fd8f03..6255b9e 100644
--- a/krita/plugins/extensions/histogram/histogram.cc
+++ b/krita/plugins/extensions/histogram/histogram.cc
@@ -58,9 +58,6 @@ Histogram::Histogram(QObject *parent, const QVariantList &)
: KParts::Plugin(parent)
{
if (parent->inherits("KisView2")) {
-
- setComponentData(HistogramFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", "kritaplugins/histogram.rc"),
true);
diff --git a/krita/plugins/extensions/imagesize/imagesize.cc \
b/krita/plugins/extensions/imagesize/imagesize.cc index 028360e..8a068e4 100644
--- a/krita/plugins/extensions/imagesize/imagesize.cc
+++ b/krita/plugins/extensions/imagesize/imagesize.cc
@@ -70,8 +70,6 @@ ImageSize::ImageSize(QObject *parent, const QVariantList &)
: KParts::Plugin(parent)
{
if (parent->inherits("KisView2")) {
- setComponentData(ImageSizeFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", "kritaplugins/imagesize.rc"), \
true);
KAction *action = new KAction(i18n("Scale To New Size..."), this);
diff --git a/krita/plugins/extensions/imagesplit/imagesplit.cpp \
b/krita/plugins/extensions/imagesplit/imagesplit.cpp index c1ea4bb..ad10825 100644
--- a/krita/plugins/extensions/imagesplit/imagesplit.cpp
+++ b/krita/plugins/extensions/imagesplit/imagesplit.cpp
@@ -55,7 +55,6 @@ Imagesplit::Imagesplit(QObject *parent, const QVariantList &)
: KParts::Plugin(parent)
{
if (parent->inherits("KisView2")) {
- setComponentData(ImagesplitFactory::componentData());
setXMLFile(KStandardDirs::locate("data", "kritaplugins/imagesplit.rc"), \
true); KAction *action = new KAction(i18n("Image Split "), this);
actionCollection()->addAction("imagesplit", action);
diff --git a/krita/plugins/extensions/metadataeditor/metadataeditor.cc \
b/krita/plugins/extensions/metadataeditor/metadataeditor.cc index edea06c..2f61cbf \
100644
--- a/krita/plugins/extensions/metadataeditor/metadataeditor.cc
+++ b/krita/plugins/extensions/metadataeditor/metadataeditor.cc
@@ -56,8 +56,6 @@ metadataeditorPlugin::metadataeditorPlugin(QObject *parent, const \
QVariantList & if (parent->inherits("KisView2")) {
m_view = (KisView2*) parent;
- setComponentData(metadataeditorPluginFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", "kritaplugins/metadataeditor.rc"), \
true);
KAction *action = new KAction(i18n("&Edit metadata..."), this);
diff --git a/krita/plugins/extensions/modify_selection/modify_selection.cc \
b/krita/plugins/extensions/modify_selection/modify_selection.cc index \
5f5ccfe..3e8014b 100644
--- a/krita/plugins/extensions/modify_selection/modify_selection.cc
+++ b/krita/plugins/extensions/modify_selection/modify_selection.cc
@@ -61,8 +61,6 @@ ModifySelection::ModifySelection(QObject *parent, const \
QVariantList &) : KParts::Plugin(parent)
{
if (parent->inherits("KisView2")) {
- setComponentData(ModifySelectionFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", \
"kritaplugins/modify_selection.rc"), true);
diff --git a/krita/plugins/extensions/painterlyframework/painterlymixer.cpp \
b/krita/plugins/extensions/painterlyframework/painterlymixer.cpp index \
875282a..3fd797d 100644
--- a/krita/plugins/extensions/painterlyframework/painterlymixer.cpp
+++ b/krita/plugins/extensions/painterlyframework/painterlymixer.cpp
@@ -35,7 +35,6 @@ K_EXPORT_PLUGIN(PainterlyMixerFactory("krita"))
PainterlyMixer::PainterlyMixer(QObject *parent, const QVariantList &)
: KParts::Plugin(parent)
{
- setComponentData(PainterlyMixerFactory::componentData());
KoDockRegistry::instance()->add(new KisPainterlyMixerDockerFactory());
}
diff --git a/krita/plugins/extensions/rotateimage/rotateimage.cc \
b/krita/plugins/extensions/rotateimage/rotateimage.cc index 947e70b..c56791a 100644
--- a/krita/plugins/extensions/rotateimage/rotateimage.cc
+++ b/krita/plugins/extensions/rotateimage/rotateimage.cc
@@ -58,8 +58,6 @@ RotateImage::RotateImage(QObject *parent, const QVariantList &)
: KParts::Plugin(parent)
{
if (parent->inherits("KisView2")) {
- setComponentData(RotateImageFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", "kritaplugins/rotateimage.rc"),
true);
m_view = (KisView2*) parent;
diff --git a/krita/plugins/extensions/scripting/scriptingpart.cpp \
b/krita/plugins/extensions/scripting/scriptingpart.cpp index d4ce37b..cf579d6 100644
--- a/krita/plugins/extensions/scripting/scriptingpart.cpp
+++ b/krita/plugins/extensions/scripting/scriptingpart.cpp
@@ -80,8 +80,6 @@ ScriptingPart::ScriptingPart(QObject *parent, const QVariantList &)
, d(new Private())
{
d->view = dynamic_cast<KisView2*>(parent);
- dbgScript << "ScriptingPart Ctor";
- setComponentData(ScriptingPart::componentData());
setXMLFile(KStandardDirs::locate("data", "kritaplugins/scripting.rc"), true);
#if 1
// Add filters
diff --git a/krita/plugins/extensions/separate_channels/kis_separate_channels_plugin.cc \
b/krita/plugins/extensions/separate_channels/kis_separate_channels_plugin.cc index \
a991754..029033d 100644
--- a/krita/plugins/extensions/separate_channels/kis_separate_channels_plugin.cc
+++ b/krita/plugins/extensions/separate_channels/kis_separate_channels_plugin.cc
@@ -54,8 +54,6 @@ KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(QObject \
*parent, const QVar : KParts::Plugin(parent)
{
if (parent->inherits("KisView2")) {
- setComponentData(KisSeparateChannelsPluginFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", "kritaplugins/imageseparate.rc"), \
true); m_view = (KisView2*) parent;
KAction *action = new KAction(i18n("Separate Image..."), this);
diff --git a/krita/plugins/extensions/shearimage/shearimage.cc \
b/krita/plugins/extensions/shearimage/shearimage.cc index 53300db..7b52ca0 100644
--- a/krita/plugins/extensions/shearimage/shearimage.cc
+++ b/krita/plugins/extensions/shearimage/shearimage.cc
@@ -56,8 +56,6 @@ ShearImage::ShearImage(QObject *parent, const QVariantList &)
: KParts::Plugin(parent)
{
if (parent->inherits("KisView2")) {
- setComponentData(ShearImageFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", "kritaplugins/shearimage.rc"),
true);
diff --git a/krita/plugins/extensions/together/together.cc \
b/krita/plugins/extensions/together/together.cc index 5fd3f35..24f8263 100644
--- a/krita/plugins/extensions/together/together.cc
+++ b/krita/plugins/extensions/together/together.cc
@@ -49,8 +49,6 @@ TogetherPlugin::TogetherPlugin(QObject *parent, const QVariantList \
&) if (parent->inherits("KisView2")) {
m_view = (KisView2*) parent;
- setComponentData(TogetherPluginFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", "kritaplugins/together.rc"), true);
}
diff --git a/krita/plugins/extensions/tonemapping/tonemapping.cc \
b/krita/plugins/extensions/tonemapping/tonemapping.cc index 4ba5b90..c64c217 100644
--- a/krita/plugins/extensions/tonemapping/tonemapping.cc
+++ b/krita/plugins/extensions/tonemapping/tonemapping.cc
@@ -46,8 +46,6 @@ tonemappingPlugin::tonemappingPlugin(QObject *parent, const \
QVariantList &)
if (parent->inherits("KisView2") && \
KisToneMappingOperatorsRegistry::instance()->count() > 0) { m_view = (KisView2*) \
parent;
- setComponentData(tonemappingPluginFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data", "kritaplugins/tonemapping.rc"), \
true);
m_toneMappingAction = new KAction(i18n("Tonemapping..."), this);
diff --git a/krita/plugins/paintops/waterymixbrush/waterymix_paintop_plugin.cpp \
b/krita/plugins/paintops/waterymixbrush/waterymix_paintop_plugin.cpp index \
c857796..2b8a1be 100644
--- a/krita/plugins/paintops/waterymixbrush/waterymix_paintop_plugin.cpp
+++ b/krita/plugins/paintops/waterymixbrush/waterymix_paintop_plugin.cpp
@@ -40,8 +40,6 @@ K_EXPORT_PLUGIN(WateryMixPaintOpPluginFactory("krita"))
WateryMixPaintOpPlugin::WateryMixPaintOpPlugin(QObject *parent, const QVariantList \
&) : QObject(parent)
{
- //
- //setComponentData(WateryMixPaintOpPluginFactory::componentData());
KisPaintOpRegistry *r = KisPaintOpRegistry::instance();
r->add(new KisSimplePaintOpFactory<KisWateryMixPaintOp, \
KisWateryMixPaintOpSettings, KisWateryMixPaintOpSettingsWidget>("waterymixbrush", \
i18n("Watery Mixbrush"), \
KisPaintOpFactory::categoryExperimental(),"krita-waterymix.png"));
diff --git a/krita/plugins/tools/tool_curves/tool_curves.cc \
b/krita/plugins/tools/tool_curves/tool_curves.cc index f5247b4..01a224a 100644
--- a/krita/plugins/tools/tool_curves/tool_curves.cc
+++ b/krita/plugins/tools/tool_curves/tool_curves.cc
@@ -47,8 +47,6 @@ K_EXPORT_PLUGIN(ToolCurvesFactory("krita"))
ToolCurves::ToolCurves(QObject *parent, const QVariantList &)
: QObject(parent)
{
- //setComponentData(ToolCurvesFactory::componentData());
-
if (parent->inherits("KoToolRegistry")) {
KoToolRegistry * r = dynamic_cast<KoToolRegistry*>(parent);
//r->add(new KisToolBezierPaintFactory());
diff --git a/krita/sdk/templates/docker/APPNAMELC.cc \
b/krita/sdk/templates/docker/APPNAMELC.cc index d0a7155..740de47 100644
--- a/krita/sdk/templates/docker/APPNAMELC.cc
+++ b/krita/sdk/templates/docker/APPNAMELC.cc
@@ -68,7 +68,6 @@ private:
{
m_view = (KisView2*) parent;
- setComponentData(%{APPNAME}PluginFactory::componentData());
%{APPNAME}DockFactory dockFactory( m_view);
m_view->createDockWidget( &dockFactory );
}
diff --git a/krita/sdk/templates/view/APPNAMELC.cc \
b/krita/sdk/templates/view/APPNAMELC.cc index 99fa27a..cc761f6 100644
--- a/krita/sdk/templates/view/APPNAMELC.cc
+++ b/krita/sdk/templates/view/APPNAMELC.cc
@@ -25,8 +25,6 @@ K_EXPORT_PLUGIN(%{APPNAME}PluginFactory("krita"))
{
m_view = (KisView2*) parent;
- setComponentData(%{APPNAME}PluginFactory::componentData());
-
setXMLFile(KStandardDirs::locate("data","kritaplugins/%{APPNAMELC}.rc"), \
true);
KAction *action = new KAction(i18n("&My action !"), this);
diff --git a/krita/ui/kis_view2.cpp b/krita/ui/kis_view2.cpp
index 67777de..470efc5 100644
--- a/krita/ui/kis_view2.cpp
+++ b/krita/ui/kis_view2.cpp
@@ -223,8 +223,6 @@ KisView2::KisView2(KisDoc2 * doc, QWidget * parent)
setFocusPolicy(Qt::NoFocus);
- setComponentData(KisFactory2::componentData(), false);
-
if (!doc->isReadWrite()) {
setXMLFile("krita_readonly.rc");
} else {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic