remove commented same_id functions, and also remove some const_casts

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

diff --git a/src/ChangeLog b/src/ChangeLog
index ed0d51c2b32212e2124b7a733eda1f5caad7732f..3db57c1dc55bc20db307f33268fcf6869f41df94 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-29  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * tabular.[Ch]: delete commented same_id functions
+
 2003-05-28  John Levon  <levon@movementarian.org>
 
        * lyxfunc.C: fix LFUN_ESCAPE (bug 1055)

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 36f27bd28b03865f55588a38c4ad384dba8ed740..bcec3e7810d73da85f697c7342b9bdda47e0b502 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,21 @@
+2003-05-29  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * insetwrap.C (clone): remove const_cast
+
+       * insetnote.C (clone): remove const_cast
+
+       * insetminipage.C (clone): remove const_cast
+
+       * insetmarginal.C (clone): remove const_cast
+
+       * insetfoot.C (clone): remove const_cast
+
+       * insetfloat.C (clone): remove const_cast
+
+       * insetert.C (clone): remove const_cast
+
+       * delete commented same_id functions from a lot of files. 
+
 2003-05-28  John Levon  <levon@movementarian.org>
 
        * insetcite.C:

diff --git a/src/insets/inset.C b/src/insets/inset.C
index 700121dc5aaeedb59e3abfb987da3436dab2e819..f708b80bd991f5d352755ec3631256a7d644187f 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -47,18 +47,6 @@ Inset::Inset(Inset const & in)
 }
 
 
