Alfredo's second patch

[lyx.git] / src / lyxtextclasslist.C

diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index ea21f14b0ef57a43ef11bcd0394baa2b624eda51..d764c5c043c405f12ff0fbba4f7494891bbdf1c8 100644 (file)
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -11,16 +11,11 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "lyxtextclasslist.h"
 #include "lyxtextclass.h"
 #include "debug.h"
 #include "lyxlex.h"
 #include "gettext.h"
-
 #include "frontends/Alert.h"
 
 #include "support/lyxfunctional.h"
@@ -29,6 +24,10 @@
 
 #include <utility>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::exit;
+#endif
+
 using lyx::textclass_type;
 using std::pair;
 using std::make_pair;
@@ -42,10 +41,10 @@ pair<bool, textclass_type> const
 LyXTextClassList::NumberOfClass(string const & textclass) const
 {
        ClassList::const_iterator cit =
-               find_if(classlist.begin(), classlist.end(),
+               find_if(classlist_.begin(), classlist_.end(),
                        lyx::compare_memfun(&LyXTextClass::name, textclass));
-       return cit != classlist.end() ?
-               make_pair(true, textclass_type(cit - classlist.begin())) :
+       return cit != classlist_.end() ?
+               make_pair(true, textclass_type(cit - classlist_.begin())) :
                make_pair(false, textclass_type(0));
 }
 
@@ -54,17 +53,11 @@ LyXTextClassList::NumberOfClass(string const & textclass) const
 LyXTextClass const &
 LyXTextClassList::operator[](textclass_type textclass) const
 {
-       classlist[textclass].load();
-       if (textclass < classlist.size())
-               return classlist[textclass];
+       classlist_[textclass].load();
+       if (textclass < classlist_.size())
+               return classlist_[textclass];
        else
-               return classlist[0];
-}
-
-
-void LyXTextClassList::Add(LyXTextClass const & t)
-{
-       classlist.push_back(t);
+               return classlist_[0];
 }
 
 
@@ -78,21 +71,17 @@ public:
 
 
 // Reads LyX textclass definitions according to textclass config file
-bool LyXTextClassList::Read ()
+bool LyXTextClassList::Read()
 {
        LyXLex lex(0, 0);
        string real_file = LibFileSearch("", "textclass.lst");
        lyxerr[Debug::TCLASS] << "Reading textclasses from `"
-                             << real_file << "'" << endl;
+                             << real_file << '\'' << endl;
 
        if (real_file.empty()) {
                lyxerr << "LyXTextClassList::Read: unable to find "
                        "textclass file  `" << MakeDisplayPath(real_file, 1000)
                       << "'. Exiting." << endl;
-
-               Alert::alert(_("LyX wasn't able to find its layout descriptions!"),
-                          _("Check that the file \"textclass.lst\""),
-                          _("is installed correctly. Sorry, has to exit :-("));
                return false;
                // This causes LyX to end... Not a desirable behaviour. Lgb
                // What do you propose? That the user gets a file dialog
@@ -139,23 +128,20 @@ bool LyXTextClassList::Read ()
                                        if (lyxerr.debugging(Debug::TCLASS)) {
                                                tmpl.load();
                                        }
-                                       Add(tmpl);
+                                       classlist_.push_back(tmpl);
                                }
                        }
                }
        }
        lyxerr[Debug::TCLASS] << "End of parsing of textclass.lst" << endl;
 
-       if (classlist.empty()) {
+       if (classlist_.empty()) {
                lyxerr << "LyXTextClassList::Read: no textclasses found!"
                       << endl;
-               Alert::alert(_("LyX wasn't able to find any layout description!"),
-                          _("Check the contents of the file \"textclass.lst\""),
-                          _("Sorry, has to exit :-("));
                return false;
        }
        // Ok everything loaded ok, now sort the list.
-       sort(classlist.begin(), classlist.end(), less_textclass_desc());
+       sort(classlist_.begin(), classlist_.end(), less_textclass_desc());
        return true;
 }