#include "support/lassert.h"
#include "support/lstrings.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
#include <boost/regex.hpp>
#include <fstream>
namespace lyx {
-using boost::bind;
+
using boost::regex;
using boost::smatch;
if (real_file.empty()) {
LYXERR0("LayoutFileList::Read: unable to find textclass file `"
- << makeDisplayPath(real_file.absFilename(), 1000)
+ << makeDisplayPath(real_file.absFileName(), 1000)
<< "'.");
success = false;
} else if (!lex.setFile(real_file)) {
<< real_file << '.');
} else if (!lex.isOK()) {
LYXERR0("LayoutFileList::Read: unable to open textclass file `"
- << makeDisplayPath(real_file.absFilename(), 1000)
+ << makeDisplayPath(real_file.absFileName(), 1000)
<< "'\nCheck your installation.");
} else {
// we have a file we can read.
LayoutFile * tc = new LayoutFile(textclass, textclass,
"Unknown text class " + textclass, textclass + ".cls", true);
- if (!tc->load(tempLayout.absFilename())) {
+ if (!tc->load(tempLayout.absFileName())) {
// The only way this happens is because the hardcoded layout file
// aboveis wrong or stdclass.inc cannot be found. So try again
// without stdclass.inc.
"Input stdclass.inc\n\n"
<< layoutpost;
ofs2.close();
- if (!tc->load(tempLayout.absFilename())) {
+ if (!tc->load(tempLayout.absFileName())) {
// This can only happen if the hardcoded file above is wrong.
LASSERT(false, /* */);
}