X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloatList.C;h=c0b1e423b51cc61090e806062bd4090027f74a0d;hb=dad1fc66e44a4dad94eb1e9ffd5736bf8f59ae6d;hp=0e2992d2ec90aee3138e83075092dc88f7f75864;hpb=42a1e2ea5a05435f9b07c6274b966e2ae13d4615;p=lyx.git diff --git a/src/FloatList.C b/src/FloatList.C index 0e2992d2ec..c0b1e423b5 100644 --- a/src/FloatList.C +++ b/src/FloatList.C @@ -1,10 +1,7 @@ #include -#ifdef __GNUG__ -#pragma implementation -#endif - #include "FloatList.h" +#include "gettext.h" // This class is now mostly finished, except one thing, it is a global // object. This will not do. The user (and layout files) are free to @@ -25,33 +22,16 @@ FloatList::FloatList() { - // Insert the latex builtin float-types - // (these will later be read from a layout file) - - // table - Floating table("table", "htbp", "lot", "", "plain", "Table", true); - newFloat(table); - - // figure - Floating figure("figure", "htbp", "lof", "", "plain", "Figure", true); - newFloat(figure); - - // And we add algorithm too since LyX has - // supported that for a long time, - // but support for this should probably be moved to a layout file. - Floating algorithm("algorithm", "htbp", "loa", - "", "ruled", "Algorithm"); - newFloat(algorithm); } -FloatList::const_iterator FloatList::begin() const +FloatList::const_iterator FloatList::begin() const { return list.begin(); } -FloatList::const_iterator FloatList::end() const +FloatList::const_iterator FloatList::end() const { return list.end(); } @@ -67,7 +47,7 @@ string const FloatList::defaultPlacement(string const & t) const { List::const_iterator cit = list.find(t); if (cit != list.end()) - return (*cit).second.placement(); + return cit->second.placement(); return string(); } @@ -84,7 +64,7 @@ Floating const & FloatList::getType(string const & t) const // I wish we could use exceptions List::const_iterator cit = list.find(t); if (cit != list.end()) - return (*cit).second; + return cit->second; #ifdef HAVE_EXCEPTIONS throw UnknownFloatType(t); #else @@ -94,11 +74,13 @@ Floating const & FloatList::getType(string const & t) const } -FloatList::const_iterator FloatList::operator[](string const & t) const +void FloatList::erase(string const & t) { - return list.find(t); + list.erase(t); } -// The global floatlist -FloatList floatList; +FloatList::const_iterator FloatList::operator[](string const & t) const +{ + return list.find(t); +}