more header disentangling

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

diff --git a/src/ChangeLog b/src/ChangeLog
index b5ce885c566b218a52ff34a6f4e9cb02ac0b815d..bf10e8509a348b6f601a1cdc13caa847354dbcac 100644 (file)
--- 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 d4717cd28f450185f53bb425b5e043f1cb3c6387..ba42a7a12dba344728550582c96ffa9c9ae64b84 100644 (file)
--- 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 cf94f63b922426e10a4a1834737fd7922a9c100d..f07462f0f35da9313a80e60c908b04bddc07f860 100644 (file)
--- 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 61143f4bac1b2ed8751df51adc630c0569a2a640..f08de93fce142c16953653b53c0a30e1ca04ceac 100644 (file)
--- 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 601a430ce4abab3fff9efa6e7694781355aa94d6..9bf18307d49d9bd4c76e9e93f0c06ddb35a7fc60 100644 (file)
--- 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 e58e0cde49d6efd6a7b165994ced4ccfd78e20ad..5722b55b5c6aa40757cad3fe50074401afe95a5b 100644 (file)
--- 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 bb301cadd59b3d827426f45d4fb7d6fdb4bbee60..ee9b546cd6cfe909506a6ac9a30cdc44e716b2de 100644 (file)
--- 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"