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

[Caolán McNamara (via logerrit)]

 vcl/inc/DropdownBox.hxx                   |    2 +-
 vcl/inc/PriorityMergedHBox.hxx            |    2 +-
 vcl/source/control/NotebookbarPopup.cxx   |    2 +-
 vcl/source/control/PriorityMergedHBox.cxx |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 17e253a5de94ccce31300247fa53e05d9d499ff5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Feb 28 20:54:08 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Mar 1 10:11:41 2021 +0100

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

diff --git a/vcl/inc/DropdownBox.hxx b/vcl/inc/DropdownBox.hxx
index 3aa55b5ef367..4f60cd4f67e1 100644
--- a/vcl/inc/DropdownBox.hxx
+++ b/vcl/inc/DropdownBox.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_SFX2_NOTEBOOKBAR_DROPDOWNBOX_HXX
 
 #include <vcl/notebookbar/IPrioritable.hxx>
-#include <vcl/notebookbar/NotebookbarPopup.hxx>
 #include <vcl/layout.hxx>
+#include "NotebookbarPopup.hxx"
 
 class DropdownBox : public VclHBox, public vcl::IPrioritable
 {
diff --git a/include/vcl/notebookbar/NotebookbarPopup.hxx b/vcl/inc/NotebookbarPopup.hxx
similarity index 100%
rename from include/vcl/notebookbar/NotebookbarPopup.hxx
rename to vcl/inc/NotebookbarPopup.hxx
diff --git a/vcl/inc/PriorityMergedHBox.hxx b/vcl/inc/PriorityMergedHBox.hxx
index 15972d2d7531..548243c06f7c 100644
--- a/vcl/inc/PriorityMergedHBox.hxx
+++ b/vcl/inc/PriorityMergedHBox.hxx
@@ -19,8 +19,8 @@
 
 #include <vcl/toolkit/button.hxx>
 #include <vcl/layout.hxx>
+#include "NotebookbarPopup.hxx"
 #include "PriorityHBox.hxx"
-#include <vcl/notebookbar/NotebookbarPopup.hxx>
 
 class PriorityMergedHBox : public PriorityHBox
 {
diff --git a/vcl/source/control/NotebookbarPopup.cxx b/vcl/source/control/NotebookbarPopup.cxx
index 7a8aaadc0dd8..48368776da87 100644
--- a/vcl/source/control/NotebookbarPopup.cxx
+++ b/vcl/source/control/NotebookbarPopup.cxx
@@ -7,11 +7,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <vcl/notebookbar/NotebookbarPopup.hxx>
 #include <vcl/notebookbar/IPrioritable.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/layout.hxx>
+#include <NotebookbarPopup.hxx>
 
 NotebookbarPopup::NotebookbarPopup(const VclPtr<VclHBox>& pParent)
     : FloatingWindow(pParent, "Popup", "sfx/ui/notebookbarpopup.ui")
diff --git a/vcl/source/control/PriorityMergedHBox.cxx b/vcl/source/control/PriorityMergedHBox.cxx
index b2f16db25276..43b13b5175f8 100644
--- a/vcl/source/control/PriorityMergedHBox.cxx
+++ b/vcl/source/control/PriorityMergedHBox.cxx
@@ -20,9 +20,9 @@
 #include <vcl/toolkit/button.hxx>
 #include <vcl/layout.hxx>
 #include <bitmaps.hlst>
+#include <NotebookbarPopup.hxx>
 #include <PriorityHBox.hxx>
 #include <PriorityMergedHBox.hxx>
-#include <vcl/notebookbar/NotebookbarPopup.hxx>
 #include <comphelper/lok.hxx>
 
 #define DUMMY_WIDTH 50