More 'standard conformant blurb' nonsense.

[lyx.git] / src / toc.C

diff --git a/src/toc.C b/src/toc.C
index 8912609988453cf427c989ccc936a08eed286361..e8d303412fd903503daa1ec9770a7c26e0b14bdd 100644 (file)
--- a/src/toc.C
+++ b/src/toc.C
@@ -34,8 +34,8 @@ using std::max;
 using std::endl;
 using std::ostream;
 
-namespace toc
-{
+namespace lyx {
+namespace toc {
 
 string const TocItem::asString() const
 {
@@ -78,34 +78,33 @@ TocList const getTocList(Buffer const * buf)
        ParConstIterator pit = buf->par_iterator_begin();
        ParConstIterator end = buf->par_iterator_end();
        for (; pit != end; ++pit) {
-               Paragraph const * par = *pit;
-
 #ifdef WITH_WARNINGS
 #warning bogus type (Lgb)
 #endif
-               char const labeltype = par->layout()->labeltype;
+               char const labeltype = pit->layout()->labeltype;
 
                if (labeltype >= LABEL_COUNTER_CHAPTER
                    && labeltype <= LABEL_COUNTER_CHAPTER + buf->params.tocdepth) {
                                // insert this into the table of contents
                        const int depth = max(0, labeltype - textclass.maxcounter());
-                       TocItem const item(par->id(), depth,
-                                          par->asString(buf, true));
+                       TocItem const item(pit->id(), depth,
+                                          pit->asString(buf, true));
                        toclist["TOC"].push_back(item);
                }
 
                // For each paragraph, traverse its insets and look for
                // FLOAT_CODE or WRAP_CODE
-               InsetList::iterator it = par->insetlist.begin();
-               InsetList::iterator end = par->insetlist.end();
+               InsetList::const_iterator it = pit->insetlist.begin();
+               InsetList::const_iterator end = pit->insetlist.end();
                for (; it != end; ++it) {
-                       if (it.getInset()->lyxCode() == Inset::FLOAT_CODE) {
+                       if (it->inset->lyxCode() == InsetOld::FLOAT_CODE) {
                                InsetFloat * il =
-                                       static_cast<InsetFloat*>(it.getInset());
+                                       static_cast<InsetFloat*>(it->inset);
                                il->addToToc(toclist, buf);
-                       } else if (it.getInset()->lyxCode() == Inset::WRAP_CODE) {
+                       } else if (it->inset->lyxCode() == InsetOld::WRAP_CODE) {
                                InsetWrap * il =
-                                       static_cast<InsetWrap*>(it.getInset());
+                                       static_cast<InsetWrap*>(it->inset);
+
                                il->addToToc(toclist, buf);
                        }
                }
@@ -145,3 +144,4 @@ void asciiTocList(string const & type, Buffer const * buffer, ostream & os)
 
 
 } // namespace toc
+} // namespace lyx