Embedding: merge lyx::EmbeddedFiles to lyx::support::EmbeddedFileList

[lyx.git] / src / insets / InsetText.cpp

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 3219e59dcf04b4490c5e28b41d8c8928ea972dfe..9369555c58ea3769342aeb09f148f5999eebffc1 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -20,13 +20,13 @@
 #include "CoordCache.h"
 #include "CutAndPaste.h"
 #include "Cursor.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "DispatchResult.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
+#include "InsetList.h"
 #include "Intl.h"
-#include "Color.h"
 #include "lyxfind.h"
 #include "Lexer.h"
 #include "LyXRC.h"
@@ -42,41 +42,31 @@
 #include "ParIterator.h"
 #include "Row.h"
 #include "sgml.h"
+#include "TextClass.h"
 #include "TextMetrics.h"
 #include "TexRow.h"
-#include "Undo.h"
 
 #include "frontends/alert.h"
 #include "frontends/Painter.h"
 
-#include "support/lyxalgo.h" // count
+#include "support/lstrings.h"
 
 #include <boost/bind.hpp>
-#include <boost/current_function.hpp>
-#include <boost/signal.hpp>
+#include <boost/assert.hpp>
 
-#include <sstream>
+using namespace std;
+using namespace lyx::support;
 
+using boost::bind;
+using boost::ref;
 
 namespace lyx {
 
 using graphics::PreviewLoader;
 
-using support::isStrUnsignedInt;
-
-using boost::bind;
-using boost::ref;
-
-using std::endl;
-using std::for_each;
-using std::max;
-using std::string;
-using std::ostream;
-using std::vector;
-
 
 InsetText::InsetText(BufferParams const & bp)
-       : drawFrame_(false), frame_color_(Color::insetframe)
+       : drawFrame_(false), frame_color_(Color_insetframe)
 {
        paragraphs().push_back(Paragraph());
        paragraphs().back().layout(bp.getTextClass().defaultLayout());
@@ -174,7 +164,7 @@ void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
        //lyxerr << "InsetText::metrics: width: " << mi.base.textwidth << endl;
 
        // Hand font through to contained lyxtext:
-       tm.font_ = mi.base.font;
+       tm.font_.fontInfo() = mi.base.font;
        mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
        if (hasFixedWidth())
                tm.metrics(mi, dim, mi.base.textwidth);
@@ -217,7 +207,7 @@ void InsetText::edit(Cursor & cur, bool left)
        int const pos = left ? 0 : paragraphs().back().size();
        text_.setCursor(cur.top(), pit, pos);
        cur.clearSelection();
-       finishUndo();
+       cur.finishUndo();
 }
 
 
@@ -229,9 +219,8 @@ Inset * InsetText::editXY(Cursor & cur, int x, int y)
 
 void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       LYXERR(Debug::ACTION) << BOOST_CURRENT_FUNCTION
-                            << " [ cmd.action = "
-                            << cmd.action << ']' << endl;
+       LYXERR(Debug::ACTION, "InsetText::doDispatch()"
+               << " [ cmd.action = " << cmd.action << ']');
        text_.dispatch(cur, cmd);
 }
 
@@ -366,13 +355,13 @@ void InsetText::setDrawFrame(bool flag)
 }
 
 
-Color_color InsetText::frameColor() const
+ColorCode InsetText::frameColor() const
 {
-       return Color::color(frame_color_);
+       return frame_color_;
 }
 
 
-void InsetText::setFrameColor(Color_color col)
+void InsetText::setFrameColor(ColorCode col)
 {
        frame_color_ = col;
 }
@@ -391,7 +380,7 @@ void InsetText::appendParagraphs(Buffer * buffer, ParagraphList & plist)
        ParagraphList::iterator ins = pl.insert(pl.end(), *pit);
        ++pit;
        mergeParagraph(buffer->params(), pl,
-                      std::distance(pl.begin(), ins) - 1);
+                      distance(pl.begin(), ins) - 1);
 
        for_each(pit, plist.end(),
                 bind(&ParagraphList::push_back, ref(pl), _1));
@@ -404,8 +393,8 @@ void InsetText::addPreview(PreviewLoader & loader) const
        ParagraphList::const_iterator pend = paragraphs().end();
 
        for (; pit != pend; ++pit) {
-               InsetList::const_iterator it  = pit->insetlist.begin();
-               InsetList::const_iterator end = pit->insetlist.end();
+               InsetList::const_iterator it  = pit->insetList().begin();
+               InsetList::const_iterator end = pit->insetList().end();
                for (; it != end; ++it)
                        it->inset->addPreview(loader);
        }