remove some compability code

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

diff --git a/src/ChangeLog b/src/ChangeLog
index e217d560b4d4006572bb2fed2060c1568f3f3ce1..d457d6dac748f7f43af5f2e51b9865297f1f0542 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,13 @@
+2003-03-02  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * buffer.C (readInset): remove compability code for old Figure and
+       InsetInfo insets
+
 2003-03-02  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * buffer.C: ws changes
+       (readInset):
+
        * BufferView_pimpl.C: ditto
        * author.C: ditto
        * buffer.h: ditto

diff --git a/src/buffer.C b/src/buffer.C
index 8e3e03e3d91f5a73078f0f2c05cbffd68357f071..b5f9f8561e51aeb751481c1b19eb0920af927fbb 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -1135,7 +1135,6 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
                        inset = new InsetParent(inscmd, *this);
                }
        } else {
-               bool alreadyread = false;
                if (tmptok == "Quotes") {
                        inset = new InsetQuotes;
                } else if (tmptok == "External") {
@@ -1144,16 +1143,8 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
                        inset = new InsetFormulaMacro;
                } else if (tmptok == "Formula") {
                        inset = new InsetFormula;
-               } else if (tmptok == "Figure") { // Backward compatibility
-//                     inset = new InsetFig(100, 100, *this);
-                       inset = new InsetGraphics;
                } else if (tmptok == "Graphics") {
                        inset = new InsetGraphics;
-               } else if (tmptok == "Info") {// backwards compatibility
-                       inset = new InsetNote(this,
-                                             lex.getLongString("\\end_inset"),
-                                             true);
-                       alreadyread = true;
                } else if (tmptok == "Note") {
                        inset = new InsetNote(params);
                } else if (tmptok == "Include") {
@@ -1193,7 +1184,8 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
                        inset = new InsetFloatList;
                }
 
-               if (inset && !alreadyread) inset->read(this, lex);
+               if (inset)
+                       inset->read(this, lex);
        }
 
        if (inset) {

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 69162f4591eaa4d0142d952cbec8ab7900d415c8..6e5f295c161db0f546833d2c73db2f98e7e46f41 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-02  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * insetnote.[Ch] (InsetNote): remove unused constructor
+
 2003-02-28  Alfredo Braunstein  <abraunst@libero.it>
 
        * insetgraphics.C: added include "format.h"
@@ -45,7 +49,7 @@
 2003-02-26  Alfredo Braunstein <abraunst@libero.it>
 
        * insetgraphics.C (draw)
-       * insetinclude.C (draw): Eliminate also the other argument (owner 
+       * insetinclude.C (draw): Eliminate also the other argument (owner
        inset inset) in the call to PreviewImage::image
 
 2003-02-25  Alfredo Braunstein <abraunst@libero.it>
@@ -92,7 +96,7 @@
        * Makefile.am: add new files.
 
 2003-02-21  Angus Leeming  <leeming@lyx.org>
-       
+
        * updatableinset.h (setView, view): remove.
        * inset.h (view, cache): to be replaced by these.
 
@@ -110,7 +114,7 @@
        child document is under version control.
 
 2003-02-17 André Pönitz <poenitz@gmx.net>
-       
+
        * insetbib.[Ch]: Adjust access to bibkeys
 
 2003-02-14  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
@@ -164,7 +168,7 @@
 
 2003-01-12  Michael Schmitt <michael.schmitt@teststep.org>
 
-        * insetgraphics.C (draw, width): Fix spacing around graphics inset
+       * insetgraphics.C (draw, width): Fix spacing around graphics inset
 
 2002-12-17  Juergen Vigna  <jug@lyx.org>
 
@@ -185,8 +189,8 @@
 
 2002-12-17  Alfredo Braunstein <abraunst@libero.it>
 
-       * insettext.C (lfunMouseRelease): hackish solution to the "double
-       menu open" bug
+       * insettext.C (lfunMouseRelease): hackish solution to the "double
+       menu open" bug
 
 2002-12-08  Lars Gullik Bjønnes  <larsbj@gullik.net>
 

diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index 5b3a995e62cfde21e6e4e6784199dd6392bfdd82..ce8f14ee1a9ea49050b344f3eb40fa66cc37f502 100644 (file)
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -59,26 +59,6 @@ Inset * InsetNote::clone(Buffer const &, bool same_id) const
 }
 
 
-// This constructor is used for reading old InsetInfo
-InsetNote::InsetNote(Buffer const * buf, string const & contents,
-                    bool collapsed)
-       : InsetCollapsable(buf->params, collapsed)
-{
-       init();
-
-       Paragraph * par = inset.paragraph();
-       LyXFont font(LyXFont::ALL_INHERIT, buf->params.language);
-
-       // Since XForms doesn't support RTL, we can assume that old notes
-       // in RTL documents are written in English.
-       if (font.language()->RightToLeft())
-               font.setLanguage(default_language);
-
-       lyx::pos_type pos = 0;
-       buf->insertStringAsLines(par, pos, font, rtrim(contents, "\n"));
-}
-
-
 string const InsetNote::editMessage() const
 {
        return _("Opened Note Inset");

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index 89ea7cc182c1046e00b36f1d5cc34ffde4dfe0ad..1043300d92fd5cedc03d25d41a31fd55a7ee46be 100644 (file)
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -26,8 +26,6 @@ public:
        InsetNote(InsetNote const &, bool same_id = false);
        ///
        Inset * clone(Buffer const &, bool same_id = false) const;
-       /// constructor with initial contents
-       InsetNote(Buffer const *, string const & contents, bool collapsed);
        ///
        string const editMessage() const;
        ///