remove redundant lyxerr.debugging checks; macro LYXERR already checks whether the...

[lyx.git] / src / lyxtextclasslist.C

diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index bec917d8b0bb02bea12fae0f2620d786da2ea25a..d5eeeefdbe7c7f3ba4d3cc9b2c4d559ffbb61582 100644 (file)
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -27,6 +27,8 @@
 namespace lyx {
 namespace fs = boost::filesystem;
 
+using support::FileName;
+using support::addName;
 using support::libFileSearch;
 using support::makeDisplayPath;
 
@@ -34,10 +36,6 @@ using boost::bind;
 using boost::regex;
 using boost::smatch;
 
-#ifndef CXX_GLOBAL_CSTD
-using std::exit;
-#endif
-
 using std::endl;
 using std::equal_to;
 using std::find_if;
@@ -100,7 +98,7 @@ bool LyXTextClassList::read()
 {
        LyXLex lex(0, 0);
        support::FileName const real_file = libFileSearch("", "textclass.lst");
-       lyxerr[Debug::TCLASS] << "Reading textclasses from `"
+       LYXERR(Debug::TCLASS) << "Reading textclasses from `"
                              << real_file << '\'' << endl;
 
        if (real_file.empty()) {
@@ -133,25 +131,25 @@ bool LyXTextClassList::read()
 
        bool finished = false;
        // Parse config-file
-       lyxerr[Debug::TCLASS] << "Starting parsing of textclass.lst" << endl;
+       LYXERR(Debug::TCLASS) << "Starting parsing of textclass.lst" << endl;
        while (lex.isOK() && !finished) {
-               lyxerr[Debug::TCLASS] << "\tline by line" << endl;
+               LYXERR(Debug::TCLASS) << "\tline by line" << endl;
                switch (lex.lex()) {
                case LyXLex::LEX_FEOF:
                        finished = true;
                        break;
                default:
                        string const fname = lex.getString();
-                       lyxerr[Debug::TCLASS] << "Fname: " << fname << endl;
+                       LYXERR(Debug::TCLASS) << "Fname: " << fname << endl;
                        if (lex.next()) {
                                string const clname = lex.getString();
-                               lyxerr[Debug::TCLASS] << "Clname: " << clname << endl;
+                               LYXERR(Debug::TCLASS) << "Clname: " << clname << endl;
                                if (lex.next()) {
                                        string const desc = lex.getString();
-                                       lyxerr[Debug::TCLASS] << "Desc: " << desc << endl;
+                                       LYXERR(Debug::TCLASS) << "Desc: " << desc << endl;
                                        if (lex.next()) {
                                                bool avail = lex.getBool();
-                                               lyxerr[Debug::TCLASS] << "Avail: " << avail << endl;
+                                               LYXERR(Debug::TCLASS) << "Avail: " << avail << endl;
                                                // This code is run when we have
                                                // fname, clname, desc, and avail
                                                LyXTextClass tmpl(fname, clname, desc, avail);
@@ -164,7 +162,7 @@ bool LyXTextClassList::read()
                        }
                }
        }
-       lyxerr[Debug::TCLASS] << "End of parsing of textclass.lst" << endl;
+       LYXERR(Debug::TCLASS) << "End of parsing of textclass.lst" << endl;
 
        if (classlist_.empty()) {
                lyxerr << "LyXTextClassList::Read: no textclasses found!"
@@ -182,15 +180,15 @@ LyXTextClassList::addTextClass(std::string const & textclass, std::string const
 {
        // only check for textclass.layout file, .cls can be anywhere in $TEXINPUTS
        // NOTE: latex class name is defined in textclass.layout, which can be different from textclass
-       string layout_file = path + "/" + textclass + ".layout";
-       if (fs::exists(layout_file)) {
-               lyxerr[Debug::TCLASS] << "Adding class " << textclass << " from directory " << path << endl;
+       FileName const layout_file(addName(path, textclass + ".layout"));
+       if (fs::exists(layout_file.toFilesystemEncoding())) {
+               LYXERR(Debug::TCLASS) << "Adding class " << textclass << " from directory " << path << endl;
                // Read .layout file and get description, real latex classname etc
                //
                // This is a C++ version of function processLayoutFile in configure.py,
                // which uses the following regex
                //     \Declare(LaTeX|DocBook)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)}
-               ifstream ifs(layout_file.c_str());
+               ifstream ifs(layout_file.toFilesystemEncoding().c_str());
                static regex const reg("^#\\s*\\\\Declare(LaTeX|DocBook)Class\\s*"
                        "(?:\\[([^,]*)(?:,.*)*\\])*\\s*\\{(.*)\\}\\s*");
                string line;
@@ -222,15 +220,15 @@ LyXTextClassList textclasslist;
 // Reads the style files
 bool LyXSetStyle()
 {
-       lyxerr[Debug::TCLASS] << "LyXSetStyle: parsing configuration..." << endl;
+       LYXERR(Debug::TCLASS) << "LyXSetStyle: parsing configuration..." << endl;
 
        if (!textclasslist.read()) {
-               lyxerr[Debug::TCLASS] << "LyXSetStyle: an error occured "
+               LYXERR(Debug::TCLASS) << "LyXSetStyle: an error occured "
                        "during parsing.\n             Exiting." << endl;
                return false;
        }
 
-       lyxerr[Debug::TCLASS] << "LyXSetStyle: configuration parsed." << endl;
+       LYXERR(Debug::TCLASS) << "LyXSetStyle: configuration parsed." << endl;
        return true;
 }