summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-05-13 04:44:01 +0000
committerDavid Robillard <d@drobilla.net>2009-05-13 04:44:01 +0000
commit5268059f5d4ca9325a78da688a7622898354215a (patch)
treeebf19a912d4bf98966b3bf7c289059b0644bf47e /src/gui
parent19928bb583e72802746b89e322f71ecc0fcb7427 (diff)
downloadingen-5268059f5d4ca9325a78da688a7622898354215a.tar.gz
ingen-5268059f5d4ca9325a78da688a7622898354215a.tar.bz2
ingen-5268059f5d4ca9325a78da688a7622898354215a.zip
Remove 'using' declarations from headers.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1993 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/LoadPatchWindow.cpp2
-rw-r--r--src/gui/LoadSubpatchWindow.cpp4
-rw-r--r--src/gui/PatchCanvas.cpp2
-rw-r--r--src/gui/PatchWindow.cpp2
-rw-r--r--src/gui/Port.cpp1
-rw-r--r--src/gui/ThreadedLoader.cpp1
-rw-r--r--src/gui/ThreadedLoader.hpp17
7 files changed, 20 insertions, 9 deletions
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index 7ae755ad..d693704f 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -29,6 +29,8 @@
using namespace Ingen::Serialisation;
using boost::optional;
using namespace std;
+using namespace std;
+using namespace Raul;
namespace Ingen {
namespace GUI {
diff --git a/src/gui/LoadSubpatchWindow.cpp b/src/gui/LoadSubpatchWindow.cpp
index 3b935f68..302b5387 100644
--- a/src/gui/LoadSubpatchWindow.cpp
+++ b/src/gui/LoadSubpatchWindow.cpp
@@ -28,8 +28,10 @@
#include "PatchView.hpp"
#include "Configuration.hpp"
#include "ThreadedLoader.hpp"
+
using boost::optional;
using namespace std;
+using namespace Raul;
namespace Ingen {
namespace GUI {
@@ -146,7 +148,7 @@ LoadSubpatchWindow::ok_clicked()
assert(_patch);
// If unset load_patch will load values
- optional<Symbol> symbol;
+ optional<Raul::Symbol> symbol;
string name_str = "";
if (_name_from_user_radio->get_active()) {
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 57df4a61..99ed8446 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -46,10 +46,12 @@
#include "GladeFactory.hpp"
#include "WindowFactory.hpp"
#include "ThreadedLoader.hpp"
+
using Ingen::Client::ClientStore;
using Ingen::Serialisation::Serialiser;
using Ingen::Client::PluginModel;
using namespace std;
+using namespace Raul;
namespace Ingen {
namespace GUI {
diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp
index d1248920..cc882f8d 100644
--- a/src/gui/PatchWindow.cpp
+++ b/src/gui/PatchWindow.cpp
@@ -41,6 +41,8 @@
#include "WindowFactory.hpp"
#include "PatchView.hpp"
+using namespace Raul;
+
namespace Ingen {
namespace GUI {
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index 922dea77..e7daac0a 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -32,6 +32,7 @@ using namespace std;
using namespace Raul;
namespace Ingen {
+using namespace Shared;
namespace GUI {
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index 2b185257..3a33d5ac 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -25,6 +25,7 @@
#include "client/PatchModel.hpp"
using namespace std;
+using namespace Raul;
namespace Ingen {
namespace GUI {
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index ffe7a482..cdf331a4 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -33,10 +33,11 @@ using std::string;
using std::list;
using boost::optional;
-using namespace Ingen::Client;
-using namespace Ingen::Serialisation;
-
namespace Ingen {
+using namespace Shared;
+using namespace Client;
+using namespace Serialisation;
+
namespace GUI {
@@ -56,11 +57,11 @@ class ThreadedLoader : public Raul::Slave
public:
ThreadedLoader(SharedPtr<EngineInterface> engine);
- void load_patch(bool merge,
- const Glib::ustring& document_uri,
- optional<Path> data_path,
- optional<Path> engine_parent,
- optional<Symbol> engine_symbol,
+ void load_patch(bool merge,
+ const Glib::ustring& document_uri,
+ optional<Raul::Path> data_path,
+ optional<Raul::Path> engine_parent,
+ optional<Raul::Symbol> engine_symbol,
optional<GraphObject::Properties> engine_data);
void save_patch(SharedPtr<PatchModel> model, const string& filename);