X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtextclasslist.C;h=861b33e2617d53673fb1650fe6985e7a2fe76263;hb=2523638092e2024bac408eee98ad2094bc4e4089;hp=ea21f14b0ef57a43ef11bcd0394baa2b624eda51;hpb=d62a9764da0e58808f7d2b3844d9b9c02f7026c4;p=lyx.git

diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index ea21f14b0e..861b33e261 100644
--- 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];
 }
 
 
@@ -83,7 +80,7 @@ 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 "
@@ -139,14 +136,14 @@ 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!"),
@@ -155,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;
 }