From 697a0d48b59e489f0b5e10146f806878aaead6c3 Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Thu, 26 Apr 2001 18:40:38 +0000
Subject: [PATCH] Move included files out of .h files and into .C files. Means
 that the GUI-specific views no longer depend on LyXView.h etc, etc.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1959 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/controllers/ChangeLog           | 29 +++++++++++++++++++
 src/frontends/controllers/ControlBibitem.C    |  2 ++
 src/frontends/controllers/ControlBibtex.C     |  2 ++
 src/frontends/controllers/ControlButtons.C    |  2 ++
 src/frontends/controllers/ControlButtons.h    |  4 +--
 src/frontends/controllers/ControlCharacter.C  |  2 ++
 src/frontends/controllers/ControlCitation.C   |  2 ++
 src/frontends/controllers/ControlCommand.C    |  2 ++
 .../controllers/ControlConnections.C          |  1 +
 src/frontends/controllers/ControlCopyright.C  |  2 ++
 src/frontends/controllers/ControlCredits.C    |  3 +-
 src/frontends/controllers/ControlError.C      |  2 ++
 src/frontends/controllers/ControlExternal.C   |  2 ++
 src/frontends/controllers/ControlGraphics.C   |  3 ++
 src/frontends/controllers/ControlGraphics.h   |  2 +-
 src/frontends/controllers/ControlInclude.C    |  2 ++
 src/frontends/controllers/ControlIndex.C      |  2 ++
 src/frontends/controllers/ControlInset.h      |  3 --
 src/frontends/controllers/ControlLog.C        |  5 +++-
 src/frontends/controllers/ControlMinipage.C   |  2 ++
 src/frontends/controllers/ControlPreamble.C   |  2 ++
 src/frontends/controllers/ControlPrint.C      |  2 ++
 src/frontends/controllers/ControlRef.C        |  3 +-
 src/frontends/controllers/ControlSearch.C     |  2 ++
 .../controllers/ControlTabularCreate.C        |  2 ++
 .../controllers/ControlTabularCreate.h        |  4 +--
 src/frontends/controllers/ControlToc.C        |  2 ++
 src/frontends/controllers/ControlUrl.C        |  2 ++
 src/frontends/controllers/ControlVCLog.C      |  6 ++--
 29 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 03b8fce3b7..46336e5e17 100644
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,32 @@
+2001-04-26  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* ControlButtons.h: no longer include ButtonControllerBase.h, ViewBase.h
+	* ControlGraphics.h: no longer include insetgraphicsParams.h
+	* ControlInset.h: no longer include LyXView.h, LAssert.h
+
+	* ControlBibitem.C:
+	* ControlBibtex.C:
+	* ControlButtons.C:
+	* ControlCharacter.C:
+	* ControlCitation.C:
+	* ControlCommand.C:
+	* ControlConnections.C:
+	* ControlCopyright.C:
+	* ControlCredits.C:
+	* ControlError.C:
+	* ControlExternal.C:
+	* ControlGraphics.C:
+	* ControlInclude.C:
+	* ControlLog.C:
+	* ControlMinipage.C:
+	* ControlPreamble.C:
+	* ControlPrint.C:
+	* ControlRef.C:
+	* ControlSearch.C:
+	* ControlTabularCreate.C:
+	* ControlToc.C:
+	* ControlVCLog.C: they're now in here!
+
 2001-04-17  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* ButtonControllerBase.h: C++ mode, inherit privately from
diff --git a/src/frontends/controllers/ControlBibitem.C b/src/frontends/controllers/ControlBibitem.C
index 65993c134a..c1023622de 100644
--- a/src/frontends/controllers/ControlBibitem.C
+++ b/src/frontends/controllers/ControlBibitem.C
@@ -19,6 +19,8 @@
 #endif
 
 #include <config.h>
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlBibitem.h"
 #include "Dialogs.h"
 #include "LyXView.h"
diff --git a/src/frontends/controllers/ControlBibtex.C b/src/frontends/controllers/ControlBibtex.C
index 560b20e32d..4f700ae83f 100644
--- a/src/frontends/controllers/ControlBibtex.C
+++ b/src/frontends/controllers/ControlBibtex.C
@@ -20,6 +20,8 @@
 #endif
 
 #include <config.h>
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlBibtex.h"
 #include "Dialogs.h"
 #include "LyXView.h"
