do not include language.h and gettext.h in lyxfont.h and lyxparagraph.h

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1899 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/po/POTFILES.in b/po/POTFILES.in
index c9074e1990e68da3597a8f994205a9fe3d60904c..d231458f187fa837b04c40827ee6da3174aefe4c 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,8 +10,8 @@ src/CutAndPaste.C
 src/debug.C
 src/exporter.C
 src/ext_l10n.h
-src/figure_form.C
 src/figureForm.C
+src/figure_form.C
 src/FontLoader.C
 src/frontends/controllers/ButtonController.h
 src/frontends/controllers/character.C
@@ -89,67 +89,67 @@ src/frontends/qt2/paragraphdlgimpl.C
 src/frontends/qt2/tabularcreatedlgimpl.C
 src/frontends/xforms/combox.C
 src/frontends/xforms/FileDialog.C
-src/frontends/xforms/form_bibitem.C
 src/frontends/xforms/FormBibitem.C
-src/frontends/xforms/form_bibtex.C
+src/frontends/xforms/form_bibitem.C
 src/frontends/xforms/FormBibtex.C
+src/frontends/xforms/form_bibtex.C
 src/frontends/xforms/form_browser.C
-src/frontends/xforms/form_character.C
 src/frontends/xforms/FormCharacter.C
-src/frontends/xforms/form_citation.C
+src/frontends/xforms/form_character.C
 src/frontends/xforms/FormCitation.C
-src/frontends/xforms/form_copyright.C
+src/frontends/xforms/form_citation.C
 src/frontends/xforms/FormCopyright.C
-src/frontends/xforms/form_credits.C
+src/frontends/xforms/form_copyright.C
 src/frontends/xforms/FormCredits.C
-src/frontends/xforms/form_document.C
+src/frontends/xforms/form_credits.C
 src/frontends/xforms/FormDocument.C
-src/frontends/xforms/form_error.C
+src/frontends/xforms/form_document.C
 src/frontends/xforms/FormError.C
-src/frontends/xforms/form_external.C
+src/frontends/xforms/form_error.C
 src/frontends/xforms/FormExternal.C
-src/frontends/xforms/form_filedialog.C
+src/frontends/xforms/form_external.C
 src/frontends/xforms/FormFiledialog.C
-src/frontends/xforms/form_graphics.C
+src/frontends/xforms/form_filedialog.C
 src/frontends/xforms/FormGraphics.C
-src/frontends/xforms/form_include.C
+src/frontends/xforms/form_graphics.C
 src/frontends/xforms/FormInclude.C
-src/frontends/xforms/form_index.C
+src/frontends/xforms/form_include.C
 src/frontends/xforms/FormIndex.C
+src/frontends/xforms/form_index.C
 src/frontends/xforms/FormLog.C
 src/frontends/xforms/FormMathsBitmap.C
-src/frontends/xforms/form_maths_deco.C
 src/frontends/xforms/FormMathsDeco.C
-src/frontends/xforms/form_maths_delim.C
+src/frontends/xforms/form_maths_deco.C
 src/frontends/xforms/FormMathsDelim.C
-src/frontends/xforms/form_maths_matrix.C
+src/frontends/xforms/form_maths_delim.C
 src/frontends/xforms/FormMathsMatrix.C
-src/frontends/xforms/form_maths_panel.C
+src/frontends/xforms/form_maths_matrix.C
 src/frontends/xforms/FormMathsPanel.C
-src/frontends/xforms/form_maths_space.C
+src/frontends/xforms/form_maths_panel.C
 src/frontends/xforms/FormMathsSpace.C
-src/frontends/xforms/form_minipage.C
+src/frontends/xforms/form_maths_space.C
 src/frontends/xforms/FormMinipage.C
-src/frontends/xforms/form_paragraph.C
+src/frontends/xforms/form_minipage.C
 src/frontends/xforms/FormParagraph.C
-src/frontends/xforms/form_preamble.C
+src/frontends/xforms/form_paragraph.C
 src/frontends/xforms/FormPreamble.C
