summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2014-11-30 18:27:04 -0500
committerDavid Robillard <d@drobilla.net>2014-11-30 23:56:19 -0500
commitcf537b97f5d015074578c809a15a38b8d3858d00 (patch)
tree929425d102806aee9867fde4c1a57641481d2447 /gtk2_ardour
parent008bfceb77298f21c592a3860d75d5cc4b315e4d (diff)
Add missing namespace qualifiers.
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/edit_note_dialog.h4
-rw-r--r--gtk2_ardour/midi_region_view.cc1
-rw-r--r--gtk2_ardour/midi_time_axis.cc1
-rw-r--r--gtk2_ardour/patch_change.h14
-rw-r--r--gtk2_ardour/route_ui.cc1
5 files changed, 12 insertions, 9 deletions
diff --git a/gtk2_ardour/edit_note_dialog.h b/gtk2_ardour/edit_note_dialog.h
index 59e53722a0..bc8d546057 100644
--- a/gtk2_ardour/edit_note_dialog.h
+++ b/gtk2_ardour/edit_note_dialog.h
@@ -28,9 +28,9 @@ class NoteBase;
class EditNoteDialog : public ArdourDialog
{
public:
- EditNoteDialog (MidiRegionView* rv, set<NoteBase*> n);
+ EditNoteDialog (MidiRegionView* rv, std::set<NoteBase*> n);
- void done (int);
+ void done (int);
private:
MidiRegionView* _region_view;
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 21ae56b8c2..1accb0c6b5 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -85,6 +85,7 @@
using namespace ARDOUR;
using namespace PBD;
using namespace Editing;
+using namespace std;
using Gtkmm2ext::Keyboard;
PBD::Signal1<void, MidiRegionView *> MidiRegionView::SelectionCleared;
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index c3e42a0968..f51746c1ec 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -97,6 +97,7 @@ using namespace PBD;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace Editing;
+using namespace std;
// Minimum height at which a control is displayed
static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 160;
diff --git a/gtk2_ardour/patch_change.h b/gtk2_ardour/patch_change.h
index 44f10074d5..a087c2a090 100644
--- a/gtk2_ardour/patch_change.h
+++ b/gtk2_ardour/patch_change.h
@@ -34,13 +34,13 @@ class PatchChange
{
public:
PatchChange(
- MidiRegionView& region,
- ArdourCanvas::Container* parent,
- const string& text,
- double height,
- double x,
- double y,
- ARDOUR::InstrumentInfo& info,
+ MidiRegionView& region,
+ ArdourCanvas::Container* parent,
+ const std::string& text,
+ double height,
+ double x,
+ double y,
+ ARDOUR::InstrumentInfo& info,
ARDOUR::MidiModel::PatchChangePtr patch
);
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index dcdf7fa778..2d353eb6b1 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -63,6 +63,7 @@ using namespace Gtkmm2ext;
using namespace ARDOUR;
using namespace ARDOUR_UI_UTILS;
using namespace PBD;
+using namespace std;
uint32_t RouteUI::_max_invert_buttons = 3;
PBD::Signal1<void, boost::shared_ptr<Route> > RouteUI::BusSendDisplayChanged;