summaryrefslogtreecommitdiff
path: root/gtk2_ardour/export_channel_selector.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-09-14 16:51:02 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-09-14 16:51:02 +0000
commitda8eec7a8311295ee91308eca9fae2146385c512 (patch)
tree8353f003e048b3980bdf4e09f78a4c37d3ad6a59 /gtk2_ardour/export_channel_selector.h
parentc1ee2c6943623e43181d56eed0de18b608fff86a (diff)
remove Glib::ustring from gtk2_ardour
git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/export_channel_selector.h')
-rw-r--r--gtk2_ardour/export_channel_selector.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h
index 6a1c4252a4..cfb71b34f5 100644
--- a/gtk2_ardour/export_channel_selector.h
+++ b/gtk2_ardour/export_channel_selector.h
@@ -114,7 +114,7 @@ class PortExportChannelSelector : public ExportChannelSelector
/* Static columns */
Gtk::TreeModelColumn<bool> selected;
- Gtk::TreeModelColumn<Glib::ustring> name;
+ Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<ARDOUR::IO *> io;
/* Combo list column (shared by all channels) */
@@ -129,7 +129,7 @@ class PortExportChannelSelector : public ExportChannelSelector
Channel (RouteCols & cols) { cols.add (port); cols.add (label); }
Gtk::TreeModelColumn<ARDOUR::AudioPort *> port;
- Gtk::TreeModelColumn<Glib::ustring> label;
+ Gtk::TreeModelColumn<std::string> label;
};
std::list<Channel> channels;
@@ -147,7 +147,7 @@ class PortExportChannelSelector : public ExportChannelSelector
Gtk::TreeModelColumn<bool> selected; // not used ATM
Gtk::TreeModelColumn<ARDOUR::AudioPort *> port;
- Gtk::TreeModelColumn<Glib::ustring> label;
+ Gtk::TreeModelColumn<std::string> label;
};
PortCols port_cols;
};
@@ -175,8 +175,8 @@ class PortExportChannelSelector : public ExportChannelSelector
/* Signal handlers for selections changes in the view */
- void update_toggle_selection (Glib::ustring const & path);
- void update_selection_text (Glib::ustring const & path, Glib::ustring const & new_text, uint32_t channel);
+ void update_toggle_selection (std::string const & path);
+ void update_selection_text (std::string const & path, std::string const & new_text, uint32_t channel);
RouteCols route_cols;
Glib::RefPtr<Gtk::ListStore> route_list;