More header file include dependency work

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2386 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Asger Ottar Alstrup 2001-07-29 17:39:01 +00:00
parent da76673568
commit b8cad4ca9d
34 changed files with 54 additions and 17 deletions

View File

@ -28,6 +28,7 @@
#include "support/syscall.h" #include "support/syscall.h"
#include "support/syscontr.h" #include "support/syscontr.h"
#include "support/path.h" #include "support/path.h"
#include "support/lstrings.h"
#include "gettext.h" #include "gettext.h"
using std::ifstream; using std::ifstream;

View File

@ -20,6 +20,7 @@
#include "DepTable.h" #include "DepTable.h"
#include "support/lyxlib.h" #include "support/lyxlib.h"
#include "support/filetools.h" #include "support/filetools.h"
#include "support/lstrings.h"
#include <fstream> #include <fstream>
#include "debug.h" #include "debug.h"

View File

@ -28,6 +28,7 @@
#include "support/path.h" #include "support/path.h"
#include "support/LRegex.h" #include "support/LRegex.h"
#include "support/LSubstring.h" #include "support/LSubstring.h"
#include "support/lstrings.h"
#include "bufferlist.h" #include "bufferlist.h"
#include "gettext.h" #include "gettext.h"
#include "lyx_gui_misc.h" #include "lyx_gui_misc.h"

View File

@ -22,6 +22,7 @@
#include "bufferparams.h" #include "bufferparams.h"
#include "layout.h" #include "layout.h"
#include "support/filetools.h" #include "support/filetools.h"
#include "support/lstrings.h"
#include "FloatList.h" #include "FloatList.h"
#include "language.h" #include "language.h"

View File

