Add missing namespace qualifiers.

This commit is contained in:
David Robillard 2014-11-30 18:27:04 -05:00
parent 008bfceb77
commit cf537b97f5
10 changed files with 18 additions and 14 deletions

View file

@ -28,7 +28,7 @@ class NoteBase;
class EditNoteDialog : public ArdourDialog
{
public:
EditNoteDialog (MidiRegionView* rv, set<NoteBase*> n);
EditNoteDialog (MidiRegionView* rv, std::set<NoteBase*> n);
void done (int);

View file

@ -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;

View file

@ -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;

View file

@ -36,7 +36,7 @@ public:
PatchChange(
MidiRegionView& region,
ArdourCanvas::Container* parent,
const string& text,
const std::string& text,
double height,
double x,
double y,

View file

@ -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;

View file

@ -55,7 +55,7 @@ class Session;
class LIBARDOUR_API MidiDiskstream : public Diskstream
{
public:
MidiDiskstream (Session &, const string& name, Diskstream::Flag f = Recordable);
MidiDiskstream (Session &, const std::string& name, Diskstream::Flag f = Recordable);
MidiDiskstream (Session &, const XMLNode&);
~MidiDiskstream();
@ -147,7 +147,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
int use_new_write_source (uint32_t n=0);
int find_and_use_playlist (const string&);
int find_and_use_playlist (const std::string&);
void allocate_temporary_buffers ();

View file

@ -38,7 +38,7 @@ class Session;
class LIBARDOUR_API MidiTrack : public Track
{
public:
MidiTrack (Session&, string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal);
MidiTrack (Session&, std::string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal);
~MidiTrack ();
int init ();

View file

@ -466,7 +466,7 @@ Butler::empty_pool_trash ()
void
Butler::drop_references ()
{
cerr << "Butler drops pool trash\n";
std::cerr << "Butler drops pool trash\n";
SessionEvent::pool->set_trash (0);
}

View file

@ -451,7 +451,7 @@ PortManager::reestablish_ports ()
for (i = p->begin(); i != p->end(); ++i) {
if (i->second->reestablish ()) {
error << string_compose (_("Re-establising port %1 failed"), i->second->name()) << endmsg;
cerr << string_compose (_("Re-establising port %1 failed"), i->second->name()) << endl;
std::cerr << string_compose (_("Re-establising port %1 failed"), i->second->name()) << std::endl;
break;
}
}

View file

@ -51,6 +51,7 @@ using namespace ARDOUR;
using namespace Glib;
using namespace PBD;
using namespace Evoral;
using namespace std;
/** Constructor used for new internal-to-session files. File cannot exist. */
SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags)