Inset::textString --> Inset::tocString

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

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index fc458c572a0b258c98ba00bf0ee8dcd09ae7ba9f..f9c0a8cb0dff5ef5afcf1bd8164eefb0d8922ba7 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -2431,7 +2431,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)->textString(os);
+                       getInset(i)->tocString(os);
        }
 
        return os.str();

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 48341f119c3d4d93e32d6acd07dd33b8815b3e8a..ea8fbfc54a4ad2f5039715577b8fad4a295c3411 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -292,7 +292,7 @@ public:
        /// docbook output
        virtual int docbook(odocstream & os, OutputParams const &) const;
        /// the string that is passed to the TOC
-       virtual void textString(odocstream &) const {}
+       virtual void tocString(odocstream &) const {}
 
        /** This enum indicates by which means the inset can be modified:
        - NOT_EDITABLE: the inset's content cannot be modified at all

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 2933e1b22c79fdb62d08383b6fb4a03c0c352fcb..f305139dbfad08230840eff15fbdf0ff4683a2ca 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -232,7 +232,7 @@ int InsetBranch::docbook(odocstream & os,
 }
 
 
-void InsetBranch::textString(odocstream & os) const
+void InsetBranch::tocString(odocstream & os) const
 {
        if (isBranchSelected())
                os << text().asString(0, 1, AS_STR_LABEL | AS_STR_INSETS);

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index b608fd19cc1a7a509331095e908eeee5dfed3f5f..67fde95cf8f8856fa46bddaeb9be2a6a6b042103 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -74,7 +74,7 @@ private:
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
-       void textString(odocstream &) const;
+       void tocString(odocstream &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index 859ceba81f4e050b65cb2c9f4c3b78dd3888c0c4..48f51ada44fd41800ed4123f154c1e6ba7c662ed 100644 (file)
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -471,7 +471,7 @@ int InsetCitation::docbook(odocstream & os, OutputParams const &) const
 }
 
 
-void InsetCitation::textString(odocstream & os) const
+void InsetCitation::tocString(odocstream & os) const
 {
        plaintext(os, OutputParams(0));
 }

diff --git a/src/insets/InsetCitation.h b/src/insets/InsetCitation.h
index b0399d08981b3801fcdcc2f37db3c2061205395f..b232b86afd6d408299f219a46a96a87b71bf1507 100644 (file)
--- a/src/insets/InsetCitation.h
+++ b/src/insets/InsetCitation.h
@@ -48,7 +48,7 @@ public:
        ///
        int docbook(odocstream &, OutputParams const &) const;
        /// the string that is passed to the TOC
-       void textString(odocstream &) const;
+       void tocString(odocstream &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index 5bc513b259fc9f38526306e645434f4a28b0bacc..7c54aefc3020487d54f546c743aa771c4eab6ba2 100644 (file)
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -108,7 +108,7 @@ int InsetFlex::docbook(odocstream & os, OutputParams const & runparams) const
 }
 
 
-void InsetFlex::textString(odocstream & os) const
+void InsetFlex::tocString(odocstream & os) const
 {
        os << text().asString(0, 1, AS_STR_LABEL | AS_STR_INSETS);
 }

diff --git a/src/insets/InsetFlex.h b/src/insets/InsetFlex.h
index 96b3a71b2e41c411022a253a1d18c5da152230de..c6c40fe5d36cf13fec59e50725bb5bed72312ea7 100644 (file)
--- a/src/insets/InsetFlex.h
+++ b/src/insets/InsetFlex.h
@@ -41,7 +41,7 @@ public:
        ///
        int docbook(odocstream &, OutputParams const &) const;
        /// the string that is passed to the TOC
-       void textString(odocstream &) const;
+       void tocString(odocstream &) const;
 
        /// should paragraph indendation be ommitted in any case?
        bool neverIndent() const { return true; }

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index 42c6240a032b572096facf9c7fdb82c4816b3a46..6db2babd08b4286843d3058f0aa9c619179719b8 100644 (file)
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -165,7 +165,7 @@ int InsetHyperlink::docbook(odocstream & os, OutputParams const &) const
 }
 
 
-void InsetHyperlink::textString(odocstream & os) const
+void InsetHyperlink::tocString(odocstream & os) const
 {
        plaintext(os, OutputParams(0));
 }

diff --git a/src/insets/InsetHyperlink.h b/src/insets/InsetHyperlink.h
index 186b7567fc5882d8320caf861681c63368d614c5..43eee9065b3b0cc9aa73e908b73c5f75fdbe3c16 100644 (file)
--- a/src/insets/InsetHyperlink.h
+++ b/src/insets/InsetHyperlink.h
@@ -41,7 +41,7 @@ public:
        ///
        int docbook(odocstream &, OutputParams const &) const;
        /// the string that is passed to the TOC
-       void textString(odocstream &) const;
+       void tocString(odocstream &) const;
        ///
        static ParamInfo const & findInfo(std::string const &);
        ///

diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp
index 122266d8081beab35aa10312baff19cb92f1b1ed..d27b12541401922431c320baeeae75fb2a246fc1 100644 (file)
--- a/src/insets/InsetQuotes.cpp
+++ b/src/insets/InsetQuotes.cpp
@@ -312,7 +312,7 @@ int InsetQuotes::docbook(odocstream & os, OutputParams const &) const
 }
 
 
-void InsetQuotes::textString(odocstream & os) const
+void InsetQuotes::tocString(odocstream & os) const
 {
        os << displayString();
 }

diff --git a/src/insets/InsetQuotes.h b/src/insets/InsetQuotes.h
index 18442fc7945cd0b4ff26f637734bb7505ac67e21..feb162b06d1ee5a404cc021f893fbec3f6158d63 100644 (file)
--- a/src/insets/InsetQuotes.h
+++ b/src/insets/InsetQuotes.h
@@ -85,7 +85,7 @@ public:
        int docbook(odocstream &, OutputParams const &) const;
 
        /// the string that is passed to the TOC
-       void textString(odocstream &) const;
+       void tocString(odocstream &) const;
 
        ///
        void validate(LaTeXFeatures &) const;

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index f0c45db39ce97d25d979eaea836263ae4b0a882a..282243e648079b2214dd9625cd745459fe1e4ab1 100644 (file)
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -115,7 +115,7 @@ int InsetRef::docbook(odocstream & os, OutputParams const & runparams) const
 }
 
 
-void InsetRef::textString(odocstream & os) const
+void InsetRef::tocString(odocstream & os) const
 {
        plaintext(os, OutputParams(0));
 }

diff --git a/src/insets/InsetRef.h b/src/insets/InsetRef.h
index 78ddbbdbeb44a6615c3e9d23efe0b0e26886c935..934681172bab76cc3e9102380a9ac89e0ccf0a5b 100644 (file)
--- a/src/insets/InsetRef.h
+++ b/src/insets/InsetRef.h
@@ -55,7 +55,7 @@ public:
        ///
        int docbook(odocstream &, OutputParams const &) const;
        /// the string that is passed to the TOC
-       void textString(odocstream &) const;
+       void tocString(odocstream &) const;
        ///
        void validate(LaTeXFeatures & features) const;
        ///

diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index d8cea9ceaa896baf599a21afeb530df1c5bbf456..f83880a2d60bc71783c84326c2ab3a4c3824f24f 100644 (file)
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -617,7 +617,7 @@ int InsetSpace::docbook(odocstream & os, OutputParams const &) const
 }
 
 
-void InsetSpace::textString(odocstream & os) const
+void InsetSpace::tocString(odocstream & os) const
 {
        plaintext(os, OutputParams(0));
 }

diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h
index 98074f18efca0ee435bf527992609873106fbe0c..7607b0932484663e8a33119932b9d908b865fe6f 100644 (file)
--- a/src/insets/InsetSpace.h
+++ b/src/insets/InsetSpace.h
@@ -117,7 +117,7 @@ private:
        ///
        int docbook(odocstream &, OutputParams const &) const;
        /// the string that is passed to the TOC
-       void textString(odocstream &) const;
+       void tocString(odocstream &) const;
        ///
        void edit(Cursor & cur, bool front,
                EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);

diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp
index 1dd92c5901a1d46a0f078fdfde7dfe8988a5afff..85db15d45273aaf9868c1996e16f23c9434835f1 100644 (file)
--- a/src/insets/InsetSpecialChar.cpp
+++ b/src/insets/InsetSpecialChar.cpp
@@ -287,7 +287,7 @@ int InsetSpecialChar::docbook(odocstream & os, OutputParams const &) const
 }
 
 
-void InsetSpecialChar::textString(odocstream & os) const
+void InsetSpecialChar::tocString(odocstream & os) const
 {
        plaintext(os, OutputParams(0));
 }

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