Remove a couple of #includes from buffer.h

Reorder #includes in lots of files into some semblence of a coherent order. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7695 a592a061-630c-0410-9148-cb99ea01b6c8
2024-11-05 13:26:21 +00:00 · 2003-09-06 18:38:02 +00:00 · 2003-09-06 18:38:02 +00:00 · 462eca7d1a
commit 462eca7d1a
parent f3bff9d5d8
23 changed files with 195 additions and 146 deletions
--- a/src/BufferView.C
+++ b/src/BufferView.C
@ -15,32 +15,31 @@
 #include <config.h>

 #include "BufferView.h"
-#include "BufferView_pimpl.h"
-
-#include "WordLangTuple.h"
 #include "buffer.h"
 #include "bufferlist.h"
-#include "gettext.h"
+#include "BufferView_pimpl.h"
 #include "funcrequest.h"
+#include "gettext.h"
 #include "iterators.h"
 #include "language.h"
 #include "lyxtext.h"
-#include "undo_funcs.h"
 #include "paragraph.h"
 #include "paragraph_funcs.h"
+#include "undo_funcs.h"
+#include "WordLangTuple.h"

 #include "frontends/Alert.h"
 #include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
-#include "frontends/WorkArea.h"
 #include "frontends/screen.h"
+#include "frontends/WorkArea.h"

 #include "insets/insetcommand.h" // ChangeRefs
 #include "insets/updatableinset.h"

 #include "support/filetools.h"
-#include "support/lyxalgo.h" // lyx_count
 #include "support/LAssert.h"
+#include "support/lyxalgo.h" // lyx_count


 extern BufferList bufferlist;
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@ -19,9 +19,9 @@
 #include <config.h>

 #include "BufferView_pimpl.h"
-#include "bufferlist.h"
 #include "buffer.h"
 #include "buffer_funcs.h"
+#include "bufferlist.h"
 #include "debug.h"
 #include "factory.h"
 #include "FloatList.h"
@ -54,18 +54,17 @@
 #include "frontends/WorkArea.h"
 #include "frontends/WorkAreaFactory.h"

-#include "mathed/formulabase.h"
-
 #include "graphics/Previews.h"

-#include "support/tostr.h"
+#include "mathed/formulabase.h"
+
 #include "support/filetools.h"
 #include "support/path_defines.h"
+#include "support/tostr.h"

 #include <boost/bind.hpp>


-
 using std::vector;
 using std::find_if;
 using std::find;
--- a/src/ChangeLog
+++ b/src/ChangeLog
@ -1,3 +1,26 @@
+2003-09-06  Angus Leeming  <leeming@lyx.org>
+
+	* buffer_funcs.C:
+	* buffer.h:
+	* bufferlist.C:
+	* BufferView.C:
+	* bufferview_funcs.C:
+	* BufferView_pimpl.C:
+	* CutAndPaste.C:
+	* lyx_cb.C:
+	* lyxfunc.C:
+	* paragraph.h:
+	* ParagraphParameters.C:
+	* tabular.C:
+	* text3.C:
+	* toc.C:
+	* undo_funcs.C:
+	* frontends/controllers/ControlDocument.C:
+	* insets/insetcaption.C: rearrange the #includes into some sort of
+	coherent order.
+
+	* buffer.h: remove #includes ErrorList.h, undo.h
+
 2003-09-06  Angus Leeming  <leeming@lyx.org>

 	* support/types.h: add a 'depth_type' typedef, used to store the
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@ -13,13 +13,16 @@
 #include <config.h>

 #include "CutAndPaste.h"
+
 #include "buffer.h"
-#include "ParagraphParameters.h"
+#include "errorlist.h"
+#include "gettext.h"
 #include "iterators.h"
 #include "lyxtextclasslist.h"
-#include "gettext.h"
 #include "paragraph.h"
 #include "paragraph_funcs.h"
+#include "ParagraphParameters.h"
+
 #include "insets/insetinclude.h"
 #include "insets/insettabular.h"

--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@ -15,20 +15,20 @@
 #include <config.h>

 #include "ParagraphParameters.h"
-#include "tex-strings.h"
-#include "lyxlex.h"

 #include "buffer.h"
 #include "BufferView.h"
-#include "support/std_sstream.h"
 #include "gettext.h"
+#include "lyxlex.h"
 #include "lyxtext.h"
 #include "paragraph.h"
+#include "tex-strings.h"

 #include "frontends/LyXView.h"

 #include "support/lstrings.h"

