From 3f1021344b067ebf2b5a048d0bd03d3d4d9cd2dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Mon, 26 Nov 2001 18:03:23 +0000 Subject: [PATCH] more header disentangling git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3082 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 1 + src/insets/insetert.C | 1 + src/insets/insetnote.C | 1 + src/lyxfont.C | 6 ++++++ src/lyxfont.h | 8 +------- src/paragraph_pimpl.C | 1 + src/sp_spell.C | 1 + 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b5ce885c56..bf10e8509a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -9,6 +9,7 @@ * lyxrow.[Ch]: * paragraph.[Ch]: * paragraph_pimpl.[Ch]: + * sp_spell.C: * text.C: * text2.C: reduce header dependencies, introduce type for positions diff --git a/src/insets/insetert.C b/src/insets/insetert.C index d4717cd28f..ba42a7a12d 100644 --- a/src/insets/insetert.C +++ b/src/insets/insetert.C @@ -16,6 +16,7 @@ #include "insetert.h" #include "gettext.h" #include "lyxfont.h" +#include "language.h" #include "buffer.h" #include "insets/insettext.h" #include "support/LOstream.h" diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C index cf94f63b92..f07462f0f3 100644 --- a/src/insets/insetnote.C +++ b/src/insets/insetnote.C @@ -17,6 +17,7 @@ #include "insetnote.h" #include "gettext.h" #include "lyxfont.h" +#include "language.h" #include "buffer.h" #include "BufferView.h" #include "lyxtext.h" diff --git a/src/lyxfont.C b/src/lyxfont.C index 61143f4bac..f08de93fce 100644 --- a/src/lyxfont.C +++ b/src/lyxfont.C @@ -22,6 +22,7 @@ #include "debug.h" #include "lyxrc.h" #include "lyxlex.h" +#include "language.h" #include "FontLoader.h" #include "support/lstrings.h" #include "bufferparams.h" // stateText @@ -158,6 +159,11 @@ bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const } +LyXFont::LyXFont() + : bits(sane), lang(default_language) +{} + + LyXFont::LyXFont(LyXFont::FONT_INIT1) #ifndef INHERIT_LANGUAGE : bits(inherit), lang(default_language) diff --git a/src/lyxfont.h b/src/lyxfont.h index 601a430ce4..9bf18307d4 100644 --- a/src/lyxfont.h +++ b/src/lyxfont.h @@ -20,10 +20,10 @@ #include "LString.h" #include "LColor.h" -#include "language.h" class LyXLex; class BufferParams; +class Language; /// @@ -379,12 +379,6 @@ LyXFont::FONT_SHAPE LyXFont::shape() const } -inline -LyXFont::LyXFont() - : bits(sane), lang(default_language) -{} - - inline LyXFont::FONT_FAMILY LyXFont::family() const { diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C index e58e0cde49..5722b55b5c 100644 --- a/src/paragraph_pimpl.C +++ b/src/paragraph_pimpl.C @@ -16,6 +16,7 @@ #include "paragraph_pimpl.h" #include "texrow.h" +#include "language.h" #include "bufferparams.h" #include "encoding.h" #include "lyxrc.h" diff --git a/src/sp_spell.C b/src/sp_spell.C index bb301cadd5..ee9b546cd6 100644 --- a/src/sp_spell.C +++ b/src/sp_spell.C @@ -46,6 +46,7 @@ #include "LString.h" #include "support/lstrings.h" #include "lyxrc.h" +#include "language.h" #include "debug.h" #include "encoding.h" #include "sp_ispell.h" -- 2.39.2