From c30f3ea3dd294210058c781145d6fdd320c975b4 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 23 Oct 2017 22:34:03 +0200 Subject: loplugin:includeform: sal Change-Id: I539ca8b9dee5edc5fc2282a2b9b0ffd78bad8b11 --- sal/osl/all/debugbase.cxx | 12 ++++++------ sal/osl/all/loadmodulerelative.cxx | 18 +++++++++--------- sal/osl/all/log.cxx | 16 ++++++++-------- sal/osl/unx/backtrace.c | 2 +- sal/osl/unx/backtraceapi.cxx | 2 +- sal/osl/unx/conditn.cxx | 2 +- sal/osl/unx/createfilehandlefromfd.hxx | 4 ++-- sal/osl/unx/file_impl.hxx | 2 +- sal/osl/unx/file_misc.cxx | 10 +++++----- sal/osl/unx/file_stat.cxx | 2 +- sal/osl/unx/file_url.cxx | 4 ++-- sal/osl/unx/file_url.hxx | 2 +- sal/osl/unx/file_volume.cxx | 8 ++++---- sal/osl/unx/module.cxx | 2 +- sal/osl/unx/process.cxx | 4 ++-- sal/osl/unx/process_impl.cxx | 16 ++++++++-------- sal/osl/unx/random.cxx | 2 +- sal/osl/unx/readwrite_helper.cxx | 2 +- sal/osl/unx/salinit.cxx | 10 +++++----- sal/osl/unx/security.cxx | 4 ++-- 20 files changed, 62 insertions(+), 62 deletions(-) (limited to 'sal/osl') diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx index c82dde90a495..3c2f6c67b1e7 100644 --- a/sal/osl/all/debugbase.cxx +++ b/sal/osl/all/debugbase.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "rtl/strbuf.hxx" -#include "rtl/string.hxx" -#include "rtl/ustring.hxx" -#include "osl/process.h" -#include "osl/diagnose.hxx" -#include "sal/log.hxx" +#include +#include +#include +#include +#include +#include #include #include diff --git a/sal/osl/all/loadmodulerelative.cxx b/sal/osl/all/loadmodulerelative.cxx index e99669696bcc..30c7d600674d 100644 --- a/sal/osl/all/loadmodulerelative.cxx +++ b/sal/osl/all/loadmodulerelative.cxx @@ -17,18 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include #include -#include "sal/log.hxx" -#include "osl/module.h" -#include "osl/module.hxx" -#include "rtl/malformeduriexception.hxx" -#include "rtl/uri.hxx" -#include "rtl/ustring.h" -#include "rtl/ustring.hxx" -#include "sal/types.h" +#include +#include +#include +#include +#include +#include +#include +#include extern "C" { diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx index 1f0138f1266d..636429c6992e 100644 --- a/sal/osl/all/log.cxx +++ b/sal/osl/all/log.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "sal/config.h" +#include #include #include @@ -21,13 +21,13 @@ #include #include -#include "osl/thread.hxx" -#include "rtl/string.h" -#include "sal/detail/log.h" -#include "sal/log.hxx" -#include "sal/types.h" -#include "backtraceasstring.hxx" -#include "salusesyslog.hxx" +#include +#include +#include +#include +#include +#include +#include #if defined ANDROID #include diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c index 1d9a58b3350c..f70031d0b4a9 100644 --- a/sal/osl/unx/backtrace.c +++ b/sal/osl/unx/backtrace.c @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/types.h" +#include #ifdef __sun diff --git a/sal/osl/unx/backtraceapi.cxx b/sal/osl/unx/backtraceapi.cxx index 4216bf2cd07d..9edeef9fd7d9 100644 --- a/sal/osl/unx/backtraceapi.cxx +++ b/sal/osl/unx/backtraceapi.cxx @@ -21,7 +21,7 @@ #include #include "backtrace.h" -#include "backtraceasstring.hxx" +#include namespace { diff --git a/sal/osl/unx/conditn.cxx b/sal/osl/unx/conditn.cxx index 64a1ea3ae0e7..45f1c0e600a2 100644 --- a/sal/osl/unx/conditn.cxx +++ b/sal/osl/unx/conditn.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include #include diff --git a/sal/osl/unx/createfilehandlefromfd.hxx b/sal/osl/unx/createfilehandlefromfd.hxx index b5a4e7666ba1..415fda061978 100644 --- a/sal/osl/unx/createfilehandlefromfd.hxx +++ b/sal/osl/unx/createfilehandlefromfd.hxx @@ -10,9 +10,9 @@ #ifndef INCLUDED_SAL_OSL_UNX_CREATEFILEHANDLEFROMFD_HXX #define INCLUDED_SAL_OSL_UNX_CREATEFILEHANDLEFROMFD_HXX -#include "sal/config.h" +#include -#include "osl/file.h" +#include namespace osl { namespace detail { diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx index e1ed0affc8f2..f0718e236f6f 100644 --- a/sal/osl/unx/file_impl.hxx +++ b/sal/osl/unx/file_impl.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX #define INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX -#include "osl/file.h" +#include #include #include diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index 5f2bd76f114b..8cb00fcc5a1d 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "osl/file.hxx" -#include "osl/detail/file.h" +#include +#include -#include "osl/diagnose.h" -#include "osl/thread.h" +#include +#include #include -#include "rtl/alloc.h" +#include #include #include "system.hxx" diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx index ec1ebe45849a..3ea74e80918c 100644 --- a/sal/osl/unx/file_stat.cxx +++ b/sal/osl/unx/file_stat.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "osl/file.h" +#include #include "system.hxx" #include diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx index 4e8c7f445da6..2041c984ec02 100644 --- a/sal/osl/unx/file_url.cxx +++ b/sal/osl/unx/file_url.cxx @@ -28,7 +28,7 @@ #include #include -#include "osl/file.hxx" +#include #include #include #include @@ -39,7 +39,7 @@ #include #include #include -#include "rtl/textcvt.h" +#include #include #include "file_error_transl.hxx" diff --git a/sal/osl/unx/file_url.hxx b/sal/osl/unx/file_url.hxx index eceaabd4c651..7185ada4feb3 100644 --- a/sal/osl/unx/file_url.hxx +++ b/sal/osl/unx/file_url.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SAL_OSL_UNX_FILE_URL_HXX #define INCLUDED_SAL_OSL_UNX_FILE_URL_HXX -#include "osl/file.h" +#include namespace rtl { class OUString; } diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx index 3388019bd8d2..5a69039e0a18 100644 --- a/sal/osl/unx/file_volume.cxx +++ b/sal/osl/unx/file_volume.cxx @@ -19,11 +19,11 @@ #include -#include "osl/file.h" +#include -#include "osl/diagnose.h" -#include "osl/thread.h" -#include "rtl/alloc.h" +#include +#include +#include #include "file_error_transl.hxx" #include "file_url.hxx" diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx index 207b0379a924..9d3f23a95242 100644 --- a/sal/osl/unx/module.cxx +++ b/sal/osl/unx/module.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include #include #include diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index 96829d71a96c..8f5578567d37 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" -#include "rtl/ustring.hxx" +#include +#include #include diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index e7cc240a01c2..494972b282fd 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -17,20 +17,20 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "osl/process.h" +#include #include #include #include #include -#include "osl/diagnose.h" -#include "osl/file.h" -#include "osl/module.h" -#include "osl/thread.h" -#include "rtl/ustring.hxx" -#include "rtl/strbuf.h" -#include "sal/log.hxx" +#include +#include +#include +#include +#include +#include +#include #include "file_path_helper.hxx" diff --git a/sal/osl/unx/random.cxx b/sal/osl/unx/random.cxx index 6f7d4a8adfb8..5904e7d575b3 100644 --- a/sal/osl/unx/random.cxx +++ b/sal/osl/unx/random.cxx @@ -8,7 +8,7 @@ */ #include "system.hxx" -#include "oslrandom.h" +#include #include diff --git a/sal/osl/unx/readwrite_helper.cxx b/sal/osl/unx/readwrite_helper.cxx index 68caa176690d..c661eacd013f 100644 --- a/sal/osl/unx/readwrite_helper.cxx +++ b/sal/osl/unx/readwrite_helper.cxx @@ -10,7 +10,7 @@ #include "readwrite_helper.hxx" #include -#include +#include "system.hxx" bool safeWrite(int fd, void* data, sal_uInt32 dataSize) { diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx index b8e6555d81e3..cfc612b8b77c 100644 --- a/sal/osl/unx/salinit.cxx +++ b/sal/osl/unx/salinit.cxx @@ -19,7 +19,7 @@ #include -#include "sal/config.h" +#include #if defined MACOSX #include @@ -28,11 +28,11 @@ #include #endif -#include "osl/process.h" -#include "sal/main.h" -#include "sal/types.h" +#include +#include +#include -#include +#include "saltime.hxx" #include #if HAVE_SYSLOG_H diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx index dafa69fae663..9370fe608cf9 100644 --- a/sal/osl/unx/security.cxx +++ b/sal/osl/unx/security.cxx @@ -34,8 +34,8 @@ #include #include -#include "osl/thread.h" -#include "osl/file.h" +#include +#include #if defined LINUX || defined __sun #include -- cgit