From c9403be3b0e2ab2c4b549b5dd063d9d78f74cdcb Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 5 Sep 2003 03:10:30 +0000 Subject: [PATCH] Strip redundant #includes. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7669 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/graphics/ChangeLog | 4 ++++ src/graphics/GraphicsCache.C | 5 +---- src/graphics/GraphicsCacheItem.C | 9 +++------ src/graphics/GraphicsConverter.C | 7 ++----- src/graphics/GraphicsLoader.C | 6 ------ src/graphics/GraphicsParams.C | 7 ++++--- src/graphics/PreviewImage.C | 3 +-- src/graphics/PreviewLoader.C | 12 ++---------- src/graphics/PreviewedInset.C | 6 +----- src/graphics/Previews.C | 4 ---- 10 files changed, 18 insertions(+), 45 deletions(-) diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog index 4b1ae0c3f3..01736b3032 100644 --- a/src/graphics/ChangeLog +++ b/src/graphics/ChangeLog @@ -1,3 +1,7 @@ +2003-09-05 Angus Leeming + + * *.C: strip out redundant #includes. + 2003-09-04 Angus Leeming * LoaderQueue.C (get): diff --git a/src/graphics/GraphicsCache.C b/src/graphics/GraphicsCache.C index a220462f54..53b9a45d52 100644 --- a/src/graphics/GraphicsCache.C +++ b/src/graphics/GraphicsCache.C @@ -19,12 +19,9 @@ #include "support/filetools.h" -#include "frontends/lyx_gui.h" - -#include - namespace support = lyx::support; + namespace lyx { namespace graphics { diff --git a/src/graphics/GraphicsCacheItem.C b/src/graphics/GraphicsCacheItem.C index 7fc4f801eb..84d66086bd 100644 --- a/src/graphics/GraphicsCacheItem.C +++ b/src/graphics/GraphicsCacheItem.C @@ -13,20 +13,17 @@ #include #include "GraphicsCacheItem.h" -#include "GraphicsImage.h" #include "GraphicsConverter.h" - -#include "support/FileMonitor.h" +#include "GraphicsImage.h" #include "debug.h" -#include "support/LAssert.h" #include "support/filetools.h" +#include "support/FileMonitor.h" +#include "support/LAssert.h" #include "support/lyxlib.h" -#include #include -#include namespace support = lyx::support; diff --git a/src/graphics/GraphicsConverter.C b/src/graphics/GraphicsConverter.C index 13b4b91206..2f4a25487a 100644 --- a/src/graphics/GraphicsConverter.C +++ b/src/graphics/GraphicsConverter.C @@ -13,23 +13,19 @@ #include "GraphicsConverter.h" #include "converter.h" -#include "format.h" #include "debug.h" +#include "format.h" #include "support/filetools.h" -#include "support/forkedcall.h" #include "support/forkedcallqueue.h" #include "support/tostr.h" #include "support/lstrings.h" #include "support/lyxlib.h" #include -#include #include "Lsstream.h" -#include "support/LOstream.h" #include -#include // needed for pid_t namespace support = lyx::support; @@ -48,6 +44,7 @@ using support::unlink; using std::endl; using std::ostream; + namespace lyx { namespace graphics { diff --git a/src/graphics/GraphicsLoader.C b/src/graphics/GraphicsLoader.C index a4937f9e6f..7b05ffea56 100644 --- a/src/graphics/GraphicsLoader.C +++ b/src/graphics/GraphicsLoader.C @@ -12,18 +12,13 @@ #include "GraphicsLoader.h" -#include "GraphicsCache.h" #include "GraphicsCacheItem.h" #include "GraphicsImage.h" #include "GraphicsParams.h" #include "LoaderQueue.h" -#include "frontends/LyXView.h" - #include -#include -#include namespace lyx { namespace graphics { @@ -63,7 +58,6 @@ private: /// Params params_; - }; diff --git a/src/graphics/GraphicsParams.C b/src/graphics/GraphicsParams.C index a424546b62..e5d88f09b9 100644 --- a/src/graphics/GraphicsParams.C +++ b/src/graphics/GraphicsParams.C @@ -10,14 +10,15 @@ #include -#include - #include "GraphicsParams.h" -#include "Lsstream.h" + #include "lyxlength.h" +#include "Lsstream.h" + using std::abs; + namespace lyx { namespace graphics { diff --git a/src/graphics/PreviewImage.C b/src/graphics/PreviewImage.C index 3fae30b2d7..2f8c03df6c 100644 --- a/src/graphics/PreviewImage.C +++ b/src/graphics/PreviewImage.C @@ -11,14 +11,13 @@ #include #include "PreviewImage.h" -#include "PreviewLoader.h" #include "GraphicsImage.h" #include "GraphicsLoader.h" +#include "PreviewLoader.h" #include "support/lyxlib.h" #include -#include namespace support = lyx::support; diff --git a/src/graphics/PreviewLoader.C b/src/graphics/PreviewLoader.C index 9af42478de..b8192c0c94 100644 --- a/src/graphics/PreviewLoader.C +++ b/src/graphics/PreviewLoader.C @@ -18,29 +18,21 @@ #include "format.h" #include "debug.h" #include "lyxrc.h" -#include "LColor.h" -#include "Lsstream.h" - -#include "insets/inset.h" #include "frontends/lyx_gui.h" // hexname #include "support/filetools.h" #include "support/forkedcall.h" #include "support/forkedcontr.h" -#include "support/tostr.h" #include "support/lstrings.h" #include "support/lyxlib.h" +#include "support/tostr.h" #include -#include +#include "Lsstream.h" #include #include -#include -#include -#include -#include namespace support = lyx::support; diff --git a/src/graphics/PreviewedInset.C b/src/graphics/PreviewedInset.C index 258c6f0417..c6ebaf76b1 100644 --- a/src/graphics/PreviewedInset.C +++ b/src/graphics/PreviewedInset.C @@ -11,16 +11,12 @@ #include #include "PreviewedInset.h" -#include "GraphicsImage.h" -#include "PreviewLoader.h" #include "PreviewImage.h" +#include "PreviewLoader.h" #include "Previews.h" -#include "buffer.h" #include "BufferView.h" -#include "frontends/LyXView.h" - #include "support/lstrings.h" #include diff --git a/src/graphics/Previews.C b/src/graphics/Previews.C index e8c64b9886..acda22cf6a 100644 --- a/src/graphics/Previews.C +++ b/src/graphics/Previews.C @@ -16,12 +16,8 @@ #include "buffer.h" #include "lyxrc.h" -#include "insets/inset.h" - #include "support/LAssert.h" -#include - namespace support = lyx::support; -- 2.39.5