diff options
| author | Jan Lingscheid <jan.linscheid@auticon.de> | 2017-10-16 11:28:28 +0000 |
|---|---|---|
| committer | Jan Lingscheid <jan.lingscheid@auticon.de> | 2017-10-17 08:55:00 +0000 |
| commit | 8ef37560aeca3d38db6603ca573929b19ea90105 (patch) | |
| tree | ac3ffe8c35b5512d5cb7bf92c6517864d0546c43 /src | |
| parent | Remove std::auto_ptr (diff) | |
| download | inkscape-8ef37560aeca3d38db6603ca573929b19ea90105.tar.gz inkscape-8ef37560aeca3d38db6603ca573929b19ea90105.zip | |
Replace boost::scoped_ptr
This replaces all usage of boost::scoped_ptr with std::unique_ptr.
Also removes the corresponding includes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/internal/cairo-renderer.cpp | 3 | ||||
| -rw-r--r-- | src/extension/internal/gdkpixbuf-input.cpp | 3 | ||||
| -rw-r--r-- | src/helper/pixbuf-ops.cpp | 3 | ||||
| -rw-r--r-- | src/ui/dialog/icon-preview.cpp | 1 | ||||
| -rw-r--r-- | src/ui/dialog/objects.h | 3 |
5 files changed, 4 insertions, 9 deletions
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index 3724a5e17..116364739 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -27,7 +27,6 @@ #include <signal.h> #include <errno.h> -#include <boost/scoped_ptr.hpp> #include "libnrtype/Layout-TNG.h" #include <2geom/transforms.h> @@ -517,7 +516,7 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx) // Do the export SPDocument *document = item->document; - boost::scoped_ptr<Inkscape::Pixbuf> pb( + std::unique_ptr<Inkscape::Pixbuf> pb( sp_generate_internal_bitmap(document, NULL, bbox->min()[Geom::X], bbox->min()[Geom::Y], bbox->max()[Geom::X], bbox->max()[Geom::Y], width, height, res, res, (guint32) 0xffffff00, item )); diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp index 7af7927f2..26e6531dd 100644 --- a/src/extension/internal/gdkpixbuf-input.cpp +++ b/src/extension/internal/gdkpixbuf-input.cpp @@ -2,7 +2,6 @@ #include <gdkmm/pixbuf.h> #include <gdkmm/pixbufformat.h> -#include <boost/scoped_ptr.hpp> #include <glib/gprintf.h> #include <glibmm/i18n.h> #include "dir-util.h" @@ -65,7 +64,7 @@ GdkpixbufInput::open(Inkscape::Extension::Input *mod, char const *uri) bool embed = ( link.compare( "embed" ) == 0 ); SPDocument *doc = NULL; - boost::scoped_ptr<Inkscape::Pixbuf> pb(Inkscape::Pixbuf::create_from_file(uri)); + std::unique_ptr<Inkscape::Pixbuf> pb(Inkscape::Pixbuf::create_from_file(uri)); // TODO: the pixbuf is created again from the base64-encoded attribute in SPImage. // Find a way to create the pixbuf only once. diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp index 438a428e6..8d7202111 100644 --- a/src/helper/pixbuf-ops.cpp +++ b/src/helper/pixbuf-ops.cpp @@ -15,7 +15,6 @@ #include <config.h> #endif -#include <boost/scoped_ptr.hpp> #include <2geom/transforms.h> #include "ui/interface.h" @@ -67,7 +66,7 @@ bool sp_export_jpg_file(SPDocument *doc, gchar const *filename, unsigned width, unsigned height, double xdpi, double ydpi, unsigned long bgcolor, double quality, SPItem* item) { - boost::scoped_ptr<Inkscape::Pixbuf> pixbuf( + std::unique_ptr<Inkscape::Pixbuf> pixbuf( sp_generate_internal_bitmap(doc, filename, x0, y0, x1, y1, width, height, xdpi, ydpi, bgcolor, item)); diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp index 991139aa8..f9cd8929a 100644 --- a/src/ui/dialog/icon-preview.cpp +++ b/src/ui/dialog/icon-preview.cpp @@ -18,7 +18,6 @@ #endif #include <gtkmm/buttonbox.h> -#include <boost/scoped_ptr.hpp> #include <glibmm/i18n.h> #include <glibmm/timer.h> diff --git a/src/ui/dialog/objects.h b/src/ui/dialog/objects.h index b7fd1b4f8..8ad1b15ef 100644 --- a/src/ui/dialog/objects.h +++ b/src/ui/dialog/objects.h @@ -16,7 +16,6 @@ # include <config.h> #endif -#include <boost/scoped_ptr.hpp> #include <gtkmm/box.h> #include <gtkmm/treeview.h> #include <gtkmm/treestore.h> @@ -168,7 +167,7 @@ private: Gtk::Box _blur_vbox; Gtk::Dialog _colorSelectorDialog; - boost::scoped_ptr<Inkscape::UI::SelectedColor> _selectedColor; + std::unique_ptr<Inkscape::UI::SelectedColor> _selectedColor; //Methods: |