'using namespace lyx::support' instead of 'using support::xxx'

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

diff --git a/src/Author.cpp b/src/Author.cpp
index d31dd7cb5f2017f51ac4480c949b6736c1a20432..aa9c970a34d7ada28b95bdf8efe2e1fb3a3860dd 100644 (file)
--- a/src/Author.cpp
+++ b/src/Author.cpp
@@ -19,12 +19,10 @@
 #include <istream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::token;
-using support::trim;
-
 
 bool operator==(Author const & l, Author const & r)
 {

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index b5579da7b1cfa63e0ead3e2fefe34fc94a82d065..538922f0a2167ef32c12d781ea61c5a0a0928597 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -31,14 +31,10 @@
 #include "boost/regex.hpp"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-using support::compare_no_case;
-using support::getVectorFromString;
-using support::ltrim;
-using support::rtrim;
 
 //////////////////////////////////////////////////////////////////////
 //

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 83002cc6f7aae662baf7eea09bd340e4144ff1be..d9b0acbfb480280ef6a6b5d49b474448e500e9c0 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -107,34 +107,10 @@
 #include <fstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::addName;
-using support::bformat;
-using support::changeExtension;
-using support::cmd_ret;
-using support::createBufferTmpDir;
-using support::FileName;
-using support::FileNameList;
-using support::libFileSearch;
-using support::latex_path;
-using support::ltrim;
-using support::makeAbsPath;
-using support::makeDisplayPath;
-using support::makeLatexName;
-using support::onlyFilename;
-using support::onlyPath;
-using support::quoteName;
-using support::removeAutosaveFile;
-using support::rename;
-using support::runCommand;
-using support::split;
-using support::subst;
-using support::tempName;
-using support::trim;
-using support::suffixIs;
-
 namespace Alert = frontend::Alert;
 namespace os = support::os;
 
@@ -1026,7 +1002,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
        catch (...) {
                lyxerr << "Caught some really weird exception..." << endl;
                LyX::cref().emergencyCleanup();
-               abort();
+               lyx::support::abort();
        }
 
        ofs.close();

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index a650ba62dc32d7a7c67a89463dc983c59932f176..8584d46bee315878c954f674400b76bc12366f3a 100644 (file)
--- a/src/BufferList.cpp
+++ b/src/BufferList.cpp
@@ -36,18 +36,10 @@
 using boost::bind;
 
 using namespace std;
+using namespace lyx::support;
 
 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;
 
 

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 322d9d3ea57ec3840cb89ec0d3d229f7b4b64a43..3dfe0656f88e6abc859cb390dfb6fa3e8805f6cd 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -54,13 +54,7 @@
 #include <sstream>
 
 using namespace std;
-
-using lyx::support::FileName;
-using lyx::support::libFileSearch;
-using lyx::support::bformat;
-using lyx::support::rtrim;
-using lyx::support::tokenPos;
-using lyx::support::prefixIs;
+using namespace lyx::support;
 
 
 static char const * const string_paragraph_separation[] = {

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 8ce64641e4e0dfed4dc20e362004ff34f0d66b12..468e0a0a90dca355446099e731fa85d4dab7c404 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -81,18 +81,10 @@
 #include <vector>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::addPath;
-using support::bformat;
-using support::FileFilterList;
-using support::FileName;
-using support::fileSearch;
-using support::makeDisplayPath;
-using support::makeAbsPath;
-using support::package;
-
 namespace Alert = frontend::Alert;
 
 namespace {

diff --git a/src/Chktex.cpp b/src/Chktex.cpp
index 809d9643675e0c74067b1d3b8f4c8ec61a6857ea..20ee902876738a9d1f4d01bec583594acad6884f 100644 (file)
--- a/src/Chktex.cpp
+++ b/src/Chktex.cpp
@@ -24,16 +24,10 @@
 #include <boost/format.hpp>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::changeExtension;
-using support::FileName;
-using support::makeAbsPath;
-using support::onlyFilename;
-using support::split;
-using support::Systemcall;
-
 
 Chktex::Chktex(string const & chktex, string const & f, string const & p)
                : cmd(chktex), file(f), path(p)

diff --git a/src/CmdDef.cpp b/src/CmdDef.cpp
index b05d726a18fb8304a03be8ee7466690f95d0e6e3..f7dbb71a0921a167a0efeaa488f6240505b44f5c 100644 (file)
--- a/src/CmdDef.cpp
+++ b/src/CmdDef.cpp
@@ -23,14 +23,10 @@
 #include <string>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-using support::i18nLibFileSearch;
-using support::trim;
-
-
 namespace {
 
 enum CmdDefTags {

diff --git a/src/Color.cpp b/src/Color.cpp
index f90b24e255d98990094d9204ccc849a3c10a5983..68b71f37fb8c78fc10f42407f49870e44c9ef532 100644 (file)
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -31,10 +31,10 @@
 
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::ascii_lowercase;
 
 struct ColorSet::ColorEntry {
        ColorCode lcolor;

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 6768299f7c8352ad2964dbe5aa01ffe8b46e2382..4f27e8f33f07e7f56ba9b95aaabea7316b6fa842 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -37,31 +37,10 @@
 #include "support/Systemcall.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::addName;
-using support::bformat;
-using support::changeExtension;
-using support::compare_ascii_no_case;
-using support::contains;
-using support::FileName;
-using support::FileNameList;
-using support::getExtension;
-using support::libFileSearch;
-using support::libScriptSearch;
-using support::makeAbsPath;
-using support::makeRelPath;
-using support::onlyFilename;
-using support::onlyPath;
-using support::package;
-using support::prefixIs;
-using support::quoteName;
-using support::removeExtension;
-using support::split;
-using support::subst;
-using support::Systemcall;
-
 namespace Alert = lyx::frontend::Alert;
 
 

diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp
index 4ca2979a35c4581b13a90cf364e884e22a10f4e1..d82f939ff2e10bfd6068a6ac48c9e5b33a56162c 100644 (file)
--- a/src/ConverterCache.cpp
+++ b/src/ConverterCache.cpp
@@ -36,12 +36,10 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-using support::addName;
-
 namespace {
 
 unsigned long do_crc(string const & s)

diff --git a/src/Counters.cpp b/src/Counters.cpp
index ad13330cd78365f2b95831ce95fc493531b69215..1c910b115c2e4cdf7595cac964282e2527b5bcc9 100644 (file)
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -24,10 +24,10 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::lowercase;
 
 Counter::Counter()
 {

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 51fd1bbf1bde66962a6b75142ee15200b3ff446a..44f04bf4e29cf8d4789ee6d672d5b939174b018c 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -59,12 +59,10 @@
 #include <string>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-using frontend::Clipboard;
-
 namespace {
 
 typedef std::pair<pit_type, int> PitPosPair;

diff --git a/src/DepTable.cpp b/src/DepTable.cpp
index b37f9141509f41e6d6891de056678fb99980d895..17eab19fb3af58d927d7287a29aebe28a04da06f 100644 (file)
--- a/src/DepTable.cpp
+++ b/src/DepTable.cpp
@@ -25,13 +25,10 @@
 #include <fstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-using support::ltrim;
-using support::onlyFilename;
-using support::suffixIs;
 
 inline
 bool DepTable::dep_info::changed() const

diff --git a/src/EmbeddedFiles.cpp b/src/EmbeddedFiles.cpp
index e31f95460d91c4827d563aaad4d83d146fbde0b8..325ca23362a9feb8b817b03820977e4e49418d04 100644 (file)
--- a/src/EmbeddedFiles.cpp
+++ b/src/EmbeddedFiles.cpp
@@ -39,23 +39,12 @@
 #include <utility>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
 namespace Alert = frontend::Alert;
 
-using support::FileName;
-using support::DocFileName;
-using support::makeAbsPath;
-using support::addName;
-using support::absolutePath;
-using support::onlyFilename;
-using support::makeRelPath;
-using support::changeExtension;
-using support::bformat;
-using support::prefixIs;
-using support::makedir;
-
 
 EmbeddedFile::EmbeddedFile(string const & file, string const & inzip_name,
        bool embed, Inset const * inset)

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 949e673d42148ac7ab29d393671db977ff7754e0..ec06b562d2f3b0061f21b5d05e5b2333cb19f1b2 100644 (file)
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -28,11 +28,10 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-
 Encodings encodings;
 
 namespace {

diff --git a/src/ErrorList.cpp b/src/ErrorList.cpp
index bc007da2ddc5d8d060f5fd77cc6636eb59eef9e5..be395cbd2ebaca4e48b44273654bcf2573aebb45 100644 (file)
--- a/src/ErrorList.cpp
+++ b/src/ErrorList.cpp
@@ -16,6 +16,7 @@ using namespace std;
 
 namespace lyx {
 
+
 ErrorItem::ErrorItem(docstring const & error_, docstring const & description_,
                     int par_id_, pos_type pos_start_, pos_type pos_end_)
        : error(error_), description(description_), par_id(par_id_),

diff --git a/src/Exporter.cpp b/src/Exporter.cpp
index 326358560cf8cc4e6a0800ffb60903c305a6afbf..8546b0a8ca8a76e912f02523611d06ff99adcd7e 100644 (file)
--- a/src/Exporter.cpp
+++ b/src/Exporter.cpp
@@ -30,17 +30,10 @@
 #include <algorithm>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-using support::FileName;
-using support::makeDisplayPath;
-using support::onlyFilename;
-using support::onlyPath;
-using support::package;
-using support::prefixIs;
-
 namespace Alert = frontend::Alert;
 
 /// ask the user what to do if a file already exists

diff --git a/src/Font.cpp b/src/Font.cpp
index a1492db03233f6909792ca7dd318ec375d7a279d..03997b2c6f9b5298502bcc7c5def2efd0113e6f5 100644 (file)
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -32,14 +32,10 @@
 #include "support/lstrings.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::ascii_lowercase;
-using support::bformat;
-using support::rtrim;
-using support::subst;
-
 //
 // Names for the GUI
 //

diff --git a/src/Format.cpp b/src/Format.cpp
index 6154d69689c39a2cd87be575c0723a2c389617df..077a33e08ec26462d3549a3030f44ab3847d7759 100644 (file)
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -26,22 +26,10 @@
 #include "support/Systemcall.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::absolutePath;
-using support::bformat;
-using support::compare_ascii_no_case;
-using support::contains;
-using support::FileName;
-using support::libScriptSearch;
-using support::makeDisplayPath;
-using support::onlyPath;
-using support::quoteName;
-using support::subst;
-using support::Systemcall;
-using support::token;
-
 namespace Alert = frontend::Alert;
 namespace os = support::os;
 

diff --git a/src/ISpell.cpp b/src/ISpell.cpp
index 28358c828b4bbddeef0bb8af519d2c499dc90e26..6b7d1324d68c84c3b56041a22da3d3bb93635641 100644 (file)
--- a/src/ISpell.cpp
+++ b/src/ISpell.cpp
@@ -37,11 +37,10 @@
 using boost::shared_ptr;
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-
 namespace {
 
 class LaunchIspell : public support::ForkedProcess {

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index f6cc6848b5bef4d65b5068a50ac90cf45e99f23d..67384b5adffb43dfa7eef489ad830929fd8852b8 100644 (file)
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -28,12 +28,10 @@
 #include <utility>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-using support::i18nLibFileSearch;
-
 
 string const KeyMap::printKeySym(KeySymbol const & key, KeyModifier mod)
 {

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index 7a71b457c9d0ef41fcb93a4d4fe3636ec5508acd..efa764b18b1ad56c0ca42783549c4a4563de1118 100644 (file)
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -37,29 +37,10 @@ using boost::regex;
 using boost::smatch;
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::absolutePath;
-using support::bformat;
-using support::changeExtension;
-using support::contains;
-using support::FileName;
-using support::findtexfile;
-using support::getcwd;
-using support::makeAbsPath;
-using support::onlyFilename;
-using support::prefixIs;
-using support::quoteName;
-using support::removeExtension;
-using support::rtrim;
-using support::rsplit;
-using support::split;
-using support::subst;
-using support::suffixIs;
-using support::Systemcall;
-using support::trim;
-
 namespace os = support::os;
 
 // TODO: in no particular order

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 5953c952df6aa706af827d6dc7ec9aa75b46bff6..1b29d2206aef676b59878283f95d3d24b8ad3e7d 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -32,14 +32,10 @@
 #include "support/filetools.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::isSGMLFilename;
-using support::libFileSearch;
-using support::makeRelPath;
-using support::onlyPath;
-
 /////////////////////////////////////////////////////////////////////
 //
 // Strings

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 1374fbefd7d738fb9af23446bed37efe1a8c6dc6..08ae3f1973899016929500f231b5954380d0581e 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -24,13 +24,10 @@
 #include <ostream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::subst;
-using support::trim;
-
-
 /// Special value of toclevel for layouts that to not belong in a TOC
 const int Layout::NOT_IN_TOC = -1000;
 

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index a6418ef040dfd975240daab372b46bc80c443a6e..781aa52d15c5784e830a7bd4fde90549e0d979da 100644 (file)
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -34,21 +34,10 @@
 #include <vector>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::compare_ascii_no_case;
-using support::FileName;
-using support::isStrDbl;
-using support::isStrInt;
-using support::ltrim;
-using support::makeDisplayPath;
-using support::prefixIs;
-using support::split;
-using support::subst;
-using support::trim;
-
-
 //////////////////////////////////////////////////////////////////////
 //
 // Lexer::Pimpl

diff --git a/src/LyX.cpp b/src/LyX.cpp
index e74dfc7814f4a143d7247696cb4c0a8116a9c321..f4fdda708ffe9f18e70114f0b51b10696aaa7e7d 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -70,24 +70,10 @@
 #include <vector>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::addName;
-using support::addPath;
-using support::bformat;
-using support::changeExtension;
-using support::createLyXTmpDir;
-using support::FileName;
-using support::fileSearch;
-using support::getEnv;
-using support::i18nLibFileSearch;
-using support::libFileSearch;
-using support::package;
-using support::prependEnvPath;
-using support::rtrim;
-using support::Systemcall;
-
 namespace Alert = frontend::Alert;
 namespace os = support::os;
 

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index e493aa0d527e65524d32f9d23aa1b5a5e20b999b..36f92780be8a53902656a11bc2f7025b918cb74d 100644 (file)
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -23,13 +23,10 @@
 #include <boost/assert.hpp>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::split;
-using support::trim;
-
-
 /*
      NAMING RULES FOR USER-COMMANDS
      Here's the set of rules to apply when a new command name is introduced:

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 4e05990dc967dc78aec683c94c94d29cab157a9a..5da4fd1a573c2de48b149087f7e3c2727d837aa8 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -96,34 +96,12 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
 using frontend::LyXView;
 
-using support::absolutePath;
-using support::addName;
-using support::addPath;
-using support::bformat;
-using support::changeExtension;
-using support::contains;
-using support::FileFilterList;
-using support::FileName;
-using support::fileSearch;
-using support::i18nLibFileSearch;
-using support::makeDisplayPath;
-using support::makeAbsPath;
-using support::package;
-using support::quoteName;
-using support::rtrim;
-using support::split;
-using support::subst;
-using support::Systemcall;
-using support::token;
-using support::trim;
-using support::prefixIs;
-
-
 namespace Alert = frontend::Alert;
 
 extern bool quitting;

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index d7b6f09b4561fcc4c4b5285d7573064c7b382e50..666e63efdc24fd05cfc91166093d3109a152e601 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -41,19 +41,12 @@
 #include "support/userinfo.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
 namespace os = support::os;
 
-using support::ascii_lowercase;
-using support::bformat;
-using support::expandPath;
-using support::FileName;
-using support::getEnv;
-using support::libFileSearch;
-using support::token;
-
 namespace {
 
 // when adding something to this array keep it sorted!

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index aff782494fe2977f7f2d69ed0e75cd40f9b58809..1e595894b829d4867710e4b89d4c3acf5bf9dc21 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -28,14 +28,10 @@
 #include "support/lyxlib.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-using support::FileName;
-using support::makeAbsPath;
-using support::tempName;
-
 namespace Alert = frontend::Alert;
 
 

diff --git a/src/MenuBackend.cpp b/src/MenuBackend.cpp
index 5c20906999387af23a63ef1325b2ae729881f36d..e9b4009fda2e7a72644691d1e995d5f4fa9bc8b8 100644 (file)
--- a/src/MenuBackend.cpp
+++ b/src/MenuBackend.cpp
@@ -50,14 +50,10 @@
 
 using namespace std;
 using boost::bind;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::compare_ascii_no_case;
-using support::contains;
-using support::makeDisplayPath;
-using support::token;
-
 namespace {
 
 class MenuNamesEqual : public std::unary_function<Menu, bool> {

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index 1e7f13ca36af03675765c1d2a2dfe69b4ec4a661..baa185c1a278d7c272421a869d778ef04f8282a2 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -23,12 +23,10 @@
 #include <ostream>
        
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-using support::libFileSearch;
-using support::makeDisplayPath;
 
 //global variable: module list
 ModuleList moduleList;

diff --git a/src/Mover.cpp b/src/Mover.cpp
index b989cf118e147265dac58311bd7e5df608608eea..c188ff95563ded0dd0c31beedc675bf3fb390554 100644 (file)
--- a/src/Mover.cpp
+++ b/src/Mover.cpp
@@ -21,10 +21,10 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::quoteName;
 
 bool Mover::copy(support::FileName const & from, support::FileName const & to,
                 unsigned long int mode) const

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 8ef2665631b9fbbca860ceb0de1c1643d55d0abd..307c9b169f05c89e8a4e4748f1b2e64b90e83fd0 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -21,6 +21,7 @@
 #include <string>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -123,7 +124,7 @@ void PDFOptions::writeLaTeX(odocstream & os, bool hyper_required) const
        if (!pagemode.empty())
                opt += "pdfpagemode=" + pagemode + ',';
        
-       opt = support::rtrim(opt,",");
+       opt = rtrim(opt,",");
        opt += "]\n {hyperref}\n";
 
        // load the pdftitle etc. as hypersetup, otherwise you'll get
@@ -141,7 +142,7 @@ void PDFOptions::writeLaTeX(odocstream & os, bool hyper_required) const
                hyperset += "\n ";
                hyperset += quoted_options_get();
        }
-       hyperset = support::rtrim(hyperset,",");
+       hyperset = rtrim(hyperset,",");
        if (!hyperset.empty())
                opt += "\\hypersetup{" + hyperset + "}\n ";
        

diff --git a/src/PSpell.cpp b/src/PSpell.cpp
index bb5862da9aec64a75b64ed8f4fead921c4bc0e71..c4b4d980ac661a2d8640a913e35285dc566bf25b 100644 (file)
--- a/src/PSpell.cpp
+++ b/src/PSpell.cpp
@@ -25,6 +25,7 @@ extern "C" {
 #include <boost/assert.hpp>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index ecb0733969816efa4178badc627a0e46c7f99223..595d8223ca6a6c1ad9c1671c68d43e3d7bcc0d5c 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -59,17 +59,10 @@
 #include <vector>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::contains;
-using support::lowercase;
-using support::prefixIs;
-using support::subst;
-using support::suffixIs;
-using support::rsplit;
-using support::uppercase;
-
 namespace {
 /// Inset identifier (above 0x10ffff, for ucs-4)
 char_type const META_INSET = 0x200001;

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 5d89a3c280207e6760d6abfff9ff2c9deb28fd7f..36d850b1d9f867d9bee153852a94d03fb47cf189 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -58,13 +58,10 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using lyx::support::contains;
-using lyx::support::rsplit;
-using support::subst;
-
 
 ParagraphMetrics::ParagraphMetrics(Paragraph const & par): position_(-1), par_(&par)
 {

diff --git a/src/ParagraphParameters.cpp b/src/ParagraphParameters.cpp
index c8c0a5dab470d71b1659d96ccc5fed305405f8c0..0e2ce0ee8102e7593d189729d926ca96479b63ff 100644 (file)
--- a/src/ParagraphParameters.cpp
+++ b/src/ParagraphParameters.cpp
@@ -28,10 +28,10 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::rtrim;
 
 //NOTE The order of these MUST be the same as in Layout.h.
 static char const * const string_align[] = {

diff --git a/src/Server.cpp b/src/Server.cpp
index e4a44343688990d8c1d49115faa3b371cf9fdb82..286be5d4da9cea891424cd0257d0d686ccb9d71b 100644 (file)
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -59,15 +59,10 @@
 #include <fcntl.h>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::compare;
-using support::FileName;
-using support::rtrim;
-using support::split;
-
-
 /////////////////////////////////////////////////////////////////////
 //
 // LyXComm

diff --git a/src/Text.cpp b/src/Text.cpp
index ce49dfc5498c1002ef413c9466f991d919a1244d..70464c10dc42db479238da78c2b59b02faca684b 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -74,14 +74,10 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-using support::contains;
-using support::split;
-using support::subst;
-
 using cap::cutSelection;
 using cap::pasteParagraphList;
 

diff --git a/src/Text3.cpp b/src/Text3.cpp
index a8e079fdf6a183e3091eb3fc0067ee2bd5a0c1e2..8490e4491743bf98aa9c053a92178b20426cd8b0 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -75,6 +75,7 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -84,9 +85,6 @@ using cap::pasteFromStack;
 using cap::pasteClipboard;
 using cap::replaceSelection;
 
-using support::isStrUnsignedInt;
-using support::token;
-
 // globals...
 static Font freefont(ignore_font, ignore_language);
 static bool toggleall = false;

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 2253108761a4ea6e86be5d813e4a88c6389ecb49..7f3772ec95d621e26511cdcd53714a2a54e2ce18 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -36,18 +36,10 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-using support::libFileSearch;
-using support::makeDisplayPath;
-using support::quoteName;
-using support::rtrim;
-using support::subst;
-using support::addName;
-
-
 namespace {
 
 class LayoutNamesEqual : public std::unary_function<LayoutPtr, bool> {

diff --git a/src/TextClassList.cpp b/src/TextClassList.cpp
index eceacd29da1f3d3d6bfd6c0b124cff10d2f0e252..fec02e520f98c1c18bd2a08ae7acaace3c169c0f 100644 (file)
--- a/src/TextClassList.cpp
+++ b/src/TextClassList.cpp
@@ -23,20 +23,15 @@
 
 #include <fstream>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-using support::addName;
-using support::libFileSearch;
-using support::makeDisplayPath;
-
 using boost::bind;
 using boost::regex;
 using boost::smatch;
 
-using namespace std;
-
 // Gets textclass number from name
 pair<bool, textclass_type> const
 TextClassList::numberOfClass(string const & textclass) const

diff --git a/src/ToolbarBackend.cpp b/src/ToolbarBackend.cpp
index cbe318267df65dfea424d2e91c2ea96b51cb6339..91eab84e1b19889e509da222f41ca5e4ae27e057 100644 (file)
--- a/src/ToolbarBackend.cpp
+++ b/src/ToolbarBackend.cpp
@@ -23,12 +23,10 @@
 #include <algorithm>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::compare_ascii_no_case;
-using support::getVectorFromString;
-
 namespace {
 
 class ToolbarNamesEqual

diff --git a/src/Trans.cpp b/src/Trans.cpp
index 9d061d15eccc162032bc7284221e4bec51dbc81a..8954f1d4c705f79cdc9b6d84b6d0d185cd0cba93 100644 (file)
--- a/src/Trans.cpp
+++ b/src/Trans.cpp
@@ -28,14 +28,10 @@
 #include "support/docstream.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::split;
-using support::contains;
-using support::libFileSearch;
-
-
 /////////////////////////////////////////////////////////////////////
 //
 // TeXAccents

diff --git a/src/Undo.cpp b/src/Undo.cpp
index 74e8cbc2c3d9453c70388320d9ec282031109df1..401051e3f58e5ac22d4d94293cfc5e81fd01aabb 100644 (file)
--- a/src/Undo.cpp
+++ b/src/Undo.cpp
@@ -37,6 +37,7 @@
 #include <ostream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index c92a648ffd7b6d6e3e6074d47b13786ed8f9940c..1726b921ef7fefa897e1c72f727d11fc89eb65cb 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -24,6 +24,7 @@
 #include <fstream>
 
 using namespace std;
+using namespace lyx::support;
 
 using boost::regex;
 using boost::regex_match;
@@ -31,17 +32,6 @@ using boost::smatch;
 
 namespace lyx {
 
-using support::addName;
-using support::addPath;
-using support::contains;
-using support::FileName;
-using support::onlyFilename;
-using support::onlyPath;
-using support::quoteName;
-using support::rtrim;
-using support::split;
-using support::Systemcall;
-
 
 int VCS::doVCCommand(string const & cmd, FileName const & path)
 {

diff --git a/src/VSpace.cpp b/src/VSpace.cpp
index b42409e88d88d194d894f4dee2d1e28f3746c7ae..45379fd85dce898d3fca4cdd9340d17699d4ba3f 100644 (file)
--- a/src/VSpace.cpp
+++ b/src/VSpace.cpp
@@ -24,16 +24,10 @@
 #include "support/lstrings.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::compare;
-using support::isStrDbl;
-using support::ltrim;
-using support::prefixIs;
-using support::rtrim;
-
-
 namespace {
 
 /// used to return numeric values in parsing vspace

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index a76a2a9952b6d5251c201f69e14c3bcb142acfeb..3f031df6be218591a54ca2497ad039525d9e13e4 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -51,19 +51,10 @@
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 
-
-namespace lyx {
-
 using namespace std;
+using namespace lyx::support;
 
-using support::addName;
-using support::bformat;
-using support::FileName;
-using support::libFileSearch;
-using support::makeAbsPath;
-using support::makeDisplayPath;
-using support::onlyFilename;
-using support::onlyPath;
+namespace lyx {
 
 namespace Alert = frontend::Alert;
 

diff --git a/src/client/Messages.cpp b/src/client/Messages.cpp
index 0b2aa7319d253c587a46473b8c03e61252a129e5..6a51e171fcdbafb1ff6b4d9629a6ffa9b977f949 100644 (file)
--- a/src/client/Messages.cpp
+++ b/src/client/Messages.cpp
@@ -19,11 +19,10 @@
 #include <ostream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::package;
-
 
 #ifdef ENABLE_NLS
 

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 4b1962eb3bf30aea02f76a0a9c722ddce231e8b0..3c17593935d9485455bf966b84b45a5fa23f834b 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -55,15 +55,13 @@
 #include <iostream>
 
 using namespace std;
+using namespace lyx::support;
 
 using ::boost::scoped_ptr;
 namespace fs = ::boost::filesystem;
 
 namespace lyx {
 
-using support::FileName;
-using support::prefixIs;
-
 namespace support {
 
 string itoa(unsigned int i)

diff --git a/src/client/debug.cpp b/src/client/debug.cpp
index 40cf5f5bc7b54d280cd93257d053873600d2fac2..d113e8d4058824752dda35a7a949daabccf6ea3c 100644 (file)
--- a/src/client/debug.cpp
+++ b/src/client/debug.cpp
@@ -22,13 +22,10 @@
 #include <iomanip>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::ascii_lowercase;
-using support::bformat;
-using support::isStrInt;
-
 namespace {
 
 struct ErrorItem {

diff --git a/src/client/gettext.cpp b/src/client/gettext.cpp
index e62c0efa5177b940d7b055456bc961f989868896..013daf967f41b3001c4a5257e5f3094d1919e280 100644 (file)
--- a/src/client/gettext.cpp
+++ b/src/client/gettext.cpp
@@ -15,6 +15,7 @@
 #include "Messages.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 

diff --git a/src/frontends/qt4/Dialog.cpp b/src/frontends/qt4/Dialog.cpp
index 04e09a95fecd0829587faf7350c757d8be318b3c..7a0bd41fcfeed59acf6f11490b2673c183ad4e7c 100644 (file)
--- a/src/frontends/qt4/Dialog.cpp
+++ b/src/frontends/qt4/Dialog.cpp
@@ -28,6 +28,7 @@
 #include <string>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/qt4/FloatPlacement.cpp b/src/frontends/qt4/FloatPlacement.cpp
index ffcedaf32bb07408667227f98042e7f88a28183b..563896e0c9a379019d3dcf909dcf01fc332065b8 100644 (file)
--- a/src/frontends/qt4/FloatPlacement.cpp
+++ b/src/frontends/qt4/FloatPlacement.cpp
@@ -18,8 +18,8 @@
 #include "support/lstrings.h"
 
 using namespace std;
+using namespace lyx::support;
 
-using lyx::support::contains;
 
 //namespace lyx {
 

diff --git a/src/frontends/qt4/GuiAlert.cpp b/src/frontends/qt4/GuiAlert.cpp
index 512700421b882953e356fc968cad6bdc355ebca9..a9cb6d82aea929b2a3dad5e7ec2bc52db85195f7 100644 (file)
--- a/src/frontends/qt4/GuiAlert.cpp
+++ b/src/frontends/qt4/GuiAlert.cpp
@@ -32,11 +32,11 @@
 #include <iomanip>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::bformat;
 
 static docstring const formatted(docstring const & text)
 {

diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index 7c62b2913ac5bbb61d76aab94e08e23a125a3a7f..6f0602f480dff78ba7e6094a19def8e1e3b3290f 100644 (file)
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -37,18 +37,11 @@
 #include <QLineEdit>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::changeExtension;
-using support::contains;
-using support::FileFilterList;
-using support::onlyFilename;
-using support::prefixIs;
-using support::split;
-using support::trim;
-
 
 GuiBibtex::GuiBibtex(GuiView & lv)
        : GuiCommand(lv, "bibtex")

diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp
index f7b32c2d44c482e0bb31544cc8d58aad055f2862..188eafbbcefe545b306b4bfa2e7a3c66c1b8a879 100644 (file)
--- a/src/frontends/qt4/GuiClipboard.cpp
+++ b/src/frontends/qt4/GuiClipboard.cpp
@@ -25,14 +25,12 @@
 #include "support/lstrings.h"
 
 using namespace std;
+using namespace lyx::support;
 
 static char const * const mime_type = "application/x-lyx";
 
 namespace lyx {
 
-using support::internalLineEnding;
-using support::externalLineEnding;
-
 namespace frontend {
 
 GuiClipboard::GuiClipboard()

diff --git a/src/frontends/qt4/GuiCommandBuffer.cpp b/src/frontends/qt4/GuiCommandBuffer.cpp
index 1f36f91c413abd976c2e834ace16f925aa3e0462..b2ae0a1f4c714cf6190fda6eb11fffafe4ae7c88 100644 (file)
--- a/src/frontends/qt4/GuiCommandBuffer.cpp
+++ b/src/frontends/qt4/GuiCommandBuffer.cpp
@@ -38,13 +38,11 @@
 #include <QVBoxLayout>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::prefixIs;
-
-
 namespace {
 
 class QTempListBox : public QListWidget {

diff --git a/src/frontends/qt4/GuiErrorList.cpp b/src/frontends/qt4/GuiErrorList.cpp
index 99c7b4cbb78671a3f903df698c208598a285c29f..8af229eb93d046208b013a52a3ec9f933e1a30aa 100644 (file)
--- a/src/frontends/qt4/GuiErrorList.cpp
+++ b/src/frontends/qt4/GuiErrorList.cpp
@@ -29,12 +29,11 @@
 #include <QCloseEvent>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::bformat;
-
 GuiErrorList::GuiErrorList(GuiView & lv)
        : GuiDialog(lv, "errorlist")
 {

diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp
index a3dc99831e2ed952198310e9dec929208995eb1e..8113f7d137dee2fd22b9cdabb5ae21ec643e1e82 100644 (file)
--- a/src/frontends/qt4/GuiExternal.cpp
+++ b/src/frontends/qt4/GuiExternal.cpp
@@ -46,20 +46,11 @@
 #include <QTextBrowser>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::FileFilterList;
-using support::FileName;
-using support::float_equal;
-using support::isStrDbl;
-using support::makeAbsPath;
-using support::readBB_from_PSFile;
-using support::token;
-using support::trim;
-using support::os::internal_path;
-
 using namespace external;
 
 namespace {

diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp
index 35a6c71005e33e3678c161cd7b8afb30892f00eb..31d00f63476efe9cfe27032ed859df3e6d820edf 100644 (file)
--- a/src/frontends/qt4/GuiGraphics.cpp
+++ b/src/frontends/qt4/GuiGraphics.cpp
@@ -55,21 +55,11 @@
 #include <utility>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::addName;
-using support::FileFilterList;
-using support::FileName;
-using support::float_equal;
-using support::makeAbsPath;
-using support::os::internal_path;
-using support::package;
-using support::readBB_from_PSFile;
-using support::token;
-
-
 //FIXME setAutoTextCB should really take an argument, as indicated, that
 //determines what text is to be written for "auto". But making
 //that work involves more extensive revisions than we now want

diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index 2c99e278065eaa624d18a145e5262cd8a80dcd63..642e514e741d12d7c1d60a73e246d38dac048eaf 100644 (file)
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -39,19 +39,12 @@
 #include <utility>
 
 using namespace std;
+using namespace lyx::support;
+using namespace lyx::support::os;
 
 namespace lyx {
 namespace frontend {
 
-using support::FileFilterList;
-using support::FileName;
-using support::makeAbsPath;
-using support::onlyPath;
-using support::os::internal_path;
-using support::prefixIs;
-using support::getStringFromVector;
-using support::getVectorFromString;
-
 
 GuiInclude::GuiInclude(GuiView & lv)
        : GuiCommand(lv, "include")

diff --git a/src/frontends/qt4/GuiListings.cpp b/src/frontends/qt4/GuiListings.cpp
index 8341e99419fbfa42722d8322d0d8f347631e8c63..b8702114d06de3c4317ca1a41a94ed98c0db66f4 100644 (file)
--- a/src/frontends/qt4/GuiListings.cpp
+++ b/src/frontends/qt4/GuiListings.cpp
@@ -28,16 +28,9 @@
 #include <QRegExpValidator>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
-
-using support::findToken;
-using support::getVectorFromString;
-using support::getStringFromVector;
-using support::prefixIs;
-using support::suffixIs;
-using support::contains;
-
 namespace frontend {
 
 

diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index 899e1d574371603349ae3243405480f52da89d24..8107bb8a6429d82b04f524dfe6101e9c9890842d 100644 (file)
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -27,12 +27,11 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::FileName;
-
 /////////////////////////////////////////////////////////////////////
 //
 // LogHighlighter

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 5c7dc1a9cbe8c8292720840717b60bb69af3c1d0..792506fd380c6dee70baf7ce504f77db3eed61f3 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -66,22 +66,12 @@
 using namespace Ui;
 
 using namespace std;
+using namespace lyx::support;
+using namespace lyx::support::os;
 
 namespace lyx {
 namespace frontend {
 
-using support::compare_ascii_no_case;
-using support::os::external_path;
-using support::os::external_path_list;
-using support::os::internal_path;
-using support::os::internal_path_list;
-using support::FileName;
-using support::FileFilterList;
-using support::addPath;
-using support::addName;
-using support::mkdir;
-using support::package;
-
 
 /////////////////////////////////////////////////////////////////////
 //

diff --git a/src/frontends/qt4/GuiPrint.cpp b/src/frontends/qt4/GuiPrint.cpp
index f54cde7fe4e3367835e8eaf29b2cd4762646ffaf..1e32a5e0ab05c1adb838d26e95482c7cb1955bd9 100644 (file)
--- a/src/frontends/qt4/GuiPrint.cpp
+++ b/src/frontends/qt4/GuiPrint.cpp
@@ -34,12 +34,11 @@
 #include <QPushButton>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::FileFilterList;
-
 
 GuiPrint::GuiPrint(GuiView & lv)
        : GuiDialog(lv, "print")

diff --git a/src/frontends/qt4/GuiRef.cpp b/src/frontends/qt4/GuiRef.cpp
index 0567fdf49b361b2ca4958c39b8540ee2ea03e994..a976d04eb756c801ab9c3bc623587afb92985924 100644 (file)
--- a/src/frontends/qt4/GuiRef.cpp
+++ b/src/frontends/qt4/GuiRef.cpp
@@ -32,13 +32,11 @@
 #include <QCloseEvent>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::makeAbsPath;
-using support::makeDisplayPath;
-
 GuiRef::GuiRef(GuiView & lv)
        : GuiCommand(lv, "ref")
 {

diff --git a/src/frontends/qt4/GuiSendto.cpp b/src/frontends/qt4/GuiSendto.cpp
index 84b960de6a7c0a45ae1764f63d4d8bd24c08e672..afb9dc8a27f87dbc984b7ab6e53a680c9a09a367 100644 (file)
--- a/src/frontends/qt4/GuiSendto.cpp
+++ b/src/frontends/qt4/GuiSendto.cpp
@@ -28,11 +28,11 @@
 #include <QCloseEvent>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::trim;
 
 GuiSendTo::GuiSendTo(GuiView & lv)
        : GuiDialog(lv, "sendto")

diff --git a/src/frontends/qt4/GuiSpellchecker.cpp b/src/frontends/qt4/GuiSpellchecker.cpp
index 87804fe0db659ce25f6a7bdea652edc70262c8d2..6233a3b31be5e3357bb0748d2a970fd2303394b2 100644 (file)
--- a/src/frontends/qt4/GuiSpellchecker.cpp
+++ b/src/frontends/qt4/GuiSpellchecker.cpp
@@ -47,12 +47,11 @@
 #include "frontends/alert.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::bformat;
-using support::contains;
 
 GuiSpellchecker::GuiSpellchecker(GuiView & lv)
        : GuiDialog(lv, "spellchecker"), exitEarly_(false),

diff --git a/src/frontends/qt4/GuiTexinfo.cpp b/src/frontends/qt4/GuiTexinfo.cpp
index 048df8d7e6c8e8ef6c8edcaba16df189bfb11e56..083b6dc19b058bb36438f7df0174d56115f68c63 100644 (file)
--- a/src/frontends/qt4/GuiTexinfo.cpp
+++ b/src/frontends/qt4/GuiTexinfo.cpp
@@ -31,17 +31,11 @@
 #include <algorithm>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::FileName;
-using support::contains;
-using support::split;
-using support::token;
-using support::getExtension;
-using support::libFileSearch;
-using support::onlyFilename;
 
 static string texFileFromList(string const & file, string const & type)
 {

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 0674d5ed7c7367622a517b84ccd09a1abf7658b3..8dfa4ba291c4954879e5e2d0da2fda7cae75c218 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -93,6 +93,7 @@
 #endif
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -100,16 +101,6 @@ extern bool quitting;
 
 namespace frontend {
 
-using support::addPath;
-using support::bformat;
-using support::FileFilterList;
-using support::FileName;
-using support::makeAbsPath;
-using support::makeDisplayPath;
-using support::package;
-using support::removeAutosaveFile;
-using support::trim;
-
 namespace {
 
 class BackgroundWidget : public QWidget

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 997f341148da02e6a413e6254bb96462e47fdefa..2c6acace92bff4a6828c504a91172af65573b917 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -71,11 +71,10 @@ int const CursorWidth = 1;
 #undef NoModifier 
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-
 
 /// return the LyX mouse button state from Qt's
 static mouse_button::state q_button_state(Qt::MouseButton button)

diff --git a/src/frontends/qt4/LyXFileDialog.cpp b/src/frontends/qt4/LyXFileDialog.cpp
index 56fef5d74de97af004c25c20e650691b627cee72..bba57747d85c02ff75f9ee1fe0a26f118aa9116a 100644 (file)
--- a/src/frontends/qt4/LyXFileDialog.cpp
+++ b/src/frontends/qt4/LyXFileDialog.cpp
@@ -22,11 +22,10 @@
 #include <QHBoxLayout>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::split;
-
 /// return the Qt form of the label
 static docstring const getLabel(docstring const & ucs4str)
 {

diff --git a/src/frontends/qt4/qt_helpers.cpp b/src/frontends/qt4/qt_helpers.cpp
index aad055d2f0fe36ba0634ba67e4cbe4da1f8f0d5d..28843539adfbf36b461d39a9b2abc785bfe038e8 100644 (file)
--- a/src/frontends/qt4/qt_helpers.cpp
+++ b/src/frontends/qt4/qt_helpers.cpp
@@ -44,28 +44,9 @@
 #include <locale>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
-
-using support::addName;
-using support::bformat;
-using support::FileFilterList;
-using support::FileName;
-using support::getExtension;
-using support::getVectorFromString;
-using support::libFileSearch;
-using support::makeAbsPath;
-using support::makeRelPath;
-using support::onlyFilename;
-using support::onlyPath;
-using support::package;
-using support::prefixIs;
-using support::quoteName;
-using support::removeExtension;
-using support::Systemcall;
-using support::token;
-using support::isStrDbl;
-
 namespace frontend {
 
 string widgetsToLength(QLineEdit const * input, LengthCombo const * combo)

diff --git a/src/graphics/GraphicsCache.cpp b/src/graphics/GraphicsCache.cpp
index ed87453fa1db32f05491f07570f71469694b6ad8..ce5a0882491d229d026e0aac3ddcfd8669c67eda 100644 (file)
--- a/src/graphics/GraphicsCache.cpp
+++ b/src/graphics/GraphicsCache.cpp
@@ -22,11 +22,10 @@
 #include <map>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-
 namespace graphics {
 
 /** The cache contains one item per file, so use a map to find the

diff --git a/src/graphics/GraphicsCacheItem.cpp b/src/graphics/GraphicsCacheItem.cpp
index 4f90611033f6bc1fa51dbf8245984a6ac94ab064..f826419d714cb445bfe31c7259cf5968f6355b7c 100644 (file)
--- a/src/graphics/GraphicsCacheItem.cpp
+++ b/src/graphics/GraphicsCacheItem.cpp
@@ -27,17 +27,10 @@
 #include <boost/bind.hpp>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileMonitor;
-using support::FileName;
-using support::makeDisplayPath;
-using support::onlyFilename;
-using support::tempName;
-using support::unzipFile;
-
-
 namespace graphics {
 
 class CacheItem::Impl : public boost::signals::trackable {

diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp
index fab772a7069558416189b468e16b3866ed8d960d..e0f5fda88357d6b8b10fb2474948d51adf3ad65c 100644 (file)
--- a/src/graphics/GraphicsConverter.cpp
+++ b/src/graphics/GraphicsConverter.cpp
@@ -29,22 +29,10 @@
 #include <fstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::addExtension;
-using support::changeExtension;
-using support::FileName;
-using support::ForkedCall;
-using support::getExtension;
-using support::libScriptSearch;
-using support::onlyPath;
-using support::onlyFilename;
-using support::quoteName;
-using support::quote_python;
-using support::subst;
-using support::tempName;
-
 namespace graphics {
 
 class Converter::Impl : public boost::signals::trackable {

diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp
index 5545ed194e4075b5585d6fdfbf3effa5c11b5c01..76dbbb8a63603c37ccc8e60fd50e9b5b6872f414 100644 (file)
--- a/src/graphics/GraphicsLoader.cpp
+++ b/src/graphics/GraphicsLoader.cpp
@@ -26,11 +26,11 @@
 #include <queue>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace graphics {
 
-using support::FileName;
 
 /////////////////////////////////////////////////////////////////////
 //

diff --git a/src/graphics/PreviewImage.cpp b/src/graphics/PreviewImage.cpp
index 07d04d7b4d6f8659f0686b8dd8d2f0ffcf25bb1f..5402ae8bd819427f720fd26810a08f30dbe517ca 100644 (file)
--- a/src/graphics/PreviewImage.cpp
+++ b/src/graphics/PreviewImage.cpp
@@ -21,11 +21,9 @@
 #include <boost/bind.hpp>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
-
-using support::FileName;
-
 namespace graphics {
 
 class PreviewImage::Impl : public boost::signals::trackable {

diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index 96afd27842483ed167f935b5358756b216cd2be9..7900234c2bfcbd953d6a2ad4454d060f353f35cf 100644 (file)
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -44,9 +44,9 @@
 #include <iomanip>
 
 using namespace std;
+using namespace lyx::support;
 
 using boost::bind;
-using lyx::support::FileName;
 
 namespace {
 

diff --git a/src/insets/ExternalSupport.cpp b/src/insets/ExternalSupport.cpp
index ec85244aa8ffda8ccdefcf34dcd9263a9acc84d6..b3f6a98015bc4747b28a492109412063d87af55b 100644 (file)
--- a/src/insets/ExternalSupport.cpp
+++ b/src/insets/ExternalSupport.cpp
@@ -37,12 +37,9 @@
 #include <algorithm>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
-
-using support::FileName;
-using support::isValidLaTeXFilename;
-
 namespace external {
 
 Template const * getTemplatePtr(InsetExternalParams const & params)

diff --git a/src/insets/ExternalTransforms.cpp b/src/insets/ExternalTransforms.cpp
index 6bbbb6813eaaab8d527f514203b197ee0edcb9bd..bad7b38d6b4236c5193890a82ca68ecef3cefd24 100644 (file)
--- a/src/insets/ExternalTransforms.cpp
+++ b/src/insets/ExternalTransforms.cpp
@@ -25,11 +25,11 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace external {
 
-using support::float_equal;
 
 string const ExtraData::get(string const & id) const
 {

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 726b93e234bbfc73b60a8fbe25c1141e027f596c..3000eb722f16e5ae836a45974f2e132cec3e3497 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -40,32 +40,10 @@
 #include <boost/tokenizer.hpp>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::absolutePath;
-using support::ascii_lowercase;
-using support::changeExtension;
-using support::contains;
-using support::copy;
-using support::DocFileName;
-using support::FileName;
-using support::FileNameList;
-using support::findtexfile;
-using support::isValidLaTeXFilename;
-using support::latex_path;
-using support::ltrim;
-using support::makeAbsPath;
-using support::makeRelPath;
-using support::prefixIs;
-using support::removeExtension;
-using support::rtrim;
-using support::split;
-using support::subst;
-using support::tokenPos;
-using support::trim;
-using support::lowercase;
-
 namespace Alert = frontend::Alert;
 namespace os = support::os;
 

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index 0a8929260fbd68fa54238cb909698ec2f0a003c7..09e2de0df44a8a5076bf6f1b51466d04834851e0 100644 (file)
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -27,19 +27,10 @@
 #include <algorithm>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-using support::FileNameList;
-using support::getStringFromVector;
-using support::getVectorFromString;
-using support::ltrim;
-using support::prefixIs;
-using support::rtrim;
-using support::split;
-using support::tokenPos;
-
 namespace {
 
 vector<string> const init_possible_cite_commands()

diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index ca248155d23a0a5907235b75fee9fb285c6b6f6e..80a0ae035e8041225fa864c2de6a074f46541206 100644 (file)
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -38,12 +38,10 @@
 #include <boost/assert.hpp>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::findToken;
-using support::ExceptionMessage;
-using support::WarningException;
 
 InsetCommandParams::InsetCommandParams(InsetCode code)
        : insetCode_(code), preview_(false)

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 4264fa6aa47c49e555926348f2770099ac97f82b..d419e136b23b17df4fa2e8978ef6eaed145e97f4 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -38,11 +38,10 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::token;
-
 
 InsetERT::InsetERT(BufferParams const & bp, CollapseStatus status)
        : InsetCollapsable(bp, status)

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index 2ce1566a4d8077f7aedfae38cc5df84ec83b8de7..38b0d6b079320b1c7d4ac4a86afef2ba27452674 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -44,8 +44,7 @@
 #include <sstream>
 
 using namespace std;
-
-using lyx::support::DocFileName;
+using namespace lyx::support;
 
 namespace {
 

diff --git a/src/insets/InsetFloatList.cpp b/src/insets/InsetFloatList.cpp
index cec2f9737280a7420050123dfaadbbb20e5c9c89..ed18d6f2f9c05ac8a4c6ed91d75753b3a466a598 100644 (file)
--- a/src/insets/InsetFloatList.cpp
+++ b/src/insets/InsetFloatList.cpp
@@ -31,11 +31,10 @@
 #include <ostream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-
 
 InsetFloatList::InsetFloatList()
        : InsetCommand(InsetCommandParams(FLOAT_LIST_CODE), "toc")

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 39e5fb5875494a7a6409e0c5eb49eedde6a1dba0..26e8be32c80e023c6a7513d841101bdf2d553bbf 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -90,29 +90,10 @@ TODO
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-using support::changeExtension;
-using support::compare_timestamps;
-using support::contains;
-using support::DocFileName;
-using support::FileName;
-using support::float_equal;
-using support::getExtension;
-using support::isValidLaTeXFilename;
-using support::latex_path;
-using support::onlyFilename;
-using support::removeExtension;
-using support::rtrim;
-using support::subst;
-using support::suffixIs;
-using support::Systemcall;
-using support::unzipFile;
-using support::unzippedFileName;
-
-
 namespace {
 
 /// Find the most suitable image format for images in \p format

diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp
index e88ef42839e862401c4e73ffd800845c9d482633..9d85bb2a4b0b74f9f16f38cf675cb57e15205186 100644 (file)
--- a/src/insets/InsetGraphicsParams.cpp
+++ b/src/insets/InsetGraphicsParams.cpp
@@ -31,14 +31,10 @@
 #include <ostream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::float_equal;
-using support::readBB_from_PSFile;
-using support::token;
-using support::DocFileName;
-
 
 InsetGraphicsParams::InsetGraphicsParams()
 {

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index e254b93751f419e9c3dd6c2547a7d304d229dcaa..5e0f5552456018ed556318643cfc44c95b4f7e44 100644 (file)
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -23,11 +23,10 @@
 #include "support/docstream.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::subst;
-
 
 InsetHyperlink::InsetHyperlink(InsetCommandParams const & p)
        : InsetCommand(p, "href")

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 9aff3d66b84150f614554d523edb9273b690a3c5..43dea4d33bfb6055465e1c201847443e5cf1acfc 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -54,29 +54,10 @@
 #include <boost/bind.hpp>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::addName;
-using support::absolutePath;
-using support::bformat;
-using support::changeExtension;
-using support::contains;
-using support::copy;
-using support::DocFileName;
-using support::FileName;
-using support::FileNameList;
-using support::getVectorFromString;
-using support::isLyXFilename;
-using support::isValidLaTeXFilename;
-using support::latex_path;
-using support::makeAbsPath;
-using support::makeRelPath;
-using support::onlyFilename;
-using support::onlyPath;
-using support::prefixIs;
-using support::subst;
-
 namespace Alert = frontend::Alert;
 
 

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 063c7bee73651d97d060139645d37d821a9c23f0..2ec19155d2cac913d561f25f2fa7b6cde4e039d9 100644 (file)
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -35,15 +35,10 @@
 #include "support/ExceptionMessage.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::prefixIs;
-using support::trim;
-using support::split;
-using support::rtrim;
-using support::ExceptionMessage;
-using support::WarningException;
 
 InsetInfo::InsetInfo(BufferParams const & bp, string const & name) 
        : InsetText(bp), type_(UNKNOWN_INFO), name_(), bp_(bp),

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index f205cc822c09eec5b05e47560694f8a769e5bb6a..c225446038acd43c006520cfbb5884eb0e50c271 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -33,12 +33,10 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::token;
-using support::contains;
-using support::subst;
 
 char const lstinline_delimiters[] =
        "!*()-=+|;:'\"`,<.>/?QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm";

diff --git a/src/insets/InsetListingsParams.cpp b/src/insets/InsetListingsParams.cpp
index 599e2f1e1382e1f59debec84205315f779d337c0..ebe6b27c2c7b5751239f9c536f11eb36b609a554 100644 (file)
--- a/src/insets/InsetListingsParams.cpp
+++ b/src/insets/InsetListingsParams.cpp
@@ -25,19 +25,10 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-using support::trim;
-using support::rtrim;
-using support::subst;
-using support::isStrInt;
-using support::prefixIs;
-using support::suffixIs;
-using support::getVectorFromString;
-using lyx::support::contains;
-
 namespace {
 
 enum param_type {

diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp
index 14a8f629b4ef80dd7e05b6f3c3c606e5cb76b324..9e03914dd4b6a6311cdd7d9b866064645060228a 100644 (file)
--- a/src/insets/InsetQuotes.cpp
+++ b/src/insets/InsetQuotes.cpp
@@ -32,11 +32,10 @@
 #include "support/lstrings.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::prefixIs;
-
 namespace {
 
 /* codes used to read/write quotes to LyX files

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index f22c2f67f18334bd52f60c62b5b0f0f113bfddde..c1edce515603faa02b9d57fcf6f4adad5d1d7af0 100644 (file)
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -25,11 +25,10 @@
 #include "support/lstrings.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::escape;
-
 
 InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf)
        : InsetCommand(p, "ref"), isLatex(buf.isLatex())

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 849f1a8513fa66e27333e187033337511232245f..dabb855dd5c6d920e2418c41db037e80166ff892 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -63,18 +63,13 @@
 #include <limits>
 
 using namespace std;
+using namespace lyx::support;
 
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
 namespace lyx {
 
-using support::prefixIs;
-using support::FileName;
-using support::ltrim;
-using support::rtrim;
-using support::suffixIs;
-
 using cap::dirtyTabularStack;
 using cap::tabularStackDirty;
 

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 830a3806262274f2a31ffabe8597fc2905475c4d..1377bb8d734ee9982c66e6797ea67926fd087053 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -55,6 +55,7 @@
 #include <boost/assert.hpp>
 
 using namespace std;
+using namespace lyx::support;
 
 using boost::bind;
 using boost::ref;
@@ -63,8 +64,6 @@ namespace lyx {
 
 using graphics::PreviewLoader;
 
-using support::isStrUnsignedInt;
-
 
 InsetText::InsetText(BufferParams const & bp)
        : drawFrame_(false), frame_color_(Color_insetframe)

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index 233c86d58cfa0c816700ee57ed37cd286f5b6e5e..1d4fb9d6a5f521c8a73b4d9cb3e19beff22bc64d 100644 (file)
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -33,11 +33,10 @@
 #include <boost/bind.hpp>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-
 
 LyXRC_PreviewStatus RenderPreview::status()
 {

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 08c63fbb85d7bdd107be39d3f8ac595768b61a4e..514ee4595adc0018d29ed170145b94b7bfa3ff4f 100644 (file)
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -36,14 +36,10 @@
 #include "support/lstrings.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::compare_no_case;
-using support::uppercase;
-using support::split;
-
-
 namespace {
 
 bool parse_bool(docstring & howto)

diff --git a/src/mathed/InsetFormulaMacro.cpp b/src/mathed/InsetFormulaMacro.cpp
index 1e929d28f4505c70825acbc624ad2402645775a8..a97eec6b7acdeea27d8873829b5e8419113e841b 100644 (file)
--- a/src/mathed/InsetFormulaMacro.cpp
+++ b/src/mathed/InsetFormulaMacro.cpp
@@ -30,11 +30,10 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-
 
 InsetFormulaMacro::InsetFormulaMacro()
        : InsetMathNest(2), name_("unknownA")

diff --git a/src/mathed/InsetMathCases.cpp b/src/mathed/InsetMathCases.cpp
index c38e91fda036c6848b36700abcf8b639f3c6f53f..6ade4d2ebe875d6eacc725b769a7a6e7e6e6d8a8 100644 (file)
--- a/src/mathed/InsetMathCases.cpp
+++ b/src/mathed/InsetMathCases.cpp
@@ -27,11 +27,10 @@
 #include <ostream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-
 
 InsetMathCases::InsetMathCases(row_type n)
        : InsetMathGrid(2, n, 'c', from_ascii("ll"))

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 8cbb24e6e85846e9de10f952b2d0c64541a13717..dd650971b5faf97c045bfddc90bcea2092d9cc50 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -56,12 +56,11 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
 using cap::grabAndEraseSelection;
-using support::bformat;
-using support::subst;
 
 namespace {
 

diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index 4ca2e021c4b5563242fc5378259287a64b23ea0a..6985f80aadf8ae951716f6fddada9f51453b6d98 100644 (file)
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -45,18 +45,10 @@
 #include <fstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::cmd_ret;
-using support::getVectorFromString;
-using support::libFileSearch;
-using support::runCommand;
-using support::FileName;
-using support::quoteName;
-using support::tempName;
-using support::subst;
-
 static char const * function_names[] = {
        "arccos", "arcsin", "arctan", "arg", "bmod",
        "cos", "cosh", "cot", "coth", "csc", "deg",

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index d79885b3b208df7606806e0c105f5ffada852b42..2cd60f055a93e8ffcd5a90ffc9dc2fa4201d74da 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -58,12 +58,10 @@
 #include "frontends/FontLoader.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::libFileSearch;
-using support::split;
-
 bool has_math_fonts;
 
 

diff --git a/src/output.cpp b/src/output.cpp
index 0e51cf3becc8440a9162e36f8b2fe79a61a2a2c9..67b0323b491c22e79a1994d7dc41e31edf862c2b 100644 (file)
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -20,12 +20,10 @@
 #include "support/lstrings.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-using support::FileName;
-
 namespace {
 
 template<typename OFStream>

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 6103990257adc0d32ce49733bd3694e1ed9ec4c0..1244da6edb547d90144ba72545fbc28a25a3bf5b 100644 (file)
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -35,11 +35,10 @@
 #include <boost/next_prior.hpp>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::subst;
-
 namespace {
 
 ParagraphList::const_iterator searchParagraph(

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 5d1090c3045ecd1c6a3c4e77a9077f2dbe29a925..95714af9cdf617d021294da994e3a895a58e416f 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -36,11 +36,10 @@
 #include <boost/next_prior.hpp>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::subst;
-
 namespace {
 
 

diff --git a/src/output_plaintext.cpp b/src/output_plaintext.cpp
index f9629e920307ec3ca1c4ed2fe9acb5c9c28215ef..2ce6aee5c75d44aa713d984d8accb0e471e35b6b 100644 (file)
--- a/src/output_plaintext.cpp
+++ b/src/output_plaintext.cpp
@@ -26,14 +26,10 @@
 #include "support/lstrings.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::ascii_lowercase;
-using support::compare_ascii_no_case;
-using support::contains;
-using support::FileName;
-
 
 void writePlaintextFile(Buffer const & buf, FileName const & fname,
        OutputParams const & runparams)

diff --git a/src/sgml.cpp b/src/sgml.cpp
index 4addbd319a5680f7c80d00811d359174faaac890..6ac6c8653b95af30c777cae4ed13e23c4bf6ac9d 100644 (file)
--- a/src/sgml.cpp
+++ b/src/sgml.cpp
@@ -31,10 +31,10 @@
 #include <ostream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::subst;
 
 docstring sgml::escapeChar(char_type c)
 {

diff --git a/src/support/Messages.cpp b/src/support/Messages.cpp
index 00735e480871659b56f8987b80a3987530d690f8..b8ae5a0ac3fb6b924ba6760cf0c0138ec8bb29be 100644 (file)
--- a/src/support/Messages.cpp
+++ b/src/support/Messages.cpp
@@ -63,12 +63,9 @@ void cleanTranslation(docstring & trans)
 #    include "../intl/libintl.h"
 #  endif
 
-namespace lyx {
-
-using support::package;
-using support::getEnv;
-using support::setEnv;
+using namespace lyx::support;
 
+namespace lyx {
 
 // This version use the traditional gettext.
 Messages::Messages(string const & l)

diff --git a/src/support/debug.cpp b/src/support/debug.cpp
index a20e06b41593e56a2cdbdd05932763bc5f994f06..ab3b6eee754cddf1d7cb3bc5c2363df5ae29138f 100644 (file)
--- a/src/support/debug.cpp
+++ b/src/support/debug.cpp
@@ -22,13 +22,10 @@
 #include <iomanip>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::ascii_lowercase;
-using support::bformat;
-using support::isStrInt;
-
 namespace {
 
 struct ErrorItem {

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index 235ff4579945e68f26948bf5adc350566f3e184e..9e88c2b5e4c2aeae4a63454fb467dc4bbe91e50e 100644 (file)
--- a/src/tex2lyx/preamble.cpp
+++ b/src/tex2lyx/preamble.cpp
@@ -30,13 +30,10 @@
 #include <map>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-using support::libFileSearch;
-using support::isStrDbl;
-
 // special columntypes
 extern std::map<char, int> special_columns;
 

diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index eb576288500365d313160db188ab37980fed4023..5f4767efb8d27b1186e2659e0437a8e574a6057d 100644 (file)
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -36,19 +36,11 @@
 #include <map>
 
 using namespace std;
+using namespace lyx::support;
+using namespace lyx::support::os;
 
 namespace lyx {
 
-using support::changeExtension;
-using support::FileName;
-using support::isStrUnsignedInt;
-using support::ltrim;
-using support::makeAbsPath;
-using support::onlyPath;
-using support::os::internal_path;
-using support::rtrim;
-
-
 // Hacks to allow the thing to link in the lyxlayout stuff
 LayoutPtr captionlayout;
 

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 78069912df1c0167889d89cdd57d1ece8a49f8a9..523c02296c5893da441069df821dc3de7fe7d9dd 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -31,19 +31,10 @@
 #include <vector>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::addExtension;
-using support::changeExtension;
-using support::FileName;
-using support::makeAbsPath;
-using support::makeRelPath;
-using support::rtrim;
-using support::suffixIs;
-using support::contains;
-using support::subst;
-
 
 void parse_text_in_inset(Parser & p, ostream & os, unsigned flags, bool outer,
                Context const & context)