-src/frontends/xforms/form_preferences.C
+src/frontends/xforms/form_preamble.C
 src/frontends/xforms/FormPreferences.C
-src/frontends/xforms/form_print.C
+src/frontends/xforms/form_preferences.C
 src/frontends/xforms/FormPrint.C
-src/frontends/xforms/form_ref.C
+src/frontends/xforms/form_print.C
 src/frontends/xforms/FormRef.C
-src/frontends/xforms/form_search.C
+src/frontends/xforms/form_ref.C
 src/frontends/xforms/FormSearch.C
-src/frontends/xforms/form_tabular.C
+src/frontends/xforms/form_search.C
 src/frontends/xforms/FormTabular.C
-src/frontends/xforms/form_tabular_create.C
+src/frontends/xforms/form_tabular.C
 src/frontends/xforms/FormTabularCreate.C
-src/frontends/xforms/form_toc.C
+src/frontends/xforms/form_tabular_create.C
 src/frontends/xforms/FormToc.C
-src/frontends/xforms/form_url.C
+src/frontends/xforms/form_toc.C
 src/frontends/xforms/FormUrl.C
+src/frontends/xforms/form_url.C
 src/frontends/xforms/FormVCLog.C
 src/frontends/xforms/input_validators.C
 src/frontends/xforms/Menubar_pimpl.C

diff --git a/src/BufferView2.C b/src/BufferView2.C
index 745cc2b88a4b5935c5ece6d761d6f4c962edcb8f..eb766c0bcdfffd28f0fc4f127dd2619852e4b488 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -32,6 +32,7 @@
 #include "BufferView_pimpl.h"
 #include "insets/insetcommand.h" //ChangeRefs
 #include "support/lyxfunctional.h" //equal_1st_in_pair
+#include "language.h"
 
 extern BufferList bufferlist;
 

diff --git a/src/ChangeLog b/src/ChangeLog
index a6de52b947dbf6a3b2e88b120638af684a4b639b..e773da23672e0b5ea2842e97e87cbb6f2d4b6825 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+2001-04-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * exporter.C: 
+       * paragraph.C: 
+       * screen.C: 
+       * tabular.C: 
+       * CutAndPaste.C: include gettext.h
+
+       * lyxfont.h: remove old hack with ON and OFF.
+
+       * lyxparagraph.h: 
+       * lyxfont.h: do not include language.h...
+
+       * BufferView2.C: 
+       * LaTeXFeatures.C: 
+       * Painter.C: 
+       * bufferview_funcs.C: 
+       * font.C: 
+       * lyxfont.C: 
+       * text.C: 
+       * text2.C: 
+       * trans_mgr.C: 
+       * paragraph.C: ... but do it here instead
+
 2001-04-04  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * text2.C (SetLayout): split in NEW_INSETS and non NEW_INSETS version
@@ -5,7 +29,7 @@
        * tabular.C: small reformat
 
        * paragraph.C (GetFontSettings): split in NEW_INSETS and non
-       NEW_INSETS verison
+       NEW_INSETS version
        (GetChar): ditto
        (BreakParagraph): ditto
        (SetOnlyLayout): ditto
@@ -35,7 +59,7 @@
        * lyxrow.C (par): moved
        (height): moved
        (next): moved
-       * lyxrox.h: as inlines here
+       * lyxrow.h: as inlines here
 
        * lyxfont.h (shape): moved from lyxfont.C
        (emph): moved from lyxfont.C

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index aabb0a8b023bc9d124df80403478951184dd11f1..7a00a9c612af70b2f7c4858d1949e8e6ab146e8d 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -16,6 +16,7 @@
 #include "insets/inseterror.h"
 #include "lyx_gui_misc.h"
 #include "lyxcursor.h"
+#include "gettext.h"
 
 #ifdef __GNUG__
 #pragma implementation

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 2da36b28b8c67fe849a2c4a6cf560f1accfac72a..8fead5dce258831ad280272d46488b673e407627 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -24,6 +24,7 @@
 #include "layout.h"
 #include "support/filetools.h"
 #include "FloatList.h"
