summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-08-12 11:03:48 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-08-12 20:23:20 +0200
commit70a008181aef33272346e7ae45f8838354346ead (patch)
tree6d4e0e87d15e27d38639bbae1e6832a2f9b4a233 /vcl
parent4ddafa14d70567a4e4581310a7cc83eafc1b776f (diff)
SvTreeListBox can move into toolkit headers now
Change-Id: I6b3b6ef1530a192f4b6bf87aa9688687063683ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100591 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/iconview.hxx2
-rw-r--r--vcl/inc/pch/precompiled_vcl.hxx10
-rw-r--r--vcl/inc/svimpbox.hxx2
-rw-r--r--vcl/source/app/salvtables.cxx4
-rw-r--r--vcl/source/treelist/iconview.cxx4
-rw-r--r--vcl/source/treelist/svimpbox.cxx6
-rw-r--r--vcl/source/treelist/svlbitm.cxx6
-rw-r--r--vcl/source/treelist/svtabbx.cxx2
-rw-r--r--vcl/source/treelist/treelist.cxx6
-rw-r--r--vcl/source/treelist/treelistbox.cxx6
-rw-r--r--vcl/source/treelist/treelistentry.cxx2
-rw-r--r--vcl/source/treelist/uiobject.cxx4
-rw-r--r--vcl/source/treelist/viewdataentry.cxx2
-rw-r--r--vcl/source/window/builder.cxx2
14 files changed, 29 insertions, 29 deletions
diff --git a/vcl/inc/iconview.hxx b/vcl/inc/iconview.hxx
index 09d1a0b02fe7..f9b623688621 100644
--- a/vcl/inc/iconview.hxx
+++ b/vcl/inc/iconview.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVTOOLS_ICONVIEW_HXX
#define INCLUDED_SVTOOLS_ICONVIEW_HXX
-#include <vcl/treelistbox.hxx>
+#include <vcl/toolkit/treelistbox.hxx>
class IconView final : public SvTreeListBox
{
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 966e842b43bc..b6fa73b6d062 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-08-10 21:11:12 using:
+ Generated on 2020-08-12 11:16:23 using:
./bin/update_pch vcl vcl --cutoff=6 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -321,11 +321,12 @@
#include <vcl/toolkit/lstbox.hxx>
#include <vcl/toolkit/spinfld.hxx>
#include <vcl/toolkit/svlbitm.hxx>
+#include <vcl/toolkit/treelist.hxx>
+#include <vcl/toolkit/treelistentries.hxx>
+#include <vcl/toolkit/treelistentry.hxx>
#include <vcl/toolkit/unowrap.hxx>
+#include <vcl/toolkit/viewdataentry.hxx>
#include <vcl/transfer.hxx>
-#include <vcl/treelist.hxx>
-#include <vcl/treelistentries.hxx>
-#include <vcl/treelistentry.hxx>
#include <vcl/uitest/logger.hxx>
#include <vcl/uitest/uiobject.hxx>
#include <vcl/unohelp.hxx>
@@ -333,7 +334,6 @@
#include <vcl/vclevent.hxx>
#include <vcl/vclmedit.hxx>
#include <vcl/vclptr.hxx>
-#include <vcl/viewdataentry.hxx>
#include <vcl/virdev.hxx>
#include <vcl/weld.hxx>
#include <vcl/window.hxx>
diff --git a/vcl/inc/svimpbox.hxx b/vcl/inc/svimpbox.hxx
index cb52069ca41b..02f8de6d8c72 100644
--- a/vcl/inc/svimpbox.hxx
+++ b/vcl/inc/svimpbox.hxx
@@ -27,7 +27,7 @@
#include <vcl/image.hxx>
#include <vcl/svtaccessiblefactory.hxx>
#include <vcl/vclevent.hxx>
-#include <vcl/treelistbox.hxx>
+#include <vcl/toolkit/treelistbox.hxx>
#include <o3tl/enumarray.hxx>
#include <memory>
#include <vector>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 0c5d40fa45fa..2a138f1575a1 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -61,13 +61,13 @@
#include <vcl/toolkit/svtabbx.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
-#include <vcl/treelistentry.hxx>
+#include <vcl/toolkit/treelistentry.hxx>
#include <vcl/toolkit/throbber.hxx>
#include <vcl/toolkit/unowrap.hxx>
#include <vcl/weld.hxx>
#include <vcl/weldutils.hxx>
#include <vcl/vclmedit.hxx>
-#include <vcl/viewdataentry.hxx>
+#include <vcl/toolkit/viewdataentry.hxx>
#include <vcl/virdev.hxx>
#include <bitmaps.hlst>
#include <calendar.hxx>
diff --git a/vcl/source/treelist/iconview.cxx b/vcl/source/treelist/iconview.cxx
index 162096bff04c..9e0ab737b2c3 100644
--- a/vcl/source/treelist/iconview.cxx
+++ b/vcl/source/treelist/iconview.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/treelistentry.hxx>
-#include <vcl/viewdataentry.hxx>
+#include <vcl/toolkit/treelistentry.hxx>
+#include <vcl/toolkit/viewdataentry.hxx>
#include <iconview.hxx>
#include "iconviewimpl.hxx"
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index ac8f4cfeb621..e8bd4da9ca0c 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -30,7 +30,7 @@
#include <memory>
#include <stack>
-#include <vcl/treelistbox.hxx>
+#include <vcl/toolkit/treelistbox.hxx>
#include <vcl/toolkit/svlbitm.hxx>
#include <tools/wintypes.hxx>
#include <bitmaps.hlst>
@@ -40,8 +40,8 @@
#include <i18nlangtag/languagetag.hxx>
#include <tools/debug.hxx>
-#include <vcl/treelistentry.hxx>
-#include <vcl/viewdataentry.hxx>
+#include <vcl/toolkit/treelistentry.hxx>
+#include <vcl/toolkit/viewdataentry.hxx>
// #i27063# (pl), #i32300# (pb) never access VCL after DeInitVCL - also no destructors
Image* SvImpLBox::s_pDefCollapsed = nullptr;
diff --git a/vcl/source/treelist/svlbitm.cxx b/vcl/source/treelist/svlbitm.cxx
index 8b072424d072..87a32e9612a9 100644
--- a/vcl/source/treelist/svlbitm.cxx
+++ b/vcl/source/treelist/svlbitm.cxx
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/treelistbox.hxx>
+#include <vcl/toolkit/treelistbox.hxx>
#include <vcl/toolkit/svlbitm.hxx>
-#include <vcl/treelistentry.hxx>
-#include <vcl/viewdataentry.hxx>
+#include <vcl/toolkit/treelistentry.hxx>
+#include <vcl/toolkit/viewdataentry.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolkit/button.hxx>
#include <vcl/decoview.hxx>
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index 9e712c70c827..2504cf2e1fd6 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -22,7 +22,7 @@
#include <vcl/toolkit/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <vcl/toolkit/svlbitm.hxx>
-#include <vcl/treelistentry.hxx>
+#include <vcl/toolkit/treelistentry.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <rtl/ustrbuf.hxx>
diff --git a/vcl/source/treelist/treelist.cxx b/vcl/source/treelist/treelist.cxx
index c9d6c264eaaf..537cf2a5429c 100644
--- a/vcl/source/treelist/treelist.cxx
+++ b/vcl/source/treelist/treelist.cxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/treelist.hxx>
-#include <vcl/treelistentry.hxx>
-#include <vcl/viewdataentry.hxx>
+#include <vcl/toolkit/treelist.hxx>
+#include <vcl/toolkit/treelistentry.hxx>
+#include <vcl/toolkit/viewdataentry.hxx>
#include <tools/debug.hxx>
#include <osl/diagnose.h>
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index c2a15925f125..74be3d890402 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -23,7 +23,7 @@
- SelectAll( false ) => only repaint the deselected entries
*/
-#include <vcl/treelistbox.hxx>
+#include <vcl/toolkit/treelistbox.hxx>
#include <vcl/accessiblefactory.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <vcl/svapp.hxx>
@@ -41,8 +41,8 @@
#include <tools/debug.hxx>
#include <vcl/toolkit/svlbitm.hxx>
-#include <vcl/treelistentry.hxx>
-#include <vcl/viewdataentry.hxx>
+#include <vcl/toolkit/treelistentry.hxx>
+#include <vcl/toolkit/viewdataentry.hxx>
#include <svimpbox.hxx>
#include <set>
diff --git a/vcl/source/treelist/treelistentry.cxx b/vcl/source/treelist/treelistentry.cxx
index 5ffd4428b758..46f95aad2f15 100644
--- a/vcl/source/treelist/treelistentry.cxx
+++ b/vcl/source/treelist/treelistentry.cxx
@@ -18,7 +18,7 @@
*/
#include <memory>
-#include <vcl/treelistentry.hxx>
+#include <vcl/toolkit/treelistentry.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <tools/debug.hxx>
diff --git a/vcl/source/treelist/uiobject.cxx b/vcl/source/treelist/uiobject.cxx
index 9256321688dd..1c9146c51101 100644
--- a/vcl/source/treelist/uiobject.cxx
+++ b/vcl/source/treelist/uiobject.cxx
@@ -10,8 +10,8 @@
#include <memory>
#include <vcl/toolkit/svlbitm.hxx>
#include <vcl/uitest/uiobject.hxx>
-#include <vcl/treelistbox.hxx>
-#include <vcl/treelistentry.hxx>
+#include <vcl/toolkit/treelistbox.hxx>
+#include <vcl/toolkit/treelistentry.hxx>
TreeListUIObject::TreeListUIObject(const VclPtr<SvTreeListBox>& xTreeList):
WindowUIObject(xTreeList),
diff --git a/vcl/source/treelist/viewdataentry.cxx b/vcl/source/treelist/viewdataentry.cxx
index f5fbf8e0bdfb..b14d479310af 100644
--- a/vcl/source/treelist/viewdataentry.cxx
+++ b/vcl/source/treelist/viewdataentry.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/viewdataentry.hxx>
+#include <vcl/toolkit/viewdataentry.hxx>
SvViewDataEntry::SvViewDataEntry() :
nVisPos(0),
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 2d27f27e9f1a..b7e77efb7c17 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -46,7 +46,7 @@
#include <vcl/tabpage.hxx>
#include <vcl/toolkit/throbber.hxx>
#include <vcl/toolbox.hxx>
-#include <vcl/treelistentry.hxx>
+#include <vcl/toolkit/treelistentry.hxx>
#include <vcl/vclmedit.hxx>
#include <vcl/settings.hxx>
#include <slider.hxx>