remove or change salbtype.hxx includes

Change-Id: Ibd28b8fa92e98ebeb482a9081fbeae24defe4adb
Reviewed-on: https://gerrit.libreoffice.org/70826
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

21 files changed, 4 insertions, 22 deletions

diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index 81b062fefdc1..c15fdf9e16b8 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -13,7 +13,7 @@
 #include <config_cairo_canvas.h>
 #include <vcl/bitmapex.hxx>
 #include <vcl/ImageTree.hxx>
-#include <vcl/salbtype.hxx>
+#include <vcl/BitmapColor.hxx>
 #if ENABLE_CAIRO_CANVAS
 #include <vcl/cairo.hxx>
 #endif
diff --git a/include/vcl/dibtools.hxx b/include/vcl/dibtools.hxx
index 6c05ca56a172..c5fa662ebb73 100644
--- a/include/vcl/dibtools.hxx
+++ b/include/vcl/dibtools.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_VCL_DIBTOOLS_HXX
 
 #include <vcl/dllapi.h>
-#include <vcl/salbtype.hxx>
+#include <vcl/Scanline.hxx>
 
 // predefines
 
diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx
index 398e5e2d3643..b98281f2346f 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -36,7 +36,6 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/pngwrite.hxx>
 #include <vcl/floatwin.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/help.hxx>
 
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 1e2af987fd56..0ae01dbb2c9f 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -30,7 +30,6 @@
 #include <basegfx/range/b2ibox.hxx>
 #include <o3tl/safeint.hxx>
 #include <tools/helpers.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/bitmap.hxx>
 
 using namespace basegfx;
diff --git a/vcl/inc/bitmap/Octree.hxx b/vcl/inc/bitmap/Octree.hxx
index 3336c115106f..7e222eb01e91 100644
--- a/vcl/inc/bitmap/Octree.hxx
+++ b/vcl/inc/bitmap/Octree.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_VCL_INC_OCTREE_HXX
 #define INCLUDED_VCL_INC_OCTREE_HXX
 
-#include <vcl/salbtype.hxx>
 #include <vcl/dllapi.h>
+#include <vcl/BitmapColor.hxx>
 
 struct OctreeNode
 {
diff --git a/vcl/qa/cppunit/BackendTest.cxx b/vcl/qa/cppunit/BackendTest.cxx
index 0dc336aa99a4..485633e1a91c 100644
--- a/vcl/qa/cppunit/BackendTest.cxx
+++ b/vcl/qa/cppunit/BackendTest.cxx
@@ -10,8 +10,6 @@
 
 #include <test/bootstrapfixture.hxx>
 
-#include <vcl/salbtype.hxx>
-
 #include <vcl/bitmap.hxx>
 #include <tools/stream.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/vcl/qa/cppunit/bitmapcolor.cxx b/vcl/qa/cppunit/bitmapcolor.cxx
index 879bc78d7d1d..2de8533ef986 100644
--- a/vcl/qa/cppunit/bitmapcolor.cxx
+++ b/vcl/qa/cppunit/bitmapcolor.cxx
@@ -20,7 +20,7 @@
 // bootstrap stuff
 #include <test/bootstrapfixture.hxx>
 
-#include <vcl/salbtype.hxx>
+#include <vcl/BitmapColor.hxx>
 
 namespace
 {
diff --git a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
index efb3dcfbcb2e..b363da7386a1 100644
--- a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
+++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
@@ -11,7 +11,6 @@
 #include <test/bootstrapfixture.hxx>
 
 #include <vcl/virdev.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index cf6ee60a486a..82cfe44ead62 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -11,7 +11,6 @@
 #include <test/bootstrapfixture.hxx>
 
 #include <vcl/virdev.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/wrkwin.hxx>
 
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index 5610c7347755..380d46a7f7f7 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -27,7 +27,6 @@
 #include <vcl/dibtools.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/virdev.hxx>
 #if ENABLE_CAIRO_CANVAS
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 3c0df290b217..7c90e6d349ef 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -29,7 +29,6 @@
 #include <unotools/resmgr.hxx>
 
 #include <vcl/ImageTree.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/bitmapex.hxx>
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index cc4e86a54460..a0b9427b24b1 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/salbtype.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapaccess.hxx>
 
diff --git a/vcl/source/gdi/bmpacc2.cxx b/vcl/source/gdi/bmpacc2.cxx
index 1b03e854ef48..4ac7b84c3e7c 100644
--- a/vcl/source/gdi/bmpacc2.cxx
+++ b/vcl/source/gdi/bmpacc2.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/salbtype.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/BitmapTools.hxx>
 
diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx
index bdaf8e889c80..f6ffe913de36 100644
--- a/vcl/source/gdi/bmpacc3.cxx
+++ b/vcl/source/gdi/bmpacc3.cxx
@@ -19,7 +19,6 @@
 
 #include <tools/poly.hxx>
 
-#include <vcl/salbtype.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/region.hxx>
 #include <vcl/bitmapaccess.hxx>
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 7070b6783165..b04296259f50 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -22,7 +22,6 @@
 
 #include <cassert>
 
-#include <vcl/salbtype.hxx>
 #include <vcl/dibtools.hxx>
 #include <comphelper/fileformat.h>
 #include <tools/zcodec.hxx>
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 355744aa3dad..eb730fe578a7 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -27,7 +27,6 @@
 #include <tools/vcompat.hxx>
 #include <tools/fract.hxx>
 #include <vcl/metaact.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/window.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index d07ee741b618..77003226a75d 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <vcl/bitmapaccess.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/salgtype.hxx>
 #include <bmpfast.hxx>
 #include <o3tl/safeint.hxx>
diff --git a/vcl/source/graphic/UnoGraphicTransformer.cxx b/vcl/source/graphic/UnoGraphicTransformer.cxx
index af1ed9a7f6fd..f50101fff6f4 100644
--- a/vcl/source/graphic/UnoGraphicTransformer.cxx
+++ b/vcl/source/graphic/UnoGraphicTransformer.cxx
@@ -25,7 +25,6 @@
 #include <vcl/image.hxx>
 #include <vcl/metaact.hxx>
 #include <svl/solar.hrc>
-#include <vcl/salbtype.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/BitmapDuoToneFilter.hxx>
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index 72ce02ed2642..c53d800beb14 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -54,7 +54,6 @@
 #include <tools/diagnose_ex.h>
 #include <rtl/uuid.h>
 
-#include <vcl/salbtype.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/bitmapex.hxx>
 
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 0a5d58142978..16fb939290b4 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -18,7 +18,6 @@
 #include <sal/log.hxx>
 #include <tools/stream.hxx>
 #include <config_folders.h>
-#include <vcl/salbtype.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <memory>
 #include <vcl/pngwrite.hxx>
diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index e93f44ac9a69..89319393c8b7 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -25,7 +25,6 @@
 
 #include <vcl/hatch.hxx>
 #include <vcl/metaact.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>