update SCons

[lyx.git] / src / LayoutFile.cpp

diff --git a/src/LayoutFile.cpp b/src/LayoutFile.cpp
index a915f7129b8236d91328676ac963bdc454841172..6f80c957968b3f1a992595a3042670b0fbeb297b 100644 (file)
--- a/src/LayoutFile.cpp
+++ b/src/LayoutFile.cpp
@@ -27,8 +27,8 @@
 #include "support/lassert.h"
 #include "support/lstrings.h"
 
-#include <boost/bind.hpp>
-#include <boost/regex.hpp>
+#include "support/bind.h"
+#include "support/regex.h"
 
 #include <fstream>
 
@@ -37,9 +37,7 @@ using namespace lyx::support;
 
 namespace lyx {
 
-using boost::bind;
-using boost::regex;
-using boost::smatch;
+
 
 LayoutFile::LayoutFile(string const & fn, string const & cln,
                           string const & desc, string const & prereq,
@@ -106,7 +104,7 @@ bool LayoutFileList::read()
 
        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)) {
@@ -114,7 +112,7 @@ bool LayoutFileList::read()
                       << 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.
@@ -233,7 +231,7 @@ LayoutFileIndex LayoutFileList::addEmptyClass(string const & textclass)
        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.
@@ -244,7 +242,7 @@ LayoutFileIndex LayoutFileList::addEmptyClass(string const & textclass)
                        "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, /* */);
                }