listerrors.lyx : Update a link.

[lyx.git] / src / LayoutFile.cpp

diff --git a/src/LayoutFile.cpp b/src/LayoutFile.cpp
index a915f7129b8236d91328676ac963bdc454841172..541f2dae84290c8f69c305a0c713fc53e66b4f85 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,
@@ -105,16 +103,14 @@ bool LayoutFileList::read()
        LYXERR(Debug::TCLASS, "Reading textclasses from `" << real_file << "'.");
 
        if (real_file.empty()) {
-               LYXERR0("LayoutFileList::Read: unable to find textclass file  `"
-                   << makeDisplayPath(real_file.absFilename(), 1000)
-                   << "'.");
-               success = false;
+               LYXERR0("LayoutFileList::Read: unable to find textclass file  "
+                   << "`textclass.lst'.");
        } else if (!lex.setFile(real_file)) {
                LYXERR0("LayoutFileList::Read: lyxlex was not able to set 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.
@@ -222,7 +218,7 @@ LayoutFileIndex LayoutFileList::addEmptyClass(string const & textclass)
        // stdclass.inc. That would give us something moderately usable.
        ofs << "# This layout is automatically generated\n"
               "# \\DeclareLaTeXClass{" << textclass << "}\n\n"
-              "Format 26\n"
+              "Format " << LAYOUT_FORMAT << "\n"
               "Input stdclass.inc\n\n"
            << layoutpost;
        ofs.close();
@@ -233,18 +229,17 @@ 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 
+               // above is wrong or stdclass.inc cannot be found. So try again 
                // without stdclass.inc.
                ofstream ofs2(tempLayout.toFilesystemEncoding().c_str());
                ofs2 << "# This layout is automatically generated\n"
                        "# \\DeclareLaTeXClass{" << textclass << "}\n\n"
-                       "Format 26\n"
-                       "Input stdclass.inc\n\n"
+                       "Format " << LAYOUT_FORMAT << "\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, /* */);
                }
@@ -319,13 +314,7 @@ bool LayoutFileList::load(string const & name, string const & buf_path)
        }
 
        LayoutFile * tc = classmap_[name];
-       if (!tc->load(buf_path)) {
-               docstring s = bformat(_("The document class %1$s "
-                                  "could not be loaded."), from_utf8(name));
-               frontend::Alert::error(_("Could not load class"), s);
-               return false;
-       }
-       return true;
+       return tc->load(buf_path);
 }