summaryrefslogtreecommitdiff
path: root/gtk2_ardour/crossfade_edit.h
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2009-05-12 17:03:42 +0000
committerCarl Hetherington <carl@carlh.net>2009-05-12 17:03:42 +0000
commit3b89d9eaa03406a5e03648f47734211f09b89d62 (patch)
tree1c8d151bca327d4a5cb7047c8591aa814b9b4ec8 /gtk2_ardour/crossfade_edit.h
parent2e5c935990d6ea5cc6e9a5a6de0fd8c52e68657c (diff)
Remove most using declarations from header files.
git-svn-id: svn://localhost/ardour2/branches/3.0@5069 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/crossfade_edit.h')
-rw-r--r--gtk2_ardour/crossfade_edit.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h
index 4b905a85c2..694625a9b5 100644
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -61,14 +61,14 @@ class CrossfadeEditor : public ArdourDialog
: x (a), y (b) {}
};
- struct Preset : public list<PresetPoint> {
+ struct Preset : public std::list<PresetPoint> {
const char* name;
const char* image_name;
Preset (const char* n, const char* x) : name (n), image_name (x) {}
};
- typedef list<Preset*> Presets;
+ typedef std::list<Preset*> Presets;
static Presets* fade_in_presets;
static Presets* fade_out_presets;
@@ -108,10 +108,10 @@ class CrossfadeEditor : public ArdourDialog
struct Half {
ArdourCanvas::Line* line;
ArdourCanvas::Polygon* shading;
- list<Point*> points;
+ std::list<Point*> points;
ARDOUR::AutomationList normative_curve; /* 0 - 1.0, linear */
ARDOUR::AutomationList gain_curve; /* 0 - 2.0, gain mapping */
- vector<ArdourCanvas::WaveView*> waves;
+ std::vector<ArdourCanvas::WaveView*> waves;
Half();
};
@@ -125,8 +125,8 @@ class CrossfadeEditor : public ArdourDialog
WhichFade current;
bool point_grabbed;
- vector<Gtk::Button*> fade_out_buttons;
- vector<Gtk::Button*> fade_in_buttons;
+ std::vector<Gtk::Button*> fade_out_buttons;
+ std::vector<Gtk::Button*> fade_in_buttons;
Gtk::VBox vpacker2;