-// Inset::Inset(Inset const & in, bool same_id)
-//     : InsetBase(),
-//     top_x(0), top_baseline(0), scx(0), owner_(0),
-//     name_(in.name_), background_color_(in.background_color_)
-// {
-//     if (same_id)
-//             id_ = in.id();
-//     else
-//             id_ = inset_id++;
-// }
-
-
 bool Inset::directWrite() const
 {
        return false;

diff --git a/src/insets/inset.h b/src/insets/inset.h
index 14a698eebcd7e3e0eece0989d562ffed5ca08f1f..4cbf3e471938bb963e15c011cb5b945dbd11526e 100644 (file)
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -160,8 +160,6 @@ public:
        ///
        Inset(Inset const & in);
        ///
-       //Inset(Inset const & in, bool same_id);
-       ///
        virtual void dimension(BufferView *, LyXFont const &, Dimension &) const = 0;
        ///
        int ascent(BufferView *, LyXFont const &) const;
@@ -212,8 +210,6 @@ public:
 
        ///
        virtual Inset * clone(Buffer const &) const = 0;
-       ///
-       //virtual Inset * clone(Buffer const &, bool same_ids) const = 0;
 
        /// returns true to override begin and end inset in file
        virtual bool directWrite() const;

diff --git a/src/insets/insetbibitem.h b/src/insets/insetbibitem.h
index d37c9a07b852d2dea9343babd85488b56fe7aae1..637cd11f337c6d40a0c6f0c68717761260506641 100644 (file)
--- a/src/insets/insetbibitem.h
+++ b/src/insets/insetbibitem.h
@@ -31,8 +31,6 @@ public:
        ///
        Inset * clone(Buffer const &) const;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-       ///
        virtual dispatch_result localDispatch(FuncRequest const & cmd);
        /** Currently \bibitem is used as a LyX2.x command,
            so we need this method.

diff --git a/src/insets/insetbibtex.h b/src/insets/insetbibtex.h
index f14428fc2dababced0cf864db711829a4b4f0f2e..247c74a35169877257baf8e8e4bce4aa01d7b712 100644 (file)
--- a/src/insets/insetbibtex.h
+++ b/src/insets/insetbibtex.h
@@ -25,17 +25,11 @@ public:
        ///
        InsetBibtex(InsetCommandParams const &);
        ///
-       //InsetBibtex(InsetCommandParams const &, bool same_id);
-       ///
        ~InsetBibtex();
        ///
        Inset * clone(Buffer const &) const {
                return new InsetBibtex(params());
        }
-       ///
-       //Inset * clone(Buffer const &, bool same_id) const {
-       //      return new InsetBibtex(params(), same_id);
-       //}
        /// small wrapper for the time being
        virtual dispatch_result localDispatch(FuncRequest const & cmd);
        ///

diff --git a/src/insets/insetcite.h b/src/insets/insetcite.h
index b9c47ac4a0df63ecc30aaa7bf4f0709a45b7a31e..2be5f686e232df913ffef6bef4d62b13236a02ea 100644 (file)
--- a/src/insets/insetcite.h
+++ b/src/insets/insetcite.h
@@ -23,18 +23,12 @@ public:
        ///
        InsetCitation(InsetCommandParams const &);
        ///
-       //InsetCitation(InsetCommandParams const &, bool same_id);
-       ///
        ~InsetCitation();
        ///
        Inset * clone(Buffer const &) const {
                return new InsetCitation(params());
        }
        ///
-       //Inset * clone(Buffer const &, bool same_id) const {
-       //      return new InsetCitation(params(), same_id);
-       //}
-       ///
        string const getScreenLabel(Buffer const *) const;
        ///
        EDITABLE editable() const { return IS_EDITABLE; }

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 89f9a82de3bea2fb1edb3968fc13a54c50efd222..8d62008e0807f4ce8155fea707dbfde051771a25 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -71,21 +71,6 @@ InsetCollapsable::InsetCollapsable(InsetCollapsable const & in)
 }
 
 
-// InsetCollapsable::InsetCollapsable(InsetCollapsable const & in, bool same_id)
-//     : UpdatableInset(in, same_id), collapsed_(in.collapsed_),
-//       framecolor(in.framecolor), labelfont(in.labelfont), inset(in.inset),
-//       button_length(0), button_top_y(0), button_bottom_y(0),
-//       label(in.label),
-// #if 0
-//       autocollapse(in.autocollapse),
-// #endif
-//       oldWidth(0), in_update(false), first_after_edit(false)
-// {
-//     inset.init(&(in.inset), same_id);
-//     inset.setOwner(this);
-// }
-
-
 bool InsetCollapsable::insertInset(BufferView * bv, Inset * in)
 {
        if (!insetAllowed(in->lyxCode())) {

diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h
index 7691845910b2d7054d7e7be5f8d6d08903e4ed1f..b733d9ec6dfd74eecb6a30a659fcbf56b520be14 100644 (file)
--- a/src/insets/insetcollapsable.h
+++ b/src/insets/insetcollapsable.h
@@ -41,8 +41,6 @@ public:
        ///
        InsetCollapsable(InsetCollapsable const & in);
        ///
-       //InsetCollapsable(InsetCollapsable const & in, bool same_id);
-       ///
        void read(Buffer const *, LyXLex &);
        ///
        void write(Buffer const *, std::ostream &) const;

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index 286cd9736d02df0ff83bf936f3e684578e2d507e..be3015e65b313fedb9910fcd74fcac870873bdd2 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -33,9 +33,6 @@ public:
        explicit
        InsetCommand(InsetCommandParams const &);
        ///
-       //explicit
-       //InsetCommand(InsetCommandParams const &, bool same_id);
-       ///
        void write(Buffer const *, std::ostream & os) const
                { p_.write(os); }
        ///

diff --git a/src/insets/insetenv.C b/src/insets/insetenv.C
index aeeb5f07c5b7362cf48521aefa2f1a3e38aaf26b..7a5215af55c0dc77e0930a7b6351cf454215c7d7 100644 (file)
--- a/src/insets/insetenv.C
+++ b/src/insets/insetenv.C
@@ -40,23 +40,12 @@ InsetEnvironment::InsetEnvironment(InsetEnvironment const & in)
 {}
 
 
-// InsetEnvironment::InsetEnvironment(InsetEnvironment const & in, bool same_id)
-//     : InsetText(in, same_id), layout_(in.layout_)
-// {}
-
-
 Inset * InsetEnvironment::clone(Buffer const &) const
 {
        return new InsetEnvironment(*this);
 }
 
 
-// Inset * InsetEnvironment::clone(Buffer const &, bool same_id) const
-// {
-//     return new InsetEnvironment(*this, same_id);
-// }
-
-
 void InsetEnvironment::write(Buffer const * buf, ostream & os) const
 {
        os << "Environment " << getInsetName() << "\n";

diff --git a/src/insets/insetenv.h b/src/insets/insetenv.h
index b8d55a9d4fed0d4cf7181b6fa19046d86e275cea..fab8a56fd1814947aa08b420dfee589bf8d9f36b 100644 (file)
--- a/src/insets/insetenv.h
+++ b/src/insets/insetenv.h
@@ -22,16 +22,12 @@ public:
        ///
        InsetEnvironment(InsetEnvironment const &);
        ///
-       //InsetEnvironment(InsetEnvironment const &, bool same_id);
-       ///
        void write(Buffer const * buf, std::ostream & os) const;
        ///
        void read(Buffer const * buf, LyXLex & lex);
        ///
        Inset * clone(Buffer const &) const;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-       ///
        Inset::Code lyxCode() const { return Inset::ENVIRONMENT_CODE; }
        ///
        int latex(Buffer const *, std::ostream &,

diff --git a/src/insets/inseterror.h b/src/insets/inseterror.h
index 4576837bb6819c5c6aff430f6f500b95568b3da8..9dadbee3a3ebd856a176c95fd1a5dcc696c86944 100644 (file)
--- a/src/insets/inseterror.h
+++ b/src/insets/inseterror.h
@@ -26,9 +26,6 @@ public:
        explicit
        InsetError(string const &);
        ///
-       //explicit
-       //InsetError(string const &, bool same_id);
-       ///
        ~InsetError();
        ///
        virtual dispatch_result localDispatch(FuncRequest const & cmd);
@@ -60,10 +57,6 @@ public:
                return new InsetError(contents);
        }
        ///
-       //Inset * clone(Buffer const &, bool same_id) const {
-       //      return new InsetError(contents, same_id);
-       //}
-       ///
        Inset::Code lyxCode() const { return Inset::ERROR_CODE; }
        /// We don't want "begin" and "end inset" in lyx-file
        bool directWrite() const { return true; };

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index f5abcc230ffd96b5228096b5e5b44950359a9174..c0fa754a42d0ed946fd4361fc67084bae61de08d 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -70,25 +70,12 @@ InsetERT::InsetERT(InsetERT const & in)
 }
 
 
-// InsetERT::InsetERT(InsetERT const & in, bool same_id)
-//     : InsetCollapsable(in, same_id), status_(in.status_)
-// {
-//     init();
-// }
-
-
 Inset * InsetERT::clone(Buffer const &) const
 {
-       return new InsetERT(*const_cast<InsetERT *>(this));
+       return new InsetERT(*this);
 }
 
 
-// Inset * InsetERT::clone(Buffer const &, bool same_id) const
-// {
-//     return new InsetERT(*const_cast<InsetERT *>(this), same_id);
-// }
-
-
 InsetERT::InsetERT(BufferParams const & bp,
                   Language const * l, string const & contents, bool collapsed)
        : InsetCollapsable(bp, collapsed)

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 89f211c137d6842a4c80231fe3a7a39c6111aaeb..786c6aacb34252011b5f8f89ae9acc463bc6d031 100644 (file)
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -40,12 +40,8 @@ public:
        ///
        InsetERT(InsetERT const &);
        ///
-       //InsetERT(InsetERT const &, bool same_id);
-       ///
        Inset * clone(Buffer const &) const;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-       ///
        InsetERT(BufferParams const &,
                 Language const *, string const & contents, bool collapsed);
        ///

diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index 0bfbc90c1f87762bfde86d7205ed5de47400a251..1e0f3f954f049fd06bbfde71a43d7a0b4ffb57b1 100644 (file)
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -232,17 +232,6 @@ Inset * InsetExternal::clone(Buffer const &) const
 }
 
 
-// Inset * InsetExternal::clone(Buffer const &, bool same_id) const
-// {
-//     InsetExternal * inset = new InsetExternal;
-//     inset->params_ = params_;
-//     inset->view_ = view_;
-//     if (same_id)
-//             inset->id_ = id_;
-//     return inset;
-// }
-
-
 string const InsetExternal::getScreenLabel(Buffer const *) const
 {
        ExternalTemplate const & et = params_.templ;

diff --git a/src/insets/insetexternal.h b/src/insets/insetexternal.h
index e200b5f1d5672f1eed63de0bc3e9cdfbceecb629..6b0d2cd320db512935ceba59e097ee79676e93dd 100644 (file)
--- a/src/insets/insetexternal.h
+++ b/src/insets/insetexternal.h
@@ -70,8 +70,6 @@ public:
 
        ///
        virtual Inset * clone(Buffer const &) const;
-       ///
-       //virtual Inset * clone(Buffer const &, bool same_id) const;
 
        /// returns the text of the button
        virtual string const getScreenLabel(Buffer const *) const;

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 1512660714258283e9fb0633d172f3ac1f9d3bae..7e08132ef416488a7ec596051242dbd1e6440b19 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -150,11 +150,6 @@ InsetFloat::InsetFloat(InsetFloat const & in)
 {}
 
 
-// InsetFloat::InsetFloat(InsetFloat const & in, bool same_id)
-//     : InsetCollapsable(in, same_id), params_(in.params_)
-// {}
-
-
 InsetFloat::~InsetFloat()
 {
        InsetFloatMailer mailer(*this);
@@ -266,16 +261,10 @@ void InsetFloat::validate(LaTeXFeatures & features) const
 
 Inset * InsetFloat::clone(Buffer const &) const
 {
-       return new InsetFloat(*const_cast<InsetFloat *>(this));
+       return new InsetFloat(*this);
 }
 
 
-// Inset * InsetFloat::clone(Buffer const &, bool same_id) const
-// {
-//     return new InsetFloat(*const_cast<InsetFloat *>(this), same_id);
-// }
-
-
 string const InsetFloat::editMessage() const
 {
        return _("Opened Float Inset");

diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h
index 8b02904acdc07f20a3259d283191601fa99d1114..6f8e3412569faac56eff3356af19a4dc32dc775f 100644 (file)
--- a/src/insets/insetfloat.h
+++ b/src/insets/insetfloat.h
@@ -43,8 +43,6 @@ public:
        ///
        InsetFloat(InsetFloat const &);
        ///
-       //InsetFloat(InsetFloat const &, bool same_id);
-       ///
        ~InsetFloat();
        ///
        virtual dispatch_result localDispatch(FuncRequest const & cmd);
@@ -57,8 +55,6 @@ public:
        ///
        Inset * clone(Buffer const &) const;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-       ///
        Inset::Code lyxCode() const { return Inset::FLOAT_CODE; }
        ///
        int latex(Buffer const *, std::ostream &,

diff --git a/src/insets/insetfoot.C b/src/insets/insetfoot.C
index c020e5484596cc2b0d3711e16c24e722424705bf..857d5c072679b2151e98a2e2d7ff9bb6653362d9 100644 (file)
--- a/src/insets/insetfoot.C
+++ b/src/insets/insetfoot.C
@@ -46,26 +46,12 @@ InsetFoot::InsetFoot(InsetFoot const & in)
 }
 
 
-// InsetFoot::InsetFoot(InsetFoot const & in, bool same_id)
-//     : InsetFootlike(in, same_id)
-// {
-//     setLabel(_("foot"));
-//     setInsetName("Foot");
-// }
-
-
 Inset * InsetFoot::clone(Buffer const &) const
 {
-       return new InsetFoot(*const_cast<InsetFoot *>(this));
+       return new InsetFoot(*this);
 }
 
 
-// Inset * InsetFoot::clone(Buffer const &, bool same_id) const
-// {
-//     return new InsetFoot(*const_cast<InsetFoot *>(this), same_id);
-// }
-
-
 string const InsetFoot::editMessage() const
 {
        return _("Opened Footnote Inset");

diff --git a/src/insets/insetfoot.h b/src/insets/insetfoot.h
index 81ff5117f9c111f1ba3b9e7ae849b457e7fde181..41410f9a94a3493c2bb80b167bf41dba7b3e2053 100644 (file)
--- a/src/insets/insetfoot.h
+++ b/src/insets/insetfoot.h
@@ -27,12 +27,8 @@ public:
        ///
        InsetFoot(InsetFoot const &);
        ///
-       //InsetFoot(InsetFoot const &, bool same_id);
-       ///
        Inset * clone(Buffer const &) const;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-       ///
        Inset::Code lyxCode() const { return Inset::FOOT_CODE; }
        ///
        int latex(Buffer const *, std::ostream &,

diff --git a/src/insets/insetfootlike.C b/src/insets/insetfootlike.C
index 604f8465b915438989a2ae15f4d7ec2eb3b64855..7922e022a682953004f8e4a3f9bfa2361dfee3b2 100644 (file)
--- a/src/insets/insetfootlike.C
+++ b/src/insets/insetfootlike.C
@@ -43,17 +43,6 @@ InsetFootlike::InsetFootlike(InsetFootlike const & in)
 }
 
 
-// InsetFootlike::InsetFootlike(InsetFootlike const & in, bool same_id)
-//     : InsetCollapsable(in, same_id)
-// {
-//     LyXFont font(LyXFont::ALL_SANE);
-//     font.decSize();
-//     font.decSize();
-//     font.setColor(LColor::collapsable);
-//     setLabelFont(font);
-// }
-
-
 void InsetFootlike::write(Buffer const * buf, ostream & os) const
 {
        os << getInsetName() << "\n";

diff --git a/src/insets/insetfootlike.h b/src/insets/insetfootlike.h
index 284ab620abfaff7a7fea784e048fe4fbe7805e4f..bea01ff58cb78dc98fae6711c6276b56fc20a643 100644 (file)
--- a/src/insets/insetfootlike.h
+++ b/src/insets/insetfootlike.h
@@ -24,8 +24,6 @@ public:
        ///
        InsetFootlike(InsetFootlike const &);
        ///
-       //InsetFootlike(InsetFootlike const &, bool same_id);
-       ///
        void write(Buffer const * buf, std::ostream & os) const;
        ///
        bool insetAllowed(Inset::Code) const;

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 11b5945d30c9003ce242c1f4dbfa99422f8b1343..74f94a3a26168c6ccad56fd35c87dcdfc913a9ba 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -202,29 +202,12 @@ InsetGraphics::InsetGraphics(InsetGraphics const & ig,
 }
 
 
-// InsetGraphics::InsetGraphics(InsetGraphics const & ig,
-//                          string const & filepath,
-//                          bool same_id)
-//     : Inset(ig, same_id),
-//       graphic_label(uniqueID()),
-//       cache_(new Cache(*this))
-// {
-//     setParams(ig.params(), filepath);
-// }
-
-
 Inset * InsetGraphics::clone(Buffer const & buffer) const
 {
        return new InsetGraphics(*this, buffer.filePath());
 }
 
 
-// Inset * InsetGraphics::clone(Buffer const & buffer, bool same_id) const
-// {
-//     return new InsetGraphics(*this, buffer.filePath(), same_id);
-// }
-
-
 InsetGraphics::~InsetGraphics()
 {
        InsetGraphicsMailer mailer(*this);

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index 940f4509a993bc2e95ae311bdc189b24ff355053..7a070d1ca9d36193cc611826b02cc6e1f5cef2cb 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -30,9 +30,6 @@ public:
        ///
        InsetGraphics(InsetGraphics const &, string const & filepath);
        ///
-       //InsetGraphics(InsetGraphics const &, string const & filepath,
-       //            bool same_id);
-       ///
        ~InsetGraphics();
        ///
        virtual dispatch_result localDispatch(FuncRequest const & cmd);
@@ -70,8 +67,6 @@ public:
 
        ///
        virtual Inset * clone(Buffer const &) const;
-       ///
-       //virtual Inset * clone(Buffer const &, bool same_id) const;
 
        /** Set the inset parameters, used by the GUIndependent dialog.
            Return true of new params are different from what was so far.

diff --git a/src/insets/insethfill.h b/src/insets/insethfill.h
index 0db2fc10f0b4aa61bb0b325c2a414df7a449565c..77eef0a6dcbbee0e19a34f27e866a35ce1cda155 100644 (file)
--- a/src/insets/insethfill.h
+++ b/src/insets/insethfill.h
@@ -21,13 +21,9 @@ public:
        InsetHFill();
        ///
        virtual Inset * clone(Buffer const &) const {
-               return new InsetHFill();
+               return new InsetHFill;
        }
        ///
-       //virtual Inset * clone(Buffer const &, bool /*same_id*/) const {
-       //      return new InsetHFill();
-       //}
-       ///
        string const getScreenLabel(Buffer const *) const { return getContents(); }
        ///
        Inset::Code lyxCode() const { return Inset::HFILL_CODE; }

diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h
index 4cde1408b657d5ca1b2904972ac43f4c47f7056d..a6d197952b159c7944e83dad43f50918728f5ff2 100644 (file)
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -76,8 +76,6 @@ public:
        ///
        virtual Inset * clone(Buffer const &) const;
        ///
-       //virtual Inset * clone(Buffer const &, bool same_id) const;
-       ///
        Inset::Code lyxCode() const { return Inset::INCLUDE_CODE; }
        /// This returns the list of labels on the child buffer
        std::vector<string> const getLabelList() const;

diff --git a/src/insets/insetindex.h b/src/insets/insetindex.h
index 27bd984bb62f1998574e470f52fbf75c0ad9f208..0eac55b403353ba9a5c7aebaf68b04ea7bd53ac5 100644 (file)
--- a/src/insets/insetindex.h
+++ b/src/insets/insetindex.h
@@ -24,18 +24,12 @@ public:
        ///
        InsetIndex(InsetCommandParams const &);
        ///
-       //InsetIndex(InsetCommandParams const &, bool same_id);
-       ///
        ~InsetIndex();
        ///
        virtual Inset * clone(Buffer const &) const {
                return new InsetIndex(params());
        }
        ///
-       //virtual Inset * clone(Buffer const &, bool same_id) const {
-       //      return new InsetIndex(params(), same_id);
-       //}
-       ///
        dispatch_result localDispatch(FuncRequest const & cmd);
        ///
        string const getScreenLabel(Buffer const *) const;
@@ -53,18 +47,12 @@ public:
        ///
        InsetPrintIndex(InsetCommandParams const &);
        ///
-       //InsetPrintIndex(InsetCommandParams const &, bool same_id);
-       ///
        ~InsetPrintIndex();
        ///
        Inset * clone(Buffer const &) const {
                return new InsetPrintIndex(params());
        }
        ///
-       //Inset * clone(Buffer const &, bool same_id) const {
-       //      return new InsetPrintIndex(params(), same_id);
-       //}
-       ///
        //dispatch_result localDispatch(FuncRequest const & cmd);
        /// Updates needed features for this inset.
        void validate(LaTeXFeatures & features) const;

diff --git a/src/insets/insetlabel.h b/src/insets/insetlabel.h
index a9eccd361302e8e4a658d2ddd409e69bf2f05e50..6edfda852d9bad4fc292a6981b14c7b8ed677494 100644 (file)
--- a/src/insets/insetlabel.h
+++ b/src/insets/insetlabel.h
@@ -20,18 +20,12 @@ public:
        ///
        InsetLabel(InsetCommandParams const &);
        ///
-       //InsetLabel(InsetCommandParams const &, bool same_id);
-       ///
        ~InsetLabel();
        ///
        virtual Inset * clone(Buffer const &) const {
                return new InsetLabel(params());
        }
        ///
-       //virtual Inset * clone(Buffer const &, bool same_id) const {
-       //      return new InsetLabel(params(), same_id);
-       //}
-       ///
        virtual dispatch_result localDispatch(FuncRequest const & cmd);
        ///
        string const getScreenLabel(Buffer const *) const { return getContents(); }

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index 0e0ec4c47833e77703765dc6912bf7635ad6c718..0fe5f86273d9d38fb7c6c9132926a018da4d6af0 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -62,8 +62,6 @@ public:
        ///
        virtual Inset * clone(Buffer const &) const;
        ///
-       //virtual Inset * clone(Buffer const &, bool same_id) const;
-       ///
        Inset::Code lyxCode()const;
        ///
        inline bool canDisplay();

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index 76ca85581f9082ffb4df010086a8cfb92e845cb6..6e7a0ad90d06271553eb59004adf922640a94100 100644 (file)
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -41,26 +41,12 @@ InsetMarginal::InsetMarginal(InsetMarginal const & in)
 }
 
 
