summaryrefslogtreecommitdiffstats
path: root/src/style.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2014-12-24 10:27:30 +0000
committertavmjong-free <tavmjong@free.fr>2014-12-24 10:27:30 +0000
commitc10ae6598c095b0273672f764f0fe0e684c94b87 (patch)
treed837f1351dc1aa71f23eaf063b805e64cb4d336b /src/style.cpp
parentAdd missing SPStyle::readFromPrefs(), remove sp_style_read_from_prefs(). (diff)
downloadinkscape-c10ae6598c095b0273672f764f0fe0e684c94b87.tar.gz
inkscape-c10ae6598c095b0273672f764f0fe0e684c94b87.zip
Remove sp_style_read_from_object()
(bzr r13822.1.3)
Diffstat (limited to 'src/style.cpp')
-rw-r--r--src/style.cpp32
1 files changed, 7 insertions, 25 deletions
diff --git a/src/style.cpp b/src/style.cpp
index f677e4a76..b91b3d774 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -576,7 +576,13 @@ SPStyle::read( SPObject *object, Inkscape::XML::Node *repr ) {
}
}
-// Matches void sp_style_read_from_object(SPStyle *style, SPObject *object);
+/**
+ * Read style properties from object's repr.
+ *
+ * 1. Reset existing object style
+ * 2. Load current effective object style
+ * 3. Load i attributes from immediate parent (which has to be up-to-date)
+ */
void
SPStyle::readFromObject( SPObject *object ) {
@@ -1215,30 +1221,6 @@ sp_style_unref(SPStyle *style)
return style;
}
-
-
-// Called in: sp-clippath.cpp, sp-item.cpp (suspicious), sp-object.cpp, sp-style-elem.cpp
-/**
- * Read style properties from object's repr.
- *
- * 1. Reset existing object style
- * 2. Load current effective object style
- * 3. Load i attributes from immediate parent (which has to be up-to-date)
- */
-void
-sp_style_read_from_object(SPStyle *style, SPObject *object)
-{
- // std::cout << "sp_style_read_from_object: " << (object->getId()?object->getId():"null") << std::endl;
- g_return_if_fail(style != NULL);
- g_return_if_fail(object != NULL);
- g_return_if_fail(SP_IS_OBJECT(object));
-
- Inkscape::XML::Node *repr = object->getRepr();
- g_return_if_fail(repr != NULL);
-
- style->read( object, repr );
-}
-
static CRSelEng *
sp_repr_sel_eng()
{