From a7f2b2ba3f13ceb60376802f4a31e104153839e8 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Tue, 17 Feb 2015 03:00:37 +0100 Subject: At first, I was thinking "I just have to go to the selection file, and change that GSList* with a std::list, then resolve the few problems" So, i tried that. And I will continue tomorrow, and the days after, on and on. (bzr r13922.1.1) --- src/desktop-style.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'src/desktop-style.h') diff --git a/src/desktop-style.h b/src/desktop-style.h index 40ca27e9e..0e40a2652 100644 --- a/src/desktop-style.h +++ b/src/desktop-style.h @@ -13,6 +13,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include "selection.h" // SelContainer class ColorRGBA; class SPCSSAttr; class SPDesktop; @@ -64,21 +65,21 @@ guint32 sp_desktop_get_color_tool(SPDesktop *desktop, Glib::ustring const &tool, double sp_desktop_get_font_size_tool (SPDesktop *desktop); void sp_desktop_apply_style_tool(SPDesktop *desktop, Inkscape::XML::Node *repr, Glib::ustring const &tool, bool with_text); -gdouble stroke_average_width (GSList const *objects); +gdouble stroke_average_width (const SelContainer &objects); -int objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill); -int objects_query_fontnumbers (GSList *objects, SPStyle *style_res); -int objects_query_fontstyle (GSList *objects, SPStyle *style_res); -int objects_query_fontfamily (GSList *objects, SPStyle *style_res); -int objects_query_opacity (GSList *objects, SPStyle *style_res); -int objects_query_strokewidth (GSList *objects, SPStyle *style_res); -int objects_query_miterlimit (GSList *objects, SPStyle *style_res); -int objects_query_strokecap (GSList *objects, SPStyle *style_res); -int objects_query_strokejoin (GSList *objects, SPStyle *style_res); +int objects_query_fillstroke (const SelContainer &objects, SPStyle *style_res, bool const isfill); +int objects_query_fontnumbers (const SelContainer &objects, SPStyle *style_res); +int objects_query_fontstyle (const SelContainer &objects, SPStyle *style_res); +int objects_query_fontfamily (const SelContainer &objects, SPStyle *style_res); +int objects_query_opacity (const SelContainer &objects, SPStyle *style_res); +int objects_query_strokewidth (const SelContainer &objects, SPStyle *style_res); +int objects_query_miterlimit (const SelContainer &objects, SPStyle *style_res); +int objects_query_strokecap (const SelContainer &objects, SPStyle *style_res); +int objects_query_strokejoin (const SelContainer &objects, SPStyle *style_res); -int objects_query_blur (GSList *objects, SPStyle *style_res); +int objects_query_blur (const SelContainer &objects, SPStyle *style_res); -int sp_desktop_query_style_from_list (GSList *list, SPStyle *style, int property); +int sp_desktop_query_style_from_list (const SelContainer &list, SPStyle *style, int property); int sp_desktop_query_style(SPDesktop *desktop, SPStyle *style, int property); bool sp_desktop_query_style_all (SPDesktop *desktop, SPStyle *query); -- cgit v1.2.3