-// InsetMarginal::InsetMarginal(InsetMarginal const & in, bool same_id)
-//     : InsetFootlike(in, same_id)
-// {
-//     setLabel(_("margin"));
-//     setInsetName("Marginal");
-// }
-
-
 Inset * InsetMarginal::clone(Buffer const &) const
 {
-       return new InsetMarginal(*const_cast<InsetMarginal *>(this));
+       return new InsetMarginal(*this);
 }
 
 
-// Inset * InsetMarginal::clone(Buffer const &, bool same_id) const
-// {
-//     return new InsetMarginal(*const_cast<InsetMarginal *>(this), same_id);
-// }
-
-
 string const InsetMarginal::editMessage() const
 {
        return _("Opened Marginal Note Inset");

diff --git a/src/insets/insetmarginal.h b/src/insets/insetmarginal.h
index 1ee63aa9016a303a923d636fd468c075511d63b7..b69950d10398373c406ad43868b9e217a056b5e9 100644 (file)
--- a/src/insets/insetmarginal.h
+++ b/src/insets/insetmarginal.h
@@ -26,12 +26,8 @@ public:
        ///
        InsetMarginal(InsetMarginal const &);
        ///
-       //InsetMarginal(InsetMarginal const &, bool same_id);
-       ///
        Inset * clone(Buffer const &) const;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-       ///
        Inset::Code lyxCode() const { return Inset::MARGIN_CODE; }
        ///
        int latex(Buffer const *, std::ostream &,

diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index 1c108a2c6316c867d8360b55e6c033def4b4102b..6a6f3f16d985ecb13281ea775682a2aed47ef889 100644 (file)
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -93,23 +93,12 @@ InsetMinipage::InsetMinipage(InsetMinipage const & in)
 {}
 
 
-// InsetMinipage::InsetMinipage(InsetMinipage const & in, bool same_id)
-//     : InsetCollapsable(in, same_id), params_(in.params_)
-// {}
-
-
 Inset * InsetMinipage::clone(Buffer const &) const
 {
-       return new InsetMinipage(*const_cast<InsetMinipage *>(this));
+       return new InsetMinipage(*this);
 }
 
 
-// Inset * InsetMinipage::clone(Buffer const &, bool same_id) const
-// {
-//     return new InsetMinipage(*const_cast<InsetMinipage *>(this), same_id);
-// }
-
-
 InsetMinipage::~InsetMinipage()
 {
        InsetMinipageMailer mailer(*this);

diff --git a/src/insets/insetminipage.h b/src/insets/insetminipage.h
index c78c769d4eb6ffcd1ced1979961b005853b248d6..2db509f111fff3355b5b589d66b86785a673b1bc 100644 (file)
--- a/src/insets/insetminipage.h
+++ b/src/insets/insetminipage.h
@@ -58,8 +58,6 @@ public:
        ///
        InsetMinipage(InsetMinipage const &);
        ///
-       //InsetMinipage(InsetMinipage const &, bool same_id);
-       ///
        ~InsetMinipage();
        ///
        virtual dispatch_result localDispatch(FuncRequest const & cmd);
@@ -70,8 +68,6 @@ public:
        ///
        Inset * clone(Buffer const &) const;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-       ///
        void dimension(BufferView *, LyXFont const &, Dimension &) const;
        ///
        Inset::Code lyxCode() const { return Inset::MINIPAGE_CODE; }

diff --git a/src/insets/insetnewline.h b/src/insets/insetnewline.h
index b6f20af1eeaa608abd249e8428dc36a2c044a7e0..60de3b614010cceaf2e7476ec7b3b95b00e01b9c 100644 (file)
--- a/src/insets/insetnewline.h
+++ b/src/insets/insetnewline.h
@@ -24,11 +24,6 @@ public:
                return new InsetNewline;
        }
 
-
-       //virtual Inset * clone(Buffer const &, bool same_id) const {
-       //      return new InsetNewline;
-       //}
-
        Inset::Code lyxCode() const { return Inset::NEWLINE_CODE; }
 
        void dimension(BufferView *, LyXFont const &, Dimension &) const;

diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index c09db364ae5616888d03806bd6a7f39eefe2d8a6..457aa1368f22c92305ab24e83156ddfb55f8ef3a 100644 (file)
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -53,25 +53,12 @@ InsetNote::InsetNote(InsetNote const & in)
 }
 
 
-// InsetNote::InsetNote(InsetNote const & in, bool same_id)
-//     : InsetCollapsable(in, same_id)
-// {
-//     init();
-// }
-
-
 Inset * InsetNote::clone(Buffer const &) const
 {
-       return new InsetNote(*const_cast<InsetNote *>(this));
+       return new InsetNote(*this);
 }
 
 
-// Inset * InsetNote::clone(Buffer const &, bool same_id) const
-// {
-//     return new InsetNote(*const_cast<InsetNote *>(this), same_id);
-// }
-
-
 string const InsetNote::editMessage() const
 {
        return _("Opened Note Inset");

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index ca173ab6d54794b02a34adad791857c2c317a8c0..4b5b1d0c4a98906e430bc5657e651f8eabfcc025 100644 (file)
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -25,12 +25,8 @@ public:
        ///
        InsetNote(InsetNote const &);
        ///
-       //InsetNote(InsetNote const &, bool same_id);
-       ///
        Inset * clone(Buffer const &) const;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-       ///
        string const editMessage() const;
        ///
        Inset::Code lyxCode() const { return Inset::NOTE_CODE; }

diff --git a/src/insets/insetoptarg.C b/src/insets/insetoptarg.C
index 03f000d92049e615c52228305e1e2ff6a714b265..7a082361026aa987d261465aea5f9593c08ae2e7 100644 (file)
--- a/src/insets/insetoptarg.C
+++ b/src/insets/insetoptarg.C
@@ -47,28 +47,12 @@ InsetOptArg::InsetOptArg(InsetOptArg const & in)
 }
 
 
-// InsetOptArg::InsetOptArg(InsetOptArg const & in, bool same_id)
-//     : InsetCollapsable(in, same_id)
-// {
-//     LyXFont font(LyXFont::ALL_SANE);
-//     font.setColor(LColor::collapsable);
-//     setLabelFont(font);
-//     setLabel(_("opt"));
-// }
-
-
 Inset * InsetOptArg::clone(Buffer const &) const
 {
        return new InsetOptArg(*this);
 }
 
 
-// Inset * InsetOptArg::clone(Buffer const &, bool same_id) const
-// {
-//     return new InsetOptArg(*this, same_id);
-// }
-
-
 string const InsetOptArg::editMessage() const
 {
        return _("Opened Optional Argument Inset");

diff --git a/src/insets/insetoptarg.h b/src/insets/insetoptarg.h
index 50ff61cb9eb88b95db371003eb88199de091a2d3..a4999bdafdcddd5be96d43ea6c2e3ee180faf13a 100644 (file)
--- a/src/insets/insetoptarg.h
+++ b/src/insets/insetoptarg.h
@@ -26,13 +26,8 @@ public:
        InsetOptArg(BufferParams const &);
 
        InsetOptArg(InsetOptArg const &);
-       //InsetOptArg(InsetOptArg const &, bool same_id);
-
        /// make a duplicate of this inset
        Inset * clone(Buffer const &) const;
-       /// make a duplicate of this inset
-       //Inset * clone(Buffer const &, bool same_id) const;
-
        /// this inset is editable
        EDITABLE editable() const { return IS_EDITABLE; }
        /// code of the inset

diff --git a/src/insets/insetparent.h b/src/insets/insetparent.h
index 8fd4691d347de6ab954388ee0baeb92a97aa5726..c79b7419f28ad6b7ba3560a5ab06be4efacdd109 100644 (file)
--- a/src/insets/insetparent.h
+++ b/src/insets/insetparent.h
@@ -27,16 +27,10 @@ public:
        ///
        InsetParent(InsetCommandParams const &, Buffer const &);
        ///
-       //InsetParent(InsetCommandParams const &, Buffer const &, bool same_id);
-       ///
        virtual Inset * clone(Buffer const & buffer) const {
                return new InsetParent(params(), buffer);
        }
        ///
-       //virtual Inset * clone(Buffer const & buffer, bool same_id) const {
-       //      return new InsetParent(params(), buffer, same_id);
-       //}
-       ///
        dispatch_result localDispatch(FuncRequest const & cmd);
        ///
        string const getScreenLabel(Buffer const *) const;

diff --git a/src/insets/insetquotes.h b/src/insets/insetquotes.h
index 12e5e14da2d3bd9fb6cbd29582be1eac3f2c7c3c..29875c70a69e7dea7e953cebe134e403d2c8f7d8 100644 (file)
--- a/src/insets/insetquotes.h
+++ b/src/insets/insetquotes.h
@@ -69,9 +69,6 @@ public:
        InsetQuotes(char c, BufferParams const & params);
        ///
        Inset * clone(Buffer const &) const;
-       ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-
        ///
        void dimension(BufferView *, LyXFont const &, Dimension &) const;
        ///

diff --git a/src/insets/insetref.h b/src/insets/insetref.h
index 9e1aa204aeda37f9b7d33b2404d232a058e4e38c..ce78a712f83198321dbcf31c284c6dda9b3f2507 100644 (file)
--- a/src/insets/insetref.h
+++ b/src/insets/insetref.h
@@ -38,18 +38,12 @@ public:
        ///
        InsetRef(InsetCommandParams const &, Buffer const &);
        ///
-       //InsetRef(InsetCommandParams const &, Buffer const &, bool same_id);
-       ///
        ~InsetRef();
        ///
        virtual Inset * clone(Buffer const & buffer) const {
                return new InsetRef(params(), buffer);
        }
        ///
-       //virtual Inset * clone(Buffer const & buffer, bool same_id) const {
-       //      return new InsetRef(params(), buffer, same_id);
-       //}
-       ///
        dispatch_result localDispatch(FuncRequest const & cmd);
        ///
        string const getScreenLabel(Buffer const *) const;

diff --git a/src/insets/insetspace.h b/src/insets/insetspace.h
index 01f8a79c05a3af57fe35415365dc75cbee4fef2c..9a1a872e1121aaeba5a95e1b26c18188bcd1ac1c 100644 (file)
--- a/src/insets/insetspace.h
+++ b/src/insets/insetspace.h
@@ -73,8 +73,6 @@ public:
        ///
        virtual Inset * clone(Buffer const &) const;
        ///
-       //virtual Inset * clone(Buffer const &, bool same_id) const;
-       ///
        Inset::Code lyxCode() const { return Inset::SPACE_CODE; }
        /// We don't need \begin_inset and \end_inset
        bool directWrite() const { return true; }

diff --git a/src/insets/insetspecialchar.h b/src/insets/insetspecialchar.h
index 2bc1cb9b1630ab22792832176d44749e5c4275c3..bcca7aeab27aa50cefa56e9bf919db8abb8b3889 100644 (file)
--- a/src/insets/insetspecialchar.h
+++ b/src/insets/insetspecialchar.h
@@ -65,8 +65,6 @@ public:
        ///
        virtual Inset * clone(Buffer const &) const;
        ///
-       //virtual Inset * clone(Buffer const &, bool same_id) const;
-       ///
        Inset::Code lyxCode() const { return Inset::SPECIALCHAR_CODE; }
        /// We don't need \begin_inset and \end_inset
        bool directWrite() const { return true; }

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index fa971302aab25d2a8743bb809c3db9be846f20c5..c5096ba1e3a51e23b52f97af64088b87a4a6818b 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -193,26 +193,6 @@ InsetTabular::InsetTabular(InsetTabular const & tab, Buffer const & buf)
 }
 
 
-// InsetTabular::InsetTabular(InsetTabular const & tab, Buffer const & buf,
-//                                                bool same_id)
-//     : UpdatableInset(tab, same_id), buffer(&buf)
-// {
-//     tabular.reset(new LyXTabular(buf.params,
-//                                  this, *(tab.tabular), same_id));
-//     the_locking_inset = 0;
-//     old_locking_inset = 0;
-//     locked = false;
-//     oldcell = -1;
-//     actrow = actcell = 0;
-//     clearSelection();
-//     need_update = INIT;
-//     in_update = false;
-//     in_reset_pos = 0;
-//     inset_x = 0;
-//     inset_y = 0;
-// }
-
-
 InsetTabular::~InsetTabular()
 {
        InsetTabularMailer mailer(*this);
@@ -226,12 +206,6 @@ Inset * InsetTabular::clone(Buffer const & buf) const
 }
 
 
-// Inset * InsetTabular::clone(Buffer const & buf, bool same_id) const
-// {
-//     return new InsetTabular(*this, buf, same_id);
-// }
-
-
 BufferView * InsetTabular::view() const
 {
        return buffer->getUser();

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index 05063aa53ababd945a09de84fe1a53e24e63cb36..7fdd0bd10759fadf6405fda5c70c537bde380939 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -78,14 +78,10 @@ public:
        ///
        InsetTabular(InsetTabular const &, Buffer const &);
        ///
-       //InsetTabular(InsetTabular const &, Buffer const &, bool same_id);
-       ///
        ~InsetTabular();
        ///
        Inset * clone(Buffer const &) const;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-       ///
        void read(Buffer const *, LyXLex &);
        ///
        void write(Buffer const *, std::ostream &) const;

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 7e073ff94526c717bbaab3228d517c17c0ac4b16..0b036445725325587c9a37b3dc90b357673ee93d 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -155,14 +155,6 @@ InsetText::InsetText(InsetText const & in)
 }
 
 
-// InsetText::InsetText(InsetText const & in, bool same_id)
-//     : UpdatableInset(in, same_id), lt(0), in_update(false), do_resize(0),
-//       do_reinit(false)
-// {
-//     init(&in, same_id);
-// }
-
-
 InsetText & InsetText::operator=(InsetText const & it)
 {
        init(&it);
@@ -201,39 +193,6 @@ void InsetText::init(InsetText const * ins)
 }
 
 
-// void InsetText::init(InsetText const * ins, bool same_id)
-// {
-//     if (ins) {
-//             setParagraphData(ins->paragraphs, same_id);
-//             autoBreakRows = ins->autoBreakRows;
-//             drawFrame_ = ins->drawFrame_;
-//             frame_color = ins->frame_color;
-//             if (same_id)
-//                     id_ = ins->id_;
-//     } else {
-//             for_each(paragraphs.begin(), paragraphs.end(),
-//                      boost::bind(&Paragraph::setInsetOwner, _1, this));
-
-//             the_locking_inset = 0;
-//             drawFrame_ = NEVER;
-//             frame_color = LColor::insetframe;
-//             autoBreakRows = false;
-//     }
-//     top_y = 0;
-//     old_max_width = 0;
-//     no_selection = true;
-//     need_update = FULL;
-//     drawTextXOffset = 0;
-//     drawTextYOffset = 0;
-//     locked = false;
-//     old_par = 0;
-//     last_drawn_width = -1;
-//     cached_bview = 0;
-//     sstate.lpar = 0;
-//     in_insetAllowed = false;
-// }
-
-
 InsetText::~InsetText()
 {
        paragraphs.clear();
@@ -271,12 +230,6 @@ Inset * InsetText::clone(Buffer const &) const
 }
 
 
-// Inset * InsetText::clone(Buffer const &, bool same_id) const
-// {
-//     return new InsetText(*this, same_id);
-// }
-
-
 void InsetText::write(Buffer const * buf, ostream & os) const
 {
        os << "Text\n";
@@ -2008,46 +1961,6 @@ void InsetText::setParagraphData(ParagraphList const & plist)
 }
 
 
-// void InsetText::setParagraphData(ParagraphList const & plist, bool same_id)
-// {
-//     // we have to unlock any locked inset otherwise we're in troubles
-//     the_locking_inset = 0;
-
-//     #warning CHECK not adhering to same_id here might wreck havoc (Lgb)
-//     // But it it makes no difference that is a lot better.
-//     if (same_id) {
-//             lyxerr << "Same_id called with 'true'" << endl;
-//             lyxerr << "Please report this to the list." << endl;
-
-//             paragraphs.clear();
-//             ParagraphList::iterator it = plist.begin();
-//             ParagraphList::iterator end = plist.end();
-//             for (; it != end; ++it) {
-//                     int const id = it->id();
-//                     paragraphs.push_back(*it);
-//                     Paragraph & tmp = paragraphs.back();
-//                     tmp.setInsetOwner(this);
-//                     tmp.id(id);
-//             }
-//     } else {
-// #warning FIXME.
-//             // See if this can be simplified when std::list is in effect.
-//             paragraphs.clear();
-
-//             ParagraphList::iterator it = plist.begin();
-//             ParagraphList::iterator end = plist.end();
-//             for (; it != end; ++it) {
-//                     paragraphs.push_back(*it);
-//                     Paragraph & tmp = paragraphs.back();
-//                     tmp.setInsetOwner(this);
-//             }
-//     }
-
-//     reinitLyXText();
-//     need_update = INIT;
-// }
-
-
 void InsetText::markNew(bool track_changes)
 {
        ParagraphList::iterator pit = paragraphs.begin();

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index e54ec3c309e9deb671913b631b1de75a230d31af..c37a5588f6e79de6d13fd755dc07a47597e6fff9 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -75,15 +75,10 @@ public:
        explicit
        InsetText(InsetText const &);
        ///
-       //explicit
-       //InsetText(InsetText const &, bool same_id);
-       ///
        ~InsetText();
        ///
        Inset * clone(Buffer const &) const;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-       ///
        InsetText & operator=(InsetText const & it);
        /// empty inset to empty par, or just mark as erased
        void clear(bool just_mark_erased);
@@ -154,14 +149,10 @@ public:
        ///
        void init(InsetText const * ins);
        ///
-       //void init(InsetText const * ins, bool same_id);
-       ///
        void writeParagraphData(Buffer const *, std::ostream &) const;
        ///
        void setParagraphData(ParagraphList const &);
        ///
-       //void setParagraphData(ParagraphList const &, bool same_id);
-       ///
        void setText(string const &, LyXFont const &);
        ///
        void setAutoBreakRows(bool);

diff --git a/src/insets/insettheorem.h b/src/insets/insettheorem.h
index e7e457d102304da347acce5878158a6c22cd9371..60ea45cee47c72c4b2f6346f30d06dba5e436f37 100644 (file)
--- a/src/insets/insettheorem.h
+++ b/src/insets/insettheorem.h
@@ -27,8 +27,6 @@ public:
        ///
        virtual Inset * clone(Buffer const &) const;
        ///
-       //virtual Inset * clone(Buffer const &, bool same_id) const;
-       ///
        Inset::Code lyxCode() const { return Inset::THEOREM_CODE; }
        ///
        bool display() const { return true; }

diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C
index 160a1322af845ffe655df7daef9840a29d385e48..8e0469482548c9bee87976a2aa2cdb5e1cd158bd 100644 (file)
--- a/src/insets/insettoc.C
+++ b/src/insets/insettoc.C
@@ -28,11 +28,6 @@ InsetTOC::InsetTOC(InsetCommandParams const & p)
 {}
 
 
-// InsetTOC::InsetTOC(InsetCommandParams const & p, bool same_id)
-//     : InsetCommand(p, same_id)
-// {}
-
-
 InsetTOC::~InsetTOC()
 {
        InsetCommandMailer mailer("toc", *this);

diff --git a/src/insets/insettoc.h b/src/insets/insettoc.h
index bc4c696cf88ef1ac9179c322285e32905684246f..443ab697629e18747234f345ba68992b51f07b30 100644 (file)
--- a/src/insets/insettoc.h
+++ b/src/insets/insettoc.h
@@ -22,18 +22,12 @@ public:
        ///
        InsetTOC(InsetCommandParams const &);
        ///
-       //InsetTOC(InsetCommandParams const &, bool same_id);
-       ///
        ~InsetTOC();
        ///
        virtual Inset * clone(Buffer const &) const {
                return new InsetTOC(params());
        }
        ///
-       //virtual Inset * clone(Buffer const &, bool same_id) const {
-       //      return new InsetTOC(params(), same_id);
-       //}
-       ///
        dispatch_result localDispatch(FuncRequest const & cmd);
        ///
        string const getScreenLabel(Buffer const *) const;

diff --git a/src/insets/inseturl.h b/src/insets/inseturl.h
index 756ec2402a825c7d438d2379250030b383255a59..8daee16a959a003694d7bfa81fe5e00a08ec553e 100644 (file)
--- a/src/insets/inseturl.h
+++ b/src/insets/inseturl.h
@@ -25,19 +25,12 @@ public:
        explicit
        InsetUrl(InsetCommandParams const &);
        ///
-       //explicit
-       //InsetUrl(InsetCommandParams const &, bool same_id);
-       ///
        ~InsetUrl();
        ///
        virtual Inset * clone(Buffer const &) const {
                return new InsetUrl(params());
        }
        ///
-       //virtual Inset * clone(Buffer const &, bool same_id) const {
-       //      return new InsetUrl(params(), same_id);
-       //}
-       ///
        dispatch_result localDispatch(FuncRequest const & cmd);
        ///
        Inset::Code lyxCode() const { return Inset::URL_CODE; }

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index f1249091e1700a9bed6eb1c0fdc74058a666faa0..8e281d0c9edbfab7c58ab14a2e723099f880f928 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -80,11 +80,6 @@ InsetWrap::InsetWrap(InsetWrap const & in)
 {}
 
 
-// InsetWrap::InsetWrap(InsetWrap const & in, bool same_id)
-//     : InsetCollapsable(in, same_id), params_(in.params_)
-// {}
-
-
 InsetWrap::~InsetWrap()
 {
        InsetWrapMailer mailer(*this);
@@ -187,16 +182,10 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 
 Inset * InsetWrap::clone(Buffer const &) const
 {
-       return new InsetWrap(*const_cast<InsetWrap *>(this));
+       return new InsetWrap(*this);
 }
 
 
-// Inset * InsetWrap::clone(Buffer const &, bool same_id) const
-// {
-//     return new InsetWrap(*const_cast<InsetWrap *>(this), same_id);
-// }
-
-
 string const InsetWrap::editMessage() const
 {
        return _("Opened Wrap Inset");

diff --git a/src/insets/insetwrap.h b/src/insets/insetwrap.h
index bc5b9896e15f4b668fda1fc5ec7b2e15fcc6d22f..fd01ab8533f1ab1b854d06265763469126bb3043 100644 (file)
--- a/src/insets/insetwrap.h
+++ b/src/insets/insetwrap.h
@@ -41,8 +41,6 @@ public:
        ///
        InsetWrap(InsetWrap const &);
        ///
-       //InsetWrap(InsetWrap const &, bool same_id);
-       ///
        ~InsetWrap();
        ///
        virtual dispatch_result localDispatch(FuncRequest const & cmd);
@@ -55,8 +53,6 @@ public:
        ///
        Inset * clone(Buffer const &) const;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-       ///
        Inset::Code lyxCode() const { return Inset::WRAP_CODE; }
        ///
        int latex(Buffer const *, std::ostream &,

diff --git a/src/insets/updatableinset.C b/src/insets/updatableinset.C
index d03c3f46772ab26b62dd6d3697ada49f3f16c5cc..a01ec0f3bcc24b37f4563bfbbb575b8dc477cb77 100644 (file)
--- a/src/insets/updatableinset.C
+++ b/src/insets/updatableinset.C
@@ -35,11 +35,6 @@ UpdatableInset::UpdatableInset(UpdatableInset const & in)
 {}
 
 
-// UpdatableInset::UpdatableInset(UpdatableInset const & in, bool same_id)
-//     : Inset(in, same_id), block_drawing_(false)
-// {}
-
-
 void UpdatableInset::insetUnlock(BufferView *)
 {
        lyxerr[Debug::INFO] << "Inset Unlock" << std::endl;

diff --git a/src/insets/updatableinset.h b/src/insets/updatableinset.h
index 6672ab38e2720de5ed9393f77d62cf47deb8dbdd..f41c02387b9098fbc6ab76262601a479030656bd 100644 (file)
--- a/src/insets/updatableinset.h
+++ b/src/insets/updatableinset.h
@@ -50,8 +50,6 @@ public:
        UpdatableInset();
        ///
        UpdatableInset(UpdatableInset const & in);
-       ///
-       //UpdatableInset(UpdatableInset const & in, bool same_id);
 
        /// check if the font of the char we want inserting is correct
        /// and modify it if it is not.

diff --git a/src/mathed/formula.h b/src/mathed/formula.h
index 8074c37f86cea37b9c99c532a6fb3ccf41a667a4..bab0e55c3b54eb733864b125466207640f04cc6b 100644 (file)
--- a/src/mathed/formula.h
+++ b/src/mathed/formula.h
@@ -56,8 +56,6 @@ public:
        ///
        Inset * clone(Buffer const &) const;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-       ///
        void validate(LaTeXFeatures & features) const;
        ///
        Inset::Code lyxCode() const;

diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h
index e6826e34bedac05e8681c6b0014367fe8322b69b..4482822ef731569af8c39213e57da19b674bd6c3 100644 (file)
--- a/src/mathed/formulabase.h
+++ b/src/mathed/formulabase.h
@@ -32,8 +32,6 @@ public:
        ///
        Inset * clone(Buffer const &) const = 0;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const = 0;
-       ///
        virtual void draw(BufferView *,LyXFont const &, int, float &) const = 0;
        /// lowest x coordinate
        virtual int xlow() const;

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index a9545decaa7e9492f023f5138bc15682a4623ead..1d8f03027bc5bd3f3fe61a4a645b20e99be27aca 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -54,8 +54,6 @@ public:
        ///
        Inset * clone(Buffer const &) const;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-       ///
        Inset::Code lyxCode() const;
        ///
        MathAtom const & par() const;

diff --git a/src/tabular.C b/src/tabular.C
index a5e498a2f6d38a8b46a9b539b3e7ff1d789c99b6..023f5406cb98e3d4f65de007759403990facf4f7 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -131,33 +131,6 @@ LyXTabular::LyXTabular(BufferParams const & bp,
 }
 
 
-// LyXTabular::LyXTabular(BufferParams const & bp,
-//                    InsetTabular * inset, LyXTabular const & lt,
-//                    bool same_id)
-// {
-//     owner_ = inset;
-//     cur_cell = -1;
-//     Init(bp, lt.rows_, lt.columns_, &lt);
-//     // we really should change again to have InsetText as a pointer
-//     // and allocate it then we would not have to do this stuff all
-//     // double!
-//     if (same_id) {
-//             for (int i = 0; i < rows_; ++i) {
-//                     for (int j = 0; j < columns_; ++j) {
-//                             cell_info[i][j].inset.id(lt.cell_info[i][j].inset.id());
-//                             cell_info[i][j].inset.setParagraphData(lt.cell_info[i][j].inset.paragraphs, true);
-//                     }
-//             }
-//     }
-// #if 0
-// #ifdef WITH_WARNINGS
-// #warning Jürgen, can you make it the other way round. So that copy assignment depends on the copy constructor and not the other way. (Lgb)
-// #endif
-//     operator=(lt);
-// #endif
-// }
-
-
 LyXTabular::LyXTabular(Buffer const * buf, InsetTabular * inset, LyXLex & lex)
 {
        owner_ = inset;
@@ -209,24 +182,6 @@ LyXTabular * LyXTabular::clone(BufferParams const & bp,
 }
 
 
-// LyXTabular * LyXTabular::clone(BufferParams const & bp,
-//                            InsetTabular * inset, bool same_id)
-// {
-//     LyXTabular * result = new LyXTabular(bp, inset, *this, same_id);
-// #if 0
-//     // don't know if this is good but I need to Clone also
-//     // the text-insets here, this is for the Undo-facility!
-//     for (int i = 0; i < rows_; ++i) {
-//             for (int j = 0; j < columns_; ++j) {
-//                     result->cell_info[i][j].inset = cell_info[i][j].inset;
-//                     result->cell_info[i][j].inset.setOwner(inset);
-//             }
-//     }
-// #endif
-//     return result;
-// }
-
-
 /* activates all lines and sets all widths to 0 */
 void LyXTabular::Init(BufferParams const & bp,
                      int rows_arg, int columns_arg, LyXTabular const * lt)

diff --git a/src/tabular.h b/src/tabular.h
index 92916cd7a80b8278bd9be3032c30762479ec7e05..8aaee3509e669e48770ca3cd49bb9305e0c7d61b 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -182,18 +182,12 @@ public:
        LyXTabular(BufferParams const &,
                   InsetTabular *, LyXTabular const &);
        ///
-       //LyXTabular(BufferParams const &,
-       //         InsetTabular *, LyXTabular const &, bool same_id = false);
-       ///
        explicit
        LyXTabular(Buffer const *, InsetTabular *, LyXLex & lex);
        ///
        LyXTabular & operator=(LyXTabular const &);
        ///
        LyXTabular * clone(BufferParams const &, InsetTabular *);
-       ///
-       //LyXTabular * clone(BufferParams const &,
-       //                 InsetTabular *, bool same_id = false);
 
        /// Returns true if there is a topline, returns false if not
        bool TopLine(int cell, bool onlycolumn = false) const;