summaryrefslogtreecommitdiffstats
path: root/src/ui/uxmanager.cpp
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2019-01-23 01:58:28 +0000
committerMartin Owens <doctormo@gmail.com>2019-03-06 01:26:24 +0000
commite71e984af918104579da59e45785fe1651c5e992 (patch)
tree9fe91c6e2b1237055e46dc4974c1003c2abc8d61 /src/ui/uxmanager.cpp
parentRevert modal fix to fix #108 (diff)
downloadinkscape-e71e984af918104579da59e45785fe1651c5e992.tar.gz
inkscape-e71e984af918104579da59e45785fe1651c5e992.zip
Avoid the “using std::*;” or “using namespace std;” constructs.
This makes the code a lot less readable and greppable for no reason.
Diffstat (limited to 'src/ui/uxmanager.cpp')
-rw-r--r--src/ui/uxmanager.cpp16
1 files changed, 7 insertions, 9 deletions
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) {