diff --git a/src/frontends/controllers/ControlButtons.C b/src/frontends/controllers/ControlButtons.C
index 1f27c14a3c..6773b844d1 100644
--- a/src/frontends/controllers/ControlButtons.C
+++ b/src/frontends/controllers/ControlButtons.C
@@ -19,6 +19,8 @@
 #endif
 
 #include "ControlButtons.h"
+#include "ButtonControllerBase.h"
+#include "ViewBase.h"
 
 void ControlButtons::ApplyButton()
 {
diff --git a/src/frontends/controllers/ControlButtons.h b/src/frontends/controllers/ControlButtons.h
index 02c4f22a81..223304e48b 100644
--- a/src/frontends/controllers/ControlButtons.h
+++ b/src/frontends/controllers/ControlButtons.h
@@ -33,9 +33,9 @@
 #endif
 
 #include "DialogBase.h" // This can go eventually
-#include "ButtonControllerBase.h"
 
 class ViewBase;
+class ButtonControllerBase;
 
 /** Abstract base class for Controllers with a ButtonController.
  */
@@ -76,6 +76,4 @@ protected:
 	virtual ViewBase & view() = 0;
 };
 
-#include "ViewBase.h"
-
 #endif // CONTROLBUTTONS_H
diff --git a/src/frontends/controllers/ControlCharacter.C b/src/frontends/controllers/ControlCharacter.C
index 1a20f51ebe..12dbfb213f 100644
--- a/src/frontends/controllers/ControlCharacter.C
+++ b/src/frontends/controllers/ControlCharacter.C
@@ -14,6 +14,8 @@
 
 #include <config.h>
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlCharacter.h"
 #include "buffer.h"
 #include "Dialogs.h"
diff --git a/src/frontends/controllers/ControlCitation.C b/src/frontends/controllers/ControlCitation.C
index 56abf2b48f..c601db9afb 100644
--- a/src/frontends/controllers/ControlCitation.C
+++ b/src/frontends/controllers/ControlCitation.C
@@ -18,6 +18,8 @@
 #pragma implementation
 #endif
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlCitation.h"
 #include "buffer.h"
 #include "Dialogs.h"
diff --git a/src/frontends/controllers/ControlCommand.C b/src/frontends/controllers/ControlCommand.C
index 1d4b5399a7..6689bbf644 100644
--- a/src/frontends/controllers/ControlCommand.C
+++ b/src/frontends/controllers/ControlCommand.C
@@ -17,6 +17,8 @@
 
 #include <config.h>
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlCommand.h"
 #include "buffer.h"
 #include "Dialogs.h"
diff --git a/src/frontends/controllers/ControlConnections.C b/src/frontends/controllers/ControlConnections.C
index 2446320a75..57704df2fa 100644
--- a/src/frontends/controllers/ControlConnections.C
+++ b/src/frontends/controllers/ControlConnections.C
@@ -18,6 +18,7 @@
 
 #include <config.h>
 
+#include "ViewBase.h"
 #include "ControlConnections.h"
 #include "Dialogs.h"
 #include "LyXView.h"
diff --git a/src/frontends/controllers/ControlCopyright.C b/src/frontends/controllers/ControlCopyright.C
index 51fd780bf4..ac51fdf3a7 100644
--- a/src/frontends/controllers/ControlCopyright.C
+++ b/src/frontends/controllers/ControlCopyright.C
@@ -13,6 +13,8 @@
 
 #include <config.h>
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlCopyright.h"
 #include "Dialogs.h"
 #include "LyXView.h"
diff --git a/src/frontends/controllers/ControlCredits.C b/src/frontends/controllers/ControlCredits.C
index 04375af8fd..2d7c3849fb 100644
--- a/src/frontends/controllers/ControlCredits.C
+++ b/src/frontends/controllers/ControlCredits.C
@@ -9,12 +9,13 @@
 
 #include <config.h>
 #include <fstream>
-#include "Lsstream.h"
 
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlCredits.h"
 #include "Dialogs.h"
 #include "LyXView.h"
diff --git a/src/frontends/controllers/ControlError.C b/src/frontends/controllers/ControlError.C
index 0c571e1876..8333253d39 100644
--- a/src/frontends/controllers/ControlError.C
+++ b/src/frontends/controllers/ControlError.C
@@ -17,6 +17,8 @@
 
 #include <config.h>
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlError.h"
 #include "Dialogs.h"
 #include "LyXView.h"
