Avoid the “using std::*;” or “using namespace std;” constructs.

This makes the code a lot less readable and greppable for no reason.

6 files changed, 26 insertions, 36 deletions

diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index ba101921b..c751950ba 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -23,6 +23,7 @@
 # include "config.h"  // only include where actually required!
 #endif
 
+#include <vector>
 #include "style.h"
 #include "rdf.h"
 #include "verbs.h"
@@ -47,8 +48,6 @@
 #include "object/color-profile.h"
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
-using std::pair;
-
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp
index dbe84ea38..d993c2113 100644
--- a/src/ui/dialog/filedialogimpl-win32.cpp
+++ b/src/ui/dialog/filedialogimpl-win32.cpp
@@ -21,6 +21,8 @@
 #include <gdkmm/general.h>
 #include <glibmm/fileutils.h>
 #include <glibmm/i18n.h>
+#include <list>
+#include <vector>
 
 //Inkscape includes
 #include "display/cairo-utils.h"
@@ -34,7 +36,6 @@
 #include "util/units.h"
 
 
-using namespace std;
 using namespace Glib;
 using namespace Cairo;
 using namespace Gdk::Cairo;
@@ -184,7 +185,7 @@ FileOpenDialogImplWin32::~FileOpenDialogImplWin32()
 
 void FileOpenDialogImplWin32::addFilterMenu(Glib::ustring name, Glib::ustring pattern)
 {
-    list<Filter> filter_list;
+    std::list<Filter> filter_list;
 
     int extension_index = 0;
     int filter_length = 1;
@@ -210,7 +211,7 @@ void FileOpenDialogImplWin32::addFilterMenu(Glib::ustring name, Glib::ustring pa
     _filter = new wchar_t[filter_length];
     wchar_t *filterptr = _filter;
 
-    for(list<Filter>::iterator filter_iterator = filter_list.begin();
+    for(std::list<Filter>::iterator filter_iterator = filter_list.begin();
         filter_iterator != filter_list.end(); ++filter_iterator)
     {
         const Filter &filter = *filter_iterator;
@@ -242,7 +243,7 @@ void FileOpenDialogImplWin32::addFilterMenu(Glib::ustring name, Glib::ustring pa
 
 void FileOpenDialogImplWin32::createFilterMenu()
 {
-    list<Filter> filter_list;
+    std::list<Filter> filter_list;
 
     int extension_index = 0;
     int filter_length = 1;
@@ -427,7 +428,7 @@ void FileOpenDialogImplWin32::createFilterMenu()
     _filter = new wchar_t[filter_length];
     wchar_t *filterptr = _filter;
 
-    for(list<Filter>::iterator filter_iterator = filter_list.begin();
+    for(std::list<Filter>::iterator filter_iterator = filter_list.begin();
         filter_iterator != filter_list.end(); ++filter_iterator)
     {
         const Filter &filter = *filter_iterator;
@@ -1609,7 +1610,7 @@ FileSaveDialogImplWin32::~FileSaveDialogImplWin32()
 
 void FileSaveDialogImplWin32::createFilterMenu()
 {
-    list<Filter> filter_list;
+    std::list<Filter> filter_list;
 
     knownExtensions.clear();
 
@@ -1655,7 +1656,7 @@ void FileSaveDialogImplWin32::createFilterMenu()
     _filter = new wchar_t[filter_length];
     wchar_t *filterptr = _filter;
 
-    for(list<Filter>::iterator filter_iterator = filter_list.begin();
+    for(std::list<Filter>::iterator filter_iterator = filter_list.begin();
         filter_iterator != filter_list.end(); ++filter_iterator)
     {
         const Filter &filter = *filter_iterator;
@@ -1685,7 +1686,7 @@ void FileSaveDialogImplWin32::createFilterMenu()
 
 void FileSaveDialogImplWin32::addFileType(Glib::ustring name, Glib::ustring pattern)
 {
-    list<Filter> filter_list;
+    std::list<Filter> filter_list;
 
     knownExtensions.clear();
 
@@ -1716,7 +1717,7 @@ void FileSaveDialogImplWin32::addFileType(Glib::ustring name, Glib::ustring patt
     _filter = new wchar_t[filter_length];
     wchar_t *filterptr = _filter;
 
-    for(list<Filter>::iterator filter_iterator = filter_list.begin();
+    for(std::list<Filter>::iterator filter_iterator = filter_list.begin();
         filter_iterator != filter_list.end(); ++filter_iterator)
     {
         const Filter &filter = *filter_iterator;
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 4ae36ed23..28990bd2d 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -22,6 +22,7 @@
  */
 
 #include <numeric>
+#include <vector>
 
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
@@ -66,7 +67,6 @@
 
 
 using Inkscape::DocumentUndo;
-using namespace std;
 
 #define DDC_RED_RGBA 0xff0000ff
 #define DYNA_MIN_WIDTH 1.0e-6
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index 8c52dafa0..1f62ecec6 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -10,6 +10,7 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#include <vector>
 #include "widgets/desktop-widget.h"
 
 #include "uxmanager.h"
@@ -18,9 +19,6 @@
 #include "util/ege-tags.h"
 #include "widgets/toolbox.h"
 
-
-using std::vector;
-
 class TrackItem
 {
 public:
@@ -33,8 +31,8 @@ public:
     std::vector<GtkWidget*> boxes;
 };
 
-static vector<SPDesktop*> desktops;
-static vector<SPDesktopWidget*> dtws;
+static std::vector<SPDesktop*> desktops;
+static std::vector<SPDesktopWidget*> dtws;
 static std::map<SPDesktop*, TrackItem> trackedBoxes;
 
 
@@ -82,7 +80,7 @@ public:
     void addTrack( SPDesktopWidget* dtw ) override;
     void delTrack( SPDesktopWidget* dtw ) override;
 
-    void connectToDesktop( vector<GtkWidget *> const & toolboxes, SPDesktop *desktop ) override;
+    void connectToDesktop( std::vector<GtkWidget *> const & toolboxes, SPDesktop *desktop ) override;
 
     gint getDefaultTask( SPDesktop *desktop ) override;
     void setTask(SPDesktop* dt, gint val) override;
@@ -199,20 +197,20 @@ void UXManagerImpl::addTrack( SPDesktopWidget* dtw )
 
 void UXManagerImpl::delTrack( SPDesktopWidget* dtw )
 {
-    vector<SPDesktopWidget*>::iterator iter = std::find(dtws.begin(), dtws.end(), dtw);
+    std::vector<SPDesktopWidget*>::iterator iter = std::find(dtws.begin(), dtws.end(), dtw);
     if (iter != dtws.end()) {
         dtws.erase(iter);
     }
 }
 
-void UXManagerImpl::connectToDesktop( vector<GtkWidget *> const & toolboxes, SPDesktop *desktop )
+void UXManagerImpl::connectToDesktop( std::vector<GtkWidget *> const & toolboxes, SPDesktop *desktop )
 {
     if (!desktop)
     {
         return;
     }
     TrackItem &tracker = trackedBoxes[desktop];
-    vector<GtkWidget*>& tracked = tracker.boxes;
+    std::vector<GtkWidget*>& tracked = tracker.boxes;
     tracker.destroyConn = desktop->connectDestroy(&desktopDestructHandler);
 
     for (auto toolbox : toolboxes) {
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 030e90af0..df6af9626 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -27,9 +27,6 @@
 #include "object/sp-root.h"
 #include "io/resource.h"
 
-using std::pair;
-using Inkscape::Util::unit_table;
-
 namespace Inkscape {
 namespace UI {
 namespace Widget {
@@ -133,7 +130,7 @@ PageSizer::PageSizer(Registry & _wr)
             snprintf(formatBuf, 79, "%0.1f x %0.1f", width, height);
             Glib::ustring desc = formatBuf;
             desc.append(" " + std::string(line[3]));
-            PaperSize paper(name, width, height, unit_table.getUnit(line[3]));
+            PaperSize paper(name, width, height, Inkscape::Util::unit_table.getUnit(line[3]));
             _paperSizeTable[name] = paper;
             Gtk::TreeModel::Row row = *(_paperSizeListStore->append());
             row[_paperSizeListColumns.nameColumn] = name;
@@ -450,12 +447,9 @@ PageSizer::updateFitMarginsUI(Inkscape::XML::Node *nv_repr)
 Gtk::ListStore::iterator
 PageSizer::find_paper_size (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h) const
 {
-    using Inkscape::Util::Quantity;
-    using std::swap;
-
     // The code below assumes that w < h, so make sure that's the case:
     if ( h < w ) {
-        swap(h,w);
+        std::swap(h,w);
     }
 
     g_return_val_if_fail(w <= h, _paperSizeListStore->children().end());
@@ -464,8 +458,8 @@ PageSizer::find_paper_size (Inkscape::Util::Quantity w, Inkscape::Util::Quantity
     for (iter = _paperSizeTable.begin() ;
          iter != _paperSizeTable.end() ; ++iter) {
         PaperSize paper = iter->second;
-        Quantity smallX (paper.smaller, paper.unit);
-        Quantity largeX (paper.larger, paper.unit);
+        Inkscape::Util::Quantity smallX (paper.smaller, paper.unit);
+        Inkscape::Util::Quantity largeX (paper.larger, paper.unit);
 
         g_return_val_if_fail(smallX.quantity < largeX.quantity + 0.001, _paperSizeListStore->children().end());
 
diff --git a/src/ui/widget/preview.cpp b/src/ui/widget/preview.cpp
index f22032b65..2de9a9a28 100644
--- a/src/ui/widget/preview.cpp
+++ b/src/ui/widget/preview.cpp
@@ -36,8 +36,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <algorithm>
-using std::min;
-
 #include <gdkmm/general.h>
 #include "preview.h"
 #include "preferences.h"
@@ -272,7 +270,7 @@ Preview::on_draw(const Cairo::RefPtr<Cairo::Context> &cr)
             context->render_arrow(cr,
                                   G_PI, // Down-pointing arrow
                                   area.x, area.y,
-                                  min(area.width, area.height)
+                                  std::min(area.width, area.height)
                                  );
         }
 
@@ -286,7 +284,7 @@ Preview::on_draw(const Cairo::RefPtr<Cairo::Context> &cr)
             context->render_arrow(cr,
                                   G_PI, // Down-pointing arrow
                                   otherArea.x, otherArea.y,
-                                  min(otherArea.width, otherArea.height)
+                                  std::min(otherArea.width, otherArea.height)
                                  );
         }
 
@@ -300,7 +298,7 @@ Preview::on_draw(const Cairo::RefPtr<Cairo::Context> &cr)
             context->render_arrow(cr,
                                   1.5*G_PI, // Left-pointing arrow
                                   otherArea.x, otherArea.y,
-                                  min(otherArea.width, otherArea.height)
+                                  std::min(otherArea.width, otherArea.height)
                                  );
         }