@ -30,6 +30,7 @@
#include "support/LAssert.h" #include "support/LAssert.h"
#include "support/filetools.h" #include "support/filetools.h"
#include "support/lyxfunctional.h" #include "support/lyxfunctional.h"
#include "support/lstrings.h"
extern LyXAction lyxaction; extern LyXAction lyxaction;
extern LastFiles * lastfiles; 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) Menu & Menu::add(MenuItem const & i)
{ {
@ -235,7 +246,6 @@ void Menu::checkShortcuts() const
} }
} }
namespace { namespace {
class compare_format { class compare_format {

View File

@ -19,7 +19,6 @@
#endif #endif
#include "LString.h" #include "LString.h"
#include "support/lstrings.h"
#include <vector> #include <vector>
class LyXLex; class LyXLex;
@ -76,9 +75,9 @@ public:
action_(action), submenu_(), optional_(optional) {} action_(action), submenu_(), optional_(optional) {}
/// The label of a given menuitem /// 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) /// 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 '|' /// The complete label, with label and shortcut separated by a '|'
string const fulllabel() const { return label_;} string const fulllabel() const { return label_;}
/// The kind of entry /// The kind of entry

View File

@ -20,6 +20,7 @@
#include "lyxlex.h" #include "lyxlex.h"
#include "debug.h" #include "debug.h"
#include "lyxlex.h" #include "lyxlex.h"
#include "support/lstrings.h"
using std::endl; using std::endl;

View File

@ -6,7 +6,12 @@
#include "UpdateInset.h" #include "UpdateInset.h"
#include "BufferView.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) void UpdateInset::update(BufferView * bv)
{ {

View File

@ -8,7 +8,6 @@
#endif #endif
#include <queue> #include <queue>
#include "support/LAssert.h"
class Inset; class Inset;
class BufferView; class BufferView;
@ -17,10 +16,8 @@ class BufferView;
class UpdateInset { class UpdateInset {
public: public:
/// ///
void push(Inset * inset) { void push(Inset * inset);
lyx::Assert(inset);
insetqueue.push(inset);
}
/// ///
void update(BufferView *); void update(BufferView *);
private: private:

View File

@ -17,6 +17,7 @@
#include "debug.h" #include "debug.h"
#include "gettext.h" #include "gettext.h"
#include "support/lstrings.h"
using std::ostream; using std::ostream;
using std::setw; using std::setw;

View File

@ -19,7 +19,6 @@
#include <iosfwd> #include <iosfwd>
#include "LString.h" #include "LString.h"
#include "support/lstrings.h"
/** Ideally this should have been a namespace, but since we try to be /** Ideally this should have been a namespace, but since we try to be
compilable on older C++ compilators too, we use a struct instead. compilable on older C++ compilators too, we use a struct instead.

View File

@ -28,6 +28,7 @@
#include "debug.h" #include "debug.h"
#include "gettext.h" #include "gettext.h"
#include "BufferView.h" #include "BufferView.h"
#include "support/lstrings.h"
using Liason::setMinibuffer; using Liason::setMinibuffer;
using SigC::slot; using SigC::slot;

View File

@ -18,6 +18,7 @@
#include "form_bibtex.h" #include "form_bibtex.h"
#include "gettext.h" #include "gettext.h"
#include "debug.h" #include "debug.h"
#include "support/lstrings.h"
typedef FormCB<ControlBibtex, FormDB<FD_form_bibtex> > base_class; typedef FormCB<ControlBibtex, FormDB<FD_form_bibtex> > base_class;

View File

@ -31,6 +31,7 @@
#include "vspace.h" #include "vspace.h"
#include "bmtable.h" #include "bmtable.h"
#include "support/filetools.h" #include "support/filetools.h"
#include "support/lstrings.h"
#include "language.h" #include "language.h"
#include "LyXView.h" #include "LyXView.h"
#include "BufferView.h" #include "BufferView.h"

View File

@ -22,6 +22,7 @@
#include "bmtable.h" #include "bmtable.h"
#include "debug.h" #include "debug.h"
#include "mathed/symbol_def.h" #include "mathed/symbol_def.h"
#include "support/lstrings.h"
#include "lyxfunc.h" #include "lyxfunc.h"
#include "delim.xbm" #include "delim.xbm"

View File

@ -17,8 +17,8 @@
#endif #endif
#include "support/LAssert.h" #include "support/LAssert.h"
#include "support/lstrings.h"
#include "debug.h" #include "debug.h"
#include "MathsSymbols.h" #include "MathsSymbols.h"
#include "FormMathsPanel.h" #include "FormMathsPanel.h"

View File

@ -17,6 +17,7 @@
#include "support/filetools.h" #include "support/filetools.h"
#include "support/path.h" #include "support/path.h"
#include "support/os.h" #include "support/os.h"
#include "support/lstrings.h"
#include "lyxrc.h" #include "lyxrc.h"
#include "font.h" #include "font.h"
#include "LyXView.h" #include "LyXView.h"

View File

@ -22,6 +22,7 @@
#include "insets/insetfloat.h" #include "insets/insetfloat.h"
#include "debug.h" #include "debug.h"
#include "gettext.h" #include "gettext.h"
#include "support/lstrings.h"
using std::ostream; using std::ostream;
using std::endl; using std::endl;

View File

@ -20,6 +20,7 @@
#include "LaTeXFeatures.h" #include "LaTeXFeatures.h"
#include "gettext.h" #include "gettext.h"
#include "support/FileInfo.h" #include "support/FileInfo.h"
#include "support/lstrings.h"
#include "layout.h" #include "layout.h"
using std::ostream; using std::ostream;

View File

@ -41,6 +41,7 @@
#include "BufferView.h" #include "BufferView.h"
#include "undo_funcs.h" #include "undo_funcs.h"
#include "support/LAssert.h" #include "support/LAssert.h"
#include "support/lstrings.h"
using std::ostream; using std::ostream;
using std::ifstream; using std::ifstream;

View File

@ -40,6 +40,7 @@
#include "LColor.h" #include "LColor.h"
#include "support/textutils.h" #include "support/textutils.h"
#include "support/LAssert.h" #include "support/LAssert.h"
#include "support/lstrings.h"
#include "lyxrow.h" #include "lyxrow.h"
#include "lyxrc.h" #include "lyxrc.h"
#include "intl.h" #include "intl.h"

View File

@ -25,6 +25,7 @@
#include "gettext.h" #include "gettext.h"
#include "support/LAssert.h" #include "support/LAssert.h"
#include "support/lyxfunctional.h" #include "support/lyxfunctional.h"
#include "support/lstrings.h"
using std::pair; using std::pair;
using std::make_pair; using std::make_pair;

View File

@ -33,6 +33,7 @@
#include "support/filetools.h" #include "support/filetools.h"
#include "support/path.h" #include "support/path.h"
#include "support/syscall.h" #include "support/syscall.h"
#include "support/lstrings.h"
#include "gettext.h" #include "gettext.h"
#include "BufferView.h" #include "BufferView.h"

View File

@ -2,19 +2,20 @@
#ifndef LYXFUNC_H #ifndef LYXFUNC_H
#define LYXFUNC_H #define LYXFUNC_H
#include <sigc++/signal_system.h>
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface #pragma interface
#endif #endif
#include "commandtags.h" #include <X11/Xlib.h>
#include <sigc++/signal_system.h>
#include "commandtags.h" // for kb_action enum
#include "func_status.h" #include "func_status.h"
#include "kbsequence.h" #include "kbsequence.h"
#include "insets/inset.h"
#include "LString.h" #include "LString.h"
class LyXView; class LyXView;
class LyXText;
/** This class encapsulates all the LyX command operations. /** This class encapsulates all the LyX command operations.

View File

@ -8,6 +8,7 @@
#include "lyxlex_pimpl.h" #include "lyxlex_pimpl.h"
#include "support/lyxalgo.h" #include "support/lyxalgo.h"
#include "support/filetools.h" #include "support/filetools.h"
#include "support/lstrings.h"
#include "debug.h" #include "debug.h"
using std::sort; using std::sort;

View File

@ -32,6 +32,7 @@
#include "support/LOstream.h" #include "support/LOstream.h"
#include "support/lyxlib.h" #include "support/lyxlib.h"
#include "support/syscall.h" #include "support/syscall.h"
#include "support/lstrings.h"
#include "LyXView.h" #include "LyXView.h"
#include "Painter.h" #include "Painter.h"
#include "lyxrc.h" #include "lyxrc.h"

View File

@ -33,7 +33,7 @@
#include "gettext.h" #include "gettext.h"
#include "LaTeXFeatures.h" #include "LaTeXFeatures.h"
#include "debug.h" #include "debug.h"
#include "support/LOstream.h" #include "support/lstrings.h"
#include "LyXView.h" #include "LyXView.h"
#include "Painter.h" #include "Painter.h"
#include "font.h" #include "font.h"

View File

@ -47,6 +47,7 @@
#include "debug.h" #include "debug.h"
#include "mathed/support.h" #include "mathed/support.h"
#include "lyxlex.h" #include "lyxlex.h"
#include "support/lstrings.h"
using std::istream; using std::istream;
using std::endl; using std::endl;

View File

@ -35,6 +35,7 @@
#include "insets/insetbib.h" #include "insets/insetbib.h"
#include "insets/insettext.h" #include "insets/insettext.h"
#include "support/filetools.h" #include "support/filetools.h"
#include "support/lstrings.h"
#include "lyx_gui_misc.h" #include "lyx_gui_misc.h"
#include "texrow.h" #include "texrow.h"
#include "support/lyxmanip.h" #include "support/lyxmanip.h"

View File

@ -6,6 +6,7 @@
#include "LString.h" #include "LString.h"
#include "support/lyxlib.h" #include "support/lyxlib.h"
#include "support/filetools.h" #include "support/filetools.h"
#include "support/lstrings.h"
#include "debug.h" #include "debug.h"
#include "os.h" #include "os.h"

View File

@ -18,6 +18,7 @@
#include "paragraph.h" #include "paragraph.h"
#include "support/textutils.h" #include "support/textutils.h"
#include "support/LAssert.h" #include "support/LAssert.h"
#include "support/lstrings.h"
#include "insets/insetbib.h" #include "insets/insetbib.h"
#include "insets/insettext.h" #include "insets/insettext.h"
#include "insets/insetspecialchar.h" #include "insets/insetspecialchar.h"

View File

@ -25,6 +25,7 @@
#include "layout.h" #include "layout.h"
#include "LyXView.h" #include "LyXView.h"
#include "support/textutils.h" #include "support/textutils.h"
#include "support/lstrings.h"
#include "undo_funcs.h" #include "undo_funcs.h"
#include "buffer.h" #include "buffer.h"
#include "bufferparams.h" #include "bufferparams.h"

View File

@ -7,6 +7,7 @@
#include "LyXView.h" #include "LyXView.h"
#include "trans.h" #include "trans.h"
#include "support/filetools.h" #include "support/filetools.h"
#include "support/lstrings.h"
#include "tex-strings.h" #include "tex-strings.h"
#include "lyxlex.h" #include "lyxlex.h"
#include "debug.h" #include "debug.h"

View File

@ -13,6 +13,7 @@
#include "support/LSubstring.h" #include "support/LSubstring.h"
#include "support/path.h" #include "support/path.h"
#include "support/filetools.h" #include "support/filetools.h"
#include "support/lstrings.h"
#include "buffer.h" #include "buffer.h"
#include "BufferView.h" #include "BufferView.h"
#include "LyXView.h" #include "LyXView.h"