Begin undoing the tocString() mess by renaming that routine.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36889 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index ed22830e5a9f994f1e200ddfdb812dd6ac39c70a..fb9a832fe2e207c76f2399b863a27666ed910351 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -2928,7 +2928,7 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options) const
                    || (c == '\n' && (options & AS_STR_NEWLINES)))
                        os.put(c);
                else if (c == META_INSET && (options & AS_STR_INSETS)) {
-                       getInset(i)->tocString(os);
+                       getInset(i)->toString(os);
                        if (getInset(i)->asInsetMath())
                                os << " ";
                }

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 965fa6279a44b86de35fecf6d0df4a255d8c1819..44646b93831318dcfb14dcff5de1f0908dd69837 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -323,8 +323,8 @@ public:
        // FIXME This method is used for things other than generating strings
        // for the TOC. E.g., it is called by Paragraph::asString() to get the
        // contents of the inset. These two functions should be disentangled.
-       /// the string that is passed to the TOC
-       virtual void tocString(odocstream &) const {}
+       /// 
+       virtual void toString(odocstream &) const {}
 
        /// can the contents of the inset be edited on screen ?
        // true for InsetCollapsables (not ButtonOnly) (not InsetInfo), InsetText

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 4bcd711c1bbcfbd63cff6cf9793bf191d863ab7b..01cd795bd9ff4cf622d50c37048247625b852cab 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -238,10 +238,10 @@ docstring InsetBranch::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 }
 
 
-void InsetBranch::tocString(odocstream & os) const
+void InsetBranch::toString(odocstream & os) const
 {
        if (isBranchSelected())
-               InsetCollapsable::tocString(os);
+               InsetCollapsable::toString(os);
 }
 
 

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index f852ee2defb0f166df932448010686fe5f4a953e..8f58a50310c1c110ddb7a4f14b774be137d0bf0c 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -73,7 +73,7 @@ private:
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
-       void tocString(odocstream &) const;
+       void toString(odocstream &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index 5d8d8c9a203c90aacfb9b18ba6a217314b8f198d..1ef7e0fb000ff455dae48cc1748ab380d2d2aa6b 100644 (file)
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -540,7 +540,7 @@ docstring InsetCitation::xhtml(XHTMLStream & xs, OutputParams const &) const
 }
 
 
-void InsetCitation::tocString(odocstream & os) const
+void InsetCitation::toString(odocstream & os) const
 {
        plaintext(os, OutputParams(0));
 }

diff --git a/src/insets/InsetCitation.h b/src/insets/InsetCitation.h
index 831da30dac859c5ec4f1fb38532491d22eb14bf7..8ae83c4c16c323cb39c39820643e406a297f9906 100644 (file)
--- a/src/insets/InsetCitation.h
+++ b/src/insets/InsetCitation.h
@@ -51,7 +51,7 @@ public:
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
-       void tocString(odocstream &) const;
+       void toString(odocstream &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index 42dd6917ddbe28439c466bedf5dd5a50acf21266..468b19039dc7598c83ed0d7bd69344acbd67a53d 100644 (file)
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -236,7 +236,7 @@ docstring InsetHyperlink::xhtml(XHTMLStream & xs, OutputParams const &) const
 }
 
 
-void InsetHyperlink::tocString(odocstream & os) const
+void InsetHyperlink::toString(odocstream & os) const
 {
        plaintext(os, OutputParams(0));
 }

diff --git a/src/insets/InsetHyperlink.h b/src/insets/InsetHyperlink.h
index ddf35af8533e4631c71a94def965960656c70f3b..29439f51c51282b88c5356df19cc10719f2b7889 100644 (file)
--- a/src/insets/InsetHyperlink.h
+++ b/src/insets/InsetHyperlink.h
@@ -36,7 +36,7 @@ public:
        ///
        bool isInToc() const { return true; }
        ///
-       void tocString(odocstream &) const;
+       void toString(odocstream &) const;
        ///
        docstring toolTip(BufferView const & bv, int x, int y) const;
        ///

diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp
index 4e47361bf752910cdfca7968e7aa5f28b90daac4..0c272ffb098fa7f69c20a0c527419697e8428495 100644 (file)
--- a/src/insets/InsetQuotes.cpp
+++ b/src/insets/InsetQuotes.cpp
@@ -327,7 +327,7 @@ docstring InsetQuotes::xhtml(XHTMLStream & xs, OutputParams const & op) const
 }
 
 
-void InsetQuotes::tocString(odocstream & os) const
+void InsetQuotes::toString(odocstream & os) const
 {
        os << displayString();
 }

diff --git a/src/insets/InsetQuotes.h b/src/insets/InsetQuotes.h
index 0cc463e4c27723fcaf4a2542a2072b327bc163bf..faab5ca90f7e7db94f42a65dc63960ea529c678c 100644 (file)
--- a/src/insets/InsetQuotes.h
+++ b/src/insets/InsetQuotes.h
@@ -86,8 +86,8 @@ public:
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
 
-       /// the string that is passed to the TOC
-       void tocString(odocstream &) const;
+       /// 
+       void toString(odocstream &) const;
 
        ///
        void validate(LaTeXFeatures &) const;

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index 8324104eed490ff3d4b533ba96a317865a352987..1a802a233e223fdb6c634b2cf822b381f49285f6 100644 (file)
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -231,7 +231,7 @@ docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const &) const
 }
 
 
