Strip out redundant includes (193 of 'em).

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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index f22b964bc29b8c1f7641648fb971246ced557fca..60b7201ce7512a640e1d8ca48bec8d6b788765be 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-05  Angus Leeming  <leeming@lyx.org>
+
+       * *.C: strip out redundant #includes. (193 in total.)
+
 2003-09-03  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * insets/insetbibtex.[Ch]:

diff --git a/src/insets/ExternalTemplate.C b/src/insets/ExternalTemplate.C
index 959706e9944b41953fb8ec7e04e2b7a96857e6fa..3a0900dea0b06b2013802e88da5da0b7eef17889 100644 (file)
--- a/src/insets/ExternalTemplate.C
+++ b/src/insets/ExternalTemplate.C
@@ -12,21 +12,21 @@
 
 #include "ExternalTemplate.h"
 
-#include "lyxlex.h"
 #include "debug.h"
-#include "support/path.h"
-#include "support/LAssert.h"
+#include "lyxlex.h"
+
 #include "support/filetools.h"
+#include "support/LAssert.h"
 #include "support/lstrings.h"
+#include "support/path.h"
 #include "support/path_defines.h"
 
-#include <algorithm>
-
 namespace support = lyx::support;
 
 using std::endl;
-using std::ostream;
 using std::for_each;
+using std::ostream;
+
 
 // We have to have dummy default commands for security reasons!
 

diff --git a/src/insets/inset.C b/src/insets/inset.C
index 28637838f0b44f3412fda8633902c44ef89a7fb7..6f7fc7d1c73236e198b85b15ba312e182b8a902c 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -14,23 +14,11 @@
 #include <config.h>
 
 #include "inset.h"
+#include "updatableinset.h"
+
 #include "BufferView.h"
-#include "funcrequest.h"
 #include "gettext.h"
-#include "lyxfont.h"
-#include "lyxtext.h"
-#include "dimension.h"
-#include "metricsinfo.h"
-
-#include "insets/updatableinset.h"
-
-#include "frontends/Painter.h"
-#include "frontends/mouse_state.h"
-
-#include "support/lstrings.h"
-
 
-#include "debug.h"
 
 // Initialization of the counter for the inset id's,
 unsigned int InsetOld::inset_id = 0;

diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C
index c242739ff729ec92a0966b53f74ee08a43e63b52..7a3a411379ff8be842f4c9990b92e32c14b93d5f 100644 (file)
--- a/src/insets/insetbase.C
+++ b/src/insets/insetbase.C
@@ -9,6 +9,7 @@
  */
 
 #include <config.h>
+
 #include "insetbase.h"
 
 

diff --git a/src/insets/insetbibitem.C b/src/insets/insetbibitem.C
index a9d5fde47f9dcd5c2e7a97496389f9cc06c9e2f9..b3a263d3fff9649f87330fce645c948a7462c324 100644 (file)
--- a/src/insets/insetbibitem.C
+++ b/src/insets/insetbibitem.C
@@ -10,6 +10,7 @@
 #include <config.h>
 
 #include "insetbibitem.h"
+
 #include "buffer.h"
 #include "BufferView.h"
 #include "funcrequest.h"
@@ -17,8 +18,8 @@
 
 #include "frontends/font_metrics.h"
 
-#include "support/tostr.h"
 #include "support/lstrings.h"
+#include "support/tostr.h"
 
 using namespace lyx::support;
 

diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C
index 3687af8b63ab5d4eaa043496d5b3814c707b62c4..dc80fab2379d63b11f4845421fa80be293d8a391 100644 (file)
--- a/src/insets/insetbibtex.C
+++ b/src/insets/insetbibtex.C
@@ -11,31 +11,29 @@
 #include <config.h>
 
 #include "insetbibtex.h"
-#include "metricsinfo.h"
+
 #include "buffer.h"
-#include "BufferView.h"
 #include "debug.h"
 #include "funcrequest.h"
 #include "gettext.h"
 #include "latexrunparams.h"
+#include "metricsinfo.h"
 
 #include "support/filetools.h"
-#include "support/path.h"
-#include "support/os.h"
 #include "support/lstrings.h"
-#include "support/LAssert.h"
+#include "support/os.h"
+#include "support/path.h"
 
 #include <fstream>
-#include <cstdlib>
 
 using namespace lyx::support;
 
-using std::ostream;
-using std::ifstream;
-using std::getline;
 using std::endl;
-using std::vector;
+using std::getline;
+using std::ifstream;
+using std::ostream;
 using std::pair;
+using std::vector;
 
 
 InsetBibtex::InsetBibtex(InsetCommandParams const & p)

diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C
index 4de498724a055f129840cc6b27dcd3f01815eb3d..dba6f3693266e7b22ea762777dc14e01864900a0 100644 (file)
--- a/src/insets/insetbranch.C
+++ b/src/insets/insetbranch.C
@@ -10,26 +10,19 @@
 
 #include <config.h>
 
-#include "Lsstream.h"
-
 #include "insetbranch.h"
-#include "gettext.h"
-#include "lyxfont.h"
-#include "language.h"
+
 #include "buffer.h"
 #include "BufferView.h"
 #include "funcrequest.h"
-#include "LaTeXFeatures.h"
-#include "latexrunparams.h"
+#include "gettext.h"
 #include "lyxlex.h"
-#include "lyxtext.h"
-#include "insets/insettext.h"
-#include "support/LOstream.h"
-#include "support/lstrings.h"
-#include "debug.h"
 
-using std::ostream;
+#include "Lsstream.h"
+
 using std::auto_ptr;
+using std::ostream;
+
 
 void InsetBranch::init()
 {

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index 3bd8cd50265fbec65dc6cada7f90b31d661db364..6b384cacfb2004a114bbba1ab439a5d13fa2fe3e 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -11,26 +11,28 @@
 #include <config.h>
 
 #include "insetcaption.h"
-#include "frontends/Painter.h"
-#include "frontends/font_metrics.h"
-#include "BufferView.h"
+#include "insetfloat.h"
+#include "insetwrap.h"
+
 #include "buffer.h"
+#include "BufferView.h"
 #include "Floating.h"
 #include "FloatList.h"
-#include "insets/insetfloat.h"
-#include "insets/insetwrap.h"
-#include "debug.h"
 #include "gettext.h"
-#include "Lsstream.h"
 #include "metricsinfo.h"
-#include "support/lstrings.h"
+
+#include "frontends/Painter.h"
+#include "frontends/font_metrics.h"
+
 #include "support/LAssert.h"
-#include "support/BoostFormat.h"
+#include "support/lstrings.h"
+
+#include "Lsstream.h"
 
 using namespace lyx::support;
 
-using std::ostream;
 using std::endl;
+using std::ostream;
 
 
 InsetCaption::InsetCaption(BufferParams const & bp)

diff --git a/src/insets/insetcite.C b/src/insets/insetcite.C
index d0cf1c7f48fcd67b11648f54060fde98466353a9..a4cc7f1e721e5c06a49d289477ab2c342d90cc86 100644 (file)
--- a/src/insets/insetcite.C
+++ b/src/insets/insetcite.C
@@ -12,23 +12,23 @@
 #include <config.h>
 
 #include "insetcite.h"
-#include "funcrequest.h"
+
 #include "buffer.h"
 #include "BufferView.h"
+#include "funcrequest.h"
 #include "LaTeXFeatures.h"
 
 #include "frontends/controllers/biblio.h"
 
 #include "support/lstrings.h"
 
-#include <map>
-
 using namespace lyx::support;
 
 using std::ostream;
 using std::vector;
 using std::map;
 
+
 namespace {
 
 // An optimisation. We assume that until the first InsetCitation::edit is

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 1732465503c77c327d291f708ff4512e31987f9e..94ff01c1fdd715640fb255d04c72c2317aa858fd 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -13,34 +13,28 @@
 #include <config.h>
 
 #include "insetcollapsable.h"
-#include "insettext.h"
 
+#include "buffer.h"
 #include "BufferView.h"
 #include "debug.h"
-#include "dimension.h"
-#include "gettext.h"
-#include "lyxfont.h"
 #include "lyxlex.h"
-#include "lyxtext.h"
-#include "WordLangTuple.h"
 #include "funcrequest.h"
-#include "buffer.h"
 #include "metricsinfo.h"
+#include "WordLangTuple.h"
 
 #include "frontends/font_metrics.h"
 #include "frontends/Painter.h"
 #include "frontends/LyXView.h"
 
 #include "support/LAssert.h"
-#include "support/LOstream.h"
 
 using namespace lyx::support;
 using namespace lyx::graphics;
 
-using std::vector;
-using std::ostream;
 using std::endl;
 using std::max;
+using std::vector;
+using std::ostream;
 
 
 InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index f09ff6369b8e4c15a223a0072e3b1374c625d4fd..dd0224e931dee2628cf6c0b2e7a875657f61d2e4 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -12,16 +12,12 @@
 #include <config.h>
 
 #include "insetcommand.h"
+
 #include "BufferView.h"
-#include "debug.h"
 #include "funcrequest.h"
 #include "lyxlex.h"
 #include "metricsinfo.h"
 
-#include "frontends/Painter.h"
-
-#include "support/lstrings.h"
-
 #include "Lsstream.h"
 
 using std::ostream;

diff --git a/src/insets/insetcommandparams.C b/src/insets/insetcommandparams.C
index b07880c384ac246d4b863cb123bdac9f97b055ad..6f8ad66b1941ca64ac745bb3f3c20df8775c570d 100644 (file)
--- a/src/insets/insetcommandparams.C
+++ b/src/insets/insetcommandparams.C
@@ -10,15 +10,13 @@
 
 #include <config.h>
 
-
 #include "insetcommandparams.h"
-#include "lyxlex.h"
-#include "debug.h"
 
-#include "support/LOstream.h"
+#include "debug.h"
+#include "lyxlex.h"
 
-using std::ostream;
 using std::endl;
+using std::ostream;
 
 
 InsetCommandParams::InsetCommandParams()

diff --git a/src/insets/insetenv.C b/src/insets/insetenv.C
index 3886f765e467cec78cedea51a3a4e63614ef8c47..7de871f3c9129c87eaa7a896922c066ad314cb8b 100644 (file)
--- a/src/insets/insetenv.C
+++ b/src/insets/insetenv.C
@@ -11,18 +11,15 @@
 #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 "texrow.h"
-#include "support/LOstream.h"
 
-using std::ostream;
 using std::endl;
 using std::auto_ptr;
+using std::ostream;
 
 
 InsetEnvironment::InsetEnvironment

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 5cc6ba64c99498d76d9eda6e9c11573953c2ebf0..176fef51da3de30b009e07ae957363b328c4a253 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -11,8 +11,6 @@
 #include <config.h>
 
 #include "insetert.h"
-#include "insettext.h"
-#include "metricsinfo.h"
 
 #include "buffer.h"
 #include "BufferView.h"
@@ -20,28 +18,23 @@
 #include "funcrequest.h"
 #include "gettext.h"
 #include "language.h"
-#include "lyxfont.h"
 #include "lyxlex.h"
-#include "lyxrow.h"
-#include "lyxtext.h"
+#include "metricsinfo.h"
 #include "WordLangTuple.h"
 
 #include "frontends/Alert.h"
-#include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
 
-#include "support/LOstream.h"
-#include "support/LAssert.h"
 #include "support/tostr.h"
 
 using namespace lyx::support;
 
 using lyx::pos_type;
 
-using std::ostream;
 using std::min;
 using std::endl;
 using std::auto_ptr;
+using std::ostream;
 
 
 void InsetERT::init()

diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index 38d891e77f74a11ea6b0fa500817b28c1737edb5..981f314e050c7a9716447815e1bf729e6bc9c1a7 100644 (file)
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -21,17 +21,12 @@
 #include "funcrequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "latexrunparams.h"
-#include "lyx_main.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
 #include "Lsstream.h"
 
 #include "frontends/lyx_gui.h"
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
 
-#include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/forkedcall.h"
 #include "support/lstrings.h"
@@ -40,19 +35,16 @@
 #include "support/path.h"
 #include "support/path_defines.h"
 #include "support/tostr.h"
-#include "support/LAssert.h"
 #include "support/translator.h"
 
 #include <boost/bind.hpp>
 
-#include <cstdio>
-#include <utility>
-
 namespace support = lyx::support;
 
-using std::ostream;
 using std::endl;
 using std::auto_ptr;
+using std::ostream;
+
 
 namespace lyx {
 namespace graphics {

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 197de9e4106c1d37bce6c0a46b31ce73738cf675..962012700f258440169905012654f6a49c747f94 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -12,7 +12,6 @@
 #include <config.h>
 
 #include "insetfloat.h"
-#include "insettext.h"
 
 #include "buffer.h"
 #include "BufferView.h"
@@ -23,24 +22,18 @@
 #include "gettext.h"
 #include "iterators.h"
 #include "LaTeXFeatures.h"
-#include "Lsstream.h"
-#include "lyxfont.h"
 #include "lyxlex.h"
-#include "lyxtext.h"
-#include "Lsstream.h"
 
-#include "support/LOstream.h"
 #include "support/lstrings.h"
 #include "support/tostr.h"
 
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
+#include "Lsstream.h"
 
 using namespace lyx::support;
 
-using std::ostream;
 using std::endl;
 using std::auto_ptr;
+using std::ostream;
 
 
 // With this inset it will be possible to support the latex package

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index 6800c53351a510597b29f4b4464af40ed87c6719..91b54b91aad5b3f2f478deab970d000bf4204343 100644 (file)
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -13,7 +13,6 @@
 #include "insetfloatlist.h"
 
 #include "buffer.h"
-#include "BufferView.h"
 #include "debug.h"
 #include "Floating.h"
 #include "FloatList.h"
@@ -23,14 +22,13 @@
 #include "lyxlex.h"
 #include "metricsinfo.h"
 #include "toc.h"
-#include "Lsstream.h"
 
 #include "support/lstrings.h"
 
 using namespace lyx::support;
 
-using std::ostream;
 using std::endl;
+using std::ostream;
 
 
 InsetFloatList::InsetFloatList()

diff --git a/src/insets/insetfoot.C b/src/insets/insetfoot.C
index cc047e2a9ba47912eab93372b4441aa760fcd22d..446834239f67b457b028d43852526566e8b12578 100644 (file)
--- a/src/insets/insetfoot.C
+++ b/src/insets/insetfoot.C
@@ -12,22 +12,18 @@
 #include <config.h>
 
 #include "insetfoot.h"
+
 #include "gettext.h"
-#include "lyxfont.h"
-#include "BufferView.h"
 #include "latexrunparams.h"
-#include "lyxtext.h"
-#include "insets/insettext.h"
-#include "support/LOstream.h"
-#include "debug.h"
 // the following are needed just to get the layout of the enclosing
 // paragraph. This seems a bit too much to me (JMarc)
 #include "lyxlayout.h"
 #include "paragraph_funcs.h"
 
+#include "support/LOstream.h"
 
-using std::ostream;
 using std::auto_ptr;
+using std::ostream;
 
 
 InsetFoot::InsetFoot(BufferParams const & bp)

diff --git a/src/insets/insetfootlike.C b/src/insets/insetfootlike.C
index 63c55040a9b8ebf893d00a4d75cfd5a9986aac67..dbb172923270616c5b3506bcb23edd2ff35601ea 100644 (file)
--- a/src/insets/insetfootlike.C
+++ b/src/insets/insetfootlike.C
@@ -11,12 +11,9 @@
 #include <config.h>
 
 #include "insetfootlike.h"
-#include "metricsinfo.h"
-#include "lyxfont.h"
-#include "buffer.h"
-#include "lyxtext.h"
-#include "support/LOstream.h"
 
+#include "buffer.h"
+#include "metricsinfo.h"
 
 using std::ostream;
 

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index e7b69c6ae8d91562aa50e97b8dd4f75bb703f05f..d9a3f3ba3c6852fd887cc9813a68d9e56b82659a 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -53,7 +53,6 @@ TODO
 #include <config.h>
 
 #include "insets/insetgraphics.h"
-#include "insets/insetgraphicsParams.h"
 #include "insets/renderers.h"
 
 #include "buffer.h"
@@ -64,18 +63,14 @@ TODO
 #include "funcrequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "latexrunparams.h"
 #include "Lsstream.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
-#include "paragraph_funcs.h"
-#include "lyxtext.h"
 
 #include "frontends/Alert.h"
-#include "frontends/Dialogs.h"
 
-#include "support/LAssert.h"
 #include "support/filetools.h"
+#include "support/LAssert.h"
 #include "support/lyxalgo.h" // lyx::count
 #include "support/lyxlib.h" // float_equal
 #include "support/os.h"
@@ -85,16 +80,12 @@ TODO
 #include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>
 
-#include <algorithm> // For the std::max
-
-// set by Exporters
-
 namespace support = lyx::support;
 using namespace lyx::support;
 
-using std::ostream;
 using std::endl;
 using std::auto_ptr;
+using std::ostream;
 
 
 namespace {

diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C
index 0423356447183e4a6c17cdcde2f5611f50daa5a7..0a236448944054c92eaddbe93529afc2c3a1ba64 100644 (file)
--- a/src/insets/insetgraphicsParams.C
+++ b/src/insets/insetgraphicsParams.C
@@ -11,26 +11,26 @@
 
 #include <config.h>
 
-
 #include "insetgraphicsParams.h"
 
+#include "debug.h"
+#include "lyxlex.h"
+#include "lyxrc.h"
+
+#include "frontends/lyx_gui.h"
+
 #include "graphics/GraphicsParams.h"
 
 #include "support/filetools.h"
 #include "support/lyxlib.h"
-#include "support/LOstream.h"
-#include "support/LAssert.h"
 #include "support/lstrings.h"
 #include "support/translator.h"
-#include "lyxrc.h"
-#include "debug.h"
-#include "lyxlex.h"
-#include "frontends/lyx_gui.h"
 
 using namespace lyx::support;
 
 using std::ostream;
 
+
 namespace lyx {
 namespace graphics {
 /// The translator between the DisplayType and the corresponding lyx string.

diff --git a/src/insets/insethfill.C b/src/insets/insethfill.C
index 07007bd038e57d0b9be656e43021315aaf9403b1..3af0c0fdd40a1c1ae4dfdee4b9966b764b3d501c 100644 (file)
--- a/src/insets/insethfill.C
+++ b/src/insets/insethfill.C
@@ -10,12 +10,11 @@
 
 #include <config.h>
 
-
 #include "insethfill.h"
-#include "support/LOstream.h"
 
 using std::ostream;
 
+
 InsetHFill::InsetHFill()
        : InsetCommand(InsetCommandParams("hfill"))
 {}

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index b647952c05df1360e57e5318ac04376366bf8ab1..38cfe9d56f567c48074038edf104240ac17b079d 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -11,6 +11,7 @@
 #include <config.h>
 
 #include "insetinclude.h"
+
 #include "buffer.h"
 #include "buffer_funcs.h"
 #include "bufferlist.h"
@@ -20,36 +21,31 @@
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "latexrunparams.h"
-#include "Lsstream.h"
 #include "lyxlex.h"
-#include "lyxrc.h"
 #include "metricsinfo.h"
-#include "dimension.h"
 
-#include "frontends/Dialogs.h"
-#include "frontends/LyXView.h"
 #include "frontends/Painter.h"
 
-#include "support/filetools.h"
+#include "graphics/PreviewedInset.h"
+#include "graphics/PreviewImage.h"
+
 #include "support/FileInfo.h"
 #include "support/FileMonitor.h"
+#include "support/filetools.h"
 #include "support/lstrings.h" // contains
 #include "support/tostr.h"
 
-#include "graphics/PreviewedInset.h"
-#include "graphics/PreviewImage.h"
-
 #include <boost/bind.hpp>
 
-#include <cstdlib>
+#include "Lsstream.h"
 
 using namespace lyx::support;
 
-using std::ostream;
 using std::endl;
-using std::vector;
-using std::pair;
 using std::auto_ptr;
+using std::ostream;
+using std::pair;
+using std::vector;
 
 
 extern BufferList bufferlist;

diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C
index be034b8a9cd024b4f021e1609474ad9b0cddd877..b1a3a39677d57629cad50629460d9b4c5d30fd8d 100644 (file)
--- a/src/insets/insetindex.C
+++ b/src/insets/insetindex.C
@@ -9,19 +9,16 @@
  */
 #include <config.h>
 
-
 #include "insetindex.h"
-#include "metricsinfo.h"
-#include "BufferView.h"
+
 #include "funcrequest.h"
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
-#include "LaTeXFeatures.h"
 #include "gettext.h"
-#include "support/LOstream.h"
+#include "LaTeXFeatures.h"
+#include "metricsinfo.h"
 
 using std::ostream;
 
+
 InsetIndex::InsetIndex(InsetCommandParams const & p)
        : InsetCommand(p)
 {}

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 1554760f81a4fb127833e8ff7db978e902abde85..923869f571d729a98c40f1338bc2f8e7d11fe1ab 100644 (file)
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -10,23 +10,18 @@
 
 #include <config.h>
 
-
 #include "insetlabel.h"
-#include "buffer.h"
+
 #include "BufferView.h"
 #include "funcrequest.h"
-#include "gettext.h"
-#include "lyxtext.h"
 
 #include "support/lstrings.h"
-#include "support/LOstream.h"
-#include "support/lstrings.h" //frontStrip, strip
 
 using namespace lyx::support;
 
 using std::ostream;
-using std::vector;
 using std::pair;
+using std::vector;
 
 
 InsetLabel::InsetLabel(InsetCommandParams const & p)

diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C
index a0a364ce29d118069aa7890c27dc963cd4dedf78..a3cb9de05ca32790fbbf15226a4a215e7a94766d 100644 (file)
--- a/src/insets/insetlatexaccent.C
+++ b/src/insets/insetlatexaccent.C
@@ -13,20 +13,21 @@
 #include "insetlatexaccent.h"
 
 #include "debug.h"
-#include "lyxrc.h"
-#include "support/lstrings.h"
-#include "BufferView.h"
-#include "frontends/Painter.h"
-#include "frontends/font_metrics.h"
 #include "language.h"
 #include "lyxlex.h"
+#include "lyxrc.h"
 #include "metricsinfo.h"
 
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+
+#include "support/lstrings.h"
+
 using namespace lyx::support;
 
-using std::ostream;
 using std::endl;
 using std::auto_ptr;
+using std::ostream;
 
 
 /* LatexAccent. Proper handling of accented characters */

diff --git a/src/insets/insetlist.C b/src/insets/insetlist.C
index fb46a7d3aaea58bb7205d04670516f2468711a12..2b20ada5d4143f85896ded8b1e0c6146d5ad0c75 100644 (file)
--- a/src/insets/insetlist.C
+++ b/src/insets/insetlist.C
@@ -9,18 +9,20 @@
  */
 #include <config.h>
 
-
 #include "insetlist.h"
+#include "insets/insettext.h"
+
+#include "BufferView.h"
+#include "debug.h"
 #include "gettext.h"
 #include "lyxfont.h"
-#include "BufferView.h"
 #include "lyxtext.h"
-#include "insets/insettext.h"
+
 #include "support/LOstream.h"
-#include "debug.h"
 
-using std::ostream;
 using std::endl;
+using std::ostream;
+
 
 // This class is _far_ from finished. I hope that we can have a inset to
 // handle the different lists that we have. It should also be possible

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index 853219bf143e23f40ead018b96cfe6cfafd7caec..d06fa37f8f8fc8196dfde3a29c72649ed683448e 100644 (file)
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -11,19 +11,14 @@
 
 #include <config.h>
 
-
 #include "insetmarginal.h"
+
 #include "gettext.h"
-#include "lyxfont.h"
-#include "BufferView.h"
-#include "lyxtext.h"
-#include "insets/insettext.h"
-#include "support/LOstream.h"
-#include "debug.h"
 
+#include "support/LOstream.h"
 
-using std::ostream;
 using std::auto_ptr;
+using std::ostream;
 
 
 InsetMarginal::InsetMarginal(BufferParams const & bp)

diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index ecf9ed6d81d7f6fc050ba69e24f608eb6b810fa0..7207a4f205aaa8a5eb88e134b74aeed5f83d566e 100644 (file)
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -12,28 +12,19 @@
 #include <config.h>
 
 #include "insetminipage.h"
-#include "insettext.h"
 
 #include "BufferView.h"
 #include "debug.h"
-#include "dimension.h"
 #include "funcrequest.h"
 #include "gettext.h"
-#include "Lsstream.h"
-#include "lyxfont.h"
 #include "lyxlex.h"
-#include "lyxtext.h"
-#include "Lsstream.h"
 #include "metricsinfo.h"
 
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
-
-#include "support/LOstream.h"
+#include "Lsstream.h"
 
-using std::ostream;
 using std::endl;
 using std::auto_ptr;
+using std::ostream;
 
 
 // Some information about Minipages in LaTeX:

diff --git a/src/insets/insetnewline.C b/src/insets/insetnewline.C
index eb7db91402833c2f44ba9a836b35166c33c8d7f7..191f2e9629fe391f36b606c3a311b6126de07bd5 100644 (file)
--- a/src/insets/insetnewline.C
+++ b/src/insets/insetnewline.C
@@ -14,19 +14,15 @@
 
 #include "BufferView.h"
 #include "debug.h"
-#include "dimension.h"
-#include "paragraph.h"
 #include "lyxtext.h"
 #include "metricsinfo.h"
 #include "paragraph_funcs.h"
 
-#include "support/LOstream.h"
-
-#include "frontends/Painter.h"
 #include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
 
-using std::ostream;
 using std::endl;
+using std::ostream;
 
 
 void InsetNewline::read(Buffer const &, LyXLex &)

diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index d05b87680e553a3422bf591eca75609cf395e395..e249d5b2e43556af727c4ba8e2be5474989cfe09 100644 (file)
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -13,26 +13,18 @@
 #include <config.h>
 
 #include "insetnote.h"
-#include "insettext.h"
 
-#include "buffer.h"
 #include "BufferView.h"
-#include "debug.h"
 #include "funcrequest.h"
 #include "gettext.h"
-#include "language.h"
 #include "LaTeXFeatures.h"
-#include "lyxfont.h"
 #include "lyxlex.h"
-#include "lyxtext.h"
 #include "metricsinfo.h"
-#include "support/LOstream.h"
-#include "support/lstrings.h"
 
 #include "Lsstream.h"
 
-using std::ostream;
 using std::auto_ptr;
+using std::ostream;
 
 
 void InsetNote::init()

diff --git a/src/insets/insetoptarg.C b/src/insets/insetoptarg.C
index a1f92a5805c03b9cb2418281a29775f05224a671..30086b6276678ba2f1822008d7b2b798638bdc10 100644 (file)
--- a/src/insets/insetoptarg.C
+++ b/src/insets/insetoptarg.C
@@ -10,23 +10,15 @@
 
 #include <config.h>
 
+#include "insetoptarg.h"
 
 #include "debug.h"
-
-#include "insetoptarg.h"
-#include "support/LOstream.h"
-#include "frontends/Alert.h"
-#include "support/lstrings.h" // frontStrip, strip
-#include "lyxtext.h"
-#include "buffer.h"
 #include "gettext.h"
-#include "BufferView.h"
-#include "support/lstrings.h"
 
+using std::auto_ptr;
 using std::ostream;
-using std::vector;
 using std::pair;
-using std::auto_ptr;
+using std::vector;
 
 
 InsetOptArg::InsetOptArg(BufferParams const & ins)

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 6e094c0a278ada61db898055cb67212963156821..b9f9a7d8f58b9fad8b799fd10447c44cc2eeac1d 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -13,16 +13,12 @@
 #include "insetquotes.h"
 
 #include "buffer.h"
-#include "BufferView.h"
 #include "debug.h"
-#include "dimension.h"
 #include "language.h"
 #include "LaTeXFeatures.h"
 #include "latexrunparams.h"
-#include "lyxfont.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
-#include "paragraph.h"
 #include "metricsinfo.h"
 #include "paragraph_funcs.h"
 
@@ -34,9 +30,10 @@
 
 using namespace lyx::support;
 
-using std::ostream;
 using std::endl;
 using std::auto_ptr;
+using std::ostream;
+
 
 namespace {
 

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index c4affe9143683c3378234f064257c5691d60b0fb..989b51d8e1c7a6e750805128830d7d08fa71cab4 100644 (file)
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -9,22 +9,23 @@
  */
 #include <config.h>
 
-
 #include "insetref.h"
+
 #include "buffer.h"
+#include "BufferView.h"
 #include "funcrequest.h"
-#include "debug.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
+
 #include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
-#include "BufferView.h"
+
 #include "support/lstrings.h"
 
 using namespace lyx::support;
 
 using std::ostream;
 
+
 InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf)
        : InsetCommand(p), isLatex(buf.isLatex())
 {}

diff --git a/src/insets/insetspace.C b/src/insets/insetspace.C
index 801bf188bd99d602ac500d167d3fa77063ba8f99..345a5f1f27249ec8cd5c5af70d011e646a22f844 100644 (file)
--- a/src/insets/insetspace.C
+++ b/src/insets/insetspace.C
@@ -16,19 +16,16 @@
 #include "insetspace.h"
 
 #include "debug.h"
-#include "dimension.h"
-#include "LaTeXFeatures.h"
 #include "latexrunparams.h"
-#include "BufferView.h"
-#include "frontends/Painter.h"
-#include "frontends/font_metrics.h"
 #include "lyxlex.h"
-#include "lyxfont.h"
 #include "metricsinfo.h"
 
-using std::ostream;
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+
 using std::max;
 using std::auto_ptr;
+using std::ostream;
 
 
 InsetSpace::InsetSpace()

diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C
index 018ac6763e3de80193be15bd41a227769b13759b..f6aa672987760ba41fd8a3accf4a3cabd86b90c1 100644 (file)
--- a/src/insets/insetspecialchar.C
+++ b/src/insets/insetspecialchar.C
@@ -15,18 +15,16 @@
 #include "insetspecialchar.h"
 
 #include "debug.h"
-#include "dimension.h"
 #include "LaTeXFeatures.h"
-#include "BufferView.h"
-#include "frontends/Painter.h"
-#include "frontends/font_metrics.h"
 #include "lyxlex.h"
-#include "lyxfont.h"
 #include "metricsinfo.h"
 
-using std::ostream;
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+
 using std::max;
 using std::auto_ptr;
+using std::ostream;
 
 
 InsetSpecialChar::InsetSpecialChar(Kind k)

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index c930f08e6e61b1a32a24f4ea1eefa6111527eecf..6f42d17d80c3d9e0283f02f89f8783381ec9003a 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -11,55 +11,41 @@
 #include <config.h>
 
 #include "insettabular.h"
-#include "insettext.h"
 
 #include "buffer.h"
 #include "BufferView.h"
-#include "lfuns.h"
 #include "debug.h"
-#include "dimension.h"
 #include "funcrequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "language.h"
-#include "LaTeXFeatures.h"
-#include "Lsstream.h"
 #include "lyx_cb.h"
-#include "lyxfunc.h"
-#include "lyxlength.h"
 #include "lyxlex.h"
-#include "lyxtext.h"
+#include "metricsinfo.h"
+#include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "undo_funcs.h"
 #include "WordLangTuple.h"
-#include "metricsinfo.h"
-#include "paragraph_funcs.h"
 
 #include "frontends/Alert.h"
-#include "frontends/Dialogs.h"
 #include "frontends/font_metrics.h"
 #include "frontends/LyXView.h"
 #include "frontends/Painter.h"
 
 #include "support/LAssert.h"
-#include "support/lstrings.h"
-
-#include <fstream>
-#include <algorithm>
-#include <cstdlib>
 
+#include "Lsstream.h"
 
 using namespace lyx::support;
 using namespace lyx::graphics;
 
-using std::vector;
-using std::ostream;
-using std::ifstream;
-using std::max;
 using std::endl;
-using std::swap;
 using std::max;
+using std::swap;
 using std::auto_ptr;
+using std::ifstream;
+using std::ostream;
+using std::vector;
 
 
 namespace {

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 246280bd1f667b3ad46023e32560959cda251183..2b07ede5f3644733bb930344c942ee45be7e79ad 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -11,67 +11,45 @@
 #include <config.h>
 
 #include "insettext.h"
+#include "insetnewline.h"
 
 #include "buffer.h"
 #include "BufferView.h"
-#include "bufferview_funcs.h"
 #include "CutAndPaste.h"
 #include "debug.h"
-#include "dimension.h"
 #include "funcrequest.h"
 #include "gettext.h"
-#include "errorlist.h"
 #include "intl.h"
-#include "LaTeXFeatures.h"
-#include "LColor.h"
-#include "Lsstream.h"
-#include "lyxfont.h"
-#include "lyxcursor.h"
 #include "lyxfind.h"
 #include "lyxlex.h"
-#include "lyxrow.h"
 #include "lyxrc.h"
-#include "lyxtext.h"
-#include "paragraph.h"
+#include "metricsinfo.h"
+#include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
-#include "trans_mgr.h"
+#include "rowpainter.h"
+#include "sgml.h"
 #include "undo_funcs.h"
 #include "WordLangTuple.h"
-#include "paragraph_funcs.h"
-#include "sgml.h"
-#include "rowpainter.h"
-#include "insetnewline.h"
-#include "metricsinfo.h"
-#include "textcursor.h"
 
 #include "frontends/Alert.h"
-#include "frontends/Dialogs.h"
 #include "frontends/font_metrics.h"
 #include "frontends/LyXView.h"
 #include "frontends/Painter.h"
-#include "frontends/screen.h"
 
-#include "support/textutils.h"
-#include "support/LAssert.h"
-#include "support/lstrings.h"
 #include "support/lyxalgo.h" // lyx::count
 
 #include <boost/bind.hpp>
 
-#include <fstream>
-#include <algorithm>
-#include <cstdlib>
-
-using std::ostream;
-using std::ifstream;
 using std::endl;
+using std::for_each;
 using std::min;
 using std::max;
 using std::make_pair;
-using std::vector;
-using std::pair;
-using std::for_each;
 using std::auto_ptr;
+using std::ostream;
+using std::ifstream;
+using std::pair;
+using std::vector;
 
 using namespace lyx::support;
 using namespace lyx::graphics;

diff --git a/src/insets/insettheorem.C b/src/insets/insettheorem.C
index acf98c508da432f593bee539cf3d7ebde7235efc..fb4bcbdcd4b6e708a67d2cfcf120db4968bdb013 100644 (file)
--- a/src/insets/insettheorem.C
+++ b/src/insets/insettheorem.C
@@ -10,19 +10,21 @@
 
 #include <config.h>
 
-
 #include "insettheorem.h"
-#include "metricsinfo.h"
+#include "insets/insettext.h"
+
+#include "debug.h"
+#include "BufferView.h"
 #include "gettext.h"
 #include "lyxfont.h"
-#include "BufferView.h"
 #include "lyxtext.h"
+#include "metricsinfo.h"
+
 #include "support/LOstream.h"
-#include "debug.h"
-#include "insets/insettext.h"
 
-using std::ostream;
 using std::endl;
+using std::ostream;
+
 
 /*
   The intention is to be able to create arbitrary theorem like environments

diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C
index 74273ce85eed42cdef56655633b0493fe5a2b42c..666abdbc9db4cd3107f4f7762751104f935098ba 100644 (file)
--- a/src/insets/insettoc.C
+++ b/src/insets/insettoc.C
@@ -11,18 +11,13 @@
 
 #include "insettoc.h"
 
-#include "BufferView.h"
-#include "debug.h"
 #include "funcrequest.h"
 #include "gettext.h"
 #include "metricsinfo.h"
 #include "toc.h"
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
 
-
-using std::vector;
 using std::ostream;
+using std::vector;
 
 
 InsetTOC::InsetTOC(InsetCommandParams const & p)

diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C
index c60b5f620bbf10421ddc6b2c6df4dd64a3657239..a67392e604dd11c746eddf0c7efc8af7d76918f7 100644 (file)
--- a/src/insets/inseturl.C
+++ b/src/insets/inseturl.C
@@ -11,16 +11,14 @@
 #include <config.h>
 
 #include "inseturl.h"
+
 #include "funcrequest.h"
-#include "BufferView.h"
-#include "LaTeXFeatures.h"
 #include "latexrunparams.h"
-#include "frontends/LyXView.h"
-#include "debug.h"
-#include "frontends/Dialogs.h"
-#include "support/lstrings.h"
+#include "LaTeXFeatures.h"
 #include "gettext.h"
 
+#include "support/lstrings.h"
+
 using namespace lyx::support;
 
 using std::ostream;

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index f87350f4ca189d897f2048d89f3e33a70baabdd2..baf8877a55ef3590daf75846baba1a0c50820759 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -11,31 +11,25 @@
 #include <config.h>
 
 #include "insetwrap.h"
-#include "insettext.h"
 
 #include "buffer.h"
 #include "BufferView.h"
 #include "debug.h"
-#include "funcrequest.h"
 #include "Floating.h"
 #include "FloatList.h"
+#include "funcrequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "Lsstream.h"
-#include "lyxfont.h"
 #include "lyxlex.h"
-#include "lyxtext.h"
-#include "Lsstream.h"
-
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
 
-#include "support/LOstream.h"
 #include "support/tostr.h"
 
-using std::ostream;
+#include "Lsstream.h"
+
 using std::endl;
 using std::auto_ptr;
+using std::ostream;
+
 
 namespace {
 

diff --git a/src/insets/mailinset.C b/src/insets/mailinset.C
index eb396823e77e768efcb72a4b25ec1eeb8ac212c1..ff9e07727c253c011cc767c86270869b3cd5a6a8 100644 (file)
--- a/src/insets/mailinset.C
+++ b/src/insets/mailinset.C
@@ -11,15 +11,17 @@
 #include <config.h>
 
 #include "mailinset.h"
-#include "inset.h"
+
 #include "BufferView.h"
-#include "frontends/LyXView.h"
+
 #include "frontends/Dialogs.h"
+#include "frontends/LyXView.h"
+
 #include "support/LAssert.h"
-#include "Lsstream.h"
 
 using namespace lyx::support;
 
+
 void MailInset::showDialog(BufferView * bv) const
 {
        Assert(bv);

diff --git a/src/insets/renderers.C b/src/insets/renderers.C
index caf8985e2ebe9801f66010df7000d3bf1d57712f..c33cab867c70ba4c9e481c2a08af75472b8ca0b3 100644 (file)
--- a/src/insets/renderers.C
+++ b/src/insets/renderers.C
@@ -12,7 +12,6 @@
 
 #include "insets/renderers.h"
 
-#include "buffer.h"
 #include "BufferView.h"
 #include "gettext.h"
 #include "metricsinfo.h"

diff --git a/src/insets/updatableinset.C b/src/insets/updatableinset.C
index e65b4f92909b88416ce8a034579de4624c1a24f0..30b83b0f2b76d9a36819125d67de64b7fd660a2d 100644 (file)
--- a/src/insets/updatableinset.C
+++ b/src/insets/updatableinset.C
@@ -14,16 +14,18 @@
 #include <config.h>
 
 #include "updatableinset.h"
+
 #include "BufferView.h"
-#include "funcrequest.h"
 #include "debug.h"
-#include "lyxfont.h"
-#include "WordLangTuple.h"
+#include "funcrequest.h"
 #include "lyxtext.h"
+#include "WordLangTuple.h"
+
 #include "support/lstrings.h"
 
 using namespace lyx::support;
 
+
 // some stuff for inset locking
 
 UpdatableInset::UpdatableInset()