Warning cleanup

(bzr r4025)

1 files changed, 84 insertions, 84 deletions

diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index 7739238b4..10e0c43d4 100644
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
@@ -27,7 +27,7 @@
 #include "text-editing.h"
 
 Inkscape::ObjectSnapper::ObjectSnapper(SPNamedView const *nv, NR::Coord const d)
-    : Snapper(nv, d), _snap_to_itemnode(true), _snap_to_itempath(true), 
+    : Snapper(nv, d), _snap_to_itemnode(true), _snap_to_itempath(true),
     _snap_to_bboxnode(true), _snap_to_bboxpath(true), _strict_snapping(true),
     _include_item_center(false)
 {
@@ -36,14 +36,14 @@ Inkscape::ObjectSnapper::ObjectSnapper(SPNamedView const *nv, NR::Coord const d)
     _paths_to_snap_to = new std::vector<Path*>;
 }
 
-Inkscape::ObjectSnapper::~ObjectSnapper() 
+Inkscape::ObjectSnapper::~ObjectSnapper()
 {
     _candidates->clear(); //Don't delete the candidates themselves, as these are not ours!
-    delete _candidates;    
-    
+    delete _candidates;
+
     _points_to_snap_to->clear();
     delete _points_to_snap_to;
-    
+
     for (std::vector<Path*>::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) {
         delete *k;
     }
@@ -52,11 +52,11 @@ Inkscape::ObjectSnapper::~ObjectSnapper()
 }
 
 /**
- *    Find all items within snapping range.  
+ *    Find all items within snapping range.
  *     \param r Pointer to the current document
- *  \param it List of items to ignore 
- *  \param first_point If true then this point is the first one from a whole bunch of points 
- *  \param points_to_snap The whole bunch of points, all from the same selection and having the same transformation 
+ *  \param it List of items to ignore
+ *  \param first_point If true then this point is the first one from a whole bunch of points
+ *  \param points_to_snap The whole bunch of points, all from the same selection and having the same transformation
  *  \param DimensionToSnap Snap in X, Y, or both directions.
  */
 
@@ -66,47 +66,47 @@ void Inkscape::ObjectSnapper::_findCandidates(SPObject* r,
                                               std::vector<NR::Point> &points_to_snap,
                                               DimensionToSnap const snap_dim) const
 {
-    if (ThisSnapperMightSnap()) {    
+    if (ThisSnapperMightSnap()) {
         SPDesktop const *desktop = SP_ACTIVE_DESKTOP;
-        
-        if (first_point) { 
+
+        if (first_point) {
             _candidates->clear();
-        }        
-                
+        }
+
         for (SPObject* o = sp_object_first_child(r); o != NULL; o = SP_OBJECT_NEXT(o)) {
             if (SP_IS_ITEM(o) && !SP_ITEM(o)->isLocked() && !desktop->itemIsHidden(SP_ITEM(o))) {
-    
+
                 /* See if this item is on the ignore list */
                 std::list<SPItem const *>::const_iterator i = it.begin();
                 while (i != it.end() && *i != o) {
                     i++;
                 }
-    
+
                 if (i == it.end()) {
                     /* See if the item is within range */
                     if (SP_IS_GROUP(o)) {
                         _findCandidates(o, it, false, points_to_snap, snap_dim);
                     } else {
                         // Now let's see if any of the snapping points is within
-                        // snapping range of this object  
+                        // snapping range of this object
                         NR::Maybe<NR::Rect> b = sp_item_bbox_desktop(SP_ITEM(o));
                         if (b) {
                             for (std::vector<NR::Point>::const_iterator i = points_to_snap.begin(); i != points_to_snap.end(); i++) {
                                 NR::Point b_min = b->min();
-                                NR::Point b_max = b->max();                                
+                                NR::Point b_max = b->max();
                                 double d = getDistance();
-                                bool withinX = ((*i)[NR::X] >= b_min[NR::X] - d) && ((*i)[NR::X] <= b_max[NR::X] + d); 
+                                bool withinX = ((*i)[NR::X] >= b_min[NR::X] - d) && ((*i)[NR::X] <= b_max[NR::X] + d);
                                 bool withinY = ((*i)[NR::Y] >= b_min[NR::Y] - d) && ((*i)[NR::Y] <= b_max[NR::Y] + d);
                                 if (snap_dim == SNAP_X && withinX || snap_dim == SNAP_Y && withinY || snap_dim == SNAP_XY && withinX && withinY) {
-                                    //We've found a point that is within snapping range 
+                                    //We've found a point that is within snapping range
                                     //of this object, so record it as a candidate
                                     _candidates->push_back(SP_ITEM(o));
                                     break;
-                                }    
-                            }    
+                                }
+                            }
                         }
                     }
-                }    
+                }
             }
         }
     }
