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

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

diff --git a/libs/ardour/ardour/broadcast_info.h b/libs/ardour/ardour/broadcast_info.h
index dbad062b2b5f6d87555500cf4040c5994993302d..522d7e7361e2acadae8131327e21f22a8326885c 100644 (file)
--- a/libs/ardour/ardour/broadcast_info.h
+++ b/libs/ardour/ardour/broadcast_info.h
@@ -28,8 +28,6 @@
 
 #include "ardour/types.h"
 
-using std::string;
-
 namespace ARDOUR
 {
 
@@ -42,38 +40,38 @@ class BroadcastInfo
        /// Construct empty broadcast info
        BroadcastInfo ();
        ~BroadcastInfo ();
-       
+
        /// Returns last error sring from libsndfile
-       string get_error () const { return error; }
-       
+       std::string get_error () const { return error; }
+
        /* Convenience functions */
-       
+
        void set_from_session (Session const & session, int64_t time_ref);
-       
+
        /* Reading */
-       
-       bool load_from_file (string const & filename);
+
+       bool load_from_file (std::string const & filename);
        bool load_from_file (SNDFILE* sf);
-       
-       string get_description () const;
+
+       std::string get_description () const;
        int64_t get_time_reference () const;
        struct tm get_origination_time () const;
-       string get_originator () const;
-       string get_originator_ref () const;
-       
+       std::string get_originator () const;
+       std::string get_originator_ref () const;
+
        /* Writing */
-       
-       bool write_to_file (string const & filename);
+
+       bool write_to_file (std::string const & filename);
        bool write_to_file (SNDFILE* sf);
-       
-       void set_description (string const & desc);
+
+       void set_description (std::string const & desc);
        void set_time_reference (int64_t when);
        void set_origination_time (struct tm * now = 0); // if 0, use time generated at construction
-       void set_originator (string const & str = "");
-       void set_originator_ref (string const & str = "");
-       
+       void set_originator (std::string const & str = "");
+       void set_originator_ref (Session const &, std::string const & str = "");
+
        /* State info */
-       
+
        /// Returns true if a info has been succesfully loaded or anything has been manually set
        bool has_info () const { return _has_info; }
 
@@ -81,10 +79,10 @@ class BroadcastInfo
 
        SF_BROADCAST_INFO * info;
        struct tm _time;
-       
+
        void update_error ();
-       string error;
-       
+       std::string error;
+
        bool _has_info;
 };