Replace 'using namespace abc;' with 'using abc::xyz;'

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

src/BufferView.C

@@ -15,6 +15,7 @@
 #include <config.h>
 
 #include "BufferView.h"
+
 #include "buffer.h"
 #include "bufferlist.h"
 #include "BufferView_pimpl.h"
@@ -42,15 +43,17 @@
 #include "support/filetools.h"
 #include "support/lyxalgo.h" // lyx_count
 
-
-extern BufferList bufferlist;
-
-using namespace lyx::support;
+using lyx::support::bformat;
+using lyx::support::MakeAbsPath;
 
 using std::find;
+
 using std::vector;
 
 
+extern BufferList bufferlist;
+
+
 BufferView::BufferView(LyXView * owner, int xpos, int ypos,
 		       int width, int height)
 	: pimpl_(new Pimpl(this, owner, xpos, ypos, width, height))

src/BufferView_pimpl.C

@@ -66,14 +66,32 @@
 
 #include <boost/bind.hpp>
 
+using bv_funcs::bold;
+using bv_funcs::code;
+using bv_funcs::currentState;
+using bv_funcs::emph;
+using bv_funcs::fontSize;
+using bv_funcs::lang;
+using bv_funcs::noun;
+using bv_funcs::roman;
+using bv_funcs::sans;
+using bv_funcs::styleReset;
+using bv_funcs::underline;
+
+using lyx::pos_type;
+
+using lyx::support::AddPath;
+using lyx::support::bformat;
+using lyx::support::FileSearch;
+using lyx::support::IsDirWriteable;
+using lyx::support::MakeDisplayPath;
+using lyx::support::strToUnsignedInt;
+using lyx::support::system_lyxdir;
 
 using std::endl;
 using std::make_pair;
 using std::min;
 
-using lyx::pos_type;
-using namespace lyx::support;
-using namespace bv_funcs;
 
 extern BufferList bufferlist;
 

src/Chktex.C

@@ -11,21 +11,26 @@
 #include <config.h>
 
 #include "Chktex.h"
-#include "LaTeX.h" // TeXErrors
 #include "gettext.h"
 
+#include "LaTeX.h" // TeXErrors
+
+#include "support/BoostFormat.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/systemcall.h"
 
-#include "support/BoostFormat.h"
-
 #include <fstream>
 
-using namespace lyx::support;
+using lyx::support::atoi;
+using lyx::support::ChangeExtension;
+using lyx::support::OnlyFilename;
+using lyx::support::split;
+using lyx::support::Systemcall;
 
 using std::getline;
+
 using std::ifstream;
 
 

src/CutAndPaste.C

@@ -29,16 +29,16 @@
 
 #include "support/lstrings.h"
 
+using lyx::pos_type;
+using lyx::textclass_type;
+
+using lyx::support::bformat;
 
 using std::for_each;
 using std::make_pair;
 using std::pair;
 using std::vector;
 
-using namespace lyx::support;
-using lyx::pos_type;
-using lyx::textclass_type;
-
 
 typedef limited_stack<pair<ParagraphList, textclass_type> > CutStack;
 

src/DepTable.C

@@ -13,6 +13,7 @@
 #include <config.h>
 
 #include "DepTable.h"
+
 #include "debug.h"
 
 #include "support/lyxlib.h"
@@ -28,7 +29,11 @@
 using std::time;
 #endif
 
-using namespace lyx::support;
+using lyx::support::ltrim;
+using lyx::support::MakeAbsPath;
+using lyx::support::OnlyFilename;
+using lyx::support::suffixIs;
+using lyx::support::sum;
 
 using std::endl;
 using std::flush;

src/LColor.C

@@ -17,13 +17,13 @@
 #include <config.h>
 
 #include "debug.h"
-#include "LColor.h"
 #include "gettext.h"
+#include "LColor.h"
 #include "support/lstrings.h"
 
 #include <map>
 
-using namespace lyx::support;
+using lyx::support::compare_ascii_no_case;
 
 using std::endl;
 

src/LaTeX.C

@@ -31,7 +31,22 @@
 
 #include <fstream>
 
-using namespace lyx::support;
+using lyx::support::AbsolutePath;
+using lyx::support::bformat;
+using lyx::support::ChangeExtension;
+using lyx::support::contains;
+using lyx::support::FileInfo;
+using lyx::support::findtexfile;
+using lyx::support::getcwd;
+using lyx::support::OnlyFilename;
+using lyx::support::os;
+using lyx::support::prefixIs;
+using lyx::support::QuoteName;
+using lyx::support::rtrim;
+using lyx::support::split;
+using lyx::support::suffixIs;
+using lyx::support::Systemcall;
+using lyx::support::unlink;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::sscanf;
@@ -39,6 +54,7 @@ using std::sscanf;
 
 using std::endl;
 using std::getline;
+
 using std::ifstream;
 using std::set;
 using std::vector;
@@ -51,6 +67,7 @@ using boost::smatch;
 using boost::cmatch;
 #endif
 
