X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-chunk.hh;h=bf01cd7568611ca312576bb4cd84e51df6c704b2;hb=eee5583d9b8b6ff3187060aa48120e4544d2af58;hp=3769ce2e42fe7603cc6e3567bf88ea84d6c89eda;hpb=40aac0ae57ee113faa860ba221d83d9e6312173e;p=lilypond.git

diff --git a/lily/include/midi-chunk.hh b/lily/include/midi-chunk.hh
index 3769ce2e42..bf01cd7568 100644
--- a/lily/include/midi-chunk.hh
+++ b/lily/include/midi-chunk.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2007--2014 Han-Wen Nienhuys <hanwen@lilypond.org>
+  Copyright (C) 2007--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ public:
 
   int delta_ticks_;
   Midi_item *midi_;
-  string to_string () const;
+  std::string to_string () const;
 };
 
 /**
@@ -43,15 +43,15 @@ public:
 class Midi_chunk
 {
 public:
-  void set (const string &header_string, const string &data_string, const string &footer_string);
-  virtual string to_string () const;
-  virtual string data_string () const;
+  void set (const std::string &header_string, const std::string &data_string, const std::string &footer_string);
+  virtual std::string to_string () const;
+  virtual std::string data_string () const;
   DECLARE_CLASSNAME (Midi_chunk);
   virtual ~Midi_chunk ();
 private:
-  string data_string_;
-  string footer_string_;
-  string header_string_;
+  std::string data_string_;
+  std::string footer_string_;
+  std::string header_string_;
 };
 
 class Midi_header : public Midi_chunk
@@ -69,13 +69,13 @@ public:
   int port_;
   DECLARE_CLASSNAME (Midi_track);
 
-  vector<Midi_event *> events_;
+  std::vector<Midi_event *> events_;
 
   Midi_track (int number, bool port);
   ~Midi_track ();
 
   void add (int, Midi_item *midi);
-  virtual string data_string () const;
+  virtual std::string data_string () const;
 };
 
 #endif /* MIDI_CHUNK_HH */