Move #includes out of header files.

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

src/BufferView.C

@@ -25,6 +25,7 @@
 #include "debug.h"
 #include "gettext.h"
 #include "errorlist.h"
+#include "funcrequest.h"
 #include "iterators.h"
 #include "language.h"
 #include "lyxcursor.h"

src/ChangeLog

@@ -1,3 +1,15 @@
+2003-09-04  Angus Leeming  <leeming@lyx.org>
+
+	* FloatList.h: move out #include "Floating.h".
+	* LaTeX.h: move out #include "DepTable.h".
+	* LyXAction.h: move out #include "funcrequest.h".
+	* buffer.h: move out #include "author.h", "iterators.h".
+	* bufferparams.h: move out #include "LaTeXFeatures.h", "texrow.h".
+	* lyx_main.h: move out #include "errorlist.h".
+	* lyxfunc.h: move out #include "FuncStatus.h".
+	* lyxtext: move out #include "lyxcursor.h".
+	* paragraph_pimpl.h: move out #include "counters.h".
+	 
 2003-09-03  Angus Leeming  <leeming@lyx.org>
 
 	* LaTeXFeatures.[Ch]: replace the externalPreambles string with a

src/FloatList.C

@@ -11,6 +11,7 @@
 #include <config.h>
 
 #include "FloatList.h"
+#include "Floating.h"
 #include "gettext.h"
 
 // This class is now mostly finished, except one thing, it is a global

src/FloatList.h

@@ -15,7 +15,8 @@
 #include <map>
 
 #include "LString.h"
