move some headers inside ucbhelper

Change-Id: Iccd80aa4e631abe002837ca61248e136de9a62eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87866
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2020-02-03 14:28:33 +02:00
parent 54b28638ab
commit d7b0b2b505
12 changed files with 19 additions and 22 deletions

View File

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/python2
# Look for headers inside include/ that can be moved into their respective modules. # Look for headers inside include/ that can be moved into their respective modules.

View File

@ -91,9 +91,6 @@ blacklist:
include/ucbhelper/activedatasink.hxx: include/ucbhelper/activedatasink.hxx:
# base class has to be a complete type # base class has to be a complete type
- com/sun/star/io/XActiveDataSink.hpp - 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: include/ucbhelper/commandenvironment.hxx:
# base class has to be a complete type # base class has to be a complete type
- com/sun/star/ucb/XCommandEnvironment.hpp - com/sun/star/ucb/XCommandEnvironment.hpp

View File

@ -7544,14 +7544,12 @@ include/typelib/typedescription.h
include/typelib/typedescription.hxx include/typelib/typedescription.hxx
include/typelib/uik.h include/typelib/uik.h
include/ucbhelper/activedatasink.hxx include/ucbhelper/activedatasink.hxx
include/ucbhelper/activedatastreamer.hxx
include/ucbhelper/authenticationfallback.hxx include/ucbhelper/authenticationfallback.hxx
include/ucbhelper/cancelcommandexecution.hxx include/ucbhelper/cancelcommandexecution.hxx
include/ucbhelper/commandenvironment.hxx include/ucbhelper/commandenvironment.hxx
include/ucbhelper/content.hxx include/ucbhelper/content.hxx
include/ucbhelper/contenthelper.hxx include/ucbhelper/contenthelper.hxx
include/ucbhelper/contentidentifier.hxx include/ucbhelper/contentidentifier.hxx
include/ucbhelper/contentinfo.hxx
include/ucbhelper/fd_inputstream.hxx include/ucbhelper/fd_inputstream.hxx
include/ucbhelper/getcomponentcontext.hxx include/ucbhelper/getcomponentcontext.hxx
include/ucbhelper/interactionrequest.hxx include/ucbhelper/interactionrequest.hxx
@ -7567,7 +7565,6 @@ include/ucbhelper/resultsetmetadata.hxx
include/ucbhelper/simpleauthenticationrequest.hxx include/ucbhelper/simpleauthenticationrequest.hxx
include/ucbhelper/simplecertificatevalidationrequest.hxx include/ucbhelper/simplecertificatevalidationrequest.hxx
include/ucbhelper/simpleinteractionrequest.hxx include/ucbhelper/simpleinteractionrequest.hxx
include/ucbhelper/simpleioerrorrequest.hxx
include/ucbhelper/simplenameclashresolverequest.hxx include/ucbhelper/simplenameclashresolverequest.hxx
include/ucbhelper/ucbhelperdllapi.h include/ucbhelper/ucbhelperdllapi.h
include/uno/Enterable.h include/uno/Enterable.h
@ -16784,6 +16781,7 @@ ucb/source/ucp/webdav/webdavresultset.hxx
ucb/source/ucp/webdav/webdavservices.cxx ucb/source/ucp/webdav/webdavservices.cxx
ucbhelper/source/client/activedatasink.cxx ucbhelper/source/client/activedatasink.cxx
ucbhelper/source/client/activedatastreamer.cxx ucbhelper/source/client/activedatastreamer.cxx
ucbhelper/source/client/activedatastreamer.hxx
ucbhelper/source/client/commandenvironment.cxx ucbhelper/source/client/commandenvironment.cxx
ucbhelper/source/client/content.cxx ucbhelper/source/client/content.cxx
ucbhelper/source/client/interceptedinteraction.cxx ucbhelper/source/client/interceptedinteraction.cxx
@ -16793,6 +16791,7 @@ ucbhelper/source/provider/cancelcommandexecution.cxx
ucbhelper/source/provider/contenthelper.cxx ucbhelper/source/provider/contenthelper.cxx
ucbhelper/source/provider/contentidentifier.cxx ucbhelper/source/provider/contentidentifier.cxx
ucbhelper/source/provider/contentinfo.cxx ucbhelper/source/provider/contentinfo.cxx
ucbhelper/source/provider/contentinfo.hxx
ucbhelper/source/provider/fd_inputstream.cxx ucbhelper/source/provider/fd_inputstream.cxx
ucbhelper/source/provider/getcomponentcontext.cxx ucbhelper/source/provider/getcomponentcontext.cxx
ucbhelper/source/provider/interactionrequest.cxx ucbhelper/source/provider/interactionrequest.cxx
@ -16806,6 +16805,7 @@ ucbhelper/source/provider/simpleauthenticationrequest.cxx
ucbhelper/source/provider/simplecertificatevalidationrequest.cxx ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
ucbhelper/source/provider/simpleinteractionrequest.cxx ucbhelper/source/provider/simpleinteractionrequest.cxx
ucbhelper/source/provider/simpleioerrorrequest.cxx ucbhelper/source/provider/simpleioerrorrequest.cxx
ucbhelper/source/provider/simpleioerrorrequest.hxx
ucbhelper/source/provider/simplenameclashresolverequest.cxx ucbhelper/source/provider/simplenameclashresolverequest.cxx
unodevtools/inc/options.hxx unodevtools/inc/options.hxx
unodevtools/source/skeletonmaker/cppcompskeleton.cxx unodevtools/source/skeletonmaker/cppcompskeleton.cxx

