Extract toString method into InsetParams

diff --git a/src/Makefile.am b/src/Makefile.am
index 7dec8a1a6d4e20e6da50246aa20ee21e20e5b249..8627d6b8fb22f461c4a182c659578a432df232a9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -577,6 +577,7 @@ SOURCEFILESINSETS = \
        insets/InsetNewpage.cpp \
        insets/InsetNomencl.cpp \
        insets/InsetNote.cpp \
+       insets/InsetParams.cpp \
        insets/InsetPhantom.cpp \
        insets/InsetPreview.cpp \
        insets/InsetQuotes.cpp \

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 60291bf62ba228cfc6d52026e3a79377b7bc04a0..80518c7ddfd0a860e0108a53794a0befbaac0265 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -834,15 +834,6 @@ string InsetBox::contextMenuName() const
 }
 
 
-string InsetBoxParams::toString() const
-{
-       ostringstream data;
-       data << "box" << ' ';
-       write(data);
-       return data.str();
-}
-
-
 void InsetBox::string2params(string const & in, InsetBoxParams & params)
 {
        if (in.empty())

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index 6cc0db6bf3e4698ef4abb5725f23f6c597b62d70..16ebf4a79495e9bd7347583fbea4ab7ecc4a81b3 100644 (file)
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -31,7 +31,7 @@ public:
        ///
        void read(Lexer & lex) override;
        ///
-       std::string toString() const override;
+       std::string name() const override { return "box"; }
 
        ///
        std::string type;

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index baa6c587685b6f8e700c9f43213f7df253226178..80fd56afa280bc217c8a6118c821fa01c8302058 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -387,14 +387,6 @@ bool InsetBranch::isMacroScope() const
 }
 
 
-string InsetBranchParams::toString() const
-{
-       ostringstream data;
-       write(data);
-       return data.str();
-}
-
-
 void InsetBranch::string2params(string const & in, InsetBranchParams & params)
 {
        params = InsetBranchParams();

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index 87eb71ff917a945a0863537a9688a4638b5f349a..e7b9a508880d576984ded05844090c3de0d269f1 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -28,8 +28,6 @@ public:
        ///
        void read(Lexer & lex) override;
        ///
-       std::string toString() const override;
-       ///
        docstring branch;
        ///
        bool inverted;

diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index 4ea716f9c451d5e2783d789b650fe3cc5139229e..f74f1ee40cfa536850da9a8b02262f4736ad70aa 100644 (file)
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -406,6 +406,12 @@ void InsetCommandParams::Write(ostream & os, Buffer const * buffer) const
 }
 
 
+string InsetCommandParams::name() const
+{
+       return insetName(code());
+}
+
+
 bool InsetCommandParams::writeEmptyOptional(ParamInfo::const_iterator ci) const
 {
        LASSERT(ci->isOptional(), return false);
@@ -604,16 +610,6 @@ docstring InsetCommandParams::getFirstNonOptParam() const
 }
 
 
-string InsetCommandParams::toString() const
-{
-       ostringstream data;
-       data << insetName(code()) << ' ';
-       write(data);
-       data << "\\end_inset\n";
-       return data.str();
-}
-
-
 docstring const & InsetCommandParams::operator[](string const & name) const
 {
        static const docstring dummy;

diff --git a/src/insets/InsetCommandParams.h b/src/insets/InsetCommandParams.h
index a7656dc4fc0dd18ef244c5f1f28440988739bbad..cd4d76a6c64a6efeebf45a6940c65a24ae7c633b 100644 (file)
--- a/src/insets/InsetCommandParams.h
+++ b/src/insets/InsetCommandParams.h
@@ -137,7 +137,8 @@ public:
        ///
        void Write(std::ostream & os, Buffer const * buf) const;
        ///
-       std::string toString() const override;
+       std::string name() const override;
+       bool writeEndInset() const override { return true; }
        /// Build the complete LaTeX command
        docstring getCommand(OutputParams const &) const;
        /// Return the command name

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 00eb1d04057eec937833e3fca99f4d218e9522f8..f7549544664759273b5c673875d9bebb2fef1ef5 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -207,15 +207,6 @@ void InsetERTParams::read(Lexer & lex)
 }
 
 