@@ -120,20 +120,20 @@ bool Inkscape::ObjectSnapper::_snapNodes(Inkscape::Snapper::PointType const &t,
                                          DimensionToSnap const snap_dim) const
 {
     bool success = false;
-    
+
     // Determine the type of bounding box we should snap to
-    SPItem::BBoxType bbox_type = SPItem::GEOMETRIC_BBOX; 
-    if (_snap_to_bboxnode) {    
+    SPItem::BBoxType bbox_type = SPItem::GEOMETRIC_BBOX;
+    if (_snap_to_bboxnode) {
         gchar const *prefs_bbox = prefs_get_string_attribute("tools.select", "bounding_box");
         bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::APPROXIMATE_BBOX;
-    }        
-    
-    bool p_is_a_node = t & Inkscape::Snapper::SNAPPOINT_NODE;        
-    bool p_is_a_bbox = t & Inkscape::Snapper::SNAPPOINT_BBOX; 
+    }
+
+    bool p_is_a_node = t & Inkscape::Snapper::SNAPPOINT_NODE;
+    bool p_is_a_bbox = t & Inkscape::Snapper::SNAPPOINT_BBOX;
     bool p_is_a_guide = t & Inkscape::Snapper::SNAPPOINT_GUIDE;
-    
-    // A point considered for snapping should be either a node, a bbox corner or a guide. Pick only ONE! 
-    g_assert(!(p_is_a_node && p_is_a_bbox || p_is_a_bbox && p_is_a_guide || p_is_a_node && p_is_a_guide));    
+
+    // A point considered for snapping should be either a node, a bbox corner or a guide. Pick only ONE!
+    g_assert(!(p_is_a_node && p_is_a_bbox || p_is_a_bbox && p_is_a_guide || p_is_a_node && p_is_a_guide));
 
     // Now, let's first collect all points to snap to. If we have a whole bunch of points to snap,
     // e.g. when translating an item using the selector tool, then we will only do this for the
@@ -141,20 +141,20 @@ bool Inkscape::ObjectSnapper::_snapNodes(Inkscape::Snapper::PointType const &t,
     if (first_point) {
         _points_to_snap_to->clear();
         for (std::vector<SPItem*>::const_iterator i = _candidates->begin(); i != _candidates->end(); i++) {
-            
+
             //NR::Matrix i2doc(NR::identity());
             SPItem *root_item = *i;
             if (SP_IS_USE(*i)) {
                 root_item = sp_use_root(SP_USE(*i));
             }
-              
+
             //Collect all nodes so we can snap to them
             if (_snap_to_itemnode) {
                 if (!(_strict_snapping && !p_is_a_node) || p_is_a_guide) {
                     sp_item_snappoints(root_item, _include_item_center, SnapPointsIter(*_points_to_snap_to));
                 }
             }
-            
+
             //Collect the bounding box's corners so we can snap to them
             if (_snap_to_bboxnode) {
                 if (!(_strict_snapping && !p_is_a_bbox) || p_is_a_guide) {
@@ -164,11 +164,11 @@ bool Inkscape::ObjectSnapper::_snapNodes(Inkscape::Snapper::PointType const &t,
                             _points_to_snap_to->push_back(b->corner(k));
                         }
                     }
-                }        
+                }
             }
         }
     }
