Embedding: saving inzip name to .lyx file so that embedded files can always be found...

[lyx.git] / src / Format.cpp

diff --git a/src/Format.cpp b/src/Format.cpp
index 6dd5bd6557249065eb546ef1c58886b168dd39ec..edfdf4135ba1e03ea2d295081b6db20bedf44ba8 100644 (file)
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -25,26 +25,11 @@
 #include "support/os.h"
 #include "support/Systemcall.h"
 
-using std::find_if;
-using std::string;
-using std::distance;
-
+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;
 
@@ -55,7 +40,7 @@ string const token_path_format("$$p");
 string const token_socket_format("$$a");
 
 
-class FormatNamesEqual : public std::unary_function<Format, bool> {
+class FormatNamesEqual : public unary_function<Format, bool> {
 public:
        FormatNamesEqual(string const & name)
                : name_(name) {}
@@ -68,7 +53,7 @@ private:
 };
 
 
-class FormatExtensionsEqual : public std::unary_function<Format, bool> {
+class FormatExtensionsEqual : public unary_function<Format, bool> {
 public:
        FormatExtensionsEqual(string const & extension)
                : extension_(extension) {}
@@ -144,7 +129,7 @@ string Formats::getFormatFromFile(FileName const & filename) const
                return format;
 
        // try to find a format from the file extension.
-       string const ext = support::getExtension(filename.absFilename());
+       string const ext = getExtension(filename.absFilename());
        if (!ext.empty()) {
                // this is ambigous if two formats have the same extension,
                // but better than nothing