diff --git a/src/frontends/controllers/ControlExternal.C b/src/frontends/controllers/ControlExternal.C
index a294c1283a..2258afdd68 100644
--- a/src/frontends/controllers/ControlExternal.C
+++ b/src/frontends/controllers/ControlExternal.C
@@ -22,6 +22,8 @@
 #pragma implementation
 #endif
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlExternal.h"
 #include "buffer.h"
 #include "Dialogs.h"
diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C
index f5d3991142..167d2ad140 100644
--- a/src/frontends/controllers/ControlGraphics.C
+++ b/src/frontends/controllers/ControlGraphics.C
@@ -17,6 +17,8 @@
 #pragma implementation
 #endif 
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlGraphics.h"
 #include "buffer.h"
 #include "Dialogs.h"
@@ -24,6 +26,7 @@
 #include "gettext.h"
 
 #include "insets/insetgraphics.h"
+#include "insets/insetgraphicsParams.h" // need operator!=()
 
 #include "support/FileInfo.h"  // for FileInfo
 #include "helper_funcs.h"      // for browseFile
diff --git a/src/frontends/controllers/ControlGraphics.h b/src/frontends/controllers/ControlGraphics.h
index 1be2845c33..a81aeedfbf 100644
--- a/src/frontends/controllers/ControlGraphics.h
+++ b/src/frontends/controllers/ControlGraphics.h
@@ -19,9 +19,9 @@
 #endif 
 
 #include "ControlInset.h"
-#include "insets/insetgraphicsParams.h" // need operator!=()
 
 class InsetGraphics;
+class InsetGraphicsParams;
 class LyXView;
 
 /** A controller for Graphics dialogs.
diff --git a/src/frontends/controllers/ControlInclude.C b/src/frontends/controllers/ControlInclude.C
index eef0c3d23a..dd3beaadbf 100644
--- a/src/frontends/controllers/ControlInclude.C
+++ b/src/frontends/controllers/ControlInclude.C
@@ -15,6 +15,8 @@
 #pragma implementation
 #endif
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlInclude.h"
 #include "buffer.h"
 #include "Dialogs.h"
diff --git a/src/frontends/controllers/ControlIndex.C b/src/frontends/controllers/ControlIndex.C
index 176d0ca328..36c96bd379 100644
--- a/src/frontends/controllers/ControlIndex.C
+++ b/src/frontends/controllers/ControlIndex.C
@@ -17,6 +17,8 @@
 #pragma implementation
 #endif
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlIndex.h"
 #include "buffer.h"
 #include "Dialogs.h"
diff --git a/src/frontends/controllers/ControlInset.h b/src/frontends/controllers/ControlInset.h
index 9dfa3c8c36..6bc95147af 100644
--- a/src/frontends/controllers/ControlInset.h
+++ b/src/frontends/controllers/ControlInset.h
@@ -18,9 +18,6 @@
 #ifndef CONTROLINSET_H
 #define CONTROLINSET_H
 
-#include "LyXView.h"
-#include "support/LAssert.h"
-
 #include "ControlConnections.h"
 
 class Inset;
diff --git a/src/frontends/controllers/ControlLog.C b/src/frontends/controllers/ControlLog.C
index 40fee20f9b..c85f91bcbe 100644
--- a/src/frontends/controllers/ControlLog.C
+++ b/src/frontends/controllers/ControlLog.C
@@ -12,11 +12,14 @@
  * \author Angus Leeming <a.leeming@ic.ac.uk>
  */
 
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <config.h>
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlLog.h"
 #include "LyXView.h"
 #include "Dialogs.h"
diff --git a/src/frontends/controllers/ControlMinipage.C b/src/frontends/controllers/ControlMinipage.C
index 54802e7420..dab432c839 100644
--- a/src/frontends/controllers/ControlMinipage.C
+++ b/src/frontends/controllers/ControlMinipage.C
@@ -17,6 +17,8 @@
 #pragma implementation
 #endif
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlMinipage.h"
 #include "Dialogs.h"
 #include "LyXView.h"
