[Libreoffice-commits] core.git: include/vcl solenv/clang-format vcl/inc vcl/source

[Caolán McNamara (via logerrit)]

 solenv/clang-format/excludelist               |    2 +-
 vcl/inc/DropdownBox.hxx                       |    2 +-
 vcl/inc/OptionalBox.hxx                       |    7 ++-----
 vcl/inc/PriorityHBox.hxx                      |    9 +++------
 vcl/source/control/NotebookbarPopup.cxx       |    2 +-
 vcl/source/window/NotebookBarAddonsMerger.cxx |    2 +-
 vcl/source/window/builder.cxx                 |    2 +-
 7 files changed, 10 insertions(+), 16 deletions(-)

New commits:
commit ad76e0ab49afa46ac2addf99d3c486f0812dc39d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Feb 28 20:56:58 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Mar 1 12:28:27 2021 +0100

    IPrioritable.hxx can move into private headers
    
    Change-Id: I3046d91d18363e61fd4c94a94291ad8b2e97fd70
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111722
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 7b5326ce4b18..b02bc17441ee 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6420,7 +6420,6 @@ include/vcl/metaact.hxx
 include/vcl/metaactiontypes.hxx
 include/vcl/metric.hxx
 include/vcl/mnemonic.hxx
-include/vcl/notebookbar/IPrioritable.hxx
 include/vcl/notebookbar/notebookbar.hxx
 include/vcl/oldprintadaptor.hxx
 include/vcl/opengl/OpenGLContext.hxx
@@ -14443,6 +14442,7 @@ vcl/headless/svpprn.cxx
 vcl/headless/svptext.cxx
 vcl/headless/svpvd.cxx
 vcl/inc/IconThemeSelector.hxx
+vcl/inc/IPrioritable.hxx
 vcl/inc/PhysicalFontCollection.hxx
 vcl/inc/PhysicalFontFace.hxx
 vcl/inc/PhysicalFontFamily.hxx
diff --git a/vcl/inc/DropdownBox.hxx b/vcl/inc/DropdownBox.hxx
index 4f60cd4f67e1..8a81788c4e66 100644
--- a/vcl/inc/DropdownBox.hxx
+++ b/vcl/inc/DropdownBox.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SFX2_NOTEBOOKBAR_DROPDOWNBOX_HXX
 #define INCLUDED_SFX2_NOTEBOOKBAR_DROPDOWNBOX_HXX
 
-#include <vcl/notebookbar/IPrioritable.hxx>
 #include <vcl/layout.hxx>
+#include "IPrioritable.hxx"
 #include "NotebookbarPopup.hxx"
 
 class DropdownBox : public VclHBox, public vcl::IPrioritable
diff --git a/include/vcl/notebookbar/IPrioritable.hxx b/vcl/inc/IPrioritable.hxx
similarity index 100%
rename from include/vcl/notebookbar/IPrioritable.hxx
rename to vcl/inc/IPrioritable.hxx
diff --git a/vcl/inc/OptionalBox.hxx b/vcl/inc/OptionalBox.hxx
index 54c7b720508b..05ab1cbf0cff 100644
--- a/vcl/inc/OptionalBox.hxx
+++ b/vcl/inc/OptionalBox.hxx
@@ -17,11 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_OPTIONALBOX_HXX
-#define INCLUDED_VCL_OPTIONALBOX_HXX
+#pragma once
 
-#include <vcl/notebookbar/IPrioritable.hxx>
 #include <vcl/layout.hxx>
+#include "IPrioritable.hxx"
 
 class OptionalBox final : public VclHBox, public vcl::IPrioritable
 {
@@ -37,6 +36,4 @@ public:
     bool IsHidden() override;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/PriorityHBox.hxx b/vcl/inc/PriorityHBox.hxx
index e3e8c4c19b9c..8c5529ec8860 100644
--- a/vcl/inc/PriorityHBox.hxx
+++ b/vcl/inc/PriorityHBox.hxx
@@ -17,14 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/notebookbar/IPrioritable.hxx>
+#pragma once
+
 #include <vcl/layout.hxx>
+#include "IPrioritable.hxx"
 
 #include <vector>
 
-#ifndef INCLUDED_SFX2_NOTEBOOKBAR_PRIORITYHBOX_HXX
-#define INCLUDED_SFX2_NOTEBOOKBAR_PRIORITYHBOX_HXX
-
 /*
  * PriorityHBox is a VclHBox which hides its own children if there is no sufficient space.
  * Hiding order can be modified using child's priorities. If a control have default
@@ -58,6 +57,4 @@ public:
     virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/NotebookbarPopup.cxx b/vcl/source/control/NotebookbarPopup.cxx
index 48368776da87..3cc21815ab84 100644
--- a/vcl/source/control/NotebookbarPopup.cxx
+++ b/vcl/source/control/NotebookbarPopup.cxx
@@ -7,10 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <vcl/notebookbar/IPrioritable.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/layout.hxx>
+#include <IPrioritable.hxx>
 #include <NotebookbarPopup.hxx>
 
 NotebookbarPopup::NotebookbarPopup(const VclPtr<VclHBox>& pParent)
diff --git a/vcl/source/window/NotebookBarAddonsMerger.cxx b/vcl/source/window/NotebookBarAddonsMerger.cxx
index d5446032a248..f7cdbb2c3227 100644
--- a/vcl/source/window/NotebookBarAddonsMerger.cxx
+++ b/vcl/source/window/NotebookBarAddonsMerger.cxx
@@ -21,12 +21,12 @@
 
 #include <cstddef>
 
-#include <vcl/notebookbar/IPrioritable.hxx>
 #include <vcl/notebookbar/NotebookBarAddonsMerger.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/toolbox.hxx>
+#include <IPrioritable.hxx>
 #include <OptionalBox.hxx>
 
 const char STYLE_TEXT[] = "Text";
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 62681345ca6b..4519ae6e2ead 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -34,7 +34,6 @@
 #include <vcl/toolkit/fixed.hxx>
 #include <vcl/toolkit/fixedhyper.hxx>
 #include <vcl/headbar.hxx>
-#include <vcl/notebookbar/IPrioritable.hxx>
 #include <vcl/notebookbar/NotebookBarAddonsMerger.hxx>
 #include <vcl/toolkit/ivctrl.hxx>
 #include <vcl/layout.hxx>
@@ -64,6 +63,7 @@
 #include <messagedialog.hxx>
 #include <ContextVBox.hxx>
 #include <DropdownBox.hxx>
+#include <IPrioritable.hxx>
 #include <OptionalBox.hxx>
 #include <PriorityMergedHBox.hxx>
 #include <PriorityHBox.hxx>