remove Inset::deletable() as it returns always 'true'

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

diff --git a/src/insets/inset.C b/src/insets/inset.C
index 3e0a1ce90be29af4f6082eff868c696f5cc61f55..50d94871e9c977a4882c04925a5509d75d4d4239 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -56,12 +56,6 @@ Inset::Inset(Inset const & in, bool same_id)
 }
 
 
-bool Inset::deletable() const
-{
-       return true;
-}
-
-
 bool Inset::directWrite() const
 {
        return false;

diff --git a/src/insets/inset.h b/src/insets/inset.h
index 4957a395fb947526ce8696c8017eaf7ab8ac09cf..3a309aee22c99523edced1c7469d375671fc7577 100644 (file)
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -228,8 +228,6 @@ public:
        virtual int docbook(Buffer const *, std::ostream &, bool) const = 0;
        /// Updates needed features for this inset.
        virtual void validate(LaTeXFeatures & features) const;
-       ///
-       virtual bool deletable() const;
 
        /// returns LyX code associated with the inset. Used for TOC, ...)
        virtual Inset::Code lyxCode() const { return NO_CODE; }

diff --git a/src/insets/insetbib.h b/src/insets/insetbib.h
index d037e829a4100257110973ecb76c66cda18cbbef..14068e366f7134b08311925a3512e76649b5633f 100644 (file)
--- a/src/insets/insetbib.h
+++ b/src/insets/insetbib.h
@@ -45,10 +45,6 @@ public:
        void edit(BufferView * bv, bool front = true);
        ///
        EDITABLE editable() const { return IS_EDITABLE; }
-       /// A user can't neither insert nor delete this inset
-       //bool deletable() const {
-       //      return false;
-       //}
        /// keep .lyx format compatible
        bool directWrite() const { return true; }
        ///

diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C
index 8c7788fec79313e9ade583dae72ecc09889da15f..f05530fd6b6430327d4bc72fcf5cb1094d7c1d03 100644 (file)
--- a/src/insets/insetlatexaccent.C
+++ b/src/insets/insetlatexaccent.C
@@ -660,12 +660,6 @@ int InsetLatexAccent::docbook(Buffer const *, ostream & os, bool) const
 }
 
 
-bool InsetLatexAccent::deletable() const
-{
-       return true;
-}
-
-
 bool InsetLatexAccent::directWrite() const
 {
        return true;

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index d89a0afdfa7c7612103d30787c5f00cbad4cf276..712f768151efc0371bb570a6a439fa95ed7c7dcc 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -62,8 +62,6 @@ public:
        ///
        int docbook(Buffer const *, std::ostream &, bool mixcont) const;
        ///
-       bool deletable() const;
-       ///
        bool directWrite() const;
        ///
        virtual Inset * clone(Buffer const &, bool same_id = false) const;

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 5626bb1d17acc57ac021c33ed309c611eeedb61a..b9c4833a66fa7bd644e97e98d5fc6f2e8baf917c 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -1769,12 +1769,6 @@ bool InsetTabular::movePrevCell(BufferView * bv, bool lock)
 }
 
 
-bool InsetTabular::deletable() const
-{
-       return true;
-}
-
-
 void InsetTabular::setFont(BufferView * bv, LyXFont const & font, bool tall,
                           bool selectall)
 {

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index 11275a129817d447950956e54fa3bcb2261b919e..99da476657885f3b937fe8aa95e679cfdd46a7a0 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -282,8 +282,6 @@ private:
        ///
        bool movePrevCell(BufferView *, bool lock = false);
        ///
-       bool deletable() const;
-       ///
        int getCellXPos(int cell) const;
        ///
        void resetPos(BufferView *) const;

diff --git a/src/text.C b/src/text.C
index b8dae41293e72e72b67c821264cf3e036cdd0aee..388b5f92c00841c1091d1056bd0705cbc59d6d0a 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -2773,10 +2773,7 @@ void LyXText::backspace(BufferView * bview)
                setCursorIntern(bview, cursor.par(), cursor.pos()- 1,
                                false, cursor.boundary());
 
-               // some insets are undeletable here
                if (cursor.par()->isInset(cursor.pos())) {
-                       if (!cursor.par()->getInset(cursor.pos())->deletable())
-                               return;
                        // force complete redo when erasing display insets
                        // this is a cruel method but safe..... Matthias
                        if (cursor.par()->getInset(cursor.pos())->display() ||