summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/pixelartdialog.cpp
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2016-08-12 04:11:03 +0000
committerTed Gould <ted@gould.cx>2016-08-12 04:11:03 +0000
commitff848ebc9919d158c3ec3d7420e72b6aca99a3ea (patch)
tree030ab171865d0ed7f6bae3ef68315639cdb2622b /src/ui/dialog/pixelartdialog.cpp
parentMerging 0.92.x branch (diff)
parentCloneTiler: Further C++ification (diff)
downloadinkscape-ff848ebc9919d158c3ec3d7420e72b6aca99a3ea.tar.gz
inkscape-ff848ebc9919d158c3ec3d7420e72b6aca99a3ea.zip
Merge trunk
(bzr r14950.1.20)
Diffstat (limited to '')
-rw-r--r--src/ui/dialog/pixelartdialog.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index f557ff0fc..b838b0842 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -31,7 +31,6 @@
#include <gtkmm/stock.h>
#include <gtkmm/messagedialog.h>
-#include <gtk/gtk.h> //for GTK_RESPONSE* types
#include <glibmm/i18n.h>
#include "ui/widget/spinbutton.h"
@@ -41,18 +40,13 @@
#include "desktop-tracker.h"
#include "message-stack.h"
#include "selection.h"
-#include "preferences.h"
#include "sp-image.h"
#include "display/cairo-utils.h"
#include "libdepixelize/kopftracer2011.h"
-#include <algorithm>
#include "document.h"
-#include "xml/repr.h"
-#include "xml/document.h"
#include "svg/svg.h"
#include "svg/svg-color.h"
-#include "color.h"
#include "svg/css-ostringstream.h"
#include "document-undo.h"
@@ -372,8 +366,8 @@ void PixelArtDialogImpl::vectorize()
return;
}
- std::vector<SPItem*> const items = desktop->selection->itemList();
- for(std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end();++i){
+ auto items = desktop->selection->items();
+ for(auto i=items.begin(); i!=items.end();++i){
if ( !SP_IS_IMAGE(*i) )
continue;