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 f1f50ef57b9179a1c2ed9eed41023821876164d6..48dd40d2c750c7430b83b01b68d0c91addf07af3 100644 (file)
--- 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 2f549876051ea258a6ee2deb77f378ac49d65d99..5f2d994546c4c067065c4196aeb1809c87332e2f 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,5 +1,19 @@
 2002-06-10  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
+       * 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  <leeming@lyx.org>

diff --git a/src/frontends/controllers/ControlCitation.C b/src/frontends/controllers/ControlCitation.C
index 8909356917843d88ac4e7609a1e4a8c481028799..5af344ed4a23fcdfcd745832fee7646249e861a5 100644 (file)
--- a/src/frontends/controllers/ControlCitation.C
+++ b/src/frontends/controllers/ControlCitation.C
@@ -29,13 +29,6 @@
 
 #include <algorithm>
 
-// 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;
 

diff --git a/src/frontends/controllers/ControlCommand.C b/src/frontends/controllers/ControlCommand.C
index 1239ffc26fa75b555692b44ec6675c8097318825..511e30823fafdced8b61c7a7d31c0d39eb5e04f8 100644 (file)
--- 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 280b80dded1a75e2b7e0442d55ae949b992ad9ab..55a4ac22206899c4274c4f4e4277540eb8507461 100644 (file)
--- 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 4791fb712eef979f12adc9ef5eaca0d95d3488f6..412c6e66919c658ff02403a2fc6d7a045fcdd0de 100644 (file)
--- 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 8330de76e90ccd6c44642e24ef9283ba54ab372b..8436ef787e234ad5a52049721438e80f2794b5eb 100644 (file)
--- 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 1a594d63eae617f726ac084bdc5463053349d61c..2e8891a3c9adc74f7c4d47c9b703d2d4d0f88ad9 100644 (file)
--- 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 <boost/bind.hpp>
 
 using std::vector;

diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C
index b4290964fc76006419e0f27b98fe17152efa3959..c43807c0cdeb452e18944085ad044e3f0fc42186 100644 (file)
--- 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 d34aac5653c8e3aaca429ad38affd8e64d454a03..5c01ad3839c96d8bcf702e0baa27368bcb7f2464 100644 (file)
--- a/src/frontends/controllers/ControlInclude.C
+++ b/src/frontends/controllers/ControlInclude.C
@@ -31,8 +31,6 @@
 
 #include "frontends/LyXView.h"
 
-#include "ControlInset.tmpl"
-
 #include <boost/bind.hpp>
 
 using std::pair;

diff --git a/src/frontends/controllers/ControlInset.h b/src/frontends/controllers/ControlInset.h
index 5ba77c005b26be20f153b6086c1d610282e8982d..89ae4b5d5ed8ba8209adff257a156ff0e7e5c32e 100644 (file)
--- 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 3bbdd44f4853d93219d6ec66f1d474088d0f76df..017abd6e4dfe482dcf160e89301b8212e0330daa 100644 (file)
--- 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 b92d1e2cf2a35d6d375f1e5c160b026065f195c7..2a6d87eec0fb88705bb51aa37e7553926ed4bfc7 100644 (file)
--- 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 00074b8351ce9078cc1fc252085fe13bc7b093d5..d13dfdaf210778b01c7488f04e74c05cae09ec17 100644 (file)
--- a/src/frontends/gnome/ChangeLog
+++ b/src/frontends/gnome/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-10  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * gnomeBC.C: do not include ButtonController.tmpl
+
 2002-06-03  Michael A. Koziarski  <michael@koziarski.com>
 
        * dialogs/GLog.C

diff --git a/src/frontends/gnome/gnomeBC.C b/src/frontends/gnome/gnomeBC.C
index 5fe5cc62b5e11cb746467a0c3bcd3f3eab01733e..7812692ce0c9314301e0645da5120d59f0122f4e 100644 (file)
--- a/src/frontends/gnome/gnomeBC.C
+++ b/src/frontends/gnome/gnomeBC.C
@@ -5,7 +5,6 @@
 #endif
 
 #include "gnomeBC.h"
-#include "ButtonController.tmpl"
 
 #include <gtkmm/widget.h>
 #include <gtkmm/button.h>

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index f753743bce0d20334760c240d1b672df2198b2c0..bafbddb847fe782e3f83398a134de83289fa575a 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-10  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * Qt2BC.C: do not include ButtonController.tmpl
+
 2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
 
        * QtLyXView.h: moved into frontends/

diff --git a/src/frontends/qt2/Qt2BC.C b/src/frontends/qt2/Qt2BC.C
index 0c364b38bdbc07305b43bdcbae569383587ebc59..4ef0bc8153ad5aab4009852c9e6448b2be9d09de 100644 (file)
--- 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 <qbutton.h>

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 5c06504ed1217b8a2f3f708c492f5f443dd62a5c..a8781ca703ff6c966af8ec7dd397c3e8419f3830 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,5 +1,9 @@
 2002-06-10  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
+       * FormMathsPanel.C: do not include ButtonController.tmpl
+       * FormPreferences.C: ditto
+       * xformsBC.C: ditto
+
        * FormBase.h (controller): remove ViewBase:: prefix
 
 2002-06-07  Angus Leeming  <leeming@lyx.org>

diff --git a/src/frontends/xforms/FormMathsPanel.C b/src/frontends/xforms/FormMathsPanel.C
index 8e4546b306ad511164a3b42c5ffffc8ea0586943..520a87740073dfc3bf2a96308329c9c03e470708 100644 (file)
--- 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 769c0c17ab6ebc615125829c7224ded6638ef0a7..513a3a54f90bff7eeeabf051826aab40687957c3 100644 (file)
--- 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 6bd90c56c4df09362eba332c738db7af94c656b8..bbb704afc46289f1cdfa94d6cf2cb2a3416b431c 100644 (file)
--- 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<FL_OBJECT, FL_OBJECT>(cancel, close)
 {}