#include "layout.h"
#include "lyxlex.h"
#include "support/filetools.h"
-#include "lyx_gui_misc.h"
+#include "frontends/Alert.h"
#include "debug.h"
#include "gettext.h"
#include "support/LAssert.h"
using std::find_if;
using std::remove_if;
+using lyx::layout_type;
+using lyx::textclass_type;
+
+
// Global variable: textclass table.
LyXTextClassList textclasslist;
//////////////////////////////////////////
// Gets textclass number from name
-pair<bool, LyXTextClassList::size_type> const
+pair<bool, textclass_type> const
LyXTextClassList::NumberOfClass(string const & textclass) const
{
ClassList::const_iterator cit =
find_if(classlist.begin(), classlist.end(),
lyx::compare_memfun(&LyXTextClass::name, textclass));
return cit != classlist.end() ?
- make_pair(true, size_type(cit - classlist.begin())) :
- make_pair(false, size_type(0));
+ make_pair(true, textclass_type(cit - classlist.begin())) :
+ make_pair(false, textclass_type(0));
}
// Gets layout structure from style number and textclass number
LyXLayout const &
-LyXTextClassList::Style(LyXTextClassList::size_type textclass,
- LyXTextClass::size_type layout) const
+LyXTextClassList::Style(textclass_type textclass,
+ layout_type layout) const
{
classlist[textclass].load();
if (layout < classlist[textclass].numLayouts())
// Gets layout number from name and textclass number
-pair<bool, LyXTextClass::size_type> const
-LyXTextClassList::NumberOfLayout(LyXTextClassList::size_type textclass,
+pair<bool, layout_type> const
+LyXTextClassList::NumberOfLayout(textclass_type textclass,
string const & name) const
{
classlist[textclass].load();
return make_pair(true, i);
}
if (name == "dummy")
- return make_pair(true, LyXTextClassList::size_type(LYX_DUMMY_LAYOUT));
- return make_pair(false, LyXTextClass::size_type(0)); // not found
+ return make_pair(true, layout_type(LYX_DUMMY_LAYOUT));
+ return make_pair(false, layout_type(0)); // not found
}
// Gets a layout (style) name from layout number and textclass number
string const &
-LyXTextClassList::NameOfLayout(LyXTextClassList::size_type textclass,
- LyXTextClass::size_type layout) const
+LyXTextClassList::NameOfLayout(textclass_type textclass,
+ layout_type layout) const
{
static string const dummy("dummy");
classlist[textclass].load();
// Gets a textclass name from number
string const &
-LyXTextClassList::NameOfClass(LyXTextClassList::size_type number) const
+LyXTextClassList::NameOfClass(textclass_type number) const
{
static string const dummy("dummy");
- if (classlist.size() == 0) {
+ if (classlist.empty()) {
return dummy;
}
lyx::Assert(number < classlist.size());
// Gets a textclass latexname from number
string const &
-LyXTextClassList::LatexnameOfClass(LyXTextClassList::size_type number) const
+LyXTextClassList::LatexnameOfClass(textclass_type number) const
{
static string const dummy("dummy");
classlist[number].load();
- if (classlist.size() == 0) {
+ if (classlist.empty()) {
return dummy;
}
lyx::Assert(number < classlist.size());
// Gets a textclass description from number
string const &
-LyXTextClassList::DescOfClass(LyXTextClassList::size_type number) const
+LyXTextClassList::DescOfClass(textclass_type number) const
{
static string const dummy("dummy");
- if (classlist.size() == 0) {
+ if (classlist.empty()) {
return dummy;
}
lyx::Assert(number < classlist.size());
// Gets a textclass structure from number
LyXTextClass const &
-LyXTextClassList::TextClass(LyXTextClassList::size_type textclass) const
+LyXTextClassList::TextClass(textclass_type textclass) const
{
classlist[textclass].load();
if (textclass < classlist.size())
"textclass file `" << MakeDisplayPath(real_file, 1000)
<< "'. Exiting." << endl;
- WriteAlert(_("LyX wasn't able to find its layout descriptions!"),
+ 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;
}
lyxerr[Debug::TCLASS] << "End of parsing of textclass.lst" << endl;
- if (classlist.size() == 0) {
+ if (classlist.empty()) {
lyxerr << "LyXTextClassList::Read: no textclasses found!"
<< endl;
- WriteAlert(_("LyX wasn't able to find any layout description!"),
- _("Check the contents of the file \"textclass.lst\""),
+ 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;
}
/* Load textclass
Returns false if this fails
*/
-bool
-LyXTextClassList::Load (LyXTextClassList::size_type number) const
+bool LyXTextClassList::Load(textclass_type number) const
{
bool result = true;
if (number < classlist.size()) {