View File

@ -23,7 +23,7 @@
************************************************************************** **************************************************************************
*************************************************************************/ *************************************************************************/
#include <ucbhelper/activedatastreamer.hxx> #include "activedatastreamer.hxx"
using namespace com::sun::star; using namespace com::sun::star;

View File

@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifndef INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX #ifndef UCBHELPER_SOURCE_CLIENT_ACTIVEDATASTREAMER_HXX
#define INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX #define UCBHELPER_SOURCE_CLIENT_ACTIVEDATASTREAMER_HXX
#include <com/sun/star/io/XActiveDataStreamer.hpp> #include <com/sun/star/io/XActiveDataStreamer.hpp>
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
@ -46,6 +46,6 @@ public:
} /* namespace ucbhelper */ } /* namespace ucbhelper */
#endif /* ! INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX */ #endif /* ! UCBHELPER_SOURCE_CLIENT_ACTIVEDATASTREAMER_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -55,7 +55,7 @@
#include <com/sun/star/beans/UnknownPropertyException.hpp> #include <com/sun/star/beans/UnknownPropertyException.hpp>
#include <ucbhelper/content.hxx> #include <ucbhelper/content.hxx>
#include <ucbhelper/activedatasink.hxx> #include <ucbhelper/activedatasink.hxx>
#include <ucbhelper/activedatastreamer.hxx> #include "activedatastreamer.hxx"
#include <ucbhelper/cancelcommandexecution.hxx> #include <ucbhelper/cancelcommandexecution.hxx>
namespace com::sun::star::ucb { class XCommandEnvironment; } namespace com::sun::star::ucb { class XCommandEnvironment; }

View File

@ -30,7 +30,7 @@
#include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/interactionrequest.hxx>
#include <ucbhelper/cancelcommandexecution.hxx> #include <ucbhelper/cancelcommandexecution.hxx>
#include <ucbhelper/simpleioerrorrequest.hxx> #include "simpleioerrorrequest.hxx"
using namespace com::sun::star; using namespace com::sun::star;

View File

@ -33,7 +33,7 @@
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
#include <ucbhelper/contenthelper.hxx> #include <ucbhelper/contenthelper.hxx>
#include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/contentidentifier.hxx>
#include <ucbhelper/contentinfo.hxx> #include "contentinfo.hxx"
#include <ucbhelper/providerhelper.hxx> #include <ucbhelper/providerhelper.hxx>
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>

View File

@ -30,7 +30,7 @@
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <ucbhelper/contenthelper.hxx> #include <ucbhelper/contenthelper.hxx>
#include <ucbhelper/contentinfo.hxx> #include "contentinfo.hxx"
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>
using namespace com::sun::star; using namespace com::sun::star;

View File

@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifndef INCLUDED_UCBHELPER_CONTENTINFO_HXX #ifndef UCBHELPER_SOURCE_PROVIDER_CONTENTINFO_HXX
#define INCLUDED_UCBHELPER_CONTENTINFO_HXX #define UCBHELPER_SOURCE_PROVIDER_CONTENTINFO_HXX
#include <memory> #include <memory>
#include <com/sun/star/ucb/XCommandInfo.hpp> #include <com/sun/star/ucb/XCommandInfo.hpp>
@ -123,6 +123,6 @@ public:
} // namespace ucbhelper } // namespace ucbhelper
#endif /* ! INCLUDED_UCBHELPER_CONTENTINFO_HXX */ #endif /* ! UCBHELPER_SOURCE_PROVIDER_CONTENTINFO_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -18,7 +18,7 @@
*/ */
#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
#include <ucbhelper/simpleioerrorrequest.hxx> #include "simpleioerrorrequest.hxx"
using namespace com::sun::star; using namespace com::sun::star;
using namespace ucbhelper; using namespace ucbhelper;

View File

@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifndef INCLUDED_UCBHELPER_SIMPLEIOERRORREQUEST_HXX #ifndef UCBHELPER_SOURCE_PROVIDER_SIMPLEIOERRORREQUEST_HXX
#define INCLUDED_UCBHELPER_SIMPLEIOERRORREQUEST_HXX #define UCBHELPER_SOURCE_PROVIDER_SIMPLEIOERRORREQUEST_HXX
#include <com/sun/star/ucb/IOErrorCode.hpp> #include <com/sun/star/ucb/IOErrorCode.hpp>
#include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/interactionrequest.hxx>
@ -62,6 +62,6 @@ public:
} // namespace ucbhelper } // namespace ucbhelper
#endif /* ! INCLUDED_UCBHELPER_SIMPLEIOERRORREQUEST_HXX */ #endif /* ! UCBHELPER_SOURCE_PROVIDER_SIMPLEIOERRORREQUEST_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */