diff options
31 files changed, 37 insertions, 89 deletions
diff --git a/tools/IwyuFilter_tools.yaml b/tools/IwyuFilter_tools.yaml new file mode 100644 index 000000000000..c24beaef25d9 --- /dev/null +++ b/tools/IwyuFilter_tools.yaml @@ -0,0 +1,34 @@ +--- +assumeFilename: tools/source/generic/gen.cxx +blacklist: + tools/qa/cppunit/test_pathutils.cxx: + # Needed for WIN32 specific unit test + - cppunit/TestAssert.h + - cppunit/plugin/TestPlugIn.h + - tools/pathutils.hxx + - cwchar + tools/source/debug/debug.cxx: + # Needed for linker visibility + - tools/diagnose_ex.h + tools/source/generic/poly.cxx: + # OSL_BIGENDIAN is being checked + - osl/endian.h + tools/source/misc/extendapplicationenvironment.cxx: + # Needed on MACOSX + - config_folders.h + # Needed for linker visibility + - tools/extendapplicationenvironment.hxx + tools/source/ref/ref.cxx: + # Don't replace with impl. detail + - tools/weakbase.hxx + tools/source/stream/strmwnt.cxx: + # WIN32-specific file + - string.h + - osl/thread.h + - o3tl/char16_t2wchar_t.hxx + tools/source/stream/strmunx.cxx: + # Needed for OSL_DEBUG_LEVEL > 1 + - osl/thread.h + tools/source/string/tenccvt.cxx: + # Needed for linker visibility + - tools/tenccvt.hxx diff --git a/tools/inc/poly.h b/tools/inc/poly.h index 2c84bf7459cf..17819ac93482 100644 --- a/tools/inc/poly.h +++ b/tools/inc/poly.h @@ -22,8 +22,6 @@ #include <sal/types.h> #include <tools/poly.hxx> -class Point; - class SAL_WARN_UNUSED ImplPolygon { public: @@ -55,10 +53,6 @@ public: #define MAX_POLYGONS SAL_MAX_UINT16 -namespace tools { -class Polygon; -} - struct ImplPolyPolygon { std::vector<tools::Polygon> mvPolyAry; diff --git a/tools/qa/cppunit/test_100mm2twips.cxx b/tools/qa/cppunit/test_100mm2twips.cxx index 93eab264f8da..80ceda2ffb3f 100644 --- a/tools/qa/cppunit/test_100mm2twips.cxx +++ b/tools/qa/cppunit/test_100mm2twips.cxx @@ -18,16 +18,12 @@ */ #include <sal/types.h> -#include <sal/log.hxx> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> #include <tools/helpers.hxx> -#include <cassert> - namespace tools { class cm2TwipsTest : public CppUnit::TestFixture diff --git a/tools/qa/cppunit/test_bigint.cxx b/tools/qa/cppunit/test_bigint.cxx index 9e02a609cce6..ef147961dbf4 100644 --- a/tools/qa/cppunit/test_bigint.cxx +++ b/tools/qa/cppunit/test_bigint.cxx @@ -17,12 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <limits> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <rtl/math.hxx> - #include <tools/bigint.hxx> namespace tools diff --git a/tools/qa/cppunit/test_color.cxx b/tools/qa/cppunit/test_color.cxx index 011fbcbdfa65..9c2a4d9c7049 100644 --- a/tools/qa/cppunit/test_color.cxx +++ b/tools/qa/cppunit/test_color.cxx @@ -11,9 +11,7 @@ #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> #include <tools/color.hxx> -#include <tools/stream.hxx> namespace { diff --git a/tools/qa/cppunit/test_fract.cxx b/tools/qa/cppunit/test_fract.cxx index 774427915392..897533d645fd 100644 --- a/tools/qa/cppunit/test_fract.cxx +++ b/tools/qa/cppunit/test_fract.cxx @@ -20,7 +20,6 @@ #include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> #include <rtl/math.hxx> #include <tools/fract.hxx> diff --git a/tools/qa/cppunit/test_fround.cxx b/tools/qa/cppunit/test_fround.cxx index 8e7781363edf..4014ff3cb46b 100644 --- a/tools/qa/cppunit/test_fround.cxx +++ b/tools/qa/cppunit/test_fround.cxx @@ -20,7 +20,6 @@ #include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> #include <tools/helpers.hxx> diff --git a/tools/qa/cppunit/test_inetmime.cxx b/tools/qa/cppunit/test_inetmime.cxx index cdeca0560276..12b1641890b4 100644 --- a/tools/qa/cppunit/test_inetmime.cxx +++ b/tools/qa/cppunit/test_inetmime.cxx @@ -17,12 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sal/types.h> #include <rtl/ustring.hxx> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> #include <tools/inetmime.hxx> diff --git a/tools/qa/cppunit/test_minmax.cxx b/tools/qa/cppunit/test_minmax.cxx index 390353045dfc..93709def974e 100644 --- a/tools/qa/cppunit/test_minmax.cxx +++ b/tools/qa/cppunit/test_minmax.cxx @@ -20,7 +20,6 @@ #include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> #include <tools/helpers.hxx> diff --git a/tools/qa/cppunit/test_pathutils.cxx b/tools/qa/cppunit/test_pathutils.cxx index 9148a6ab340b..1b0c57c08afd 100644 --- a/tools/qa/cppunit/test_pathutils.cxx +++ b/tools/qa/cppunit/test_pathutils.cxx @@ -19,11 +19,9 @@ #include <cwchar> -#include <sal/types.h> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> #include <tools/pathutils.hxx> namespace { diff --git a/tools/qa/cppunit/test_rectangle.cxx b/tools/qa/cppunit/test_rectangle.cxx index c4b321d388eb..8b10ece6239b 100644 --- a/tools/qa/cppunit/test_rectangle.cxx +++ b/tools/qa/cppunit/test_rectangle.cxx @@ -7,11 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <sal/types.h> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> #include <tools/gen.hxx> namespace diff --git a/tools/qa/cppunit/test_stream.cxx b/tools/qa/cppunit/test_stream.cxx index cf164ee5a935..d8e4d1ef71e1 100644 --- a/tools/qa/cppunit/test_stream.cxx +++ b/tools/qa/cppunit/test_stream.cxx @@ -11,7 +11,6 @@ #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> #include <tools/stream.hxx> #include <sstream> diff --git a/tools/qa/cppunit/test_xmlwalker.cxx b/tools/qa/cppunit/test_xmlwalker.cxx index d10221937145..4c2f9a808ea6 100644 --- a/tools/qa/cppunit/test_xmlwalker.cxx +++ b/tools/qa/cppunit/test_xmlwalker.cxx @@ -7,11 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <memory> -#include <string> - -#include <sal/types.h> -#include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <test/bootstrapfixture.hxx> #include <rtl/ustring.hxx> diff --git a/tools/source/datetime/systemdatetime.cxx b/tools/source/datetime/systemdatetime.cxx index cd07728ece98..2115f4b6205a 100644 --- a/tools/source/datetime/systemdatetime.cxx +++ b/tools/source/datetime/systemdatetime.cxx @@ -22,7 +22,6 @@ #endif #include <windows.h> #elif defined UNX -#include <unistd.h> #include <sys/time.h> #endif @@ -33,7 +32,6 @@ #include <mach/mach_time.h> #endif -#include <rtl/math.hxx> #include <osl/diagnose.h> #include <systemdatetime.hxx> diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx index 068787dfe389..d99c337e9885 100644 --- a/tools/source/datetime/ttime.cxx +++ b/tools/source/datetime/ttime.cxx @@ -28,8 +28,6 @@ #include <windows.h> #include <mmsystem.h> #elif defined UNX -#include <unistd.h> -#include <math.h> #include <sys/time.h> #endif @@ -40,10 +38,8 @@ #include <mach/mach_time.h> #endif -#include <sal/log.hxx> #include <rtl/math.hxx> #include <tools/time.hxx> -#include <osl/diagnose.h> #include <com/sun/star/util/DateTime.hpp> #include <systemdatetime.hxx> diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx index efecd0f5027b..bfbb8e6b4554 100644 --- a/tools/source/debug/debug.cxx +++ b/tools/source/debug/debug.cxx @@ -17,17 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined (UNX) || defined (__GNUC__) -#include <unistd.h> -#endif - -#include <errno.h> -#include <time.h> -#include <cstdarg> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> - #include <com/sun/star/configuration/CorruptedConfigurationException.hpp> #include <com/sun/star/configuration/backend/BackendSetupException.hpp> #include <com/sun/star/configuration/backend/MalformedDataException.hpp> @@ -37,6 +26,7 @@ #include <com/sun/star/deployment/DeploymentException.hpp> #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp> #include <com/sun/star/document/UndoFailedException.hpp> +#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/ldap/LdapGenericException.hpp> @@ -57,13 +47,10 @@ #include <com/sun/star/xml/sax/SAXParseException.hpp> #include <comphelper/anytostring.hxx> #include <tools/debug.hxx> -#include <rtl/string.h> #include <sal/log.hxx> -#include <sal/macros.h> #include <osl/thread.h> #include <typeinfo> -#include <vector> #include <tools/diagnose_ex.h> diff --git a/tools/source/fsys/fileutil.cxx b/tools/source/fsys/fileutil.cxx index e9efcb994e71..731afa58e63e 100644 --- a/tools/source/fsys/fileutil.cxx +++ b/tools/source/fsys/fileutil.cxx @@ -8,8 +8,8 @@ */ #include <tools/fileutil.hxx> -#include <tools/urlobj.hxx> #if defined _WIN32 +#include <tools/urlobj.hxx> #include <osl/file.hxx> #include <string.h> #include <o3tl/char16_t2wchar_t.hxx> diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 91bdedf699ce..7ee92a3382b6 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -43,8 +43,6 @@ #include <string.h> #include <com/sun/star/uno/Sequence.hxx> -#include <sax/tools/converter.hxx> -#include <rtl/uri.hxx> #include <comphelper/base64.hxx> using namespace css; diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx index e80a513496c4..903cf826f44a 100644 --- a/tools/source/generic/bigint.cxx +++ b/tools/source/generic/bigint.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <limits> #include <math.h> -#include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> #include <tools/bigint.hxx> diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index 7c18f5390677..fe760decf852 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -19,8 +19,6 @@ #include <cstddef> #include <cstdlib> -#include <limits> -#include <new> #include <string.h> #ifdef _WIN32 @@ -28,10 +26,7 @@ #endif #include <osl/file.hxx> -#include <tools/stream.hxx> #include <tools/config.hxx> -#include <osl/security.h> -#include <rtl/strbuf.hxx> #include <sal/log.hxx> struct ImplKeyData diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx index 266b32fadf3e..e6e05dfd5dc6 100644 --- a/tools/source/generic/fract.cxx +++ b/tools/source/generic/fract.cxx @@ -19,14 +19,11 @@ #include <tools/fract.hxx> #include <tools/debug.hxx> -#include <tools/lineend.hxx> #include <tools/stream.hxx> #include <o3tl/safeint.hxx> -#include <rtl/ustring.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> -#include <limits.h> #include <algorithm> #include <cmath> diff --git a/tools/source/generic/line.cxx b/tools/source/generic/line.cxx index b1a23635e9d6..26465c5c85d6 100644 --- a/tools/source/generic/line.cxx +++ b/tools/source/generic/line.cxx @@ -17,12 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/link.hxx> #include <tools/line.hxx> #include <tools/helpers.hxx> -#include <cstdlib> -#include <math.h> +#include <cmath> namespace tools { diff --git a/tools/source/generic/point.cxx b/tools/source/generic/point.cxx index 1b470c6065ec..f33fe9a28803 100644 --- a/tools/source/generic/point.cxx +++ b/tools/source/generic/point.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <numeric> - #include <tools/gen.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx index 82b996ed68db..0603a1dc8513 100644 --- a/tools/source/generic/poly2.cxx +++ b/tools/source/generic/poly2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <rtl/math.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> #include <poly.h> @@ -27,7 +26,6 @@ #include <tools/vcompat.hxx> #include <tools/gen.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> namespace tools { diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index decd1041a547..14ad5b9d1485 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -18,12 +18,10 @@ */ #include <algorithm> -#include <cstddef> #include <limits> #include <forward_list> #include <memory> -#include <osl/diagnose.h> #include <sal/log.hxx> #include <rtl/ustring.hxx> #include <rtl/strbuf.hxx> diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index 3a3a9c297ed9..e393baaaf91e 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -20,8 +20,6 @@ #include <sal/types.h> #include <tools/datetime.hxx> #include <tools/inetmsg.hxx> -#include <tools/contnr.hxx> -#include <rtl/instance.hxx> #include <comphelper/string.hxx> #include <rtl/character.hxx> diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index 34cb3736bd07..c23289923af4 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -21,7 +21,6 @@ #include <cassert> -#include <sal/log.hxx> #include <sal/types.h> #include <rtl/strbuf.hxx> #include <tools/inetmsg.hxx> diff --git a/tools/source/misc/extendapplicationenvironment.cxx b/tools/source/misc/extendapplicationenvironment.cxx index a2ae45720ed1..64e1d9801a79 100644 --- a/tools/source/misc/extendapplicationenvironment.cxx +++ b/tools/source/misc/extendapplicationenvironment.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_features.h> #include <config_folders.h> #include <sal/config.h> @@ -26,17 +25,11 @@ #if defined UNX #include <sys/resource.h> -#include <sys/time.h> -#include <sys/types.h> #endif #include <osl/process.h> -#include <osl/thread.h> #include <rtl/bootstrap.hxx> -#include <rtl/string.hxx> -#include <rtl/textcvt.h> #include <rtl/ustrbuf.hxx> -#include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/types.h> #include <tools/extendapplicationenvironment.hxx> diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 7eaef59e5883..453073c61112 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -24,7 +24,6 @@ #include <string.h> #include <stdio.h> -#include <stdlib.h> #include <osl/endian.h> #include <osl/diagnose.h> diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index c682071a112c..4ba6da6dfe1b 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -19,12 +19,8 @@ #include <algorithm> #include <stdio.h> -#include <string.h> -#include <sys/stat.h> #include <fcntl.h> #include <errno.h> -#include <unistd.h> -#include <limits.h> #include <tools/stream.hxx> #include <vector> @@ -37,7 +33,6 @@ #include <osl/file.hxx> #include <osl/detail/file.h> #include <rtl/instance.hxx> -#include <rtl/strbuf.hxx> using namespace osl; diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx index 70cfd8aac0d5..ae1bc812c626 100644 --- a/tools/source/zcodec/zcodec.cxx +++ b/tools/source/zcodec/zcodec.cxx @@ -27,7 +27,6 @@ #include <tools/zcodec.hxx> #include <rtl/crc.h> -#include <osl/endian.h> #define PZSTREAM static_cast<z_stream*>(mpsC_Stream) |