-string InsetERTParams::toString() const
-{
-       ostringstream data;
-       data << "ert" << ' ';
-       write(data);
-       return data.str();
-}
-
-
 docstring InsetERT::xhtml(XMLStream &, OutputParams const &) const
 {
        return docstring();

diff --git a/src/insets/InsetERT.h b/src/insets/InsetERT.h
index 57a8c4ed0ed8b6678076b0772ca6fa2d665a7d08..6656a99d12051ae32d221e85a089e1d8c3a5da5d 100644 (file)
--- a/src/insets/InsetERT.h
+++ b/src/insets/InsetERT.h
@@ -28,7 +28,7 @@ struct InsetERTParams : public InsetParams {
        ///
        void read(Lexer & lex) override;
        ///
-       std::string toString() const override;
+       std::string name() const override { return "ert"; }
        ///
        CollapseStatus status_;
 };

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index 42918ec81dce85ab5f79ac727664c84168e85c48..9dd0fa2690e1904e0e97c76c26acfef79568e858 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -934,13 +934,4 @@ void InsetExternal::string2params(string const & in, InsetExternalParams & param
 }
 
 
-string InsetExternalParams::toString() const
-{
-       ostringstream data;
-       data << "external" << ' ';
-       write(data);
-       data << "\\end_inset\n";
-       return data.str();
-}
-
 } // namespace lyx

diff --git a/src/insets/InsetExternal.h b/src/insets/InsetExternal.h
index 8d233c80b748cf4a6289546b9cf251dedf26e345..af4c496550006f6dbd50082fb3bc8a427810ac94 100644 (file)
--- a/src/insets/InsetExternal.h
+++ b/src/insets/InsetExternal.h
@@ -53,7 +53,8 @@ public:
 
        void write(std::ostream &) const override;
        void read(Lexer &) override;
-       std::string toString() const override;
+       std::string name() const override { return "external"; }
+       bool writeEndInset() const override { return true; }
 
        Buffer const * buffer() { return buffer_; }
        void setBuffer(Buffer const * b) { buffer_ = b; }

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index b6120ddd986c5c943c197b513640269ed15af369..11b349256f4804cfa5ce65b53d1ead26f904b6cb 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -967,12 +967,4 @@ void InsetFloat::string2params(string const & in, InsetFloatParams & params)
 }
 
 
-string InsetFloatParams::toString() const
-{
-       ostringstream data;
-       write(data);
-       return data.str();
-}
-
-
 } // namespace lyx

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index 9a043b5babb9b0ec97d7952b240e721bcc1138f3..58ac723a0a0147c745ba566812f8dbb024f52c58 100644 (file)
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -32,8 +32,6 @@ public:
        ///
        void read(Lexer & lex) override;
        ///
-       std::string toString() const override;
-       ///
        std::string type;
        ///
        std::string placement;

diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp
index c4de6335528e67cb5563f64c9cad44e28a33969d..60db34490eccf6fc21526ef6c8cc8417ced873a5 100644 (file)
--- a/src/insets/InsetGraphicsParams.cpp
+++ b/src/insets/InsetGraphicsParams.cpp
@@ -254,13 +254,9 @@ bool InsetGraphicsParams::read(Lexer & lex, string const & token, bool allowOrig
 }
 
 
-string InsetGraphicsParams::toString() const
+void InsetGraphicsParams::read(Lexer & lex)
 {
-       ostringstream data;
-       data << "graphics" << ' ';
-       write(data);
-       data << "\\end_inset\n";
-       return data.str();
+       // TODO
 }
 
 

diff --git a/src/insets/InsetGraphicsParams.h b/src/insets/InsetGraphicsParams.h
index be3fae8a14bd6b48c9634b2f0c67073e68241302..2315459edf763ce4fa3099193ecd287b14a6457a 100644 (file)
--- a/src/insets/InsetGraphicsParams.h
+++ b/src/insets/InsetGraphicsParams.h
@@ -30,7 +30,7 @@ class Buffer;
 
 
 /// This class holds all the parameters needed by insetGraphics.
