solenv/clang-format/excludelist | 4 ++--
toolkit/source/awt/vclxtoolkit.cxx | 2 +-
vcl/Library_vcl.mk | 2 +-
vcl/inc/managedmenubutton.hxx | 3 ++-
vcl/inc/menutogglebutton.hxx | 2 +-
vcl/inc/salvtables.hxx | 2 +-
vcl/source/app/salvtables.cxx | 2 +-
vcl/source/control/MenuButton.cxx | 6 +++---
vcl/source/uitest/uiobject.cxx | 2 +-
vcl/source/window/builder.cxx | 2 +-
10 files changed, 14 insertions(+), 13 deletions(-)
New commits:
commit 1218e023fd67b32dc6c6110c1bd2fe6d44ed1e0b
Author: Christopher Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Sat Feb 15 14:14:28 2025 +1100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Feb 18 09:52:23 2025 +0100
vcl: menubtn.[hc]xx -> MenuButton.[hc]xx
Change-Id: I0b037261c753df6cd7efc2ee605abc02304c226c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179238
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/include/vcl/toolkit/menubtn.hxx
b/include/vcl/toolkit/MenuButton.hxx
similarity index 100%
rename from include/vcl/toolkit/menubtn.hxx
rename to include/vcl/toolkit/MenuButton.hxx
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 3e308c87a8b4..b4ccc7e98f2a 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6246,7 +6246,7 @@ include/vcl/toolkit/imgctrl.hxx
include/vcl/toolkit/ivctrl.hxx
include/vcl/toolkit/longcurr.hxx
include/vcl/toolkit/lstbox.hxx
-include/vcl/toolkit/menubtn.hxx
+include/vcl/toolkit/MenuButton.hxx
include/vcl/toolkit/morebtn.hxx
include/vcl/toolkit/prgsbar.hxx
include/vcl/toolkit/roadmap.hxx
@@ -14559,6 +14559,7 @@ vcl/source/control/calendar.cxx
vcl/source/control/combobox.cxx
vcl/source/control/ctrl.cxx
vcl/source/control/ContextVBox.cxx
+vcl/source/control/MenuButton.cxx
vcl/source/control/edit.cxx
vcl/source/control/field.cxx
vcl/source/control/field2.cxx
@@ -14575,7 +14576,6 @@ vcl/source/control/ivctrl.cxx
vcl/source/control/listbox.cxx
vcl/source/control/longcurr.cxx
vcl/source/control/managedmenubutton.cxx
-vcl/source/control/menubtn.cxx
vcl/source/control/notebookbar.cxx
vcl/source/control/prgsbar.cxx
vcl/source/control/quickselectionengine.cxx
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 4edeefabfb1d..c25a17ed5490 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -110,7 +110,7 @@
#include <vcl/scheduler.hxx>
#include <vcl/toolkit/lstbox.hxx>
#include <vcl/toolkit/longcurr.hxx>
-#include <vcl/toolkit/menubtn.hxx>
+#include <vcl/toolkit/MenuButton.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/toolkit/scrbar.hxx>
#include <vcl/split.hxx>
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 08d4e550505c..483fcc5fe8b0 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -245,7 +245,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/control/imp_listbox \
vcl/source/control/listbox \
vcl/source/control/managedmenubutton \
- vcl/source/control/menubtn \
+ vcl/source/control/MenuButton \
vcl/source/control/NotebookbarPopup \
vcl/source/control/PriorityHBox \
vcl/source/control/PriorityMergedHBox \
diff --git a/vcl/inc/managedmenubutton.hxx b/vcl/inc/managedmenubutton.hxx
index 0f6492b6fdee..d90d9922f1a4 100644
--- a/vcl/inc/managedmenubutton.hxx
+++ b/vcl/inc/managedmenubutton.hxx
@@ -9,7 +9,8 @@
#pragma once
-#include <vcl/toolkit/menubtn.hxx>
+#include <vcl/toolkit/MenuButton.hxx>
+
#include <com/sun/star/awt/XPopupMenu.hpp>
#include <com/sun/star/frame/XPopupMenuController.hpp>
diff --git a/vcl/inc/menutogglebutton.hxx b/vcl/inc/menutogglebutton.hxx
index c1b5aef54498..d15fbd474fec 100644
--- a/vcl/inc/menutogglebutton.hxx
+++ b/vcl/inc/menutogglebutton.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <vcl/toolkit/menubtn.hxx>
+#include <vcl/toolkit/MenuButton.hxx>
class MenuToggleButton final : public MenuButton
{
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 66750a2444d9..19b292e500ab 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -21,7 +21,7 @@
#include <vcl/toolkit/fixed.hxx>
#include <vcl/toolkit/fixedhyper.hxx>
#include <vcl/toolkit/lstbox.hxx>
-#include <vcl/toolkit/menubtn.hxx>
+#include <vcl/toolkit/MenuButton.hxx>
#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/toolkit/combobox.hxx>
#include <vcl/tabctrl.hxx>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 926274d38a30..ca2078879c26 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -57,7 +57,7 @@
#include <vcl/headbar.hxx>
#include <vcl/toolkit/ivctrl.hxx>
#include <vcl/layout.hxx>
-#include <vcl/toolkit/menubtn.hxx>
+#include <vcl/toolkit/MenuButton.hxx>
#include <vcl/ptrstyle.hxx>
#include <slider.hxx>
#include <vcl/sysdata.hxx>
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/MenuButton.cxx
similarity index 98%
rename from vcl/source/control/menubtn.cxx
rename to vcl/source/control/MenuButton.cxx
index 1cfd0799fe30..b0e97fa09110 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/MenuButton.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -22,7 +22,7 @@
#include <vcl/toolkit/floatwin.hxx>
#include <vcl/menu.hxx>
#include <vcl/timer.hxx>
-#include <vcl/toolkit/menubtn.hxx>
+#include <vcl/toolkit/MenuButton.hxx>
#include <vcl/settings.hxx>
#include <vcl/uitest/uiobject.hxx>
#include <vcl/uitest/logger.hxx>
@@ -312,4 +312,4 @@ bool MenuToggleButton::GetActive() const
return mbIsActive;
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index ebfffef5a9d3..a1b02bb4fe52 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -30,7 +30,7 @@
#include <vcl/toolkit/treelistbox.hxx>
#include <vcl/toolkit/treelistentry.hxx>
#include <vcl/toolkit/svlbitm.hxx>
-#include <vcl/toolkit/menubtn.hxx>
+#include <vcl/toolkit/MenuButton.hxx>
#include <vcl/toolkit/vclmedit.hxx>
#include <vcl/uitest/logger.hxx>
#include <uiobject-internal.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index a49341526969..19c0124bff02 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -44,7 +44,7 @@
#include <vcl/toolkit/ivctrl.hxx>
#include <vcl/layout.hxx>
#include <vcl/toolkit/lstbox.hxx>
-#include <vcl/toolkit/menubtn.hxx>
+#include <vcl/toolkit/MenuButton.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/toolkit/scrbar.hxx>
