From d405b061dfde119c9567412c4adb155223022050 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 15 Jul 2011 04:05:15 +0000
Subject: [PATCH] Eliminate a lot of unnessesary includes of subs_grid.h

Originally committed to SVN as r5458.
---
 aegisub/src/command/video.cpp           |  1 +
 aegisub/src/dialog_detached_video.cpp   |  1 -
 aegisub/src/dialog_fonts_collector.cpp  |  1 -
 aegisub/src/dialog_kara_timing_copy.cpp | 11 -----------
 aegisub/src/dialog_kara_timing_copy.h   |  6 ------
 aegisub/src/dialog_style_manager.cpp    |  1 -
 aegisub/src/dialog_timing_processor.cpp |  1 -
 aegisub/src/dialog_timing_processor.h   |  1 -
 aegisub/src/visual_tool_clip.cpp        |  1 -
 aegisub/src/visual_tool_cross.cpp       |  1 -
 aegisub/src/visual_tool_rotatexy.cpp    |  1 -
 aegisub/src/visual_tool_rotatez.cpp     |  1 -
 aegisub/src/visual_tool_scale.cpp       |  1 -
 13 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp
index 34f276ca2..5d4f0b4e9 100644
--- a/aegisub/src/command/video.cpp
+++ b/aegisub/src/command/video.cpp
@@ -50,6 +50,7 @@
 #include "../dialog_dummy_video.h"
 #include "../dialog_jumpto.h"
 #include "../dialog_video_details.h"
+#include "../selection_controller.h"
 #include "../subs_grid.h"
 #include "../utils.h"
 #include "../video_box.h"
diff --git a/aegisub/src/dialog_detached_video.cpp b/aegisub/src/dialog_detached_video.cpp
index d131b2683..e943f12b0 100644
--- a/aegisub/src/dialog_detached_video.cpp
+++ b/aegisub/src/dialog_detached_video.cpp
@@ -46,7 +46,6 @@
 #include "dialog_detached_video.h"
 #include "frame_main.h"
 #include "main.h"
-#include "subs_grid.h"
 #include "video_box.h"
 #include "video_context.h"
 #include "video_display.h"
diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp
index 2143effd3..f3cde56b2 100644
--- a/aegisub/src/dialog_fonts_collector.cpp
+++ b/aegisub/src/dialog_fonts_collector.cpp
@@ -59,7 +59,6 @@
 #include "main.h"
 #include "scintilla_text_ctrl.h"
 #include "selection_controller.h"
-#include "subs_grid.h"
 #include "utils.h"
 
 
diff --git a/aegisub/src/dialog_kara_timing_copy.cpp b/aegisub/src/dialog_kara_timing_copy.cpp
index 1a0425352..57357c6dd 100644
--- a/aegisub/src/dialog_kara_timing_copy.cpp
+++ b/aegisub/src/dialog_kara_timing_copy.cpp
@@ -35,9 +35,6 @@
 /// @ingroup tools_ui kara_timing_copy
 ///
 
-
-///////////
-// Headers
 #include "config.h"
 
 #ifndef AGI_PRE
@@ -57,7 +54,6 @@
 #include "libresrc/libresrc.h"
 #include "main.h"
 #include "selection_controller.h"
-#include "subs_grid.h"
 #include "utils.h"
 #include "validators.h"
 #include "video_context.h"
@@ -827,14 +823,8 @@ bool KaraokeLineMatchDisplay::UndoMatch()
 	return true;
 }
 
-
-
-
-
 /// @brief Constructor 
 /// @param parent 
