summaryrefslogtreecommitdiffstats
path: root/src/live_effects
diff options
context:
space:
mode:
authorJabiertxof <jabier.arraiza@marker.es>2019-05-25 02:28:36 +0000
committerJabiertxof <jabier.arraiza@marker.es>2019-05-25 02:28:36 +0000
commit1b7952931eca6cdea627f45132cb8331f0ff86e4 (patch)
tree0eed3bec596c310e5d29ebc489db31b06cf4e629 /src/live_effects
parentAllow style as attribute in CopyRotate LPE and Mirror Symmetry (diff)
downloadinkscape-1b7952931eca6cdea627f45132cb8331f0ff86e4.tar.gz
inkscape-1b7952931eca6cdea627f45132cb8331f0ff86e4.zip
Rename wrong named function
Diffstat (limited to 'src/live_effects')
-rw-r--r--src/live_effects/lpe-copy_rotate.cpp8
-rw-r--r--src/live_effects/lpe-copy_rotate.h2
-rw-r--r--src/live_effects/lpe-mirror_symmetry.cpp9
-rw-r--r--src/live_effects/lpe-mirror_symmetry.h2
4 files changed, 10 insertions, 11 deletions
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 9748fb6da..b969b59eb 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -191,7 +191,7 @@ LPECopyRotate::doAfterEffect (SPLPEItem const* lpeitem)
}
}
-void LPECopyRotate::sp_clone_style(SPObject *orig, SPObject *dest)
+void LPECopyRotate::cloneStyle(SPObject *orig, SPObject *dest)
{
dest->getRepr()->setAttribute("style", orig->getRepr()->attribute("style"));
for (auto iter : orig->style->properties()) {
@@ -216,7 +216,7 @@ LPECopyRotate::cloneD(SPObject *orig, SPObject *dest, Geom::Affine transform, bo
Inkscape::XML::Document *xml_doc = document->getReprDoc();
if ( SP_IS_GROUP(orig) && SP_IS_GROUP(dest) && SP_GROUP(orig)->getItemCount() == SP_GROUP(dest)->getItemCount() ) {
if (reset) {
- sp_clone_style(orig, dest);
+ cloneStyle(orig, dest);
}
std::vector< SPObject * > childs = orig->childList(true);
size_t index = 0;
@@ -230,7 +230,7 @@ LPECopyRotate::cloneD(SPObject *orig, SPObject *dest, Geom::Affine transform, bo
if ( SP_IS_TEXT(orig) && SP_IS_TEXT(dest) && SP_TEXT(orig)->children.size() == SP_TEXT(dest)->children.size()) {
if (reset) {
- sp_clone_style(orig, dest);
+ cloneStyle(orig, dest);
}
size_t index = 0;
for (auto & child : SP_TEXT(orig)->children) {
@@ -266,7 +266,7 @@ LPECopyRotate::cloneD(SPObject *orig, SPObject *dest, Geom::Affine transform, bo
}
if (reset) {
- sp_clone_style(orig, dest);
+ cloneStyle(orig, dest);
}
}
diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h
index 519fa8e59..7bf203fcb 100644
--- a/src/live_effects/lpe-copy_rotate.h
+++ b/src/live_effects/lpe-copy_rotate.h
@@ -45,7 +45,7 @@ public:
void doOnRemove (SPLPEItem const* /*lpeitem*/) override;
void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/) override;
Gtk::Widget * newWidget() override;
- void sp_clone_style(SPObject *orig, SPObject *dest);
+ void cloneStyle(SPObject *orig, SPObject *dest);
Geom::PathVector doEffect_path_post (Geom::PathVector const & path_in);
void toItem(Geom::Affine transform, size_t i, bool reset);
void cloneD(SPObject *orig, SPObject *dest, Geom::Affine transform, bool reset);
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index d07079b40..2d49c5cd4 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -31,7 +31,6 @@
#include "object/sp-lpe-item.h"
#include "object/sp-path.h"
#include "object/sp-text.h"
-#include "style.h"
#include "xml/sp-css-attr.h"
@@ -272,7 +271,7 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem)
previous_center = center_point;
}
-void LPEMirrorSymmetry::sp_clone_style(SPObject *orig, SPObject *dest)
+void LPEMirrorSymmetry::cloneStyle(SPObject *orig, SPObject *dest)
{
dest->getRepr()->setAttribute("style", orig->getRepr()->attribute("style"));
for (auto iter : orig->style->properties()) {
@@ -300,7 +299,7 @@ LPEMirrorSymmetry::cloneD(SPObject *orig, SPObject *dest, bool reset)
Inkscape::XML::Document *xml_doc = document->getReprDoc();
if ( SP_IS_GROUP(orig) && SP_IS_GROUP(dest) && SP_GROUP(orig)->getItemCount() == SP_GROUP(dest)->getItemCount() ) {
if (reset) {
- sp_clone_style(orig, dest);
+ cloneStyle(orig, dest);
}
std::vector< SPObject * > childs = orig->childList(true);
size_t index = 0;
@@ -314,7 +313,7 @@ LPEMirrorSymmetry::cloneD(SPObject *orig, SPObject *dest, bool reset)
if (SP_IS_TEXT(orig) && SP_IS_TEXT(dest) && SP_TEXT(orig)->children.size() == SP_TEXT(dest)->children.size()) {
if (reset) {
- sp_clone_style(orig, dest);
+ cloneStyle(orig, dest);
}
size_t index = 0;
for (auto &child : SP_TEXT(orig)->children) {
@@ -338,7 +337,7 @@ LPEMirrorSymmetry::cloneD(SPObject *orig, SPObject *dest, bool reset)
}
}
if (reset) {
- sp_clone_style(orig, dest);
+ cloneStyle(orig, dest);
}
}
diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h
index ffbbf33f5..3653d139c 100644
--- a/src/live_effects/lpe-mirror_symmetry.h
+++ b/src/live_effects/lpe-mirror_symmetry.h
@@ -49,7 +49,7 @@ public:
void doOnRemove (SPLPEItem const* /*lpeitem*/) override;
void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/) override;
Gtk::Widget * newWidget() override;
- void sp_clone_style(SPObject *orig, SPObject *dest);
+ void cloneStyle(SPObject *orig, SPObject *dest);
void toMirror(Geom::Affine transform, bool reset);
void cloneD(SPObject *orig, SPObject *dest, bool reset);
Inkscape::XML::Node * createPathBase(SPObject *elemref);