diff --git a/src/frontends/controllers/ButtonController.h b/src/frontends/controllers/ButtonController.h index f1f50ef57b..2d554617d2 100644 --- a/src/frontends/controllers/ButtonController.h +++ b/src/frontends/controllers/ButtonController.h @@ -81,4 +81,7 @@ protected: }; + +#include "ButtonController.tmpl" + #endif // BUTTONCONTROLLER_H diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 8565ace316..cd82ffde2c 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,8 @@ +2002-10-14 Jean-Marc Lasgouttes + + * several files: move the inclusion of .tmpl files from .C files + to .h files + 2002-07-26 Juergen Vigna * ControlThesaurus.C (replace): ditto. diff --git a/src/frontends/controllers/ControlCitation.C b/src/frontends/controllers/ControlCitation.C index d7852e334d..e4a82862b7 100644 --- a/src/frontends/controllers/ControlCitation.C +++ b/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::showInset -// ControlInset::createInset -#include "ControlInset.tmpl" - - using std::pair; using std::vector; using SigC::slot; diff --git a/src/frontends/controllers/ControlCommand.C b/src/frontends/controllers/ControlCommand.C index 35226c7c53..1fd3af7c85 100644 --- a/src/frontends/controllers/ControlCommand.C +++ b/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" diff --git a/src/frontends/controllers/ControlDialog.h b/src/frontends/controllers/ControlDialog.h index a2cbfd0fbd..ea75ed8472 100644 --- a/src/frontends/controllers/ControlDialog.h +++ b/src/frontends/controllers/ControlDialog.h @@ -47,4 +47,7 @@ private: bool dialog_built_; }; + +#include "ControlDialog.tmpl" + #endif // CONTROLDIALOG_H diff --git a/src/frontends/controllers/ControlDialog_impl.C b/src/frontends/controllers/ControlDialog_impl.C index eae9ef766c..2a9f50c6d7 100644 --- a/src/frontends/controllers/ControlDialog_impl.C +++ b/src/frontends/controllers/ControlDialog_impl.C @@ -9,7 +9,6 @@ #include #include "ControlDialog_impl.h" -#include "ControlDialog.tmpl" ControlDialogBD::ControlDialogBD(LyXView & lv, Dialogs & d) : ControlDialog(lv, d) diff --git a/src/frontends/controllers/ControlERT.C b/src/frontends/controllers/ControlERT.C index 6115604b9a..0d7b15a7c0 100644 --- a/src/frontends/controllers/ControlERT.C +++ b/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" diff --git a/src/frontends/controllers/ControlError.C b/src/frontends/controllers/ControlError.C index d6c94ea769..bdb7e700f4 100644 --- a/src/frontends/controllers/ControlError.C +++ b/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" diff --git a/src/frontends/controllers/ControlExternal.C b/src/frontends/controllers/ControlExternal.C index e55f1b8a22..61ec6a137e 100644 --- a/src/frontends/controllers/ControlExternal.C +++ b/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" diff --git a/src/frontends/controllers/ControlFloat.C b/src/frontends/controllers/ControlFloat.C index 64f22fde39..e7ce337d43 100644 --- a/src/frontends/controllers/ControlFloat.C +++ b/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" diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C index 38c6c3c594..6aceb91bc7 100644 --- a/src/frontends/controllers/ControlGraphics.C +++ b/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" diff --git a/src/frontends/controllers/ControlInclude.C b/src/frontends/controllers/ControlInclude.C index f918d3ac09..21882f27e0 100644 --- a/src/frontends/controllers/ControlInclude.C +++ b/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" diff --git a/src/frontends/controllers/ControlInset.h b/src/frontends/controllers/ControlInset.h index 34353d8d49..5d6579ccc4 100644 --- a/src/frontends/controllers/ControlInset.h +++ b/src/frontends/controllers/ControlInset.h @@ -106,4 +106,7 @@ private: }; + +#include "ControlInset.tmpl" + #endif // CONTROLINSET_H diff --git a/src/frontends/controllers/ControlMinipage.C b/src/frontends/controllers/ControlMinipage.C index f8fe7fe521..112293ad0c 100644 --- a/src/frontends/controllers/ControlMinipage.C +++ b/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" diff --git a/src/frontends/controllers/GUI.h b/src/frontends/controllers/GUI.h index adab6c4252..1ff6d56b0a 100644 --- a/src/frontends/controllers/GUI.h +++ b/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" diff --git a/src/frontends/gnome/gnomeBC.C b/src/frontends/gnome/gnomeBC.C index e79bb70931..2e65d97f34 100644 --- a/src/frontends/gnome/gnomeBC.C +++ b/src/frontends/gnome/gnomeBC.C @@ -5,7 +5,6 @@ #endif #include "gnomeBC.h" -#include "ButtonController.tmpl" #include "gtk--/widget.h" #include "gtk--/button.h" diff --git a/src/frontends/qt2/Qt2BC.C b/src/frontends/qt2/Qt2BC.C index 0c364b38bd..4ef0bc8153 100644 --- a/src/frontends/qt2/Qt2BC.C +++ b/src/frontends/qt2/Qt2BC.C @@ -14,7 +14,6 @@ #endif #include "Qt2BC.h" -#include "ButtonController.tmpl" #include "debug.h" #include diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 3e3666b1f6..0b6b61fa7c 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2002-10-14 Jean-Marc Lasgouttes + + * several files: do not include .tmpl files in .C files. + 2002-10-09 Dekel Tsur * FormRef.C (update): Always list the labels of the current buffer. diff --git a/src/frontends/xforms/FormMathsPanel.C b/src/frontends/xforms/FormMathsPanel.C index 00ccc44891..29db900a2b 100644 --- a/src/frontends/xforms/FormMathsPanel.C +++ b/src/frontends/xforms/FormMathsPanel.C @@ -36,7 +36,6 @@ #include "FormMathsSpace.h" #include "FormMathsStyle.h" -#include "ButtonController.tmpl" #include "deco.xpm" #include "delim.xpm" diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C index 34dee4f661..75e46bf13e 100644 --- a/src/frontends/xforms/FormPreferences.C +++ b/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" diff --git a/src/frontends/xforms/xformsBC.C b/src/frontends/xforms/xformsBC.C index 6bd90c56c4..1ee22e8cb2 100644 --- a/src/frontends/xforms/xformsBC.C +++ b/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)