From e59e72d1d10e6184fafa1bd4daedaf5512a1e23b Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 5 Apr 2001 12:26:41 +0000 Subject: [PATCH] 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 --- po/POTFILES.in | 60 ++++++++++---------- src/BufferView2.C | 1 + src/ChangeLog | 28 ++++++++- src/CutAndPaste.C | 1 + src/LaTeXFeatures.C | 1 + src/Painter.C | 1 + src/bufferview_funcs.C | 2 +- src/exporter.C | 1 + src/font.C | 1 + src/frontends/controllers/ChangeLog | 14 +++++ src/frontends/controllers/ControlCharacter.C | 2 + src/frontends/controllers/ControlCopyright.C | 1 + src/frontends/controllers/ControlExternal.C | 1 + src/frontends/controllers/ControlGraphics.C | 1 + src/frontends/controllers/ControlInclude.C | 1 + src/frontends/controllers/ControlPreamble.C | 1 + src/frontends/controllers/ControlPrint.C | 1 + src/frontends/controllers/ControlSearch.C | 1 + src/frontends/controllers/ControlToc.C | 1 + src/frontends/controllers/character.C | 2 + src/frontends/xforms/ChangeLog | 4 ++ src/frontends/xforms/Menubar_pimpl.C | 1 + src/insets/ChangeLog | 16 ++++++ src/insets/inset.C | 1 + src/insets/insetcaption.C | 1 + src/insets/insetexternal.C | 1 + src/insets/insetgraphics.C | 1 + src/insets/insetindex.C | 1 + src/insets/insetlabel.C | 1 + src/insets/insetlatexaccent.C | 1 + src/insets/insetminipage.C | 1 + src/insets/insetquotes.C | 1 + src/insets/insettabular.C | 2 + src/insets/inseturl.C | 1 + src/insets/lyxinset.h | 1 - src/lyxfont.C | 1 + src/lyxfont.h | 15 +---- src/lyxparagraph.h | 2 +- src/lyxrc.C | 1 + src/paragraph.C | 2 + src/screen.C | 1 + src/tabular.C | 1 + src/text.C | 1 + src/text2.C | 1 + src/trans_mgr.C | 1 + 45 files changed, 133 insertions(+), 49 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index c9074e1990..d231458f18 100644 --- 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 745cc2b88a..eb766c0bcd 100644 --- 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 a6de52b947..e773da2367 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,27 @@ +2001-04-05 Jean-Marc Lasgouttes + + * 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 * 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 aabb0a8b02..7a00a9c612 100644 --- 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 2da36b28b8..8fead5dce2 100644 --- 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 34f54f2a33..2e1f8c0d56 100644 --- 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 8aa4bcb5c1..3151f3ee16 100644 --- 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 26952a7b64..837a5585e7 100644 --- 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 032a5c3f42..f022b22c41 100644 --- 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 294490a6d7..3143cae2e1 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,17 @@ +2001-04-05 Jean-Marc Lasgouttes + + * 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 * ButtonController.h: diff --git a/src/frontends/controllers/ControlCharacter.C b/src/frontends/controllers/ControlCharacter.C index ce320474e6..1a20f51ebe 100644 --- 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 0e78135b77..51fd780bf4 100644 --- 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 d0c4ed75c9..7a02313821 100644 --- 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 777a5fb1e9..8d7acb3ad8 100644 --- 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 0fd1db44f7..a352fd5ea9 100644 --- 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 d298300446..52d863c754 100644 --- 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 d33b2f95d9..f91d70d800 100644 --- 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 ca077e000b..f7cfdb27a5 100644 --- 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 6bf0fbb83f..c5b86cacd4 100644 --- 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 750f210040..4fe1b9a9f7 100644 --- 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 75697cbc37..d13fa39a1b 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2001-04-05 Jean-Marc Lasgouttes + + * Menubar_pimpl.C: include gettext.h + 2001-04-05 Lars Gullik Bjønnes * xforms_helpers.C (formatted): constify length diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C index bb90a386ba..87a9222f03 100644 --- 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 33d29e9869..97c1fcbce3 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,19 @@ +2001-04-05 Jean-Marc Lasgouttes + + * 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 * insetcollapsable.[Ch] (getLabelList): add std:: on vector diff --git a/src/insets/inset.C b/src/insets/inset.C index cef7715c47..bae82b6f9c 100644 --- 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 336142cb2c..16c485077c 100644 --- 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 881c9d4068..b95ae99397 100644 --- 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 575b5e727b..95080ca684 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -145,6 +145,7 @@ TODO Extended features: #include // 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 7f8cbe6f00..f13c8db9fd 100644 --- 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 0c36ab4613..ddff0337d1 100644 --- 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 2fc222f235..e5ef5cba39 100644 --- 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 0065b5fe0f..19a355b64d 100644 --- 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 99e19b1b9d..2c980b85a7 100644 --- 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 c6a9e21e13..be9a89dbd4 100644 --- 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 b95bc270af..cb3fe5f22e 100644 --- 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 2957b9acfb..e47c9b47b1 100644 --- a/src/insets/lyxinset.h +++ b/src/insets/lyxinset.h @@ -19,7 +19,6 @@ #include -#include "gettext.h" #include "lyxfont.h" #include "lyxlex.h" #include "commandtags.h" diff --git a/src/lyxfont.C b/src/lyxfont.C index 31beb27025..e43715aab8 100644 --- 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 07a0348d80..906115a887 100644 --- a/src/lyxfont.h +++ b/src/lyxfont.h @@ -19,24 +19,11 @@ #include #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 6d7f0fad7e..c1e9cd7cef 100644 --- a/src/lyxparagraph.h +++ b/src/lyxparagraph.h @@ -23,7 +23,6 @@ #include #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 0c0282ec23..7afa7e0b3a 100644 --- 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 d3f6f779fc..dfbb0f5c11 100644 --- 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 312f92273d..5ef3ad3aac 100644 --- 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 b06f5b9a91..bd751ba08d 100644 --- 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 e9e71b9e85..25ba26e4f1 100644 --- 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 c0a845a424..fd82af868b 100644 --- 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 88b4190e48..656e57c6df 100644 --- 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; -- 2.39.2