diff options
| author | Martin Owens <doctormo@gmail.com> | 2019-03-06 23:54:12 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2019-03-06 23:54:12 +0000 |
| commit | 3711d5d705436c20590c1ff4cef12e67beed6597 (patch) | |
| tree | 9026f75a574bc3b9b531acb959eced87c5d4a9f7 /src/object/sp-guide.cpp | |
| parent | Merge: Correct text for enabling grid (diff) | |
| parent | Avoid the “using std::*;” or “using namespace std;” constructs. (diff) | |
| download | inkscape-3711d5d705436c20590c1ff4cef12e67beed6597.tar.gz inkscape-3711d5d705436c20590c1ff4cef12e67beed6597.zip | |
Merge: Avoid the “using std::*;” or “using namespace std;” construct
Diffstat (limited to 'src/object/sp-guide.cpp')
| -rw-r--r-- | src/object/sp-guide.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/object/sp-guide.cpp b/src/object/sp-guide.cpp index bbb66aa4a..8dbc68f09 100644 --- a/src/object/sp-guide.cpp +++ b/src/object/sp-guide.cpp @@ -19,6 +19,7 @@ #include <algorithm> #include <cstring> #include <string> +#include <vector> #include "display/sp-canvas.h" #include "display/guideline.h" @@ -40,7 +41,6 @@ #include "verbs.h" using Inkscape::DocumentUndo; -using std::vector; SPGuide::SPGuide() : SPObject() @@ -406,7 +406,7 @@ void SPGuide::moveto(Geom::Point const point_on_line, bool const commit) } /* DISABLED CODE BECAUSE SPGuideAttachment IS NOT USE AT THE MOMENT (johan) - for (vector<SPGuideAttachment>::const_iterator i(attached_items.begin()), + for (std::vector<SPGuideAttachment>::const_iterator i(attached_items.begin()), iEnd(attached_items.end()); i != iEnd; ++i) { @@ -445,7 +445,7 @@ void SPGuide::set_normal(Geom::Point const normal_to_line, bool const commit) } /* DISABLED CODE BECAUSE SPGuideAttachment IS NOT USE AT THE MOMENT (johan) - for (vector<SPGuideAttachment>::const_iterator i(attached_items.begin()), + for (std::vector<SPGuideAttachment>::const_iterator i(attached_items.begin()), iEnd(attached_items.end()); i != iEnd; ++i) { @@ -550,7 +550,7 @@ void sp_guide_remove(SPGuide *guide) { g_assert(SP_IS_GUIDE(guide)); - for (vector<SPGuideAttachment>::const_iterator i(guide->attached_items.begin()), + for (std::vector<SPGuideAttachment>::const_iterator i(guide->attached_items.begin()), iEnd(guide->attached_items.end()); i != iEnd; ++i) { |