X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloatList.cpp;h=3ed9127d39a45a548da47aa02846a2299f324846;hb=13739f37d5208e87e97c44ef2eeba35807ddb9c5;hp=acdc628e7da95a56a9d7831762a40496487b5f47;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git diff --git a/src/FloatList.cpp b/src/FloatList.cpp index acdc628e7d..3ed9127d39 100644 --- a/src/FloatList.cpp +++ b/src/FloatList.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * * Full author contact details are available in file CREDITS. */ @@ -13,31 +13,12 @@ #include "FloatList.h" #include "Floating.h" +using namespace std; namespace lyx { -using std::string; - -// 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 -// create floats and modify them to fit into a certain document. So it is -// pretty clear that each layout needs its own list, as do documents. -// However this is also not enough since we really want the user to be -// able to create "presistent" floats, in the sense that a user created -// float can be used across sessions and across documents. So we need a -// global¹ floatlist as well. The interaction between these are not quite -// clear, but it seems natural that the definition found in the document -// takes precedence. -// We also have the issue about what get stored _in_ the lyx file. -// -// ¹ not absolutely global but somewhere where documents,layouts and -// the bufferview can have access to it. -// -// Lgb - FloatList::FloatList() -{ -} +{} FloatList::const_iterator FloatList::begin() const @@ -54,7 +35,7 @@ FloatList::const_iterator FloatList::end() const void FloatList::newFloat(Floating const & fl) { - list[fl.type()] = fl; + list[fl.floattype()] = fl; }