diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-10-18 22:53:43 +0000 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-10-18 23:26:26 +0000 |
| commit | ddffc1a8ab9e3357a8e0350ff08b5ef1a9fb2651 (patch) | |
| tree | 9c91b6224ee6af12f030f03635f52b654db59840 /src/ui/tool/control-point-selection.h | |
| parent | Merge branch 'bugfix-1789838-confirmation-needed-before-overwriting-template'... (diff) | |
| download | inkscape-ddffc1a8ab9e3357a8e0350ff08b5ef1a9fb2651.tar.gz inkscape-ddffc1a8ab9e3357a8e0350ff08b5ef1a9fb2651.zip | |
Remove util/unordered-containers.h aliases.
Diffstat (limited to 'src/ui/tool/control-point-selection.h')
| -rw-r--r-- | src/ui/tool/control-point-selection.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ui/tool/control-point-selection.h b/src/ui/tool/control-point-selection.h index 192e273e0..046b98649 100644 --- a/src/ui/tool/control-point-selection.h +++ b/src/ui/tool/control-point-selection.h @@ -14,13 +14,14 @@ #include <list> #include <memory> +#include <unordered_map> +#include <unordered_set> #include <boost/optional.hpp> #include <cstddef> #include <sigc++/sigc++.h> #include <2geom/forward.h> #include <2geom/point.h> #include <2geom/rect.h> -#include "util/unordered-containers.h" #include "ui/tool/commit-events.h" #include "ui/tool/manipulator.h" #include "snap-candidate.h" @@ -42,7 +43,7 @@ class ControlPointSelection : public Manipulator, public sigc::trackable { public: ControlPointSelection(SPDesktop *d, SPCanvasGroup *th_group); ~ControlPointSelection() override; - typedef INK_UNORDERED_SET<SelectableControlPoint *> set_type; + typedef std::unordered_set<SelectableControlPoint *> set_type; typedef set_type Set; // convenience alias typedef set_type::iterator iterator; @@ -144,8 +145,8 @@ private: set_type _points; set_type _all_points; - INK_UNORDERED_MAP<SelectableControlPoint *, Geom::Point> _original_positions; - INK_UNORDERED_MAP<SelectableControlPoint *, Geom::Affine> _last_trans; + std::unordered_map<SelectableControlPoint *, Geom::Point> _original_positions; + std::unordered_map<SelectableControlPoint *, Geom::Affine> _last_trans; boost::optional<double> _rot_radius; boost::optional<double> _mouseover_rot_radius; Geom::OptRect _bounds; |