From e71e984af918104579da59e45785fe1651c5e992 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Wed, 23 Jan 2019 02:58:28 +0100
Subject: =?UTF-8?q?Avoid=20the=20=E2=80=9Cusing=20std::*;=E2=80=9D=20or=20?=
 =?UTF-8?q?=E2=80=9Cusing=20namespace=20std;=E2=80=9D=20constructs.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes the code a lot less readable and greppable for no reason.
---
 src/ui/uxmanager.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/ui/uxmanager.cpp')

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) {
-- 
cgit v1.2.3