summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@ubuntu.com>2018-06-29 18:22:01 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-07-10 11:45:42 +0200
commit6b51fee8d264db616d1be32676f0f691acbfe680 (patch)
treedee5c44446b46951fce9bf3bb5344c941b3f539e
parent15eadb56d0a24fb4b1e70c8afb41f6e02eb47761 (diff)
tdf#42949 Fix IWYU warnings in include/osl/*hxx
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I7b19938246ca8498fa300f781589bf17b3d486aa Reviewed-on: https://gerrit.libreoffice.org/56723 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--desktop/source/app/app.cxx1
-rw-r--r--desktop/source/app/dispatchwatcher.cxx1
-rw-r--r--desktop/source/deployment/dp_persmap.cxx1
-rw-r--r--filter/source/graphicfilter/ieps/ieps.cxx1
-rw-r--r--idlc/source/idlccompile.cxx1
-rw-r--r--include/IwyuFilter_include.yaml12
-rw-r--r--include/osl/file.hxx4
-rw-r--r--sal/osl/unx/file.cxx1
-rw-r--r--sal/qa/osl/file/osl_File.cxx1
-rw-r--r--shell/source/backends/desktopbe/desktopbackend.cxx1
-rw-r--r--unoidl/source/unoidl-write.cxx1
11 files changed, 22 insertions, 3 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index cb67abaa8fd9..e459ccdace81 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -99,6 +99,7 @@
#include <officecfg/Setup.hxx>
#include <osl/file.hxx>
#include <osl/process.h>
+#include <rtl/byteseq.hxx>
#include <rtl/uri.hxx>
#include <unotools/pathoptions.hxx>
#include <svtools/miscopt.hxx>
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 6438bf7f3ef8..d45b6ab12f9d 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -61,6 +61,7 @@
#include <osl/thread.hxx>
#include <osl/file.hxx>
#include <osl/file.h>
+#include <rtl/byteseq.hxx>
#include <iostream>
using namespace ::osl;
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 83074def69eb..c06c63656e6f 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -19,6 +19,7 @@
#include <dp_misc.h>
#include <dp_persmap.h>
+#include <rtl/byteseq.hxx>
#include <rtl/strbuf.hxx>
using namespace ::rtl;
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index e737b8ba8d82..6a422f1f6b09 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -35,6 +35,7 @@
#include <osl/process.h>
#include <osl/file.hxx>
#include <osl/thread.h>
+#include <rtl/byteseq.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
#include <o3tl/safeint.hxx>
#include <memory>
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index ca6a8ebeb10a..c8a389025325 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -18,6 +18,7 @@
*/
#include <idlc.hxx>
+#include <rtl/alloc.h>
#include <rtl/ustring.hxx>
#include <rtl/strbuf.hxx>
#include <osl/process.h>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index f679943627c1..5e9a818b379d 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -22,3 +22,15 @@ blacklist:
include/osl/thread.h:
# ODK API test would fail with fw decl here
- osl/time.h
+ include/osl/conditn.hxx:
+ # ODK API test would fail with fw decl here
+ - osl/time.h
+ include/osl/pipe_decl.hxx:
+ # ODK API test would fail with fw decl here
+ - osl/security.hxx
+ include/osl/socket_decl.hxx:
+ # Needed by socket.hxx for inline function
+ - rtl/byteseq.hxx
+ include/osl/thread.hxx:
+ # ODK API test would fail with fw decl here
+ - osl/time.h
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index 6d1a755ac422..a85f5fc7aeb0 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -24,7 +24,6 @@
#include <string.h>
-#include <cassert>
#include <cstddef>
#include "sal/log.hxx"
@@ -33,9 +32,8 @@
#include "osl/file.h"
#include "osl/diagnose.h"
-#include "rtl/byteseq.hxx"
-#include <stdio.h>
+namespace rtl { class ByteSequence; }
namespace osl
{
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index c2cbf768588b..40aadc940e88 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -24,6 +24,7 @@
#include <osl/file.hxx>
#include <osl/detail/file.h>
#include <rtl/alloc.h>
+#include <rtl/byteseq.hxx>
#include <rtl/string.hxx>
#include "system.hxx"
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 5261cb6511f2..5027f934c084 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -18,6 +18,7 @@
*/
#include <sal/types.h>
+#include <rtl/byteseq.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index 7fa007689095..369de240859a 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -43,6 +43,7 @@
#include <cppuhelper/weak.hxx>
#include <osl/file.hxx>
#include <osl/security.hxx>
+#include <rtl/byteseq.hxx>
#include <rtl/string.h>
#include <rtl/textenc.h>
#include <rtl/ustring.h>
diff --git a/unoidl/source/unoidl-write.cxx b/unoidl/source/unoidl-write.cxx
index fcb004a24df3..083f7a5b7b1f 100644
--- a/unoidl/source/unoidl-write.cxx
+++ b/unoidl/source/unoidl-write.cxx
@@ -22,6 +22,7 @@
#include <osl/file.h>
#include <osl/file.hxx>
#include <osl/process.h>
+#include <rtl/byteseq.hxx>
#include <rtl/process.h>
#include <rtl/string.h>
#include <rtl/string.hxx>