Removed all redundant using directives from the source.

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

diff --git a/src/BranchList.C b/src/BranchList.C
index 2198a7cc70ab6347c177f2a0f4a97c34516e12cb..f9ab44df823e0681dddd30fe498190a42c0c7cf8 100644 (file)
--- a/src/BranchList.C
+++ b/src/BranchList.C
@@ -16,7 +16,6 @@
 #include <functional>
 
 using std::bind2nd;
-using std::remove_if;
 using std::binary_function;
 using namespace lyx::support;
 

diff --git a/src/BufferView.C b/src/BufferView.C
index 69c73907d4f94d1104ae750fef80758101ff99f5..09669dc27e8e001c62482ae3801a7f3732782f4b 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -44,15 +44,10 @@
 
 extern BufferList bufferlist;
 
-using lyx::pos_type;
 using namespace lyx::support;
 
-using std::pair;
-using std::endl;
-using std::ifstream;
-using std::vector;
 using std::find;
-using std::count_if;
+using std::vector;
 
 
 BufferView::BufferView(LyXView * owner, int xpos, int ypos,

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index abcc8144daedb1d2412b1523fae0e7e77ebbfe89..3781ad43e5edb1041a8f49686d2fe764781e2e1a 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -65,10 +65,6 @@
 #include <boost/bind.hpp>
 
 
-using std::vector;
-using std::find_if;
-using std::find;
-using std::pair;
 using std::endl;
 using std::make_pair;
 using std::min;

diff --git a/src/ChangeLog b/src/ChangeLog
index 42703cc2269e320b9621e7a647caf1f4de854a52..f35aa151ad47147ff13a10df5b2ded7afedd8347 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,38 @@
+2003-09-08  Angus Leeming  <leeming@lyx.org>
+
+       * BranchList.C:
+       * BufferView.C:
+       * BufferView_pimpl.C:
+       * CutAndPaste.C:
+       * DepTable.C:
+       * LaTeX.C:
+       * LaTeXFeatures.C:
+       * LyXAction.C:
+       * MenuBackend.C:
+       * TextCache.C:
+       * aspell.C:
+       * buffer.C:
+       * bufferlist.C:
+       * changes.C:
+       * chset.C:
+       * converter.C:
+       * counters.C:
+       * debug.C:
+       * graph.C:
+       * ispell.C:
+       * lyx_cb.C:
+       * lyxfind.C:
+       * lyxfunc.C:
+       * lyxlex_pimpl.C:
+       * lyxrc.C:
+       * lyxrow.C:
+       * paragraph.C:
+       * rowpainter.C:
+       * texrow.C:
+       * text.C:
+       * text2.C:
+       * toc.C: remove redundant using directives.
+
 2003-09-07  Angus Leeming  <leeming@lyx.org>
 
        * LaTeXFeatures.h: remove #include "support/types.h".

diff --git a/src/Chktex.C b/src/Chktex.C
index 0651672dedd374e4cb68c1c261a04f8a48639ee2..94ac719c73aeb42233cc49a66ce90e7d13c30a90 100644 (file)
--- a/src/Chktex.C
+++ b/src/Chktex.C
@@ -25,8 +25,8 @@
 
 using namespace lyx::support;
 
-using std::ifstream;
 using std::getline;
+using std::ifstream;
 
 
 Chktex::Chktex(string const & chktex, string const & f, string const & p)

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index f03569133d82dec3986874c2918e3341b021df91..579bc0dc11a0e9dd9df476d909e0655096e66ebd 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -29,10 +29,9 @@
 #include "support/LAssert.h"
 #include "support/lstrings.h"
 
-using std::endl;
-using std::pair;
-using std::make_pair;
 using std::for_each;
+using std::make_pair;
+using std::pair;
 using std::vector;
 
 using namespace lyx::support;

diff --git a/src/DepTable.C b/src/DepTable.C
index adbf627e1f7d7a854726007d5f13b63b9ae4d75d..7326cd64554257e2889b93456f6e7cbe43bd0de5 100644 (file)
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -30,13 +30,12 @@ using std::time;
 
 using namespace lyx::support;
 
-using std::make_pair;
-using std::ofstream;
-using std::ifstream;
-using std::flush;
 using std::endl;
+using std::flush;
 using std::getline;
 
+using std::ofstream;
+using std::ifstream;
 
 inline
 bool DepTable::dep_info::changed() const

diff --git a/src/InsetList.C b/src/InsetList.C
index 0ab77397e22b35a141e1735b7a1dfdbea7706ab8..b1efab3835b4eb25edc65566dcb6a9a737793d40 100644 (file)
--- a/src/InsetList.C
+++ b/src/InsetList.C
@@ -18,12 +18,12 @@
 
 #include "insets/insetbranch.h"
 
-
 using lyx::pos_type;
 
+using std::endl;
 using std::lower_bound;
 using std::upper_bound;
-using std::endl;
+
 
 namespace {
 

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 09137f2276b479f0fa12c80e6858988f064cf356..8f35c72b1fa4fc559257fdf237754dbf677bedc5 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -37,13 +37,13 @@ using namespace lyx::support;
 using std::sscanf;
 #endif
 
-using std::ifstream;
-using std::getline;
 using std::endl;
-using std::vector;
+using std::getline;
+using std::ifstream;
 using std::set;
+using std::vector;
+
 using boost::regex;
-using boost::regex_match;
 
 #ifndef USE_INCLUDED_STRING
 using boost::smatch;

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 4238f6a28b81744f4b73c1b9072a4a73a3a83f84..4738c33f57bfc1852c9ed204020bcfe2ef34acfc 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -31,14 +31,13 @@
 
 using namespace lyx::support;
 
-using lyx::textclass_type;
-
 using std::endl;
-using std::list;
-using std::set;
 using std::find;
+
+using std::list;
 using std::ostream;
 using std::ostringstream;
+using std::set;
 
 
 LaTeXFeatures::LaTeXFeatures(BufferParams const & p)

diff --git a/src/LyXAction.C b/src/LyXAction.C
index 6d5ffdbf6b7cbadfead907e139eb22206125bb91..d5ff9ffd3bd38b92875daa52ca3a2d2a6e8e56db 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -23,8 +23,6 @@ using namespace lyx::support;
 
 using std::ostream;
 using std::endl;
-using std::pair;
-using std::make_pair;
 
 /*
      NAMING RULES FOR USER-COMMANDS

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 1a25d7188fb770eaeedfba7b822e0ab209dda83b..24ba9a8542ad16eef62196e7f23dfceb1c63c201 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -48,12 +48,12 @@ extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
 using namespace lyx::support;
 
 using std::endl;
-using std::vector;
-using std::max;
-using std::pair;
 using std::find_if;
+using std::max;
 using std::sort;
 
+using std::vector;
+
 // This is the global menu definition
 MenuBackend menubackend;
 

diff --git a/src/TextCache.C b/src/TextCache.C
index b6aac445d115301613e39ec38a1ecaf2524342f4..752f53685a5d2632d96627ed571f215029303640 100644 (file)
--- a/src/TextCache.C
+++ b/src/TextCache.C
@@ -17,13 +17,13 @@
 
 #include <algorithm>
 
-using std::ostream;
-using std::for_each;
-using std::remove_if;
-using std::find_if;
 using std::endl;
+using std::find_if;
+using std::for_each;
 using std::make_pair;
 
+using std::ostream;
+
 extern BufferList bufferlist;
 
 namespace {

diff --git a/src/Thesaurus.C b/src/Thesaurus.C
index 6013a96007da3692fb2e7e709791d31efc712b77..37376bc5b052610ad48cca8bcdfd908059b720a9 100644 (file)
--- a/src/Thesaurus.C
+++ b/src/Thesaurus.C
@@ -18,6 +18,7 @@
 
 using std::sort;
 
+
 Thesaurus::Thesaurus()
 {
        aik_ = new Aiksaurus;

diff --git a/src/ToolbarBackend.C b/src/ToolbarBackend.C
index 4fc07de1fb2351495d88ace9323281ad705f2c48..82a08673dfde5f1df4d27cce7df34a291c0d7520 100644 (file)
--- a/src/ToolbarBackend.C
+++ b/src/ToolbarBackend.C
@@ -23,13 +23,14 @@
 
 #include "frontends/controllers/ControlMath.h"
 
-
 using namespace lyx::support;
 
 using std::endl;
-using std::vector;
 using std::make_pair;
 
+using std::vector;
+
+
 ToolbarBackend toolbarbackend;
 
 namespace {

diff --git a/src/aspell.C b/src/aspell.C
index a16b7025e4f64e420a6ab7a4bd6444597e8338cb..6d7a2fa27856606ce493d9202b211b81fec5bd12 100644 (file)
--- a/src/aspell.C
+++ b/src/aspell.C
@@ -24,7 +24,6 @@
 
 using namespace lyx::support;
 
-using std::endl;
 
 ASpell::ASpell(BufferParams const &, string const & lang)
        : els(0), spell_error_object(0)

diff --git a/src/buffer.C b/src/buffer.C
index c6d0bdea26c7a49b42f9ca30114c4fa0bf1ee975..cde8351c37760c740eeed64046cd5a417cf97991 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -68,28 +68,22 @@
 
 using namespace lyx::support;
 
-#ifndef CXX_GLOBAL_CSTD
-using std::pow;
-#endif
+using std::endl;
+using std::for_each;
+using std::make_pair;
 
+using std::ifstream;
+using std::list;
+using std::ios;
 using std::ostream;
 using std::ostringstream;
 using std::ofstream;
-using std::ifstream;
-using std::fstream;
-using std::ios;
-using std::setw;
-using std::endl;
 using std::pair;
-using std::make_pair;
-using std::vector;
-using std::map;
 using std::stack;
-using std::list;
-using std::for_each;
+using std::vector;
 
 using lyx::pos_type;
-using lyx::textclass_type;
+
 
 // all these externs should eventually be removed.
 extern BufferList bufferlist;

diff --git a/src/bufferlist.C b/src/bufferlist.C
index bde19e7383e3c5b0832155eca584e466f4623e4a..44e948c6a2783562c2ff66c3731a3e5778836274 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -31,12 +31,12 @@
 
 using namespace lyx::support;
 
-using std::vector;
-using std::find;
 using std::endl;
+using std::find;
 using std::find_if;
 using std::for_each;
-using std::mem_fun;
+
+using std::vector;
 
 
 BufferList::BufferList()

diff --git a/src/changes.C b/src/changes.C
index e7a82c8658ace9822f08b91a0cb420287e346508..f27207aa98dcc91e531398282a5af4ff2769c47d 100644 (file)
--- a/src/changes.C
+++ b/src/changes.C
@@ -19,7 +19,6 @@
 
 using namespace lyx::support;
 
-using std::vector;
 using std::endl;
 using lyx::pos_type;
 

diff --git a/src/chset.C b/src/chset.C
index 33b94c895e4ccf92bbea57444ecabd785f5972dc..3c783e09dfda6d84010075d0c2d6b0abc95fafb0 100644 (file)
--- a/src/chset.C
+++ b/src/chset.C
@@ -22,13 +22,14 @@
 
 using namespace lyx::support;
 
-using std::ifstream;
+using std::endl;
 using std::getline;
-using std::pair;
 using std::make_pair;
-using std::endl;
+
+using std::ifstream;
+using std::pair;
+
 using boost::regex;
-using boost::regex_match;
 
 #ifndef USE_INCLUDED_STRING
 using boost::smatch;
@@ -37,7 +38,6 @@ using boost::cmatch;
 #endif
 
 
-
 bool CharacterSet::loadFile(string const & fname)
 {
        map_.clear();

diff --git a/src/converter.C b/src/converter.C
index 7da9ed0a869fff985e24ca25eecd66c60ef25a8e..03b8fc0ea42bfb6aba1e2f200ba79d32b9d16cba 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -25,18 +25,14 @@
 #include "support/path.h"
 #include "support/systemcall.h"
 
-
-
 using namespace lyx::support;
 
-#ifndef CXX_GLOBAL_CSTD
-using std::isdigit;
-#endif
-
-using std::vector;
 using std::endl;
 using std::find_if;
 
+using std::vector;
+
+
 namespace {
 
 string const token_from("$$i");

diff --git a/src/counters.C b/src/counters.C
index 6e7c5f1608f9b8699fd23aa24f15a5f7a9288cf3..b1ae79a1d9418162c5392994012863b5ec1d2916 100644 (file)
--- a/src/counters.C
+++ b/src/counters.C
@@ -22,7 +22,6 @@ using namespace lyx::support;
 
 using std::endl;
 using std::ostringstream;
-using std::vector;
 
 
 Counter::Counter()

diff --git a/src/debug.C b/src/debug.C
index 478fe99a7ba08887abb983d8d47ad4b83d211405..f89120ee0a2c332dcd24441bb79fdb153fa6440e 100644 (file)
--- a/src/debug.C
+++ b/src/debug.C
@@ -21,7 +21,6 @@ using namespace lyx::support;
 
 using std::ostream;
 using std::setw;
-using std::endl;
 
 namespace {
 

diff --git a/src/exporter.C b/src/exporter.C
index 6ca03d33350d0ea672b0f886296d56fdd4121c4d..63af5855fc3d1a1d2006c52821894e5a3172043b 100644 (file)
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -32,9 +32,10 @@
 
 using namespace lyx::support;
 
-using std::vector;
 using std::find;
 
+using std::vector;
+
 
 namespace {
 

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 4d66f650f5bed402c472086e7678fee326b34742..c79de908df935389c93e78cfe7197d6e07fc9161 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-08  Angus Leeming  <leeming@lyx.org>
+
+       * ControlCommandBuffer.C:
+       * ControlDocument.C:
+       * ControlPrefs.C:
+       * helper_funcs.C:
+       * tex_helpers.C: remove redundant using directives.
+
 2003-09-07  Angus Leeming  <leeming@lyx.org>
 
        * ButtonController.h:

diff --git a/src/frontends/controllers/ControlCommandBuffer.C b/src/frontends/controllers/ControlCommandBuffer.C
index e2c348c3478b84e07be49368acda38bd60b5eae5..60dc596bf28e789ef0d4e65b4bddd3e929027369 100644 (file)
--- a/src/frontends/controllers/ControlCommandBuffer.C
+++ b/src/frontends/controllers/ControlCommandBuffer.C
@@ -22,12 +22,14 @@
 
 using namespace lyx::support;
 
-using std::vector;
 using std::back_inserter;
 using std::transform;
-using std::endl;
+
+using std::vector;
+
 using namespace bv_funcs;
 
+
 namespace {
 
 struct prefix_p {

diff --git a/src/frontends/controllers/ControlDocument.C b/src/frontends/controllers/ControlDocument.C
index 54939b63f5faa48a4c617ff3c69d263012571675..40a7b6d88a6744353d09792ed843114c2ee6a675 100644 (file)
--- a/src/frontends/controllers/ControlDocument.C
+++ b/src/frontends/controllers/ControlDocument.C
@@ -33,8 +33,6 @@
 
 using namespace lyx::support;
 
-using std::endl;
-
 
 ControlDocument::ControlDocument(LyXView & lv, Dialogs & d)
        : ControlDialogBD(lv, d), bp_(0)

diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C
index 52d19bcdf6ca3bf5ed355cd1d0f13bd0f9657529..47d1d5f9bb1c0a108db4cb077ea156a9d28cc66f 100644 (file)
--- a/src/frontends/controllers/ControlGraphics.C
+++ b/src/frontends/controllers/ControlGraphics.C
@@ -33,8 +33,9 @@
 
 using namespace lyx::support;
 
-using std::pair;
 using std::make_pair;
+
+using std::pair;
 using std::vector;
 
 

diff --git a/src/frontends/controllers/ControlPrefs.C b/src/frontends/controllers/ControlPrefs.C
index 7c4e4504d50ae57a078a569ea29190781e5315c7..97447eeced04bce1f0c390045d7c08882505fe68 100644 (file)
--- a/src/frontends/controllers/ControlPrefs.C
+++ b/src/frontends/controllers/ControlPrefs.C
@@ -32,7 +32,6 @@
 
 using namespace lyx::support;
 
-using std::endl;
 using std::pair;
 
 

diff --git a/src/frontends/controllers/helper_funcs.C b/src/frontends/controllers/helper_funcs.C
index 14b3aa278fba1e0f481205ce48bbceb14b5c9319..6128056974f1a16e72e51449584f47e0f3ba4967 100644 (file)
--- a/src/frontends/controllers/helper_funcs.C
+++ b/src/frontends/controllers/helper_funcs.C
@@ -22,7 +22,6 @@
 
 using namespace lyx::support;
 
-using std::make_pair;
 using std::pair;
 using std::vector;
 

diff --git a/src/frontends/controllers/tex_helpers.C b/src/frontends/controllers/tex_helpers.C
index 78c57e5e9ada91b8c774fc6975592642dce38a7d..d542bbabca326d2f39b11de7988d13b64c3a8ccf 100644 (file)
--- a/src/frontends/controllers/tex_helpers.C
+++ b/src/frontends/controllers/tex_helpers.C
@@ -26,10 +26,7 @@
 
 using namespace lyx::support;
 
-using std::vector;
 using std::endl;
-using std::sort;
-using std::unique;
 
 
 // build filelists of all availabe bst/cls/sty-files. done through

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index ad0d92be48d2c83e0770f93ea234d77a90b817e4..a2c003fef26ed4424a61b40b059a351020342fcf 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,25 @@
+2003-09-08  Angus Leeming  <leeming@lyx.org>
+
+       * FileDialog.C:
+       * QCitation.C:
+       * QCitationDialog.C:
+       * QCommandBuffer.C:
+       * QContentPane.C:
+       * QGraphics.C:
+       * QLMenubar.C:
+       * QLPopupMenu.C:
+       * QLog.C:
+       * QMathDialog.C:
+       * QParagraphDialog.C:
+       * QPrefsDialog.C:
+       * QRef.C:
+       * QTexinfo.C:
+       * QtView.C:
+       * lyx_gui.C:
+       * panelstack.C:
+       * qscreen.C:
+       * qt_helpers.C: remove redundant using directives.
+
 2003-09-07  Angus Leeming  <leeming@lyx.org>
 
        * BulletsModule.h: remove #include "support/std_string.h", <vector>.

diff --git a/src/frontends/qt2/FileDialog.C b/src/frontends/qt2/FileDialog.C
index 5434d6bae31d8ada7c515d4ef0ee20d7fe8003a1..f452a3578f21f59c055195a5ba0af66c60329407 100644 (file)
--- a/src/frontends/qt2/FileDialog.C
+++ b/src/frontends/qt2/FileDialog.C
@@ -17,10 +17,6 @@
 #include "qt_helpers.h"
 #include "gettext.h"
 
-#include <utility>
-
-using std::make_pair;
-using std::pair;
 using std::endl;
 
 

diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C
index 81ea3d993e5669e3dff48cdbbdece63fafda60fb..50fc0dd09a32aae16a275c4275d3bf79f7b8946e 100644 (file)
--- a/src/frontends/qt2/QAbout.C
+++ b/src/frontends/qt2/QAbout.C
@@ -27,6 +27,7 @@
 using namespace lyx::support;
 
 using std::getline;
+
 using std::istringstream;
 using std::ostringstream;
 

diff --git a/src/frontends/qt2/QCitation.C b/src/frontends/qt2/QCitation.C
index 93030b036f834fe9d78cc2308ac630091598250a..85183bccf3ac57eef4b16f846050e70804bec6c6 100644 (file)
--- a/src/frontends/qt2/QCitation.C
+++ b/src/frontends/qt2/QCitation.C
@@ -31,14 +31,11 @@
 using namespace lyx::support;
 
 using std::find;
-using std::max;
-using std::min;
-using std::pair;
-using std::sort;
+
 using std::vector;
 
-typedef QController<ControlCitation, QView<QCitationDialog> > base_class;
 
+typedef QController<ControlCitation, QView<QCitationDialog> > base_class;
 
 QCitation::QCitation(Dialog & parent)
        : base_class(parent, _("LyX: Citation Reference"))

diff --git a/src/frontends/qt2/QCitationDialog.C b/src/frontends/qt2/QCitationDialog.C
index c54e8ef4fa27ecd9d77645af9d2753949050411b..b55cf0b8b5d49741db3d940f719633ce63263296 100644 (file)
--- a/src/frontends/qt2/QCitationDialog.C
+++ b/src/frontends/qt2/QCitationDialog.C
@@ -24,8 +24,6 @@
 #include "QCitation.h"
 
 using std::vector;
-using std::find;
-using std::max;
 
 
 QCitationDialog::QCitationDialog(QCitation * form)

diff --git a/src/frontends/qt2/QCommandBuffer.C b/src/frontends/qt2/QCommandBuffer.C
index 34d4c9e91424d3c6800298cc01838120374f5981..d9658b6c1f173961a95c5b3a4878cc00c19c1b33 100644 (file)
--- a/src/frontends/qt2/QCommandBuffer.C
+++ b/src/frontends/qt2/QCommandBuffer.C
@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "support/filetools.h"
 #include "controllers/ControlCommandBuffer.h"
 #include "qt_helpers.h"
@@ -28,7 +27,6 @@
 using namespace lyx::support;
 
 using std::vector;
-using std::endl;
 
 namespace {
 

diff --git a/src/frontends/qt2/QContentPane.C b/src/frontends/qt2/QContentPane.C
index 03f0b3cda00d9507fb13c3c67dc6b37c106f3bbd..627b62433e9e33f354c63e7c9701b6e0993a6436 100644 (file)
--- a/src/frontends/qt2/QContentPane.C
+++ b/src/frontends/qt2/QContentPane.C
@@ -20,7 +20,6 @@
 
 #include "funcrequest.h"
 
-using std::endl;
 
 namespace {
 

diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C
index 80a6f2071b00fceb028792795aa25a541993dbaf..84b1e901061256f30f8d30242bfa320e66df13e8 100644 (file)
--- a/src/frontends/qt2/QGraphics.C
+++ b/src/frontends/qt2/QGraphics.C
@@ -37,7 +37,6 @@
 using namespace lyx::support;
 
 using std::vector;
-using std::endl;
 
 typedef QController<ControlGraphics, QView<QGraphicsDialog> > base_class;
 

diff --git a/src/frontends/qt2/QLImage.C b/src/frontends/qt2/QLImage.C
index 6d06884df00cfec0424d469f906b76b68f6e79b5..dc51677182c030e5a50e0b440eb2cfb5ac2fe336 100644 (file)
--- a/src/frontends/qt2/QLImage.C
+++ b/src/frontends/qt2/QLImage.C
@@ -27,8 +27,9 @@
 
 using namespace lyx::support;
 
-using std::find_if;
 using std::endl;
+using std::find_if;
+
 
 namespace lyx {
 namespace graphics {

diff --git a/src/frontends/qt2/QLMenubar.C b/src/frontends/qt2/QLMenubar.C
index d9a20ecb7782d143ce61782f3b83d0d604a71579..e21519e4ccbf8c0315033d7bf689fafa6639e10f 100644 (file)
--- a/src/frontends/qt2/QLMenubar.C
+++ b/src/frontends/qt2/QLMenubar.C
@@ -20,11 +20,6 @@
 #include <qcursor.h>
 
 
-using std::endl;
-using std::vector;
-using std::max;
-using std::min;
-using std::for_each;
 using std::pair;
 
 

diff --git a/src/frontends/qt2/QLPainter.C b/src/frontends/qt2/QLPainter.C
index 54c9a1305fc81d99688ec3992118b0a9252458c6..2ffc7ddf5e1ddb6b81934cbfcc67da5c3e7d2364 100644 (file)
--- a/src/frontends/qt2/QLPainter.C
+++ b/src/frontends/qt2/QLPainter.C
@@ -23,7 +23,6 @@
 
 #include <qpainter.h>
 
-
 using std::endl;
 
 

diff --git a/src/frontends/qt2/QLPopupMenu.C b/src/frontends/qt2/QLPopupMenu.C
index 5461dfc03a709e292308f747faeff05a313bc207..067281f18a31372ab70f7bfef13ce1294f9a2323 100644 (file)
--- a/src/frontends/qt2/QLPopupMenu.C
+++ b/src/frontends/qt2/QLPopupMenu.C
@@ -23,7 +23,6 @@
 
 using namespace lyx::support;
 
-using std::endl;
 using std::pair;
 using std::make_pair;
 

diff --git a/src/frontends/qt2/QLToolbar.C b/src/frontends/qt2/QLToolbar.C
index 8f088fa8ca751da30174939dfed7e8214ed55d85..30404a2e51caf078aa4a255f5e3b5660351d8673 100644 (file)
--- a/src/frontends/qt2/QLToolbar.C
+++ b/src/frontends/qt2/QLToolbar.C
@@ -12,7 +12,6 @@
 
 #include <config.h>
 
-
 #include "debug.h"
 #include "gettext.h"
 #include "lyxfunc.h"
@@ -20,8 +19,6 @@
 #include "FuncStatus.h"
 #include "buffer.h"
 
-
-
 #include "QtView.h"
 #include "QLToolbar.h"
 

diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt2/QLog.C
index cb03fde8c6133bc9e18cfb4a3ff2a5b06988d6b1..124fbd3cdbc466c1ec73679cbfe744806635256e 100644 (file)
--- a/src/frontends/qt2/QLog.C
+++ b/src/frontends/qt2/QLog.C
@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "qt_helpers.h"
 #include "ControlLog.h"
 #include "support/std_sstream.h"
@@ -25,7 +24,6 @@
 #include <fstream>
 
 using std::ifstream;
-using std::getline;
 using std::ostringstream;
 
 typedef QController<ControlLog, QView<QLogDialog> > base_class;

diff --git a/src/frontends/qt2/QLyXKeySym.C b/src/frontends/qt2/QLyXKeySym.C
index b19a170526c670fc38b9262d464534b66e0f92aa..8fa058e9d14e67bc4554dfa22e67b740e4406c63 100644 (file)
--- a/src/frontends/qt2/QLyXKeySym.C
+++ b/src/frontends/qt2/QLyXKeySym.C
@@ -11,7 +11,6 @@
 
 #include <config.h>
 
-
 #include "QLyXKeySym.h"
 #include "qlkey.h"
 #include "debug.h"
@@ -23,8 +22,10 @@
 #include <map>
 
 using std::endl;
+
 using std::map;
 
+
 namespace {
 
 typedef map<string, QTextCodec *> EncodingMap;

diff --git a/src/frontends/qt2/QMathDialog.C b/src/frontends/qt2/QMathDialog.C
index db55381b7a24b8ea5d628125c4840a5ac30eff68..c28c400213075cdad0e4ef77ebb1bacdd31758ec 100644 (file)
--- a/src/frontends/qt2/QMathDialog.C
+++ b/src/frontends/qt2/QMathDialog.C
@@ -26,8 +26,6 @@
 #include <qlistbox.h>
 #include <qpopupmenu.h>
 
-using std::min;
-using std::max;
 
 
 class QScrollViewSingle : public QScrollView {

diff --git a/src/frontends/qt2/QParagraph.C b/src/frontends/qt2/QParagraph.C
index fb1434b82ec47e21a1953f0ca52f37d5c4330bc5..45f5ea5ecbec48b4089edbf1db1a987ba16d7e3b 100644 (file)
--- a/src/frontends/qt2/QParagraph.C
+++ b/src/frontends/qt2/QParagraph.C
@@ -35,10 +35,12 @@
 
 using namespace lyx::support;
 
-using std::vector;
 using std::bind2nd;
 using std::remove_if;
 
+using std::vector;
+
+
 typedef QController<ControlParagraph, QView<QParagraphDialog> > base_class;
 
 

diff --git a/src/frontends/qt2/QParagraphDialog.C b/src/frontends/qt2/QParagraphDialog.C
index fb0e6cf4582a5344f14ed0a1e977efeeb848b3ae..e3a8420d3a50f83e40177a4865fe2e990a4dc3e5 100644 (file)
--- a/src/frontends/qt2/QParagraphDialog.C
+++ b/src/frontends/qt2/QParagraphDialog.C
@@ -11,7 +11,6 @@
 
 #include <config.h>
 
-
 #include "QParagraphDialog.h"
 #include "QParagraph.h"
 
@@ -24,9 +23,6 @@
 #include "qt_helpers.h"
 
 
-using std::vector;
-
-
 QParagraphDialog::QParagraphDialog(QParagraph * form)
        : QParagraphDialogBase(0, 0, false, 0),
        form_(form)

diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C
index 895dde11cce50f84addcee9d9f438971530536c1..2e8d83fa9ee31b042a2389c5a33554a22319fcc4 100644 (file)
--- a/src/frontends/qt2/QPrefs.C
+++ b/src/frontends/qt2/QPrefs.C
@@ -51,12 +51,13 @@
 
 using namespace lyx::support;
 
-using std::vector;
-using std::pair;
-using std::ostringstream;
+using std::endl;
 using std::setfill;
 using std::setw;
-using std::endl;
+
+using std::ostringstream;
+using std::pair;
+using std::vector;
 
 
 typedef Qt2CB<ControlPrefs, Qt2DB<QPrefsDialog> > base_class;

diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C
index bee666f740e0075d08c39b56a1c76a46a104c314..f1ed5b091431f5f8bd2166542b01fe39b5b367b7 100644 (file)
--- a/src/frontends/qt2/QPrefsDialog.C
+++ b/src/frontends/qt2/QPrefsDialog.C
@@ -46,7 +46,6 @@
 #include "qcoloritem.h"
 #include "qfontexample.h"
 
-using std::endl;
 
 QPrefsDialog::QPrefsDialog(QPrefs * form)
        : QPrefsDialogBase(0, 0, false, 0), form_(form)

diff --git a/src/frontends/qt2/QRef.C b/src/frontends/qt2/QRef.C
index 98310bfe553b162ffa0226dfcc0658e08470afb8..902b122f551ba617921f37ab4c8fd3d289c3c13b 100644 (file)
--- a/src/frontends/qt2/QRef.C
+++ b/src/frontends/qt2/QRef.C
@@ -27,11 +27,7 @@
 
 #include "qt_helpers.h"
 
-using std::find;
-using std::max;
-using std::sort;
 using std::vector;
-using std::endl;
 
 
 typedef QController<ControlRef, QView<QRefDialog> > base_class;

diff --git a/src/frontends/qt2/QTexinfo.C b/src/frontends/qt2/QTexinfo.C
index 42caeb5671ded8795361055fa7a52332c3e1db4b..b021016f041cd8dfc8d67467b80c6a0f7edd75ad 100644 (file)
--- a/src/frontends/qt2/QTexinfo.C
+++ b/src/frontends/qt2/QTexinfo.C
@@ -24,7 +24,6 @@
 
 using namespace lyx::support;
 
-using std::vector;
 
 typedef QController<ControlTexinfo, QView<QTexinfoDialog> > base_class;
 

diff --git a/src/frontends/qt2/QToc.C b/src/frontends/qt2/QToc.C
index 3be90bd2399ca2d6e7f384da36f5f5832a8decfe..507bcbaeb8fd12a0523d8937c312e36b1887f4ff 100644 (file)
--- a/src/frontends/qt2/QToc.C
+++ b/src/frontends/qt2/QToc.C
@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include <stack>
 
 #include "qt_helpers.h"
@@ -25,10 +24,12 @@
 #include <qcombobox.h>
 
 using std::endl;
+
 using std::pair;
 using std::stack;
 using std::vector;
 
+
 typedef QController<ControlToc, QView<QTocDialog> > base_class;
 
 QToc::QToc(Dialog & parent)

diff --git a/src/frontends/qt2/QWorkArea.C b/src/frontends/qt2/QWorkArea.C
index 8bfee1c6b3b59e582b0b635e0f76b81ab3e8ee23..75f0e06ceb607ca5d7f6e695122cc93308e9a4f9 100644 (file)
--- a/src/frontends/qt2/QWorkArea.C
+++ b/src/frontends/qt2/QWorkArea.C
@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "QWorkArea.h"
 #include "debug.h"
 #include "qt_helpers.h"
@@ -28,9 +27,9 @@
 #include <X11/Xlib.h>
 #endif
 
-
 using std::endl;
 
+
 QWorkArea::QWorkArea(int, int, int, int)
        : WorkArea(), QWidget(qApp->mainWidget()), painter_(*this)
 {

diff --git a/src/frontends/qt2/QtView.C b/src/frontends/qt2/QtView.C
index 343614aa69b11b27aa0b92d47357f970670eccee..e165cc3671ccd0af5a8fec7dfcca8a7b5654ff89 100644 (file)
--- a/src/frontends/qt2/QtView.C
+++ b/src/frontends/qt2/QtView.C
@@ -11,14 +11,12 @@
 
 #include <config.h>
 
-
 #include "lyx_cb.h"
 #include "support/filetools.h"
 #include "MenuBackend.h"
 #include "lyxfunc.h"
 #include "BufferView.h"
 
-
 #include <boost/bind.hpp>
 
 #include "QtView.h"
@@ -32,7 +30,6 @@
 
 using namespace lyx::support;
 
-using std::endl;
 
 namespace {
 

diff --git a/src/frontends/qt2/iconpalette.C b/src/frontends/qt2/iconpalette.C
index 0b4f6b006b28eab7656bd0b704fa0b03eb92bb50..469fa379a28b1c29d97b0a311e17e3f8906e351d 100644 (file)
--- a/src/frontends/qt2/iconpalette.C
+++ b/src/frontends/qt2/iconpalette.C
@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "debug.h"
 
 #include "iconpalette.h"
@@ -22,9 +21,11 @@
 
 using std::endl;
 using std::make_pair;
-using std::vector;
 using std::max;
 
+using std::vector;
+
+
 int const button_size = 40;
 
 

diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt2/lyx_gui.C
index 79a2abca9991375f4e92339dda89d3b6dd054e5f..8be032184df6cfdb3c9eabef6f6dbd6369be23ba 100644 (file)
--- a/src/frontends/qt2/lyx_gui.C
+++ b/src/frontends/qt2/lyx_gui.C
@@ -47,9 +47,9 @@ using namespace lyx::support;
 using std::exit;
 #endif
 
-using std::vector;
 using std::map;
-using std::endl;
+using std::vector;
+
 
 extern BufferList bufferlist;
 

diff --git a/src/frontends/qt2/panelstack.C b/src/frontends/qt2/panelstack.C
index b205e94a24a78b529d3d804e204f5f58ad1e75bc..26d6d8a83b6347827940e055f4992090edf93123 100644 (file)
--- a/src/frontends/qt2/panelstack.C
+++ b/src/frontends/qt2/panelstack.C
@@ -22,8 +22,6 @@
 
 using namespace lyx::support;
 
-using std::map;
-
 
 PanelStack::PanelStack(QWidget * parent, const char * name)
        : QWidget(parent, name)

diff --git a/src/frontends/qt2/qfont_loader.C b/src/frontends/qt2/qfont_loader.C
index 5377ff20072493649eaaaaab0d7151f30ae6b4bb..63ea634c71027f1f1eca902e708076d788abda93 100644 (file)
--- a/src/frontends/qt2/qfont_loader.C
+++ b/src/frontends/qt2/qfont_loader.C
@@ -32,10 +32,11 @@
 using namespace lyx::support;
 
 using std::endl;
-using std::vector;
-using std::pair;
 using std::make_pair;
 
+using std::pair;
+using std::vector;
+
 namespace {
 
 void addFontPath()

diff --git a/src/frontends/qt2/qscreen.C b/src/frontends/qt2/qscreen.C
index d3489afec68421cacaf436d854514272e74bd5ae..1225a89cfe87eee8e196e95b67b8729f9146c432 100644 (file)
--- a/src/frontends/qt2/qscreen.C
+++ b/src/frontends/qt2/qscreen.C
@@ -10,8 +10,6 @@
 
 #include <config.h>
 
-
-
 #include "QWorkArea.h"
 #include "qscreen.h"
 #include "debug.h"
@@ -19,8 +17,7 @@
 #include <qapplication.h>
 
 using std::endl;
-using std::max;
-using std::min;
+
 
 namespace {
 

diff --git a/src/frontends/qt2/qt_helpers.C b/src/frontends/qt2/qt_helpers.C
index 0c0971c4e2a032c720da95762ea316c40ad95a5e..864955d25f86fdc33b9623707c4089378dd94b57 100644 (file)
--- a/src/frontends/qt2/qt_helpers.C
+++ b/src/frontends/qt2/qt_helpers.C
@@ -19,10 +19,10 @@
 #include <qlineedit.h>
 #include <qtextcodec.h>
 
+using std::make_pair;
 
 using std::pair;
-using std::make_pair;
-using std::min;
+
 
 string makeFontName(string const & family, string const & foundry)
 {

diff --git a/src/frontends/xforms/Alert_pimpl.C b/src/frontends/xforms/Alert_pimpl.C
index 892bd49560d41a00f9b69366e43c94b747b810c5..e25a891d80020c6fe8bfe01d55a4309a1d9c34b2 100644 (file)
--- a/src/frontends/xforms/Alert_pimpl.C
+++ b/src/frontends/xforms/Alert_pimpl.C
@@ -22,7 +22,6 @@
 
 #include "lyx_forms.h"
 
-using std::endl;
 using std::make_pair;
 using std::pair;
 

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 6da72b2368d386a45c968e5b397c6354b7a6b62a..67d370a9206b67e4416d250a82ecc55f36632fb6 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,23 @@
+2003-09-08  Angus Leeming  <leeming@lyx.org>
+
+       * Alert_pimpl.C:
+       * FileDialog.C:
+       * FormBibtex.C:
+       * FormCharacter.C:
+       * FormCitation.C:
+       * FormDocument.C:
+       * FormMathsDelim.C:
+       * FormNote.C:
+       * FormPreferences.C:
+       * FormSpellchecker.C:
+       * FormToc.C:
+       * RadioButtonGroup.C:
+       * XFormsMenubar.C:
+       * XMiniBuffer.C:
+       * XPainter.C:
+       * xforms_helpers.C:
+       * xscreen.C: remove redundant using directives.
+
 2003-09-07  Angus Leeming  <leeming@lyx.org>
 
        * FormAboutlyx.h: remove #include <boost/scoped_ptr.hpp>.

diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C
index 102bfd818742cd60b68de46e093cf73c1df5589e..edb334378d55d58e589c410e21062e494ece38e5 100644 (file)
--- a/src/frontends/xforms/Color.C
+++ b/src/frontends/xforms/Color.C
@@ -30,6 +30,7 @@ using std::floor;
 using std::max;
 using std::min;
 using std::setw;
+
 using std::istringstream;
 using std::ostringstream;
 

diff --git a/src/frontends/xforms/FileDialog.C b/src/frontends/xforms/FileDialog.C
index 9e06794288be875507c0a9dba1d3c85ef6731d39..df848ead72d5e4fc606f3ab6e109cb483d64f4dd 100644 (file)
--- a/src/frontends/xforms/FileDialog.C
+++ b/src/frontends/xforms/FileDialog.C
@@ -21,8 +21,6 @@
 using namespace lyx::support;
 
 using std::endl;
-using std::make_pair;
-using std::pair;
 
 
 FileDialog::FileDialog(string const &t, kb_action s, Button b1, Button b2)

diff --git a/src/frontends/xforms/FormBibtex.C b/src/frontends/xforms/FormBibtex.C
index be56c77798903eed301314a6955b195baa3cb28a..54ccab834e9147c22e27348e066c76f4b30e371a 100644 (file)
--- a/src/frontends/xforms/FormBibtex.C
+++ b/src/frontends/xforms/FormBibtex.C
@@ -29,7 +29,6 @@
 
 using namespace lyx::support;
 
-using std::sort;
 using std::vector;
 
 

diff --git a/src/frontends/xforms/FormCharacter.C b/src/frontends/xforms/FormCharacter.C
index dc457b3041bc247c10fbd03e802dc096d95b2715..5669cab9a8da84d7fad81ffd89de6f3e42b5a1a8 100644 (file)
--- a/src/frontends/xforms/FormCharacter.C
+++ b/src/frontends/xforms/FormCharacter.C
@@ -27,7 +27,6 @@
 
 using namespace lyx::support;
 
-using std::find;
 using std::vector;
 
 

diff --git a/src/frontends/xforms/FormCitation.C b/src/frontends/xforms/FormCitation.C
index 74b8d18275a1d95baf7a74b5047b4bfcc749cfbe..14e2cd83ed702af43fefe26a273c55b79dce2249 100644 (file)
--- a/src/frontends/xforms/FormCitation.C
+++ b/src/frontends/xforms/FormCitation.C
@@ -27,9 +27,7 @@ using namespace lyx::support;
 
 using std::find;
 using std::max;
-using std::min;
-using std::sort;
-using std::pair;
+
 using std::vector;
 
 

diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index b99e97b1d0c9b7e23b28f0892752a1099419ee16..8bf07f1664e6d57ab5b8936d92cd79be65f26a87 100644 (file)
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -48,8 +48,7 @@ using namespace lyx::support;
 
 using std::bind2nd;
 using std::endl;
-using std::setw;
-using std::setfill;
+
 using std::vector;
 
 

diff --git a/src/frontends/xforms/FormFiledialog.C b/src/frontends/xforms/FormFiledialog.C
index e4f3bf51b873c50690682bdf2bb20247f55c12db..325b03ab95e5add076a2d26d238c1bb81dbe4101 100644 (file)
--- a/src/frontends/xforms/FormFiledialog.C
+++ b/src/frontends/xforms/FormFiledialog.C
@@ -55,6 +55,7 @@
 
 using std::max;
 using std::sort;
+
 using std::map;
 
 using namespace lyx::support;

diff --git a/src/frontends/xforms/FormForks.C b/src/frontends/xforms/FormForks.C
index 81555e5d9f6c73d378da1b721dc6e080346b899f..edf91d8b85317416e2b813a70d926aadd0271158 100644 (file)
--- a/src/frontends/xforms/FormForks.C
+++ b/src/frontends/xforms/FormForks.C
@@ -30,6 +30,7 @@ using namespace lyx::support;
 
 using std::find;
 using std::find_if;
+
 using std::vector;
 
 

diff --git a/src/frontends/xforms/FormMathsDelim.C b/src/frontends/xforms/FormMathsDelim.C
index b00040dfbb958bc421a007f840b88fcaaad1f0c1..4acbbb05112a6d0dba7649f046ddfe73c5f6b27e 100644 (file)
--- a/src/frontends/xforms/FormMathsDelim.C
+++ b/src/frontends/xforms/FormMathsDelim.C
@@ -44,7 +44,6 @@ static char const * delim_values[] = {
        "langle",  "rangle", "|", "Vert", ".", 0
 };
 
-using std::endl;
 
 
 typedef FormController<ControlMath, FormView<FD_maths_delim> > base_class;

diff --git a/src/frontends/xforms/FormNote.C b/src/frontends/xforms/FormNote.C
index b60e01f6b09896122653dd5796813643e1230185..e1a2aac4e6085028936cc6968e1f3a99ca8f04a8 100644 (file)
--- a/src/frontends/xforms/FormNote.C
+++ b/src/frontends/xforms/FormNote.C
@@ -8,7 +8,6 @@
  * Full author contact details are available in file CREDITS.
  */
 
-
 #include <config.h>
 
 #include "FormNote.h"
@@ -22,8 +21,6 @@
 
 #include "lyx_forms.h"
 
-using std::vector;
-
 
 typedef FormController<ControlNote, FormView<FD_note> > base_class;
 

diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C
index bde1a2be7df8928f052c2e321439d50c32c6f013..8895e22ef17c70078b5bb5c929b0888f7ea9d37c 100644 (file)
--- a/src/frontends/xforms/FormParagraph.C
+++ b/src/frontends/xforms/FormParagraph.C
@@ -38,6 +38,7 @@ using namespace lyx::support;
 
 using std::bind2nd;
 using std::remove_if;
+
 using std::vector;
 
 

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 231179bf08e0c7d87822d547ba4abad22e463e3c..f8c5ac63b7616df2307c17ee9b930f3c7c8e364e 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -41,8 +41,7 @@ using std::endl;
 using std::make_pair;
 using std::max;
 using std::min;
-using std::setfill;
-using std::setw;
+
 using std::pair;
 using std::vector;
 

diff --git a/src/frontends/xforms/FormRef.C b/src/frontends/xforms/FormRef.C
index ed670c64708b89c5ddef7c9f26fa8d9f4215ed54..c665d798bdf6b5aedcb2061853504f057153b997 100644 (file)
--- a/src/frontends/xforms/FormRef.C
+++ b/src/frontends/xforms/FormRef.C
@@ -29,6 +29,7 @@ using namespace lyx::support;
 using std::find;
 using std::max;
 using std::sort;
+
 using std::vector;
 
 

diff --git a/src/frontends/xforms/FormSpellchecker.C b/src/frontends/xforms/FormSpellchecker.C
index 9982b04650e61afb3eea3b0c1e352b57549b9176..04449d33cad844aa0f9b490f88e9bac93cbd510a 100644 (file)
--- a/src/frontends/xforms/FormSpellchecker.C
+++ b/src/frontends/xforms/FormSpellchecker.C
@@ -22,8 +22,6 @@
 
 #include "lyx_forms.h"
 
-using std::endl;
-
 
 typedef FormCB<ControlSpellchecker, FormDB<FD_spellchecker> > base_class;
 

diff --git a/src/frontends/xforms/FormThesaurus.C b/src/frontends/xforms/FormThesaurus.C
index ed3d23aa36fbfc69ecd60ab7051c5fc3e9a93861..c9c57854933672c80955867bf8c74cc4748afe81 100644 (file)
--- a/src/frontends/xforms/FormThesaurus.C
+++ b/src/frontends/xforms/FormThesaurus.C
@@ -24,8 +24,8 @@
 using namespace lyx::support;
 
 #ifndef CXX_GLOBAL_CSTD
-using std::isupper;
 using std::islower;
+using std::isupper;
 #endif
 
 using std::vector;

diff --git a/src/frontends/xforms/FormToc.C b/src/frontends/xforms/FormToc.C
index 3ec8fcba048e4a03b23a46e81eb56cbd8839be07..73008402a0ef55ba6e3c2d7ae0966a9617194790 100644 (file)
--- a/src/frontends/xforms/FormToc.C
+++ b/src/frontends/xforms/FormToc.C
@@ -23,7 +23,6 @@
 
 using namespace lyx::support;
 
-using std::endl;
 using std::vector;
 
 

diff --git a/src/frontends/xforms/RadioButtonGroup.C b/src/frontends/xforms/RadioButtonGroup.C
index d859db950eb412f7164d13fcfaf6c7922eb0d56b..51b28c7093b9418c8e5a35eb9877a90b437f7e89 100644 (file)
--- a/src/frontends/xforms/RadioButtonGroup.C
+++ b/src/frontends/xforms/RadioButtonGroup.C
@@ -25,7 +25,6 @@
 using namespace lyx::support;
 
 using std::endl;
-using std::find_if;
 
 
 void RadioButtonGroup::init(FL_OBJECT * ob, size_type value)

diff --git a/src/frontends/xforms/XFormsMenubar.C b/src/frontends/xforms/XFormsMenubar.C
index 424b8553195525cae96d8d707d4c99be5f27f47f..6d420f14869ad4f0795e902ed5ac4908558e1e96 100644 (file)
--- a/src/frontends/xforms/XFormsMenubar.C
+++ b/src/frontends/xforms/XFormsMenubar.C
@@ -30,8 +30,6 @@ using namespace lyx::support;
 
 using std::endl;
 using std::for_each;
-using std::max;
-using std::min;
 using std::vector;
 
 

diff --git a/src/frontends/xforms/XMiniBuffer.C b/src/frontends/xforms/XMiniBuffer.C
index ab90cbb9663a3e23c7463df20bfc7a23438fc24b..c29c15f539a76cf217f856c3d696bc7670e6dc80 100644 (file)
--- a/src/frontends/xforms/XMiniBuffer.C
+++ b/src/frontends/xforms/XMiniBuffer.C
@@ -24,12 +24,6 @@
 
 #include <boost/bind.hpp>
 
-
-#ifndef CXX_GLOBAL_CSTD
-using std::isprint;
-#endif
-
-using std::endl;
 using std::vector;
 
 

diff --git a/src/frontends/xforms/XPainter.C b/src/frontends/xforms/XPainter.C
index a282b83dca6d67d4ff506fac52f1c8670f93886d..9bf41db58c38b464a385c8ae2402849a983505f2 100644 (file)
--- a/src/frontends/xforms/XPainter.C
+++ b/src/frontends/xforms/XPainter.C
@@ -29,9 +29,6 @@
 
 using namespace lyx::support;
 
-using std::endl;
-using std::max;
-
 
 XPainter::XPainter(XWorkArea & xwa)
        : Painter(), owner_(xwa)

diff --git a/src/frontends/xforms/XWorkArea.C b/src/frontends/xforms/XWorkArea.C
index 770afc278db718471d87c6e95d535ccff364d901..501f05e7ab960098620a9b2b446c2b7e09b2f88e 100644 (file)
--- a/src/frontends/xforms/XWorkArea.C
+++ b/src/frontends/xforms/XWorkArea.C
@@ -11,17 +11,18 @@
 
 #include <config.h>
 
-
 #include "XWorkArea.h"
+
 #include "debug.h"
 #include "XLyXKeySym.h"
 #include "funcrequest.h"
 #include "Timeout.h"
 
-using std::endl;
 using std::abs;
-using std::hex;
 using std::dec;
+using std::endl;
+using std::hex;
+
 
 namespace {
 

diff --git a/src/frontends/xforms/xformsImage.C b/src/frontends/xforms/xformsImage.C
index ccb6bd5f91fd14f00fea81b005f90154398dfcf4..ea97d222b3d5c549803f71774ba90c0a123d6c40 100644 (file)
--- a/src/frontends/xforms/xformsImage.C
+++ b/src/frontends/xforms/xformsImage.C
@@ -36,6 +36,7 @@ using namespace lyx::support;
 
 using std::find_if;
 
+
 namespace {
 
 void init_graphics();

diff --git a/src/frontends/xforms/xforms_helpers.C b/src/frontends/xforms/xforms_helpers.C
index 4eb4b5db74a7c297fe667bf153e755a9025e3dce..51107927ce08097f2b23cbdaacf572ada8b101bb 100644 (file)
--- a/src/frontends/xforms/xforms_helpers.C
+++ b/src/frontends/xforms/xforms_helpers.C
@@ -30,8 +30,8 @@
 using namespace lyx::support;
 
 using std::make_pair;
+
 using std::ofstream;
-using std::pair;
 using std::vector;
 
 

diff --git a/src/frontends/xforms/xscreen.C b/src/frontends/xforms/xscreen.C
index 7521699b0dd7bc3c2a401f23670cf6dd0fde5399..a00b187de091f48ac9973c6b44128fe01bc239ba 100644 (file)
--- a/src/frontends/xforms/xscreen.C
+++ b/src/frontends/xforms/xscreen.C
@@ -19,8 +19,6 @@
 #include "debug.h"
 
 using std::endl;
-using std::max;
-using std::min;
 
 
 namespace {

diff --git a/src/funcrequest.C b/src/funcrequest.C
index 6382dc8695faac83d52854bb85be210be10b1b72..ac5c173bcac6bad029c1cba751de78361e877365 100644 (file)
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -17,11 +17,11 @@
 #include "debug.h"
 #include "support/std_sstream.h"
 
+using std::endl;
+using std::getline;
 
 using std::istringstream;
 using std::vector;
-using std::getline;
-using std::endl;
 
 
 FuncRequest::FuncRequest()

diff --git a/src/graph.C b/src/graph.C
index 876394da753d095c7040d67c72ac2c6dfcfe250b..6eee7f3a439b704fcedd8c8954306d5d0268f557 100644 (file)
--- a/src/graph.C
+++ b/src/graph.C
@@ -13,7 +13,6 @@
 
 #include <algorithm>
 
-using std::queue;
 using std::vector;
 
 

diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index c11e6e45cc6eaca0a4f831ea91083b9e66347487..f4bcfece0638c70cbad408203f2175b5ea3af63d 100644 (file)
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-08  Angus Leeming  <leeming@lyx.org>
+
+       * GraphicsImage.C:
+       * GraphicsParams.C:
+       * PreviewLoader.C: remove redundant using directives.
+
 2003-09-07  Angus Leeming  <leeming@lyx.org>
 
        * GraphicsTypes.h:

diff --git a/src/graphics/GraphicsImage.C b/src/graphics/GraphicsImage.C
index 78097751dc4cd8c2942167150df1aa35cd5c9a3e..41fac6bb3c2140bea8cd1cdf6df801c59a4a4050 100644 (file)
--- a/src/graphics/GraphicsImage.C
+++ b/src/graphics/GraphicsImage.C
@@ -16,8 +16,6 @@
 #include "GraphicsParams.h"
 #include "debug.h"
 
-using std::endl;
-using std::abs;
 
 namespace lyx {
 namespace graphics {

diff --git a/src/graphics/GraphicsParams.C b/src/graphics/GraphicsParams.C
index 1a13a5bae25ea82dbebc9d5990a773d01183de7b..91f54a0916afb3f42a14fe8ad0357451b11b16c8 100644 (file)
--- a/src/graphics/GraphicsParams.C
+++ b/src/graphics/GraphicsParams.C
@@ -17,7 +17,6 @@
 #include "support/std_sstream.h"
 
 using std::abs;
-using std::istringstream;
 
 
 namespace lyx {

diff --git a/src/graphics/PreviewLoader.C b/src/graphics/PreviewLoader.C
index f2b049853bec736f2f3040d62ddc85adae8931fb..3443d64d0d7304df6b9e7d7a62fd6196e40b6e97 100644 (file)
--- a/src/graphics/PreviewLoader.C
+++ b/src/graphics/PreviewLoader.C
@@ -37,15 +37,11 @@
 
 namespace support = lyx::support;
 
-
 using std::endl;
 using std::find;
 using std::fill;
 using std::find_if;
-using std::getline;
 using std::make_pair;
-using std::setfill;
-using std::setw;
 
 using std::ifstream;
 using std::list;
@@ -56,6 +52,7 @@ using std::ostringstream;
 using std::pair;
 using std::vector;
 
+
 namespace {
 
 typedef pair<string, string> StrPair;

diff --git a/src/importer.C b/src/importer.C
index 02b25500fdc1819a0dddbfae732773c534cf2a55..a21fd655bf41fb9e53728557216ac9c9865ac528 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -24,11 +24,10 @@
 #include "gettext.h"
 #include "BufferView.h"
 
-
 using namespace lyx::support;
 
-using std::vector;
 using std::find;
+using std::vector;
 
 
 extern BufferList bufferlist;

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index ce00ea126b8494228ccc8b9fad1e89e8b158b941..92be93c772b15e641e512c2f4412bb5357118df1 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,15 @@
+2003-09-08  Angus Leeming  <leeming@lyx.org>
+
+       * insetcollapsable.C:
+       * insetenv.C:
+       * insetinclude.C:
+       * insetlabel.C:
+       * insetoptarg.C:
+       * insetspecialchar.C:
+       * insettabular.C:
+       * insettext.C:
+       * insettoc.C: remove redundant using directives.
+
 2003-09-07  Angus Leeming  <leeming@lyx.org>
 
        * insetspace.h:

diff --git a/src/insets/ExternalTemplate.C b/src/insets/ExternalTemplate.C
index 7a89cc1a4652e363fd02e6e957620e683d8d955b..b568448126f2d8ddb614733a9184f909ceccb83d 100644 (file)
--- a/src/insets/ExternalTemplate.C
+++ b/src/insets/ExternalTemplate.C
@@ -27,6 +27,7 @@ namespace support = lyx::support;
 
 using std::endl;
 using std::for_each;
+
 using std::ostream;
 
 

diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C
index dc80fab2379d63b11f4845421fa80be293d8a391..3d2f18579921c47f1e82cc8c4425f84638282b1d 100644 (file)
--- a/src/insets/insetbibtex.C
+++ b/src/insets/insetbibtex.C
@@ -30,6 +30,7 @@ using namespace lyx::support;
 
 using std::endl;
 using std::getline;
+
 using std::ifstream;
 using std::ostream;
 using std::pair;

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 81635a95a9959654d453d603e2c19374454a761b..45ec67327013d295929a29104589b1488c07ace8 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -34,7 +34,6 @@ using namespace lyx::graphics;
 
 using std::endl;
 using std::max;
-using std::vector;
 using std::ostream;
 
 

diff --git a/src/insets/insetenv.C b/src/insets/insetenv.C
index 61526c50e81ab24eddd93c334c94aae5da6911dc..cb882e511db7866b80a88c617ab9a83260c7919c 100644 (file)
--- a/src/insets/insetenv.C
+++ b/src/insets/insetenv.C
@@ -18,7 +18,6 @@
 #include "paragraph_funcs.h"
 #include "texrow.h"
 
-using std::endl;
 using std::auto_ptr;
 using std::ostream;
 

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 5f52f21c760bb111e9b98f9ee337b671469175bf..168705380450f94c2b0c2399614bbee5f90a373c 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -32,8 +32,9 @@ using namespace lyx::support;
 
 using lyx::pos_type;
 
-using std::min;
 using std::endl;
+using std::min;
+
 using std::auto_ptr;
 using std::ostream;
 

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index ab646a64bfc7308c3960237bfbb1605fc434049a..6ef23ecfe89c7e9d81b9685909c0b1bb501a6a2a 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -42,12 +42,11 @@
 using namespace lyx::support;
 
 using std::endl;
+
 using std::auto_ptr;
 using std::istringstream;
 using std::ostream;
 using std::ostringstream;
-using std::pair;
-using std::vector;
 
 
 extern BufferList bufferlist;

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 923869f571d729a98c40f1338bc2f8e7d11fe1ab..27c96fc16334cbf98e090491b23baccc78d84747 100644 (file)
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -20,8 +20,6 @@
 using namespace lyx::support;
 
 using std::ostream;
-using std::pair;
-using std::vector;
 
 
 InsetLabel::InsetLabel(InsetCommandParams const & p)

diff --git a/src/insets/insetoptarg.C b/src/insets/insetoptarg.C
index 4ea88a012aa36f0a6fa5e6b2be18ba3d471e0bfe..3b4fe9809f1adfa78ae2fff85887df1b2fed2dc9 100644 (file)
--- a/src/insets/insetoptarg.C
+++ b/src/insets/insetoptarg.C
@@ -18,8 +18,6 @@
 
 using std::auto_ptr;
 using std::ostream;
-using std::pair;
-using std::vector;
 
 
 InsetOptArg::InsetOptArg(BufferParams const & ins)

diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C
index f6aa672987760ba41fd8a3accf4a3cabd86b90c1..0271d231b2d9bd65cd7f794d8f13f0810b825967 100644 (file)
--- a/src/insets/insetspecialchar.C
+++ b/src/insets/insetspecialchar.C
@@ -22,7 +22,6 @@
 #include "frontends/font_metrics.h"
 #include "frontends/Painter.h"
 
-using std::max;
 using std::auto_ptr;
 using std::ostream;
 

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index d790f3f7a7df720521879125bbe61a97310d8c86..f13711a794bb8d2f1d2ec4c657a811b463c4e085 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -43,12 +43,11 @@ using namespace lyx::graphics;
 using std::endl;
 using std::max;
 using std::swap;
+
 using std::auto_ptr;
-using std::ifstream;
 using std::istringstream;
 using std::ostream;
 using std::ostringstream;
-using std::vector;
 
 
 namespace {

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 6813ae22f98c703cad50da8aaa2d87f084b869b8..be3cc4c17d101c63da536cec29bd263884d8f1db 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -44,13 +44,10 @@
 
 using std::endl;
 using std::for_each;
-using std::min;
 using std::max;
-using std::make_pair;
+
 using std::auto_ptr;
 using std::ostream;
-using std::ifstream;
-using std::pair;
 using std::vector;
 
 using namespace lyx::support;
@@ -58,7 +55,6 @@ using namespace lyx::graphics;
 using namespace bv_funcs;
 
 using lyx::pos_type;
-using lyx::textclass_type;
 
 
 InsetText::InsetText(BufferParams const & bp)

diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C
index 666abdbc9db4cd3107f4f7762751104f935098ba..abd689b255282d7c9cbcd9b06a3fcaa86d6a1440 100644 (file)
--- a/src/insets/insettoc.C
+++ b/src/insets/insettoc.C
@@ -17,7 +17,6 @@
 #include "toc.h"
 
 using std::ostream;
-using std::vector;
 
 
 InsetTOC::InsetTOC(InsetCommandParams const & p)

diff --git a/src/ispell.C b/src/ispell.C
index 2dae4f04bde1cea5f054c3a47140e51c7f275521..65a51e3c18404b2cc22245b4099028aaa7b8b12d 100644 (file)
--- a/src/ispell.C
+++ b/src/ispell.C
@@ -36,12 +36,12 @@ using namespace lyx::support;
 using std::strcpy;
 using std::strlen;
 using std::strpbrk;
-using std::strstr;
 #endif
 
 using std::endl;
 using std::max;
 
+
 namespace {
 
 class LaunchIspell : public lyx::support::ForkedProcess {

diff --git a/src/lastfiles.C b/src/lastfiles.C
index 2c30467384bc60c000833bf0244a1e0de28fc506..69b44af7ae6a79d972dcdcc25ca4b5f2557cdb48 100644 (file)
--- a/src/lastfiles.C
+++ b/src/lastfiles.C
@@ -21,12 +21,13 @@
 
 using namespace lyx::support;
 
-using std::ifstream;
-using std::ofstream;
-using std::getline;
+using std::copy;
 using std::endl;
 using std::find;
-using std::copy;
+using std::getline;
+
+using std::ifstream;
+using std::ofstream;
 using std::ostream_iterator;
 
 

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index cd9404bff3a1ff0bc611dd63f7f1732b5575cba7..efa81e1e71f828e5fe0b4e9c9b094cd95ea27558 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -46,15 +46,14 @@
 
 using namespace lyx::support;
 
-using std::vector;
-using std::ifstream;
+using std::back_inserter;
 using std::copy;
 using std::endl;
+using std::make_pair;
+
+using std::ifstream;
 using std::ios;
-using std::back_inserter;
 using std::istream_iterator;
-using std::pair;
-using std::make_pair;
 
 extern BufferList bufferlist;
 // this should be static, but I need it in buffer.C
@@ -387,7 +386,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
        istream_iterator<char> end;
 #if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
        // We use this until the compilers get better...
-       vector<char> tmp;
+       std::vector<char> tmp;
        copy(ii, end, back_inserter(tmp));
        string const tmpstr(tmp.begin(), tmp.end());
 #else

diff --git a/src/lyxfind.C b/src/lyxfind.C
index 60e1d4e76d996a5051a8e9b19e88157c5eb69db9..aa790c6e9b46b39b0648d3d522a8745b48dc0a80 100644 (file)
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -23,8 +23,6 @@
 
 using namespace lyx::support;
 
-using lyx::pos_type;
-using std::endl;
 
 namespace lyx {
 namespace find {

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index d0a60263b3d258b16dd6835a3444f81ef651b12a..4532c96581a27cd22a0db71b8e4726d3f1345467 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -73,14 +73,11 @@
 
 using namespace lyx::support;
 
-using std::pair;
-using std::make_pair;
 using std::endl;
-using std::find_if;
+using std::make_pair;
+
 using std::istringstream;
-using std::vector;
-using std::transform;
-using std::back_inserter;
+
 using namespace bv_funcs;
 
 extern BufferList bufferlist;

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 45141c6b3dcc65fadacc5ec8965ec7e3f8e1b3bf..4e0eafb0b85e6fb820a549755ff6d71fbc14dbf6 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -22,14 +22,14 @@
 
 using namespace lyx::support;
 
+using std::endl;
+using std::getline;
+using std::lower_bound;
 using std::sort;
-using std::ostream;
+
 using std::ios;
 using std::istream;
-using std::endl;
-using std::lower_bound;
-using std::vector;
-using std::getline;
+using std::ostream;
 
 // namespace {
 struct compare_tags {

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 320f04b623c45f052825c6a27b65fc6e372ecb72..7a4f08577a79a17572e3bbfc5e87e52e61629d3b 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -41,7 +41,6 @@ using std::ofstream;
 using std::cout;
 using std::ios;
 using std::endl;
-using std::vector;
 
 namespace lyx {
 namespace graphics {

diff --git a/src/lyxrow.C b/src/lyxrow.C
index a93192a5fb83a990ac3b8b3c1cf7a22d90d369c5..20a73b5c2de09d5a18fd3edee73040b5c79c90b6 100644 (file)
--- a/src/lyxrow.C
+++ b/src/lyxrow.C
@@ -21,8 +21,6 @@
 
 using lyx::pos_type;
 
-using std::max;
-using std::min;
 
 Row::Row()
        : pos_(0), end_(0), fill_(0), height_(0), width_(0), y_(0),

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index b7f96056cb2c9783ed56c14053856fb98259f728..e2a2d4362ccda5047fbebc7adf935ada8695818b 100644 (file)
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -31,6 +31,7 @@ using namespace lyx::support;
 using std::endl;
 using std::find_if;
 using std::remove_if;
+
 using std::ostream;
 
 namespace { // anon

diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index 8fb1c1098348506c91eda421769f247556241829..45a49ad39c1d98522691085a0e9baa9fa66ec60d 100644 (file)
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -27,12 +27,14 @@ using std::exit;
 #endif
 
 using lyx::textclass_type;
-using std::pair;
-using std::make_pair;
+
 using std::endl;
 using std::find_if;
+using std::make_pair;
 using std::sort;
 
+using std::pair;
+
 
 // Gets textclass number from name
 pair<bool, textclass_type> const

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 527aa9d5b1c5cb2ec56a1f5bdf75def1e0bab602..15334dea302f4bf3f0f5abc769f828cdf937117e 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,15 @@
+2003-09-08  Angus Leeming  <leeming@lyx.org>
+
+       * formulabase.C:
+       * formulamacro.C:
+       * math_charinset.C:
+       * math_cursor.C:
+       * math_data.C:
+       * math_diminset.C:
+       * math_hullinset.C:
+       * math_support.C:
+       * math_tabularinset.C: remove redundant using directives.
+
 2003-09-07  Angus Leeming  <leeming@lyx.org>
 
        * formulabase.h: remove #includes "dimension.h", <boost/weak_ptr.hpp>,

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index 7a5dcaf42fd8f0ae943a1796827ce43578578b40..caaf250321554f461d4e50dd69732bb905a2c72c 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -39,14 +39,12 @@
 
 using namespace lyx::support;
 
-using std::endl;
-using std::istringstream;
-using std::ostream;
-using std::ostringstream;
-using std::vector;
 using std::abs;
+using std::endl;
 using std::max;
 
+using std::istringstream;
+
 
 MathCursor * mathcursor = 0;
 

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index eb1093b91f4a9fcc3ef0965d959a64dd9a109e8b..e7b1c57e80378173e10026d2aafa266daadeac84 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -26,9 +26,9 @@
 
 using namespace lyx::support;
 
-using std::istringstream;
-using std::ostream;
 using std::auto_ptr;
+using std::ostream;
+
 
 extern MathCursor * mathcursor;
 

diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C
index 67b5a5fb63d3fa007055b5eb11b6de609fd22e27..2f25b6a937a7b349d9764ebd84ee0dd16eb81f8c 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -19,11 +19,12 @@
 
 #include <iterator>
 
-using std::vector;
-using std::istringstream;
 using std::getline;
-using std::istream_iterator;
+
 using std::auto_ptr;
+using std::istringstream;
+using std::istream_iterator;
+using std::vector;
 
 
 MathArrayInset::MathArrayInset(string const & name, int m, int n)

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index 47e0d0292daba32d2ab16f63641cdfd132232904..c1823681e84897dfa90e211d6064149973668843 100644 (file)
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -13,22 +13,17 @@
 
 #include "math_charinset.h"
 #include "dimension.h"
-#include "support/std_ostream.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
 #include "textpainter.h"
 
-
-
-using std::ostream;
-using std::endl;
 using std::auto_ptr;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::strchr;
-using std::isalpha;
 #endif
 
+
 extern bool has_math_fonts;
 
 namespace {

diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C
index 96fdc1c7d9c7bd956f292ff63797cb143159b7d3..e628f4237cf23a4540de295cb7efc0a864cdbeb8 100644 (file)
--- a/src/mathed/math_cursor.C
+++ b/src/mathed/math_cursor.C
@@ -39,12 +39,11 @@
 using namespace lyx::support;
 
 using std::endl;
+using std::isalpha;
 using std::min;
-using std::max;
 using std::swap;
-using std::vector;
+
 using std::ostringstream;
-using std::isalpha;
 
 
 // matheds own cut buffer

diff --git a/src/mathed/math_data.C b/src/mathed/math_data.C
index dfc678f40b3b50041f9ba311044d7e4d44e8bcd8..a63c627710915947f825b63d4e51904cffeba55d 100644 (file)
--- a/src/mathed/math_data.C
+++ b/src/mathed/math_data.C
@@ -23,10 +23,9 @@
 
 using namespace lyx::support;
 
-using std::max;
-using std::min;
 using std::abs;
 using std::endl;
+using std::min;
 
 
 MathArray::MathArray()

diff --git a/src/mathed/math_diminset.C b/src/mathed/math_diminset.C
index 22921751e0b3846dff36b4ddb499faac65d65759..f1253db1921d28dd4fbffb904329bb8e01fd9da1 100644 (file)
--- a/src/mathed/math_diminset.C
+++ b/src/mathed/math_diminset.C
@@ -12,8 +12,6 @@
 
 #include "math_diminset.h"
 
-using std::ostringstream;
-
 
 void MathDimInset::metricsT(TextMetricsInfo const &) const
 {

diff --git a/src/mathed/math_extern.C b/src/mathed/math_extern.C
index f6a4be430a2bb4303db80d3e1b310abea1f53bc3..4ad4ea65276c750c163104714836f8e5f9609fa0 100644 (file)
--- a/src/mathed/math_extern.C
+++ b/src/mathed/math_extern.C
@@ -40,11 +40,12 @@
 
 using namespace lyx::support;
 
-using std::ostream;
+using std::endl;
+using std::find_if;
+
 using std::istringstream;
+using std::ostream;
 using std::ostringstream;
-using std::find_if;
-using std::endl;
 
 
 ostream & operator<<(ostream & os, MathArray const & ar)

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index 5f61841e332c9f30fb3b0b9c959ebc47a3ff5c51..ade73f990454ee87e7e4c9c4fd7193869e76bc6a 100644 (file)
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -19,18 +19,18 @@
 #include "frontends/Painter.h"
 #include "support/std_sstream.h"
 
-
 #include "insets/mailinset.h"
 
-using std::swap;
+using std::endl;
 using std::max;
 using std::min;
-using std::vector;
+using std::swap;
+
+using std::auto_ptr;
 using std::istream;
 using std::istringstream;
 using std::ostringstream;
-using std::auto_ptr;
-using std::endl;
+using std::vector;
 
 
 class GridInsetMailer : public MailInset {

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index c094677cd8c31e4a98dcddd049a52a8baf16556c..c392b34d72d4c1aa0203cfbf07b9b4275a6d0885 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -28,16 +28,16 @@
 #include "lyxrc.h"
 #include "gettext.h"
 
-
 using namespace lyx::support;
 
+using std::endl;
+using std::max;
+
+using std::auto_ptr;
 using std::istringstream;
 using std::ostringstream;
-using std::vector;
-using std::max;
-using std::endl;
 using std::pair;
-using std::auto_ptr;
+
 
 namespace {
 

diff --git a/src/mathed/math_mathmlstream.C b/src/mathed/math_mathmlstream.C
index a12a646abc923d96327560354d207a3ff88efe7e..88495f63cf46e733ea2151adb75bc0ba8ac74a58 100644 (file)
--- a/src/mathed/math_mathmlstream.C
+++ b/src/mathed/math_mathmlstream.C
@@ -16,9 +16,10 @@
 #include "math_extern.h"
 #include "support/lyxalgo.h"
 
+using std::strlen;
 
 using std::ostream;
-using std::strlen;
+
 
 namespace {
 

diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 95b4cb77539f9f82c3faf1d594fe4c3f17057a2b..f849d5c22ad5c3c93e020d3ae2fb1198d7b95148 100644 (file)
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -65,15 +65,15 @@ following hack as starting point to write some macros:
 #include "support/std_sstream.h"
 #include "debug.h"
 
+using std::atoi;
+using std::endl;
+using std::fill;
 
+using std::ios;
 using std::istream;
 using std::istringstream;
 using std::ostream;
-using std::ios;
-using std::endl;
-using std::fill;
 using std::vector;
-using std::atoi;
 
 
 //#define FILEDEBUG

diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C
index 9e9eee1af67fbf08b09d3bc84842c23804150b00..b7cf00fe9f970ddfb0f8649d945856b15ccf413b 100644 (file)
--- a/src/mathed/math_sizeinset.C
+++ b/src/mathed/math_sizeinset.C
@@ -18,6 +18,7 @@
 #include "support/std_ostream.h"
 
 using std::atoi;
+
 using std::auto_ptr;
 
 

diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C
index 3441463bc31100336bf0c33bcc84a93c466dbcd8..e55c9286f4ea59f58d7527ce0a6b736e6b405a5a 100644 (file)
--- a/src/mathed/math_support.C
+++ b/src/mathed/math_support.C
@@ -12,20 +12,23 @@
 #include <config.h>
 
 #include "math_support.h"
-#include "math_parser.h"
+
 #include "math_data.h"
+#include "math_mathmlstream.h"
+#include "math_parser.h"
+
+#include "debug.h"
+
 #include "frontends/Painter.h"
 #include "frontends/font_metrics.h"
 #include "frontends/lyx_gui.h"
-#include "debug.h"
+
 #include "support/std_sstream.h"
-#include "math_mathmlstream.h"
 
 #include <map>
 
 using std::max;
 using std::endl;
-using std::ostringstream;
 
 
 ///

diff --git a/src/mathed/math_tabularinset.C b/src/mathed/math_tabularinset.C
index 114fee63c44af585c5c06b56d7771da8885bb84c..7d297507e567baa4b7ea99800561eceb080a76dc 100644 (file)
--- a/src/mathed/math_tabularinset.C
+++ b/src/mathed/math_tabularinset.C
@@ -17,10 +17,6 @@
 
 #include <iterator>
 
-using std::vector;
-using std::istringstream;
-using std::getline;
-using std::istream_iterator;
 using std::auto_ptr;
 
 

diff --git a/src/paragraph.C b/src/paragraph.C
index 0eede1c38a00f825fe3f6c420428811488f62704..d92231747d7dbf5cf88f2fde231949873cc032be 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -44,10 +44,6 @@ using namespace lyx::support;
 using std::ostream;
 using std::ostringstream;
 using std::endl;
-using std::fstream;
-using std::ios;
-using std::lower_bound;
-using std::upper_bound;
 
 using lyx::pos_type;
 

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 698a44ac418686b2e436db4037e868d4eb898366..4eed72a30f51b5492c789f848abdde0f40895b66 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -27,11 +27,14 @@
 #include "support/LAssert.h"
 
 using namespace lyx::support;
+
 using lyx::pos_type;
+
 using std::endl;
-using std::ostream;
 using std::upper_bound;
-using std::lower_bound;
+
+using std::ostream;
+
 
 // Initialize static member.
 ShareContainer<LyXFont> Paragraph::Pimpl::FontTable::container;

diff --git a/src/rowpainter.C b/src/rowpainter.C
index 1bcc643c81ee8b7bf7c129bc13600b308f0792b6..46b2b10d11338c8a6f694edd3ad81cebb09b37c4 100644 (file)
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -36,7 +36,6 @@
 using namespace lyx::support;
 
 using std::max;
-using std::endl;
 using lyx::pos_type;
 
 extern int PAPER_MARGIN;

diff --git a/src/sgml.C b/src/sgml.C
index 238ad2274bfccf7383a200107fce105bdb046acd..db91894847e2a061ccf60edacadefff47811cd64 100644 (file)
--- a/src/sgml.C
+++ b/src/sgml.C
@@ -16,10 +16,12 @@
 #include "paragraph.h"
 #include "sgml.h"
 
-using std::pair;
+using std::endl;
 using std::make_pair;
+
 using std::ostream;
-using std::endl;
+using std::pair;
+
 
 namespace sgml {
 

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 4ab1d5a3351a6de946fa31b3fb3fd5cd3fe035a2..387fbc98af5352e38ea33d4d576c0274f868c6f5 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-08  Angus Leeming  <leeming@lyx.org>
+
+       * boost-inst.C:
+       * filetools.C:
+       * forkedcallqueue.C:
+       * lstrings.C:
+       * lyxsum.C: remove redundant using directives.
 
 2003-09-05  Angus Leeming  <leeming@lyx.org>
 

diff --git a/src/support/boost-inst.C b/src/support/boost-inst.C
index c58dc7c8ddeab53b38c5ac87eb4d83210693b13e..a5a290befa6a7d8bbdb14ba28685acbdc51f3365 100644 (file)
--- a/src/support/boost-inst.C
+++ b/src/support/boost-inst.C
@@ -17,8 +17,6 @@
 namespace boost
 {
 
-using boost::io::out_of_range_bit;
-
 template class basic_format<char>;
 
 template

diff --git a/src/support/filetools.C b/src/support/filetools.C
index 350377390605ae86857e4bce6dc1b6909a32656b..2bf34040765c8a99ea362792e05f9f2b9999aca9 100644 (file)
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -69,17 +69,17 @@
 
 #ifndef CXX_GLOBAL_CSTD
 using std::fgetc;
-using std::isalpha;
 using std::isalnum;
+using std::isalpha;
 #endif
 
-using std::make_pair;
-using std::pair;
 using std::endl;
+using std::getline;
+using std::make_pair;
+
 using std::ifstream;
 using std::ostringstream;
 using std::vector;
-using std::getline;
 
 
 namespace lyx {

diff --git a/src/support/forkedcallqueue.C b/src/support/forkedcallqueue.C
index 20614d88ab0143ece2d4d5891cad924dc5ddc103..8ef76ecb4ab1b20a86cbf590cad07ce8af951ef2 100644 (file)
--- a/src/support/forkedcallqueue.C
+++ b/src/support/forkedcallqueue.C
@@ -18,7 +18,7 @@
 #include <boost/signals/signal2.hpp>
 
 using std::endl;
-using std::queue;
+
 
 namespace lyx {
 namespace support {

diff --git a/src/support/forkedcontr.C b/src/support/forkedcontr.C
index e517d6bcf553e062b92c452c20958f4dbcf700f2..741d0ed52df2d0ae64be30f9e81fc320582865f8 100644 (file)
--- a/src/support/forkedcontr.C
+++ b/src/support/forkedcontr.C
@@ -28,14 +28,16 @@
 #include <unistd.h>
 #include <sys/wait.h>
 
-using std::vector;
 using std::endl;
 using std::find_if;
 
+using std::vector;
+
 #ifndef CXX_GLOBAL_CSTD
 using std::strerror;
 #endif
 
+
 namespace lyx {
 namespace support {
 

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index 17b55e00dcaf7c94daf22d2e7aa24aad6be53c1b..023484ee231ffad46aef401d5caf492d3e78b39e 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -28,18 +28,18 @@
 #include <cctype>
 #include <cstdlib>
 
-using std::count;
 using std::transform;
+
 using std::vector;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::atof;
 using std::isdigit;
-using std::strlen;
 using std::tolower;
 using std::toupper;
 #endif
 
+
 namespace lyx {
 namespace support {
 

diff --git a/src/support/lyxsum.C b/src/support/lyxsum.C
index d378e6a5c20184795cbfaeb6bbb08c3783cb7395..2c1f0e218ebe8949002928f6ceb2e77339bac496 100644 (file)
--- a/src/support/lyxsum.C
+++ b/src/support/lyxsum.C
@@ -79,7 +79,6 @@ unsigned long lyx::support::sum(string const & file)
 #include <fstream>
 #include <iterator>
 
-using std::for_each;
 
 namespace {
 
@@ -88,7 +87,7 @@ inline
 unsigned long do_crc(InputIterator first, InputIterator last)
 {
        boost::crc_32_type crc;
-       crc = for_each(first, last, crc);
+       crc = std::for_each(first, last, crc);
        return crc.checksum();
 }
 

diff --git a/src/tabular.C b/src/tabular.C
index c97eba98bbc68729a5516d8f0f3dffd04fb2111d..bbd37b32d9ca3b0220b69a278fa591c81cc39597 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -36,12 +36,13 @@
 using namespace lyx::support;
 
 using std::abs;
-using std::ostream;
-using std::ostringstream;
-using std::istream;
+using std::endl;
 using std::getline;
 using std::max;
-using std::endl;
+
+using std::istream;
+using std::ostream;
+using std::ostringstream;
 using std::vector;
 
 #ifndef CXX_GLOBAL_CSTD

diff --git a/src/tex2lyx/ChangeLog b/src/tex2lyx/ChangeLog
index 052f069e341452a66d5544c015d68468be7d3d40..29051af599851455150c872bae2a179666001b67 100644 (file)
--- a/src/tex2lyx/ChangeLog
+++ b/src/tex2lyx/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-08  Angus Leeming  <leeming@lyx.org>
+
+       * math.C:
+       * preamble.C:
+       * table.C:
+       * tex2lyx.C:
+       * texparser.C: remove redundant using directives.
+
 2003-08-19  Angus Leeming  <leeming@lyx.org>
 
        * most files: add 'standard conformant' header blurb.

diff --git a/src/tex2lyx/math.C b/src/tex2lyx/math.C
index f70ac09651a579221dd6d5fa3ff52592b97e4ad5..3ca609eabd5b30f54f5ad639383a1504c20558b2 100644 (file)
--- a/src/tex2lyx/math.C
+++ b/src/tex2lyx/math.C
@@ -15,13 +15,12 @@
 #include "tex2lyx.h"
 
 #include <iostream>
-#include <vector>
 
 using std::cerr;
 using std::endl;
+
 using std::ostream;
 using std::string;
-using std::vector;
 
 
 bool is_math_env(string const & name)

diff --git a/src/tex2lyx/preamble.C b/src/tex2lyx/preamble.C
index 3d43f8025fd8533c42380004d8bd635ca57ee462..777aec4695853857ba32ef7ca280253c63b52537 100644 (file)
--- a/src/tex2lyx/preamble.C
+++ b/src/tex2lyx/preamble.C
@@ -26,10 +26,6 @@
 #include <vector>
 #include <map>
 
-using std::cerr;
-using std::endl;
-using std::getline;
-using std::istream;
 using std::istringstream;
 using std::ostream;
 using std::ostringstream;

diff --git a/src/tex2lyx/table.C b/src/tex2lyx/table.C
index 99a311c1c76bde8ead226b8789c562300cc1792d..7b02cf3d79a2d9a98b61ada778d7f5bacca2d95e 100644 (file)
--- a/src/tex2lyx/table.C
+++ b/src/tex2lyx/table.C
@@ -29,7 +29,6 @@ using std::ostream;
 using std::ostringstream;
 using std::string;
 using std::vector;
-using std::map;
 
 #include "mathed/math_gridinfo.h"
 

diff --git a/src/tex2lyx/tex2lyx.C b/src/tex2lyx/tex2lyx.C
index f75001f25e08dab3048af30524a948bd324e3dc5..b357b03be8196ec16fe7d2c597c0b3afb4a06ba8 100644 (file)
--- a/src/tex2lyx/tex2lyx.C
+++ b/src/tex2lyx/tex2lyx.C
@@ -28,14 +28,13 @@
 #include <sstream>
 #include <vector>
 
+using std::endl;
 using std::cout;
 using std::cerr;
-using std::endl;
 using std::getline;
-using std::istream;
+
 using std::ifstream;
 using std::istringstream;
-using std::ostream;
 using std::ostringstream;
 using std::stringstream;
 using std::string;

diff --git a/src/tex2lyx/texparser.C b/src/tex2lyx/texparser.C
index b8469fcc205008472108942e626a03bf41c380d5..e5612667d2ce3a2a8f1283c349ba545f6c5baf16 100644 (file)
--- a/src/tex2lyx/texparser.C
+++ b/src/tex2lyx/texparser.C
@@ -18,12 +18,10 @@
 using std::cerr;
 using std::endl;
 using std::fill;
-using std::ios;
 using std::istream;
 using std::istringstream;
 using std::ostream;
 using std::string;
-using std::vector;
 
 
 namespace {

diff --git a/src/tex2lyx/text.C b/src/tex2lyx/text.C
index 657bd243d8070b67f9d0103b0b7522b7c0383ce7..e194a3edd3645fe944cde6362f641c1080bcc762 100644 (file)
--- a/src/tex2lyx/text.C
+++ b/src/tex2lyx/text.C
@@ -26,6 +26,7 @@
 
 using std::cerr;
 using std::endl;
+
 using std::map;
 using std::ostream;
 using std::ostringstream;

diff --git a/src/texrow.C b/src/texrow.C
index de53933d2d304072463f305f9e2e47c104b2dccc..9e1b10e5634be4c4215564b96f0e1d039a0f4d85 100644 (file)
--- a/src/texrow.C
+++ b/src/texrow.C
@@ -18,7 +18,7 @@
 #include <algorithm>
 
 using std::find_if;
-using std::endl;
+
 
 namespace {
 

diff --git a/src/text.C b/src/text.C
index d7993fc610decb37db9682b968375f8ea50494b1..26a373d9eb2753cca6abfd5cc534d8c553af1b6b 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -48,9 +48,7 @@
 using namespace lyx::support;
 
 using std::max;
-using std::min;
 using std::endl;
-using std::pair;
 
 using lyx::pos_type;
 using lyx::word_location;

diff --git a/src/text2.C b/src/text2.C
index 0affbe7812a1e0c04a8bec0aaae1fcb9ee3dd154..e2fa98fab59671f4b5da21320b7642fae55fb3db 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -59,12 +59,10 @@
 
 using namespace lyx::support;
 
-using std::ostringstream;
-using std::vector;
-using std::copy;
 using std::endl;
-using std::find;
-using std::pair;
+
+using std::ostringstream;
+
 using lyx::pos_type;
 
 

diff --git a/src/text3.C b/src/text3.C
index c2fe35741c4ed62ebbdcdc2bd1527eba70a1520d..c2f7d884f8905626c8414eabfbff495d75a0ada5 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -52,10 +52,13 @@ using namespace bv_funcs;
 
 using std::endl;
 using std::find;
+
 using std::istringstream;
 using std::vector;
+
 using lyx::pos_type;
 
+
 extern string current_layout;
 extern int bibitemMaxWidth(BufferView *, LyXFont const &);
 

diff --git a/src/toc.C b/src/toc.C
index 12bf0d9c03e0955081118d09776df8326a50b26f..60f75217f84e9706036273b24e0f07b1c6669591 100644 (file)
--- a/src/toc.C
+++ b/src/toc.C
@@ -28,7 +28,6 @@
 
 using std::vector;
 using std::max;
-using std::endl;
 using std::ostream;
 
 namespace lyx {

diff --git a/src/vc-backend.C b/src/vc-backend.C
index 9e227b58cee86d13d2cf02b63de06b15b7960057..07a17dc69eb1c7db52f31e4e429b81b55e8da132 100644 (file)
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -32,8 +32,10 @@ using std::gmtime;
 #endif
 
 using std::endl;
-using std::ifstream;
 using std::getline;
+
+using std::ifstream;
+
 using boost::regex;
 using boost::regex_match;