anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36889 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-12-15 01:34:04 +00:00
parent de1655f92b
commit 832d6cd7e1
20 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Paragraph.cpp
View File

@ -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 << " ";
}

4
src/insets/Inset.h
View File

@ -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

4
src/insets/InsetBranch.cpp
View File

@ -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);
}

2
src/insets/InsetBranch.h
View File

@ -73,7 +73,7 @@ private:
///
docstring xhtml(XHTMLStream &, OutputParams const &) const;
///
void tocString(odocstream &) const;
void toString(odocstream &) const;
///
void validate(LaTeXFeatures &) const;
///

2
src/insets/InsetCitation.cpp
View File

@ -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));
}

2
src/insets/InsetCitation.h
View File

@ -51,7 +51,7 @@ public:
///
docstring xhtml(XHTMLStream &, OutputParams const &) const;
///
void tocString(odocstream &) const;
void toString(odocstream &) const;
///
void validate(LaTeXFeatures &) const;
///

2
src/insets/InsetHyperlink.cpp
View File

@ -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));
}

2
src/insets/InsetHyperlink.h
View File

@ -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;
///

2
src/insets/InsetQuotes.cpp
View File

@ -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();
}

4
src/insets/InsetQuotes.h
View File

@ -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;

2
src/insets/InsetRef.cpp
View File

@ -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));
}

4
src/insets/InsetRef.h
View File

@ -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;
///

2
src/insets/InsetSpace.cpp
View File

@ -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));
}

4
src/insets/InsetSpace.h
View File

@ -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; }
///

2
src/insets/InsetSpecialChar.cpp
View File

@ -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));
}

4
src/insets/InsetSpecialChar.h
View File

@ -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

2
src/insets/InsetText.cpp
View File

@ -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);
}

4
src/insets/InsetText.h
View File

@ -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 &);
///

2
src/mathed/InsetMathHull.cpp
View File

@ -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));
}

4
src/mathed/InsetMathHull.h
View File

@ -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);