From: Lars Gullik Bjønnes Date: Mon, 10 Jun 2002 17:33:05 +0000 (+0000) Subject: handle some tmpl files in a more sane way X-Git-Tag: 1.6.10~19119 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3005c47180e97adec4200b5dd13e61a67f085dcc;p=features.git handle some tmpl files in a more sane way git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4355 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/frontends/controllers/ButtonController.h b/src/frontends/controllers/ButtonController.h index f1f50ef57b..48dd40d2c7 100644 --- a/src/frontends/controllers/ButtonController.h +++ b/src/frontends/controllers/ButtonController.h @@ -81,4 +81,6 @@ protected: }; +#include "ButtonController.tmpl" + #endif // BUTTONCONTROLLER_H diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 2f54987605..5f2d994546 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,5 +1,19 @@ 2002-06-10 Lars Gullik Bjønnes + * GUI.h: do not include ButtonController.tmpl + + * ControlInset.h: include ControlInset.tmpl + + * ControlCitation.C: do not include ControlInset.tmpl + * ControlCommand.C: ditto + * ControlERT.C: ditto + * ControlError.C: ditto + * ControlExternal.C: ditto + * ControlFloat.C: ditto + * ControlGraphics.C: ditto + * ControlInclude.C: ditto + * ControlMinipage.C: ditto + * ControlDialog.tmpl: remove the Base:: prefix 2002-06-07 Angus Leeming diff --git a/src/frontends/controllers/ControlCitation.C b/src/frontends/controllers/ControlCitation.C index 8909356917..5af344ed4a 100644 --- a/src/frontends/controllers/ControlCitation.C +++ b/src/frontends/controllers/ControlCitation.C @@ -29,13 +29,6 @@ #include -// 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; diff --git a/src/frontends/controllers/ControlCommand.C b/src/frontends/controllers/ControlCommand.C index 1239ffc26f..511e30823f 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 "frontends/LyXView.h" diff --git a/src/frontends/controllers/ControlERT.C b/src/frontends/controllers/ControlERT.C index 280b80dded..55a4ac2220 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 "frontends/LyXView.h" #include "buffer.h" diff --git a/src/frontends/controllers/ControlError.C b/src/frontends/controllers/ControlError.C index 4791fb712e..412c6e6691 100644 --- a/src/frontends/controllers/ControlError.C +++ b/src/frontends/controllers/ControlError.C @@ -20,7 +20,6 @@ #include "ControlError.h" #include "ViewBase.h" #include "ButtonControllerBase.h" -#include "ControlInset.tmpl" #include "Dialogs.h" #include "buffer.h" #include "insets/inseterror.h" diff --git a/src/frontends/controllers/ControlExternal.C b/src/frontends/controllers/ControlExternal.C index 8330de76e9..8436ef787e 100644 --- a/src/frontends/controllers/ControlExternal.C +++ b/src/frontends/controllers/ControlExternal.C @@ -22,7 +22,6 @@ #include "BufferView.h" #include "ButtonControllerBase.h" #include "ControlExternal.h" -#include "ControlInset.tmpl" #include "Dialogs.h" #include "Liason.h" #include "frontends/LyXView.h" diff --git a/src/frontends/controllers/ControlFloat.C b/src/frontends/controllers/ControlFloat.C index 1a594d63ea..2e8891a3c9 100644 --- a/src/frontends/controllers/ControlFloat.C +++ b/src/frontends/controllers/ControlFloat.C @@ -25,8 +25,6 @@ #include "insets/insetfloat.h" #include "frontends/LyXView.h" -#include "ControlInset.tmpl" - #include using std::vector; diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C index b4290964fc..c43807c0cd 100644 --- a/src/frontends/controllers/ControlGraphics.C +++ b/src/frontends/controllers/ControlGraphics.C @@ -21,7 +21,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 d34aac5653..5c01ad3839 100644 --- a/src/frontends/controllers/ControlInclude.C +++ b/src/frontends/controllers/ControlInclude.C @@ -31,8 +31,6 @@ #include "frontends/LyXView.h" -#include "ControlInset.tmpl" - #include using std::pair; diff --git a/src/frontends/controllers/ControlInset.h b/src/frontends/controllers/ControlInset.h index 5ba77c005b..89ae4b5d5e 100644 --- a/src/frontends/controllers/ControlInset.h +++ b/src/frontends/controllers/ControlInset.h @@ -107,5 +107,7 @@ private: }; +#include "ControlInset.tmpl" #endif // CONTROLINSET_H + diff --git a/src/frontends/controllers/ControlMinipage.C b/src/frontends/controllers/ControlMinipage.C index 3bbdd44f48..017abd6e4d 100644 --- a/src/frontends/controllers/ControlMinipage.C +++ b/src/frontends/controllers/ControlMinipage.C @@ -20,7 +20,6 @@ #include "ControlMinipage.h" #include "ViewBase.h" #include "ButtonControllerBase.h" -#include "ControlInset.tmpl" #include "Dialogs.h" #include "frontends/LyXView.h" #include "buffer.h" diff --git a/src/frontends/controllers/GUI.h b/src/frontends/controllers/GUI.h index b92d1e2cf2..2a6d87eec0 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/ChangeLog b/src/frontends/gnome/ChangeLog index 00074b8351..d13dfdaf21 100644 --- a/src/frontends/gnome/ChangeLog +++ b/src/frontends/gnome/ChangeLog @@ -1,3 +1,7 @@ +2002-06-10 Lars Gullik Bjønnes + + * gnomeBC.C: do not include ButtonController.tmpl + 2002-06-03 Michael A. Koziarski * dialogs/GLog.C diff --git a/src/frontends/gnome/gnomeBC.C b/src/frontends/gnome/gnomeBC.C index 5fe5cc62b5..7812692ce0 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 #include diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index f753743bce..bafbddb847 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2002-06-10 Lars Gullik Bjønnes + + * Qt2BC.C: do not include ButtonController.tmpl + 2002-05-23 John Levon * QtLyXView.h: moved into frontends/ 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 5c06504ed1..a8781ca703 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,5 +1,9 @@ 2002-06-10 Lars Gullik Bjønnes + * FormMathsPanel.C: do not include ButtonController.tmpl + * FormPreferences.C: ditto + * xformsBC.C: ditto + * FormBase.h (controller): remove ViewBase:: prefix 2002-06-07 Angus Leeming diff --git a/src/frontends/xforms/FormMathsPanel.C b/src/frontends/xforms/FormMathsPanel.C index 8e4546b306..520a877400 100644 --- a/src/frontends/xforms/FormMathsPanel.C +++ b/src/frontends/xforms/FormMathsPanel.C @@ -36,8 +36,6 @@ #include "FormMathsSpace.h" #include "FormMathsStyle.h" -#include "ButtonController.tmpl" - #include "deco.xpm" #include "delim.xpm" #include "equation.xpm" diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C index 769c0c17ab..513a3a54f9 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..bbb704afc4 100644 --- a/src/frontends/xforms/xformsBC.C +++ b/src/frontends/xforms/xformsBC.C @@ -15,9 +15,9 @@ #endif #include "xformsBC.h" -#include "ButtonController.tmpl" #include "xforms_helpers.h" + xformsBC::xformsBC(string const & cancel, string const & close) : GuiBC(cancel, close) {}