update drobilla's fascistic dir-locals.el to force emacs users into whitespace submis...

[ardour.git] / gtk2_ardour / export_format_dialog.h

diff --git a/gtk2_ardour/export_format_dialog.h b/gtk2_ardour/export_format_dialog.h
index 418b015d8ca628eb7e5daab2fd23f67200cf5f31..f22e3425891141e3a07dde1e319935b0bf9933fb 100644 (file)
--- a/gtk2_ardour/export_format_dialog.h
+++ b/gtk2_ardour/export_format_dialog.h
@@ -27,13 +27,14 @@
 #include "ardour/export_formats.h"
 
 #include "pbd/xml++.h"
+#include "pbd/signals.h"
 
 #include "ardour_dialog.h"
 #include "audio_clock.h"
 
 #include <gtkmm.h>
 
-class ExportFormatDialog : public ArdourDialog {
+class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList {
   private:
 
        typedef ARDOUR::ExportFormatManager::WeakCompatPtr WeakCompatPtr;
@@ -76,7 +77,7 @@ class ExportFormatDialog : public ArdourDialog {
 
        /* These are connected to signals from GUI components, and should change element states  */
 
-       void update_compatibility_selection (Glib::ustring const & path);
+       void update_compatibility_selection (std::string const & path);
        void update_quality_selection ();
        void update_format_selection ();
        void update_sample_rate_selection ();
@@ -107,7 +108,7 @@ class ExportFormatDialog : public ArdourDialog {
 
        template<typename T, typename ColsT>
        void change_compatibility (bool compatibility, boost::weak_ptr<T> w_ptr, Glib::RefPtr<Gtk::ListStore> & list, ColsT & cols,
-                                  Glib::ustring const & c_incompatible = "red", Glib::ustring const & c_compatible = "white");
+                                  std::string const & c_incompatible = "red", std::string const & c_compatible = "white");
 
        uint32_t applying_changes_from_engine;
 
@@ -178,7 +179,7 @@ class ExportFormatDialog : public ArdourDialog {
          public:
                Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::CompatPtr>  ptr;
                Gtk::TreeModelColumn<bool>                                    selected;
-               Gtk::TreeModelColumn<Glib::ustring>                           label;
+               Gtk::TreeModelColumn<std::string>                           label;
 
                CompatibilityCols () { add(ptr); add(selected); add(label); }
        };
@@ -193,8 +194,8 @@ class ExportFormatDialog : public ArdourDialog {
        {
          public:
                Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::QualityPtr>  ptr;
-               Gtk::TreeModelColumn<Glib::ustring>                            color;
-               Gtk::TreeModelColumn<Glib::ustring>                            label;
+               Gtk::TreeModelColumn<std::string>                            color;
+               Gtk::TreeModelColumn<std::string>                            label;
 
                QualityCols () { add(ptr); add(color); add(label); }
        };
@@ -205,8 +206,8 @@ class ExportFormatDialog : public ArdourDialog {
        {
          public:
                Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::FormatPtr>  ptr;
-               Gtk::TreeModelColumn<Glib::ustring>                           color;
-               Gtk::TreeModelColumn<Glib::ustring>                           label;
+               Gtk::TreeModelColumn<std::string>                           color;
+               Gtk::TreeModelColumn<std::string>                           label;
 
                FormatCols () { add(ptr); add(color); add(label); }
        };
@@ -217,8 +218,8 @@ class ExportFormatDialog : public ArdourDialog {
        {
          public:
                Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::SampleRatePtr>  ptr;
-               Gtk::TreeModelColumn<Glib::ustring>                               color;
-               Gtk::TreeModelColumn<Glib::ustring>                               label;
+               Gtk::TreeModelColumn<std::string>                               color;
+               Gtk::TreeModelColumn<std::string>                               label;
 
                SampleRateCols () { add(ptr); add(color); add(label); }
        };
@@ -243,7 +244,7 @@ class ExportFormatDialog : public ArdourDialog {
        {
          public:
                Gtk::TreeModelColumn<ARDOUR::ExportFormatBase::SRCQuality>  id;
-               Gtk::TreeModelColumn<Glib::ustring>                         label;
+               Gtk::TreeModelColumn<std::string>                         label;
 
                SRCQualityCols () { add(id); add(label); }
        };
@@ -273,8 +274,8 @@ class ExportFormatDialog : public ArdourDialog {
        {
          public:
                Gtk::TreeModelColumn<ARDOUR::HasSampleFormat::SampleFormatPtr>   ptr;
-               Gtk::TreeModelColumn<Glib::ustring>                              color;
-               Gtk::TreeModelColumn<Glib::ustring>                              label;
+               Gtk::TreeModelColumn<std::string>                              color;
+               Gtk::TreeModelColumn<std::string>                              label;
 
                SampleFormatCols () { add(ptr); add(color); add(label); }
        };
@@ -285,8 +286,8 @@ class ExportFormatDialog : public ArdourDialog {
        {
          public:
                Gtk::TreeModelColumn<ARDOUR::HasSampleFormat::DitherTypePtr>   ptr;
-               Gtk::TreeModelColumn<Glib::ustring>                            color;
-               Gtk::TreeModelColumn<Glib::ustring>                            label;
+               Gtk::TreeModelColumn<std::string>                            color;
+               Gtk::TreeModelColumn<std::string>                            label;
 
                DitherTypeCols () { add(ptr); add (color); add(label); }
        };