This should be the last of the commits refactoring the InsetLayout code.

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

diff --git a/src/insets/InsetCitation.h b/src/insets/InsetCitation.h
index f0fd1d7a732cf44b37918f8adcdedbc571c8a271..b54d29f851e880efb336ac0a9111f1b2059e8ad3 100644 (file)
--- a/src/insets/InsetCitation.h
+++ b/src/insets/InsetCitation.h
@@ -15,8 +15,9 @@
 
 
 #include "InsetCommand.h"
+#include "InsetCode.h"
 
-#include "frontends/controllers/biblio.h"
+#include "BiblioInfo.h"
 
 
 namespace lyx {
@@ -33,28 +34,34 @@ public:
        ///
        EDITABLE editable() const { return IS_EDITABLE; }
        ///
-       InsetBase::Code lyxCode() const { return InsetBase::CITE_CODE; }
+       InsetCode lyxCode() const { return CITE_CODE; }
        ///
        int latex(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+                 OutputParams const &) const;
        ///
        int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const;
+                     OutputParams const &) const;
        ///
        int docbook(Buffer const &, odocstream &,
-                   OutputParams const &) const;
+                   OutputParams const &) const;
        /// the string that is passed to the TOC
-       virtual int textString(Buffer const &, odocstream &,
-               OutputParams const &) const;
+       void textString(Buffer const &, odocstream &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
-       void replaceContents(std::string const & from, std::string const & to);
-
+       static CommandInfo const * findInfo(std::string const &);
+       //FIXME This is the locus of the design problem we have.
+       //It really ought to do what default_cite_command() does,
+       //but to do that it needs to know what CiteEngine we are
+       //using.
+       ///
+       static std::string defaultCommand() { return "cite"; };
+       ///
+       static bool isCompatibleCommand(std::string const & cmd);
 private:
-       virtual std::auto_ptr<InsetBase> doClone() const
+       virtual Inset * clone() const
        {
-               return std::auto_ptr<InsetBase>(new InsetCitation(params()));
+               return new InsetCitation(params());
        }
 
        /// This function does the donkey work of creating the pretty label
@@ -63,7 +70,7 @@ private:
        class Cache {
        public:
                ///
-               Cache() : engine(biblio::ENGINE_BASIC), params("cite") {}
+               Cache() : engine(biblio::ENGINE_BASIC), params(CITE_CODE) {}
                ///
                biblio::CiteEngine engine;
                ///