X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSession.cpp;h=9291ef1c2213bfcd974a4a992544446915bee8fe;hb=e01e14872d60935908ad42bc164bff1342277b22;hp=36161e84ea410526cf7f8f86b056b08a17259fb3;hpb=f370da411306112060c52335dbd33bf28692ddd0;p=lyx.git diff --git a/src/Session.cpp b/src/Session.cpp index 36161e84ea..9291ef1c22 100644 --- a/src/Session.cpp +++ b/src/Session.cpp @@ -12,32 +12,18 @@ #include #include "Session.h" -#include "debug.h" -#include "support/Package.h" + +#include "support/debug.h" #include "support/filetools.h" +#include "support/Package.h" #include #include #include #include -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 +39,7 @@ string const sec_toolbars = "[toolbars]"; namespace lyx { + LastFilesSection::LastFilesSection(unsigned int num) : default_num_last_files(4), absolute_max_last_files(100) @@ -69,16 +56,16 @@ void LastFilesSection::read(istream & is) if (c == '[') break; getline(is, tmp); - if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !absolutePath(tmp)) + FileName const file(tmp); + if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !file.isAbsolute()) continue; // read lastfiles - FileName const file(tmp); if (file.exists() && !file.isDirectory() && lastfiles.size() < num_lastfiles) lastfiles.push_back(file); else - LYXERR(Debug::INIT) << "LyX: Warning: Ignore last file: " << tmp << endl; + LYXERR(Debug::INIT, "LyX: Warning: Ignore last file: " << tmp); } while (is.good()); } @@ -108,9 +95,8 @@ void LastFilesSection::setNumberOfLastFiles(unsigned int no) if (0 < no && no <= absolute_max_last_files) num_lastfiles = no; else { - LYXERR(Debug::INIT) << "LyX: session: too many last files\n" - << "\tdefault (=" << default_num_last_files - << ") used." << endl; + LYXERR(Debug::INIT, "LyX: session: too many last files\n" + << "\tdefault (=" << default_num_last_files << ") used."); num_lastfiles = default_num_last_files; } } @@ -124,14 +110,14 @@ void LastOpenedSection::read(istream & is) if (c == '[') break; getline(is, tmp); - if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !absolutePath(tmp)) + FileName const file(tmp); + if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !file.isAbsolute()) continue; - FileName const file(tmp); if (file.exists() && !file.isDirectory()) lastopened.push_back(file); else - LYXERR(Debug::INIT) << "LyX: Warning: Ignore last opened file: " << tmp << endl; + LYXERR(Debug::INIT, "LyX: Warning: Ignore last opened file: " << tmp); } while (is.good()); } @@ -178,16 +164,16 @@ 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; else - LYXERR(Debug::INIT) << "LyX: Warning: Ignore pos of last file: " << fname << endl; + LYXERR(Debug::INIT, "LyX: Warning: Ignore pos of last file: " << fname); } catch (...) { - LYXERR(Debug::INIT) << "LyX: Warning: unknown pos of last file: " << tmp << endl; + LYXERR(Debug::INIT, "LyX: Warning: unknown pos of last file: " << tmp); } } while (is.good()); } @@ -255,16 +241,16 @@ 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); else - LYXERR(Debug::INIT) << "LyX: Warning: Ignore bookmark of file: " << fname << endl; + LYXERR(Debug::INIT, "LyX: Warning: Ignore bookmark of file: " << fname); } catch (...) { - LYXERR(Debug::INIT) << "LyX: Warning: unknown Bookmark info: " << tmp << endl; + LYXERR(Debug::INIT, "LyX: Warning: unknown Bookmark info: " << tmp); } } while (is.good()); } @@ -335,13 +321,13 @@ void ToolbarSection::read(istream & is) item.info.location = ToolbarInfo::Location(location); toolbars.push_back(item); } else - LYXERR(Debug::INIT) << "LyX: Warning: Ignore toolbar info: " << tmp << endl; + LYXERR(Debug::INIT, "LyX: Warning: Ignore toolbar info: " << tmp); } catch (...) { - LYXERR(Debug::INIT) << "LyX: Warning: unknown Toolbar info: " << tmp << endl; + LYXERR(Debug::INIT, "LyX: Warning: unknown Toolbar info: " << tmp); } } while (is.good()); // sort the toolbars by location, line and position - std::sort(toolbars.begin(), toolbars.end()); + sort(toolbars.begin(), toolbars.end()); } @@ -416,9 +402,9 @@ void SessionInfoSection::read(istream & is) string value = tmp.substr(pos + 3); sessioninfo[key] = value; } else - LYXERR(Debug::INIT) << "LyX: Warning: Ignore session info: " << tmp << endl; + LYXERR(Debug::INIT, "LyX: Warning: Ignore session info: " << tmp); } catch (...) { - LYXERR(Debug::INIT) << "LyX: Warning: unknown Session info: " << tmp << endl; + LYXERR(Debug::INIT, "LyX: Warning: unknown Session info: " << tmp); } } while (is.good()); } @@ -489,7 +475,7 @@ void Session::readFile() else if (tmp == sec_session) sessionInfo().read(is); else - LYXERR(Debug::INIT) << "LyX: Warning: unknown Session section: " << tmp << endl; + LYXERR(Debug::INIT, "LyX: Warning: unknown Session section: " << tmp); } } @@ -508,8 +494,8 @@ void Session::writeFile() const toolbars().write(os); sessionInfo().write(os); } else - LYXERR(Debug::INIT) << "LyX: Warning: unable to save Session: " - << session_file << endl; + LYXERR(Debug::INIT, "LyX: Warning: unable to save Session: " + << session_file); } }