Make public virtual methods of base class Inset also public in derived classes

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index 6106ce5a5c3babbd8923c8783d5e2a2d59cf9b6b..afca2e3d97bcdc126245176333bb8175a5ddf00b 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -58,8 +58,6 @@ public:
        void rename(docstring const & newname) { params_.branch = newname; }
        ///
        InsetBranchParams const & params() const { return params_; }
-
-private:
        ///
        InsetCode lyxCode() const override { return BRANCH_CODE; }
        ///
@@ -115,7 +113,7 @@ private:
        docstring layoutName() const override { return from_ascii("Branch:") + branch(); }
        ///
        Inset * clone() const override { return new InsetBranch(*this); }
-
+private:
        ///
        friend class InsetBranchParams;
        ///

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index ed6dbbb50bfbffd01f75e485b7ef2d5ac7339cee..084175393caa0fa5f20404e071d304c2d73c7bca 100644 (file)
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -36,7 +36,6 @@ public:
        docstring getCaptionAsHTML(XMLStream & os, OutputParams const &) const;
        ///
        std::string contextMenuName() const override;
-private:
        ///
        void write(std::ostream & os) const override;
        ///
@@ -90,7 +89,7 @@ private:
        bool allowParagraphCustomization(idx_type = 0) const override { return false; }
        ///
        Inset * clone() const override { return new InsetCaption(*this); }
-
+private:
        ///
        mutable docstring full_label_;
        ///

diff --git a/src/insets/InsetERT.h b/src/insets/InsetERT.h
index 72220d07d0c7aeec383533c681a6071fd63cb9ce..4d754d95d997d79ab4dab05128a70208c0a1e799 100644 (file)
--- a/src/insets/InsetERT.h
+++ b/src/insets/InsetERT.h
@@ -39,7 +39,6 @@ public:
 
        std::string contextMenuName() const override
                { return "context-ert"; }
-private:
        ///
        InsetCode lyxCode() const override { return ERT_CODE; }
        ///

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index 0fc0fba39862b126c441d98d52d72168456dd8e1..05f56e38ded98f6a914ff42e04f3253c39aebe9f 100644 (file)
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -78,7 +78,6 @@ public:
        LyXAlignment contentAlignment() const override;
        ///
        bool forceParDirectionSwitch() const override { return true; }
-private:
        ///
        void setCaptionType(std::string const & type) override;
        ///
@@ -112,6 +111,7 @@ private:
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const override;
        ///
        bool hasSubCaptions(ParIterator const & it) const override;
+private:
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd) override;
        ///

diff --git a/src/insets/InsetFoot.h b/src/insets/InsetFoot.h
index 1e4b0d26e83749e97e550ef6ceef6bbd5dab78e2..05897a6d589d95564a9d159a78c0dc9e566a0eea 100644 (file)
--- a/src/insets/InsetFoot.h
+++ b/src/insets/InsetFoot.h
@@ -26,7 +26,6 @@ class InsetFoot : public InsetFootlike
 public:
        ///
        explicit InsetFoot(Buffer *);
-private:
        ///
        InsetCode lyxCode() const override { return FOOT_CODE; }
        ///
@@ -48,6 +47,7 @@ private:
        bool inheritFont() const override { return true; }
        ///
        bool allowMultiPar() const override { return true; }
+private:
        ///
        docstring custom_label_;
        ///

diff --git a/src/insets/InsetLine.h b/src/insets/InsetLine.h
index 361fbe5d6db0ba84f9fcc6ce8c27db6979d0fe1c..4b44a63e60c2b6f92a626d78c18ff73bcb60a061 100644 (file)
--- a/src/insets/InsetLine.h
+++ b/src/insets/InsetLine.h
@@ -34,8 +34,6 @@ public:
        { return s == "rule"; }
        //@}
 
-private:
-
        /// Inset inherited methods.
        //@{
        InsetCode lyxCode() const override { return LINE_CODE; }
@@ -52,6 +50,7 @@ private:
        Inset * clone() const override { return new InsetLine(*this); }
        //@}
 
+private:
        /// cached line height and offset.
        /// These value are independent of the BufferView size and thus
        /// can be shared between views.

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index aeab8f038b282084ec43a7636b4ffacfd500efb0..1e2a8bab9c7eec662d29eec5a70d8ace7a8aecb9 100644 (file)
--- a/src/insets/InsetNote.h
+++ b/src/insets/InsetNote.h
@@ -56,7 +56,6 @@ public:
        static void string2params(std::string const &, InsetNoteParams &);
        ///
        InsetNoteParams const & params() const { return params_; }
-private:
        ///
        InsetCode lyxCode() const override { return NOTE_CODE; }
        ///
@@ -103,7 +102,7 @@ private:
        std::string contextMenuName() const override;
        ///
        friend class InsetNoteParams;
-
+private:
        ///
        InsetNoteParams params_;
 };

diff --git a/src/insets/InsetSeparator.h b/src/insets/InsetSeparator.h
index f7e0ab90597676db964a52f80c57aad32bf1538b..c67d02670d80c241c70148ce279e365b92a7eab4 100644 (file)
--- a/src/insets/InsetSeparator.h
+++ b/src/insets/InsetSeparator.h
@@ -66,7 +66,6 @@ public:
        }
        ///
        RowFlags rowFlags() const override { return BreakAfter; }
-private:
        ///
        InsetCode lyxCode() const override { return SEPARATOR_CODE; }
        ///
@@ -99,7 +98,7 @@ private:
        void doDispatch(Cursor & cur, FuncRequest & cmd) override;
        ///
        bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const override;
-
+private:
        ///
        InsetSeparatorParams params_;
 };