more cleanup:

[lyx.git] / src / insets / insetcite.C

diff --git a/src/insets/insetcite.C b/src/insets/insetcite.C
index 2c3fe4ee0b4f17bcbebaf6bd86eef64e121ef534..fcdbd0be88aed6fdadb49fbb60bdfc41cc4cc9b5 100644 (file)
--- a/src/insets/insetcite.C
+++ b/src/insets/insetcite.C
@@ -30,16 +30,18 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/exception.hpp>
 
-using lyx::docstring;
-using lyx::odocstream;
-using lyx::support::ascii_lowercase;
-using lyx::support::contains;
-using lyx::support::getStringFromVector;
-using lyx::support::getVectorFromString;
-using lyx::support::ltrim;
-using lyx::support::rtrim;
-using lyx::support::split;
-using lyx::support::tokenPos;
+
+namespace lyx {
+
+using support::ascii_lowercase;
+using support::contains;
+using support::FileName;
+using support::getStringFromVector;
+using support::getVectorFromString;
+using support::ltrim;
+using support::rtrim;
+using support::split;
+using support::tokenPos;
 
 using std::endl;
 using std::replace;
@@ -48,7 +50,6 @@ using std::ostream;
 using std::vector;
 using std::map;
 
-namespace biblio = lyx::biblio;
 namespace fs = boost::filesystem;
 
 
@@ -68,18 +69,18 @@ string const getNatbibLabel(Buffer const & buffer,
        static CachedMap cached_keys;
 
        // and cache the timestamp of the bibliography files.
-       static std::map<string, time_t> bibfileStatus;
+       static std::map<FileName, time_t> bibfileStatus;
 
        biblio::InfoMap infomap;
 
-       vector<string> const & bibfilesCache = buffer.getBibfilesCache();
+       vector<FileName> const & bibfilesCache = buffer.getBibfilesCache();
        // compare the cached timestamps with the actual ones.
        bool changed = false;
-       for (vector<string>::const_iterator it = bibfilesCache.begin();
+       for (vector<FileName>::const_iterator it = bibfilesCache.begin();
                        it != bibfilesCache.end(); ++ it) {
-               string const f = *it;
+               FileName const f = *it;
                try {
-                       std::time_t lastw = fs::last_write_time(f);
+                       std::time_t lastw = fs::last_write_time(f.toFilesystemEncoding());
                        if (lastw != bibfileStatus[f]) {
                                changed = true;
                                bibfileStatus[f] = lastw;
@@ -325,7 +326,7 @@ docstring const InsetCitation::generateLabel(Buffer const & buffer) const
        }
 
        // FIXME UNICODE
-       return lyx::from_utf8(label);
+       return from_utf8(label);
 }
 
 
@@ -394,9 +395,8 @@ string const cleanupWhitespace(string const & citelist)
 
 int InsetCitation::docbook(Buffer const &, odocstream & os, OutputParams const &) const
 {
-        // FIXME UNICODE
        os << "<citation>"
-           << lyx::from_ascii(cleanupWhitespace(getContents()))
+           << from_ascii(cleanupWhitespace(getContents()))
            << "</citation>";
        return 0;
 }
@@ -418,7 +418,7 @@ int InsetCitation::latex(Buffer const & buffer, odocstream & os,
 {
        biblio::CiteEngine const cite_engine = buffer.params().cite_engine;
        // FIXME UNICODE
-       docstring const cite_str = lyx::from_utf8(
+       docstring const cite_str = from_utf8(
                biblio::asValidLatexCommand(getCmdName(), cite_engine));
 
        os << "\\" << cite_str;
@@ -431,7 +431,7 @@ int InsetCitation::latex(Buffer const & buffer, odocstream & os,
                os << '[' << after << ']';
 
        // FIXME UNICODE
-       os << '{' << lyx::from_utf8(cleanupWhitespace(getContents())) << '}';
+       os << '{' << from_utf8(cleanupWhitespace(getContents())) << '}';
 
        return 0;
 }
@@ -461,3 +461,6 @@ void InsetCitation::replaceContents(string const & from, string const & to)
                setContents(getStringFromVector(items));
        }
 }
+
+
+} // namespace lyx