diff options
| -rwxr-xr-x | bin/find-headers-to-move-inside-modules.py | 2 | ||||
| -rw-r--r-- | include/IwyuFilter_include.yaml | 3 | ||||
| -rw-r--r-- | solenv/clang-format/blacklist | 6 | ||||
| -rw-r--r-- | ucbhelper/source/client/activedatastreamer.cxx | 2 | ||||
| -rw-r--r-- | ucbhelper/source/client/activedatastreamer.hxx (renamed from include/ucbhelper/activedatastreamer.hxx) | 6 | ||||
| -rw-r--r-- | ucbhelper/source/client/content.cxx | 2 | ||||
| -rw-r--r-- | ucbhelper/source/provider/cancelcommandexecution.cxx | 2 | ||||
| -rw-r--r-- | ucbhelper/source/provider/contenthelper.cxx | 2 | ||||
| -rw-r--r-- | ucbhelper/source/provider/contentinfo.cxx | 2 | ||||
| -rw-r--r-- | ucbhelper/source/provider/contentinfo.hxx (renamed from include/ucbhelper/contentinfo.hxx) | 6 | ||||
| -rw-r--r-- | ucbhelper/source/provider/simpleioerrorrequest.cxx | 2 | ||||
| -rw-r--r-- | ucbhelper/source/provider/simpleioerrorrequest.hxx (renamed from include/ucbhelper/simpleioerrorrequest.hxx) | 6 |
12 files changed, 19 insertions, 22 deletions
diff --git a/bin/find-headers-to-move-inside-modules.py b/bin/find-headers-to-move-inside-modules.py index c8a9dc989069..313e30762de2 100755 --- a/bin/find-headers-to-move-inside-modules.py +++ b/bin/find-headers-to-move-inside-modules.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # Look for headers inside include/ that can be moved into their respective modules. diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 2d6ddd53b60f..43334663e7ff 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -91,9 +91,6 @@ blacklist: include/ucbhelper/activedatasink.hxx: # base class has to be a complete type - com/sun/star/io/XActiveDataSink.hpp - include/ucbhelper/activedatastreamer.hxx: - # base class has to be a complete type - - com/sun/star/io/XActiveDataStreamer.hpp include/ucbhelper/commandenvironment.hxx: # base class has to be a complete type - com/sun/star/ucb/XCommandEnvironment.hpp diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index e8408c03c6d7..7f1758c40b50 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7544,14 +7544,12 @@ include/typelib/typedescription.h include/typelib/typedescription.hxx include/typelib/uik.h include/ucbhelper/activedatasink.hxx -include/ucbhelper/activedatastreamer.hxx include/ucbhelper/authenticationfallback.hxx include/ucbhelper/cancelcommandexecution.hxx include/ucbhelper/commandenvironment.hxx include/ucbhelper/content.hxx include/ucbhelper/contenthelper.hxx include/ucbhelper/contentidentifier.hxx -include/ucbhelper/contentinfo.hxx include/ucbhelper/fd_inputstream.hxx include/ucbhelper/getcomponentcontext.hxx include/ucbhelper/interactionrequest.hxx @@ -7567,7 +7565,6 @@ include/ucbhelper/resultsetmetadata.hxx include/ucbhelper/simpleauthenticationrequest.hxx include/ucbhelper/simplecertificatevalidationrequest.hxx include/ucbhelper/simpleinteractionrequest.hxx -include/ucbhelper/simpleioerrorrequest.hxx include/ucbhelper/simplenameclashresolverequest.hxx include/ucbhelper/ucbhelperdllapi.h include/uno/Enterable.h @@ -16784,6 +16781,7 @@ ucb/source/ucp/webdav/webdavresultset.hxx ucb/source/ucp/webdav/webdavservices.cxx ucbhelper/source/client/activedatasink.cxx ucbhelper/source/client/activedatastreamer.cxx +ucbhelper/source/client/activedatastreamer.hxx ucbhelper/source/client/commandenvironment.cxx ucbhelper/source/client/content.cxx ucbhelper/source/client/interceptedinteraction.cxx @@ -16793,6 +16791,7 @@ ucbhelper/source/provider/cancelcommandexecution.cxx ucbhelper/source/provider/contenthelper.cxx ucbhelper/source/provider/contentidentifier.cxx ucbhelper/source/provider/contentinfo.cxx +ucbhelper/source/provider/contentinfo.hxx ucbhelper/source/provider/fd_inputstream.cxx ucbhelper/source/provider/getcomponentcontext.cxx ucbhelper/source/provider/interactionrequest.cxx @@ -16806,6 +16805,7 @@ ucbhelper/source/provider/simpleauthenticationrequest.cxx ucbhelper/source/provider/simplecertificatevalidationrequest.cxx ucbhelper/source/provider/simpleinteractionrequest.cxx ucbhelper/source/provider/simpleioerrorrequest.cxx +ucbhelper/source/provider/simpleioerrorrequest.hxx ucbhelper/source/provider/simplenameclashresolverequest.cxx unodevtools/inc/options.hxx unodevtools/source/skeletonmaker/cppcompskeleton.cxx diff --git a/ucbhelper/source/client/activedatastreamer.cxx b/ucbhelper/source/client/activedatastreamer.cxx index a74f0c2e0cf7..aab9cef0df29 100644 --- a/ucbhelper/source/client/activedatastreamer.cxx +++ b/ucbhelper/source/client/activedatastreamer.cxx @@ -23,7 +23,7 @@ ************************************************************************** *************************************************************************/ -#include <ucbhelper/activedatastreamer.hxx> +#include "activedatastreamer.hxx" using namespace com::sun::star; diff --git a/include/ucbhelper/activedatastreamer.hxx b/ucbhelper/source/client/activedatastreamer.hxx index 8e9faf0328d4..ae4f53736913 100644 --- a/include/ucbhelper/activedatastreamer.hxx +++ b/ucbhelper/source/client/activedatastreamer.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX -#define INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX +#ifndef UCBHELPER_SOURCE_CLIENT_ACTIVEDATASTREAMER_HXX +#define UCBHELPER_SOURCE_CLIENT_ACTIVEDATASTREAMER_HXX #include <com/sun/star/io/XActiveDataStreamer.hpp> #include <cppuhelper/implbase.hxx> @@ -46,6 +46,6 @@ public: } /* namespace ucbhelper */ -#endif /* ! INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX */ +#endif /* ! UCBHELPER_SOURCE_CLIENT_ACTIVEDATASTREAMER_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 0de94810ed29..69e92b134ae6 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -55,7 +55,7 @@ #include <com/sun/star/beans/UnknownPropertyException.hpp> #include <ucbhelper/content.hxx> #include <ucbhelper/activedatasink.hxx> -#include <ucbhelper/activedatastreamer.hxx> +#include "activedatastreamer.hxx" #include <ucbhelper/cancelcommandexecution.hxx> namespace com::sun::star::ucb { class XCommandEnvironment; } diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx index e61415f5efde..f700c8a4afc1 100644 --- a/ucbhelper/source/provider/cancelcommandexecution.cxx +++ b/ucbhelper/source/provider/cancelcommandexecution.cxx @@ -30,7 +30,7 @@ #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/cancelcommandexecution.hxx> -#include <ucbhelper/simpleioerrorrequest.hxx> +#include "simpleioerrorrequest.hxx" using namespace com::sun::star; diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx index 653f0d47e125..01ebcee1ca71 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/ucbhelper/source/provider/contenthelper.cxx @@ -33,7 +33,7 @@ #include <cppuhelper/queryinterface.hxx> #include <ucbhelper/contenthelper.hxx> #include <ucbhelper/contentidentifier.hxx> -#include <ucbhelper/contentinfo.hxx> +#include "contentinfo.hxx" #include <ucbhelper/providerhelper.hxx> #include <ucbhelper/macros.hxx> diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx index a0a26745b758..85b3b6c741e3 100644 --- a/ucbhelper/source/provider/contentinfo.cxx +++ b/ucbhelper/source/provider/contentinfo.cxx @@ -30,7 +30,7 @@ #include <cppuhelper/queryinterface.hxx> #include <osl/mutex.hxx> #include <ucbhelper/contenthelper.hxx> -#include <ucbhelper/contentinfo.hxx> +#include "contentinfo.hxx" #include <ucbhelper/macros.hxx> using namespace com::sun::star; diff --git a/include/ucbhelper/contentinfo.hxx b/ucbhelper/source/provider/contentinfo.hxx index 485085db5e28..3472ed49922c 100644 --- a/include/ucbhelper/contentinfo.hxx +++ b/ucbhelper/source/provider/contentinfo.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_UCBHELPER_CONTENTINFO_HXX -#define INCLUDED_UCBHELPER_CONTENTINFO_HXX +#ifndef UCBHELPER_SOURCE_PROVIDER_CONTENTINFO_HXX +#define UCBHELPER_SOURCE_PROVIDER_CONTENTINFO_HXX #include <memory> #include <com/sun/star/ucb/XCommandInfo.hpp> @@ -123,6 +123,6 @@ public: } // namespace ucbhelper -#endif /* ! INCLUDED_UCBHELPER_CONTENTINFO_HXX */ +#endif /* ! UCBHELPER_SOURCE_PROVIDER_CONTENTINFO_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/simpleioerrorrequest.cxx b/ucbhelper/source/provider/simpleioerrorrequest.cxx index 41492a225750..aeb0a8429424 100644 --- a/ucbhelper/source/provider/simpleioerrorrequest.cxx +++ b/ucbhelper/source/provider/simpleioerrorrequest.cxx @@ -18,7 +18,7 @@ */ #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> -#include <ucbhelper/simpleioerrorrequest.hxx> +#include "simpleioerrorrequest.hxx" using namespace com::sun::star; using namespace ucbhelper; diff --git a/include/ucbhelper/simpleioerrorrequest.hxx b/ucbhelper/source/provider/simpleioerrorrequest.hxx index 9c0846e7dc05..3a5225ac6a82 100644 --- a/include/ucbhelper/simpleioerrorrequest.hxx +++ b/ucbhelper/source/provider/simpleioerrorrequest.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_UCBHELPER_SIMPLEIOERRORREQUEST_HXX -#define INCLUDED_UCBHELPER_SIMPLEIOERRORREQUEST_HXX +#ifndef UCBHELPER_SOURCE_PROVIDER_SIMPLEIOERRORREQUEST_HXX +#define UCBHELPER_SOURCE_PROVIDER_SIMPLEIOERRORREQUEST_HXX #include <com/sun/star/ucb/IOErrorCode.hpp> #include <ucbhelper/interactionrequest.hxx> @@ -62,6 +62,6 @@ public: } // namespace ucbhelper -#endif /* ! INCLUDED_UCBHELPER_SIMPLEIOERRORREQUEST_HXX */ +#endif /* ! UCBHELPER_SOURCE_PROVIDER_SIMPLEIOERRORREQUEST_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |