more std declaration fixes.

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

src/Author.cpp

@@ -18,14 +18,13 @@
 
 #include "support/std_istream.h"
 
+using std::string;
 
 namespace lyx {
 
 using support::token;
 using support::trim;
 
-using std::string;
-
 
 bool operator==(Author const & l, Author const & r)
 {

src/Box.cpp

@@ -16,11 +16,10 @@
 
 #include "support/std_ostream.h"
 
+using std::ostream;
 
 namespace lyx {
 
-using std::ostream;
-
 
 Box::Box()
 	: x1(0), x2(0), y1(0), y2(0)

src/BranchList.cpp

@@ -17,11 +17,10 @@
 
 #include <algorithm>
 
+using std::string;
 
 namespace lyx {
 
-using std::string;
-
 
 Branch::Branch()
 {

src/Buffer.cpp

@@ -92,6 +92,20 @@
 #include <sstream>
 #include <fstream>
 
+using std::endl;
+using std::for_each;
+using std::make_pair;
+
+using std::ios;
+using std::map;
+using std::ostream;
+using std::ostringstream;
+using std::ofstream;
+using std::pair;
+using std::stack;
+using std::vector;
+using std::string;
+
 
 namespace lyx {
 
@@ -125,21 +139,6 @@ namespace os = support::os;
 namespace fs = boost::filesystem;
 namespace io = boost::iostreams;
 
-using std::endl;
-using std::for_each;
-using std::make_pair;
-
-using std::ios;
-using std::map;
-using std::ostream;
-using std::ostringstream;
-using std::ofstream;
-using std::pair;
-using std::stack;
-using std::vector;
-using std::string;
-
-
 namespace {
 
 int const LYX_FORMAT = 276;

src/BufferList.cpp

@@ -33,18 +33,6 @@
 #include <algorithm>
 #include <functional>
 
-
-namespace lyx {
-
-using support::addName;
-using support::bformat;
-using support::FileName;
-using support::makeDisplayPath;
-using support::onlyFilename;
-using support::removeAutosaveFile;
-using support::package;
-using support::prefixIs;
-
 using boost::bind;
 
 using std::auto_ptr;
@@ -58,6 +46,18 @@ using std::vector;
 using std::back_inserter;
 using std::transform;
 
+
+namespace lyx {
+
+using support::addName;
+using support::bformat;
+using support::FileName;
+using support::makeDisplayPath;
+using support::onlyFilename;
+using support::removeAutosaveFile;
+using support::package;
+using support::prefixIs;
+
 namespace Alert = lyx::frontend::Alert;
 
 

src/BufferView.cpp

@@ -78,6 +78,16 @@
 #include <functional>
 #include <vector>
 
+using std::distance;
+using std::endl;
+using std::istringstream;
+using std::make_pair;
+using std::min;
+using std::max;
+using std::mem_fun_ref;
+using std::string;
+using std::vector;
+
 
 namespace lyx {
 
@@ -91,16 +101,6 @@ using support::isFileReadable;
 using support::makeDisplayPath;
 using support::package;
 
-using std::distance;
-using std::endl;
-using std::istringstream;
-using std::make_pair;
-using std::min;
-using std::max;
-using std::mem_fun_ref;
-using std::string;
-using std::vector;
-
 namespace Alert = frontend::Alert;
 
 namespace {

src/Bullet.cpp

@@ -20,10 +20,10 @@
 
 #include <boost/assert.hpp>
 
-namespace lyx {
-
 using std::string;
 
+namespace lyx {
+
 
 /** The four LaTeX itemize environment default bullets
  */

src/Changes.cpp

@@ -21,14 +21,13 @@
 
 #include <boost/assert.hpp>
 
-
-namespace lyx {
-
 using std::abs;
 using std::endl;
 using std::string;
 using std::max;
 
+namespace lyx {
+
 /*
  * Class Change has a changetime field that specifies the exact time at which
  * a specific change was made. The change time is used as a guidance for the

src/Chktex.cpp

@@ -23,6 +23,9 @@
 
 #include <boost/format.hpp>
 
+using std::getline;
+using std::string;
+
 
 namespace lyx {
 
@@ -33,9 +36,6 @@ using support::onlyFilename;
 using support::split;
 using support::Systemcall;
 
-using std::getline;
-using std::string;
-
 
 Chktex::Chktex(string const & chktex, string const & f, string const & p)
 		: cmd(chktex), file(f), path(p)

src/Converter.cpp

@@ -33,6 +33,12 @@
 #include "support/Path.h"
 #include "support/Systemcall.h"
 
+using std::endl;
+using std::find_if;
+using std::string;
+using std::vector;
+using std::distance;
+
 
 namespace lyx {
 
@@ -59,12 +65,6 @@ using support::split;
 using support::subst;
 using support::Systemcall;
 
-using std::endl;
-using std::find_if;
-using std::string;
-using std::vector;
-using std::distance;
-
 namespace Alert = lyx::frontend::Alert;
 
 

src/Counters.cpp

@@ -22,14 +22,14 @@
 
 #include <sstream>
 
-
-namespace lyx {
-
 using std::endl;
 using std::ostringstream;
 using std::string;
 
 
+namespace lyx {
+
+
 Counter::Counter()
 {
 	reset();

src/buffer_funcs.cpp

@@ -49,6 +49,9 @@
 #include <boost/bind.hpp>
 #include <boost/filesystem/operations.hpp>
 
+using std::min;
+using std::string;
+
 
 namespace lyx {
 
@@ -63,9 +66,6 @@ using support::onlyFilename;
 using support::onlyPath;
 using support::unlink;
 
-using std::min;
-using std::string;
-
 namespace Alert = frontend::Alert;
 namespace fs = boost::filesystem;
 

src/bufferview_funcs.cpp

@@ -35,11 +35,6 @@
 
 #include <sstream>
 
-
-namespace lyx {
-
-using support::bformat;
-
 using std::istringstream;
 using std::ostringstream;
 using std::string;
@@ -47,6 +42,10 @@ using std::vector;
 using std::find;
 
 
+namespace lyx {
+
+using support::bformat;
+
 namespace bv_funcs {
 
 // Set data using font and toggle

src/callback.cpp

@@ -56,6 +56,17 @@
 #include <cerrno>
 #include <fstream>
 
+using std::back_inserter;
+using std::copy;
+using std::endl;
+using std::make_pair;
+using std::string;
+using std::ifstream;
+using std::ios;
+using std::istream_iterator;
+
+using boost::shared_ptr;
+
 
 namespace lyx {
 
@@ -77,21 +88,9 @@ using support::Systemcall;
 using support::tempName;
 using support::unlink;
 
-using boost::shared_ptr;
-
 namespace Alert = frontend::Alert;
 namespace fs = boost::filesystem;
 
-using std::back_inserter;
-using std::copy;
-using std::endl;
-using std::make_pair;
-using std::string;
-using std::ifstream;
-using std::ios;
-using std::istream_iterator;
-
-
 // this should be static, but I need it in Buffer.cpp
 bool quitting;	// flag, that we are quitting the program
 

src/tex2lyx/text.cpp

@@ -29,6 +29,15 @@
 #include <sstream>
 #include <vector>
 
+using std::cerr;
+using std::endl;
+
+using std::map;
+using std::ostream;
+using std::ostringstream;
+using std::istringstream;
+using std::string;
+using std::vector;
 
 namespace lyx {
 
@@ -42,16 +51,6 @@ using support::suffixIs;
 using support::contains;
 using support::subst;
 
-using std::cerr;
-using std::endl;
-
-using std::map;
-using std::ostream;
-using std::ostringstream;
-using std::istringstream;
-using std::string;
-using std::vector;
-
 namespace fs = boost::filesystem;