* Painter.h:

[lyx.git] / src / TocBackend.C

diff --git a/src/TocBackend.C b/src/TocBackend.C
index c5389106affa7c3d06e1cfeaf191b9e436443842..25f8cf4c67378bf56f93d76f049dfa4392aa514f 100644 (file)
--- a/src/TocBackend.C
+++ b/src/TocBackend.C
@@ -33,6 +33,8 @@
 
 #include <iostream>
 
+namespace lyx {
+
 using std::vector;
 using std::max;
 using std::ostream;
@@ -40,13 +42,12 @@ using std::string;
 using std::cout;
 using std::endl;
 
-namespace lyx {
 
 ///////////////////////////////////////////////////////////////////////////
 // TocBackend::Item implementation
 
 TocBackend::Item::Item(ParConstIterator const & par_it, int d,
-                                          std::string const & s)
+               docstring const & s)
                : par_it_(par_it), depth_(d), str_(s)
 {
 /*
@@ -96,27 +97,27 @@ int const TocBackend::Item::depth() const
 }
 
 
-std::string const & TocBackend::Item::str() const
+docstring const & TocBackend::Item::str() const
 {
        return str_;
 }
 
 
-string const TocBackend::Item::asString() const
+docstring const TocBackend::Item::asString() const
 {
-       return string(4 * depth_, ' ') + str_;
+       return docstring(4 * depth_, ' ') + str_;
 }
 
 
 void TocBackend::Item::goTo(LyXView & lv_) const
 {
        string const tmp = convert<string>(id());
-       lv_.dispatch(FuncRequest(LFUN_GOTO_PARAGRAPH, tmp));
+       lv_.dispatch(FuncRequest(LFUN_PARAGRAPH_GOTO, tmp));
 }
 
 FuncRequest TocBackend::Item::action() const
 {
-       return FuncRequest(LFUN_GOTO_PARAGRAPH, convert<string>(id()));
+       return FuncRequest(LFUN_PARAGRAPH_GOTO, convert<string>(id()));
 }
 
 
@@ -163,7 +164,7 @@ void TocBackend::update()
        for (; pit != end; ++pit) {
 
                // the string that goes to the toc (could be the optarg)
-               string tocstring;
+               docstring tocstring;
 
                // For each paragraph, traverse its insets and look for
                // FLOAT_CODE or WRAP_CODE
@@ -184,8 +185,8 @@ void TocBackend::update()
                                        break;
                                Paragraph const & par = *static_cast<InsetOptArg*>(it->inset)->paragraphs().begin();
                                if (!pit->getLabelstring().empty())
-                                       tocstring = pit->getLabelstring()
-                                               + ' ';
+                                       // FIXME UNICODE
+                                       tocstring = pit->getLabelstring() + ' ';
                                tocstring += par.asString(*buffer_, false);
                                break;
                        }
@@ -245,7 +246,7 @@ TocBackend::TocIterator const TocBackend::item(std::string const & type, ParCons
 }
 
 
-void TocBackend::asciiTocList(string const & type, ostream & os) const
+void TocBackend::asciiTocList(string const & type, odocstream & os) const
 {
        TocList::const_iterator cit = tocs_.find(type);
        if (cit != tocs_.end()) {