requires is a keyword in C++2a

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

diff --git a/src/insets/InsetRef.h b/src/insets/InsetRef.h
index 21a7ec1c7c5a21514120c5c911001f93665bd285..8683ecf9899b9de82de088c70ee3164c31d4cb41 100644 (file)
--- a/src/insets/InsetRef.h
+++ b/src/insets/InsetRef.h
@@ -28,23 +28,30 @@ public:
                ///
                std::string short_gui_name;
        };
-       static type_info types[];
-       ///
-       static int getType(std::string const & name);
-       ///
-       static std::string const & getName(int type);
+       static const type_info types[];
 
        ///
        InsetRef(Buffer * buffer, InsetCommandParams const &);
 
+       ///
+       void changeTarget(docstring const & new_label);
+
        /// \name Public functions inherited from Inset class
        //@{
        ///
+       docstring layoutName() const;
+       ///
+       void doDispatch(Cursor & cur, FuncRequest & cmd);
+       ///
+       bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & status) const;
+       ///
        bool isLabeled() const { return true; }
        ///
        docstring toolTip(BufferView const &, int, int) const
                { return tooltip_; }
        ///
+       docstring getTOCString() const;
+       ///
        bool hasSettings() const { return true; }
        ///
        InsetCode lyxCode() const { return REF_CODE; }
@@ -59,18 +66,19 @@ public:
        int docbook(odocstream &, OutputParams const &) const;
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
-       /// 
+       ///
        void toString(odocstream &) const;
        ///
-       void forToc(docstring &, size_t) const;
+       void forOutliner(docstring &, size_t const, bool const) const;
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       void updateBuffer(ParIterator const & it, UpdateType);
+       void updateBuffer(ParIterator const & it, UpdateType, bool const deleted = false);
        ///
-       void addToToc(DocIterator const & di, bool output_active) const;
+       void addToToc(DocIterator const & di, bool output_active,
+                                 UpdateType utype, TocBackend & backend) const;
        ///
-       bool forceLTR() const { return true; }
+       bool forceLTR(OutputParams const &) const;
        //@}
 
        /// \name Static public methods obligated for InsetCommand derived classes
@@ -82,13 +90,8 @@ public:
        ///
        static bool isCompatibleCommand(std::string const & s);
        //@}
-
-       //FIXME: private
-       /// \name Private functions inherited from InsetCommand class
-       //@{
        ///
-       docstring screenLabel() const { return screen_label_; }
-       //@}
+       bool outputActive() const { return active_; }
 
 protected:
        ///
@@ -100,7 +103,13 @@ private:
        ///
        Inset * clone() const { return new InsetRef(*this); }
        //@}
-       
+
+       /// \name Private functions inherited from InsetCommand class
+       //@{
+       ///
+       docstring screenLabel() const;
+       //@}
+
        /// \return the label with things that need to be escaped escaped
        docstring getEscapedLabel(OutputParams const &) const;
        /// \return the command for a formatted reference to ref
@@ -108,11 +117,15 @@ private:
        /// \param argument for reference command
        /// \param prefix of the label (before :)
        docstring getFormattedCmd(docstring const & ref, docstring & label,
-                       docstring & prefix) const;
+                       docstring & prefix, docstring const & caps) const;
 
        ///
        mutable docstring screen_label_;
        ///
+       mutable bool broken_;
+       ///
+       mutable bool active_;
+       ///
        mutable docstring tooltip_;
 };