diff --git a/src/frontends/controllers/ControlPreamble.C b/src/frontends/controllers/ControlPreamble.C
index c9720377ff..526244f6b7 100644
--- a/src/frontends/controllers/ControlPreamble.C
+++ b/src/frontends/controllers/ControlPreamble.C
@@ -12,6 +12,8 @@
 #pragma implementation
 #endif
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlPreamble.h"
 #include "LyXView.h"
 #include "Dialogs.h"
diff --git a/src/frontends/controllers/ControlPrint.C b/src/frontends/controllers/ControlPrint.C
index 65c3c5af0a..e5d631901e 100644
--- a/src/frontends/controllers/ControlPrint.C
+++ b/src/frontends/controllers/ControlPrint.C
@@ -18,6 +18,8 @@
 #pragma implementation
 #endif
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlPrint.h"
 #include "buffer.h"
 #include "Dialogs.h"
diff --git a/src/frontends/controllers/ControlRef.C b/src/frontends/controllers/ControlRef.C
index 6b8b854596..b909d5bb88 100644
--- a/src/frontends/controllers/ControlRef.C
+++ b/src/frontends/controllers/ControlRef.C
@@ -17,7 +17,8 @@
 #pragma implementation
 #endif
 
-#include "Dialogs.h"
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlRef.h"
 #include "Dialogs.h"
 #include "LyXView.h"
diff --git a/src/frontends/controllers/ControlSearch.C b/src/frontends/controllers/ControlSearch.C
index f7cfdb27a5..2928857c85 100644
--- a/src/frontends/controllers/ControlSearch.C
+++ b/src/frontends/controllers/ControlSearch.C
@@ -17,6 +17,8 @@
 #pragma implementation
 #endif
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlSearch.h"
 #include "Dialogs.h"
 #include "Liason.h"
diff --git a/src/frontends/controllers/ControlTabularCreate.C b/src/frontends/controllers/ControlTabularCreate.C
index 445bb9b401..cad18eccde 100644
--- a/src/frontends/controllers/ControlTabularCreate.C
+++ b/src/frontends/controllers/ControlTabularCreate.C
@@ -16,6 +16,8 @@
 #pragma implementation
 #endif
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlTabularCreate.h"
 #include "BufferView.h"
 #include "Dialogs.h"
diff --git a/src/frontends/controllers/ControlTabularCreate.h b/src/frontends/controllers/ControlTabularCreate.h
index 7f9ee592de..90a63eda46 100644
--- a/src/frontends/controllers/ControlTabularCreate.h
+++ b/src/frontends/controllers/ControlTabularCreate.h
@@ -13,12 +13,12 @@
 #ifndef CONTROLTABULARCREATE_H
 #define CONTROLTABULARCREATE_H
 
+#include <utility>
+ 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
-#include <utility>
- 
 #include "ControlDialogs.h"
 
 /** A controller for the TabularCreate Dialog.
diff --git a/src/frontends/controllers/ControlToc.C b/src/frontends/controllers/ControlToc.C
index c5b86cacd4..03351a1888 100644
--- a/src/frontends/controllers/ControlToc.C
+++ b/src/frontends/controllers/ControlToc.C
@@ -17,6 +17,8 @@
 #pragma implementation
 #endif
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlToc.h"
 #include "buffer.h"
 #include "Dialogs.h"
diff --git a/src/frontends/controllers/ControlUrl.C b/src/frontends/controllers/ControlUrl.C
index 59101761ae..b8896bfa25 100644
--- a/src/frontends/controllers/ControlUrl.C
+++ b/src/frontends/controllers/ControlUrl.C
@@ -17,6 +17,8 @@
 #pragma implementation
 #endif
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlUrl.h"
 #include "Dialogs.h"
 #include "LyXView.h"
diff --git a/src/frontends/controllers/ControlVCLog.C b/src/frontends/controllers/ControlVCLog.C
index e22cb5e520..087cd5fa77 100644
--- a/src/frontends/controllers/ControlVCLog.C
+++ b/src/frontends/controllers/ControlVCLog.C
@@ -12,14 +12,16 @@
  * \author Angus Leeming <a.leeming@ic.ac.uk>
  */
 
+#include <config.h>
 #include <fstream>
+#include "Lsstream.h"
 
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <config.h>
-#include "Lsstream.h"
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlVCLog.h"
 #include "buffer.h"
 #include "LyXView.h"
-- 
2.39.2