From ca28b2460abca01b5dfbe6367acacab15a9425b2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 27 Feb 2009 01:26:47 +0000 Subject: [PATCH] Remove apparently unnecessary friend declarations. git-svn-id: svn://localhost/ardour2/branches/3.0@4699 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor.h | 12 ++++-------- gtk2_ardour/imageframe_socket_handler.h | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 8f3e60d9e1..6edbffa529 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -527,10 +527,10 @@ class Editor : public PublicEditor TimeAxisView* clicked_axisview; RouteTimeAxisView* clicked_routeview; - /** The last RegionView that was clicked on, or 0 if the last click was not - * on a RegionView. This is set up by the canvas event handlers in - * editor_canvas_events.cc - */ + /** The last RegionView that was clicked on, or 0 if the last click was not + * on a RegionView. This is set up by the canvas event handlers in + * editor_canvas_events.cc + */ RegionView* clicked_regionview; RegionSelection latest_regionviews; uint32_t clicked_selection; @@ -834,8 +834,6 @@ class Editor : public PublicEditor void set_y_axis (double position); }; - friend struct Cursor; /* FIXME: needs access to several private fields */ - Cursor* playhead_cursor; ArdourCanvas::Group* cursor_group; @@ -2135,8 +2133,6 @@ public: /* "whats mine is yours" */ - friend class TimeFXDialog; - TimeFXDialog* current_timefx; static void* timefx_thread (void *arg); diff --git a/gtk2_ardour/imageframe_socket_handler.h b/gtk2_ardour/imageframe_socket_handler.h index 3a87f5bf71..b945bb65a2 100644 --- a/gtk2_ardour/imageframe_socket_handler.h +++ b/gtk2_ardour/imageframe_socket_handler.h @@ -22,13 +22,13 @@ #include #include -#include "editor.h" #include "ardour_image_compositor_socket.h" class TimeAxisViewItem ; class ImageFrameView ; class MarkerView ; class ImageFrameTimeAxisGroup ; +class Editor ; /** * ImageFrameSocketHandler defines the handler between Ardour and an Image Compositor