X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetwrap.C;h=570802c50d70b6371f71452d6cf531b577cd2b32;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=13f1831a5745ce22deb9e42fb5a8e229e77f79d9;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 13f1831a57..570802c50d 100644
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -28,7 +28,7 @@
 #include "lyxlex.h"
 #include "outputparams.h"
 #include "paragraph.h"
-#include "pariterator.h"
+#include "TocBackend.h"
 
 #include "support/convert.h"
 
@@ -54,7 +54,7 @@ InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
 	setLabelFont(font);
 	params_.type = type;
 	params_.width = LyXLength(50, LyXLength::PCW);
-	setInsetName(type);
+	setInsetName(from_utf8(type));
 }
 
 
@@ -224,7 +224,7 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const
 }
 
 
-void InsetWrap::addToToc(toc::TocList & toclist, Buffer const & buf) const
+void InsetWrap::addToToc(TocList & toclist, Buffer const & buf) const
 {
 	ParConstIterator pit = par_const_iterator_begin(*this);
 	ParConstIterator end = par_const_iterator_end(*this);
@@ -232,12 +232,11 @@ void InsetWrap::addToToc(toc::TocList & toclist, Buffer const & buf) const
 	// Find a caption layout in one of the (child inset's) pars
 	for (; pit != end; ++pit) {
 		if (pit->layout()->labeltype == LABEL_SENSITIVE) {
-			string const type = params_.type;
+			Toc & toc = toclist[params_.type];
 			docstring const str =
-				convert<docstring>(toclist[type].size() + 1)
+				convert<docstring>(toc.size() + 1)
 				+ ". " + pit->asString(buf, false);
-			toc::TocItem const item(pit, 0, str);
-			toclist[type].push_back(item);
+			toc.push_back(TocItem(pit, 0, str));
 		}
 	}
 }