add warning make controllers compile and remove some alomost unused functions, commen...

[lyx.git] / src / insets / insetinclude.h

diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h
index 4c26ce769367a65898a97f9487aad013042d955b..99d930061e096f1eece840c6dfef3248c3783c68 100644 (file)
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -12,7 +12,6 @@
 #ifndef INSET_INCLUDE_H
 #define INSET_INCLUDE_H
 
-
 #include "insetcommand.h"
 
 #include <boost/scoped_ptr.hpp>
@@ -67,7 +66,7 @@ public:
        ///
        int width(BufferView *, LyXFont const &) const;
        ///
-       void draw(BufferView *, LyXFont const &, int, float &, bool) const;
+       void draw(BufferView *, LyXFont const &, int, float &) const;
 
        /// get the parameters
        Params const & params(void) const;
@@ -83,10 +82,6 @@ public:
        /// This returns the list of bibkeys on the child buffer
        void fillWithBibKeys(std::vector<std::pair<string,string> > & keys) const;
        ///
-       void edit(BufferView *, int x, int y, mouse_button::state button);
-       ///
-       void edit(BufferView * bv, bool front = true);
-       ///
        EDITABLE editable() const
        {
                return IS_EDITABLE;
@@ -107,14 +102,9 @@ public:
        ///
        void validate(LaTeXFeatures &) const;
 
-       /** Input inserts anything inside a paragraph.
-           Display can give some visual feedback
-       */
+       /// take up a whole row if we're not type INPUT
        bool display() const;
 
-       /// return the filename stub of the included file
-       string const getRelFileBaseName() const;
-
        /// return true if the file is or got loaded.
        bool loadIfNeeded() const;
 
@@ -156,7 +146,7 @@ public:
        ///
        InsetIncludeMailer(InsetInclude & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
        virtual string const & name() const { return name_; }
        ///
@@ -164,11 +154,10 @@ public:
        ///
        static void string2params(string const &, InsetInclude::Params &);
        ///
-       static string const params2string(string const & name,
-                                         InsetInclude::Params const &);
+       static string const params2string(InsetInclude::Params const &);
 private:
        ///
-       string const name_;
+       static string const name_;
        ///
        InsetInclude & inset_;
 };