+#include "support/std_sstream.h"

 using namespace lyx::support;

--- a/src/buffer.C
+++ b/src/buffer.C
@ -11,28 +11,28 @@
 #include <config.h>

 #include "buffer.h"
+
 #include "buffer_funcs.h"
 #include "bufferlist.h"
-#include "LyXAction.h"
-#include "lyxrc.h"
-#include "lyxlex.h"
-#include "version.h"
-#include "LaTeX.h"
 #include "Chktex.h"
 #include "debug.h"
-#include "LaTeXFeatures.h"
-#include "gettext.h"
-#include "language.h"
+#include "errorlist.h"
 #include "exporter.h"
-#include "support/std_sstream.h"
 #include "format.h"
-#include "ParagraphParameters.h"
+#include "gettext.h"
 #include "iterators.h"
-#include "sgml.h"
-#include "paragraph_funcs.h"
+#include "language.h"
+#include "LaTeX.h"
+#include "LaTeXFeatures.h"
+#include "LyXAction.h"
+#include "lyxlex.h"
+#include "lyxrc.h"
 #include "messages.h"
-
-
+#include "paragraph_funcs.h"
+#include "ParagraphParameters.h"
+#include "sgml.h"
+#include "undo.h"
+#include "version.h"

 #include "insets/insetbibitem.h"
 #include "insets/insetbibtex.h"
@ -43,19 +43,21 @@

 #include "graphics/Previews.h"

-#include "support/LAssert.h"
-#include "support/textutils.h"
-#include "support/filetools.h"
-#include "support/path.h"
-#include "support/os.h"
-#include "support/tostr.h"
-#include "support/lyxlib.h"
 #include "support/FileInfo.h"
+#include "support/filetools.h"
 #include "support/gzstream.h"
+#include "support/LAssert.h"
+#include "support/lyxlib.h"
+#include "support/os.h"
+#include "support/path.h"
+#include "support/textutils.h"
+#include "support/tostr.h"

 #include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>

+#include "support/std_sstream.h"
+
 #include <iomanip>
 #include <stack>

--- a/src/buffer.h
+++ b/src/buffer.h
@ -12,24 +12,28 @@
 #ifndef BUFFER_H
 #define BUFFER_H

-#include "support/std_string.h"
-#include "undo.h"
-#include "support/limited_stack.h"
-
-#include "lyxvc.h"
 #include "bufferparams.h"
-#include "texrow.h"
-#include "ParagraphList_fwd.h"
-#include "errorlist.h"
 #include "InsetList.h"
+#include "lyxvc.h"
+#include "ParagraphList_fwd.h"
+#include "texrow.h"

+#include "support/limited_stack.h"
 #include "support/types.h"

 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/signal0.hpp>
 #include <boost/signals/signal1.hpp>

+#include "support/std_string.h"
+#include <iosfwd>
+#include <map>
+#include <utility>
+#include <vector>
+
+
 class AuthorList;
+class ErrorItem;
 class LyXRC;
 class LaTeXFeatures;
 class LatexRunParams;
@ -38,6 +42,7 @@ class Messages;
 class ParIterator;
 class ParConstIterator;
 class TeXErrors;