-/// @param _grid  
-///
 DialogKanjiTimer::DialogKanjiTimer(agi::Context *c)
 : wxDialog(c->parent,-1,_("Kanji timing"),wxDefaultPosition)
 {
@@ -843,7 +833,6 @@ DialogKanjiTimer::DialogKanjiTimer(agi::Context *c)
 
 	// Variables
 	subs = c->ass;
-	grid = c->subsGrid;
 	currentSourceLine = subs->Line.begin();
 	currentDestinationLine = subs->Line.begin();
 
diff --git a/aegisub/src/dialog_kara_timing_copy.h b/aegisub/src/dialog_kara_timing_copy.h
index d433e41b4..45fa320c2 100644
--- a/aegisub/src/dialog_kara_timing_copy.h
+++ b/aegisub/src/dialog_kara_timing_copy.h
@@ -51,8 +51,6 @@
 namespace agi { struct Context; }
 class AssOverrideParameter;
 class KaraokeLineMatchDisplay;
-class SubtitlesGrid;
-
 
 /// DOCME
 /// @class DialogKanjiTimer
@@ -60,10 +58,6 @@ class SubtitlesGrid;
 ///
 /// DOCME
 class DialogKanjiTimer : public wxDialog {
-
-	/// DOCME
-	SubtitlesGrid *grid;
-
 	/// DOCME
 	AssFile *subs;
 
diff --git a/aegisub/src/dialog_style_manager.cpp b/aegisub/src/dialog_style_manager.cpp
index 9c75106eb..79a5be233 100644
--- a/aegisub/src/dialog_style_manager.cpp
+++ b/aegisub/src/dialog_style_manager.cpp
@@ -57,7 +57,6 @@
 #include "main.h"
 #include "selection_controller.h"
 #include "standard_paths.h"
-#include "subs_grid.h"
 #include "utils.h"
 
 /// IDs
diff --git a/aegisub/src/dialog_timing_processor.cpp b/aegisub/src/dialog_timing_processor.cpp
index 840d2a89b..c0e98bf62 100644
--- a/aegisub/src/dialog_timing_processor.cpp
+++ b/aegisub/src/dialog_timing_processor.cpp
@@ -49,7 +49,6 @@
 #include "libresrc/libresrc.h"
 #include "main.h"
 #include "selection_controller.h"
-#include "subs_grid.h"
 #include "utils.h"
 #include "validators.h"
 #include "video_context.h"
diff --git a/aegisub/src/dialog_timing_processor.h b/aegisub/src/dialog_timing_processor.h
index 52c0fd594..d150fdd2c 100644
--- a/aegisub/src/dialog_timing_processor.h
+++ b/aegisub/src/dialog_timing_processor.h
@@ -48,7 +48,6 @@
 
 namespace agi { struct Context; }
 class AssDialogue;
-class SubtitlesGrid;
 
 /// DOCME
 /// @class DialogTimingProcessor
diff --git a/aegisub/src/visual_tool_clip.cpp b/aegisub/src/visual_tool_clip.cpp
index 2d4f67f28..aa4e6b0ce 100644
--- a/aegisub/src/visual_tool_clip.cpp
+++ b/aegisub/src/visual_tool_clip.cpp
@@ -41,7 +41,6 @@
 
 #include "ass_dialogue.h"
 #include "ass_file.h"
-#include "subs_grid.h"
 #include "utils.h"
 #include "video_display.h"
 #include "visual_tool_clip.h"
diff --git a/aegisub/src/visual_tool_cross.cpp b/aegisub/src/visual_tool_cross.cpp
index 6509139f8..79363756c 100644
--- a/aegisub/src/visual_tool_cross.cpp
+++ b/aegisub/src/visual_tool_cross.cpp
@@ -38,7 +38,6 @@
 #include "ass_file.h"
 #include "include/aegisub/context.h"
 #include "gl_text.h"
-#include "subs_grid.h"
 #include "video_context.h"
 #include "video_display.h"
 #include "visual_tool_cross.h"
diff --git a/aegisub/src/visual_tool_rotatexy.cpp b/aegisub/src/visual_tool_rotatexy.cpp
index d3526229e..46843bc1c 100644
--- a/aegisub/src/visual_tool_rotatexy.cpp
+++ b/aegisub/src/visual_tool_rotatexy.cpp
@@ -42,7 +42,6 @@
 #include "ass_dialogue.h"
 #include "ass_file.h"
 #include "include/aegisub/context.h"
-#include "subs_grid.h"
 #include "utils.h"
 #include "video_context.h"
 #include "video_display.h"
diff --git a/aegisub/src/visual_tool_rotatez.cpp b/aegisub/src/visual_tool_rotatez.cpp
index a812e9bdd..cd0ab5f3b 100644
--- a/aegisub/src/visual_tool_rotatez.cpp
+++ b/aegisub/src/visual_tool_rotatez.cpp
@@ -42,7 +42,6 @@
 #include "ass_dialogue.h"
 #include "ass_file.h"
 #include "include/aegisub/context.h"
-#include "subs_grid.h"
 #include "utils.h"
 #include "video_context.h"
 #include "video_display.h"
diff --git a/aegisub/src/visual_tool_scale.cpp b/aegisub/src/visual_tool_scale.cpp
index ae16bf98b..8fcad0127 100644
--- a/aegisub/src/visual_tool_scale.cpp
+++ b/aegisub/src/visual_tool_scale.cpp
@@ -42,7 +42,6 @@
 #include "ass_dialogue.h"
 #include "ass_file.h"
 #include "include/aegisub/context.h"
-#include "subs_grid.h"
 #include "utils.h"
 #include "video_context.h"
 #include "video_display.h"