diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-08-04 13:19:52 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-08-04 13:19:52 +0000 |
| commit | c87f9bac5947a51cac43d3487c76aac005d81af8 (patch) | |
| tree | e4ee49c51388a490fa9cf789df32f2a97ef49e58 /src/marker.cpp | |
| parent | Cleaned up once more. (diff) | |
| parent | catch exception by reference (diff) | |
| download | inkscape-c87f9bac5947a51cac43d3487c76aac005d81af8.tar.gz inkscape-c87f9bac5947a51cac43d3487c76aac005d81af8.zip | |
Merged from trunk (r12465).
(bzr r11608.1.119)
Diffstat (limited to 'src/marker.cpp')
| -rw-r--r-- | src/marker.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/marker.cpp b/src/marker.cpp index 518895a57..730985b01 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -571,7 +571,6 @@ void sp_marker_show_dimension (SPMarker *marker, unsigned int key, unsigned int size) { SPMarkerView *view; - unsigned int i; for (view = marker->views; view != NULL; view = view->next) { if (view->key == key) break; @@ -587,7 +586,7 @@ sp_marker_show_dimension (SPMarker *marker, unsigned int key, unsigned int size) if (!view) { view = new SPMarkerView(); view->items.clear(); - for (i = 0; i < size; i++) { + for (unsigned int i = 0; i < size; i++) { view->items.push_back(NULL); } view->next = marker->views; @@ -681,7 +680,6 @@ sp_marker_hide (SPMarker *marker, unsigned int key) static void sp_marker_view_remove (SPMarker *marker, SPMarkerView *view, unsigned int destroyitems) { - unsigned int i; if (view == marker->views) { marker->views = view->next; } else { @@ -690,7 +688,7 @@ sp_marker_view_remove (SPMarker *marker, SPMarkerView *view, unsigned int destro v->next = view->next; } if (destroyitems) { - for (i = 0; i < view->items.size(); i++) { + for (unsigned int i = 0; i < view->items.size(); i++) { /* We have to walk through the whole array because there may be hidden items */ delete view->items[i]; } |