-#include "Floating.h"
+
+class Floating;
 
 ///
 class FloatList {

src/LaTeX.C

@@ -18,6 +18,7 @@
 #include "bufferlist.h"
 #include "gettext.h"
 #include "debug.h"
+#include "DepTable.h"
 #include "support/filetools.h"
 #include "support/FileInfo.h"
 #include "support/tostr.h"

src/LaTeX.h

@@ -16,13 +16,14 @@
 
 #include "latexrunparams.h"
 #include "LString.h"
-#include "DepTable.h"
 #include <vector>
 #include <set>
 
 #include <boost/utility.hpp>
 #include <boost/signals/signal1.hpp>
 
+class DepTable;
+
 ///
 class TeXErrors {
 private:

src/LaTeXFeatures.C

@@ -19,6 +19,7 @@
 #include "lyx_sty.h"
 #include "lyxrc.h"
 #include "bufferparams.h"
+#include "Floating.h"
 #include "FloatList.h"
 #include "language.h"
 #include "encoding.h"

src/LyXAction.C

@@ -16,6 +16,7 @@
 #include "LyXAction.h"
 
 #include "debug.h"
+#include "funcrequest.h"
 #include "gettext.h"
 #include "support/lstrings.h"
 

src/LyXAction.h

@@ -13,10 +13,14 @@
 #ifndef LYXACTION_H
 #define LYXACTION_H
 
+#include "lfuns.h"
+
+#include "LString.h"
+#include <boost/utility.hpp>
 #include <map>
 
-#include "funcrequest.h"
-#include <boost/utility.hpp>
+
+class FuncRequest;
 
 /**
  * This class is a container for LyX actions. It also

src/MenuBackend.C

@@ -29,6 +29,7 @@
 #include "format.h"
 #include "exporter.h"
 #include "importer.h"
+#include "Floating.h"
 #include "FloatList.h"
 #include "toc.h"
 #include "CutAndPaste.h"

src/ToolbarBackend.C

@@ -12,6 +12,7 @@
 #include <config.h>
 
 #include "ToolbarBackend.h"
+#include "funcrequest.h"
 #include "LyXAction.h"
 #include "lyxlex.h"
 #include "debug.h"

src/buffer.h

@@ -20,22 +20,21 @@
 #include "bufferparams.h"
 #include "texrow.h"
 #include "ParagraphList.h"
-#include "author.h"
-#include "iterators.h"
 #include "errorlist.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/signal0.hpp>
 #include <boost/signals/signal1.hpp>
 
+class AuthorList;
 class LyXRC;
-class TeXErrors;
 class LaTeXFeatures;
 class LatexRunParams;
 class Language;
+class Messages;
 class ParIterator;
 class ParConstIterator;
-class Messages;
+class TeXErrors;
 
 
 /** The buffer object.

src/bufferparams.C

@@ -15,29 +15,30 @@
 
 #include <config.h>
 
-#include "bufferparams.h"
-#include "tex-strings.h"
-#include "encoding.h"
-#include "layout.h"
-#include "vspace.h"
-#include "debug.h"
-#include "lyxrc.h"
-#include "language.h"
-#include "lyxtextclasslist.h"
-#include "lyxlex.h"
-#include "Lsstream.h"
 #include "author.h"
+#include "bufferparams.h"
+#include "debug.h"
+#include "encoding.h"
 #include "gettext.h"
-
+#include "layout.h"
+#include "language.h"
+#include "LaTeXFeatures.h"
 #include "LColor.h"
+#include "Lsstream.h"
+#include "lyxrc.h"
+#include "lyxlex.h"
+#include "lyxtextclasslist.h"
+#include "tex-strings.h"
+#include "texrow.h"
+#include "vspace.h"
+
+#include "frontends/Alert.h"
 
 #include "support/lyxalgo.h" // for lyx::count
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
 #include "support/types.h"
 
-#include "frontends/Alert.h"
-
 #include <cstdlib>
 #include <algorithm>
 

src/bufferparams.h

@@ -20,8 +20,6 @@
 #include "Spacing.h"
 #include "Bullet.h"
 #include "lyxtextclass.h"
-#include "LaTeXFeatures.h"
-#include "texrow.h"
 #include "author.h"
 #include "paper.h"
 #include "BranchList.h"

src/frontends/Alert_pimpl.h

@@ -9,8 +9,6 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#include "debug.h"
-
 // GUI-specific implementations
 
 int prompt_pimpl(string const & title, string const & question,

src/frontends/ChangeLog

@@ -1,3 +1,10 @@
+2003-09-04  Angus Leeming  <angus@localhost.localdomain>
+
+	* Alert_pimpl.h: move out #include "debug.h".
+	* LyXView.h: move out #include "types.h".
+	* WorkArea.h: move out #include "funcrequest.h".
+	* screen.h: move out #include "RowList.h".
+
 2003-09-02  John Levon  <levon@movementarian.org>
 
 	* screen.C: remove cursor.i[xy]()

src/frontends/LyXView.h

@@ -16,8 +16,6 @@
 
 #include "LString.h"
 
-#include "support/types.h"
-
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>

src/frontends/WorkArea.h

@@ -15,7 +15,6 @@
 
 #include "frontends/key_state.h"
 #include "frontends/LyXKeySym.h"
-#include "funcrequest.h"
 
 #include <boost/signals/signal0.hpp>
 #include <boost/signals/signal1.hpp>
@@ -25,6 +24,7 @@
 #include <utility>
 
 class Painter;
+class FuncRequest;
 
 /**
  * The work area class represents the widget that provides the

src/frontends/controllers/ControlDocument.C

@@ -20,6 +20,7 @@
 #include "buffer.h"
 #include "buffer_funcs.h"
 #include "errorlist.h"
+#include "iterators.h"
 #include "language.h"
 #include "lyx_main.h"
 #include "lyxtextclass.h"

src/frontends/controllers/ControlErrorList.C

@@ -11,12 +11,13 @@
 #include <config.h>
 
 #include "ControlErrorList.h"
-#include "support/lstrings.h" // tostr
-#include "errorlist.h"
 #include "buffer.h"
 #include "BufferView.h"
-#include "lyxtext.h"
 #include "debug.h"
+#include "errorlist.h"
+#include "iterators.h"
+#include "lyxtext.h"
+#include "support/lstrings.h" // tostr
 
 
 using std::endl;

src/frontends/qt2/QLToolbar.C

@@ -16,6 +16,7 @@
 #include "debug.h"
 #include "gettext.h"
 #include "lyxfunc.h"
+#include "funcrequest.h"
 #include "FuncStatus.h"
 #include "BufferView.h"
 #include "buffer.h"

src/frontends/qt2/QWorkArea.C

@@ -16,6 +16,7 @@
 #include "lfuns.h"
 #include "qt_helpers.h"
 #include "lcolorcache.h"
+#include "funcrequest.h"
 
 #include <qapplication.h>
 #include <qevent.h>

src/frontends/screen.h

@@ -13,8 +13,6 @@
 #ifndef SCREEN_H
 #define SCREEN_H
 
-#include "RowList.h"
-
 class LyXText;
 class LyXCursor;
 class WorkArea;

src/frontends/xforms/Alert_pimpl.C

@@ -10,13 +10,14 @@
 
 #include <config.h>
 
-
 #include "Alert.h"
 #include "Alert_pimpl.h"
 #include "forms_gettext.h"
 #include "gettext.h"
 #include "xforms_helpers.h"
 
+#include "debug.h"
+
 #include <algorithm>
 #include <boost/tuple/tuple.hpp>
 #include "lyx_forms.h"

src/frontends/xforms/ChangeLog

@@ -1,3 +1,7 @@
+2003-09-04  Angus Leeming  <angus@localhost.localdomain>
+
+	* Alert_pimpl.C:  move #include "debug.h" out of the header file.
+
 2003-08-17  Martin Vermeer  <martin.vermeer@hut.fi>	
 
 	* FormDocument.C: fix crash on doc settings for non-branched doc

src/insets/ChangeLog

@@ -1,5 +1,7 @@
 2003-09-04  Angus Leeming  <leeming@lyx.org>
 
+	* insetgraphics.C: #include "support/os.h"
+
 	* insetfoot.h: move #include "LaTeXFeatures.h" out of the header file.
 	* insettabular.h: move #include "FuncStatus.h" out of the header file.
 	* insettoc.[Ch]: move #include "metricsinfo.h" out of the header file.

src/insets/insetcaption.C

@@ -15,6 +15,7 @@
 #include "frontends/font_metrics.h"
 #include "BufferView.h"
 #include "buffer.h"
+#include "Floating.h"
 #include "FloatList.h"
 #include "insets/insetfloat.h"
 #include "insets/insetwrap.h"

src/insets/insetenv.C

@@ -11,14 +11,14 @@
 #include <config.h>
 
 #include "insetenv.h"
+#include "bufferparams.h"
+#include "debug.h"
 #include "gettext.h"
+#include "lyxlayout.h"
 #include "lyxtextclass.h"
 #include "paragraph_funcs.h"
-#include "lyxlayout.h"
-#include "bufferparams.h"
+#include "texrow.h"
 #include "support/LOstream.h"
-#include "debug.h"
-
 
 using std::ostream;
 using std::endl;

src/insets/insetfloatlist.C

@@ -11,16 +11,18 @@
 #include <config.h>
 
 #include "insetfloatlist.h"
+
+#include "buffer.h"
+#include "BufferView.h"
+#include "debug.h"
+#include "Floating.h"
 #include "FloatList.h"
-#include "metricsinfo.h"
+#include "funcrequest.h"
+#include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "lyxlex.h"
-#include "BufferView.h"
-#include "funcrequest.h"
-#include "buffer.h"
+#include "metricsinfo.h"
 #include "toc.h"
-#include "gettext.h"
-#include "debug.h"
 #include "Lsstream.h"
 
 #include "support/lstrings.h"

src/insets/insetgraphics.C

@@ -78,8 +78,9 @@ TODO
 #include "support/filetools.h"
 #include "support/lyxalgo.h" // lyx::count
 #include "support/lyxlib.h" // float_equal
-#include "support/tostr.h"
+#include "support/os.h"
 #include "support/systemcall.h"
+#include "support/tostr.h"
 
 #include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>

src/insets/insetnote.C

@@ -21,6 +21,7 @@
 #include "funcrequest.h"
 #include "gettext.h"
 #include "language.h"
+#include "LaTeXFeatures.h"
 #include "lyxfont.h"
 #include "lyxlex.h"
 #include "lyxtext.h"

src/insets/insettabular.C

@@ -19,6 +19,7 @@
 #include "debug.h"
 #include "dimension.h"
 #include "funcrequest.h"
+#include "FuncStatus.h"
 #include "gettext.h"
 #include "language.h"
 #include "LaTeXFeatures.h"

src/insets/insetwrap.C

@@ -17,6 +17,7 @@
 #include "BufferView.h"
 #include "debug.h"
 #include "funcrequest.h"
+#include "Floating.h"
 #include "FloatList.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"

src/lyx_cb.C

@@ -42,6 +42,7 @@
 #include "support/lyxlib.h"
 #include "support/path.h"
 #include "support/path_defines.h"
+#include "support/os.h"
 #include "support/systemcall.h"
 
 #include <fstream>

src/lyx_main.C

@@ -17,35 +17,36 @@
 
 #include "lyx_main.h"
 
-#include "support/filetools.h"
-#include "support/lyxlib.h"
-#include "support/FileInfo.h"
-#include "support/path.h"
-#include "support/path_defines.h"
-#include "debug.h"
-#include "gettext.h"
-#include "lyxlex.h"
-
-#include "graphics/GraphicsTypes.h"
-
-#include "bufferlist.h"
 #include "buffer.h"
 #include "buffer_funcs.h"
-#include "lyxserver.h"
+#include "bufferlist.h"
+#include "converter.h"
+#include "debug.h"
+#include "encoding.h"
+#include "format.h"
+#include "gettext.h"
 #include "kbmap.h"
-#include "lyxfunc.h"
-#include "ToolbarBackend.h"
-#include "MenuBackend.h"
 #include "language.h"
 #include "lastfiles.h"
-#include "encoding.h"
-#include "converter.h"
-#include "format.h"
+#include "lyxfunc.h"
+#include "lyxlex.h"
 #include "lyxtextclasslist.h"
+#include "lyxserver.h"
+#include "MenuBackend.h"
+#include "ToolbarBackend.h"
 
 #include "frontends/Alert.h"
 #include "frontends/lyx_gui.h"
 
+#include "graphics/GraphicsTypes.h"
+
+#include "support/FileInfo.h"
+#include "support/filetools.h"
+#include "support/lyxlib.h"
+#include "support/os.h"
+#include "support/path.h"
+#include "support/path_defines.h"
+
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 #include <boost/signals/signal1.hpp>

src/lyx_main.h

@@ -15,7 +15,6 @@
 #define LYX_MAIN_H
 
 #include "LString.h"
-#include "errorlist.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/utility.hpp>
@@ -23,6 +22,7 @@
 #include <csignal>
 
 
+class ErrorItem;
 class LyXRC;
 class LastFiles;
 class Buffer;

src/lyxfunc.C

@@ -26,6 +26,8 @@
 #include "buffer.h"
 #include "buffer_funcs.h"
 #include "BufferView.h"
+#include "funcrequest.h"
+#include "iterators.h"
 #include "lyxserver.h"
 #include "intl.h"
 #include "lyx_main.h"

src/lyxfunc.h

@@ -15,13 +15,13 @@
 #ifndef LYXFUNC_H
 #define LYXFUNC_H
 
-#include "FuncStatus.h"
 #include "kbsequence.h"
 #include "lfuns.h"
 #include "LString.h"
 
 #include <boost/signals/trackable.hpp>
 
+class FuncStatus;
 class LyXView;
 class LyXText;
 class FuncRequest;

src/lyxrc.h

@@ -18,7 +18,7 @@
 #ifndef LYXRC_H
 #define LYXRC_H
 
-#include "paper.h" 
+#include "paper.h"
 #include "graphics/GraphicsTypes.h"
 
 // #include <boost/utility.hpp>

src/lyxtext.h

@@ -15,7 +15,6 @@
 #define LYXTEXT_H
 
 #include "lyxfont.h"
-#include "lyxcursor.h"
 #include "layout.h"
 #include "LColor.h"
 #include "insets/inset.h"
@@ -27,6 +26,7 @@ class Buffer;
 class BufferParams;
 class BufferView;
 class InsetText;
+class LyXCursor;
 class Paragraph;
 class Row;
 class Spacing;

src/lyxtextclass.C

@@ -18,6 +18,7 @@
 #include "debug.h"
 #include "lyxlex.h"
 #include "counters.h"
+#include "Floating.h"
 #include "FloatList.h"
 
 #include "support/lstrings.h"

src/paragraph_funcs.C

@@ -17,6 +17,7 @@
 #include "lyxtextclasslist.h"
 #include "debug.h"
 #include "gettext.h"
+#include "iterators.h"
 #include "language.h"
 #include "encoding.h"
 #include "lyxrc.h"

src/paragraph_pimpl.h

@@ -18,7 +18,6 @@
 #include "paragraph.h"
 #include "ParagraphParameters.h"
 #include "changes.h"
-#include "counters.h"
 
 #include <boost/scoped_ptr.hpp>
 

src/support/ChangeLog

@@ -1,3 +1,8 @@
+2003-09-04  Angus Leeming  <leeming@lyx.org>
+
+	* filetools.h:
+	* filename.C:  move #include "os.h" out of the header file.
+
 2003-09-04  Angus Leeming  <leeming@lyx.org>
 
 	* path.C (ctor, dtor): move out of line.

src/support/LAssert.C

@@ -15,6 +15,7 @@
 
 #ifdef ENABLE_ASSERTIONS
 #include "lyx_main.h"
+#include "errorlist.h"
 
 namespace lyx {
 namespace support {

src/support/filename.C

@@ -12,9 +12,11 @@
 #include <config.h>
 
 #include "filename.h"
-#include "support/filetools.h"
-#include "lstrings.h"
+
 #include "LAssert.h"
+#include "filetools.h"
+#include "lstrings.h"
+#include "os.h"
 
 
 namespace lyx {

src/support/filetools.h

@@ -15,7 +15,6 @@
 #include <vector>
 #include <utility>
 #include "LString.h"
-#include "os.h"
 
 
 namespace lyx {

src/text.C

@@ -25,6 +25,7 @@
 #include "intl.h"
 #include "lyxrc.h"
 #include "encoding.h"
+#include "funcrequest.h"
 #include "frontends/LyXView.h"
 #include "frontends/Painter.h"
 #include "frontends/font_metrics.h"

src/text2.C

@@ -37,6 +37,7 @@
 #include "frontends/font_metrics.h"
 #include "debug.h"
 #include "lyxrc.h"
+#include "Floating.h"
 #include "FloatList.h"
 #include "language.h"
 #include "ParagraphParameters.h"

src/toc.C

@@ -13,6 +13,7 @@
 
 #include "toc.h"
 #include "buffer.h"
+#include "funcrequest.h"
 #include "LyXAction.h"
 #include "paragraph.h"
 #include "debug.h"