+#include "language.h"
 
 using std::endl;
 

diff --git a/src/Painter.C b/src/Painter.C
index 34f54f2a33bd6ec142fd8fcb9c005cd2b32f56ba..2e1f8c0d5630c969ad3b756642c43add926a22e3 100644 (file)
--- a/src/Painter.C
+++ b/src/Painter.C
@@ -32,6 +32,7 @@
 #include "ColorHandler.h"
 #include "lyxrc.h"
 #include "encoding.h"
+#include "language.h"
 
 #include "frontends/support/LyXImage.h"
 

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 8aa4bcb5c144941f43c2ce457930bda33c402613..3151f3ee16361d1a06c24d0606f6d1df20df7dec 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -25,7 +25,7 @@
 #include "buffer.h"
 #include "support/lstrings.h"
 #include "lyx_cb.h"
-
+#include "language.h"
 
 #ifndef NEW_INSETS
 void Foot(BufferView * bv)

diff --git a/src/exporter.C b/src/exporter.C
index 26952a7b64ae7348533b981590d2d61c61a648fa..837a5585e70f718d9709a79cb0a396aa878868d6 100644 (file)
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -23,6 +23,7 @@
 #include "lyxrc.h"
 #include "converter.h"
 #include "lyx_gui_misc.h" //WriteAlert
+#include "gettext.h"
 
 using std::vector;
 using std::find;

diff --git a/src/font.C b/src/font.C
index 032a5c3f42fc482eb988410c99d4108eb19b6ff3..f022b22c41eedb25c4ab4e8848368759466b7b51 100644 (file)
--- a/src/font.C
+++ b/src/font.C
@@ -20,6 +20,7 @@
 #include "FontLoader.h"
 #include "lyxrc.h"
 #include "encoding.h"