-void InsetRef::tocString(odocstream & os) const
+void InsetRef::toString(odocstream & os) const
 {
        plaintext(os, OutputParams(0));
 }

diff --git a/src/insets/InsetRef.h b/src/insets/InsetRef.h
index 61620d3f25a604a59fdba903f9d0f795bb5f22d7..ceae6fc4e87fad9d964563f35f2628be6d6dcce9 100644 (file)
--- a/src/insets/InsetRef.h
+++ b/src/insets/InsetRef.h
@@ -58,8 +58,8 @@ public:
        int docbook(odocstream &, OutputParams const &) const;
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
-       /// the string that is passed to the TOC
-       void tocString(odocstream &) const;
+       /// 
+       void toString(odocstream &) const;
        ///
        void validate(LaTeXFeatures & features) const;
        ///

diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index cccde17fc88d0d35559b38201a1b18b16affdde2..7ece382c4338e61e5a0b07609d26b5ba588ddee7 100644 (file)
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -734,7 +734,7 @@ void InsetSpace::validate(LaTeXFeatures & features) const
 }
 
 
-void InsetSpace::tocString(odocstream & os) const
+void InsetSpace::toString(odocstream & os) const
 {
        plaintext(os, OutputParams(0));
 }

diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h
index 089b5664e95a1261b28ffaed9cb809648f27aef2..f013d7ca31d9ec89ac5ff2d9ac52330cfae6a4f0 100644 (file)
--- a/src/insets/InsetSpace.h
+++ b/src/insets/InsetSpace.h
@@ -129,8 +129,8 @@ public:
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures & features) const;
-       /// the string that is passed to the TOC
-       void tocString(odocstream &) const;
+       ///
+       void toString(odocstream &) const;
        ///
        bool hasSettings() const { return true; }
        ///

diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp
index f73217d02fd4d3ee8524dec30628968240e9ecc5..e89bd003b333e31e03e51b00aed5acd62752b657 100644 (file)
--- a/src/insets/InsetSpecialChar.cpp
+++ b/src/insets/InsetSpecialChar.cpp
@@ -318,7 +318,7 @@ docstring InsetSpecialChar::xhtml(XHTMLStream & xs, OutputParams const &) const
 }
 
 
-void InsetSpecialChar::tocString(odocstream & os) const
+void InsetSpecialChar::toString(odocstream & os) const
 {
        plaintext(os, OutputParams(0));
 }

diff --git a/src/insets/InsetSpecialChar.h b/src/insets/InsetSpecialChar.h
index 7fff625da0b2a9c8be97ac94dc84923c9a210179..7a06c54b57a3585e8e1654f0af0cda136f888407 100644 (file)
--- a/src/insets/InsetSpecialChar.h
+++ b/src/insets/InsetSpecialChar.h
@@ -66,8 +66,8 @@ public:
        int docbook(odocstream &, OutputParams const &) const;
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
-       /// the string that is passed to the TOC
-       void tocString(odocstream &) const;
+       ///
+       void toString(odocstream &) const;
        ///
        InsetCode lyxCode() const { return SPECIALCHAR_CODE; }
        /// We don't need \begin_inset and \end_inset

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 76d7d33a7a36008118b7637c95e08b1d4057ee0f..4c5ca72f6a5831e902ca1632200ac24f2d0546b4 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -666,7 +666,7 @@ void InsetText::updateBuffer(ParIterator const & it, UpdateType utype)
 }
 
 
-void InsetText::tocString(odocstream & os) const
+void InsetText::toString(odocstream & os) const
 {
        os << text().asString(0, 1, AS_STR_LABEL | AS_STR_INSETS);
 }

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index f1c23cccaf6987ba12409750d27fca801a783579..d848cbb0efc4cd7ebf0a2f5f9583315124e34995 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -163,8 +163,8 @@ public:
 
        /// Update the counters of this inset and of its contents
        virtual void updateBuffer(ParIterator const &, UpdateType);
-       /// the string that is passed to the TOC
-       void tocString(odocstream &) const;
+       /// 
+       void toString(odocstream &) const;
        ///
        void addToToc(DocIterator const &);
        ///

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 374e81be663e3911e2e9b3465a1688652d7b0cf0..bf4e12245387c03ffab9400b0cbabba676d2dc02 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -1983,7 +1983,7 @@ docstring InsetMathHull::xhtml(XHTMLStream & xs, OutputParams const & op) const
 }
 
 
-void InsetMathHull::tocString(odocstream & os) const
+void InsetMathHull::toString(odocstream & os) const
 {
        plaintext(os, OutputParams(0));
 }

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index dd4255f0d92b00a9e2e64b3e8e8ef0ddf380db32..9712460e433356603b134d9f25df963d747aa2b9 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -130,8 +130,8 @@ public:
        int docbook(odocstream &, OutputParams const &) const;
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
-       /// the string that is passed to the TOC
-       void tocString(odocstream &) const;
+       /// 
+       void toString(odocstream &) const;
 
        /// get notification when the cursor leaves this inset
        bool notifyCursorLeaves(Cursor const & old, Cursor & cur);