diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-10-03 20:51:05 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-10-03 20:51:05 +0000 |
| commit | 4db35e8a6706ddece9e977e5f26d4a6867ff8cbe (patch) | |
| tree | f9711f260f694d96e26bf3216fb64f2b38611b2b /src/trace | |
| parent | update to trunk (diff) | |
| parent | Merge in jabiertxof's hover information for measure tool (diff) | |
| download | inkscape-4db35e8a6706ddece9e977e5f26d4a6867ff8cbe.tar.gz inkscape-4db35e8a6706ddece9e977e5f26d4a6867ff8cbe.zip | |
Update to trunk
(bzr r15017.1.35)
Diffstat (limited to 'src/trace')
| -rw-r--r-- | src/trace/Makefile_insert | 23 | ||||
| -rw-r--r-- | src/trace/trace.cpp | 4 |
2 files changed, 2 insertions, 25 deletions
diff --git a/src/trace/Makefile_insert b/src/trace/Makefile_insert deleted file mode 100644 index 27353df15..000000000 --- a/src/trace/Makefile_insert +++ /dev/null @@ -1,23 +0,0 @@ -## Makefile.am fragment sourced by src/Makefile.am. - -if HAVE_POTRACE - -ink_common_sources += \ - trace/pool.h \ - trace/trace.h \ - trace/trace.cpp \ - trace/imagemap-gdk.cpp \ - trace/imagemap-gdk.h \ - trace/imagemap.cpp \ - trace/imagemap.h \ - trace/quantize.h \ - trace/quantize.cpp \ - trace/filterset.h \ - trace/filterset.cpp \ - trace/siox.h \ - trace/siox.cpp \ - trace/potrace/bitmap.h \ - trace/potrace/inkscape-potrace.cpp \ - trace/potrace/inkscape-potrace.h - -endif diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index 379682668..52e99886a 100644 --- a/src/trace/trace.cpp +++ b/src/trace/trace.cpp @@ -65,7 +65,7 @@ SPImage *Tracer::getSelectedSPImage() if (sioxEnabled) { SPImage *img = NULL; - std::vector<SPItem*> const list = sel->itemList(); + auto list = sel->items(); std::vector<SPItem *> items; sioxShapes.clear(); @@ -74,7 +74,7 @@ SPImage *Tracer::getSelectedSPImage() them as bottom-to-top so that we can discover the image and any SPItems above it */ - for (std::vector<SPItem*>::const_iterator i=list.begin() ; list.end()!=i ; ++i) + for (auto i=list.begin() ; list.end()!=i ; ++i) { if (!SP_IS_ITEM(*i)) { |