From 12f57a57bd58a7568206bc70700988f3d7cd0ee9 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Fri, 12 Jun 2009 16:11:33 +0000 Subject: [PATCH] The return value for xhtml() is not going to be needed. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30078 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/Inset.cpp | 3 +-- src/insets/Inset.h | 2 +- src/insets/InsetBibitem.cpp | 2 +- src/insets/InsetBibitem.h | 2 +- src/insets/InsetBibtex.cpp | 5 ++--- src/insets/InsetBibtex.h | 2 +- src/insets/InsetBox.cpp | 3 +-- src/insets/InsetBox.h | 2 +- src/insets/InsetBranch.cpp | 6 +++--- src/insets/InsetBranch.h | 2 +- src/insets/InsetCitation.cpp | 5 ++--- src/insets/InsetCitation.h | 2 +- src/insets/InsetCollapsable.cpp | 9 +++++---- src/insets/InsetCollapsable.h | 2 +- src/insets/InsetERT.cpp | 6 ------ src/insets/InsetERT.h | 2 +- src/insets/InsetHyperlink.cpp | 3 +-- src/insets/InsetHyperlink.h | 2 +- src/insets/InsetIndex.h | 4 +++- src/insets/InsetLabel.cpp | 7 +++---- src/insets/InsetLabel.h | 2 +- src/insets/InsetLine.cpp | 3 +-- src/insets/InsetLine.h | 2 +- src/insets/InsetNewline.cpp | 3 +-- src/insets/InsetNewline.h | 2 +- src/insets/InsetNewpage.cpp | 3 +-- src/insets/InsetNewpage.h | 2 +- src/insets/InsetNomencl.h | 4 ++++ src/insets/InsetNote.cpp | 6 +++--- src/insets/InsetNote.h | 2 +- src/insets/InsetOptArg.cpp | 6 ------ src/insets/InsetOptArg.h | 2 +- src/insets/InsetPhantom.cpp | 6 ------ src/insets/InsetPhantom.h | 4 ++-- src/insets/InsetQuotes.cpp | 4 ++-- src/insets/InsetQuotes.h | 2 +- src/insets/InsetSpace.cpp | 3 +-- src/insets/InsetSpace.h | 2 +- src/insets/InsetSpecialChar.cpp | 3 +-- src/insets/InsetSpecialChar.h | 2 +- src/insets/InsetText.cpp | 3 +-- src/insets/InsetText.h | 2 +- src/insets/InsetVSpace.cpp | 10 ++++------ src/insets/InsetVSpace.h | 2 +- src/insets/InsetWrap.h | 2 +- 45 files changed, 64 insertions(+), 89 deletions(-) diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp index daded4b9a9..906228a494 100644 --- a/src/insets/Inset.cpp +++ b/src/insets/Inset.cpp @@ -329,10 +329,9 @@ int Inset::docbook(odocstream &, OutputParams const &) const } -int Inset::xhtml(odocstream & od, OutputParams const &) const +void Inset::xhtml(odocstream & od, OutputParams const &) const { od << "[[Inset: " << from_ascii(insetName(lyxCode())) << "]]"; - return 0; } bool Inset::directWrite() const diff --git a/src/insets/Inset.h b/src/insets/Inset.h index 274cf65f6b..ba8dd18da8 100644 --- a/src/insets/Inset.h +++ b/src/insets/Inset.h @@ -296,7 +296,7 @@ public: /// docbook output virtual int docbook(odocstream & os, OutputParams const &) const; /// LyX HTML output - virtual int xhtml(odocstream & os, OutputParams const &) const; + virtual void xhtml(odocstream & os, OutputParams const &) const; /// the string that is passed to the TOC virtual void tocString(odocstream &) const {} diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp index fcd4c746c4..fe5c07be57 100644 --- a/src/insets/InsetBibitem.cpp +++ b/src/insets/InsetBibitem.cpp @@ -266,7 +266,7 @@ void InsetBibitem::updateLabels(ParIterator const &) } -int InsetBibitem::xhtml(odocstream & os, OutputParams const &) const +void InsetBibitem::xhtml(odocstream & os, OutputParams const &) const { os << ""; os << "" << bibLabel() << " "; diff --git a/src/insets/InsetBibitem.h b/src/insets/InsetBibitem.h index 4850f73a1f..07174c10df 100644 --- a/src/insets/InsetBibitem.h +++ b/src/insets/InsetBibitem.h @@ -61,7 +61,7 @@ private: /// int plaintext(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// virtual void fillWithBibKeys(BiblioInfo &, InsetIterator const &) const; /// Update the counter of this inset diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp index bb15688869..2f47b1b5e8 100644 --- a/src/insets/InsetBibtex.cpp +++ b/src/insets/InsetBibtex.cpp @@ -911,7 +911,7 @@ namespace { } -int InsetBibtex::xhtml(odocstream & os, OutputParams const &) const +void InsetBibtex::xhtml(odocstream & os, OutputParams const &) const { // We are going to collect all the citation keys used in the document, // getting them from the TOC. @@ -929,7 +929,7 @@ int InsetBibtex::xhtml(odocstream & os, OutputParams const &) const citekeys.push_back(*dit); } if (citekeys.empty()) - return 0; + return; sort(citekeys.begin(), citekeys.end()); unique(citekeys.begin(), citekeys.end()); // We now have a sorted, unique list of the keys used in this document. @@ -974,7 +974,6 @@ int InsetBibtex::xhtml(odocstream & os, OutputParams const &) const } os << "\n"; - return 0; } diff --git a/src/insets/InsetBibtex.h b/src/insets/InsetBibtex.h index c4cd812e3f..93bcfdead1 100644 --- a/src/insets/InsetBibtex.h +++ b/src/insets/InsetBibtex.h @@ -52,7 +52,7 @@ public: /// void validate(LaTeXFeatures &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// static ParamInfo const & findInfo(std::string const &); /// diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp index 1ca0aa718b..e1188ad43d 100644 --- a/src/insets/InsetBox.cpp +++ b/src/insets/InsetBox.cpp @@ -484,7 +484,7 @@ int InsetBox::docbook(odocstream & os, OutputParams const & runparams) const } -int InsetBox::xhtml(odocstream & os, OutputParams const & runparams) const +void InsetBox::xhtml(odocstream & os, OutputParams const & runparams) const { string style; if (!params_.width.empty()) @@ -498,7 +498,6 @@ int InsetBox::xhtml(odocstream & os, OutputParams const & runparams) const os << ">\n"; InsetText::xhtml(os, runparams); os << "\n"; - return 0; } diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h index c254fb6ea1..627dcbc0be 100644 --- a/src/insets/InsetBox.h +++ b/src/insets/InsetBox.h @@ -119,7 +119,7 @@ private: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// void validate(LaTeXFeatures &) const; /// diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp index f3dd34f5a5..ae5def6adc 100644 --- a/src/insets/InsetBranch.cpp +++ b/src/insets/InsetBranch.cpp @@ -235,10 +235,10 @@ int InsetBranch::docbook(odocstream & os, } -int InsetBranch::xhtml(odocstream & os, - OutputParams const & runparams) const +void InsetBranch::xhtml(odocstream & os, OutputParams const & rp) const { - return isBranchSelected() ? InsetText::xhtml(os, runparams) : 0; + if (isBranchSelected()) + InsetText::xhtml(os, rp); } diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h index 6285e458ee..8f8cc08665 100644 --- a/src/insets/InsetBranch.h +++ b/src/insets/InsetBranch.h @@ -74,7 +74,7 @@ private: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// void tocString(odocstream &) const; /// diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp index 7ecea9c9a0..7727f38445 100644 --- a/src/insets/InsetCitation.cpp +++ b/src/insets/InsetCitation.cpp @@ -504,12 +504,12 @@ int InsetCitation::docbook(odocstream & os, OutputParams const &) const } -int InsetCitation::xhtml(odocstream & os, OutputParams const &) const +void InsetCitation::xhtml(odocstream & os, OutputParams const &) const { BiblioInfo const & bi = buffer().masterBibInfo(); docstring const & keyList = getParam("key"); if (keyList.empty()) - return 0; + return; // FIXME We shuld do a better job outputing different things for the // different citation styles. For now, we use square brackets for every @@ -541,7 +541,6 @@ int InsetCitation::xhtml(odocstream & os, OutputParams const &) const if (!after.empty()) os << ", " << after; os << "]\n"; - return 0; } diff --git a/src/insets/InsetCitation.h b/src/insets/InsetCitation.h index 04cc480eb5..986f9fb34f 100644 --- a/src/insets/InsetCitation.h +++ b/src/insets/InsetCitation.h @@ -50,7 +50,7 @@ public: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// the string that is passed to the TOC void tocString(odocstream &) const; /// diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp index 618c551a03..da56179c0e 100644 --- a/src/insets/InsetCollapsable.cpp +++ b/src/insets/InsetCollapsable.cpp @@ -872,11 +872,13 @@ int InsetCollapsable::docbook(odocstream & os, OutputParams const & runparams) c } -int InsetCollapsable::xhtml(odocstream & os, OutputParams const & runparams) const +void InsetCollapsable::xhtml(odocstream & os, OutputParams const & runparams) const { InsetLayout const & il = getLayout(); - if (undefined()) - return InsetText::xhtml(os, runparams); + if (undefined()) { + InsetText::xhtml(os, runparams); + return; + } bool const opened = html::openTag(os, il.htmltag(), il.htmlattr()); if (!il.counter().empty()) { @@ -894,7 +896,6 @@ int InsetCollapsable::xhtml(odocstream & os, OutputParams const & runparams) con html::closeTag(os, il.htmlinnertag()); if (opened) html::closeTag(os, il.htmltag()); - return 0; } diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h index 654e28a7bf..7b3426be6a 100644 --- a/src/insets/InsetCollapsable.h +++ b/src/insets/InsetCollapsable.h @@ -146,7 +146,7 @@ public: /// It will rarely be right to call this from subclasses, due /// to the fact that it steps counters, etc. Instead, call /// InsetText::xhtml(). - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// void validate(LaTeXFeatures &) const; /// diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp index 5376c71f4d..bd59d14072 100644 --- a/src/insets/InsetERT.cpp +++ b/src/insets/InsetERT.cpp @@ -81,12 +81,6 @@ int InsetERT::plaintext(odocstream &, OutputParams const &) const } -int InsetERT::xhtml(odocstream &, OutputParams const &) const -{ - return 0; // do not output TeX code -} - - int InsetERT::docbook(odocstream & os, OutputParams const &) const { // FIXME can we do the same thing here as for LaTeX? diff --git a/src/insets/InsetERT.h b/src/insets/InsetERT.h index 5e7d2f1438..60651153ee 100644 --- a/src/insets/InsetERT.h +++ b/src/insets/InsetERT.h @@ -57,7 +57,7 @@ private: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const { return; } /// void validate(LaTeXFeatures &) const {} /// diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp index 0fb69a7cb4..e5ca7d6506 100644 --- a/src/insets/InsetHyperlink.cpp +++ b/src/insets/InsetHyperlink.cpp @@ -181,7 +181,7 @@ int InsetHyperlink::docbook(odocstream & os, OutputParams const &) const } -int InsetHyperlink::xhtml(odocstream & os, OutputParams const &) const +void InsetHyperlink::xhtml(odocstream & os, OutputParams const &) const { os << "" << getParam("name") << ""; - return 0; } diff --git a/src/insets/InsetHyperlink.h b/src/insets/InsetHyperlink.h index 8ae3ae717d..4d96b5dfb9 100644 --- a/src/insets/InsetHyperlink.h +++ b/src/insets/InsetHyperlink.h @@ -41,7 +41,7 @@ public: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// the string that is passed to the TOC void tocString(odocstream &) const; /// diff --git a/src/insets/InsetIndex.h b/src/insets/InsetIndex.h index 9e8511742a..0f4d52059d 100644 --- a/src/insets/InsetIndex.h +++ b/src/insets/InsetIndex.h @@ -58,7 +58,7 @@ private: int docbook(odocstream &, OutputParams const &) const; /// At the moment, this does nothing. See development/HTML.notes /// for some remarks on what could be done. - int xhtml(odocstream &, OutputParams const &) const { return 0; }; + void xhtml(odocstream &, OutputParams const &) const { return; } /// int latex(odocstream &, OutputParams const &) const; /// @@ -104,6 +104,8 @@ public: static bool isCompatibleCommand(std::string const & s); /// int latex(odocstream &, OutputParams const &) const; + /// Does nothing yet. + void xhtml(odocstream &, OutputParams const &) const { return; } /// void doDispatch(Cursor & cur, FuncRequest & cmd); /// diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp index 9de72d9701..1dfc82470b 100644 --- a/src/insets/InsetLabel.cpp +++ b/src/insets/InsetLabel.cpp @@ -23,6 +23,7 @@ #include "FuncStatus.h" #include "InsetIterator.h" #include "LyXFunc.h" +#include "output_xhtml.h" #include "ParIterator.h" #include "sgml.h" #include "Text.h" @@ -218,11 +219,9 @@ int InsetLabel::docbook(odocstream & os, OutputParams const & runparams) const } -int InsetLabel::xhtml(odocstream & os, OutputParams const & /*runparams*/) const +void InsetLabel::xhtml(odocstream & os, OutputParams const & /*runparams*/) const { - // FIXME Does this need to be escaped? - os << ""; - return 0; + os << ""; } } // namespace lyx diff --git a/src/insets/InsetLabel.h b/src/insets/InsetLabel.h index efafd82414..994546baf1 100644 --- a/src/insets/InsetLabel.h +++ b/src/insets/InsetLabel.h @@ -44,7 +44,7 @@ public: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// static ParamInfo const & findInfo(std::string const &); /// diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp index 07075bb7dc..1e868a11b5 100644 --- a/src/insets/InsetLine.cpp +++ b/src/insets/InsetLine.cpp @@ -85,10 +85,9 @@ int InsetLine::docbook(odocstream & os, OutputParams const &) const } -int InsetLine::xhtml(odocstream & os, OutputParams const &) const +void InsetLine::xhtml(odocstream & os, OutputParams const &) const { os << "
\n"; - return 0; } diff --git a/src/insets/InsetLine.h b/src/insets/InsetLine.h index b14c899b80..aae0449ea2 100644 --- a/src/insets/InsetLine.h +++ b/src/insets/InsetLine.h @@ -35,7 +35,7 @@ public: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// void read(Lexer & lex); /// diff --git a/src/insets/InsetNewline.cpp b/src/insets/InsetNewline.cpp index 263e9be936..7ba4b72a14 100644 --- a/src/insets/InsetNewline.cpp +++ b/src/insets/InsetNewline.cpp @@ -173,10 +173,9 @@ int InsetNewline::docbook(odocstream & os, OutputParams const &) const } -int InsetNewline::xhtml(odocstream & os, OutputParams const &) const +void InsetNewline::xhtml(odocstream & os, OutputParams const &) const { os << "
\n"; - return 0; } diff --git a/src/insets/InsetNewline.h b/src/insets/InsetNewline.h index 017d8f8201..1ba4b6173f 100644 --- a/src/insets/InsetNewline.h +++ b/src/insets/InsetNewline.h @@ -65,7 +65,7 @@ private: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// void read(Lexer & lex); /// diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp index ea71596c72..b5a55ebb84 100644 --- a/src/insets/InsetNewpage.cpp +++ b/src/insets/InsetNewpage.cpp @@ -247,10 +247,9 @@ int InsetNewpage::docbook(odocstream & os, OutputParams const &) const } -int InsetNewpage::xhtml(odocstream & os, OutputParams const &) const +void InsetNewpage::xhtml(odocstream & os, OutputParams const &) const { os << "
\n"; - return 0; } diff --git a/src/insets/InsetNewpage.h b/src/insets/InsetNewpage.h index 3d89cfe639..00b4a6fa0c 100644 --- a/src/insets/InsetNewpage.h +++ b/src/insets/InsetNewpage.h @@ -69,7 +69,7 @@ private: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// void read(Lexer & lex); /// diff --git a/src/insets/InsetNomencl.h b/src/insets/InsetNomencl.h index 5ebf4964d1..0737545648 100644 --- a/src/insets/InsetNomencl.h +++ b/src/insets/InsetNomencl.h @@ -39,6 +39,8 @@ public: InsetCode lyxCode() const { return NOMENCL_CODE; } /// int docbook(odocstream &, OutputParams const &) const; + /// Does nothing at the moment. + void xhtml(odocstream &, OutputParams const &) const { return; } /// int docbookGlossary(odocstream &) const; /// @@ -63,6 +65,8 @@ public: void validate(LaTeXFeatures & features) const; /// int docbook(odocstream &, OutputParams const &) const; + /// Does nothing at the moment. + void xhtml(odocstream &, OutputParams const &) const { return; } /// InsetCode lyxCode() const; /// diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp index 37ea6818bf..7c63bd84d3 100644 --- a/src/insets/InsetNote.cpp +++ b/src/insets/InsetNote.cpp @@ -326,12 +326,12 @@ int InsetNote::docbook(odocstream & os, OutputParams const & runparams_in) const } -int InsetNote::xhtml(odocstream & os, OutputParams const & rp) const +void InsetNote::xhtml(odocstream & os, OutputParams const & rp) const { if (params_.type == InsetNoteParams::Note) - return 0; + return; - return InsetCollapsable::xhtml(os, rp); + InsetCollapsable::xhtml(os, rp); } diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h index 0d3f8003fa..b78ed066a1 100644 --- a/src/insets/InsetNote.h +++ b/src/insets/InsetNote.h @@ -91,7 +91,7 @@ private: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// void validate(LaTeXFeatures &) const; /// diff --git a/src/insets/InsetOptArg.cpp b/src/insets/InsetOptArg.cpp index 879db43b68..d6a08f0bb3 100644 --- a/src/insets/InsetOptArg.cpp +++ b/src/insets/InsetOptArg.cpp @@ -57,12 +57,6 @@ int InsetOptArg::docbook(odocstream &, OutputParams const &) const } -int InsetOptArg::xhtml(odocstream &, OutputParams const &) const -{ - return 0; -} - - int InsetOptArg::latexOptional(odocstream & os, OutputParams const & runparams) const { diff --git a/src/insets/InsetOptArg.h b/src/insets/InsetOptArg.h index 3cbaf55f9a..26a01f9433 100644 --- a/src/insets/InsetOptArg.h +++ b/src/insets/InsetOptArg.h @@ -48,7 +48,7 @@ private: /// Standard DocBook output -- short-circuited int docbook(odocstream &, OutputParams const &) const; /// Standard XHTML output -- short-circuited - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const { return; } /// Write out to the .lyx file void write(std::ostream & os) const; /// should paragraph indendation be ommitted in any case? diff --git a/src/insets/InsetPhantom.cpp b/src/insets/InsetPhantom.cpp index abdc6c8de7..c20217c1b4 100644 --- a/src/insets/InsetPhantom.cpp +++ b/src/insets/InsetPhantom.cpp @@ -365,12 +365,6 @@ int InsetPhantom::docbook(odocstream & os, OutputParams const & runparams) const } -int InsetPhantom::xhtml(odocstream &, OutputParams const &) const -{ - return 0; // makes no sense for HTML -} - - docstring InsetPhantom::contextMenu(BufferView const &, int, int) const { return from_ascii("context-phantom"); diff --git a/src/insets/InsetPhantom.h b/src/insets/InsetPhantom.h index 9d95909209..d5df1fd2d5 100644 --- a/src/insets/InsetPhantom.h +++ b/src/insets/InsetPhantom.h @@ -83,8 +83,8 @@ private: int plaintext(odocstream &, OutputParams const &) const; /// int docbook(odocstream &, OutputParams const &) const; - /// Does nothing. - int xhtml(odocstream &, OutputParams const &) const; + /// Makes no sense fof XHTML. + void xhtml(odocstream &, OutputParams const &) const { return; } /// bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const; /// diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp index 30881e174e..3696182248 100644 --- a/src/insets/InsetQuotes.cpp +++ b/src/insets/InsetQuotes.cpp @@ -312,9 +312,9 @@ int InsetQuotes::docbook(odocstream & os, OutputParams const &) const } -int InsetQuotes::xhtml(odocstream & os, OutputParams const & op) const +void InsetQuotes::xhtml(odocstream & os, OutputParams const & op) const { - return docbook(os, op); + docbook(os, op); } diff --git a/src/insets/InsetQuotes.h b/src/insets/InsetQuotes.h index aaf32f79fb..258fe1bd99 100644 --- a/src/insets/InsetQuotes.h +++ b/src/insets/InsetQuotes.h @@ -84,7 +84,7 @@ public: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// the string that is passed to the TOC void tocString(odocstream &) const; diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp index 722c991275..c42d437503 100644 --- a/src/insets/InsetSpace.cpp +++ b/src/insets/InsetSpace.cpp @@ -680,7 +680,7 @@ int InsetSpace::docbook(odocstream & os, OutputParams const &) const } -int InsetSpace::xhtml(odocstream & os, OutputParams const &) const +void InsetSpace::xhtml(odocstream & os, OutputParams const &) const { switch (params_.kind) { case InsetSpaceParams::NORMAL: @@ -722,7 +722,6 @@ int InsetSpace::xhtml(odocstream & os, OutputParams const &) const // FIXME Probably we could do some sort of blank span? os << '\n'; } - return 0; } diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h index bc2d685d6d..db5e84db46 100644 --- a/src/insets/InsetSpace.h +++ b/src/insets/InsetSpace.h @@ -129,7 +129,7 @@ public: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// void validate(LaTeXFeatures & features) const; /// the string that is passed to the TOC diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp index b1ad2ce71c..f58e6c382c 100644 --- a/src/insets/InsetSpecialChar.cpp +++ b/src/insets/InsetSpecialChar.cpp @@ -291,7 +291,7 @@ int InsetSpecialChar::docbook(odocstream & os, OutputParams const &) const } -int InsetSpecialChar::xhtml(odocstream & os, OutputParams const &) const +void InsetSpecialChar::xhtml(odocstream & os, OutputParams const &) const { switch (kind_) { case HYPHENATION: @@ -313,7 +313,6 @@ int InsetSpecialChar::xhtml(odocstream & os, OutputParams const &) const os << '-'; break; } - return 0; } diff --git a/src/insets/InsetSpecialChar.h b/src/insets/InsetSpecialChar.h index 95af71eb1d..3dc47864cb 100644 --- a/src/insets/InsetSpecialChar.h +++ b/src/insets/InsetSpecialChar.h @@ -65,7 +65,7 @@ public: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// the string that is passed to the TOC void tocString(odocstream &) const; /// diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp index c991f31501..9676e45982 100644 --- a/src/insets/InsetText.cpp +++ b/src/insets/InsetText.cpp @@ -368,10 +368,9 @@ int InsetText::docbook(odocstream & os, OutputParams const & runparams) const } -int InsetText::xhtml(odocstream & os, OutputParams const & runparams) const +void InsetText::xhtml(odocstream & os, OutputParams const & runparams) const { xhtmlParagraphs(paragraphs(), buffer(), os, runparams); - return 0; } diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h index f2af57fb5f..482b5ca337 100644 --- a/src/insets/InsetText.h +++ b/src/insets/InsetText.h @@ -81,7 +81,7 @@ public: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// void validate(LaTeXFeatures & features) const; diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp index b26bda6402..24a26d10af 100644 --- a/src/insets/InsetVSpace.cpp +++ b/src/insets/InsetVSpace.cpp @@ -233,16 +233,14 @@ int InsetVSpace::docbook(odocstream & os, OutputParams const &) const } -int InsetVSpace::xhtml(odocstream & os, OutputParams const &) const +void InsetVSpace::xhtml(odocstream & os, OutputParams const &) const { string len = space_.asHTMLLength(); - if (len.empty()) { + if (len.empty()) // we didn't understand it os << "
\n"; - return 0; - } - os << "
\n"; - return 1; + else + os << "
\n"; } diff --git a/src/insets/InsetVSpace.h b/src/insets/InsetVSpace.h index a58578be43..92397ede32 100644 --- a/src/insets/InsetVSpace.h +++ b/src/insets/InsetVSpace.h @@ -51,7 +51,7 @@ private: /// int docbook(odocstream &, OutputParams const &) const; /// - int xhtml(odocstream &, OutputParams const &) const; + void xhtml(odocstream &, OutputParams const &) const; /// void read(Lexer & lex); /// diff --git a/src/insets/InsetWrap.h b/src/insets/InsetWrap.h index 1ad80c570d..17e3b2b7b1 100644 --- a/src/insets/InsetWrap.h +++ b/src/insets/InsetWrap.h @@ -78,7 +78,7 @@ private: bool showInsetDialog(BufferView *) const; /// bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const; - // Update the counters of this inset and of its contents + /// Update the counters of this inset and of its contents void updateLabels(ParIterator const &); /// void doDispatch(Cursor & cur, FuncRequest & cmd); -- 2.39.5