-class InsetGraphicsParams
+class InsetGraphicsParams : public InsetParams
 {
 public:
        /// Image filename.
@@ -78,11 +78,14 @@ public:
        InsetGraphicsParams & operator=(InsetGraphicsParams const &);
        /// Save the parameters in the LyX format stream.
        /// Buffer is needed to figure out if a figure is embedded.
-       void write(std::ostream & os) const;
+       void write(std::ostream & os) const override;
        /// If the token belongs to our parameters, read it.
        bool read(Lexer & lex, std::string const & token, bool allowOrigin);
+       void read(Lexer & lex) override;
        ///
-       std::string toString() const;
+       std::string name() const override { return "graphics"; }
+       ///
+       bool writeEndInset() const override { return true; }
        /// convert
        // Only a subset of InsetGraphicsParams is needed for display purposes.
        // This function also interrogates lyxrc to ascertain whether

diff --git a/src/insets/InsetIPAMacro.cpp b/src/insets/InsetIPAMacro.cpp
index 1da5e295995f94f9d3760385b6ed09bc91808ae6..d908349fc86fbab8e170e9d8dbed0f39a374eb03 100644 (file)
--- a/src/insets/InsetIPAMacro.cpp
+++ b/src/insets/InsetIPAMacro.cpp
@@ -340,15 +340,6 @@ docstring InsetIPADeco::toolTip(BufferView const &, int, int) const
 }
 
 
-string InsetIPADecoParams::toString() const
-{
-       ostringstream data;
-       data << "IPADeco" << ' ';
-       write(data);
-       return data.str();
-}
-
-
 void InsetIPADeco::string2params(string const & in, InsetIPADecoParams & params)
 {
        params = InsetIPADecoParams();

diff --git a/src/insets/InsetIPAMacro.h b/src/insets/InsetIPAMacro.h
index 41dd3bf405f4c2433bfd0588597e4aa40e4a66e9..6627539319e22cfcfd61ead9c86bd1078b020321 100644 (file)
--- a/src/insets/InsetIPAMacro.h
+++ b/src/insets/InsetIPAMacro.h
@@ -35,7 +35,7 @@ public:
        ///
        void read(Lexer & lex) override;
        ///
-       std::string toString() const override;
+       std::string name() const override { return "IPADeco"; }
        ///
        Type type;
 };

diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index 4deae0eba304e245e919e3bdc90ba82557db4b09..c076700ad99b5b6a14f96eae380bd2e8f3c4690a 100644 (file)
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -520,15 +520,6 @@ void InsetIndex::read(Lexer & lex)
 }
 
 
-string InsetIndexParams::toString() const
-{
-       ostringstream data;
-       data << "index";
-       write(data);
-       return data.str();
-}
-
-
 void InsetIndex::string2params(string const & in, InsetIndexParams & params)
 {
        params = InsetIndexParams();

diff --git a/src/insets/InsetIndex.h b/src/insets/InsetIndex.h
index c2f23a610c1b995eb416e536a1b9997447efe03f..7c0cb60753bb2794443cb85df1b6d554f4da374a 100644 (file)
--- a/src/insets/InsetIndex.h
+++ b/src/insets/InsetIndex.h
@@ -29,7 +29,7 @@ public:
        ///
        void read(Lexer & lex) override;
        ///
-       std::string toString() const override;
+       std::string name() const override { return "index"; }
 
        docstring index;
 };

diff --git a/src/insets/InsetListingsParams.cpp b/src/insets/InsetListingsParams.cpp
index ab8a0573c36261305321ed9efce2e0eb70fbc0b6..8ffb4387974b8be06fd58b4275c4abbfecc2c3b6 100644 (file)
--- a/src/insets/InsetListingsParams.cpp
+++ b/src/insets/InsetListingsParams.cpp
@@ -1006,15 +1006,6 @@ void InsetListingsParams::read(Lexer & lex)
 }
 
 
