Reduced header file includes somewhat

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

diff --git a/sourcedoc/Doxyfile.in b/sourcedoc/Doxyfile.in
index fa8789232560783fad257e09c4e49fe66e3be746..119f4fe2a3f9ccca4fafdbcbaa5d85b2c9bbcec0 100644 (file)
--- a/sourcedoc/Doxyfile.in
+++ b/sourcedoc/Doxyfile.in
@@ -45,7 +45,7 @@ OUTPUT_LANGUAGE        = English
 # Private class members and static file members will be hidden unless 
 # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES 
 
-EXTRACT_ALL            = NO
+EXTRACT_ALL            = YES
 
 # If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
 # will be included in the documentation. 
@@ -121,12 +121,12 @@ CLASS_DIAGRAMS         = YES
 # If the SOURCE_BROWSER tag is set to YES then a list of source files will 
 # be generated. Documented entities will be cross-referenced with these sources. 
 
-SOURCE_BROWSER         = NO
+SOURCE_BROWSER         = YES
 
 # Setting the INLINE_SOURCES tag to YES will include the body 
 # of functions and classes directly in the documentation. 
 
-INLINE_SOURCES         = NO
+INLINE_SOURCES         = YES
 
 # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
 # doxygen to hide any special comment blocks from generated source code 
@@ -307,7 +307,7 @@ INPUT_FILTER           =
 # of all compounds will be generated. Enable this if the project 
 # contains a lot of classes, structs, unions or interfaces. 
 
-ALPHABETICAL_INDEX     = NO
+ALPHABETICAL_INDEX     = YES
 
 # If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
 # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
@@ -591,7 +591,7 @@ PERL_PATH              = /usr/bin/perl
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section 
 # have no effect if this option is set to NO (the default) 
 
-HAVE_DOT               = NO
+HAVE_DOT               = YES
 
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and 
@@ -636,7 +636,7 @@ DOT_PATH               =
 # the specified constraint. Beware that most browsers cannot cope with very 
 # large images. 
 
-MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_WIDTH    = 1280
 
 # The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
 # (in pixels) of the graphs generated by dot. If a graph becomes larger than 
@@ -644,7 +644,7 @@ MAX_DOT_GRAPH_WIDTH    = 1024
 # the specified constraint. Beware that most browsers cannot cope with very 
 # large images. 
 
-MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_HEIGHT   = 2000
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to the search engine   

diff --git a/src/BufferView2.C b/src/BufferView2.C
index 6af288a3ab11ee1cdadb3942c325425156011991..6509b0684507cb6a489c257086e7d034da9786e6 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -31,6 +31,7 @@
 #include "language.h"
 #include "gettext.h"
 #include "undo_funcs.h"
+#include "debug.h"
 
 extern BufferList bufferlist;
 

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 814579da78c9f0dabf6f0ea169d207ebbad4de74..79205be07dd1714871d839dc9e51509d8a4729eb 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -17,6 +17,7 @@
 #include "LyXView.h"
 #include "commandtags.h"
 #include "lyxfunc.h"
+#include "debug.h"
 #include "font.h"
 #include "bufferview_funcs.h"
 #include "TextCache.h"
@@ -25,6 +26,7 @@
 #include "lyxrc.h"
 #include "intl.h"
 #include "support/LAssert.h"
+#include "support/lstrings.h"
 #include "frontends/Dialogs.h"
 #include "insets/insetbib.h"
 #include "insets/insettext.h"

diff --git a/src/Bullet.C b/src/Bullet.C
index b24403532109c30a443ea85d037d962d653dfbab..9e4c5389c0189f4d606a6796e8566f82baae23f7 100644 (file)
--- a/src/Bullet.C
+++ b/src/Bullet.C
@@ -19,6 +19,7 @@
 #endif
 
 #include "Bullet.h"
+#include "support/LAssert.h"
 
 /** The four LaTeX itemize environment default bullets
  */
@@ -52,6 +53,104 @@ Bullet::Bullet(int f, int c, int s)
 }
 
 
