Put a few std::vector<SPitem*>

(bzr r13922.1.5)

1 files changed, 33 insertions, 33 deletions

diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 39dfad44b..0c661ebfb 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -194,8 +194,8 @@ sp_desktop_set_style(SPDesktop *desktop, SPCSSAttr *css, bool change, bool write
         sp_repr_css_merge(css_write, css);
         sp_css_attr_unset_uris(css_write);
         prefs->mergeStyle("/desktop/style", css_write);
-        SelContainer const itemlist = desktop->selection->itemList();
-        for (SelContainer::const_iterator i=itemlist.begin();i!=itemlist.end();i++) {
+        std::vector<SPItem*> const itemlist = desktop->selection->itemList();
+        for (std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++) {
             /* last used styles for 3D box faces are stored separately */
             SPObject *obj = reinterpret_cast<SPObject *>(*i); // TODO unsafe until Selection is refactored.
             Box3DSide *side = dynamic_cast<Box3DSide *>(obj);
@@ -234,8 +234,8 @@ sp_desktop_set_style(SPDesktop *desktop, SPCSSAttr *css, bool change, bool write
         sp_repr_css_merge(css_no_text, css);
         css_no_text = sp_css_attr_unset_text(css_no_text);
 
-        SelContainer const itemlist = desktop->selection->itemList();
-        for (SelContainer::const_iterator i=itemlist.begin();i!=itemlist.end();i++) {
+        std::vector<SPItem*> const itemlist = desktop->selection->itemList();
+        for (std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++) {
             SPItem *item = reinterpret_cast<SPItem *>(*i);
 
             // If not text, don't apply text attributes (can a group have text attributes? Yes! FIXME)
@@ -439,7 +439,7 @@ sp_desktop_get_font_size_tool(SPDesktop *desktop)
 /** Determine average stroke width, simple method */
 // see TODO in dialogs/stroke-style.cpp on how to get rid of this eventually
 gdouble
-stroke_average_width (const SelContainer &objects)
+stroke_average_width (const std::vector<SPItem*> &objects)
 {
     if (objects.empty())
         return Geom::infinity();
@@ -447,7 +447,7 @@ stroke_average_width (const SelContainer &objects)
     gdouble avgwidth = 0.0;
     bool notstroked = true;
     int n_notstroked = 0;
-    for (SelContainer::const_iterator i=objects.begin();i!=objects.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=objects.begin();i!=objects.end();i++) {
         SPObject *obj = reinterpret_cast<SPObject *>(*i);
         SPItem *item = dynamic_cast<SPItem *>(obj);
         if (!item) {
@@ -492,7 +492,7 @@ static bool vectorsClose( std::vector<double> const &lhs, std::vector<double> co
  * Write to style_res the average fill or stroke of list of objects, if applicable.
  */
 int
-objects_query_fillstroke (const SelContainer &objects, SPStyle *style_res, bool const isfill)
+objects_query_fillstroke (const std::vector<SPItem*> &objects, SPStyle *style_res, bool const isfill)
 {
     if (objects.empty()) {
         /* No objects, set empty */
@@ -514,7 +514,7 @@ objects_query_fillstroke (const SelContainer &objects, SPStyle *style_res, bool
     prev[0] = prev[1] = prev[2] = 0.0;
     bool same_color = true;
 
-    for (SelContainer::const_iterator i=objects.begin();i!=objects.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=objects.begin();i!=objects.end();i++) {
         SPObject *obj = reinterpret_cast<SPObject *>(*i);
         if (!obj) {
             continue;
@@ -685,7 +685,7 @@ objects_query_fillstroke (const SelContainer &objects, SPStyle *style_res, bool
  * Write to style_res the average opacity of a list of objects.
  */
 int
-objects_query_opacity (const SelContainer &objects, SPStyle *style_res)
+objects_query_opacity (const std::vector<SPItem*> &objects, SPStyle *style_res)
 {
     if (objects.empty()) {
         /* No objects, set empty */
@@ -698,7 +698,7 @@ objects_query_opacity (const SelContainer &objects, SPStyle *style_res)
     guint opacity_items = 0;
 
 
-    for (SelContainer::const_iterator i=objects.begin();i!=objects.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=objects.begin();i!=objects.end();i++) {
         SPObject *obj = reinterpret_cast<SPObject *>(*i);
         if (!obj) {
             continue;
@@ -739,7 +739,7 @@ objects_query_opacity (const SelContainer &objects, SPStyle *style_res)
  * Write to style_res the average stroke width of a list of objects.
  */
 int
-objects_query_strokewidth (const SelContainer &objects, SPStyle *style_res)
+objects_query_strokewidth (const std::vector<SPItem*> &objects, SPStyle *style_res)
 {
     if (objects.empty()) {
         /* No objects, set empty */
@@ -754,7 +754,7 @@ objects_query_strokewidth (const SelContainer &objects, SPStyle *style_res)
 
     int n_stroked = 0;
 
-    for (SelContainer::const_iterator i=objects.begin();i!=objects.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=objects.begin();i!=objects.end();i++) {
         SPObject *obj = reinterpret_cast<SPObject *>(*i);
         if (!obj) {
             continue;
@@ -815,7 +815,7 @@ objects_query_strokewidth (const SelContainer &objects, SPStyle *style_res)
  * Write to style_res the average miter limit of a list of objects.
  */
 int
-objects_query_miterlimit (const SelContainer &objects, SPStyle *style_res)
+objects_query_miterlimit (const std::vector<SPItem*> &objects, SPStyle *style_res)
 {
     if (objects.empty()) {
         /* No objects, set empty */
@@ -828,7 +828,7 @@ objects_query_miterlimit (const SelContainer &objects, SPStyle *style_res)
     gdouble prev_ml = -1;
     bool same_ml = true;
 
-    for (SelContainer::const_iterator i=objects.begin();i!=objects.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=objects.begin();i!=objects.end();i++) {
         SPObject *obj = reinterpret_cast<SPObject *>(*i);
         if (!dynamic_cast<SPItem *>(obj)) {
             continue;
@@ -875,7 +875,7 @@ objects_query_miterlimit (const SelContainer &objects, SPStyle *style_res)
  * Write to style_res the stroke cap of a list of objects.
  */
 int
-objects_query_strokecap (const SelContainer &objects, SPStyle *style_res)
+objects_query_strokecap (const std::vector<SPItem*> &objects, SPStyle *style_res)
 {
     if (objects.empty()) {
         /* No objects, set empty */
@@ -887,7 +887,7 @@ objects_query_strokecap (const SelContainer &objects, SPStyle *style_res)
     bool same_cap = true;
     int n_stroked = 0;
 
-    for (SelContainer::const_iterator i=objects.begin();i!=objects.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=objects.begin();i!=objects.end();i++) {
         SPObject *obj = reinterpret_cast<SPObject *>(*i);
         if (!dynamic_cast<SPItem *>(obj)) {
             continue;
@@ -929,7 +929,7 @@ objects_query_strokecap (const SelContainer &objects, SPStyle *style_res)
  * Write to style_res the stroke join of a list of objects.
  */
 int
-objects_query_strokejoin (const SelContainer &objects, SPStyle *style_res)
+objects_query_strokejoin (const std::vector<SPItem*> &objects, SPStyle *style_res)
 {
     if (objects.empty()) {
         /* No objects, set empty */
@@ -941,7 +941,7 @@ objects_query_strokejoin (const SelContainer &objects, SPStyle *style_res)
     bool same_join = true;
     int n_stroked = 0;
 
-    for (SelContainer::const_iterator i=objects.begin();i!=objects.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=objects.begin();i!=objects.end();i++) {
         SPObject *obj = reinterpret_cast<SPObject *>(*i);
         if (!dynamic_cast<SPItem *>(obj)) {
             continue;
@@ -984,7 +984,7 @@ objects_query_strokejoin (const SelContainer &objects, SPStyle *style_res)
  * Write to style_res the average font size and spacing of objects.
  */
 int
-objects_query_fontnumbers (const SelContainer &objects, SPStyle *style_res)
+objects_query_fontnumbers (const std::vector<SPItem*> &objects, SPStyle *style_res)
 {
     bool different = false;
 
@@ -1004,7 +1004,7 @@ objects_query_fontnumbers (const SelContainer &objects, SPStyle *style_res)
     int texts = 0;
     int no_size = 0;
 
-    for (SelContainer::const_iterator i=objects.begin();i!=objects.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=objects.begin();i!=objects.end();i++) {
         SPObject *obj = reinterpret_cast<SPObject *>(*i);
 
         if (!isTextualItem(obj)) {
@@ -1116,14 +1116,14 @@ objects_query_fontnumbers (const SelContainer &objects, SPStyle *style_res)
  * Write to style_res the average font style of objects.
  */
 int
-objects_query_fontstyle (const SelContainer &objects, SPStyle *style_res)
+objects_query_fontstyle (const std::vector<SPItem*> &objects, SPStyle *style_res)
 {
     bool different = false;
     bool set = false;
 
     int texts = 0;
 
-    for (SelContainer::const_iterator i=objects.begin();i!=objects.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=objects.begin();i!=objects.end();i++) {
         SPObject *obj = reinterpret_cast<SPObject *>(*i);
 
         if (!isTextualItem(obj)) {
@@ -1173,7 +1173,7 @@ objects_query_fontstyle (const SelContainer &objects, SPStyle *style_res)
  * Write to style_res the baseline numbers.
  */
 static int
-objects_query_baselines (const SelContainer &objects, SPStyle *style_res)
+objects_query_baselines (const std::vector<SPItem*> &objects, SPStyle *style_res)
 {
     bool different = false;
 
@@ -1192,7 +1192,7 @@ objects_query_baselines (const SelContainer &objects, SPStyle *style_res)
 
     int texts = 0;
 
-    for (SelContainer::const_iterator i=objects.begin();i!=objects.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=objects.begin();i!=objects.end();i++) {
         SPObject *obj = reinterpret_cast<SPObject *>(*i);
 
         if (!isTextualItem(obj)) {
@@ -1269,7 +1269,7 @@ objects_query_baselines (const SelContainer &objects, SPStyle *style_res)
  * Write to style_res the average font family of objects.
  */
 int
-objects_query_fontfamily (const SelContainer &objects, SPStyle *style_res)
+objects_query_fontfamily (const std::vector<SPItem*> &objects, SPStyle *style_res)
 {
     bool different = false;
     int texts = 0;
@@ -1280,7 +1280,7 @@ objects_query_fontfamily (const SelContainer &objects, SPStyle *style_res)
     }
     style_res->font_family.set = FALSE;
 
-    for (SelContainer::const_iterator i=objects.begin();i!=objects.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=objects.begin();i!=objects.end();i++) {
         SPObject *obj = reinterpret_cast<SPObject *>(*i);
 
         // std::cout << "  " << reinterpret_cast<SPObject*>(i->data)->getId() << std::endl;
@@ -1325,7 +1325,7 @@ objects_query_fontfamily (const SelContainer &objects, SPStyle *style_res)
 }
 
 static int
-objects_query_fontspecification (const SelContainer &objects, SPStyle *style_res)
+objects_query_fontspecification (const std::vector<SPItem*> &objects, SPStyle *style_res)
 {
     bool different = false;
     int texts = 0;
@@ -1336,7 +1336,7 @@ objects_query_fontspecification (const SelContainer &objects, SPStyle *style_res
     }
     style_res->font_specification.set = FALSE;
 
-    for (SelContainer::const_iterator i=objects.begin();i!=objects.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=objects.begin();i!=objects.end();i++) {
         SPObject *obj = reinterpret_cast<SPObject *>(*i);
 
         // std::cout << "  " << reinterpret_cast<SPObject*>(i->data)->getId() << std::endl;
@@ -1385,7 +1385,7 @@ objects_query_fontspecification (const SelContainer &objects, SPStyle *style_res
 }
 
 static int
-objects_query_blend (const SelContainer &objects, SPStyle *style_res)
+objects_query_blend (const std::vector<SPItem*> &objects, SPStyle *style_res)
 {
     const int empty_prev = -2;
     const int complex_filter = 5;
@@ -1394,7 +1394,7 @@ objects_query_blend (const SelContainer &objects, SPStyle *style_res)
     bool same_blend = true;
     guint items = 0;
 
-    for (SelContainer::const_iterator i=objects.begin();i!=objects.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=objects.begin();i!=objects.end();i++) {
         SPObject *obj = reinterpret_cast<SPObject *>(*i);
         if (!obj) {
             continue;
@@ -1471,7 +1471,7 @@ objects_query_blend (const SelContainer &objects, SPStyle *style_res)
  * Write to style_res the average blurring of a list of objects.
  */
 int
-objects_query_blur (const SelContainer &objects, SPStyle *style_res)
+objects_query_blur (const std::vector<SPItem*> &objects, SPStyle *style_res)
 {
    if (objects.empty()) {
         /* No objects, set empty */
@@ -1484,7 +1484,7 @@ objects_query_blur (const SelContainer &objects, SPStyle *style_res)
     guint blur_items = 0;
     guint items = 0;
 
-    for (SelContainer::const_iterator i=objects.begin();i!=objects.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=objects.begin();i!=objects.end();i++) {
         SPObject *obj = reinterpret_cast<SPObject *>(*i);
         if (!obj) {
             continue;
@@ -1553,7 +1553,7 @@ objects_query_blur (const SelContainer &objects, SPStyle *style_res)
  * the result to style, return appropriate flag.
  */
 int
-sp_desktop_query_style_from_list (const SelContainer &list, SPStyle *style, int property)
+sp_desktop_query_style_from_list (const std::vector<SPItem*> &list, SPStyle *style, int property)
 {
     if (property == QUERY_STYLE_PROPERTY_FILL) {
         return objects_query_fillstroke (list, style, true);