-string InsetListingsParams::toString() const
-{
-       ostringstream data;
-       data << "listings" << ' ';
-       write(data);
-       return data.str();
-}
-
-
 string InsetListingsParams::params(string const & sep) const
 {
        string par;

diff --git a/src/insets/InsetListingsParams.h b/src/insets/InsetListingsParams.h
index 6f008b88653e9c680fe4bfc4206a95067b3ae312..f2d43733e7d7022cc3f61de286f259b0c693c85b 100644 (file)
--- a/src/insets/InsetListingsParams.h
+++ b/src/insets/InsetListingsParams.h
@@ -34,7 +34,7 @@ public:
        void read(Lexer &) override;
 
        ///
-       std::string toString() const override;
+       std::string name() const override { return "listings"; }
 
        /// valid parameter string
        std::string params(std::string const & sep=",") const;

diff --git a/src/insets/InsetNewline.cpp b/src/insets/InsetNewline.cpp
index 983457dd533313d3323d468f4a4f5b318edc5444..b7c83cb5bdde05e364728ee47d30e5c8ecc0887f 100644 (file)
--- a/src/insets/InsetNewline.cpp
+++ b/src/insets/InsetNewline.cpp
@@ -281,13 +281,4 @@ void InsetNewline::string2params(string const & in, InsetNewlineParams & params)
 }
 
 
-string InsetNewlineParams::toString() const
-{
-       ostringstream data;
-       data << "newline" << ' ';
-       write(data);
-       return data.str();
-}
-
-
 } // namespace lyx

diff --git a/src/insets/InsetNewline.h b/src/insets/InsetNewline.h
index 82667f524050369243bd06c9476234744ae1ab22..9b57e772c301630d5e65f0083d890949373485b9 100644 (file)
--- a/src/insets/InsetNewline.h
+++ b/src/insets/InsetNewline.h
@@ -34,7 +34,7 @@ public:
        ///
        void read(Lexer & lex) override;
        ///
-       std::string toString() const override;
+       std::string name() const override { return "newline"; }
        ///
        Kind kind;
 };

diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp
index 6ab41fa3cedcc082ec97d192f3a4657bcc3078b3..6a33b8469f10b561df8e027aeb50b81b94335cf0 100644 (file)
--- a/src/insets/InsetNewpage.cpp
+++ b/src/insets/InsetNewpage.cpp
@@ -351,13 +351,4 @@ void InsetNewpage::string2params(string const & in, InsetNewpageParams & params)
 }
 
 
-string InsetNewpageParams::toString() const
-{
-       ostringstream data;
-       data << "newpage" << ' ';
-       write(data);
-       return data.str();
-}
-
-
 } // namespace lyx

diff --git a/src/insets/InsetNewpage.h b/src/insets/InsetNewpage.h
index 55df6b8b96c3a85a3e3c2574c9e74a5eb1f9b069..72038e5ffe79d4a7796ee630c125bf1e7a4776b5 100644 (file)
--- a/src/insets/InsetNewpage.h
+++ b/src/insets/InsetNewpage.h
@@ -40,7 +40,7 @@ public:
        ///
        void read(Lexer & lex) override;
        ///
-       std::string toString() const override;
+       std::string name() const override { return "newpage"; }
        ///
        Kind kind;
 };

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index c2ab7e003f58a506963e66e45d74fcb8d3b26529..b0afd7d282cdd2d1f058f9f012f0326cd9843058 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -338,15 +338,6 @@ FontInfo InsetNote::getFont() const
 }
 
 
-string InsetNoteParams::toString() const
-{
-       ostringstream data;
-       data << "note" << ' ';
-       write(data);
-       return data.str();
-}
-
-
 void InsetNote::string2params(string const & in, InsetNoteParams & params)
 {
        params = InsetNoteParams();

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index eb99a139e003f7012be76a91fa8aa4ccff70da9f..dca27d0d6a634ffada30ce9eb70b68a62d67bf91 100644 (file)
--- a/src/insets/InsetNote.h
+++ b/src/insets/InsetNote.h
@@ -32,7 +32,7 @@ public:
        ///
        void read(Lexer & lex) override;
        ///
-       std::string toString() const override;
+       std::string name() const override { return "note"; }
 
        Type type;
 };

