Store an InsetBase & in MailInset.

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

diff --git a/src/graphics/GraphicsConverter.C b/src/graphics/GraphicsConverter.C
index 58f83eec3ed04828b5c3e52dc953c7618fb2d6a0..ce04d9bf207f0cd8ae2d729b78df40b4ba86d05d 100644 (file)
--- a/src/graphics/GraphicsConverter.C
+++ b/src/graphics/GraphicsConverter.C
@@ -158,9 +158,9 @@ Converter::Impl::Impl(string const & from_file,   string const & to_file_base,
        } else {
 
                lyxerr[Debug::GRAPHICS] << "\tConversion script:"
-                               << "\n--------------------------------------\n"
-                               << STRCONV(script.str())
-                               << "\n--------------------------------------\n";
+                       << "\n--------------------------------------\n"
+                       << STRCONV(script.str())
+                       << "\n--------------------------------------\n";
 
                // Output the script to file.
                static int counter = 0;
@@ -177,7 +177,7 @@ Converter::Impl::Impl(string const & from_file,   string const & to_file_base,
                // The command needed to run the conversion process
                // We create a dummy command for ease of understanding of the
                // list of forked processes.
-               // Note that 'sh ' is absolutely essential, or execvp will fail.
+               // Note: 'sh ' is absolutely essential, or execvp will fail.
                script_command_ = "sh " + script_file_ + ' ' +
                        OnlyFilename(from_file) + ' ' + to_format;
        }

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 10233ff6ee0ca43e12e738bfe487d049c673e92b..47899ff40942bfc35d3eb1b4117eccb61e517ae5 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,18 @@
+2003-03-10  Angus Leeming  <leeming@lyx.org>
+
+       * inset.h, insetbase.h: move cache() and view() into InsetBase.
+
+       * insetcommand.h (inset):
+       * insetert.h (inset):
+       * insetexternal.h (inset):
+       * insetfloat.h (inset):
+       * insetgraphics.h (inset):
+       * insetinclude.h (inset):
+       * insetminipage.h (inset):
+       * insettabular.h (inset):
+       * insetwrap.h (inset):
+       * mailinset.h (inset): return an InsetBase &, not an Inset &.
+
 2003-03-10  Angus Leeming  <leeming@lyx.org>
 
        * insetcommand.C (string2params):

diff --git a/src/insets/inset.h b/src/insets/inset.h
index 77bb0bae815c2edb92fc5b861e83f882dfff202f..77216216bcee17dd2a8d85668184ebb59287af34 100644 (file)
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -24,7 +24,6 @@
 #include "support/types.h"
 
 class LyXFont;
-class BufferView;
 class Buffer;
 class Painter;
 class LyXText;
@@ -337,10 +336,6 @@ public:
         *  defaults to empty.
         */
        virtual void generatePreview() const {}
-       ///
-       virtual void cache(BufferView *) const {}
-       ///
-       virtual BufferView * view() const { return 0; }
 
 protected:
        ///

diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h
index 79933fcc62d3598fa7219354cfa260c5e45d58e2..c6dc34894ee7e0b175c478e42ec093160104a512 100644 (file)
--- a/src/insets/insetbase.h
+++ b/src/insets/insetbase.h
@@ -14,6 +14,7 @@
 
 #include <vector>
 
+class BufferView;
 class FuncRequest;
 
 /** Dispatch result codes
@@ -64,6 +65,11 @@ public:
 
        ///
        virtual ~InsetBase() {}
+
+       /// Methods to cache and retrieve a cached BufferView.
+       virtual void cache(BufferView *) const {}
+       ///
+       virtual BufferView * view() const { return 0; }
 };
 
 #endif

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index 6d8df729c363e5a2d92103af8a721730797e2cbc..08a05823dd720b563274dfa03ac68a6a0b0bd15e 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -84,7 +84,7 @@ public:
        ///
        InsetCommandMailer(string const & name, InsetCommand & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
        virtual string const & name() const { return name_; }
        ///

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 1a1cc59c0d90c4628861fbb515d7034de06cb838..0217b16e69e6f26fec08942c2d558a6e211f74df 100644 (file)
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -159,7 +159,7 @@ public:
        ///
        InsetERTMailer(InsetERT & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
        virtual string const & name() const { return name_; }
        ///

diff --git a/src/insets/insetexternal.h b/src/insets/insetexternal.h
index 7d099fcfb6dd8349e21d1205e9caeec6d5c03a9d..fe4f0eb62217618a320bc2659b7bcb8129a1afda 100644 (file)
--- a/src/insets/insetexternal.h
+++ b/src/insets/insetexternal.h
@@ -131,7 +131,7 @@ public:
        ///
        InsetExternalMailer(InsetExternal & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
        virtual string const & name() const { return name_; }
        ///

diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h
index 38fc1284af5d2924edacb4605c152692d13ae661..cee68959a2c1403dd0bbbfdd788a9656ef0d118b 100644 (file)
--- a/src/insets/insetfloat.h
+++ b/src/insets/insetfloat.h
@@ -100,7 +100,7 @@ public:
        ///
        InsetFloatMailer(InsetFloat & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
        virtual string const & name() const { return name_; }
        ///

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index ac13376ae9c0a39c7506a3932095bdf9d7d69b72..a0e1f2b89ab5fe77ce5e828d814197a70f10a420 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -134,7 +134,7 @@ public:
        ///
        InsetGraphicsMailer(InsetGraphics & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
        virtual string const & name() const { return name_; }
        ///

diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h
index 8a57c739fbd0e09cccb3fe75269ea0a792b6594c..dcddeeb22fdef6a237769912451c0729006348ac 100644 (file)
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -156,7 +156,7 @@ public:
        ///
        InsetIncludeMailer(InsetInclude & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
        virtual string const & name() const { return name_; }
        ///

diff --git a/src/insets/insetminipage.h b/src/insets/insetminipage.h
index f5f5cafada146ec801f0cbd828eade891782d55c..d4f544a4d5ca763e8f3c4795a2272aa7b520354c 100644 (file)
--- a/src/insets/insetminipage.h
+++ b/src/insets/insetminipage.h
@@ -126,7 +126,7 @@ public:
        ///
        InsetMinipageMailer(InsetMinipage & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
        virtual string const & name() const { return name_; }
        ///

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index ffb6c4d236e57168c9cac02c4e2f6e783f6b238d..81cb7f3fb3042e301c5e9b39c557f07ad66e9b13 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -377,7 +377,7 @@ public:
        ///
        InsetTabularMailer(InsetTabular & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
        virtual string const & name() const { return name_; }
        ///

diff --git a/src/insets/insetwrap.h b/src/insets/insetwrap.h
index a35b782b0bf0c40f666ba157fdc4571f5890690c..2090d350f942260a35bbea911e04decdd1a38a64 100644 (file)
--- a/src/insets/insetwrap.h
+++ b/src/insets/insetwrap.h
@@ -97,7 +97,7 @@ public:
        ///
        InsetWrapMailer(InsetWrap & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
        virtual string const & name() const { return name_; }
        ///

diff --git a/src/insets/mailinset.h b/src/insets/mailinset.h
index 965895deb96cfd26a4aa00fa897326aeaeabfa8f..e4d1fe3048b092303ad2cd476d90c8663ec9190a 100644 (file)
--- a/src/insets/mailinset.h
+++ b/src/insets/mailinset.h
@@ -16,7 +16,7 @@
 #include "LString.h"
 
 
-class Inset;
+class InsetBase;
 
 
 class MailInset {
@@ -34,7 +34,7 @@ public:
 
 protected:
        ///
-       virtual Inset & inset() const = 0;
+       virtual InsetBase & inset() const = 0;
        ///
        virtual string const & name() const = 0;
 };