[Libreoffice-commits] core.git: compilerplugins/clang include/vcl vcl/inc vcl/source vcl/unx

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 1 10:20:30 UTC 2021


 compilerplugins/clang/unusedmethods.results |    2 --
 include/vcl/weld.hxx                        |    2 --
 vcl/inc/salvtables.hxx                      |    2 --
 vcl/source/app/salvtables.cxx               |    2 --
 vcl/unx/gtk3/gtkinst.cxx                    |   11 -----------
 5 files changed, 19 deletions(-)

New commits:
commit 9fb1d5c7265f25ab80873a21e78bc842bd6ddf61
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jun 1 09:26:01 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jun 1 12:19:34 2021 +0200

    drop unused Widget::set_secondary
    
    Change-Id: I63e69ca9daa8a452eee28333d8639d1db093e826
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116518
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results
index 172eaaec7b09..d555952b0d88 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -974,8 +974,6 @@ include/vcl/weld.hxx:179
     _Bool weld::Widget::get_hexpand() const
 include/vcl/weld.hxx:181
     _Bool weld::Widget::get_vexpand() const
-include/vcl/weld.hxx:183
-    void weld::Widget::set_secondary(_Bool)
 include/vcl/weld.hxx:190
     int weld::Widget::get_margin_top() const
 include/vcl/weld.hxx:191
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 858218e3b5d8..4546da76b18e 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -184,8 +184,6 @@ public:
     virtual void set_vexpand(bool bExpand) = 0;
     virtual bool get_vexpand() const = 0;
 
-    virtual void set_secondary(bool bSecondary) = 0;
-
     virtual void set_margin_top(int nMargin) = 0;
     virtual void set_margin_bottom(int nMargin) = 0;
     virtual void set_margin_start(int nMargin) = 0;
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 12a716edcd1c..e8c268957ef3 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -275,8 +275,6 @@ public:
 
     virtual bool get_vexpand() const override;
 
-    virtual void set_secondary(bool bSecondary) override;
-
     virtual void set_margin_top(int nMargin) override;
 
     virtual void set_margin_bottom(int nMargin) override;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 2732640bd1bb..e3fbde51e376 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -358,8 +358,6 @@ void SalInstanceWidget::set_vexpand(bool bExpand) { m_xWidget->set_vexpand(bExpa
 
 bool SalInstanceWidget::get_vexpand() const { return m_xWidget->get_vexpand(); }
 
-void SalInstanceWidget::set_secondary(bool bSecondary) { m_xWidget->set_secondary(bSecondary); }
-
 void SalInstanceWidget::set_margin_top(int nMargin) { m_xWidget->set_margin_top(nMargin); }
 
 void SalInstanceWidget::set_margin_bottom(int nMargin) { m_xWidget->set_margin_bottom(nMargin); }
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 66881f44e222..bd775e9e5a78 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -3475,17 +3475,6 @@ public:
         return gtk_widget_get_vexpand(m_pWidget);
     }
 
-    virtual void set_secondary(bool bSecondary) override
-    {
-#if !GTK_CHECK_VERSION(4, 0, 0)
-        GtkWidget* pParent = gtk_widget_get_parent(m_pWidget);
-        if (pParent && GTK_IS_BUTTON_BOX(pParent))
-            gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(pParent), m_pWidget, bSecondary);
-#else
-        (void)bSecondary;
-#endif
-    }
-
     virtual void set_margin_top(int nMargin) override
     {
         gtk_widget_set_margin_top(m_pWidget, nMargin);


More information about the Libreoffice-commits mailing list