diff --git a/src/insets/InsetParams.cpp b/src/insets/InsetParams.cpp
new file mode 100644 (file)
index 0000000..d5b2849
--- /dev/null
+++ b/src/insets/InsetParams.cpp
@@ -0,0 +1,33 @@
+/**
+ * \file InsetParams.cpp
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Yuriy Skalko
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
+
+#include "InsetParams.h"
+
+#include <sstream>
+
+using namespace std;
+
+namespace lyx {
+
+
+string InsetParams::toString() const
+{
+       ostringstream data;
+       data << name() << ' ';
+       write(data);
+       if (writeEndInset())
+               data << "\\end_inset\n";
+       return data.str();
+}
+
+
+} // namespace lyx

diff --git a/src/insets/InsetParams.h b/src/insets/InsetParams.h
index 81866cb33ab862ea965bc195cf9549531edcb1cd..c6709b4de529318056fcbb0d3e34bcbac3dd0dc3 100644 (file)
--- a/src/insets/InsetParams.h
+++ b/src/insets/InsetParams.h
@@ -30,7 +30,10 @@ public:
        ///
        virtual void read(Lexer & lex) = 0;
        ///
-       virtual std::string toString() const = 0;
+       std::string toString() const;
+protected:
+       virtual std::string name() const { return std::string(); }
+       virtual bool writeEndInset() const { return false; }
 };
 
 

diff --git a/src/insets/InsetPhantom.cpp b/src/insets/InsetPhantom.cpp
index 61d41ca2b2230678b7a1c82569a2ca535f8be8e6..4a40a4238cab2c40b7d8c295bf94d0e49db9600a 100644 (file)
--- a/src/insets/InsetPhantom.cpp
+++ b/src/insets/InsetPhantom.cpp
@@ -362,15 +362,6 @@ string InsetPhantom::contextMenuName() const
 }
 
 
-string InsetPhantomParams::toString() const
-{
-       ostringstream data;
-       data << "phantom" << ' ';
-       write(data);
-       return data.str();
-}
-
-
 void InsetPhantom::string2params(string const & in, InsetPhantomParams & params)
 {
        params = InsetPhantomParams();

diff --git a/src/insets/InsetPhantom.h b/src/insets/InsetPhantom.h
index 4d31099b031e1c295b2b8a81b3b1e341a30a98ca..ebfe747c3f77f2fb82eb69171164fbdb1c912165 100644 (file)
--- a/src/insets/InsetPhantom.h
+++ b/src/insets/InsetPhantom.h
@@ -32,7 +32,7 @@ public:
        ///
        void read(Lexer & lex) override;
        ///
-       std::string toString() const override;
+       std::string name() const override { return "phantom"; }
        Type type;
 };
 

diff --git a/src/insets/InsetScript.cpp b/src/insets/InsetScript.cpp
index 4a9ed85ee84512c590cc6626ea26aa7f2c53542c..4eb10fc2c3fc08bf6931174e1774c08cb73c8eba 100644 (file)
--- a/src/insets/InsetScript.cpp
+++ b/src/insets/InsetScript.cpp
@@ -378,15 +378,6 @@ string InsetScript::contextMenuName() const
 }
 
 
-string InsetScriptParams::toString() const
-{
-       ostringstream data;
-       data << "script ";
-       write(data);
-       return data.str();
-}
-
-
 void InsetScript::string2params(string const & in, InsetScriptParams & params)
 {
        params = InsetScriptParams();

diff --git a/src/insets/InsetScript.h b/src/insets/InsetScript.h
index 516f40fc1419ba5dcb1a743b82921e851da79cdd..612dcb025e143d0ab332bb6dc6f02f6c374867a2 100644 (file)
--- a/src/insets/InsetScript.h
+++ b/src/insets/InsetScript.h
@@ -32,7 +32,7 @@ public:
        ///
        void read(Lexer & lex) override;
        ///
-       std::string toString() const override;
+       std::string name() const override { return "script"; }
        ///
        int shift(FontInfo const & font) const;
        ///

diff --git a/src/insets/InsetSeparator.cpp b/src/insets/InsetSeparator.cpp
index 5d6b71f7342db0ab9ba467f2d1e38b2b95f92edf..fdfd4157c8e28707008111353e43db5c9d4397f8 100644 (file)
--- a/src/insets/InsetSeparator.cpp
+++ b/src/insets/InsetSeparator.cpp
@@ -302,13 +302,4 @@ void InsetSeparator::string2params(string const & in, InsetSeparatorParams & par
 }
 
 
-string InsetSeparatorParams::toString() const
-{
-       ostringstream data;
-       data << "separator" << ' ';
-       write(data);
-       return data.str();
-}
-
-
 } // namespace lyx

diff --git a/src/insets/InsetSeparator.h b/src/insets/InsetSeparator.h
index b930a2ada2c8dfcbd15f5e268834ea124185c705..cf6861f211fae5be36e22c04c39089ba0668afa1 100644 (file)
--- a/src/insets/InsetSeparator.h
+++ b/src/insets/InsetSeparator.h
@@ -33,7 +33,7 @@ public:
        ///
        void read(Lexer & lex) override;
        ///
-       std::string toString() const override;
+       std::string name() const override { return "separator"; }
 
        Kind kind;
 };

diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index 4f9ba96e5910dfae0c722c48790b002d0309b253..a9f4dc73c649a5d28be6557cf7decac602b45843 100644 (file)
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -946,15 +946,4 @@ void InsetSpace::string2params(string const & in, InsetSpaceParams & params)
 }
 
 
-string InsetSpaceParams::toString() const
-{
-       ostringstream data;
-       if (math)
-               data << "math";
-       data << "space" << ' ';
-       write(data);
-       return data.str();
-}
-
-
 } // namespace lyx

diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h
index 44f6a5e61e871b38dd705c7389f9ed6d151922e0..98948704a49c3a33c4c3e96dc2df810cf2c72db9 100644 (file)
--- a/src/insets/InsetSpace.h
+++ b/src/insets/InsetSpace.h
@@ -81,7 +81,7 @@ struct InsetSpaceParams : public InsetParams {
        ///
        void read(Lexer & lex) override;
        ///
-       std::string toString() const override;
+       std::string name() const override { return math ? "mathspace" : "space"; }
        ///
        Kind kind;
        ///

diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index a96a83c5016e2f5dfd768051719c53c150d3d895..7174430c1e58127ece8353e69a4d9e99c6d7138d 100644 (file)
--- a/src/insets/InsetVSpace.cpp
+++ b/src/insets/InsetVSpace.cpp
@@ -271,13 +271,4 @@ void InsetVSpaceParams::read(Lexer & lex)
 }
 
 
-string InsetVSpaceParams::toString() const
-{
-       ostringstream data;
-       data << "vspace" << ' ';
-       write(data);
-       return data.str();
-}
-
-
 } // namespace lyx

diff --git a/src/insets/InsetVSpace.h b/src/insets/InsetVSpace.h
index 0022d224d87c3e91154f5a215e4a01503d782823..55b31d6904acc2313f5a91e9a76c6ec8202263e1 100644 (file)
--- a/src/insets/InsetVSpace.h
+++ b/src/insets/InsetVSpace.h
@@ -27,7 +27,7 @@ struct InsetVSpaceParams : public InsetParams {
        ///
        void read(Lexer & lex) override;
        ///
-       std::string toString() const override;
+       std::string name() const override { return "vspace"; }
        ///
        VSpace space_;
 };

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index d70f8818da67a38665e03657d3e9c8d73174a85f..9400bf85d9dbab09306c787ac609b2d36d3e8a04 100644 (file)
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -268,13 +268,4 @@ void InsetWrap::string2params(string const & in, InsetWrapParams & params)
 }
 
 
-string InsetWrapParams::toString() const
-{
-       ostringstream data;
-       data << "wrap" << ' ';
-       write(data);
-       return data.str();
-}
-
-
 } // namespace lyx

diff --git a/src/insets/InsetWrap.h b/src/insets/InsetWrap.h
index bf65db4e58766eab2f630d0dc7de04b373c64feb..795eb8b21f9c3ca310990fe429c9dbff0fbb3008 100644 (file)
--- a/src/insets/InsetWrap.h
+++ b/src/insets/InsetWrap.h
@@ -27,7 +27,7 @@ public:
        ///
        void read(Lexer &) override;
        ///
-       std::string toString() const override;
+       std::string name() const override { return "wrap"; }
        ///
        std::string type;
        ///