From d5b02f3b6e00a373d1e49c49cf07112b1da54e34 Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Wed, 14 Nov 2018 05:49:57 -0500
Subject: Move getStyles to styles and clean up on destruction.

---
 src/object/sp-style-elem.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/object/sp-style-elem.cpp')

diff --git a/src/object/sp-style-elem.cpp b/src/object/sp-style-elem.cpp
index de2041764..e0080e334 100644
--- a/src/object/sp-style-elem.cpp
+++ b/src/object/sp-style-elem.cpp
@@ -450,23 +450,6 @@ void update_style_recursively( SPObject *object ) {
     }
 }
 
-/*
- * Returns each statement as an SPStyle
- */
-std::vector<SPStyle *> SPStyleElem::getStyles() {
-    std::vector<SPStyle *> ret;
-    gint count = cr_stylesheet_nr_rules(style_sheet);
-
-    for (gint x = 0; x < count; x++) {
-        SPStyle *item = new SPStyle(nullptr, nullptr);
-        CRStatement *statement = cr_stylesheet_statement_get_from_list(style_sheet, x);
-        item->mergeStatement(statement);
-        ret.push_back(item);
-    }
-
-    return ret;
-}
-
 void SPStyleElem::read_content() {
 
     // First, create the style-sheet object and track it in this
@@ -505,6 +488,16 @@ void SPStyleElem::read_content() {
     cr_parser_destroy(parser);
     delete parse_tmp;
 
+    //Record each css statement as an SPStyle
+    gint count = cr_stylesheet_nr_rules(style_sheet);
+
+    for (gint x = 0; x < count; x++) {
+        SPStyle *item = new SPStyle(nullptr, nullptr);
+        CRStatement *statement = cr_stylesheet_statement_get_from_list(style_sheet, x);
+        item->mergeStatement(statement);
+        styles.push_back(item);
+    }
+
     // If style sheet has changed, we need to cascade the entire object tree, top down
     // Get root, read style, loop through children
     update_style_recursively( (SPObject *)document->getRoot() );
@@ -542,6 +535,13 @@ void SPStyleElem::build(SPDocument *document, Inkscape::XML::Node *repr) {
     SPObject::build(document, repr);
 }
 
+void SPStyleElem::release() {
+    while(!styles.empty()) {
+        auto style = styles.back();
+        sp_style_unref(style);
+        styles.pop_back();
+    }
+}
 
 
 /*
-- 
cgit v1.2.3