From 0e3e205df591411c4ba9c609986e3530af8997b0 Mon Sep 17 00:00:00 2001
From: Raphael Grimm <raphael.grimm@kit.edu>
Date: Thu, 6 Dec 2018 23:27:10 +0100
Subject: [PATCH] Remove some global using namespace
---
.../ArmarXGui/ArmarXMainWindow.cpp | 7 +++---
.../widgets/ConditionViewerWidget.cpp | 1 -
.../LoggingPlugin/LoggingPlugin.cpp | 2 --
.../widgets/ObserverWidget.cpp | 1 -
.../PlotterPlugin/ArmarXPlotter.cpp | 2 --
.../PlotterPlugin/ArmarXPlotterDialog.cpp | 2 --
.../ScenarioManagerWidgetController.cpp | 8 +++----
.../ApplicationDatabaseController.cpp | 1 -
.../DetailedApplicationController.cpp | 1 -
.../controller/ScenarioListController.cpp | 11 ++++-----
.../controller/SettingsController.cpp | 3 +--
.../controller/openscenariocontroller.cpp | 5 ++--
.../ScenarioManager/gui/openscenarioitem.cpp | 5 ++--
.../test/TestParseScenario.cpp | 23 +++++++++----------
.../test/XMLScenarioParserTest.cpp | 1 -
.../EventSenderConfig.cpp | 2 --
16 files changed, 27 insertions(+), 48 deletions(-)
diff --git a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
index ea901046..28d122f7 100644
--- a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
+++ b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
@@ -101,10 +101,9 @@
#define CONFIG_LOAD_LAST_CONFIG "LoadLastConfig"
#define CONFIG_BLACKLISTED_TIPS "BlacklistedTips"
-using namespace std;
using namespace armarx;
-ArmarXMainWindow::ArmarXMainWindow(const armarx::ManagedIceObjectRegistryInterfacePtr& registry, const std::vector<string>& packages, const QString& configToLoad, bool disablePreloading) :
+ArmarXMainWindow::ArmarXMainWindow(const armarx::ManagedIceObjectRegistryInterfacePtr& registry, const std::vector<std::string>& packages, const QString& configToLoad, bool disablePreloading) :
QMainWindow(NULL),
pluginCache(ArmarXManagerPtr::dynamicCast(registry)),
defaultPackageNames(packages),
@@ -230,7 +229,7 @@ ArmarXMainWindow::~ArmarXMainWindow()
void ArmarXMainWindow::removeViewerWidget(QObject* widget)
{
- ARMARX_WARNING << "Removing 3d viewer" << endl;
+ ARMARX_WARNING << "Removing 3d viewer" << std::endl;
if (!widget)
{
@@ -540,7 +539,7 @@ void ArmarXMainWindow::addToRecentlyOpenedFileList(QString configFilepath)
}
-std::vector<string> ArmarXMainWindow::getDefaultPackageNames()
+std::vector<std::string> ArmarXMainWindow::getDefaultPackageNames()
{
return defaultPackageNames;
}
diff --git a/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/widgets/ConditionViewerWidget.cpp b/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/widgets/ConditionViewerWidget.cpp
index 8cad3dd7..cdb2d952 100644
--- a/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/widgets/ConditionViewerWidget.cpp
+++ b/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/widgets/ConditionViewerWidget.cpp
@@ -32,7 +32,6 @@
#include <QList>
-using namespace std;
using namespace armarx;
ConditionViewerWidget::ConditionViewerWidget(ConditionViewerWidgetController* controller)
diff --git a/source/ArmarXGui/gui-plugins/LoggingPlugin/LoggingPlugin.cpp b/source/ArmarXGui/gui-plugins/LoggingPlugin/LoggingPlugin.cpp
index dc55121d..4d013fd1 100644
--- a/source/ArmarXGui/gui-plugins/LoggingPlugin/LoggingPlugin.cpp
+++ b/source/ArmarXGui/gui-plugins/LoggingPlugin/LoggingPlugin.cpp
@@ -37,8 +37,6 @@
#include <IceUtil/IceUtil.h>
-using namespace std;
-
namespace armarx
{
diff --git a/source/ArmarXGui/gui-plugins/ObserverPropertiesPlugin/widgets/ObserverWidget.cpp b/source/ArmarXGui/gui-plugins/ObserverPropertiesPlugin/widgets/ObserverWidget.cpp
index 579314fd..c1caea1d 100644
--- a/source/ArmarXGui/gui-plugins/ObserverPropertiesPlugin/widgets/ObserverWidget.cpp
+++ b/source/ArmarXGui/gui-plugins/ObserverPropertiesPlugin/widgets/ObserverWidget.cpp
@@ -37,7 +37,6 @@
#include <ArmarXCore/observers/filters/GaussianFilter.h>
#include <ArmarXCore/observers/filters/MedianFilter.h>
-using namespace std;
using namespace armarx;
ObserverWidget::ObserverWidget(ObserverWidgetController* controller) :
diff --git a/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.cpp b/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.cpp
index d030fa58..a2b21e6e 100644
--- a/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.cpp
+++ b/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.cpp
@@ -46,8 +46,6 @@
#include <sstream>
-using namespace std;
-
namespace armarx
{
ArmarXPlotter::ArmarXPlotter() :
diff --git a/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotterDialog.cpp b/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotterDialog.cpp
index b64e62ee..1d035703 100644
--- a/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotterDialog.cpp
+++ b/source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotterDialog.cpp
@@ -30,8 +30,6 @@
using namespace armarx;
-using namespace std;
-
ArmarXPlotterDialog::ArmarXPlotterDialog(QWidget* parent, IceManagerPtr iceManager) :
QDialog(parent),
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp
index 47902faa..81113706 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp
@@ -41,12 +41,10 @@ using namespace Exec;
using namespace Controller;
using namespace Data_Structure;
using namespace Parser;
-using namespace std;
-
ScenarioManagerWidgetController::ScenarioManagerWidgetController()
:
- packages(new vector<PackagePtr>())
+ packages(new std::vector<PackagePtr>())
, executor(new Executor(stopStrategyFactory.getStopStrategy(StopperFactory::getFactory()->getPidStopper()), StarterFactory::getFactory()->getStarter()))
, applicationController(packages, executor)
, detailedApplicationController(executor)
@@ -254,7 +252,7 @@ void ScenarioManagerWidgetController::reparsePackages()
PackageBuilder parser;
for (int i = 0; i < packages.size(); i++)
{
- string name = packages.at(i).toStdString();
+ std::string name = packages.at(i).toStdString();
progress.setLabelText(QString("Loading scenarios from package ") + name.c_str());
progress.setValue(i + 1);
qApp->processEvents();
@@ -283,7 +281,7 @@ void ScenarioManagerWidgetController::reparsePackages()
updateModels();
}
-void ScenarioManagerWidgetController::reparsePackage(string name)
+void ScenarioManagerWidgetController::reparsePackage(std::string name)
{
PackageBuilder parser;
PackagePtr package = parser.parsePackage(name, StringList());
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ApplicationDatabaseController.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ApplicationDatabaseController.cpp
index 647bdf84..957e8f06 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ApplicationDatabaseController.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ApplicationDatabaseController.cpp
@@ -35,7 +35,6 @@ using namespace ScenarioManager;
using namespace Controller;
using namespace Data_Structure;
using namespace Exec;
-using namespace std;
using namespace armarx;
ApplicationDatabaseController::ApplicationDatabaseController(
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp
index de9ba0e5..d3b4db40 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp
@@ -35,7 +35,6 @@ using namespace ScenarioManager;
using namespace Controller;
using namespace Exec;
using namespace Data_Structure;
-using namespace std;
DetailedApplicationController::DetailedApplicationController(ExecutorPtr executor, QObject* parent) : QObject(parent), executor(executor), showingStartable(false)
{
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.cpp
index d5bf7611..840c04b8 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.cpp
@@ -43,7 +43,6 @@ using namespace Controller;
using namespace Data_Structure;
using namespace Parser;
using namespace Exec;
-using namespace std;
#define UPDATE_TIMER 500 //ms
@@ -234,7 +233,7 @@ void ScenarioListController::addApplicationsToScenario(QList<QPair<QString, Appl
return;
}
Parser::DependenciesGenerator generator;
- std::vector<string> acceptedApps = generator.getDependencieTree(scenario->getPackage()->getName());
+ std::vector<std::string> acceptedApps = generator.getDependencieTree(scenario->getPackage()->getName());
for (auto pair : applications)
@@ -269,7 +268,7 @@ void ScenarioListController::addApplicationsToScenario(QList<QPair<QString, Appl
}
- string appName = app->getName();
+ std::string appName = app->getName();
size_t runIndex = appName.rfind("Run");
if (runIndex != std::string::npos)
{
@@ -293,7 +292,7 @@ void ScenarioListController::addApplicationsToScenario(QList<QPair<QString, Appl
}
else
{
- instanceName = "instance" + to_string(instanceCounter);
+ instanceName = "instance" + std::to_string(instanceCounter);
}
}
@@ -308,7 +307,7 @@ void ScenarioListController::addApplicationsToScenario(QList<QPair<QString, Appl
}
if (instanceCounter > 0)
{
- instanceName += to_string(instanceCounter);
+ instanceName += std::to_string(instanceCounter);
}
}
@@ -467,7 +466,7 @@ void ScenarioListController::createScenario()
}
}
-void ScenarioListController::createdScenario(string name, string packageStr)
+void ScenarioListController::createdScenario(std::string name, std::string packageStr)
{
XMLScenarioParser parser;
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/SettingsController.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/SettingsController.cpp
index f006e349..fae1d89d 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/SettingsController.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/SettingsController.cpp
@@ -39,7 +39,6 @@ using namespace ScenarioManager;
using namespace Controller;
using namespace Data_Structure;
using namespace Exec;
-using namespace std;
using namespace armarx;
SettingsController::SettingsController(PackageVectorPtr packages, ExecutorPtr executor, QObject* parent)
@@ -171,7 +170,7 @@ void SettingsController::removePackage(int row, int column, QModelIndex parent)
settings.setValue("packages", settingsPackages);
//Remove Package from Data Structure
- for (vector<PackagePtr>::iterator iter = packages->begin(); iter != packages->end(); ++iter)
+ for (std::vector<PackagePtr>::iterator iter = packages->begin(); iter != packages->end(); ++iter)
{
if (*iter == package)
{
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.cpp
index c1fd0a91..a4913bec 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.cpp
@@ -44,7 +44,6 @@ using namespace Controller;
using namespace Data_Structure;
using namespace Parser;
using namespace Exec;
-using namespace std;
using namespace armarx;
OpenScenarioController::OpenScenarioController(PackageVectorPtr packages, Exec::ExecutorPtr exec, QObject* parent)
@@ -93,7 +92,7 @@ void OpenScenarioController::on_openScenario(int row, int column, QModelIndex pa
ScenarioPtr scenario;
auto pos = openScenarioItem->getScenarioName().find("/");
- if (pos != string::npos)
+ if (pos != std::string::npos)
{
scenario = parser.parseScenario(package, openScenarioItem->getScenarioName().substr(pos + 1), openScenarioItem->getScenarioName().substr(0, pos));
}
@@ -276,7 +275,7 @@ QStringList OpenScenarioController::getAllClosedScenarios()
CMakePackageFinder parser = CMakePackageFinderCache::GlobalCache.findPackage(packages.at(i).toStdString());
XMLScenarioParser scenarioParser;
- vector<string> packageScenarios = scenarioParser.getScenariosFromFolder(parser.getScenariosDir());
+ std::vector<std::string> packageScenarios = scenarioParser.getScenariosFromFolder(parser.getScenariosDir());
for (auto str : packageScenarios)
{
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioitem.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioitem.cpp
index 5de4c99f..ba61c103 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioitem.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioitem.cpp
@@ -28,7 +28,6 @@
using namespace armarx;
using namespace ScenarioManager;
using namespace Data_Structure;
-using namespace std;
OpenScenarioItem::OpenScenarioItem(QList<QVariant> rootItem)
{
@@ -43,13 +42,13 @@ OpenScenarioItem::OpenScenarioItem(QVariant scenarioName, QVariant scenarioPacka
m_itemData << scenarioName << scenarioPackage << "Open";
}
-string OpenScenarioItem::getScenarioPackage()
+std::string OpenScenarioItem::getScenarioPackage()
{
return scenarioPackage.toString().toStdString();
}
-string OpenScenarioItem::getScenarioName()
+std::string OpenScenarioItem::getScenarioName()
{
return scenarioName.toString().toStdString();
}
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/test/TestParseScenario.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/test/TestParseScenario.cpp
index e2b99143..ffadb908 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/test/TestParseScenario.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/test/TestParseScenario.cpp
@@ -45,7 +45,6 @@ using namespace ScenarioManager;
using namespace Data_Structure;
using namespace Parser;
using namespace rapidxml;
-using namespace std;
using namespace armarx;
BOOST_AUTO_TEST_CASE(TestPackageThings)
@@ -71,8 +70,8 @@ BOOST_AUTO_TEST_CASE(ParseIcePropertiesFromXml)
//Read xmlFile into vector
//TODO XML MIT HIER REIN PACKEN
- ifstream file("path zu einer test xml");
- vector<char> buffer((istreambuf_iterator<char>(file)), istreambuf_iterator<char>());
+ std::ifstream file("path zu einer test xml");
+ std::vector<char> buffer((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>());
buffer.push_back('\0');
//Parse the buffer
@@ -81,31 +80,31 @@ BOOST_AUTO_TEST_CASE(ParseIcePropertiesFromXml)
PropertyDefinitionContainer container("NORMALERWEISE DER APP NAME");
for (xml_node<>* property_node = doc.first_node("property"); property_node; property_node = property_node->next_sibling())
{
- const string propertyName = property_node->first_attribute("name")->value();
- const string description = property_node->first_node("description")->value();
+ const std::string propertyName = property_node->first_attribute("name")->value();
+ const std::string description = property_node->first_node("description")->value();
xml_node<>* attributes_node = property_node->first_node("attributes");
xml_node<>* first_attribute = attributes_node->first_node("attribute");
xml_node<>* second_attribute = first_attribute->next_sibling();
xml_node<>* third_attribute = second_attribute->next_sibling();
- string defaultValue = "";
+ std::string defaultValue = "";
bool caseSensitive = false;
bool required = false;
- if (string(first_attribute->first_attribute("name")->value()).find("Default") != string::npos)
+ if (std::string(first_attribute->first_attribute("name")->value()).find("Default") != std::string::npos)
{
defaultValue = first_attribute->value();
}
- if (string(second_attribute->first_attribute("name")->value()).find("CaseSensitivity") != string::npos)
+ if (std::string(second_attribute->first_attribute("name")->value()).find("CaseSensitivity") != std::string::npos)
{
- if (string(second_attribute->value()).compare("yes"))
+ if (std::string(second_attribute->value()).compare("yes"))
{
caseSensitive = true;
}
}
- if (string(third_attribute->first_attribute("name")->value()).find("Required") != string::npos)
+ if (std::string(third_attribute->first_attribute("name")->value()).find("Required") != std::string::npos)
{
- if (string(third_attribute->value()).compare("yes"))
+ if (std::string(third_attribute->value()).compare("yes"))
{
required = true;
}
@@ -120,7 +119,7 @@ BOOST_AUTO_TEST_CASE(ParseIcePropertiesFromXml)
}
else
{
- PropertyDefinition<string> type = container.defineOptionalProperty(propertyName, defaultValue, description);
+ PropertyDefinition<std::string> type = container.defineOptionalProperty(propertyName, defaultValue, description);
if (!caseSensitive)
{
type = type.setCaseInsensitive(false);
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/test/XMLScenarioParserTest.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/test/XMLScenarioParserTest.cpp
index 6af90f56..08a3e6f8 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/test/XMLScenarioParserTest.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/test/XMLScenarioParserTest.cpp
@@ -56,7 +56,6 @@ using namespace Data_Structure;
using namespace Parser;
using namespace Exec;
using namespace rapidxml;
-using namespace std;
using namespace armarx;
PackageVectorPtr packages = PackageVectorPtr(new std::vector<PackagePtr>());//std::shared_ptr<std::vector<PackagePtr>>
diff --git a/source/ArmarXGui/gui-plugins/StatechartEventSenderPlugin/EventSenderConfig.cpp b/source/ArmarXGui/gui-plugins/StatechartEventSenderPlugin/EventSenderConfig.cpp
index 39972397..b2d4efcc 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEventSenderPlugin/EventSenderConfig.cpp
+++ b/source/ArmarXGui/gui-plugins/StatechartEventSenderPlugin/EventSenderConfig.cpp
@@ -62,8 +62,6 @@
using namespace armarx;
-using namespace std;
-
EventSenderConfig::EventSenderConfig()
{
--
GitLab