From 7a3aafb5a19061ec4ef20aa3328fc76bb8a3c93d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 23 Oct 2017 22:43:21 +0200 Subject: loplugin:includeform: cppu Change-Id: I438346398fd8430cf4357b8a3d8e9f423966f2ca --- cppu/source/AffineBridge/AffineBridge.cxx | 10 +++---- cppu/source/LogBridge/LogBridge.cxx | 18 ++++++------ cppu/source/UnsafeBridge/UnsafeBridge.cxx | 12 ++++---- cppu/source/cppu/cppu_opt.cxx | 6 ++-- cppu/source/helper/purpenv/Proxy.hxx | 10 +++---- .../helper/purpenv/helper_purpenv_Environment.cxx | 10 +++---- .../helper/purpenv/helper_purpenv_Mapping.cxx | 10 +++---- .../source/helper/purpenv/helper_purpenv_Proxy.cxx | 8 ++--- cppu/source/threadpool/current.cxx | 16 +++++----- cppu/source/threadpool/threadpool.cxx | 2 +- cppu/source/typelib/static_types.cxx | 2 +- cppu/source/uno/EnvDcp.cxx | 2 +- cppu/source/uno/EnvStack.cxx | 14 ++++----- cppu/source/uno/IdentityMapping.cxx | 8 ++--- cppu/source/uno/IdentityMapping.hxx | 2 +- cppu/source/uno/cascade_mapping.cxx | 12 ++++---- cppu/source/uno/cascade_mapping.hxx | 6 ++-- cppu/source/uno/data.cxx | 6 ++-- cppu/source/uno/lbenv.cxx | 34 +++++++++++----------- cppu/source/uno/lbmap.cxx | 32 ++++++++++---------- cppu/source/uno/loadmodule.cxx | 10 +++---- cppu/source/uno/loadmodule.hxx | 2 +- cppu/source/uno/prim.hxx | 24 +++++++-------- cppu/source/uno/sequence.cxx | 2 +- 24 files changed, 129 insertions(+), 129 deletions(-) (limited to 'cppu/source') diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index db5fa824b9f5..bf0455f689a1 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -18,14 +18,14 @@ */ -#include "osl/thread.hxx" -#include "osl/conditn.hxx" -#include "osl/mutex.hxx" +#include +#include +#include #include #include -#include "cppu/helper/purpenv/Environment.hxx" -#include "cppu/helper/purpenv/Mapping.hxx" +#include +#include class InnerThread; diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index ac99c395e8f9..2e891603c152 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -18,17 +18,17 @@ */ -#include "osl/mutex.hxx" -#include "osl/thread.h" -#include "osl/thread.hxx" +#include +#include +#include #include -#include "uno/dispatcher.h" -#include "typelib/typedescription.hxx" +#include +#include #include -#include "cppu/helper/purpenv/Environment.hxx" -#include "cppu/helper/purpenv/Mapping.hxx" -#include "cppu/EnvDcp.hxx" -#include "uno/environment.hxx" +#include +#include +#include +#include #include #include diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx index 17a375a319dd..772f2a7bd703 100644 --- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx +++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "osl/mutex.hxx" -#include "osl/thread.h" -#include "osl/thread.hxx" -#include "sal/log.hxx" +#include +#include +#include +#include #include -#include "cppu/helper/purpenv/Environment.hxx" -#include "cppu/helper/purpenv/Mapping.hxx" +#include +#include class UnsafeBridge : public cppu::Enterable { diff --git a/cppu/source/cppu/cppu_opt.cxx b/cppu/source/cppu/cppu_opt.cxx index ac37da66f7bf..ad4c5142a08f 100644 --- a/cppu/source/cppu/cppu_opt.cxx +++ b/cppu/source/cppu/cppu_opt.cxx @@ -21,9 +21,9 @@ #include #include -#include "typelib/typedescription.h" -#include "uno/any2.h" -#include "rtl/ustrbuf.hxx" +#include +#include +#include using namespace ::rtl; diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx index 037c68e8dc05..3c270fa6421a 100644 --- a/cppu/source/helper/purpenv/Proxy.hxx +++ b/cppu/source/helper/purpenv/Proxy.hxx @@ -20,13 +20,13 @@ #ifndef INCLUDED_CPPU_SOURCE_HELPER_PURPENV_PROXY_HXX #define INCLUDED_CPPU_SOURCE_HELPER_PURPENV_PROXY_HXX -#include "osl/interlck.h" +#include -#include "uno/environment.hxx" -#include "uno/mapping.hxx" -#include "uno/dispatcher.h" +#include +#include +#include -#include "cppu/helper/purpenv/Mapping.hxx" +#include class Proxy : public uno_Interface diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx index 9e4925335306..4143e4838515 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx @@ -18,14 +18,14 @@ */ -#include "cppu/helper/purpenv/Environment.hxx" +#include -#include "osl/diagnose.h" -#include "uno/lbnames.h" +#include +#include #include -#include "typelib/typedescription.h" -#include "osl/interlck.h" +#include +#include extern "C" { typedef void SAL_CALL EnvFun_P (uno_Environment *); diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx index 23c3510a4c9f..f065d3c7ecca 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx @@ -18,14 +18,14 @@ */ -#include "cppu/helper/purpenv/Mapping.hxx" +#include #include "Proxy.hxx" -#include "osl/interlck.h" -#include "uno/environment.hxx" -#include "uno/dispatcher.h" -#include "typelib/typedescription.h" +#include +#include +#include +#include using namespace com::sun::star; diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index ae46da96dcad..048f393d6466 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -20,10 +20,10 @@ #include "Proxy.hxx" -#include "sal/alloca.h" -#include "uno/dispatcher.h" -#include "typelib/typedescription.hxx" -#include "cppu/EnvDcp.hxx" +#include +#include +#include +#include using namespace com::sun::star; diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx index 1b82a02d30cc..f0bb7e750a94 100644 --- a/cppu/source/threadpool/current.cxx +++ b/cppu/source/threadpool/current.cxx @@ -20,14 +20,14 @@ #include #include -#include "rtl/uuid.h" -#include "osl/thread.h" -#include "osl/mutex.hxx" - -#include "uno/current_context.h" -#include "uno/environment.hxx" -#include "uno/mapping.hxx" -#include "typelib/typedescription.h" +#include +#include +#include + +#include +#include +#include +#include #include "current.hxx" diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index 39774c9eec69..b54036d2cfd2 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.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/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index 45653b079c45..3fb0bf6ab62a 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.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/cppu/source/uno/EnvDcp.cxx b/cppu/source/uno/EnvDcp.cxx index 5e2ac2e2f97c..c5597dec47a5 100644 --- a/cppu/source/uno/EnvDcp.cxx +++ b/cppu/source/uno/EnvDcp.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "uno/EnvDcp.h" +#include void uno_EnvDcp_getTypeName(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvTypeName) diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx index 1efdbfb81622..4a2fd8146328 100644 --- a/cppu/source/uno/EnvStack.cxx +++ b/cppu/source/uno/EnvStack.cxx @@ -17,17 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "uno/environment.hxx" +#include #include -#include "cppu/EnvDcp.hxx" -#include "cppu/Enterable.hxx" +#include +#include -#include "rtl/instance.hxx" +#include -#include "osl/thread.h" -#include "osl/thread.hxx" -#include "osl/mutex.hxx" +#include +#include +#include #include diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx index 4f8266cb3aa0..659c9cdc7385 100644 --- a/cppu/source/uno/IdentityMapping.cxx +++ b/cppu/source/uno/IdentityMapping.cxx @@ -19,11 +19,11 @@ #include "IdentityMapping.hxx" -#include "typelib/typedescription.h" -#include "uno/mapping.h" -#include "uno/environment.hxx" +#include +#include +#include -#include "osl/interlck.h" +#include using namespace ::com::sun::star; diff --git a/cppu/source/uno/IdentityMapping.hxx b/cppu/source/uno/IdentityMapping.hxx index 74d900200740..ee1fe3b9648d 100644 --- a/cppu/source/uno/IdentityMapping.hxx +++ b/cppu/source/uno/IdentityMapping.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CPPU_SOURCE_UNO_IDENTITYMAPPING_HXX #define INCLUDED_CPPU_SOURCE_UNO_IDENTITYMAPPING_HXX -#include "uno/mapping.h" +#include namespace com { namespace sun { namespace star { namespace uno { class Environment; diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx index e5dc561badd3..81ef313cfcf3 100644 --- a/cppu/source/uno/cascade_mapping.cxx +++ b/cppu/source/uno/cascade_mapping.cxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "osl/interlck.h" -#include "rtl/ustring.hxx" -#include "uno/environment.hxx" +#include +#include +#include #include -#include "uno/mapping.hxx" -#include "uno/dispatcher.h" +#include +#include -#include "cppu/EnvDcp.hxx" +#include #include "cascade_mapping.hxx" diff --git a/cppu/source/uno/cascade_mapping.hxx b/cppu/source/uno/cascade_mapping.hxx index 2344f6e0a01d..37f0f1d5b643 100644 --- a/cppu/source/uno/cascade_mapping.hxx +++ b/cppu/source/uno/cascade_mapping.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_CPPU_SOURCE_UNO_CASCADE_MAPPING_HXX #define INCLUDED_CPPU_SOURCE_UNO_CASCADE_MAPPING_HXX -#include "uno/environment.h" -#include "uno/mapping.h" -#include "rtl/ustring.h" +#include +#include +#include void getCascadeMapping(uno_Mapping ** ppMapping, diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index d351dcf6ae6f..68d114dc940f 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -20,9 +20,9 @@ #include -#include "osl/mutex.hxx" -#include "sal/log.hxx" -#include "uno/data.h" +#include +#include +#include #include "constr.hxx" #include "destr.hxx" diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index fe02245527cf..01a300ed94d1 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -19,23 +19,23 @@ #include -#include "cppu/EnvDcp.hxx" - -#include "sal/log.hxx" -#include "osl/diagnose.h" -#include "osl/interlck.h" -#include "osl/mutex.hxx" -#include "osl/module.h" -#include "osl/process.h" -#include "rtl/process.h" -#include "rtl/string.hxx" -#include "rtl/ustring.hxx" -#include "rtl/ustrbuf.hxx" -#include "rtl/instance.hxx" -#include "typelib/typedescription.h" -#include "uno/dispatcher.h" -#include "uno/environment.h" -#include "uno/lbnames.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "prim.hxx" #include "destr.hxx" #include "loadmodule.hxx" diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index ecd89ecdc328..4bdf0a6d6d8e 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -26,22 +26,22 @@ #include #include -#include "rtl/ustring.hxx" -#include "rtl/ustrbuf.hxx" -#include "osl/module.h" -#include "osl/diagnose.h" -#include "osl/mutex.hxx" -#include "osl/interlck.h" -#include "sal/log.hxx" - -#include "uno/dispatcher.h" -#include "uno/mapping.h" -#include "uno/lbnames.h" -#include "uno/environment.hxx" - -#include "typelib/typedescription.h" - -#include "cppu/EnvDcp.hxx" +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include #include "cascade_mapping.hxx" #include "loadmodule.hxx" diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx index 1d8ab7576a67..ef8e65a7ffb9 100644 --- a/cppu/source/uno/loadmodule.cxx +++ b/cppu/source/uno/loadmodule.cxx @@ -18,12 +18,12 @@ */ -#include "sal/config.h" +#include -#include "osl/module.h" -#include "rtl/string.h" -#include "rtl/ustrbuf.hxx" -#include "rtl/ustring.hxx" +#include +#include +#include +#include #include "loadmodule.hxx" diff --git a/cppu/source/uno/loadmodule.hxx b/cppu/source/uno/loadmodule.hxx index a87c7b1ac3a1..9021118477d6 100644 --- a/cppu/source/uno/loadmodule.hxx +++ b/cppu/source/uno/loadmodule.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CPPU_SOURCE_UNO_LOADMODULE_HXX #define INCLUDED_CPPU_SOURCE_UNO_LOADMODULE_HXX -#include "sal/config.h" +#include #include namespace rtl { class OUString; } diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx index f497f6f6cf5d..e8245248be6f 100644 --- a/cppu/source/uno/prim.hxx +++ b/cppu/source/uno/prim.hxx @@ -19,18 +19,18 @@ #ifndef INCLUDED_CPPU_SOURCE_UNO_PRIM_HXX #define INCLUDED_CPPU_SOURCE_UNO_PRIM_HXX -#include "typelib/typedescription.h" -#include "typelib/typeclass.h" -#include "uno/sequence2.h" -#include "uno/any2.h" -#include "uno/data.h" -#include "uno/mapping.h" -#include "uno/dispatcher.h" - -#include "osl/interlck.h" -#include "osl/diagnose.h" -#include "rtl/ustring.hxx" -#include "rtl/alloc.h" +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include namespace cppu { diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx index 3fbe338cfc00..7d54c4244bdb 100644 --- a/cppu/source/uno/sequence.cxx +++ b/cppu/source/uno/sequence.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include #include #include -- cgit