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

[Noel Grandin (via logerrit)]

 sfx2/source/sidebar/ControlFactory.cxx |    2 +-
 sfx2/source/sidebar/TabBar.cxx         |    2 +-
 sfx2/source/sidebar/UnoSidebar.cxx     |    2 +-
 sfx2/source/view/sfxbasecontroller.cxx |    2 +-
 solenv/clang-format/blacklist          |    6 +++---
 vcl/source/filter/graphicfilter.cxx    |    2 +-
 vcl/workben/fftester.cxx               |    2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 0c6004584342b3826223c64eb7d0345276faf4b6
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri May 1 14:43:07 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri May 1 15:26:42 2020 +0200

    move some headers inside their respective modules
    
    Change-Id: I6b463724e301989a60e423bbfc25aa1bf146ff5e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93267
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/sfx2/inc/sidebar/ControlFactory.hxx
similarity index 100%
rename from include/sfx2/sidebar/ControlFactory.hxx
rename to sfx2/inc/sidebar/ControlFactory.hxx
diff --git a/include/sfx2/sidebar/UnoSidebar.hxx b/sfx2/inc/sidebar/UnoSidebar.hxx
similarity index 100%
rename from include/sfx2/sidebar/UnoSidebar.hxx
rename to sfx2/inc/sidebar/UnoSidebar.hxx
diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx
index 5e4d03ac3c0a..d2d3d27dde32 100644
--- a/sfx2/source/sidebar/ControlFactory.cxx
+++ b/sfx2/source/sidebar/ControlFactory.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <sfx2/sidebar/ControlFactory.hxx>
+#include <sidebar/ControlFactory.hxx>
 
 #include <sidebar/MenuButton.hxx>
 #include <sidebar/TabItem.hxx>
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 515b2da36dba..4f49bd461364 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <sfx2/sidebar/TabBar.hxx>
-#include <sfx2/sidebar/ControlFactory.hxx>
+#include <sidebar/ControlFactory.hxx>
 #include <sidebar/DeckDescriptor.hxx>
 #include <sidebar/Paint.hxx>
 #include <sfx2/sidebar/Theme.hxx>
diff --git a/sfx2/source/sidebar/UnoSidebar.cxx b/sfx2/source/sidebar/UnoSidebar.cxx
index c209c6766d03..20a8728d5f29 100644
--- a/sfx2/source/sidebar/UnoSidebar.cxx
+++ b/sfx2/source/sidebar/UnoSidebar.cxx
@@ -8,7 +8,7 @@
  *
  */
 
-#include <sfx2/sidebar/UnoSidebar.hxx>
+#include <sidebar/UnoSidebar.hxx>
 #include <sidebar/Tools.hxx>
 
 #include <sfx2/sidebar/SidebarController.hxx>
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 9baebe0be2ff..a4706277e869 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -76,7 +76,7 @@
 #include <unordered_map>
 
 #include <com/sun/star/ui/XSidebarProvider.hpp>
-#include <sfx2/sidebar/UnoSidebar.hxx>
+#include <sidebar/UnoSidebar.hxx>
 
 #define TIMEOUT_START_RESCHEDULE    10L /* 10th s */
 
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 6e1473605880..3313e70ba46c 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -6444,7 +6444,6 @@ include/sfx2/sfxuno.hxx
 include/sfx2/shell.hxx
 include/sfx2/sidebar/AsynchronousCall.hxx
 include/sfx2/sidebar/Context.hxx
-include/sfx2/sidebar/ControlFactory.hxx
 include/sfx2/sidebar/ControllerItem.hxx
 include/sfx2/sidebar/Deck.hxx
 include/sfx2/sidebar/FocusManager.hxx
@@ -6462,7 +6461,6 @@ include/sfx2/sidebar/SidebarPanelBase.hxx
 include/sfx2/sidebar/SidebarToolBox.hxx
 include/sfx2/sidebar/TabBar.hxx
 include/sfx2/sidebar/Theme.hxx
-include/sfx2/sidebar/UnoSidebar.hxx
 include/sfx2/signaturestate.hxx
 include/sfx2/stbitem.hxx
 include/sfx2/styfitem.hxx
@@ -7368,7 +7366,6 @@ include/vcl/extoutdevdata.hxx
 include/vcl/field.hxx
 include/vcl/fixed.hxx
 include/vcl/floatwin.hxx
-include/vcl/fltcall.hxx
 include/vcl/fmtfield.hxx
 include/vcl/fntstyle.hxx
 include/vcl/font.hxx
@@ -11999,6 +11996,7 @@ sfx2/inc/sidebar/Accessible.hxx
 sfx2/inc/sidebar/AccessibleTitleBar.hxx
 sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
 sfx2/inc/sidebar/ContextList.hxx
+sfx2/inc/sidebar/ControlFactory.hxx
 sfx2/inc/sidebar/ControllerFactory.hxx
 sfx2/inc/sidebar/DeckDescriptor.hxx
 sfx2/inc/sidebar/DeckLayouter.hxx
@@ -12015,6 +12013,7 @@ sfx2/inc/sidebar/UnoDeck.hxx
 sfx2/inc/sidebar/UnoDecks.hxx
 sfx2/inc/sidebar/UnoPanel.hxx
 sfx2/inc/sidebar/UnoPanels.hxx
+sfx2/inc/sidebar/UnoSidebar.hxx
 sfx2/inc/sorgitm.hxx
 sfx2/inc/srchdlg.hxx
 sfx2/inc/strings.hxx
@@ -16642,6 +16641,7 @@ vcl/inc/displayconnectiondispatch.hxx
 vcl/inc/dndeventdispatcher.hxx
 vcl/inc/dndlistenercontainer.hxx
 vcl/inc/factory.hxx
+vcl/inc/fltcall.hxx
 vcl/inc/fontattributes.hxx
 vcl/inc/fontinstance.hxx
 vcl/inc/fontselect.hxx
diff --git a/include/vcl/fltcall.hxx b/vcl/inc/fltcall.hxx
similarity index 100%
rename from include/vcl/fltcall.hxx
rename to vcl/inc/fltcall.hxx
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index e69686a3d99e..9593847dd276 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -30,7 +30,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/zcodec.hxx>
 #include <vcl/dibtools.hxx>
-#include <vcl/fltcall.hxx>
+#include <fltcall.hxx>
 #include <vcl/salctype.hxx>
 #include <vcl/pngread.hxx>
 #include <vcl/pngwrite.hxx>
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index 9325cb5b6748..66b51a5d38e1 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -41,7 +41,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wmf.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vcl/fltcall.hxx>
+#include <fltcall.hxx>
 #include <osl/file.hxx>
 #include <osl/module.hxx>
 #include <tools/stream.hxx>