IU for validate(). I guess that's in the 'don't ask' category...

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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 5efeaa0d28dc6f994f03e8425eca51697ef98bbc..abb82616191881e9ce280feb86410a9bf71ade16 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -27,6 +27,9 @@
        * insettabular.[Ch]:
        * insettext.[Ch]: unify first drawing phase
 
+       * inset.[Ch]:
+       * insetbase.h: move validate() to the base
+
 2003-05-31  Angus Leeming  <leeming@lyx.org>
 
        * Makefile.am: moved insetwrap.[Ch] into alphabetical order.

diff --git a/src/insets/inset.C b/src/insets/inset.C
index c5cc6ad5d3ef61d8f38e3f70f2e18813a79fde8c..a69f1f8884baa8d348423ed2d986c68b395a71a0 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -60,10 +60,6 @@ Inset::EDITABLE Inset::editable() const
 }
 
 
-void Inset::validate(LaTeXFeatures &) const
-{}
-
-
 bool Inset::autoDelete() const
 {
        return false;

diff --git a/src/insets/inset.h b/src/insets/inset.h
index 0b72fb684a2c21906432b15ce01a62a7f8faccf4..1bdf56775157170739978a5e6959c686c9bb8d05 100644 (file)
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -23,7 +23,6 @@
 #include <vector>
 
 class LyXFont;
-class Dimension;
 class Buffer;
 class Painter;
 class LatexRunParams;
@@ -35,8 +34,6 @@ class FuncRequest;
 class WordLangTuple;
 class ParagraphList;
 
-struct LaTeXFeatures;
-
 namespace grfx {
        class PreviewLoader;
 }
@@ -192,8 +189,6 @@ public:
        virtual int linuxdoc(Buffer const *, std::ostream &) const = 0;
        ///
        virtual int docbook(Buffer const *, std::ostream &, bool) const = 0;
-       /// Updates needed features for this inset.
-       virtual void validate(LaTeXFeatures & features) const;
 
        /// returns LyX code associated with the inset. Used for TOC, ...)
        virtual Inset::Code lyxCode() const { return NO_CODE; }

diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C
index 5a90fb006e187b0e5d52d12e336f774a9a512deb..1253333cea70491c128e3e10d30a840e07b62b43 100644 (file)
--- a/src/insets/insetbase.C
+++ b/src/insets/insetbase.C
@@ -13,4 +13,3 @@ dispatch_result InsetBase::localDispatch(FuncRequest const & cmd)
        pos_type pos = 0;
        return dispatch(cmd, idx, pos);
 }
-

diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h
index ef87a2f966a96d39a5da29541aca3b74fe9c1029..51ba1a981a674fb68b9c1c8360d600079b1401d3 100644 (file)
--- a/src/insets/insetbase.h
+++ b/src/insets/insetbase.h
@@ -19,6 +19,7 @@ class FuncRequest;
 class MetricsInfo;
 class Dimension;
 class PainterInfo;
+class LaTeXFeatures;
 
 /** Dispatch result codes
                DISPATCHED          = the inset catched the action
@@ -81,6 +82,8 @@ public:
        virtual void cache(BufferView *) const {}
        ///
        virtual BufferView * view() const { return 0; }
+       /// request "external features"
+       virtual void validate(LaTeXFeatures &) const {}
 };
 
 #endif

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index dcc6a20698458676f443fb4b8c887983e832789b..4e81536691f863e8c0ec46789ca6e3d70bdc767c 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -3,6 +3,8 @@
 
        * math_*.[Ch]: finish unified two-stage drawing
 
+       * math_inset.h: move validate to insetbase.h
+
 2003-05-28  André Pönitz  <poenitz@gmx.net>
 
        * math_*.[Ch]: prepare unified two-stage drawing

diff --git a/src/mathed/math_inset.h b/src/mathed/math_inset.h
index 02b9420b0ecf62f10885fbe0af403e3b7aac28f3..eac36dd7da0d04c14ca70be325f43c338e4d584b 100644 (file)
--- a/src/mathed/math_inset.h
+++ b/src/mathed/math_inset.h
@@ -70,7 +70,6 @@ class MathMLStream;
 class WriteStream;
 class InfoStream;
 
-class LaTeXFeatures;
 class BufferView;
 class UpdatableInset;
 class MathMacroTemplate;
@@ -213,8 +212,6 @@ public:
        /// identifies things that can get \limits or \nolimits
        virtual bool takesLimits() const { return false; }
 
-       /// request "external features"
-       virtual void validate(LaTeXFeatures &) const {}
        /// char char code if possible
        virtual void handleFont(string const &) {}
        /// is this inset equal to a given other inset?