+
+Bullet::Bullet(string const & t) 
+       :  font(MIN), character(MIN), size(MIN), user_text(1), text(t)
+{
+#ifdef ENABLE_ASSERTIONS
+       testInvariant();
+#endif
+}
+
+
+void Bullet::setCharacter(int c)
+{
+       if (c < MIN || c >= CHARMAX) {
+               character = MIN;
+       } else {
+               character = c;
+       }
+       user_text = 0;
+#ifdef ENABLE_ASSERTIONS
+       testInvariant();
+#endif
+}
+
+
+void Bullet::setFont(int f)
+{
+       if (f < MIN || f >= FONTMAX) {
+               font = MIN;
+       } else {
+               font = f;
+       }
+       user_text = 0;
+#ifdef ENABLE_ASSERTIONS
+       testInvariant();
+#endif
+}
+
+
+void Bullet::setSize(int s)
+{
+       if (s < MIN || s >= SIZEMAX) {
+               size = MIN;
+       } else {
+               size = s;
+       }
+       user_text = 0;
+#ifdef ENABLE_ASSERTIONS
+       testInvariant();
+#endif
+}
+
+
+void Bullet::setText(string const & t)
+{
+       font = character = size = MIN;
+       user_text = 1;
+       text = t;
+#ifdef ENABLE_ASSERTIONS
+       testInvariant();
+#endif
+}
+
+
+int Bullet::getCharacter() const
+{
+       return character;
+}
+
+
+int Bullet::getFont() const
+{
+       return font;
+}
+
+
+int Bullet::getSize() const
+{
+       return size;
+}
+
+
+Bullet & Bullet::operator=(Bullet const & b)
+{
+#ifdef ENABLE_ASSERTIONS
+       b.testInvariant();
+#endif
+       font = b.font;
+       character = b.character;
+       size = b.size;
+       user_text = b.user_text;
+       text = b.text;
+#ifdef ENABLE_ASSERTIONS
+       this->testInvariant();
+#endif
+       return *this;
+}
+
+
 string const & Bullet::getText() const
 {
        if (user_text == 0) {
@@ -267,3 +366,28 @@ string const Bullet::bulletEntry(short int f, short int c)
 
        return BulletPanels[f][c];
 }
+
+#ifdef ENABLE_ASSERTIONS
+void Bullet::testInvariant() const {
+       lyx::Assert(font >= MIN);
+       lyx::Assert(font < FONTMAX);
+       lyx::Assert(character >= MIN);
+       lyx::Assert(character < CHARMAX);
+       lyx::Assert(size >= MIN);
+       lyx::Assert(size < SIZEMAX);
+       lyx::Assert(user_text >= -1);
+       lyx::Assert(user_text <= 1);
+       // now some relational/operational tests
+       if (user_text == 1) {
+               lyx::Assert(font == -1 && (character == -1 && size == -1));
+               //        Assert(!text.empty()); // this isn't necessarily an error
+       }
+       //      else if (user_text == -1) {
+       //        Assert(!text.empty()); // this also isn't necessarily an error
+       //      }
+       //      else {
+       //        // user_text == 0
+       //        Assert(text.empty()); // not usually true
+       //      }
+}
+#endif

diff --git a/src/Bullet.h b/src/Bullet.h
index 455809973ef57fafc97d440ea60c00ee7a8d6dc3..547d7d1989fa5d26147f8537cfb83431d85fe3bc 100644 (file)
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -21,8 +21,6 @@
 
 #include "LString.h"
 
-#include "support/LAssert.h"
-
 ///
 class Bullet {
 public:
@@ -55,28 +53,7 @@ public:
 protected:
 #ifdef ENABLE_ASSERTIONS
        ///
-       void testInvariant() const {
-               lyx::Assert(font >= MIN);
-               lyx::Assert(font < FONTMAX);
-               lyx::Assert(character >= MIN);
-               lyx::Assert(character < CHARMAX);
-               lyx::Assert(size >= MIN);
-               lyx::Assert(size < SIZEMAX);
-               lyx::Assert(user_text >= -1);
-               lyx::Assert(user_text <= 1);
-               // now some relational/operational tests
-               if (user_text == 1) {
-                       lyx::Assert(font == -1 && (character == -1 && size == -1));
-                       //        Assert(!text.empty()); // this isn't necessarily an error
-               }
-               //      else if (user_text == -1) {
-               //        Assert(!text.empty()); // this also isn't necessarily an error
-               //      }
-               //      else {
-               //        // user_text == 0
-               //        Assert(text.empty()); // not usually true
-               //      }
-       }
+       void testInvariant() const;
 #endif
 private:
        /**
@@ -132,115 +109,6 @@ private:
 };
 
 
-/*----------------Inline Bullet Member Functions------------------*/
-
-inline
-Bullet::Bullet(string const & t) 
-       :  font(MIN), character(MIN), size(MIN), user_text(1), text(t)
-{
-#ifdef ENABLE_ASSERTIONS
-       testInvariant();
-#endif
-}
-
-
-inline
-void Bullet::setCharacter(int c)
-{
-       if (c < MIN || c >= CHARMAX) {
-               character = MIN;
-       } else {
-               character = c;
-       }
-       user_text = 0;
-#ifdef ENABLE_ASSERTIONS
-       testInvariant();
-#endif
-}
-
-
-inline
-void Bullet::setFont(int f)
-{
-       if (f < MIN || f >= FONTMAX) {
-               font = MIN;
-       } else {
-               font = f;
-       }
-       user_text = 0;
-#ifdef ENABLE_ASSERTIONS
-       testInvariant();
-#endif
-}
-
-
-inline
-void Bullet::setSize(int s)
-{
-       if (s < MIN || s >= SIZEMAX) {
-               size = MIN;
-       } else {
-               size = s;
-       }
-       user_text = 0;
-#ifdef ENABLE_ASSERTIONS
-       testInvariant();
-#endif
-}
-
-
-inline
-void Bullet::setText(string const & t)
-{
-       font = character = size = MIN;
-       user_text = 1;
-       text = t;
-#ifdef ENABLE_ASSERTIONS
-       testInvariant();
-#endif
-}
-
-
-inline
-int Bullet::getCharacter() const
-{
-       return character;
-}
-
-
-inline
-int Bullet::getFont() const
-{
-       return font;
-}
-
-
-inline
-int Bullet::getSize() const
-{
-       return size;
-}
-
-
-inline
-Bullet & Bullet::operator=(Bullet const & b)
-{
-#ifdef ENABLE_ASSERTIONS
-       b.testInvariant();
-#endif
-       font = b.font;
-       character = b.character;
-       size = b.size;
-       user_text = b.user_text;
-       text = b.text;
-#ifdef ENABLE_ASSERTIONS
-       this->testInvariant();
-#endif
-       return *this;
-}
-
-/*-----------------End Bullet Member Functions-----------------*/
-
 inline
 bool operator!=(Bullet const & b1, Bullet const & b2)
 {

diff --git a/src/ChangeLog b/src/ChangeLog
index 7a3cf1e25a5bdfc4c5b0ab5eab74751779373618..6eebafc324fd1da76b44a72cb18d9e8f791d83b9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-29  Asger Alstrup Nielsen  <alstrup@alstrup>
+
+       * *: Reduced header file dependencies all over.
+
 2001-07-30  Baruch Even  <baruch@lyx.org>
 
        * buffer.C (readInset): Stop auto-converting InsetFig to InsetGraphics.

diff --git a/src/DepTable.C b/src/DepTable.C
index 906b1f236e7b899e8babac985d419607dcbd982b..7426d1eb4df1bc93409d3f98f7ac50cc1437d99c 100644 (file)
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -21,6 +21,7 @@
 #include "support/lyxlib.h"
 #include "support/filetools.h"
 #include <fstream>
+#include "debug.h"
 
 using std::make_pair;
 using std::ofstream;

diff --git a/src/FontInfo.C b/src/FontInfo.C
index 43aa03c5770277ea01e79389ef3b466c3b99ed97..b27ed692468b3795260c5cbef25506845526dcfe 100644 (file)
--- a/src/FontInfo.C
+++ b/src/FontInfo.C
@@ -19,6 +19,7 @@
 #include "debug.h"
 #include "lyxrc.h"     // lyxrc.use_scalable_fonts
 #include "support/lstrings.h"
+#include "support/lyxlib.h"
 #include "frontends/GUIRunTime.h"
 
 using std::endl;

diff --git a/src/LColor.h b/src/LColor.h
index 1799d3f4c983f178fbd3db2e6da0e9b3e6b198ed..a0fbe0d42f7ea797cdda3fc3fca0b0dc080ab640 100644 (file)
--- a/src/LColor.h
+++ b/src/LColor.h
@@ -18,7 +18,6 @@
 #include <map>
 
 #include "LString.h"
-#include <boost/utility.hpp>
 
 /**
   This is a stateless class. 

diff --git a/src/LyXSendto.C b/src/LyXSendto.C
index e548bd26f6bd8b6f7060facaca33238dd94c74ec..f0d71077eb33479f3d1a56305332d11fce4f9e52 100644 (file)
--- a/src/LyXSendto.C
+++ b/src/LyXSendto.C
@@ -10,6 +10,7 @@
 #include "buffer.h"
 #include "lyx_gui_misc.h"
 #include "support/syscall.h"
+#include "support/lstrings.h"
 #include "gettext.h"
 #include "bufferview_funcs.h"
 #include "exporter.h"

diff --git a/src/LyXView.h b/src/LyXView.h
index 71cb18000744cae06c87ad0489b2726f161e0a23..40f44074adf6c4c887103e758d00634bb7dbffb4 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -12,7 +12,7 @@
 
 #include "LString.h"
 #include "frontends/Timeout.h"
-#include "layout.h"
+#include "layout.h" // Just for LyXTextClass::size_type (sic)
 
 class Buffer;
 class Toolbar;

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 98f15391751897a431146c7f011da9dcbf444bf2..068f15f9f037cf0b05f58b6c40d16606148c8144 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -15,6 +15,7 @@
 #pragma implementation
 #endif
 
+#include <algorithm>
 #include "MenuBackend.h"
 #include "lyxlex.h"
 #include "LyXAction.h"

diff --git a/src/TextCache.C b/src/TextCache.C
index d7bb5c54a22808addfe38bf4e17c212f62b0e8f3..6b3d9b4b832cecf651d6584cb91b968693ed618f 100644 (file)
--- a/src/TextCache.C
+++ b/src/TextCache.C
@@ -21,6 +21,7 @@
 #include "TextCache.h"
 #include "buffer.h"
 #include "bufferlist.h"
+#include "debug.h"
 
 using std::ostream;
 using std::for_each;

diff --git a/src/bufferlist.C b/src/bufferlist.C
index 57f704e1cdc41c01323727a5dc0ae547dd09c9c6..7cefba0ba02ef14bd9a359df346f771c419de06e 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -28,6 +28,7 @@
 #include "support/filetools.h"
 #include "support/lyxmanip.h"
 #include "support/lyxfunctional.h"
+#include "support/LAssert.h"
 #include "lyx_gui_misc.h"
 #include "lastfiles.h"
 #include "debug.h"

diff --git a/src/bufferlist.h b/src/bufferlist.h
index 198f46e552d4d15eb1be1a3131e5ab1d5ae61c68..8d1c31645ccc0b117bdb34efd78d7839be565775 100644 (file)
--- a/src/bufferlist.h
+++ b/src/bufferlist.h
@@ -18,8 +18,9 @@
 #pragma interface
 #endif
 
-#include "buffer.h"
-#include "debug.h"
+class Buffer;
+class UpdatableInset;
+#include <vector>
 #include <boost/utility.hpp>
 
 /** A class to hold all the buffers in a structure

diff --git a/src/commandtags.h b/src/commandtags.h
index b30196a406c0e2a2ff3cea55ff54411ae56b91b1..2088b5e5893f23ba9bb88f33174fb79864f168d3 100644 (file)
--- a/src/commandtags.h
+++ b/src/commandtags.h
@@ -12,11 +12,6 @@
 
 #include <iosfwd>
 
-#if 1
-// For NO_LATEX
-#include "lyxfont.h"
-#endif
-
 /** These are all the lyxfunctions (as enums).
     Please add new functions at the end of the enum, right
     before LFUN_LASTACTION.

diff --git a/src/converter.C b/src/converter.C
index aa3fbe8d6b06fff52655c32ac1a1638e456591d2..f8bd6f4ba209a76eb407887aa2fb01d0de87002a 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -30,6 +30,7 @@
 #include "support/lyxfunctional.h"
 #include "gettext.h"
 #include "BufferView.h"
+#include "debug.h"
 
 using std::vector;
 using std::queue;

diff --git a/src/frontends/controllers/ControlDialogs.h b/src/frontends/controllers/ControlDialogs.h
index d749676ac5fb852866b88308d0e0394dd048bc87..2335eb2db82df0e7db962be804139715cc07532f 100644 (file)
--- a/src/frontends/controllers/ControlDialogs.h
+++ b/src/frontends/controllers/ControlDialogs.h
@@ -49,7 +49,6 @@ protected:
 
 
 #include "LyXView.h"
-#include "BufferView.h"
 
 template <class Base>
 ControlDialog<Base>::ControlDialog(LyXView & lv, Dialogs & d)

diff --git a/src/frontends/controllers/ControlExternal.C b/src/frontends/controllers/ControlExternal.C
index e1c0b2b8bf38294603e359d5bf648aa77edcbdac..73e5433df1b66a6d4c16f7390908d221bfa1b249 100644 (file)
--- a/src/frontends/controllers/ControlExternal.C
+++ b/src/frontends/controllers/ControlExternal.C
@@ -30,6 +30,7 @@
 #include "Liason.h"
 #include "LyXView.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 #include "frontends/FileDialog.h"
 #include "lyx_gui_misc.h" // WriteAlert
 #include "gettext.h"

diff --git a/src/frontends/controllers/ControlPreamble.C b/src/frontends/controllers/ControlPreamble.C
index b0f313c970b7fa8c904c7070a8fdc50a113436e5..38b808f29e31da71f8fb856873c20ccab3c3165a 100644 (file)
--- a/src/frontends/controllers/ControlPreamble.C
+++ b/src/frontends/controllers/ControlPreamble.C
@@ -22,6 +22,7 @@
 #include "Liason.h"
 #include "gettext.h"
 #include "BufferView.h"
+#include "support/LAssert.h"
 
 ControlPreamble::ControlPreamble(LyXView & lv, Dialogs & d)
        : ControlDialog<ControlConnectBD>(lv, d),

diff --git a/src/frontends/controllers/ControlVCLog.C b/src/frontends/controllers/ControlVCLog.C
index ae24ffabcdef66b5433a68fcd2310212ce4ebcae..cc0ad7f7790f8d41d25672c7e76759a5edf4a912 100644 (file)
--- a/src/frontends/controllers/ControlVCLog.C
+++ b/src/frontends/controllers/ControlVCLog.C
@@ -28,6 +28,7 @@
 #include "LyXView.h"
 #include "Dialogs.h"
 #include "lyxrc.h"
+#include "support/lyxlib.h"
 
 using SigC::slot;
 using std::endl;

diff --git a/src/frontends/xforms/Dialogs.C b/src/frontends/xforms/Dialogs.C
index de101ef053d01346114915285c05294173678ed3..5f427f8ac39807c0411f8d512432bc799fc22f43 100644 (file)
--- a/src/frontends/xforms/Dialogs.C
+++ b/src/frontends/xforms/Dialogs.C
@@ -16,6 +16,7 @@
 #endif
 
 #include "Dialogs.h"
+#include "BufferView.h"
 
 #include "xformsBC.h"
 

diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index bc179e124c4e6f3764322d8e632874783726f52b..7e865f23a2c87492a2c3d6fbff7ecb1dbd8c94b8 100644 (file)
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -39,6 +39,7 @@
 #include "CutAndPaste.h"
 #include "bufferview_funcs.h"
 #include "xforms_helpers.h" 
+#include "debug.h"
 
 using Liason::setMinibuffer;
 using SigC::slot;

diff --git a/src/frontends/xforms/FormFiledialog.C b/src/frontends/xforms/FormFiledialog.C
index c43a2f049cfeb33bb070b9728947646c4a56fdf4..bcf77da0a0bc64ab07fb5b8bf201761e9afa4e24 100644 (file)
--- a/src/frontends/xforms/FormFiledialog.C
+++ b/src/frontends/xforms/FormFiledialog.C
@@ -24,6 +24,7 @@ using std::sort;
 #include "lyx_gui_misc.h" // for WriteFSAlert
 #include "support/FileInfo.h"
 #include "support/lyxlib.h"
+#include "support/lstrings.h"
 #include "gettext.h"
 #include "frontends/Dialogs.h"
 

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 0f2a087a5612a4966728cef78594fe75b62b62de..effd05d9256f2290b5b47256e56cff849bd17030 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -37,6 +37,7 @@
 #include "combox.h"
 #include "debug.h"
 #include "support/filetools.h"
+#include "support/LAssert.h"
 #include "lyx_gui_misc.h" // idex, scex
 #include "lyxlex.h"
 #include "input_validators.h"

diff --git a/src/graphics/ImageLoader.C b/src/graphics/ImageLoader.C
index 5a75a3f14fed44cea380300f76e3a28d37fac91f..ab7450dd83e9f0a290fe64c0ea9e25b6da0e7ec0 100644 (file)
--- a/src/graphics/ImageLoader.C
+++ b/src/graphics/ImageLoader.C
@@ -12,6 +12,7 @@
 #endif
 
 #include <config.h>
+#include "debug.h"
 #include "ImageLoader.h"
 #include "frontends/support/LyXImage.h"
 

diff --git a/src/insets/figinset.C b/src/insets/figinset.C
index ece18587a149bd3b775eadbbfc3d4e3e740401e3..56c9c8e1890459443b5dd78c9053136ce4458c70 100644 (file)
--- a/src/insets/figinset.C
+++ b/src/insets/figinset.C
@@ -43,6 +43,7 @@
 #include <cstdlib>
 #include <cctype>
 #include <cmath>
+#include <cerrno>
 
 #include "figinset.h"
 #include "lyx_main.h"

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 197c782f4c89e6e53a775306d0f434342123922c..6d6df151e7869c216111f905b8fc82046fe5d57a 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -25,6 +25,7 @@
 #include "debug.h"
 #include "lyxtext.h"
 #include "font.h"
+#include "lyxlex.h"
 
 class LyXText;
 

diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index 47a7afdce1e86548e6a82a33bb387aaac9bff84b..cfa91cfe3f13cd24dc95fc3d1ffd65a6235c0ea0 100644 (file)
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -30,6 +30,7 @@
 #include "support/path.h"
 #include "support/syscall.h"
 #include "gettext.h"
+#include "debug.h"
 
 using std::endl;
 

diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index b8afb1cd24e7dfe17abaa49b8af03904ded1af15..9ebb7cc0fefaeb4195088477378ac59605e4e20a 100644 (file)
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -25,6 +25,7 @@
 #include "support/lstrings.h"
 #include "debug.h"
 #include "gettext.h"
+#include "lyxlex.h"
 
 using std::ostream;
 using std::endl;

diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C
index fd4181bc6c0048be6af520602f974cd536aa37a1..7d322c1bc2ccc34c23baaf5b970ac15f00998efa 100644 (file)
--- a/src/insets/insetspecialchar.C
+++ b/src/insets/insetspecialchar.C
@@ -19,6 +19,7 @@
 #include "BufferView.h"
 #include "Painter.h"
 #include "font.h"
+#include "lyxlex.h"
 
 using std::ostream;
 using std::max;

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index f720e670bd1cc8475a465226b6ae85c12b500454..09fe240b8e4c025ad2688bde0a456db6ab7d1f03 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -40,6 +40,7 @@
 #include "language.h"
 #include "BufferView.h"
 #include "undo_funcs.h"
+#include "support/LAssert.h"
 
 using std::ostream;
 using std::ifstream;

diff --git a/src/layout.h b/src/layout.h
index 55c15a8fd57d67cb01b3c7e83d3c27122dc0934d..4b66dbbfcf02c97039c816a8cea0cfad751ba9c3 100644 (file)
--- a/src/layout.h
+++ b/src/layout.h
@@ -18,7 +18,7 @@
 #pragma interface
 #endif
 
-#include "lyxlex.h"
+class LyXLeX;
 #include "lyxfont.h"
 #include "Spacing.h"
 #include <boost/utility.hpp>

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index c8b5566d2a8b57dace66d87d5ea0578e5b02e0ec..ff2c876a594bb053a88b5ff412ec80d87c51615d 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -18,8 +18,10 @@
 #include "lyx_cb.h"
 #include "lyx_gui_misc.h"
 #include "lyx_main.h"
+#include "buffer.h"
 #include "bufferlist.h"
 #include "bufferview_funcs.h"
+#include "debug.h"
 #include "lastfiles.h"
 #include "LyXView.h"
 #include "lyxrc.h"

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 27526090cb329cd6d8311cfc2578666e9651513f..6afd11fb58e8497b445388e826320895b803d008 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -10,6 +10,7 @@
 
 #include <config.h>
 #include <cstdlib>
+#include <fcntl.h>
 
 #ifdef __GNUG__
 #pragma implementation
@@ -19,6 +20,7 @@
 #include FORMS_H_LOCATION
 #include "support/filetools.h"
 #include "support/os.h"
+#include "support/lyxlib.h"
 #include "figure_form.h"
 #include "print_form.h"
 #include "tex-strings.h"

diff --git a/src/lyx_gui_misc.C b/src/lyx_gui_misc.C
index 479c2c394eb031678382bfcbfb8e6472e9e9f7e3..54adb94fe21436aafba27dcabf7813c6c80958df 100644 (file)
--- a/src/lyx_gui_misc.C
+++ b/src/lyx_gui_misc.C
@@ -27,6 +27,7 @@
 #include "bufferview_funcs.h"
 #include "support/filetools.h"
 #include "lyxrc.h"
+#include "debug.h"
 
 using std::pair;
 using std::make_pair;

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 8b2b75bf7d747f8eb7f63d9b389cfd25d14a622b..ece5ba4fc88b48f0a6b8f77849a7f163bbae025f 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -26,6 +26,7 @@
 #include "lyxrc.h"
 #include "support/path.h"
 #include "support/filetools.h"
+#include "buffer.h"
 #include "bufferlist.h"
 #include "debug.h"
 #include "support/FileInfo.h"

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index bc964a50ca9572da5eb52a67a2a7e902ad4020ec..e348b45effdf37c59d6bf9ae41dfc4793e41e9bb 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -31,6 +31,7 @@
 #endif
 
 #include "support/lyxalgo.h"
+#include "support/LAssert.h"
 #include "version.h"
 #include "kbmap.h"
 #include "lyxfunc.h"

diff --git a/src/lyxlex.C b/src/lyxlex.C
index 3512d48449714753c8dde2fa0d42246cc24527a7..793b5c10d99ca9fe799af7b41da763c6d54f1736 100644 (file)
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -19,6 +19,7 @@
 
 #include "lyxlex.h"
 #include "lyxlex_pimpl.h"
+#include "debug.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 

diff --git a/src/lyxrc.h b/src/lyxrc.h
index d4f053a978b8dcbd2a922c09015846993f1b0d74..d477b2a33f9c4ab44f0280e948fc278f31c6acd8 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -16,8 +16,9 @@
 #pragma interface
 #endif
 
-#include "bufferparams.h"
-#include <boost/utility.hpp>
+#include "bufferparams.h" // Just to get the enum BufferParams::PAPER_SIZE (sic)
+
+// #include <boost/utility.hpp>
 
 /// This contains the runtime configuration of LyX
 class LyXRC //: public noncopyable {

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index 1751096c306cd2a63a2e458332a2bb3ed9d6a4da..3b261aa63e6b487a2c6810cf6bdbffb0d2d0407f 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -36,6 +36,7 @@
 #include "support/LOstream.h"
 #include "debug.h"
 #include "lyxlex.h"
+#include "lyxfont.h"
 
 using std::ostream;
 

diff --git a/src/minibuffer.C b/src/minibuffer.C
index a347acec8e23893e275cfded86bd2d4c6a34c7dc..68614d0910dcfe6ebda4474a073cc9e969f94561 100644 (file)
--- a/src/minibuffer.C
+++ b/src/minibuffer.C
@@ -22,6 +22,7 @@
 
 #include "support/lyxalgo.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 #include "LyXView.h"
 #include "XFormsView.h"
 #include "gettext.h"

diff --git a/src/paragraph.h b/src/paragraph.h
index 318fea8caeeee55d64c3543f73de25eff2057a31..102f685b7d0b0b12a18982b77ef215fc094a15b2 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -20,7 +20,7 @@
 
 #include <vector>
 
-#include "insets/inset.h"
+#include "insets/inset.h" // Just for Inset::Code
 #include "layout.h"
 
 class ParagraphParameters;
@@ -139,7 +139,7 @@ public:
                                      std::ostream &, TexRow & texrow);
        ///
        bool hasSameLayout(Paragraph const * par) const;
-       
+
        ///
        void makeSameLayout(Paragraph const * par);
 

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 182d1165d8d0ef30ff42ea336bdcc7fceae94236..ff4a2972f8e32bb3421b25729a49bb3b46c3a7d7 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -20,6 +20,7 @@
 #include "encoding.h"
 #include "lyxrc.h"
 #include "debug.h"
+#include "support/LAssert.h"
 
 extern int tex_code_break_column;
 

diff --git a/src/support/filetools.C b/src/support/filetools.C
index d4bccefe31201ede327f47f431f303c13a7f1427..69dab110f7ef18d3467981437866072a3b20d194 100644 (file)
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -27,6 +27,12 @@
 #pragma implementation "filetools.h"
 #endif
 
+#include <cstdlib>
+#include <fcntl.h>
+#include <cerrno>
+#include "debug.h"
+#include "support/lstrings.h"
+
 #include "filetools.h"
 #include "LSubstring.h"
 #include "lyx_gui_misc.h"

diff --git a/src/support/filetools.h b/src/support/filetools.h
index deef30d05c46cac6a5ee56114a2d60337cd08f7a..7242c108f80fee98b2fe8e138a7f6a059dee8d0c 100644 (file)
--- a/src/support/filetools.h
+++ b/src/support/filetools.h
@@ -11,15 +11,8 @@
 #pragma interface
 #endif
 
-#include <cstdlib>
-#include <fcntl.h>
-#include <cerrno>
-
 #include <vector>
-
-#include "debug.h"
 #include "LString.h"
-#include "support/lstrings.h"
 
 
 ///

diff --git a/src/support/os_unix.C b/src/support/os_unix.C
index fd02ab9934db1602a55e1827ed9706f0f6e6f340..19b8fa88aef0072d67924080205f01bd6b60e916 100644 (file)
--- a/src/support/os_unix.C
+++ b/src/support/os_unix.C
@@ -5,6 +5,7 @@
 
 #include "os.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 
 string os::binpath_ = string();
 string os::binname_ = string();

diff --git a/src/tabular.C b/src/tabular.C
index 2202e3367bf818c2ec9959cfb7b9440345ff9c4e..903cb7b377aff059d40234dae3a0f2bb7c521d71 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -30,6 +30,7 @@
 #include "LaTeXFeatures.h"
 #include "support/lstrings.h"
 #include "support/lyxmanip.h"
+#include "support/LAssert.h"
 #include "insets/insettabular.h"
 #include "insets/insettext.h"
 #include "gettext.h"

diff --git a/src/text.C b/src/text.C
index bda7eb5ce3d6665498090c0611a079b41d265569..06309f74ded3b7b67d353a55df0d3838d2e6f5e4 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -17,6 +17,7 @@
 #include "layout.h"
 #include "paragraph.h"
 #include "support/textutils.h"
+#include "support/LAssert.h"
 #include "insets/insetbib.h"
 #include "insets/insettext.h"
 #include "insets/insetspecialchar.h"

diff --git a/src/undo_funcs.C b/src/undo_funcs.C
index 70095c3424ed41036c8361af267963b7d74bdbea..64afb1ac196babfbd61a8eb4cb21d78bfc2e7d55 100644 (file)
--- a/src/undo_funcs.C
+++ b/src/undo_funcs.C
@@ -19,6 +19,7 @@
 #include "buffer.h"
 #include "insets/inset.h"
 #include "debug.h"
+#include "support/LAssert.h"
 
 /// the flag used by FinishUndo();
 bool undo_finished;