9ad252b2e7
...now that macOS builds are guaranteed to have std::optional since
358146bbbd "Bump macOS build baseline to
Xcode 11.3 and macOS 10.14.4".
The change is done mostly mechanically with
> for i in $(git grep -Fl optional); do
> sed -i -e 's:<o3tl/optional\.hxx>\|\"o3tl/optional\.hxx\":<optional>:' \
> -e 's/\<o3tl::optional\>/std::optional/g' \
> -e 's/\<o3tl::make_optional\>/std::make_optional/g' "$i"
> done
> for i in $(git grep -Flw o3tl::nullopt); do
> sed -i -e 's/\<o3tl::nullopt\>/std::nullopt/g' "$i"
> done
(though that causes some of the resulting
#include <optional>
to appear at different places relative to other includes than if they had been
added manually), plus a few manual modifications:
* adapt bin/find-unneeded-includes
* adapt desktop/IwyuFilter_desktop.yaml
* remove include/o3tl/optional.hxx
* quote resulting "<"/">" as "<"/">" in officecfg/registry/cppheader.xsl
* and then solenv/clang-format/reformat-formatted-files
Change-Id: I68833d9f7945e57aa2bc703349cbc5a56b342273
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89165
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
91 lines
3.2 KiB
YAML
91 lines
3.2 KiB
YAML
---
|
|
assumeFilename: desktop/source/lib/init.cxx
|
|
blacklist:
|
|
desktop/inc/lib/init.hxx:
|
|
# Complete type is needed
|
|
- boost/property_tree/ptree.hpp
|
|
desktop/source/offacc/acceptor.hxx:
|
|
# Don't propose hxx -> h change in URE libs
|
|
- osl/thread.hxx
|
|
desktop/qa/desktop_lib/test_desktop_lib.cxx:
|
|
# Actually used
|
|
- comphelper/scopeguard.hxx
|
|
desktop/source/app/app.cxx:
|
|
# Needed on WIN32
|
|
- o3tl/char16_t2wchar_t.hxx
|
|
# Needed for HAVE_FEATURE_UPDATE_MAR
|
|
- com/sun/star/system/XSystemShellExecute.hpp
|
|
- com/sun/star/system/SystemShellExecute.hpp
|
|
- officecfg/Office/Update.hxx
|
|
desktop/source/app/appinit.cxx:
|
|
# Needed on IOS
|
|
- rtl/bootstrap.hxx
|
|
desktop/source/app/cmdlineargs.cxx:
|
|
# Don't propose hxx -> h change in URE libs
|
|
- osl/thread.hxx
|
|
desktop/source/app/cmdlinehelp.cxx:
|
|
# Needed on WIN32
|
|
- comphelper/string.hxx
|
|
desktop/source/app/crashreport.cxx:
|
|
# Needed on WIN32
|
|
- o3tl/char16_t2wchar_t.hxx
|
|
desktop/source/app/dispatchwatcher.cxx:
|
|
# Don't propose hxx -> h change in URE libs
|
|
- osl/thread.hxx
|
|
desktop/source/app/sofficemain.cxx:
|
|
# Might be needed on WIN32
|
|
- prewin.h
|
|
- postwin.h
|
|
# Needed on ANDROID
|
|
- rtl/bootstrap.hxx
|
|
desktop/source/lib/init.cxx:
|
|
# Needed for boost::trim_copy
|
|
- boost/algorithm/string.hpp
|
|
# Actually used
|
|
- comphelper/scopeguard.hxx
|
|
# Needed on IOS & ANDROID
|
|
- officecfg/Office/Impress.hxx
|
|
desktop/source/minidump/minidump.cxx:
|
|
# Needed for ostringstream
|
|
- sstream
|
|
desktop/source/deployment/manager/dp_properties.cxx:
|
|
# Actually used
|
|
- com/sun/star/ucb/XCommandEnvironment.hpp
|
|
desktop/source/deployment/manager/dp_informationprovider.cxx:
|
|
# Needed for extern functions
|
|
- dp_services.hxx
|
|
desktop/source/deployment/manager/dp_extensionmanager.cxx:
|
|
# Actually used
|
|
- com/sun/star/deployment/XPackage.hpp
|
|
- com/sun/star/deployment/XPackageManager.hpp
|
|
- com/sun/star/uno/XComponentContext.hpp
|
|
# Needed for extern functions
|
|
- dp_services.hxx
|
|
desktop/source/deployment/misc/lockfile.cxx:
|
|
# Needed on WIN32
|
|
- memory
|
|
desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx:
|
|
# Actually used
|
|
- com/sun/star/uno/XComponentContext.hpp
|
|
desktop/source/deployment/registry/component/dp_compbackenddb.cxx:
|
|
# Actually used
|
|
- com/sun/star/uno/XComponentContext.hpp
|
|
desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx:
|
|
# Actually used
|
|
- com/sun/star/uno/XComponentContext.hpp
|
|
desktop/source/deployment/registry/package/dp_extbackenddb.cxx:
|
|
# Actually used
|
|
- com/sun/star/uno/XComponentContext.hpp
|
|
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx:
|
|
# Actually used
|
|
- com/sun/star/uno/XComponentContext.hpp
|
|
desktop/source/deployment/registry/help/dp_helpbackenddb.cxx:
|
|
# Actually used
|
|
- com/sun/star/uno/XComponentContext.hpp
|
|
desktop/source/deployment/registry/script/dp_lib_container.cxx:
|
|
# Actually used
|
|
- com/sun/star/uno/XComponentContext.hpp
|
|
- com/sun/star/ucb/XCommandEnvironment.hpp
|
|
desktop/source/deployment/registry/help/dp_help.cxx:
|
|
# Actually used
|
|
- com/sun/star/util/XMacroExpander.hpp
|