diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-02-21 07:26:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-02-21 14:50:28 +0100 |
| commit | 9ad252b2e79576119c2d733a1a45fdd9e9f83140 (patch) | |
| tree | 87fee16145d457b6799a05c389d85270476f7f35 /cui | |
| parent | 3aca35f1505fa552eaa316a2d47a60ef52646525 (diff) | |
Drop o3tl::optional wrapper
...now that macOS builds are guaranteed to have std::optional since
358146bbbd1b9775c12770fb5e497b6ec5adfc51 "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>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/inc/pch/precompiled_cui.hxx | 2 | ||||
| -rw-r--r-- | cui/source/options/fontsubs.cxx | 2 | ||||
| -rw-r--r-- | cui/source/options/tsaurls.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 25c8af7e7414..1860efb7f1da 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -284,7 +284,7 @@ #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> #include <o3tl/enumarray.hxx> -#include <o3tl/optional.hxx> +#include <optional> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/strong_int.hxx> diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index d9d4debec894..d6e724fa4a95 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -178,7 +178,7 @@ bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* ) if (m_xFontNameLB->get_active() != -1) sFontName = m_xFontNameLB->get_active_text(); officecfg::Office::Common::Font::SourceViewFont::FontName::set( - o3tl::optional< OUString >(sFontName), batch); + std::optional< OUString >(sFontName), batch); batch->commit(); return false; diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx index 6fc5ad50d55d..62f08298db8e 100644 --- a/cui/source/options/tsaurls.cxx +++ b/cui/source/options/tsaurls.cxx @@ -35,7 +35,7 @@ TSAURLsDialog::TSAURLsDialog(weld::Window* pParent) try { - o3tl::optional<css::uno::Sequence<OUString>> aUserSetTSAURLs(officecfg::Office::Common::Security::Scripting::TSAURLs::get()); + std::optional<css::uno::Sequence<OUString>> aUserSetTSAURLs(officecfg::Office::Common::Security::Scripting::TSAURLs::get()); if (aUserSetTSAURLs) { const css::uno::Sequence<OUString>& rUserSetTSAURLs = *aUserSetTSAURLs; |