+#include "language.h"
 
 namespace {
 

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 294490a6d7969eca0b0249bf654f340324cfbb11..3143cae2e12079e97b87e337bec987bb0c51773e 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,17 @@
+2001-04-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * ControlToc.C: 
+       * ControlSearch.C: 
+       * ControlPrint.C: 
+       * ControlPreamble.C: 
+       * ControlInclude.C: 
+       * ControlGraphics.C: 
+       * ControlExternal.C: 
+       * ControlCopyright.C: include gettext.h
+
+       * ControlCharacter.C: 
+       * character.C: include gettext.h and language.h
+
 2001-04-03  John Levon  <moz@compsoc.man.ac.uk>
 
        * ButtonController.h:

diff --git a/src/frontends/controllers/ControlCharacter.C b/src/frontends/controllers/ControlCharacter.C
index ce320474e6c66a3e50bc5c87fb0c4e0019e8cc7c..1a20f51ebec25d393e38cf61ed37c33977b11b8b 100644 (file)
--- a/src/frontends/controllers/ControlCharacter.C
+++ b/src/frontends/controllers/ControlCharacter.C
@@ -20,6 +20,8 @@
 #include "Liason.h"
 #include "LyXView.h"
 #include "bufferview_funcs.h" // ToggleAndShow
+#include "gettext.h"
+#include "language.h"
 
 using Liason::setMinibuffer;
 using SigC::slot;

diff --git a/src/frontends/controllers/ControlCopyright.C b/src/frontends/controllers/ControlCopyright.C
index 0e78135b775b55d4c851178f6f9bc5de739a96ec..51fd780bf447f4bee10a8dab83c254ff5bbbdd40 100644 (file)
--- a/src/frontends/controllers/ControlCopyright.C
+++ b/src/frontends/controllers/ControlCopyright.C
@@ -17,6 +17,7 @@
 #include "Dialogs.h"
 #include "LyXView.h"
 #include "BufferView.h"
+#include "gettext.h"
 
 using SigC::slot;
 

diff --git a/src/frontends/controllers/ControlExternal.C b/src/frontends/controllers/ControlExternal.C
index d0c4ed75c9101cbf9c69714545a40d8af4313226..7a023138210ed6bd4741c7f7931ce2cb5167e239 100644 (file)
--- a/src/frontends/controllers/ControlExternal.C
+++ b/src/frontends/controllers/ControlExternal.C
@@ -30,6 +30,7 @@
 #include "support/filetools.h"
 #include "frontends/FileDialog.h"
 #include "lyx_gui_misc.h" // WriteAlert
+#include "gettext.h"
 
 using std::make_pair;
 using std::vector;

diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C
index 777a5fb1e92ef96467f9d39e4006e9915f20de1b..8d7acb3ad86d61274435fbba160d0d3c83d50c50 100644 (file)
--- a/src/frontends/controllers/ControlGraphics.C
+++ b/src/frontends/controllers/ControlGraphics.C
@@ -22,6 +22,7 @@
 #include "Dialogs.h"
 #include "lyxfunc.h"
 #include "LyXView.h"
+#include "gettext.h"
 
 #include "insets/insetgraphics.h"
 

diff --git a/src/frontends/controllers/ControlInclude.C b/src/frontends/controllers/ControlInclude.C
index 0fd1db44f7a5cd42bb8ab9279de4d2f505fbb4bc..a352fd5ea9ce6298af7f55a1cc419c55bbb1ebbe 100644 (file)
--- a/src/frontends/controllers/ControlInclude.C
+++ b/src/frontends/controllers/ControlInclude.C
@@ -20,6 +20,7 @@
 #include "Dialogs.h"
 #include "lyxfunc.h"
 #include "LyXView.h"
+#include "gettext.h"
 
 #include "helper_funcs.h"
 #include "lyxrc.h"

diff --git a/src/frontends/controllers/ControlPreamble.C b/src/frontends/controllers/ControlPreamble.C
index d2983004460e1ea587d8932e892d549fa922cf79..52d863c7541955cf167b0eca7b95c58f9dca90e0 100644 (file)
--- a/src/frontends/controllers/ControlPreamble.C
+++ b/src/frontends/controllers/ControlPreamble.C
@@ -18,6 +18,7 @@
 #include "buffer.h"
 #include "lyxrc.h"
 #include "Liason.h"
+#include "gettext.h"
 
 
 ControlPreamble::ControlPreamble(LyXView & lv, Dialogs & d)

diff --git a/src/frontends/controllers/ControlPrint.C b/src/frontends/controllers/ControlPrint.C
index d33b2f95d924dcad1eac545fe666f94512da994a..f91d70d8008b0ffacebd31b4470df948054f1dda 100644 (file)
--- a/src/frontends/controllers/ControlPrint.C
+++ b/src/frontends/controllers/ControlPrint.C
@@ -27,6 +27,7 @@
 #include "Liason.h"
 #include "helper_funcs.h" // browseFile
 #include "lyx_gui_misc.h" // WriteAlert
+#include "gettext.h"
 
 using Liason::printBuffer;
 using Liason::getPrinterParams;

diff --git a/src/frontends/controllers/ControlSearch.C b/src/frontends/controllers/ControlSearch.C
index ca077e000b3fa0d2b809be9c7090e6c2912f8d56..f7cfdb27a5f2efcd8672ed63de2ea94b3e9b4898 100644 (file)
--- a/src/frontends/controllers/ControlSearch.C
+++ b/src/frontends/controllers/ControlSearch.C
@@ -24,6 +24,7 @@
 #include "buffer.h"
 #include "lyxfind.h"
 #include "debug.h"
+#include "gettext.h"
 
 using Liason::setMinibuffer;
 using SigC::slot;

diff --git a/src/frontends/controllers/ControlToc.C b/src/frontends/controllers/ControlToc.C
index 6bf0fbb83fe311d2c9571ce6dc16f8045d129432..c5b86cacd4db825604800770d16abbae3f7d47f1 100644 (file)
--- a/src/frontends/controllers/ControlToc.C
+++ b/src/frontends/controllers/ControlToc.C
@@ -23,6 +23,7 @@
 #include "LyXView.h"
 #include "lyxfunc.h"
 #include "support/lstrings.h" // tostr
+#include "gettext.h"
 
 using std::vector;
 using SigC::slot;

diff --git a/src/frontends/controllers/character.C b/src/frontends/controllers/character.C
index 750f210040ddbe9320dbeb296effbaaa6d279ab3..4fe1b9a9f748584a027433dd99b0cf12082c7082 100644 (file)
--- a/src/frontends/controllers/character.C
+++ b/src/frontends/controllers/character.C
@@ -18,7 +18,9 @@
 #pragma implementation
 #endif
 
+#include "gettext.h"
 #include "character.h"
+#include "language.h"
 
 using std::vector;
 

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 75697cbc37a4b8038775f7c701d8f08a6bdd177f..d13fa39a1b5ad2b39bf19b6387592880b60d1384 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * Menubar_pimpl.C: include gettext.h
+
 2001-04-05  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * xforms_helpers.C (formatted): constify length

diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C
index bb90a386bad67f2ace9652d0281f339869833cf4..87a9222f03107b75cc85fc7dc3382a4b2bfeda87 100644 (file)
--- a/src/frontends/xforms/Menubar_pimpl.C
+++ b/src/frontends/xforms/Menubar_pimpl.C
@@ -26,6 +26,7 @@
 #include "LyXView.h"
 #include "MenuBackend.h"
 #include "Menubar_pimpl.h"
+#include "gettext.h"
 
 using std::endl;
 using std::vector;

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 33d29e986940c5bc88df14307f5fd285379c1da0..97c1fcbce3b7fcffea6cf0f670acf439047e8276 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,19 @@
+2001-04-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * lyxinset.h: do not include gettext.h...
+
+       * inset.C:
+       * insetcaption.C:
+       * insetexternal.C:
+       * insetgraphics.C:
+       * insetindex.C:
+       * insetlabel.C:
+       * insetlatexaccent.C:
+       * insetminipage.C:
+       * insetquotes.C:
+       * insettabular.C:
+       * inseturl.C: ... and do it here instead
+
 2001-04-05  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * insetcollapsable.[Ch] (getLabelList): add std:: on vector<string>

diff --git a/src/insets/inset.C b/src/insets/inset.C
index cef7715c47761c0f089b3d46f5b1fd4b2276d108..bae82b6f9c130d8345b7fea29754c3323826f386 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -21,6 +21,7 @@
 #include "Painter.h"
 #include "commandtags.h"
 #include "support/lstrings.h"
+#include "gettext.h"
 
 using std::endl;
 

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index 336142cb2c4de54f584066448d90137c2a40c9cc..16c485077c890c9e62acf83f80003af596bf0c5e 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -21,6 +21,7 @@
 #include "FloatList.h"
 #include "insets/insetfloat.h"
 #include "debug.h"
+#include "gettext.h"
 
 using std::ostream;
 using std::endl;

diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index 881c9d4068f410effcabd939d01b147ace0d70e4..b95ae9939712e1e54a7c91b8c27d058cdc9ffa8e 100644 (file)
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -29,6 +29,7 @@
 #include "support/lstrings.h"
 #include "support/path.h"
 #include "support/syscall.h"
+#include "gettext.h"
 
 using std::endl;
 

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 575b5e727b7ac6fbafca94193e86ec9b4b31060e..95080ca68496d889d93cfe1e82cac83945a532a6 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -145,6 +145,7 @@ TODO Extended features:
 #include <algorithm> // For the std::max
 #include "support/lyxmanip.h"
 #include "debug.h"
+#include "gettext.h"
 
 extern string system_tempdir;
 

diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C
index 7f8cbe6f00690123055e3b7a1acfe3bd26bd39ab..f13c8db9fd93a56329ac68870bc99750ed75e56d 100644 (file)
--- a/src/insets/insetindex.C
+++ b/src/insets/insetindex.C
@@ -9,6 +9,7 @@
 #include "LyXView.h"
 #include "frontends/Dialogs.h"
 #include "LaTeXFeatures.h"
+#include "gettext.h"
 
 InsetIndex::InsetIndex(InsetCommandParams const & p)
        : InsetCommand(p)

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 0c36ab4613d68d266cdc1aa20fc9459f2aa79170..ddff0337d1abe0081a19c16deef392e567f61747 100644 (file)
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -20,6 +20,7 @@
 #include "support/lstrings.h" //frontStrip, strip
 #include "lyxtext.h"
 #include "buffer.h"
+#include "gettext.h"
 
 using std::ostream;
 using std::vector;

diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C
index 2fc222f235685a339ffa1e08139c9c0f950acb73..e5ef5cba393525238a57e0726dbb127a51888bf2 100644 (file)
--- a/src/insets/insetlatexaccent.C
+++ b/src/insets/insetlatexaccent.C
@@ -21,6 +21,7 @@
 #include "BufferView.h"
 #include "Painter.h"
 #include "font.h"
+#include "language.h"
 
 using std::ostream;
 using std::endl;

diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index 0065b5fe0ffaecd4f8669461069a4a93fb79fdf2..19a355b64dd81c9f65a1323eddca90676e34da21 100644 (file)
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -24,6 +24,7 @@
 #include "support/LOstream.h"
 #include "support/lstrings.h"
 #include "debug.h"
+#include "gettext.h"
 
 using std::ostream;
 using std::endl;

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 99e19b1b9d807cdc15a4e1d03126b496c0d5ec79..2c980b85a7eae550f4819a1e5005349fbd0ef450 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -24,6 +24,7 @@
 #include "support/lstrings.h"
 #include "Painter.h"
 #include "font.h"
+#include "language.h"
 
 using std::ostream;
 using std::endl;

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index c6a9e21e13a2c607ffee8d3ba9d60122feb00a0b..be9a89dbd4c33bd9199f8decb6b519193e1d041d 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -36,6 +36,8 @@
 #include "debug.h"
 #include "lyxfunc.h"
 #include "WorkArea.h"
+#include "gettext.h"
+#include "language.h"
 
 using std::ostream;
 using std::ifstream;

diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C
index b95bc270af6ac96a00976210b768fecb7f4eb572..cb3fe5f22ebf5cdd9bc918baab110a94920f801e 100644 (file)
--- a/src/insets/inseturl.C
+++ b/src/insets/inseturl.C
@@ -10,6 +10,7 @@
 #include "LyXView.h"
 #include "debug.h"
 #include "frontends/Dialogs.h"
+#include "gettext.h"
 
 using std::ostream;
 

diff --git a/src/insets/lyxinset.h b/src/insets/lyxinset.h
index 2957b9acfb5a0aa8bd7dfa56e883dffe75d14b9d..e47c9b47b1ad6c90f336b7b1a1d8e39e35bfc31f 100644 (file)
--- a/src/insets/lyxinset.h
+++ b/src/insets/lyxinset.h
@@ -19,7 +19,6 @@
 
 #include <X11/Xlib.h>
 
-#include "gettext.h"
 #include "lyxfont.h"
 #include "lyxlex.h"
 #include "commandtags.h"

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 31beb27025d03760b5f6fced5f9e93390acd3a57..e43715aab82b3bb5bf73d206f0b4ef8915b65357 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -19,6 +19,7 @@
 
 #include "gettext.h"
 #include "lyxfont.h"
+#include "language.h"
 #include "debug.h"
 #include "lyxrc.h"
 #include "lyxlex.h"

diff --git a/src/lyxfont.h b/src/lyxfont.h
index 07a0348d80e4ac14af04e85d8a1c6b3d557fe572..906115a887fba693f354de8eb3d49d83e2d2b2bd 100644 (file)
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -19,24 +19,11 @@
 #include <iosfwd>
 
 #include "LString.h"
-#include "language.h"
 #include "LColor.h"
 
-// It might happen that locale.h defines ON and OFF. This is not good
-// for us, since we use these names below. But of course this is due
-// to some old compilers. Than is broken when it comes to C++ scoping.
-#include "gettext.h" // so that we are sure tht it won't be included
-// later. 
-#ifdef ON
-#undef ON
-#endif
-
-#ifdef OFF
-#undef OFF
-#endif
-
 class LyXLex;
 class BufferParams;
+class Language;
 
 ///
 class LyXFont {

diff --git a/src/lyxparagraph.h b/src/lyxparagraph.h
index 6d7f0fad7e18d70022c272e2c356aa0a3c279002..c1e9cd7cef8f7ef4eb82428af7256d54c982a85e 100644 (file)
--- a/src/lyxparagraph.h
+++ b/src/lyxparagraph.h
@@ -23,7 +23,6 @@
 #include <boost/array.hpp>
 
 #include "insets/lyxinset.h"
-#include "language.h"
 #include "ParagraphParameters.h"
 
 class BufferParams;
@@ -32,6 +31,7 @@ class TexRow;
 struct LaTeXFeatures;
 class InsetBibKey;
 class BufferView;
+class Language;
 
 // I dare you to enable this and help me find all the bugs that then show
 // up. (Lgb)

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 0c0282ec235917a35ff7e6441e6b9a63cd3aa8ef..7afa7e0b3ac8ef570349534269b35e915b6a2642 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -31,6 +31,7 @@
 #include "support/filetools.h"
 #include "lyxtext.h"
 #include "converter.h"
+#include "gettext.h"
 
 using std::ostream;
 using std::ofstream;

diff --git a/src/paragraph.C b/src/paragraph.C
index d3f6f779fc2bdb0ef4980cc9fb83ec774ea505e2..dfbb0f5c11a8eee6ac02228c7b5ff8f4b9a59232 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -22,6 +22,7 @@
 #include "support/textutils.h"
 #include "lyxrc.h"
 #include "layout.h"
+#include "language.h"
 #include "tex-strings.h"
 #include "buffer.h"
 #include "bufferparams.h"
@@ -39,6 +40,7 @@
 #include "BufferView.h"
 #include "encoding.h"
 #include "ParameterStruct.h"
+#include "gettext.h"
 
 using std::ostream;
 using std::endl;

diff --git a/src/screen.C b/src/screen.C
index 312f92273ddbea2a3919ca0df0efeb91d4ec4e80..5ef3ad3aac364591c23dbe1fe1c0feed5030697c 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -25,6 +25,7 @@
 #include "font.h"
 #include "insets/insettext.h"
 #include "ColorHandler.h"
+#include "language.h"
 
 using std::max;
 using std::min;

diff --git a/src/tabular.C b/src/tabular.C
index b06f5b9a91c25dbe2b75b7fceb5f31357458a92d..bd751ba08d3d6995839df5f04d89542da8dc0c1f 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -32,6 +32,7 @@
 #include "support/lyxmanip.h"
 #include "insets/insettabular.h"
 #include "insets/insettext.h"
+#include "gettext.h"
 
 using std::ostream;
 using std::istream;

diff --git a/src/text.C b/src/text.C
index e9e71b9e85ca656b17593afc2f0c6557da646c94..25ba26e4f1eedc6a7d34fc4469f03e7645b2438f 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -34,6 +34,7 @@
 #include "encoding.h"
 #include "lyxscreen.h"
 #include "bufferview_funcs.h"
+#include "language.h"
 
 using std::max;
 using std::min;

diff --git a/src/text2.C b/src/text2.C
index c0a845a424916b7896996a4750f4abffbfe98c61..fd82af868b48b31934cd6c47564ead03523d8f47 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -43,6 +43,7 @@
 #include "debug.h"
 #include "lyxrc.h"
 #include "FloatList.h"
+#include "language.h"
 
 using std::copy;
 using std::find;

diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index 88b4190e48ee0d3922946376850910e04c3e089b..656e57c6dfdc0485fb2555565edfe8d2afaad9d7 100644 (file)
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -15,6 +15,7 @@
 #include "buffer.h"
 #include "lyxrc.h"
 #include "support/lstrings.h"
+#include "language.h"
 
 using std::endl;
 using std::pair;