Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing...

[ardour.git] / libs / ardour / ardour / audio_playlist_importer.h

diff --git a/libs/ardour/ardour/audio_playlist_importer.h b/libs/ardour/ardour/audio_playlist_importer.h
index 3a543674959316259c2e840b9b1574b8fe176cbf..5ab8ae9b26f5dccf5fefd1866ec2eb9895752922 100644 (file)
--- a/libs/ardour/ardour/audio_playlist_importer.h
+++ b/libs/ardour/ardour/audio_playlist_importer.h
@@ -25,12 +25,12 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <pbd/xml++.h>
-#include <pbd/id.h>
+#include "pbd/xml++.h"
+#include "pbd/id.h"
 
-#include <ardour/element_importer.h>
-#include <ardour/element_import_handler.h>
-#include <ardour/types.h>
+#include "ardour/element_importer.h"
+#include "ardour/element_import_handler.h"
+#include "ardour/types.h"
 
 #include "i18n.h"
 
@@ -48,13 +48,13 @@ class AudioPlaylistImportHandler : public ElementImportHandler
 
        AudioPlaylistImportHandler (XMLTree const & source, Session & session, AudioRegionImportHandler & region_handler, const char * nodename = "Playlists");
        virtual ~AudioPlaylistImportHandler () {}
-       virtual string get_info () const;
-       
+       virtual std::string get_info () const;
+
        void get_regions (XMLNode const & node, ElementList & list) const;
        void update_region_id (XMLProperty* id_prop);
 
        void playlists_by_diskstream (PBD::ID const & id, PlaylistList & list) const;
-       
+
   protected:
        AudioRegionImportHandler & region_handler;
 };
@@ -64,7 +64,7 @@ class UnusedAudioPlaylistImportHandler : public AudioPlaylistImportHandler
   public:
        UnusedAudioPlaylistImportHandler (XMLTree const & source, Session & session, AudioRegionImportHandler & region_handler) :
                AudioPlaylistImportHandler (source, session, region_handler, X_("UnusedPlaylists")) { }
-       string get_info () const { return _("Audio Playlists (unused)"); }
+       std::string get_info () const { return _("Audio Playlists (unused)"); }
 };
 
 class AudioPlaylistImporter : public ElementImporter
@@ -74,8 +74,8 @@ class AudioPlaylistImporter : public ElementImporter
        AudioPlaylistImporter (AudioPlaylistImporter const & other);
        ~AudioPlaylistImporter ();
 
-       string get_info () const;
-       
+       std::string get_info () const;
+
        void set_diskstream (PBD::ID const & id);
        PBD::ID const & orig_diskstream () const { return orig_diskstream_id; }