summaryrefslogtreecommitdiffstats
path: root/src/gui/App.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2017-12-25 16:05:05 -0500
committerDavid Robillard <d@drobilla.net>2017-12-25 16:26:13 -0500
commit71808f61f7db48a7ab4e16537b94ee5686749909 (patch)
tree5529b7c60b2488ac9575ddcb597c905bde577399 /src/gui/App.cpp
parent15b3b0e9f8823752f80c7e597a70749813e61c79 (diff)
downloadingen-71808f61f7db48a7ab4e16537b94ee5686749909.tar.gz
ingen-71808f61f7db48a7ab4e16537b94ee5686749909.tar.bz2
ingen-71808f61f7db48a7ab4e16537b94ee5686749909.zip
Remove superfluous using namespace declarations
Diffstat (limited to 'src/gui/App.cpp')
-rw-r--r--src/gui/App.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index d9e8680c..565f3b19 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -55,8 +55,6 @@
#include "WindowFactory.hpp"
#include "rgba.hpp"
-using namespace std;
-
namespace Raul { class Deletable; }
namespace Ingen {
@@ -247,7 +245,7 @@ App::response(int32_t id, Status status, const std::string& subject)
}
void
-App::error_message(const string& str)
+App::error_message(const std::string& str)
{
_messages_window->post_error(str);
}
@@ -352,7 +350,7 @@ App::status_text() const
void
App::port_activity(Port* port)
{
- std::pair<ActivityPorts::iterator, bool> inserted = _activity_ports.insert(make_pair(port, false));
+ std::pair<ActivityPorts::iterator, bool> inserted = _activity_ports.emplace(port, false);
if (inserted.second) {
inserted.first->second = false;
}
@@ -464,10 +462,10 @@ App::quit(Gtk::Window* dialog_parent)
try {
const std::string path = _world->conf().save(
_world->uri_map(), "ingen", "gui.ttl", Configuration::GUI);
- cout << (fmt("Saved GUI settings to %1%\n") % path);
+ std::cout << (fmt("Saved GUI settings to %1%\n") % path);
} catch (const std::exception& e) {
- cerr << (fmt("Error saving GUI settings (%1%)\n")
- % e.what());
+ std::cerr << (fmt("Error saving GUI settings (%1%)\n")
+ % e.what());
}
return true;