move the inclusion of tmpl files from .C files to headers. This fixes part of the linking problems seen on non-GNU toolchains with gcc

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@5390 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/controllers/ButtonController.h

@@ -81,4 +81,7 @@ protected:
 };
 
 
+
+#include "ButtonController.tmpl"
+
 #endif // BUTTONCONTROLLER_H

src/frontends/controllers/ChangeLog

@@ -1,3 +1,8 @@
+2002-10-14  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* several files: move the inclusion of .tmpl files from .C files
+	to .h files
+
 2002-07-26  Juergen Vigna  <jug@sad.it>
 
 	* ControlThesaurus.C (replace): ditto.

src/frontends/controllers/ControlCitation.C

@@ -25,13 +25,6 @@
 #include "Dialogs.h"
 #include "LyXView.h"
 
-// need to #include this in _one_ of the ControlCommand-derived classses in
-// order to instantiate
-// ControlInset<InsetCommand, InsetCommandParams>::showInset
-// ControlInset<InsetCommand, InsetCommandParams>::createInset
-#include "ControlInset.tmpl"
-
-
 using std::pair;
 using std::vector;
 using SigC::slot;

src/frontends/controllers/ControlCommand.C

@@ -20,7 +20,6 @@
 #include "ViewBase.h"
 #include "ButtonControllerBase.h"
 #include "ControlCommand.h"
-#include "ControlInset.tmpl"
 #include "buffer.h"
 #include "Dialogs.h"
 #include "LyXView.h"

src/frontends/controllers/ControlDialog.h

@@ -47,4 +47,7 @@ private:
 	bool dialog_built_;
 };
 
+
+#include "ControlDialog.tmpl"
+
 #endif // CONTROLDIALOG_H

src/frontends/controllers/ControlDialog_impl.C

@@ -9,7 +9,6 @@
 #include <config.h>
 
 #include "ControlDialog_impl.h"
-#include "ControlDialog.tmpl"
 
 ControlDialogBD::ControlDialogBD(LyXView & lv, Dialogs & d)
 	: ControlDialog<ControlConnectBD>(lv, d)

src/frontends/controllers/ControlERT.C

@@ -20,7 +20,6 @@
 #include "ViewBase.h"
 #include "ButtonControllerBase.h"
 #include "ControlERT.h"
-#include "ControlInset.tmpl"
 #include "Dialogs.h"
 #include "LyXView.h"
 #include "buffer.h"

src/frontends/controllers/ControlError.C

@@ -20,7 +20,6 @@
 #include "ViewBase.h"
 #include "ButtonControllerBase.h"
 #include "ControlError.h"
-#include "ControlInset.tmpl"
 #include "Dialogs.h"
 #include "LyXView.h"
 #include "buffer.h"

src/frontends/controllers/ControlExternal.C

@@ -25,7 +25,6 @@
 #include "BufferView.h"
 #include "ButtonControllerBase.h"
 #include "ControlExternal.h"
-#include "ControlInset.tmpl"
 #include "Dialogs.h"
 #include "Liason.h"
 #include "LyXView.h"

src/frontends/controllers/ControlFloat.C

@@ -18,7 +18,6 @@
 #include "ViewBase.h"
 #include "ButtonControllerBase.h"
 #include "ControlFloat.h"
-#include "ControlInset.tmpl"
 #include "Dialogs.h"
 #include "LyXView.h"
 #include "buffer.h"

src/frontends/controllers/ControlGraphics.C

@@ -22,7 +22,6 @@
 #include "ViewBase.h"
 #include "ButtonControllerBase.h"
 #include "ControlGraphics.h"
-#include "ControlInset.tmpl"
 
 #include "helper_funcs.h"
 

src/frontends/controllers/ControlInclude.C

@@ -18,7 +18,6 @@
 #include "ViewBase.h"
 #include "ButtonControllerBase.h"
 #include "ControlInclude.h"
-#include "ControlInset.tmpl"
 #include "buffer.h"
 #include "Alert.h"
 #include "BufferView.h"

src/frontends/controllers/ControlInset.h

@@ -106,4 +106,7 @@ private:
 };
 
 
+
+#include "ControlInset.tmpl"
+
 #endif // CONTROLINSET_H

src/frontends/controllers/ControlMinipage.C

@@ -20,7 +20,6 @@
 #include "ViewBase.h"
 #include "ButtonControllerBase.h"
 #include "ControlMinipage.h"
-#include "ControlInset.tmpl"
 #include "Dialogs.h"
 #include "LyXView.h"
 #include "buffer.h"

src/frontends/controllers/GUI.h

@@ -11,7 +11,6 @@
 #define GUI_H
 
 #include "ButtonController.h"
-#include "ButtonController.tmpl"
 #include "ButtonPolicies.h"
 #include "ControlAboutlyx.h"
 #include "ControlBibitem.h"

src/frontends/gnome/gnomeBC.C

@@ -5,7 +5,6 @@
 #endif
 
 #include "gnomeBC.h"
-#include "ButtonController.tmpl"
 #include "gtk--/widget.h"
 #include "gtk--/button.h"
 

src/frontends/qt2/Qt2BC.C

@@ -14,7 +14,6 @@
 #endif
 
 #include "Qt2BC.h"
-#include "ButtonController.tmpl"
 #include "debug.h"
 
 #include <qbutton.h>

src/frontends/xforms/ChangeLog

@@ -1,3 +1,7 @@
+2002-10-14  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* several files: do not include .tmpl files in .C files.
+
 2002-10-09  Dekel Tsur  <dekelts@tau.ac.il>
 
 	* FormRef.C (update): Always list the labels of the current buffer.

src/frontends/xforms/FormMathsPanel.C

@@ -36,7 +36,6 @@
 #include "FormMathsSpace.h"
 #include "FormMathsStyle.h"
 
-#include "ButtonController.tmpl"
 
 #include "deco.xpm"
 #include "delim.xpm"

src/frontends/xforms/FormPreferences.C

@@ -14,7 +14,6 @@
 
 #include "FormPreferences.h"
 #include "form_preferences.h"
-#include "ButtonController.tmpl"
 #include "Dialogs.h"
 
 #include "buffer.h"

src/frontends/xforms/xformsBC.C

@@ -15,7 +15,6 @@
 #endif
 
 #include "xformsBC.h"
-#include "ButtonController.tmpl"
 #include "xforms_helpers.h"
 
 xformsBC::xformsBC(string const & cancel, string const & close)