tdf#62699 Drop (now) pass-through header include/vcl/salbtype.hxx
Change-Id: I2e2093ac3c8c6833b70d4932bc12a82a4483bde5
Reviewed-on: https://gerrit.libreoffice.org/76499
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py
index 591c73f..6d07e20 100755
--- a/compilerplugins/clang/unusedenumconstants.py
+++ b/compilerplugins/clang/unusedenumconstants.py
@@ -148,7 +148,6 @@ def is_ignore(srcLoc):
"vcl/inc/unx/gendata.hxx",
"vcl/inc/salwtype.hxx",
"include/vcl/svapp.hxx",
"include/vcl/salbtype.hxx",
"include/vcl/commandevent.hxx", # CommandEvent, MediaCommand, ShowDialogId
"include/canvas/rendering/irendermodule.hxx", # canvas::IRenderModule::PrimitiveType
"sal/osl/unx/file.cxx", # FileHandle_Impl::Kind
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 790d2a3..28de6ac 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -302,14 +302,6 @@ blacklist:
include/vcl/mtfxmldump.hxx:
# Full definition needed for o3tl::enumarray
- vcl/metaactiontypes.hxx
include/vcl/salbtype.hxx:
# TODO remove this file entirely, contains only these headers now
- vcl/BitmapAccessMode.hxx
- vcl/BitmapBuffer.hxx
- vcl/BitmapColor.hxx
- vcl/BitmapPalette.hxx
- vcl/ColorMask.hxx
- vcl/Scanline.hxx
include/vcl/outdevstate.hxx:
# Full definition needed for boost::optional
- vcl/mapmod.hxx
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
deleted file mode 100644
index 7eabfe7..0000000
--- a/include/vcl/salbtype.hxx
+++ /dev/null
@@ -1,32 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_VCL_SALBTYPE_HXX
#define INCLUDED_VCL_SALBTYPE_HXX
#include <vcl/Scanline.hxx>
#include <vcl/BitmapColor.hxx>
#include <vcl/BitmapPalette.hxx>
#include <vcl/ColorMask.hxx>
#include <vcl/BitmapBuffer.hxx>
#include <vcl/BitmapAccessMode.hxx>
#endif // INCLUDED_VCL_SALBTYPE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index ea4921c..0978262 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7908,7 +7908,6 @@ include/vcl/prntypes.hxx
include/vcl/ptrstyle.hxx
include/vcl/quickselectionengine.hxx
include/vcl/region.hxx
include/vcl/salbtype.hxx
include/vcl/salctype.hxx
include/vcl/salgtype.hxx
include/vcl/salnativewidgets.hxx
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index cb4151f..a5e6f51 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -22,7 +22,8 @@
#include <tools/gen.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/BitmapBuffer.hxx>
#include <vcl/BitmapPalette.hxx>
#include <quartz/salgdi.h>
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 4de793e..3fb8a39 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -28,7 +28,6 @@
#include <vcl/bitmap.hxx>
#include <vcl/checksum.hxx>
#include <vcl/outdev.hxx>
#include <vcl/salbtype.hxx>
#include <svdata.hxx>
#include <salgdi.hxx>
#include <vcleventlisteners.hxx>
diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index e0af455..157bf51 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -25,7 +25,6 @@
#include <svdata.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/pngwrite.hxx>
#include <opengl/framebuffer.hxx>
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index d3b9333..db4940c 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -8,7 +8,6 @@
*/
#include <memory>
#include <vcl/salbtype.hxx>
#include <vcl/lazydelete.hxx>
#include <svdata.hxx>
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 9936f15..fea2f5c 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -28,7 +28,12 @@
#include <basegfx/vector/b2ivector.hxx>
#include <tools/color.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/BitmapAccessMode.hxx>
#include <vcl/BitmapBuffer.hxx>
#include <vcl/BitmapColor.hxx>
#include <vcl/BitmapPalette.hxx>
#include <vcl/ColorMask.hxx>
#include <vcl/Scanline.hxx>
#include <bmpfast.hxx>
#include <quartz/salbmp.h>
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index aaca35a..350f585 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -25,7 +25,6 @@
#include "gdiimpl.hxx"
#include <vcl/salbtype.hxx>
#include <vcl/gradient.hxx>
#include <sal/log.hxx>
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
index d1301f1..b5173aa 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
@@ -11,7 +11,6 @@
#include <openglgdiimpl.hxx>
#include <salbmp.hxx>
#include <vcl/salbtype.hxx>
#include <cairo.h>
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index b8d4df7..745f246 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -34,7 +34,6 @@
#include <tools/helpers.hxx>
#include <tools/debug.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/salbtype.hxx>
#include <com/sun/star/beans/XFastPropertySet.hpp>
#include <unx/salunx.h>
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index ae6b0c1..63b952e 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -20,7 +20,6 @@
#include <poll.h>
#include <salgdiimpl.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/sysdata.hxx>
#include <sal/log.hxx>
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 91c08ef..1ee50ab 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -53,7 +53,6 @@
#include <X11/Xatom.h>
#include <dlfcn.h>
#include <vcl/salbtype.hxx>
#include <window.h>
#include <strings.hrc>
#include <bitmaps.hlst>
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index de4c124..43a99dc 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -54,7 +54,6 @@
#include <unx/gtk/gtkbackend.hxx>
#include <dlfcn.h>
#include <vcl/salbtype.hxx>
#include <window.h>
#include <strings.hrc>
#include <bitmaps.hlst>
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 10efebc..008f3a4 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -33,7 +33,9 @@
#include <win/salgdi.h>
#include <win/salbmp.h>
#include <win/scoped_gdi.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/BitmapAccessMode.hxx>
#include <vcl/BitmapBuffer.hxx>
#include <vcl/BitmapPalette.hxx>
#include <win/salframe.h>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <basegfx/utils/systemdependentdata.hxx>
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index 07e90d2..480154e 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -18,7 +18,11 @@
#include <svsys.h>
#include <vcl/bitmap.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/BitmapAccessMode.hxx>
#include <vcl/BitmapBuffer.hxx>
#include <vcl/BitmapPalette.hxx>
#include <vcl/ColorMask.hxx>
#include <vcl/Scanline.hxx>
#include <com/sun/star/beans/XFastPropertySet.hpp>
#include <win/wincomp.hxx>
#include <win/salgdi.h>
diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx
index ceddcb5..9c8e984 100644
--- a/vcl/win/gdi/salgdi2.cxx
+++ b/vcl/win/gdi/salgdi2.cxx
@@ -31,7 +31,10 @@
#include <win/salframe.h>
#include <opengl/salbmp.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/BitmapAccessMode.hxx>
#include <vcl/BitmapBuffer.hxx>
#include <vcl/BitmapPalette.hxx>
#include <vcl/Scanline.hxx>
#include <vcl/bitmapaccess.hxx>
#include <outdata.hxx>
#include <salgdiimpl.hxx>
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 9043672..01dc12f 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -44,7 +44,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>
#include <vcl/menu.hxx>
