From 3a2ba2e9583a79afb878e78ec20a7e8eada0468b Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Sun, 28 Feb 2016 11:58:47 +0100
Subject: Rewrite commit 68e81a6, prefer forward declaration and includes in
 cc.

only MSVC requires the complete class for the templated c'tor in
window manager.h
---
 gtk2_ardour/ardour_ui.cc         | 1 +
 gtk2_ardour/ardour_ui.h          | 3 ++-
 gtk2_ardour/ardour_ui_dialogs.cc | 1 +
 gtk2_ardour/window_manager.h     | 2 --
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 565bc2b989..0916007431 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -131,6 +131,7 @@ typedef uint64_t microseconds_t;
 #include "keyboard.h"
 #include "keyeditor.h"
 #include "location_ui.h"
+#include "lua_script_manager.h"
 #include "luawindow.h"
 #include "main_clock.h"
 #include "missing_file_dialog.h"
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 08a2bf9a72..bc58341ec7 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -88,6 +88,7 @@
 #include "global_port_matrix.h"
 #include "keyeditor.h"
 #include "location_ui.h"
+#include "lua_script_manager.h"
 #include "rc_option_editor.h"
 #include "route_params_ui.h"
 #include "session_option_editor.h"
@@ -102,6 +103,7 @@ class EngineControl;
 class ExportVideoDialog;
 class KeyEditor;
 class LocationUIWindow;
+class LuaScriptManager;
 class RCOptionEditor;
 class RouteParams_UI;
 class SessionOptionEditor;
@@ -127,7 +129,6 @@ class Splash;
 class TimeInfoBox;
 class Meterbridge;
 class LuaWindow;
-class LuaScriptManager;
 class MidiTracer;
 class NSM_Client;
 class LevelMeterHBox;
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 9431974776..64037e843e 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -49,6 +49,7 @@
 #include "gui_thread.h"
 #include "keyeditor.h"
 #include "location_ui.h"
+#include "lua_script_manager.h"
 #include "luawindow.h"
 #include "main_clock.h"
 #include "meterbridge.h"
diff --git a/gtk2_ardour/window_manager.h b/gtk2_ardour/window_manager.h
index 6279180249..37744e5964 100644
--- a/gtk2_ardour/window_manager.h
+++ b/gtk2_ardour/window_manager.h
@@ -27,8 +27,6 @@
 #include <glibmm/refptr.h>
 #include <sigc++/trackable.h>
 
-#include "lua_script_manager.h"
-
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/window_proxy.h"
 
-- 
cgit v1.2.3