+class Undo;


 /** The buffer object.
@ -99,8 +104,9 @@ public:

 	/// This parses a single token
 	int readParagraph(LyXLex &, string const & token,
-	              ParagraphList & pars, ParagraphList::iterator & pit,
-	              lyx::depth_type & depth);
+			  ParagraphList & pars,
+			  ParagraphList::iterator & pit,
+			  lyx::depth_type & depth);

 	///
 	void insertStringAsLines(ParagraphList::iterator &, lyx::pos_type &,
@ -137,7 +143,7 @@ public:
 	bool writeFile(string const &) const;

 	///
-	void writeFileAscii(string const & , int);
+	void writeFileAscii(string const &, int);
 	///
 	void writeFileAscii(std::ostream &, int);
 	///
@ -157,12 +163,13 @@ public:
 			   bool output_body = true);
 	///
 	void simpleDocBookOnePar(std::ostream &,
-				 ParagraphList::iterator par, int & desc_on,
+				 ParagraphList::iterator par,
+				 int & desc_on,
 				 lyx::depth_type depth) const;
 	///
 	void simpleLinuxDocOnePar(std::ostream & os,
-	       ParagraphList::iterator par,
-				 lyx::depth_type depth) const;
+				  ParagraphList::iterator par,
+				  lyx::depth_type depth) const;
 	///
 	void makeLinuxDocFile(string const & filename,
 			      bool nice, bool only_body = false);
--- a/src/buffer_funcs.C
+++ b/src/buffer_funcs.C
@ -13,17 +13,19 @@
 #include <config.h>

 #include "buffer_funcs.h"
-#include "bufferlist.h"
+
 #include "buffer.h"
+#include "bufferlist.h"
+#include "errorlist.h"
 #include "gettext.h"
+#include "LaTeX.h"
 #include "paragraph.h"
 #include "vc-backend.h"
-#include "LaTeX.h"

 #include "frontends/Alert.h"

-#include "support/filetools.h"
 #include "support/FileInfo.h"
+#include "support/filetools.h"
 #include "support/lyxlib.h"


--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@ -11,25 +11,24 @@
 #include <config.h>

 #include "bufferlist.h"
-#include "lyx_main.h"
-#include "lastfiles.h"
+
 #include "buffer.h"
 #include "debug.h"
-#include "lyx_cb.h"
 #include "gettext.h"
+#include "lastfiles.h"
+#include "lyx_cb.h"
+#include "lyx_main.h"
 #include "paragraph.h"
 #include "TextCache.h"

 #include "frontends/Alert.h"

 #include "support/filetools.h"
-#include "support/lyxfunctional.h"
 #include "support/LAssert.h"
+#include "support/lyxfunctional.h"

 #include <boost/bind.hpp>

-
-
 using namespace lyx::support;

 using std::vector;
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@ -13,24 +13,27 @@

 #include <config.h>

-#include "buffer.h"
 #include "bufferview_funcs.h"
+
+#include "buffer.h"
 #include "BufferView.h"
-#include "language.h"
 #include "gettext.h"
+#include "language.h"
 #include "lyxlex.h"
 #include "lyxrow.h"
 #include "paragraph.h"
 #include "ParagraphParameters.h"

-#include "frontends/LyXView.h"
 #include "frontends/Alert.h"
+#include "frontends/LyXView.h"
+
+#include "insets/insettext.h"
+
 #include "mathed/math_cursor.h"

 #include "support/tostr.h"
-#include "support/std_sstream.h"

-#include "insets/insettext.h"
+#include "support/std_sstream.h"

 using namespace lyx::support;

--- a/src/frontends/controllers/ControlDocument.C
+++ b/src/frontends/controllers/ControlDocument.C
@ -10,25 +10,25 @@

 #include <config.h>

-#include "BufferView.h"
 #include "ControlDocument.h"
 #include "ViewBase.h"

-#include "gettext.h"
-
 #include "buffer.h"
 #include "buffer_funcs.h"
+#include "BufferView.h"
+#include "CutAndPaste.h"
+#include "errorlist.h"
+#include "gettext.h"
 #include "iterators.h"
 #include "language.h"
 #include "lyxtextclasslist.h"
-#include "CutAndPaste.h"
 #include "paragraph.h"

-#include "frontends/LyXView.h"
 #include "frontends/Alert.h"
+#include "frontends/LyXView.h"

-#include "support/LAssert.h"
 #include "support/filetools.h"
+#include "support/LAssert.h"
 #include "support/path_defines.h"

 using namespace lyx::support;
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@ -22,8 +22,8 @@
 #include "metricsinfo.h"
 #include "paragraph.h"

-#include "frontends/Painter.h"
 #include "frontends/font_metrics.h"
+#include "frontends/Painter.h"

 #include "support/LAssert.h"
 #include "support/lstrings.h"
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@ -17,6 +17,7 @@
 #include "BufferView.h"
 #include "CutAndPaste.h"
 #include "debug.h"
+#include "errorlist.h"
 #include "funcrequest.h"
 #include "gettext.h"
 #include "intl.h"
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@ -15,29 +15,30 @@
 #include <config.h>

 #include "lyx_cb.h"
-#include "lyx_main.h"
+
 #include "buffer.h"
 #include "bufferlist.h"
+#include "BufferView.h"
 #include "debug.h"
+#include "gettext.h"
 #include "lastfiles.h"
+#include "lyx_main.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
-#include "gettext.h"
-#include "BufferView.h"
 #include "paragraph.h"

-#include "frontends/lyx_gui.h"
-#include "frontends/LyXView.h"
 #include "frontends/Alert.h"
 #include "frontends/FileDialog.h"
+#include "frontends/lyx_gui.h"
+#include "frontends/LyXView.h"

 #include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/forkedcall.h"
 #include "support/lyxlib.h"
+#include "support/os.h"
 #include "support/path.h"
 #include "support/path_defines.h"
-#include "support/os.h"
 #include "support/systemcall.h"

 #include <cerrno>
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@ -23,6 +23,7 @@
 #include "converter.h"
 #include "debug.h"
 #include "encoding.h"
+#include "errorlist.h"
 #include "format.h"
 #include "gettext.h"
 #include "kbmap.h"
@ -38,7 +39,6 @@
 #include "frontends/Alert.h"
 #include "frontends/lyx_gui.h"

-
 #include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/lyxlib.h"
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@ -20,32 +20,30 @@
 #include <config.h>

 #include "lyxfunc.h"
-#include "kbmap.h"
-#include "bufferlist.h"
+
 #include "buffer.h"
 #include "buffer_funcs.h"
+#include "bufferlist.h"
 #include "BufferView.h"
-#include "funcrequest.h"
-#include "iterators.h"
-#include "lyxserver.h"
-#include "intl.h"
-#include "lyx_cb.h"
-#include "lyxrow.h"
-#include "LyXAction.h"
 #include "debug.h"
-#include "gettext.h"
-#include "support/std_sstream.h"
 #include "encoding.h"
-#include "frontends/LyXView.h"
-#include "frontends/lyx_gui.h"
-#include "format.h"
 #include "exporter.h"
+#include "format.h"
+#include "funcrequest.h"
+#include "gettext.h"
 #include "importer.h"
-#include "TextCache.h"
+#include "intl.h"
+#include "iterators.h"
+#include "kbmap.h"
+#include "lyx_cb.h"
+#include "LyXAction.h"
 #include "lyxfind.h"
-#include "undo_funcs.h"
+#include "lyxrow.h"
+#include "lyxserver.h"
 #include "paragraph.h"
 #include "ParagraphParameters.h"
+#include "TextCache.h"
+#include "undo_funcs.h"

 #include "insets/insetcommand.h"
 #include "insets/insetexternal.h"
@ -53,22 +51,23 @@

 #include "mathed/math_cursor.h"

-#include "frontends/FileDialog.h"
-#include "frontends/Dialogs.h"
-#include "frontends/Toolbar.h"
-#include "frontends/Menubar.h"
 #include "frontends/Alert.h"
+#include "frontends/Dialogs.h"
+#include "frontends/FileDialog.h"
+#include "frontends/lyx_gui.h"
+#include "frontends/LyXView.h"
+#include "frontends/Menubar.h"
+#include "frontends/Toolbar.h"

-
-#include "support/LAssert.h"
-#include "support/filetools.h"
 #include "support/FileInfo.h"
+#include "support/filetools.h"
 #include "support/forkedcontr.h"
-#include "support/tostr.h"
+#include "support/LAssert.h"
 #include "support/path.h"
 #include "support/path_defines.h"
+#include "support/tostr.h"

-
+#include "support/std_sstream.h"

 using namespace lyx::support;

--- a/src/paragraph.h
+++ b/src/paragraph.h
@ -16,15 +16,15 @@
 #ifndef PARAGRAPH_H
 #define PARAGRAPH_H

+#include "changes.h"
+#include "InsetList.h"
 #include "lyxlayout_ptr_fwd.h"
 #include "lyxfont.h" // Just for LyXFont::FONT_SIZE
-#include "InsetList.h"
+#include "RowList_fwd.h"

 #include "insets/inset.h" // Just for InsetOld::Code

 #include "support/types.h"
-#include "changes.h"
-#include "RowList_fwd.h"

 #include "support/std_string.h"

@ -85,7 +85,7 @@ public:

 	///
 	void write(Buffer const &, std::ostream &, BufferParams const &,
-		       depth_type & depth) const;
+		   depth_type & depth) const;
 	///
 	void validate(LaTeXFeatures &) const;

--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@ -14,6 +14,7 @@
 #include "paragraph_pimpl.h"
 #include "buffer.h"
 #include "debug.h"
+#include "errorlist.h"
 #include "gettext.h"
 #include "iterators.h"
 #include "language.h"
--- a/src/tabular.C
+++ b/src/tabular.C
@ -18,10 +18,10 @@
 #include <config.h>

 #include "tabular.h"
-#include "LaTeXFeatures.h"
-#include "support/std_sstream.h"
+
 #include "buffer.h"
 #include "debug.h"
+#include "LaTeXFeatures.h"
 #include "lyxlex.h"
 #include "paragraph.h"

@ -31,7 +31,7 @@
 #include "support/lstrings.h"
 #include "support/tostr.h"

-
+#include "support/std_sstream.h"

 using namespace lyx::support;

--- a/src/text2.C
+++ b/src/text2.C
@ -20,27 +20,29 @@
 #include <config.h>

 #include "lyxtext.h"
-#include "support/std_sstream.h"
-#include "funcrequest.h"
-#include "frontends/LyXView.h"
-#include "undo_funcs.h"
+
 #include "buffer.h"
 #include "buffer_funcs.h"
-#include "gettext.h"
 #include "BufferView.h"
+#include "counters.h"
 #include "CutAndPaste.h"
-#include "frontends/font_metrics.h"
 #include "debug.h"
-#include "lyxrc.h"
+#include "errorlist.h"
 #include "Floating.h"
 #include "FloatList.h"
+#include "funcrequest.h"
+#include "gettext.h"
 #include "language.h"
-#include "ParagraphParameters.h"
-#include "counters.h"
+#include "lyxrc.h"
 #include "lyxrow.h"
 #include "lyxrow_funcs.h"
 #include "metricsinfo.h"
 #include "paragraph_funcs.h"
+#include "ParagraphParameters.h"
+#include "undo_funcs.h"
+
+#include "frontends/font_metrics.h"
+#include "frontends/LyXView.h"

 #include "insets/insetbibitem.h"
 #include "insets/insetenv.h"
@ -48,11 +50,12 @@
 #include "insets/insetwrap.h"

 #include "support/LAssert.h"
-#include "support/textutils.h"
 #include "support/lstrings.h"
+#include "support/textutils.h"

 #include <boost/tuple/tuple.hpp>

+#include "support/std_sstream.h"

 using namespace lyx::support;

--- a/src/text3.C
+++ b/src/text3.C
@ -16,31 +16,35 @@
 #include <config.h>

 #include "lyxtext.h"
-#include "BufferView.h"
-#include "funcrequest.h"
-#include "lyxrc.h"
-#include "support/std_sstream.h"
-#include "debug.h"
+
 #include "buffer.h"
+#include "BufferView.h"
+#include "debug.h"
+#include "factory.h"
+#include "funcrequest.h"
+#include "gettext.h"
+#include "intl.h"
+#include "language.h"
+#include "lyxrc.h"
 #include "lyxrow.h"
 #include "paragraph.h"
 #include "ParagraphParameters.h"
-#include "gettext.h"
-#include "factory.h"
-#include "intl.h"
-#include "language.h"
-#include "support/tostr.h"
-#include "support/lstrings.h"
-#include "support/LAssert.h"
-#include "frontends/LyXView.h"
+#include "text_funcs.h"
+#include "undo_funcs.h"
+
 #include "frontends/Dialogs.h"
-#include "insets/insetspecialchar.h"
-#include "insets/insettext.h"
+#include "frontends/LyXView.h"
+
 #include "insets/insetcommand.h"
 #include "insets/insetnewline.h"
-#include "undo_funcs.h"
-#include "text_funcs.h"
+#include "insets/insetspecialchar.h"
+#include "insets/insettext.h"

+#include "support/LAssert.h"
+#include "support/lstrings.h"
+#include "support/tostr.h"
+
+#include "support/std_sstream.h"
 #include <clocale>

 using namespace lyx::support;
--- a/src/toc.C
+++ b/src/toc.C
@ -12,19 +12,20 @@
 #include <config.h>

 #include "toc.h"
+
 #include "buffer.h"
 #include "funcrequest.h"
-#include "LyXAction.h"
 #include "iterators.h"
+#include "LyXAction.h"
 #include "paragraph.h"

+#include "frontends/LyXView.h"
+
 #include "insets/insetfloat.h"
 #include "insets/insetwrap.h"

 #include "support/tostr.h"

-#include "frontends/LyXView.h"
-
 using std::vector;
 using std::max;
 using std::endl;
--- a/src/undo_funcs.C
+++ b/src/undo_funcs.C
@ -15,14 +15,16 @@
 #include <config.h>

 #include "undo_funcs.h"
-#include "lyxtext.h"
-#include "funcrequest.h"
-#include "BufferView.h"
+
 #include "buffer.h"
-#include "insets/updatableinset.h"
+#include "BufferView.h"
+#include "funcrequest.h"
 #include "iterators.h"
+#include "lyxtext.h"
 #include "paragraph.h"

+#include "insets/updatableinset.h"
+

 /// The flag used by FinishUndo().
 bool undo_finished;