transfer os::is_absolute_path() to FileName::isAbsolute().

[features.git] / src / Session.cpp

diff --git a/src/Session.cpp b/src/Session.cpp
index 839ec38ada5a94e7892cfa5c5db1de66753d21c8..a9b5e86f46af6ac30fcc457dbe85e6d8e9e23996 100644 (file)
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -21,23 +21,8 @@
 #include <algorithm>
 #include <iterator>
 
-using lyx::support::absolutePath;
-using lyx::support::addName;
-using lyx::support::FileName;
-using lyx::support::package;
-
-using std::vector;
-using std::getline;
-using std::string;
-using std::ifstream;
-using std::ofstream;
-using std::istream;
-using std::ostream;
-using std::endl;
-using std::istringstream;
-using std::copy;
-using std::find;
-using std::ostream_iterator;
+using namespace std;
+using namespace lyx::support;
 
 namespace {
 
@@ -53,6 +38,7 @@ string const sec_toolbars = "[toolbars]";
 
 namespace lyx {
 
+
 LastFilesSection::LastFilesSection(unsigned int num) :
        default_num_last_files(4),
        absolute_max_last_files(100)
@@ -177,9 +163,9 @@ void LastFilePosSection::read(istream & is)
                        itmp >> filepos.pos;
                        itmp.ignore(2);  // ignore ", "
                        getline(itmp, fname);
-                       if (!absolutePath(fname))
-                               continue;
                        FileName const file(fname);
+                       if (!file.isAbsolute())
+                               continue;
                        if (file.exists() && !file.isDirectory()
                            && lastfilepos.size() < num_lastfilepos)
                                lastfilepos[file] = filepos;
@@ -254,9 +240,9 @@ void BookmarksSection::read(istream & is)
                        itmp >> pos;
                        itmp.ignore(2);  // ignore ", "
                        getline(itmp, fname);
-                       if (!absolutePath(fname))
-                               continue;
                        FileName const file(fname);
+                       if (!file.isAbsolute())
+                               continue;
                        // only load valid bookmarks
                        if (file.exists() && !file.isDirectory() && idx <= max_bookmarks)
                                bookmarks[idx] = Bookmark(file, pit, pos, 0, 0);
@@ -340,7 +326,7 @@ void ToolbarSection::read(istream & is)
                }
        } while (is.good());
        // sort the toolbars by location, line and position
-       std::sort(toolbars.begin(), toolbars.end());
+       sort(toolbars.begin(), toolbars.end());
 }