summaryrefslogtreecommitdiff
path: root/gtk2_ardour/mixer_ui.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/mixer_ui.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/mixer_ui.h')
-rw-r--r--gtk2_ardour/mixer_ui.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index ce7c02439d..2c5081dbcc 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -187,7 +187,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
void disable_all_route_groups ();
void add_route_group (ARDOUR::RouteGroup *);
void route_groups_changed ();
- void route_group_name_edit (const Glib::ustring&, const Glib::ustring&);
+ void route_group_name_edit (const std::string&, const std::string&);
void route_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter);
Gtk::Menu *track_menu;
@@ -210,7 +210,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
add (strip);
}
Gtk::TreeModelColumn<bool> visible;
- Gtk::TreeModelColumn<Glib::ustring> text;
+ Gtk::TreeModelColumn<std::string> text;
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
Gtk::TreeModelColumn<MixerStrip*> strip;
};
@@ -222,7 +222,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
add (group);
}
Gtk::TreeModelColumn<bool> visible;
- Gtk::TreeModelColumn<Glib::ustring> text;
+ Gtk::TreeModelColumn<std::string> text;
Gtk::TreeModelColumn<ARDOUR::RouteGroup*> group;
};