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 /include/dbaccess | |
parent | loplugin:sequenceloop improve rvalue detection (diff) | |
download | core-9ad252b2e79576119c2d733a1a45fdd9e9f83140.tar.gz core-9ad252b2e79576119c2d733a1a45fdd9e9f83140.zip |
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 'include/dbaccess')
-rw-r--r-- | include/dbaccess/genericcontroller.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 60c75236475f..805131548f28 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -27,7 +27,7 @@ #include <memory> #include <vector> -#include <o3tl/optional.hxx> +#include <optional> #include <com/sun/star/awt/XUserInputInterception.hpp> #include <com/sun/star/frame/CommandGroup.hpp> @@ -94,7 +94,7 @@ namespace dbaui class ODataView; template< typename T > - inline bool SAL_CALL operator >>= (const css::uno::Any& _any, o3tl::optional< T >& _value) + inline bool SAL_CALL operator >>= (const css::uno::Any& _any, std::optional< T >& _value) { _value.reset(); // de-init the optional value @@ -118,10 +118,10 @@ namespace dbaui { bool bEnabled; - o3tl::optional<bool> bChecked; - o3tl::optional<bool> bInvisible; + std::optional<bool> bChecked; + std::optional<bool> bInvisible; css::uno::Any aValue; - o3tl::optional<OUString> sTitle; + std::optional<OUString> sTitle; FeatureState() : bEnabled(false) { } }; |