From eaca325ce81c63888ee70305ad384102e46757be Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 5 Oct 2015 13:58:35 -0400
Subject: Trim dependence on evoral types.hpp and Beats.hpp

---
 gtk2_ardour/midi_cut_buffer.h  | 2 +-
 gtk2_ardour/midi_list_editor.h | 3 +--
 gtk2_ardour/note_base.h        | 2 +-
 gtk2_ardour/public_editor.h    | 2 +-
 gtk2_ardour/quantize_dialog.h  | 1 -
 gtk2_ardour/step_editor.h      | 2 +-
 gtk2_ardour/transform_dialog.h | 1 -
 7 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'gtk2_ardour')

diff --git a/gtk2_ardour/midi_cut_buffer.h b/gtk2_ardour/midi_cut_buffer.h
index 8c92b9a442..da17c50413 100644
--- a/gtk2_ardour/midi_cut_buffer.h
+++ b/gtk2_ardour/midi_cut_buffer.h
@@ -19,7 +19,7 @@
 #ifndef __gtk_ardour_midi_cut_buffer_h__
 #define __gtk_ardour_midi_cut_buffer_h__
 
-#include "evoral/types.hpp"
+#include "evoral/Beats.hpp"
 
 #include "ardour/automatable_sequence.h"
 
diff --git a/gtk2_ardour/midi_list_editor.h b/gtk2_ardour/midi_list_editor.h
index 9ff413946c..283a0da8bc 100644
--- a/gtk2_ardour/midi_list_editor.h
+++ b/gtk2_ardour/midi_list_editor.h
@@ -25,14 +25,13 @@
 #include <gtkmm/liststore.h>
 #include <gtkmm/scrolledwindow.h>
 
-#include "evoral/types.hpp"
-
 #include "ardour/session_handle.h"
 
 #include "ardour_window.h"
 
 namespace Evoral {
 	template<typename Time> class Note;
+	class                         Beats;
 };
 
 namespace ARDOUR {
diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index 059aa9dc8f..d55f87c552 100644
--- a/gtk2_ardour/note_base.h
+++ b/gtk2_ardour/note_base.h
@@ -23,7 +23,6 @@
 #include <boost/shared_ptr.hpp>
 
 #include "canvas/types.h"
-#include "evoral/types.hpp"
 
 #include "rgb_macros.h"
 #include "ui_config.h"
@@ -33,6 +32,7 @@ class MidiRegionView;
 
 namespace Evoral {
 	template<typename T> class Note;
+	class Beats;
 }
 
 namespace ArdourCanvas {
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 45fbb9ece9..519a714c79 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -35,8 +35,8 @@
 #include <gtkmm/notebook.h>
 #include <sigc++/signal.h>
 
+#include "evoral/Beats.hpp"
 #include "evoral/Note.hpp"
-#include "evoral/types.hpp"
 
 #include "pbd/statefuldestructible.h"
 
diff --git a/gtk2_ardour/quantize_dialog.h b/gtk2_ardour/quantize_dialog.h
index 8203875e98..f162dd0993 100644
--- a/gtk2_ardour/quantize_dialog.h
+++ b/gtk2_ardour/quantize_dialog.h
@@ -27,7 +27,6 @@
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/spinbutton.h>
 
-#include "evoral/types.hpp"
 #include "ardour/types.h"
 
 #include "ardour_dialog.h"
diff --git a/gtk2_ardour/step_editor.h b/gtk2_ardour/step_editor.h
index 31632a801b..b16cd8f863 100644
--- a/gtk2_ardour/step_editor.h
+++ b/gtk2_ardour/step_editor.h
@@ -25,7 +25,7 @@
 #include <sigc++/trackable.h>
 
 #include "pbd/signals.h"
-#include "evoral/types.hpp"
+#include "evoral/Beats.hpp"
 
 namespace ARDOUR {
 class MidiTrack;
diff --git a/gtk2_ardour/transform_dialog.h b/gtk2_ardour/transform_dialog.h
index 5111aa7543..df7a1c8b92 100644
--- a/gtk2_ardour/transform_dialog.h
+++ b/gtk2_ardour/transform_dialog.h
@@ -31,7 +31,6 @@
 #include "ardour/midi_model.h"
 #include "ardour/transform.h"
 #include "ardour/types.h"
-#include "evoral/types.hpp"
 
 #include "ardour_dialog.h"
 
-- 
cgit v1.2.3