More requires --> required, for C++2a.

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

diff --git a/src/insets/InsetRef.h b/src/insets/InsetRef.h
index 002fa64d10ab656287fa10324064def6c6863f9d..37a7c3ec3cdc61cc82c7f4c5b37d066fe9923720 100644 (file)
--- a/src/insets/InsetRef.h
+++ b/src/insets/InsetRef.h
@@ -29,23 +29,28 @@ public:
                std::string short_gui_name;
        };
        static const type_info types[];
-       ///
-       static int getType(std::string const & name);
-       ///
-       static std::string const & getName(int type);
 
        ///
        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;
+       docstring getTOCString() const;
        ///
        bool hasSettings() const { return true; }
        ///
@@ -61,18 +66,19 @@ public:
        int docbook(odocstream &, OutputParams const &) const;
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
-       /// 
+       ///
        void toString(odocstream &) const;
        ///
-       void forOutliner(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 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
@@ -85,13 +91,6 @@ public:
        static bool isCompatibleCommand(std::string const & s);
        //@}
 
-       //FIXME: private
-       /// \name Private functions inherited from InsetCommand class
-       //@{
-       ///
-       docstring screenLabel() const { return screen_label_; }
-       //@}
-
 protected:
        ///
        InsetRef(InsetRef const &);
@@ -102,7 +101,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
@@ -110,11 +115,13 @@ 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 docstring tooltip_;
 };