#include <config.h>
#include "Session.h"
-#include "debug.h"
-#include "support/Package.h"
-#include "support/filetools.h"
-#include <boost/filesystem/operations.hpp>
+#include "support/debug.h"
+#include "support/filetools.h"
+#include "support/Package.h"
#include <fstream>
#include <sstream>
#include <algorithm>
#include <iterator>
-using lyx::support::absolutePath;
-using lyx::support::addName;
-using lyx::support::FileName;
-using lyx::support::package;
-
-namespace fs = boost::filesystem;
-
-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 {
namespace lyx {
+
LastFilesSection::LastFilesSection(unsigned int num) :
default_num_last_files(4),
absolute_max_last_files(100)
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() &&
- !fs::is_directory(file.toFilesystemEncoding()) &&
- lastfiles.size() < num_lastfiles)
+ 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());
}
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;
}
}
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() &&
- !fs::is_directory(file.toFilesystemEncoding()))
+ 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());
}
try {
// read lastfilepos
// pos, file\n
- pit_type pit;
- pos_type pos;
+ FilePos filepos;
string fname;
istringstream itmp(tmp);
- itmp >> pit;
+ itmp >> filepos.pit;
itmp.ignore(2); // ignore ", "
- itmp >> pos;
+ itmp >> filepos.pos;
itmp.ignore(2); // ignore ", "
getline(itmp, fname);
- if (!absolutePath(fname))
- continue;
FileName const file(fname);
- if (file.exists() &&
- !fs::is_directory(file.toFilesystemEncoding()) &&
- lastfilepos.size() < num_lastfilepos)
- lastfilepos[file] = boost::tie(pit, pos);
+ 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());
}
os << '\n' << sec_lastfilepos << '\n';
for (FilePosMap::const_iterator file = lastfilepos.begin();
file != lastfilepos.end(); ++file) {
- os << file->second.get<0>() << ", "
- << file->second.get<1>() << ", "
- << file->first << '\n';
+ os << file->second.pit << ", " << file->second.pos << ", "
+ << file->first << '\n';
}
}
-void LastFilePosSection::save(FileName const & fname, FilePos pos)
+void LastFilePosSection::save(FileName const & fname, FilePos const & pos)
{
lastfilepos[fname] = pos;
}
if (entry != lastfilepos.end())
return entry->second;
// Not found, return the first paragraph
- else
- return 0;
+ return FilePos();
}
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() &&
- !fs::is_directory(file.toFilesystemEncoding()) &&
- idx <= max_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());
}
}
-void BookmarksSection::save(FileName const & fname, pit_type bottom_pit, pos_type bottom_pos,
+void BookmarksSection::save(FileName const & fname,
+ pit_type bottom_pit, pos_type bottom_pos,
int top_id, pos_type top_pos, unsigned int idx)
{
// silently ignore bookmarks when idx is out of range
try {
// Read session info, saved as key/value pairs
// would better yell if pos returns npos
- string::size_type pos = tmp.find_first_of(" = ");
+ size_t pos = tmp.find_first_of(" = ");
// silently ignore lines without " = "
if (pos != string::npos) {
- string key = tmp.substr(0, pos);
+ ToolbarItem item;
+ item.key = tmp.substr(0, pos);
int state;
int location;
- int posx;
- int posy;
istringstream value(tmp.substr(pos + 3));
value >> state;
value >> location;
- value >> posx;
- value >> posy;
- toolbars.push_back(boost::make_tuple(key, ToolbarInfo(state, location, posx, posy)));
+ value >> item.info.posx;
+ value >> item.info.posy;
+ item.info.state = ToolbarInfo::State(state);
+ 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());
}
os << '\n' << sec_toolbars << '\n';
for (ToolbarList::const_iterator tb = toolbars.begin();
tb != toolbars.end(); ++tb) {
- os << tb->get<0>() << " = "
- << static_cast<int>(tb->get<1>().state) << " "
- << static_cast<int>(tb->get<1>().location) << " "
- << tb->get<1>().posx << " "
- << tb->get<1>().posy << '\n';
+ os << tb->key << " = "
+ << static_cast<int>(tb->info.state) << " "
+ << static_cast<int>(tb->info.location) << " "
+ << tb->info.posx << " "
+ << tb->info.posy << '\n';
}
}
{
for (ToolbarList::iterator tb = toolbars.begin();
tb != toolbars.end(); ++tb)
- if (tb->get<0>() == name)
- return tb->get<1>();
+ if (tb->key == name)
+ return tb->info;
+
// add a new item
- toolbars.push_back(boost::make_tuple(name, ToolbarSection::ToolbarInfo()));
- return toolbars.back().get<1>();
+ ToolbarItem item;
+ item.key = name;
+ toolbars.push_back(item);
+ return toolbars.back().info;
}
bool operator<(ToolbarSection::ToolbarItem const & a, ToolbarSection::ToolbarItem const & b)
{
- ToolbarSection::ToolbarInfo lhs = a.get<1>();
- ToolbarSection::ToolbarInfo rhs = b.get<1>();
+ ToolbarSection::ToolbarInfo lhs = a.info;
+ ToolbarSection::ToolbarInfo rhs = b.info;
// on if before off
if (lhs.state != rhs.state)
return static_cast<int>(lhs.state) < static_cast<int>(rhs.state);
else if (lhs.location == ToolbarSection::ToolbarInfo::LEFT ||
lhs.location == ToolbarSection::ToolbarInfo::RIGHT)
return lhs.posx < rhs.posx || (lhs.posx == rhs.posx && lhs.posy < rhs.posy);
- else
- return true;
+ return true;
}
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());
}
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);
}
}
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);
}
}
projects / lyx.git / blobdiff