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/live_effects | |
| 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/live_effects')
| -rw-r--r-- | src/live_effects/lpe-bendpath.cpp | 4 | ||||
| -rw-r--r-- | src/live_effects/lpe-envelope.cpp | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-gears.cpp | 1 | ||||
| -rw-r--r-- | src/live_effects/lpe-patternalongpath.cpp | 3 | ||||
| -rw-r--r-- | src/live_effects/lpe-test-doEffect-stack.cpp | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-vonkoch.cpp | 2 |
6 files changed, 3 insertions, 11 deletions
diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp index 6f4dcf6c3..5214f0e2c 100644 --- a/src/live_effects/lpe-bendpath.cpp +++ b/src/live_effects/lpe-bendpath.cpp @@ -6,6 +6,7 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ +#include <vector> #include "live_effects/lpe-bendpath.h" #include "knot-holder-entity.h" #include "knotholder.h" @@ -13,9 +14,6 @@ // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> -using std::vector; - - /* Theory in e-mail from J.F. Barraud Let B be the skeleton path, and P the pattern (the path to be deformed). diff --git a/src/live_effects/lpe-envelope.cpp b/src/live_effects/lpe-envelope.cpp index 968714cf7..325bf3935 100644 --- a/src/live_effects/lpe-envelope.cpp +++ b/src/live_effects/lpe-envelope.cpp @@ -10,8 +10,6 @@ // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> -using std::vector; - namespace Inkscape { namespace LivePathEffect { diff --git a/src/live_effects/lpe-gears.cpp b/src/live_effects/lpe-gears.cpp index f1e287704..a7bbfd567 100644 --- a/src/live_effects/lpe-gears.cpp +++ b/src/live_effects/lpe-gears.cpp @@ -12,7 +12,6 @@ // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> -using std::vector; using namespace Geom; class Gear { diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp index 081c87990..c667bdc49 100644 --- a/src/live_effects/lpe-patternalongpath.cpp +++ b/src/live_effects/lpe-patternalongpath.cpp @@ -7,6 +7,7 @@ #include <cmath> #include <algorithm> +#include <vector> #include <2geom/bezier-to-sbasis.h> @@ -20,8 +21,6 @@ // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> -using std::vector; - /* Theory in e-mail from J.F. Barraud Let B be the skeleton path, and P the pattern (the path to be deformed). diff --git a/src/live_effects/lpe-test-doEffect-stack.cpp b/src/live_effects/lpe-test-doEffect-stack.cpp index ffe507e34..55d707af2 100644 --- a/src/live_effects/lpe-test-doEffect-stack.cpp +++ b/src/live_effects/lpe-test-doEffect-stack.cpp @@ -10,8 +10,6 @@ // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> -using std::memcpy; - namespace Inkscape { namespace LivePathEffect { diff --git a/src/live_effects/lpe-vonkoch.cpp b/src/live_effects/lpe-vonkoch.cpp index aa0f46ecc..8936bd83a 100644 --- a/src/live_effects/lpe-vonkoch.cpp +++ b/src/live_effects/lpe-vonkoch.cpp @@ -5,11 +5,11 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ +#include <vector> #include "live_effects/lpe-vonkoch.h" // TODO due to internal breakage in glibmm headers, this must be last: #include <glibmm/i18n.h> -//using std::vector; namespace Inkscape { namespace LivePathEffect { |