-    
+
     //Do the snapping, using all the nodes and corners collected above
     for (std::vector<NR::Point>::const_iterator k = _points_to_snap_to->begin(); k != _points_to_snap_to->end(); k++) {
         /* Try to snap to this node of the path */
@@ -177,7 +177,7 @@ bool Inkscape::ObjectSnapper::_snapNodes(Inkscape::Snapper::PointType const &t,
         switch (snap_dim) {
             case SNAP_X:
                 dist = fabs((*k)[NR::X] - p[NR::X]);
-                snapped_point = NR::Point((*k)[NR::X], p[NR::Y]); 
+                snapped_point = NR::Point((*k)[NR::X], p[NR::Y]);
                 break;
             case SNAP_Y:
                 dist = fabs((*k)[NR::Y] - p[NR::Y]);
@@ -188,13 +188,13 @@ bool Inkscape::ObjectSnapper::_snapNodes(Inkscape::Snapper::PointType const &t,
                 snapped_point = *k;
                 break;
         }
-        
+
         if (dist < getDistance() && dist < s.getDistance()) {
             s = SnappedPoint(snapped_point, dist);
             success = true;
-        }       
+        }
     }
-    
+
     return success;
 }
 
@@ -211,26 +211,26 @@ bool Inkscape::ObjectSnapper::_snapPaths(Inkscape::Snapper::PointType const &t,
     SPDesktop const *desktop = SP_ACTIVE_DESKTOP;
 
     NR::Point const p_doc = desktop->dt2doc(p);
-    
+
     // Determine the type of bounding box we should snap to
-    SPItem::BBoxType bbox_type = SPItem::GEOMETRIC_BBOX; 
-    if (_snap_to_bboxpath) {    
+    SPItem::BBoxType bbox_type = SPItem::GEOMETRIC_BBOX;
+    if (_snap_to_bboxpath) {
         gchar const *prefs_bbox = prefs_get_string_attribute("tools.select", "bounding_box");
-        bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::APPROXIMATE_BBOX;        
+        bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::APPROXIMATE_BBOX;
     }
-    
-    bool p_is_a_node = t & Inkscape::Snapper::SNAPPOINT_NODE;        
-    
+
+    bool p_is_a_node = t & Inkscape::Snapper::SNAPPOINT_NODE;
+
     // Now, let's first collect all paths to snap to. If we have a whole bunch of points to snap,
     // e.g. when translating an item using the selector tool, then we will only do this for the
     // first point and store the collection for later use. This dramatically improves the performance
-    if (first_point) {        
+    if (first_point) {
         for (std::vector<Path*>::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) {
             delete *k;
         }
         _paths_to_snap_to->clear();
         for (std::vector<SPItem*>::const_iterator i = _candidates->begin(); i != _candidates->end(); i++) {
-    
+
             /* Transform the requested snap point to this item's coordinates */
             NR::Matrix i2doc(NR::identity());
             SPItem *root_item = NULL;
@@ -242,9 +242,9 @@ bool Inkscape::ObjectSnapper::_snapPaths(Inkscape::Snapper::PointType const &t,
                 i2doc = sp_item_i2doc_affine(*i);
                 root_item = *i;
             }
-            
-            //Build a list of all paths considered for snapping to            
-            
+
+            //Build a list of all paths considered for snapping to
+
             //Add the item's path to snap to
             if (_snap_to_itempath) {
                 if (!(_strict_snapping && !p_is_a_node)) {
@@ -253,29 +253,29 @@ bool Inkscape::ObjectSnapper::_snapPaths(Inkscape::Snapper::PointType const &t,
                     // containing max. 240 characters. Snapping the bbox will not be affected
                     bool very_lenghty_prose = false;
                     if (SP_IS_TEXT(root_item) || SP_IS_FLOWTEXT(root_item)) {
-                        very_lenghty_prose =  sp_text_get_length(SP_TEXT(root_item)) > 240; 
+                        very_lenghty_prose =  sp_text_get_length(SP_TEXT(root_item)) > 240;
                     }
                     // On my AMD 3000+, the snapping lag becomes annoying at approx. 240 chars
                     // which corresponds to a lag of 500 msec. This is for snapping a rect
-                    // to a single line of text. 
-                    
-                    // Snapping for example to a traced bitmap is also very stressing for 
+                    // to a single line of text.
+
+                    // Snapping for example to a traced bitmap is also very stressing for
                     // the CPU, so we'll only snap to paths having no more than 500 nodes
-                    // This also leads to a lag of approx. 500 msec (in my lousy test set-up). 
+                    // This also leads to a lag of approx. 500 msec (in my lousy test set-up).
                     bool very_complex_path = false;
                     if (SP_IS_PATH(root_item)) {
-                        very_complex_path = sp_nodes_in_path(SP_PATH(root_item)) > 500; 
-                    }                                          
-                    
+                        very_complex_path = sp_nodes_in_path(SP_PATH(root_item)) > 500;
+                    }
+
                      if (!very_lenghty_prose && !very_complex_path) {
                         _paths_to_snap_to->push_back(Path_for_item(root_item, true, true));
                      }
                 }
             }
-                    
+
             //Add the item's bounding box to snap to
             if (_snap_to_bboxpath) {
-                if (!(_strict_snapping && p_is_a_node)) {                
+                if (!(_strict_snapping && p_is_a_node)) {
                     //This will get ugly... rect -> curve -> bpath
                     NRRect rect;
                     sp_item_invoke_bbox(root_item, &rect, i2doc, TRUE, bbox_type);
@@ -284,43 +284,43 @@ bool Inkscape::ObjectSnapper::_snapPaths(Inkscape::Snapper::PointType const &t,
                     if (curve) {
                         NArtBpath *bpath = SP_CURVE_BPATH(curve);
                         if (bpath) {
-                            Path *path = bpath_to_Path(bpath);  
+                            Path *path = bpath_to_Path(bpath);
                             if (path) {
                                 _paths_to_snap_to->push_back(path);
                             }
                             delete bpath;
-                        }    
-                        delete curve;                        
+                        }
+                        delete curve;
                     }
                 }
             }
         }
     }
 
-    //Now we can finally do the real snapping, using the paths collected above        
+    //Now we can finally do the real snapping, using the paths collected above
     for (std::vector<Path*>::const_iterator k = _paths_to_snap_to->begin(); k != _paths_to_snap_to->end(); k++) {
         if (*k) {
             if (first_point) {
                 (*k)->ConvertWithBackData(0.01); //This is extremely time consuming!
             }
-        
+
             /* Look for the nearest position on this SPItem to our snap point */
             NR::Maybe<Path::cut_position> const o = get_nearest_position_on_Path(*k, p_doc);
             if (o && o->t >= 0 && o->t <= 1) {
-    
+
                 /* Convert the nearest point back to desktop coordinates */
-                NR::Point const o_it = get_point_on_Path(*k, o->piece, o->t);                    
+                NR::Point const o_it = get_point_on_Path(*k, o->piece, o->t);
                 NR::Point const o_dt = desktop->doc2dt(o_it);
-                
+
                 NR::Coord const dist = NR::L2(o_dt - p);
                 if (dist < getDistance() && dist < s.getDistance()) {
                     s = SnappedPoint(o_dt, dist);
                     success = true;
                 }
             }
-        }        
+        }
     }
-    
+
     return success;
 }
 
@@ -359,13 +359,13 @@ void Inkscape::ObjectSnapper::_doFreeSnap(SnappedConstraints &sc,
 
 
 
-void Inkscape::ObjectSnapper::_doConstrainedSnap(SnappedConstraints &sc,
-                                                   Inkscape::Snapper::PointType const &t,
-                                                   NR::Point const &p,
-                                                   bool const &first_point,
-                                                    std::vector<NR::Point> &points_to_snap,
-                                                   ConstraintLine const &c,
-                                                   std::list<SPItem const *> const &it) const
+void Inkscape::ObjectSnapper::_doConstrainedSnap( SnappedConstraints &sc,
+                                                  Inkscape::Snapper::PointType const &t,
+                                                  NR::Point const &p,
+                                                  bool const &first_point,
+                                                  std::vector<NR::Point> &points_to_snap,
+                                                  ConstraintLine const &/*c*/,
+                                                  std::list<SPItem const *> const &it) const
 {
     /* FIXME: this needs implementing properly; I think we have to do the
     ** intersection of c with the objects.
@@ -385,15 +385,15 @@ Inkscape::SnappedPoint Inkscape::ObjectSnapper::guideSnap(NR::Point const &p,
     /* Get a list of all the SPItems that we will try to snap to */
     std::vector<SPItem*> cand;
     std::list<SPItem const *> const it; //just an empty list
-    
+
     std::vector<NR::Point> points_to_snap;
     points_to_snap.push_back(p);
-    
+
     _findCandidates(sp_document_root(_named_view->document), it, true, points_to_snap, snap_dim);
 
     SnappedPoint s(p, NR_HUGE);
     _snapNodes(Inkscape::Snapper::SNAPPOINT_GUIDE, s, p, true, snap_dim);
-    
+
     return s;
 }