From b8cad4ca9d2fe8379b496b326956ab5d16ddc1eb Mon Sep 17 00:00:00 2001 From: Asger Ottar Alstrup Date: Sun, 29 Jul 2001 17:39:01 +0000 Subject: [PATCH] More header file include dependency work git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2386 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Chktex.C | 1 + src/DepTable.C | 1 + src/LaTeX.C | 1 + src/LaTeXFeatures.C | 1 + src/MenuBackend.C | 12 +++++++++++- src/MenuBackend.h | 5 ++--- src/ToolbarDefaults.C | 1 + src/UpdateInset.C | 7 ++++++- src/UpdateInset.h | 7 ++----- src/debug.C | 1 + src/debug.h | 1 - src/frontends/controllers/ControlSearch.C | 1 + src/frontends/xforms/FormBibtex.C | 1 + src/frontends/xforms/FormDocument.C | 1 + src/frontends/xforms/FormMathsDelim.C | 1 + src/frontends/xforms/MathsSymbols.C | 2 +- src/insets/insetbib.C | 1 + src/insets/insetcaption.C | 1 + src/insets/insetinclude.C | 1 + src/insets/insettabular.C | 1 + src/insets/insettext.C | 1 + src/layout.C | 1 + src/lyx_cb.C | 1 + src/lyxfunc.h | 9 +++++---- src/lyxlex_pimpl.C | 1 + src/mathed/formula.C | 1 + src/mathed/formulabase.C | 2 +- src/mathed/math_parser.C | 1 + src/paragraph.C | 1 + src/support/tempname.C | 1 + src/text.C | 1 + src/text2.C | 1 + src/trans.C | 1 + src/vc-backend.C | 1 + 34 files changed, 54 insertions(+), 17 deletions(-) diff --git a/src/Chktex.C b/src/Chktex.C index e0b3991379..fbe1f047fc 100644 --- a/src/Chktex.C +++ b/src/Chktex.C @@ -28,6 +28,7 @@ #include "support/syscall.h" #include "support/syscontr.h" #include "support/path.h" +#include "support/lstrings.h" #include "gettext.h" using std::ifstream; diff --git a/src/DepTable.C b/src/DepTable.C index 7426d1eb4d..132419b920 100644 --- a/src/DepTable.C +++ b/src/DepTable.C @@ -20,6 +20,7 @@ #include "DepTable.h" #include "support/lyxlib.h" #include "support/filetools.h" +#include "support/lstrings.h" #include #include "debug.h" diff --git a/src/LaTeX.C b/src/LaTeX.C index 5a83f1d9e4..1d236c1ba0 100644 --- a/src/LaTeX.C +++ b/src/LaTeX.C @@ -28,6 +28,7 @@ #include "support/path.h" #include "support/LRegex.h" #include "support/LSubstring.h" +#include "support/lstrings.h" #include "bufferlist.h" #include "gettext.h" #include "lyx_gui_misc.h" diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C index 6c9de09ef7..e3a174711b 100644 --- a/src/LaTeXFeatures.C +++ b/src/LaTeXFeatures.C @@ -22,6 +22,7 @@ #include "bufferparams.h" #include "layout.h" #include "support/filetools.h" +#include "support/lstrings.h" #include "FloatList.h" #include "language.h" diff --git a/src/MenuBackend.C b/src/MenuBackend.C index 068f15f9f0..7a411e6009 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -30,6 +30,7 @@ #include "support/LAssert.h" #include "support/filetools.h" #include "support/lyxfunctional.h" +#include "support/lstrings.h" extern LyXAction lyxaction; extern LastFiles * lastfiles; @@ -78,6 +79,16 @@ MenuItem::MenuItem(Kind kind, string const & label, } } +string const MenuItem::label() const +{ + return token(label_, '|', 0); +} + +string const MenuItem::shortcut() const +{ + return token(label_, '|', 1); +} + Menu & Menu::add(MenuItem const & i) { @@ -235,7 +246,6 @@ void Menu::checkShortcuts() const } } - namespace { class compare_format { diff --git a/src/MenuBackend.h b/src/MenuBackend.h index c68018bbb0..b980e305f3 100644 --- a/src/MenuBackend.h +++ b/src/MenuBackend.h @@ -19,7 +19,6 @@ #endif #include "LString.h" -#include "support/lstrings.h" #include class LyXLex; @@ -76,9 +75,9 @@ public: action_(action), submenu_(), optional_(optional) {} /// The label of a given menuitem - string const label() const { return token(label_, '|', 0); } + string const label() const; /// The keyboard shortcut (usually underlined in the entry) - string const shortcut() const { return token(label_, '|', 1); } + string const shortcut() const; /// The complete label, with label and shortcut separated by a '|' string const fulllabel() const { return label_;} /// The kind of entry diff --git a/src/ToolbarDefaults.C b/src/ToolbarDefaults.C index 390dabb43c..50140a787a 100644 --- a/src/ToolbarDefaults.C +++ b/src/ToolbarDefaults.C @@ -20,6 +20,7 @@ #include "lyxlex.h" #include "debug.h" #include "lyxlex.h" +#include "support/lstrings.h" using std::endl; diff --git a/src/UpdateInset.C b/src/UpdateInset.C index 632cfcb4ec..b42fd05120 100644 --- a/src/UpdateInset.C +++ b/src/UpdateInset.C @@ -6,7 +6,12 @@ #include "UpdateInset.h" #include "BufferView.h" -//#include "insets/inset.h" +#include "support/LAssert.h" + +void UpdateInset::push(Inset * inset) { + lyx::Assert(inset); + insetqueue.push(inset); +} void UpdateInset::update(BufferView * bv) { diff --git a/src/UpdateInset.h b/src/UpdateInset.h index eff495b7da..c868461bd2 100644 --- a/src/UpdateInset.h +++ b/src/UpdateInset.h @@ -8,7 +8,6 @@ #endif #include -#include "support/LAssert.h" class Inset; class BufferView; @@ -17,10 +16,8 @@ class BufferView; class UpdateInset { public: /// - void push(Inset * inset) { - lyx::Assert(inset); - insetqueue.push(inset); - } + void push(Inset * inset); + /// void update(BufferView *); private: diff --git a/src/debug.C b/src/debug.C index 8fa82458fb..6a77781768 100644 --- a/src/debug.C +++ b/src/debug.C @@ -17,6 +17,7 @@ #include "debug.h" #include "gettext.h" +#include "support/lstrings.h" using std::ostream; using std::setw; diff --git a/src/debug.h b/src/debug.h index 617d93fbaa..e58ed1ccb6 100644 --- a/src/debug.h +++ b/src/debug.h @@ -19,7 +19,6 @@ #include #include "LString.h" -#include "support/lstrings.h" /** Ideally this should have been a namespace, but since we try to be compilable on older C++ compilators too, we use a struct instead. diff --git a/src/frontends/controllers/ControlSearch.C b/src/frontends/controllers/ControlSearch.C index 9f03e815ac..7315d7139b 100644 --- a/src/frontends/controllers/ControlSearch.C +++ b/src/frontends/controllers/ControlSearch.C @@ -28,6 +28,7 @@ #include "debug.h" #include "gettext.h" #include "BufferView.h" +#include "support/lstrings.h" using Liason::setMinibuffer; using SigC::slot; diff --git a/src/frontends/xforms/FormBibtex.C b/src/frontends/xforms/FormBibtex.C index 923b147684..266a5d9037 100644 --- a/src/frontends/xforms/FormBibtex.C +++ b/src/frontends/xforms/FormBibtex.C @@ -18,6 +18,7 @@ #include "form_bibtex.h" #include "gettext.h" #include "debug.h" +#include "support/lstrings.h" typedef FormCB > base_class; diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C index 7e865f23a2..d30acd90d0 100644 --- a/src/frontends/xforms/FormDocument.C +++ b/src/frontends/xforms/FormDocument.C @@ -31,6 +31,7 @@ #include "vspace.h" #include "bmtable.h" #include "support/filetools.h" +#include "support/lstrings.h" #include "language.h" #include "LyXView.h" #include "BufferView.h" diff --git a/src/frontends/xforms/FormMathsDelim.C b/src/frontends/xforms/FormMathsDelim.C index 27432b56d8..d845b5866c 100644 --- a/src/frontends/xforms/FormMathsDelim.C +++ b/src/frontends/xforms/FormMathsDelim.C @@ -22,6 +22,7 @@ #include "bmtable.h" #include "debug.h" #include "mathed/symbol_def.h" +#include "support/lstrings.h" #include "lyxfunc.h" #include "delim.xbm" diff --git a/src/frontends/xforms/MathsSymbols.C b/src/frontends/xforms/MathsSymbols.C index 164d1fccb3..0278edc4e8 100644 --- a/src/frontends/xforms/MathsSymbols.C +++ b/src/frontends/xforms/MathsSymbols.C @@ -17,8 +17,8 @@ #endif #include "support/LAssert.h" +#include "support/lstrings.h" #include "debug.h" - #include "MathsSymbols.h" #include "FormMathsPanel.h" diff --git a/src/insets/insetbib.C b/src/insets/insetbib.C index 4699700505..81a73e5938 100644 --- a/src/insets/insetbib.C +++ b/src/insets/insetbib.C @@ -17,6 +17,7 @@ #include "support/filetools.h" #include "support/path.h" #include "support/os.h" +#include "support/lstrings.h" #include "lyxrc.h" #include "font.h" #include "LyXView.h" diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C index 17a5197c2c..d5a773f3e8 100644 --- a/src/insets/insetcaption.C +++ b/src/insets/insetcaption.C @@ -22,6 +22,7 @@ #include "insets/insetfloat.h" #include "debug.h" #include "gettext.h" +#include "support/lstrings.h" using std::ostream; using std::endl; diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C index 2ff7aa82b0..1c8189166e 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -20,6 +20,7 @@ #include "LaTeXFeatures.h" #include "gettext.h" #include "support/FileInfo.h" +#include "support/lstrings.h" #include "layout.h" using std::ostream; diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index 09fe240b8e..b15d80e5e4 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -41,6 +41,7 @@ #include "BufferView.h" #include "undo_funcs.h" #include "support/LAssert.h" +#include "support/lstrings.h" using std::ostream; using std::ifstream; diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 3d7c570a27..f079e0daf4 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -40,6 +40,7 @@ #include "LColor.h" #include "support/textutils.h" #include "support/LAssert.h" +#include "support/lstrings.h" #include "lyxrow.h" #include "lyxrc.h" #include "intl.h" diff --git a/src/layout.C b/src/layout.C index c36558ab04..f28c75e944 100644 --- a/src/layout.C +++ b/src/layout.C @@ -25,6 +25,7 @@ #include "gettext.h" #include "support/LAssert.h" #include "support/lyxfunctional.h" +#include "support/lstrings.h" using std::pair; using std::make_pair; diff --git a/src/lyx_cb.C b/src/lyx_cb.C index ff2c876a59..1306b2bddf 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -33,6 +33,7 @@ #include "support/filetools.h" #include "support/path.h" #include "support/syscall.h" +#include "support/lstrings.h" #include "gettext.h" #include "BufferView.h" diff --git a/src/lyxfunc.h b/src/lyxfunc.h index 735e2798fe..6942650e19 100644 --- a/src/lyxfunc.h +++ b/src/lyxfunc.h @@ -2,19 +2,20 @@ #ifndef LYXFUNC_H #define LYXFUNC_H -#include - #ifdef __GNUG__ #pragma interface #endif -#include "commandtags.h" +#include +#include + +#include "commandtags.h" // for kb_action enum #include "func_status.h" #include "kbsequence.h" -#include "insets/inset.h" #include "LString.h" class LyXView; +class LyXText; /** This class encapsulates all the LyX command operations. diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C index bcb4137621..b385ef8d53 100644 --- a/src/lyxlex_pimpl.C +++ b/src/lyxlex_pimpl.C @@ -8,6 +8,7 @@ #include "lyxlex_pimpl.h" #include "support/lyxalgo.h" #include "support/filetools.h" +#include "support/lstrings.h" #include "debug.h" using std::sort; diff --git a/src/mathed/formula.C b/src/mathed/formula.C index 1f82753e6c..d9a64e4c98 100644 --- a/src/mathed/formula.C +++ b/src/mathed/formula.C @@ -32,6 +32,7 @@ #include "support/LOstream.h" #include "support/lyxlib.h" #include "support/syscall.h" +#include "support/lstrings.h" #include "LyXView.h" #include "Painter.h" #include "lyxrc.h" diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C index c81c2ae7b0..166b9d82f6 100644 --- a/src/mathed/formulabase.C +++ b/src/mathed/formulabase.C @@ -33,7 +33,7 @@ #include "gettext.h" #include "LaTeXFeatures.h" #include "debug.h" -#include "support/LOstream.h" +#include "support/lstrings.h" #include "LyXView.h" #include "Painter.h" #include "font.h" diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C index 5ab89b2747..6c4f0255ee 100644 --- a/src/mathed/math_parser.C +++ b/src/mathed/math_parser.C @@ -47,6 +47,7 @@ #include "debug.h" #include "mathed/support.h" #include "lyxlex.h" +#include "support/lstrings.h" using std::istream; using std::endl; diff --git a/src/paragraph.C b/src/paragraph.C index d272c778cb..0196923893 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -35,6 +35,7 @@ #include "insets/insetbib.h" #include "insets/insettext.h" #include "support/filetools.h" +#include "support/lstrings.h" #include "lyx_gui_misc.h" #include "texrow.h" #include "support/lyxmanip.h" diff --git a/src/support/tempname.C b/src/support/tempname.C index 8a7785cc1a..614146f2c4 100644 --- a/src/support/tempname.C +++ b/src/support/tempname.C @@ -6,6 +6,7 @@ #include "LString.h" #include "support/lyxlib.h" #include "support/filetools.h" +#include "support/lstrings.h" #include "debug.h" #include "os.h" diff --git a/src/text.C b/src/text.C index 06309f74de..fb489d525b 100644 --- a/src/text.C +++ b/src/text.C @@ -18,6 +18,7 @@ #include "paragraph.h" #include "support/textutils.h" #include "support/LAssert.h" +#include "support/lstrings.h" #include "insets/insetbib.h" #include "insets/insettext.h" #include "insets/insetspecialchar.h" diff --git a/src/text2.C b/src/text2.C index 1d4b918dfe..8898e4cae0 100644 --- a/src/text2.C +++ b/src/text2.C @@ -25,6 +25,7 @@ #include "layout.h" #include "LyXView.h" #include "support/textutils.h" +#include "support/lstrings.h" #include "undo_funcs.h" #include "buffer.h" #include "bufferparams.h" diff --git a/src/trans.C b/src/trans.C index ff0fbf3986..6e3d2e586c 100644 --- a/src/trans.C +++ b/src/trans.C @@ -7,6 +7,7 @@ #include "LyXView.h" #include "trans.h" #include "support/filetools.h" +#include "support/lstrings.h" #include "tex-strings.h" #include "lyxlex.h" #include "debug.h" diff --git a/src/vc-backend.C b/src/vc-backend.C index b624f72fbd..0e3bac747e 100644 --- a/src/vc-backend.C +++ b/src/vc-backend.C @@ -13,6 +13,7 @@ #include "support/LSubstring.h" #include "support/path.h" #include "support/filetools.h" +#include "support/lstrings.h" #include "buffer.h" #include "BufferView.h" #include "LyXView.h" -- 2.39.5