+
 // TODO: in no particular order
 // - get rid of the extern BufferList and the call to
 //   BufferList::updateIncludedTeXfiles, this should either

src/LaTeXFeatures.C

@@ -29,7 +29,9 @@
 
 #include "support/std_sstream.h"
 
-using namespace lyx::support;
+using lyx::support::IsSGMLFilename;
+using lyx::support::MakeRelPath;
+using lyx::support::OnlyPath;
 
 using std::endl;
 using std::find;

src/LyXAction.C

@@ -17,12 +17,16 @@
 
 #include "debug.h"
 #include "funcrequest.h"
+
 #include "support/lstrings.h"
 
-using namespace lyx::support;
+using lyx::support::split;
+using lyx::support::trim;
+
+using std::endl;
 
 using std::ostream;
-using std::endl;
+
 
 /*
      NAMING RULES FOR USER-COMMANDS

src/MenuBackend.C

@@ -46,10 +46,10 @@
 
 #include <algorithm>
 
-extern BufferList bufferlist;
-extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
-
-using namespace lyx::support;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::contains;
+using lyx::support::MakeDisplayPath;
+using lyx::support::token;
 
 using std::endl;
 using std::find_if;
@@ -58,6 +58,10 @@ using std::sort;
 
 using std::vector;
 
+
+extern BufferList bufferlist;
+extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
+
 // This is the global menu definition
 MenuBackend menubackend;
 

src/ParagraphParameters.C

@@ -32,7 +32,7 @@
 
 #include "support/std_sstream.h"
 
-using namespace lyx::support;
+using lyx::support::rtrim;
 
 using std::istringstream;
 using std::ostream;

src/ToolbarBackend.C

@@ -23,7 +23,10 @@
 
 #include "frontends/controllers/ControlMath.h"
 
-using namespace lyx::support;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::getVectorFromString;
+using lyx::support::LibFileSearch;
+using lyx::support::subst;
 
 using std::endl;
 using std::make_pair;

src/aspell.C

@@ -21,9 +21,6 @@
 #include "WordLangTuple.h"
 
 
-using namespace lyx::support;
-
-
 ASpell::ASpell(BufferParams const &, string const & lang)
 	: els(0), spell_error_object(0)
 {

src/author.C

@@ -12,13 +12,15 @@
 
 #include "author.h"
 
-#include "support/std_istream.h"
 #include "support/lstrings.h"
 
 #include <boost/assert.hpp>
 
+#include "support/std_istream.h"
+
+using lyx::support::token;
+using lyx::support::trim;
 
-using namespace lyx::support;
 
 bool operator==(Author const & l, Author const & r)
 {

src/buffer.C

@@ -70,7 +70,42 @@
 #ifdef HAVE_LOCALE
 #endif
 
-using namespace lyx::support;
+using lyx::pos_type;
+
+using lyx::support::AddName;
+using lyx::support::ascii_lowercase;
+using lyx::support::atoi;
+using lyx::support::bformat;
+using lyx::support::ChangeExtension;
+using lyx::support::cmd_ret;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::compare_no_case;
+using lyx::support::contains;
+using lyx::support::CreateBufferTmpDir;
+using lyx::support::destroyDir;
+using lyx::support::FileInfo;
+using lyx::support::FileInfo;
+using lyx::support::getExtFromContents;
+using lyx::support::IsDirWriteable;
+using lyx::support::IsFileWriteable;
+using lyx::support::LibFileSearch;
+using lyx::support::ltrim;
+using lyx::support::MakeAbsPath;
+using lyx::support::MakeDisplayPath;
+using lyx::support::MakeLatexName;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::os;
+using lyx::support::Path;
+using lyx::support::QuoteName;
+using lyx::support::removeAutosaveFile;
+using lyx::support::rename;
+using lyx::support::RunCommand;
+using lyx::support::split;
+using lyx::support::strToInt;
+using lyx::support::subst;
+using lyx::support::tempName;
+using lyx::support::trim;
 
 using std::endl;
 using std::for_each;
@@ -86,8 +121,6 @@ using std::pair;
 using std::stack;
 using std::vector;
 
-using lyx::pos_type;
-
 
 // all these externs should eventually be removed.
 extern BufferList bufferlist;

src/buffer_funcs.C

@@ -31,12 +31,18 @@
 #include "support/filetools.h"
 #include "support/lyxlib.h"
 
+using lyx::support::bformat;
+using lyx::support::FileInfo;
+using lyx::support::IsFileWriteable;
+using lyx::support::LibFileSearch;
+using lyx::support::MakeDisplayPath;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::unlink;
+
 
 extern BufferList bufferlist;
 
-using namespace lyx::support;
-
-
 namespace {
 
 bool readFile(Buffer * b, string const & s)

src/bufferlist.C

@@ -30,7 +30,13 @@
 
 #include <boost/bind.hpp>
 
-using namespace lyx::support;
+using lyx::support::AddName;
+using lyx::support::bformat;
+using lyx::support::GetEnvPath;
+using lyx::support::MakeAbsPath;
+using lyx::support::MakeDisplayPath;
+using lyx::support::OnlyFilename;
+using lyx::support::removeAutosaveFile;
 
 using std::endl;
 using std::find;

src/bufferparams.C

@@ -43,7 +43,9 @@
 #include "support/std_sstream.h"
 
 namespace support = lyx::support;
-using namespace lyx::support;
+using lyx::support::bformat;
+using lyx::support::rtrim;
+using lyx::support::tokenPos;
 
 using std::endl;
 

src/bufferview_funcs.C

@@ -37,7 +37,7 @@
 
 #include "support/std_sstream.h"
 
-using namespace lyx::support;
+using lyx::support::bformat;
 
 using std::istringstream;
 using std::ostringstream;

src/chset.C

@@ -12,15 +12,18 @@
 #include <config.h>
 
 #include "chset.h"
+
+#include "debug.h"
+
 #include "support/filetools.h"
 #include "support/lyxlib.h"
-#include "debug.h"
 
 #include <boost/regex.hpp>
 
 #include <fstream>
 
-using namespace lyx::support;
+using lyx::support::atoi;
+using lyx::support::LibFileSearch;
 
 using std::endl;
 using std::getline;

src/converter.C

@@ -11,13 +11,14 @@
 #include <config.h>
 
 #include "converter.h"
-#include "bufferparams.h"
-#include "format.h"
+
 #include "buffer.h"
 #include "buffer_funcs.h"
-#include "LaTeX.h"
-#include "gettext.h"
+#include "bufferparams.h"
 #include "debug.h"
+#include "format.h"
+#include "gettext.h"
+#include "LaTeX.h"
 
 #include "frontends/Alert.h"
 
@@ -26,7 +27,24 @@
 #include "support/path.h"
 #include "support/systemcall.h"
 
-using namespace lyx::support;
+using lyx::support::AddName;
+using lyx::support::bformat;
+using lyx::support::ChangeExtension;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::contains;
+using lyx::support::DirList;
+using lyx::support::GetExtension;
+using lyx::support::LibScriptSearch;
+using lyx::support::MakeRelPath;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::Path;
+using lyx::support::prefixIs;
+using lyx::support::QuoteName;
+using lyx::support::rename;
+using lyx::support::split;
+using lyx::support::subst;
+using lyx::support::Systemcall;
 
 using std::endl;
 using std::find_if;

src/counters.C

@@ -12,16 +12,17 @@
 #include <config.h>
 
 #include "counters.h"
+
 #include "debug.h"
 
-#include "support/std_sstream.h"
 #include "support/lstrings.h"
 
 #include <boost/assert.hpp>
 
-using namespace lyx::support;
+#include "support/std_sstream.h"
 
 using std::endl;
+
 using std::ostringstream;
 
 

src/debug.C

@@ -13,14 +13,19 @@
 
 #include "debug.h"
 #include "gettext.h"
+
 #include "support/lstrings.h"
 
 #include <iomanip>
 
-using namespace lyx::support;
+using lyx::support::ascii_lowercase;
+using lyx::support::bformat;
+using lyx::support::isStrInt;
+using lyx::support::strToInt;
+
+using std::setw;
 
 using std::ostream;
-using std::setw;
 
 namespace {
 

src/exporter.C

@@ -31,7 +31,11 @@
 
 #include "support/filetools.h"
 
-using namespace lyx::support;
+using lyx::support::AddName;
+using lyx::support::bformat;
+using lyx::support::ChangeExtension;
+using lyx::support::contains;
+using lyx::support::MakeDisplayPath;
 
 using std::find;
 

src/factory.C

@@ -54,7 +54,7 @@
 #include "support/lstrings.h"
 #include "support/std_sstream.h"
 
-using namespace lyx::support;
+using lyx::support::compare_ascii_no_case;
 
 using std::endl;
 

src/format.C

@@ -24,7 +24,15 @@
 #include "support/systemcall.h"
 #include "support/lyxfunctional.h"
 
-using namespace lyx::support;
+using lyx::support::bformat;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::contains;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::Path;
+using lyx::support::QuoteName;
+using lyx::support::subst;
+using lyx::support::Systemcall;
 
 
 namespace {

src/frontends/LyXView.C

@@ -43,7 +43,9 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-using namespace lyx::support;
+using lyx::support::MakeDisplayPath;
+using lyx::support::OnlyFilename;
+
 using std::endl;
 
 

src/frontends/controllers/ControlAboutlyx.C

@@ -21,7 +21,10 @@
 
 #include <fstream>
 
-using namespace lyx::support;
+using lyx::support::FileSearch;
+using lyx::support::MakeDisplayPath;
+using lyx::support::system_lyxdir;
+using lyx::support::user_lyxdir;
 
 using std::ostream;
 using std::ostringstream;

src/frontends/controllers/ControlBibtex.C

@@ -21,7 +21,7 @@
 
 #include "support/filetools.h"
 
-using namespace lyx::support;
+using lyx::support::OnlyFilename;
 
 using std::pair;
 using std::vector;

src/frontends/controllers/ControlChanges.C

@@ -21,7 +21,8 @@
 #include "lyxfind.h"
 #include "support/lstrings.h"
 
-using namespace lyx::support;
+using lyx::support::rtrim;
+
 
 ControlChanges::ControlChanges(Dialog & parent)
 	: Dialog::Controller(parent)

src/frontends/controllers/ControlCharacter.C

@@ -19,7 +19,8 @@
 #include "funcrequest.h"
 #include "language.h"
 
-using namespace bv_funcs;
+using bv_funcs::font2string;
+
 
 ControlCharacter::ControlCharacter(Dialog & parent)
 	: Dialog::Controller(parent),

src/frontends/controllers/ControlCommandBuffer.C

@@ -20,15 +20,15 @@
 #include "support/lyxalgo.h"
 #include "support/lstrings.h"
 
-using namespace lyx::support;
+using bv_funcs::currentState;
+
+using lyx::support::prefixIs;
 
 using std::back_inserter;
 using std::transform;
 
 using std::vector;
 
-using namespace bv_funcs;
-
 
 namespace {
 

src/frontends/controllers/ControlDocument.C

@@ -31,7 +31,10 @@
 #include "support/filetools.h"
 #include "support/path_defines.h"
 
-using namespace lyx::support;
+using lyx::support::AddName;
+using lyx::support::AddPath;
+using lyx::support::bformat;
+using lyx::support::user_lyxdir;
 
 
 ControlDocument::ControlDocument(LyXView & lv, Dialogs & d)

src/frontends/controllers/ControlExternal.C

@@ -20,8 +20,6 @@
 
 #include "insets/ExternalTemplate.h"
 
-
-using namespace lyx::support;
 using std::vector;
 
 

src/frontends/controllers/ControlForks.C

@@ -21,7 +21,7 @@
 
 #include <boost/bind.hpp>
 
-using namespace lyx::support;
+using lyx::support::ForkedcallsController;
 
 using std::vector;
 

src/frontends/controllers/ControlGraphics.C

@@ -31,7 +31,13 @@
 #include "support/tostr.h"
 #include "support/types.h"
 
-using namespace lyx::support;
+using lyx::support::AddName;
+using lyx::support::FileInfo;
+using lyx::support::IsFileReadable;
+using lyx::support::MakeAbsPath;
+using lyx::support::readBB_from_PSFile;
+using lyx::support::system_lyxdir;
+using lyx::support::user_lyxdir;
 
 using std::make_pair;
 

src/frontends/controllers/ControlInclude.C

@@ -23,7 +23,9 @@
 
 #include <utility>
 
-using namespace lyx::support;
+using lyx::support::IsFileReadable;
+using lyx::support::MakeAbsPath;
+using lyx::support::OnlyPath;
 
 using std::pair;
 

src/frontends/controllers/ControlMath.C

@@ -18,8 +18,9 @@
 #include "support/lstrings.h"
 #include "support/filetools.h"
 
-
-using namespace lyx::support;
+using lyx::support::compare;
+using lyx::support::LibFileSearch;
+using lyx::support::subst;
 
 
 ControlMath::ControlMath(Dialog & dialog)

src/frontends/controllers/ControlPrefs.C

@@ -30,7 +30,9 @@
 
 #include <utility>
 
-using namespace lyx::support;
+using lyx::support::AddName;
+using lyx::support::system_lyxdir;
+using lyx::support::user_lyxdir;
 
 using std::pair;
 

src/frontends/controllers/ControlPrint.C

@@ -31,10 +31,18 @@
 
 #include "debug.h"
 
-using namespace lyx::support;
+using lyx::support::bformat;
+using lyx::support::ChangeExtension;
+using lyx::support::IsDirWriteable;
+using lyx::support::MakeAbsPath;
+using lyx::support::MakeDisplayPath;
+using lyx::support::Path;
+using lyx::support::QuoteName;
+using lyx::support::Systemcall;
 
 using std::endl;
 
+
 ControlPrint::ControlPrint(LyXView & lv, Dialogs & d)
 	: ControlDialogBD(lv, d),
 	  params_(0)

src/frontends/controllers/ControlRef.C

@@ -18,7 +18,8 @@
 
 #include "support/filetools.h" // MakeAbsPath, MakeDisplayPath
 
-using namespace lyx::support;
+using lyx::support::MakeAbsPath;
+using lyx::support::MakeDisplayPath;
 
 using std::vector;
 

src/frontends/controllers/ControlSendto.C

@@ -23,7 +23,12 @@
 #include "support/lstrings.h"
 #include "support/systemcall.h"
 
-using namespace lyx::support;
+using lyx::support::AddName;
+using lyx::support::ChangeExtension;
+using lyx::support::contains;
+using lyx::support::subst;
+using lyx::support::Systemcall;
+using lyx::support::trim;
 
 using std::vector;
 

src/frontends/controllers/ControlShowFile.C

@@ -13,7 +13,8 @@
 #include "ControlShowFile.h"
 #include "support/filetools.h"
 
-using namespace lyx::support;
+using lyx::support::GetFileContents;
+using lyx::support::OnlyFilename;
 
 
 ControlShowFile::ControlShowFile(Dialog & parent)

src/frontends/controllers/ControlSpellchecker.C

@@ -34,7 +34,7 @@
 
 #include "frontends/Alert.h"
 
-using namespace lyx::support;
+using lyx::support::bformat;
 
 using std::endl;
 

src/frontends/controllers/ControlVCLog.C

@@ -18,7 +18,7 @@
 #include "support/lyxlib.h"
 #include <fstream>
 
-using namespace lyx::support;
+using lyx::support::unlink;
 
 using std::endl;
 using std::ostream;

src/frontends/controllers/biblio.C

@@ -22,7 +22,17 @@
 
 #include <algorithm>
 
-using namespace lyx::support;
+using lyx::support::ascii_lowercase;
+using lyx::support::bformat;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::contains;
+using lyx::support::getVectorFromString;
+using lyx::support::ltrim;
+using lyx::support::rtrim;
+using lyx::support::split;
+using lyx::support::subst;
+using lyx::support::token;
+using lyx::support::trim;
 
 using std::ostringstream;
 using std::vector;
@@ -470,7 +480,6 @@ string const parseBibTeX(string data, string const & findkey)
 
 namespace {
 
-using namespace biblio;
 
 char const * const citeCommands[] = {
 	"cite", "citet", "citep", "citealt", "citealp", "citeauthor",

src/frontends/controllers/helper_funcs.C

@@ -20,7 +20,11 @@
 
 #include "support/filetools.h" // OnlyPath, OnlyFilename
 
-using namespace lyx::support;
+using lyx::support::MakeAbsPath;
+using lyx::support::MakeRelPath;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::prefixIs;
 
 using std::pair;
 using std::vector;

src/frontends/controllers/tex_helpers.C

@@ -24,7 +24,17 @@
 #include <boost/cregex.hpp>
 #include <fstream>
 
-using namespace lyx::support;
+using lyx::support::contains;
+using lyx::support::GetFileContents;
+using lyx::support::getVectorFromString;
+using lyx::support::LibFileSearch;
+using lyx::support::OnlyFilename;
+using lyx::support::Path;
+using lyx::support::Path;
+using lyx::support::split;
+using lyx::support::Systemcall;
+using lyx::support::token;
+using lyx::support::user_lyxdir;
 
 using std::endl;
 

src/frontends/qt2/FileDialog_private.C

@@ -19,7 +19,8 @@
 #include <qapplication.h>
 #include <qtoolbutton.h>
 
-using namespace lyx::support;
+using lyx::support::split;
+
 
 namespace {
 

src/frontends/qt2/QAbout.C

@@ -24,7 +24,7 @@
 #include "Qt2BC.h"
 #include "QAbout.h"
 
-using namespace lyx::support;
+using lyx::support::prefixIs;
 
 using std::getline;
 

src/frontends/qt2/QBibtex.C

@@ -29,12 +29,16 @@
 #include "QBibtex.h"
 #include "Qt2BC.h"
 
-using namespace lyx::support;
+using lyx::support::ChangeExtension;
+using lyx::support::contains;
+using lyx::support::prefixIs;
+using lyx::support::split;
+using lyx::support::trim;
 
 using std::vector;
 
-typedef QController<ControlBibtex, QView<QBibtexDialog> > base_class;
 
+typedef QController<ControlBibtex, QView<QBibtexDialog> > base_class;
 
 QBibtex::QBibtex(Dialog & parent)
 	: base_class(parent, _("BibTeX"))

src/frontends/qt2/QBibtexDialog.C

@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "qt_helpers.h"
 
 #include "support/filetools.h"
@@ -25,8 +24,8 @@
 #include "QBibtexDialog.h"
 #include "QBibtex.h"
 
+using lyx::support::ChangeExtension;
 
-using namespace lyx::support;
 
 QBibtexDialog::QBibtexDialog(QBibtex * form)
 	: QBibtexDialogBase(0, 0, false, 0),

src/frontends/qt2/QCharacter.C

@@ -22,10 +22,24 @@
 #include <qcheckbox.h>
 #include <qcombobox.h>
 
+using frnt::BarPair;
+using frnt::ColorPair;
+using frnt::FamilyPair;
+using frnt::getBarData;
+using frnt::getColorData;
+using frnt::getFamilyData;
+using frnt::getLanguageData;
+using frnt::getSeriesData;
+using frnt::getShapeData;
+using frnt::getSizeData;
+using frnt::LanguagePair;
+using frnt::SeriesPair;
+using frnt::ShapePair;
+using frnt::SizePair;
 
-using namespace frnt;
 using std::vector;
 
+
 typedef QController<ControlCharacter, QView<QCharacterDialog> > base_class;
 
 

src/frontends/qt2/QCitation.C

@@ -28,7 +28,9 @@
 #include "qt_helpers.h"
 #include "support/lstrings.h"
 
-using namespace lyx::support;
+using lyx::support::getStringFromVector;
+using lyx::support::getVectorFromString;
+using lyx::support::trim;
 
 using std::find;
 

src/frontends/qt2/QCommandBuffer.C

@@ -23,11 +23,11 @@
 #include <qtooltip.h>
 #include <qpushbutton.h>
 
-
-using namespace lyx::support;
+using lyx::support::LibFileSearch;
 
 using std::vector;
 
+
 namespace {
 
 class QTempListBox : public QListBox {

src/frontends/qt2/QDocumentDialog.C

@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "qt_helpers.h"
 
 #include "ControlDocument.h"
@@ -35,7 +34,8 @@
 #include <qslider.h>
 #include "lengthcombo.h"
 
-using namespace lyx::support;
+using lyx::support::token;
+
 
 QDocumentDialog::QDocumentDialog(QDocument * form)
 	: QDocumentDialogBase(0, 0, false, 0), form_(form)

src/frontends/qt2/QExternal.C

@@ -29,13 +29,11 @@
 #include "QExternal.h"
 #include "Qt2BC.h"
 
-
-using namespace lyx::support;
+using lyx::support::strToInt;
 
 
 typedef QController<ControlExternal, QView<QExternalDialog> > base_class;
 
-
 QExternal::QExternal(Dialog & parent)
 	: base_class(parent, _("LyX: External Material"))
 {

src/frontends/qt2/QGraphics.C

@@ -34,12 +34,15 @@
 #include "QGraphics.h"
 #include "Qt2BC.h"
 
-using namespace lyx::support;
+using lyx::support::float_equal;
+using lyx::support::strToDbl;
+using lyx::support::strToInt;
+using lyx::support::token;
 
 using std::vector;
 
-typedef QController<ControlGraphics, QView<QGraphicsDialog> > base_class;
 
+typedef QController<ControlGraphics, QView<QGraphicsDialog> > base_class;
 
 QGraphics::QGraphics(Dialog & parent)
 	: base_class(parent, _("LyX: Graphics"))

src/frontends/qt2/QLImage.C

@@ -25,7 +25,7 @@
 
 #include <boost/tuple/tuple.hpp>
 
-using namespace lyx::support;
+using lyx::support::lowercase;
 
 using std::endl;
 using std::find_if;

src/frontends/qt2/QLPopupMenu.C

@@ -20,11 +20,12 @@
 #include "QLPopupMenu.h"
 #include "qt_helpers.h"
 
+using lyx::support::subst;
 
-using namespace lyx::support;
+using std::make_pair;
 
 using std::pair;
-using std::make_pair;
+
 
 namespace {
 

src/frontends/qt2/QMinipage.C

@@ -23,11 +23,11 @@
 #include <qpushbutton.h>
 #include <qlineedit.h>
 
-using namespace lyx::support;
+using lyx::support::strToDbl;
+
 
 typedef QController<ControlMinipage, QView<QMinipageDialog> > base_class;
 
-
 QMinipage::QMinipage(Dialog & parent)
 	: base_class(parent, _("LyX: Minipage Settings"))
 {

src/frontends/qt2/QParagraph.C

@@ -32,8 +32,10 @@
 #include <qtabwidget.h>
 #include <qbuttongroup.h>
 
-
-using namespace lyx::support;
+using lyx::support::contains_functor;
+using lyx::support::isStrDbl;
+using lyx::support::subst;
+using lyx::support::trim;
 
 using std::bind2nd;
 using std::remove_if;

src/frontends/qt2/QPrefs.C

@@ -49,7 +49,8 @@
 #include <qlabel.h>
 #include "qcoloritem.h"
 
-using namespace lyx::support;
+using lyx::support::compare_no_case;
+using lyx::support::strToDbl;
 
 using std::endl;
 using std::setfill;
@@ -62,7 +63,6 @@ using std::vector;
 
 typedef Qt2CB<ControlPrefs, Qt2DB<QPrefsDialog> > base_class;
 
-
 QPrefs::QPrefs()
 	: base_class(_("LyX: Preferences"))
 {

src/frontends/qt2/QTexinfo.C

@@ -22,12 +22,11 @@
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 
-using namespace lyx::support;
+using lyx::support::OnlyFilename;
 
 
 typedef QController<ControlTexinfo, QView<QTexinfoDialog> > base_class;
 
-
 QTexinfo::QTexinfo(Dialog & parent)
 	: base_class(parent, _("LyX: LaTeX Information")),
 	  warningPosted(false), activeStyle(ControlTexinfo::cls)

src/frontends/qt2/QVCLog.C

@@ -22,8 +22,7 @@
 #include <qtextview.h>
 #include <qpushbutton.h>
 
-
-using namespace lyx::support;
+using lyx::support::bformat;
 
 using std::ostringstream;
 

src/frontends/qt2/QWrap.C

@@ -25,11 +25,11 @@
 #include <qpushbutton.h>
 #include <qlineedit.h>
 
-using namespace lyx::support;
+using lyx::support::strToDbl;
+
 
 typedef QController<ControlWrap, QView<QWrapDialog> > base_class;
 
-
 QWrap::QWrap(Dialog & parent)
 	: base_class(parent, _("LyX: Text Wrap Settings"))
 {

src/frontends/qt2/QtView.C

@@ -28,7 +28,7 @@
 #include <qapplication.h>
 #include <qstatusbar.h>
 
-using namespace lyx::support;
+using lyx::support::LibFileSearch;
 
 
 namespace {

src/frontends/qt2/floatplacement.C

@@ -21,10 +21,10 @@
 #include <qlayout.h>
 #include <qgroupbox.h>
 
-using namespace lyx::support;
+using lyx::support::contains;
+
 
 // FIXME: set disabled doesn't work properly
-
 FloatPlacement::FloatPlacement(QWidget * parent, char * name)
 	: QWidget(parent, name)
 {

src/frontends/qt2/lyx_gui.C

@@ -40,8 +40,7 @@
 #include <qapplication.h>
 #include <qpaintdevicemetrics.h>
 
-
-using namespace lyx::support;
+using lyx::support::ltrim;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::exit;

src/frontends/qt2/qfont_loader.C

@@ -30,7 +30,10 @@
 #include <algorithm>
 #endif
 
-using namespace lyx::support;
+using lyx::support::contains;
+using lyx::support::LibFileSearch;
+using lyx::support::OnlyPath;
+using lyx::support::Systemcall;
 
 using std::endl;
 using std::make_pair;

src/frontends/screen.C

@@ -42,7 +42,7 @@
 #include <boost/bind.hpp>
 #include <boost/signals/trackable.hpp>
 
-using namespace lyx::support;
+using lyx::support::LibFileSearch;
 
 using std::min;
 using std::max;

src/frontends/xforms/ColorHandler.C

@@ -24,7 +24,7 @@
 
 #include <cmath>
 
-using namespace lyx::support;
+using lyx::support::bformat;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::pow;

src/frontends/xforms/FileDialog.C

@@ -18,7 +18,7 @@
 
 #include "support/lstrings.h"
 
-using namespace lyx::support;
+using lyx::support::rsplit;
 
 using std::endl;
 

src/frontends/xforms/FontInfo.C

@@ -26,7 +26,8 @@
 
 #include <cmath>
 
-using namespace lyx::support;
+using lyx::support::atoi;
+using lyx::support::token;
 
 using std::abs;
 using std::endl;

src/frontends/xforms/FormBase.C

@@ -25,7 +25,8 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::bformat;
+using lyx::support::LibFileSearch;
 
 
 extern "C" {

src/frontends/xforms/FormBibitem.C

@@ -22,7 +22,7 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::compare;
 
 
 typedef FormController<ControlCommand, FormView<FD_bibitem> > base_class;

src/frontends/xforms/FormBibtex.C

@@ -27,7 +27,14 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::ChangeExtension;
+using lyx::support::compare;
+using lyx::support::contains;
+using lyx::support::getStringFromVector;
+using lyx::support::getVectorFromString;
+using lyx::support::OnlyFilename;
+using lyx::support::prefixIs;
+using lyx::support::split;
 
 using std::vector;
 

src/frontends/xforms/FormCharacter.C

@@ -25,13 +25,26 @@
 #include "lyx_forms.h"
 #include "combox.h"
 
-using namespace lyx::support;
+using frnt::BarPair;
+using frnt::ColorPair;
+using frnt::FamilyPair;
+using frnt::getBarData;
+using frnt::getColorData;
+using frnt::getFamilyData;
+using frnt::getLanguageData;
+using frnt::getSeriesData;
+using frnt::getShapeData;
+using frnt::getSizeData;
+using frnt::LanguagePair;
+using frnt::SeriesPair;
+using frnt::ShapePair;
+using frnt::SizePair;
+
+using lyx::support::getStringFromVector;
 
 using std::vector;
 
 
-using namespace frnt;
-
 typedef FormController<ControlCharacter, FormView<FD_character> > base_class;
 
 FormCharacter::FormCharacter(Dialog & parent)

src/frontends/xforms/FormCitation.C

@@ -23,7 +23,9 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::getStringFromVector;
+using lyx::support::getVectorFromString;
+using lyx::support::trim;
 
 using std::find;
 using std::max;

src/frontends/xforms/FormDialogView.C

@@ -26,7 +26,8 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::bformat;
+using lyx::support::LibFileSearch;
 
 
 extern "C" {

src/frontends/xforms/FormDocument.C

@@ -47,7 +47,11 @@
 
 #include <iomanip>
 
-using namespace lyx::support;
+using lyx::support::bformat;
+using lyx::support::contains_functor;
+using lyx::support::getStringFromVector;
+using lyx::support::getVectorFromString;
+using lyx::support::LibFileSearch;
 
 using std::bind2nd;
 using std::endl;

src/frontends/xforms/FormExternal.C

@@ -28,7 +28,8 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::getStringFromVector;
+using lyx::support::strToInt;
 
 
 typedef FormController<ControlExternal, FormView<FD_external> > base_class;

src/frontends/xforms/FormFiledialog.C

@@ -53,13 +53,25 @@
 # endif
 #endif
 
+using lyx::support::AbsolutePath;
+using lyx::support::AddName;
+using lyx::support::ExpandPath;
+using lyx::support::FileInfo;
+using lyx::support::getcwd;
+using lyx::support::GetEnvPath;
+using lyx::support::LyXReadLink;
+using lyx::support::MakeAbsPath;
+using lyx::support::OnlyFilename;
+using lyx::support::regexMatch;
+using lyx::support::split;
+using lyx::support::suffixIs;
+using lyx::support::trim;
+
 using std::max;
 using std::sort;
 
 using std::map;
 
-using namespace lyx::support;
-
 
 namespace {
 

src/frontends/xforms/FormFloat.C

@@ -26,7 +26,7 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::contains;
 
 
 namespace {

src/frontends/xforms/FormForks.C

@@ -26,7 +26,8 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::split;
+using lyx::support::strToInt;
 
 using std::find;
 using std::find_if;

src/frontends/xforms/FormGraphics.C

@@ -35,9 +35,15 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::bformat;
+using lyx::support::float_equal;
+using lyx::support::getStringFromVector;
+using lyx::support::strToDbl;
+using lyx::support::strToInt;
+using lyx::support::token;
 
 using std::endl;
+
 using std::vector;
 
 

src/frontends/xforms/FormInclude.C

@@ -24,7 +24,7 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::rtrim;
 
 
 typedef FormController<ControlInclude, FormView<FD_include> > base_class;

src/frontends/xforms/FormMinipage.C

@@ -24,7 +24,9 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::getStringFromVector;
+using lyx::support::isStrDbl;
+using lyx::support::subst;
 
 
 typedef FormController<ControlMinipage, FormView<FD_minipage> > base_class;

src/frontends/xforms/FormParagraph.C

@@ -33,7 +33,9 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::contains_functor;
+using lyx::support::getStringFromVector;
+using lyx::support::rtrim;
 
 using std::bind2nd;
 using std::remove_if;

src/frontends/xforms/FormPreferences.C

@@ -37,6 +37,13 @@
 
 #include <iomanip>
 
+using lyx::support::AddName;
+using lyx::support::ChangeExtension;
+using lyx::support::rtrim;
+using lyx::support::strToDbl;
+using lyx::support::trim;
+using lyx::support::user_lyxdir;
+
 using std::endl;
 using std::make_pair;
 using std::max;
@@ -45,8 +52,6 @@ using std::min;
 using std::pair;
 using std::vector;
 
-using namespace lyx::support;
-
 
 namespace {
 

src/frontends/xforms/FormPrint.C

@@ -27,12 +27,11 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::strToInt;
 
 
 typedef FormCB<ControlPrint, FormDB<FD_print> > base_class;
 
-
 FormPrint::FormPrint()
 	: base_class(_("Print Document"))
 {}

src/frontends/xforms/FormRef.C

@@ -24,7 +24,7 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::getStringFromVector;
 
 using std::find;
 using std::max;

src/frontends/xforms/FormSendto.C

@@ -24,7 +24,7 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::trim;
 
 using std::vector;
 

src/frontends/xforms/FormTabular.C

@@ -24,9 +24,12 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::contains_functor;
+using lyx::support::getStringFromVector;
+using lyx::support::isStrDbl;
 
 using std::bind2nd;
+
 using std::vector;
 
 

src/frontends/xforms/FormTexinfo.C

@@ -20,7 +20,7 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::OnlyFilename;
 
 
 typedef FormController<ControlTexinfo, FormView<FD_texinfo> > base_class;

src/frontends/xforms/FormText.C

@@ -23,7 +23,7 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::trim;
 
 
 typedef FormController<ControlCommand, FormView<FD_text> > base_class;

src/frontends/xforms/FormThesaurus.C

@@ -21,7 +21,9 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::lowercase;
+using lyx::support::trim;
+using lyx::support::uppercase;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::islower;

src/frontends/xforms/FormToc.C

@@ -21,7 +21,7 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using lyx::support::getStringFromVector;
 
 using std::vector;
 

src/frontends/xforms/FormWrap.C

@@ -25,11 +25,12 @@
 #include "lyx_forms.h"
 #include "support/tostr.h"
 
-using namespace lyx::support;
+using lyx::support::getStringFromVector;
+using lyx::support::subst;
+
 
 typedef FormController<ControlWrap, FormView<FD_wrap> > base_class;
 
-
 FormWrap::FormWrap(Dialog & parent)
 	: base_class(parent, _("Text Wrap Settings"))
 {}

src/frontends/xforms/Tooltips.C

@@ -26,7 +26,7 @@
 
 #include <boost/bind.hpp>
 
-using namespace lyx::support;
+using lyx::support::trim;
 
 
 bool Tooltips::enabled_ = true;