copy some code over to allow work to start on prefs

[lyx.git] / src / lyxtextclasslist.C

diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index 6050c266cba0e2ed98b5a98b7bba41c8178feb0c..389e7ddfbcf00f612c7e5a5ac0fc636909a0cf37 100644 (file)
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -20,7 +20,6 @@
 #include "debug.h"
 #include "lyxlex.h"
 #include "gettext.h"
-
 #include "frontends/Alert.h"
 
 #include "support/lyxfunctional.h"
@@ -29,6 +28,10 @@
 
 #include <utility>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::exit;
+#endif
+
 using lyx::textclass_type;
 using std::pair;
 using std::make_pair;
@@ -42,10 +45,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 +57,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];
 }
 
 
@@ -129,29 +126,24 @@ bool LyXTextClassList::Read ()
                        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;
-                                             // This code is run when we have
-                                             // fname, clname and desc
-                                             LyXTextClass tmpl(fname,
-                                                               clname,
-                                                               desc);
-                                             if (lyxerr.
-                                                 debugging(Debug::TCLASS)) {
-                                                     tmpl.load();
-                                             }
-                                             Add (tmpl);
+                                       string const desc = lex.getString();
+                                       lyxerr[Debug::TCLASS] << "Desc: " << desc << endl;
+                                       // This code is run when we have
+                                       // fname, clname and desc
+                                       LyXTextClass tmpl(fname, clname, desc);
+                                       if (lyxerr.debugging(Debug::TCLASS)) {
+                                               tmpl.load();
+                                       }
+                                       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!"),
@@ -160,7 +152,7 @@ bool LyXTextClassList::Read ()
                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;
 }