tdf#42949 Fix IWYU warnings in vcl/qa/* & vcl/backendtest/*

Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I2d5ab9fd1117a4c57eb42ca849daf0949a79ff50 Reviewed-on: https://gerrit.libreoffice.org/73999 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-06-14 00:40:47 +02:00 · 2019-06-14 00:40:47 +02:00 · 54d63ea296
commit 54d63ea296
parent e191cacf62
34 changed files with 10 additions and 111 deletions
--- a/vcl/IwyuFilter_vcl.yaml
+++ b/vcl/IwyuFilter_vcl.yaml
@ -22,3 +22,6 @@ blacklist:
    vcl/inc/unx/saldisp.hxx:
    # Don't replace with generated header
    - epoxy/glx.h
+    vcl/qa/cppunit/outdev.cxx:
+    # Needed for direct member access
+    - basegfx/matrix/b2dhommatrix.hxx
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@ -8,39 +8,23 @@
 */

 #include <math.h>
-#include <rtl/math.hxx>
 #include <sal/log.hxx>

 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/bootstrap.hxx>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/registry/XSimpleRegistry.hpp>
-#include <com/sun/star/ucb/UniversalContentBroker.hpp>

-#include <osl/time.h>
+#include <vcl/event.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/vclmain.hxx>
-#include <vcl/layout.hxx>
-#include <salhelper/thread.hxx>

-#include <tools/urlobj.hxx>
-#include <tools/stream.hxx>
-#include <tools/poly.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/pngread.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/graphicfilter.hxx>
-#include <vcl/button.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/pngwrite.hxx>
-#include <vcl/floatwin.hxx>
-#include <vcl/bitmapaccess.hxx>
-#include <vcl/help.hxx>

 #include <basegfx/numeric/ftools.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <tools/diagnose_ex.h>

 #include <chrono>
--- a/vcl/qa/api/XGraphicTest.cxx
+++ b/vcl/qa/api/XGraphicTest.cxx
@ -9,19 +9,15 @@

 #include <test/bootstrapfixture.hxx>

-#include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/graphic/GraphicType.hpp>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/Size.hpp>

 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>

-#include <rtl/uri.hxx>
-
 namespace
 {
 using namespace css;
--- a/vcl/qa/cppunit/BitmapExTest.cxx
+++ b/vcl/qa/cppunit/BitmapExTest.cxx
@ -10,7 +10,6 @@
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>

 #include <vcl/bitmapex.hxx>
 #include <bitmapwriteaccess.hxx>
--- a/vcl/qa/cppunit/BitmapProcessorTest.cxx
+++ b/vcl/qa/cppunit/BitmapProcessorTest.cxx
@ -15,12 +15,6 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/alpha.hxx>
-#include <vcl/virdev.hxx>
-
-#include <rtl/strbuf.hxx>
-#include <tools/stream.hxx>
-#include <vcl/graphicfilter.hxx>
-#include <config_features.h>

 #include <BitmapDisabledImageFilter.hxx>
 #include <bitmapwriteaccess.hxx>
--- a/vcl/qa/cppunit/BitmapScaleTest.cxx
+++ b/vcl/qa/cppunit/BitmapScaleTest.cxx
@ -10,22 +10,15 @@
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>

 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapaccess.hxx>
-#include <vcl/alpha.hxx>

-#include <rtl/strbuf.hxx>
 #include <tools/stream.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <config_features.h>

-#include <vcl/BitmapTools.hxx>
 #include <BitmapSymmetryCheck.hxx>
 #include <bitmapwriteaccess.hxx>
-#include <svdata.hxx>
-#include <salinst.hxx>

 namespace
 {
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@ -19,8 +19,6 @@
 #include <vcl/virdev.hxx>

 #include <rtl/strbuf.hxx>
-#include <tools/stream.hxx>
-#include <vcl/graphicfilter.hxx>
 #include <config_features.h>
 #if HAVE_FEATURE_OPENGL
 #include <vcl/opengl/OpenGLHelper.hxx>
--- a/vcl/qa/cppunit/FontFeatureTest.cxx
+++ b/vcl/qa/cppunit/FontFeatureTest.cxx
@ -10,7 +10,6 @@
 #include <test/bootstrapfixture.hxx>
 #include <config_features.h>
 #include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>

 #include <vcl/font/Feature.hxx>
 #include <vcl/font/FeatureParser.hxx>
--- a/vcl/qa/cppunit/GraphicDescriptorTest.cxx
+++ b/vcl/qa/cppunit/GraphicDescriptorTest.cxx
@ -10,12 +10,10 @@
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>

 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>

-#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <tools/stream.hxx>

--- a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
+++ b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx
@ -8,16 +8,9 @@
 */

 #include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
 #include <unotest/bootstrapfixturebase.hxx>

-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-
-#include <vcl/graph.hxx>
-#include <vcl/graphicfilter.hxx>
 #include <graphic/GraphicFormatDetector.hxx>

 #include <tools/stream.hxx>
--- a/vcl/qa/cppunit/GraphicTest.cxx
+++ b/vcl/qa/cppunit/GraphicTest.cxx
@ -18,7 +18,6 @@
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <tools/stream.hxx>
-#include <vcl/pngwrite.hxx>

 using namespace css;

--- a/vcl/qa/cppunit/ScanlineToolsTest.cxx
+++ b/vcl/qa/cppunit/ScanlineToolsTest.cxx
@ -10,7 +10,6 @@
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>

 #include <bitmap/ScanlineTools.hxx>

--- a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
@ -9,15 +9,12 @@

 #include <stdexcept>

-#include <sal/types.h>
-
 #include <rtl/ustring.hxx>
 #include <vcl/IconThemeInfo.hxx>

 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>

 using namespace vcl;

--- a/vcl/qa/cppunit/app/test_IconThemeScanner.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeScanner.cxx
@ -9,8 +9,6 @@

 #include <stdexcept>

-#include <sal/types.h>
-
 #include <rtl/ustring.hxx>
 #include <vcl/IconThemeScanner.hxx>
 #include <vcl/IconThemeInfo.hxx>
@ -18,7 +16,6 @@
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>

 class IconThemeScannerTest : public CppUnit::TestFixture
 {
--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
@ -9,7 +9,6 @@

 #include <vcl/IconThemeSelector.hxx>

-#include <vcl/IconThemeScanner.hxx>
 #include <vcl/IconThemeInfo.hxx>

 #include <cppunit/TestAssert.h>
--- a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
+++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
@ -7,7 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <unotest/filters-test.hxx>
 #include <test/bootstrapfixture.hxx>

 #include <vcl/virdev.hxx>
@ -15,7 +14,6 @@
 #include <vcl/svapp.hxx>

 #include <tools/stream.hxx>
-#include <vcl/pngwrite.hxx>

 #include <vcl/graphicfilter.hxx>
 #include <vcl/filter/PngImageReader.hxx>
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@ -29,16 +29,11 @@
 #include <com/sun/star/rendering/XBitmapPalette.hpp>

 #include <cppuhelper/implbase.hxx>
-#include <tools/diagnose_ex.h>
 #include <rtl/ref.hxx>
 #include <sal/log.hxx>

-#include <vcl/svapp.hxx>
 #include <vcl/canvastools.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/outdev.hxx>
 #include <vcl/bitmapaccess.hxx>
-#include <vcl/virdev.hxx>
 #include <vcl/bitmapex.hxx>

 #include <canvasbitmap.hxx>
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@ -15,7 +15,6 @@
 static std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec);
 #endif

-#include <unotest/filters-test.hxx>
 #include <test/bootstrapfixture.hxx>

 #include <vcl/wrkwin.hxx>
@ -24,9 +23,6 @@ static std::ostream& operator<<(std::ostream& rStream, const std::vector<long>&
 #include <sallayout.hxx>
 #include <salgdi.hxx>

-#include <osl/file.hxx>
-#include <osl/process.h>
-
 #if !defined(_WIN32) && HAVE_MORE_FONTS
 static std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec)
 {
--- a/vcl/qa/cppunit/errorhandler.cxx
+++ b/vcl/qa/cppunit/errorhandler.cxx
@ -9,7 +9,6 @@

 #include <test/bootstrapfixture.hxx>
 #include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>

 #include <vcl/errinf.hxx>

--- a/vcl/qa/cppunit/font.cxx
+++ b/vcl/qa/cppunit/font.cxx
@ -9,10 +9,6 @@

 #include <test/bootstrapfixture.hxx>
 #include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
-
-#include <osl/file.hxx>
-#include <osl/process.h>

 #include <vcl/font.hxx>

--- a/vcl/qa/cppunit/fontcharmap.cxx
+++ b/vcl/qa/cppunit/fontcharmap.cxx
@ -9,9 +9,6 @@

 #include <test/bootstrapfixture.hxx>

-#include <osl/file.hxx>
-#include <osl/process.h>
-
 #include <vcl/fontcharmap.hxx>

 class VclFontCharMapTest : public test::BootstrapFixture
--- a/vcl/qa/cppunit/fontmetric.cxx
+++ b/vcl/qa/cppunit/fontmetric.cxx
@ -9,15 +9,9 @@

 #include <test/bootstrapfixture.hxx>
 #include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
-
-#include <osl/file.hxx>
-#include <osl/process.h>

 #include <vcl/metric.hxx>

-#include <impfont.hxx>
-
 class VclFontMetricTest : public test::BootstrapFixture
 {
 public:
--- a/vcl/qa/cppunit/gen/gen.cxx
+++ b/vcl/qa/cppunit/gen/gen.cxx
@ -15,10 +15,8 @@
 #include <sfx2/sfxbasemodel.hxx>
 #include <test/unoapi_test.hxx>
 #include <vcl/bitmapaccess.hxx>
-#include <vcl/pngwrite.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/virdev.hxx>
-#include <tools/stream.hxx>

 using namespace com::sun::star;

--- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
@ -10,9 +10,6 @@
 #include <unotest/filters-test.hxx>
 #include <test/bootstrapfixture.hxx>

-#include <osl/file.hxx>
-#include <osl/process.h>
-
 #include <comphelper/fileformat.h>

 #include <vcl/graphicfilter.hxx>
--- a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
+++ b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
@ -8,10 +8,8 @@
 *
 */

-#include <test/setupvcl.hxx>
 #include <unotest/bootstrapfixturebase.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <vcl/bitmapaccess.hxx>
 #include <bitmapwriteaccess.hxx>
 #include <tools/stream.hxx>

--- a/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx
+++ b/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx
@ -8,11 +8,9 @@
 *
 */

-#include <test/setupvcl.hxx>
 #include <unotest/bootstrapfixturebase.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/bitmapaccess.hxx>
-#include <bitmapwriteaccess.hxx>
 #include <tools/stream.hxx>

 static OUString const gaDataUrl("/vcl/qa/cppunit/jpeg/data/");
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@ -7,7 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <unotest/filters-test.hxx>
 #include <test/bootstrapfixture.hxx>

 #include <vcl/wrkwin.hxx>
@ -19,7 +18,6 @@
 #include <vcl/tabctrl.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/layout.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/scheduler.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
--- a/vcl/qa/cppunit/mnemonic.cxx
+++ b/vcl/qa/cppunit/mnemonic.cxx
@ -9,10 +9,6 @@

 #include <test/bootstrapfixture.hxx>
 #include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
-
-#include <osl/file.hxx>
-#include <osl/process.h>

 #include <vcl/mnemonic.hxx>

--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@ -7,16 +7,11 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <unotest/filters-test.hxx>
 #include <test/bootstrapfixture.hxx>

 #include <vcl/virdev.hxx>
 #include <vcl/bitmapaccess.hxx>
-#include <vcl/wrkwin.hxx>

-#include <tools/stream.hxx>
-#include <vcl/pngwrite.hxx>
-#include <sal/log.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>

 class VclOutdevTest : public test::BootstrapFixture
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@ -22,7 +22,6 @@

 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
-#include <cppuhelper/implbase.hxx>
 #include <test/bootstrapfixture.hxx>
 #include <unotest/macros_test.hxx>
 #include <unotools/mediadescriptor.hxx>
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@ -10,9 +10,11 @@

 #include <test/bootstrapfixture.hxx>
 #include <test/xmltesttools.hxx>
-#include <vcl/metaact.hxx>
+#include <vcl/gdimtf.hxx>
+#include <vcl/gradient.hxx>
+#include <vcl/hatch.hxx>
+#include <vcl/lineinfo.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/bitmapaccess.hxx>
 #include <bitmapwriteaccess.hxx>
 #include <vcl/pngwrite.hxx>

--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@ -13,7 +13,6 @@
 #include <test/bootstrapfixture.hxx>

 #include <osl/thread.hxx>
-#include <salhelper/thread.hxx>
 #include <chrono>

 #include <vcl/timer.hxx>
--- a/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx
+++ b/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx
@ -8,7 +8,6 @@
 */

 #include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 #include <unotest/bootstrapfixturebase.hxx>
--- a/vcl/qa/unit/vcl-dialogs-test.cxx
+++ b/vcl/qa/unit/vcl-dialogs-test.cxx
@ -9,9 +9,6 @@

 #include <sal/config.h>
 #include <test/screenshot_test.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <sfx2/app.hxx>
 #include <vcl/abstdlg.hxx>

 using namespace ::com::sun::star;