diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index fc458c572a..f9c0a8cb0d 100644 --- 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 48341f119c..ea8fbfc54a 100644 --- 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 2933e1b22c..f305139dbf 100644 --- 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 b608fd19cc..67fde95cf8 100644 --- 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 859ceba81f..48f51ada44 100644 --- 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 b0399d0898..b232b86afd 100644 --- 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 5bc513b259..7c54aefc30 100644 --- 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 96b3a71b2e..c6c40fe5d3 100644 --- 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 42c6240a03..6db2babd08 100644 --- 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 186b7567fc..43eee9065b 100644 --- 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 122266d808..d27b125414 100644 --- 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 18442fc794..feb162b06d 100644 --- 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 f0c45db39c..282243e648 100644 --- 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 78ddbbdbeb..934681172b 100644 --- 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 d8cea9ceaa..f83880a2d6 100644 --- 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 98074f18ef..7607b09324 100644 --- 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 1dd92c5901..85db15d452 100644 --- 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 d2e18d7c35..1f04c3d803 100644 --- 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