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 /libreofficekit/qa | |
| 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 'libreofficekit/qa')
6 files changed, 7 insertions, 7 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx index fec03e046dc2..2ebaf0e49aec 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx @@ -24,7 +24,7 @@ #include "gtv-lok-dialog.hxx" #include <boost/property_tree/json_parser.hpp> -#include <o3tl/optional.hxx> +#include <optional> namespace { diff --git a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx index 43037b5059f5..ff6023d5a74f 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx @@ -19,7 +19,7 @@ #include <map> #include <boost/property_tree/json_parser.hpp> -#include <o3tl/optional.hxx> +#include <optional> #include <o3tl/unreachable.hxx> namespace { diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx index bcee979766f5..359b6ad20833 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx @@ -18,7 +18,7 @@ #include "gtv-lok-dialog.hxx" #include <boost/property_tree/json_parser.hpp> -#include <o3tl/optional.hxx> +#include <optional> #include <iostream> diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx index 25f7d7890fdb..f2b76c1a93e3 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx @@ -20,7 +20,7 @@ #include <memory> #include <boost/property_tree/json_parser.hpp> -#include <o3tl/optional.hxx> +#include <optional> namespace { diff --git a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx index 1b0233fee66c..dd601375a32c 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx @@ -20,7 +20,7 @@ #include <vector> #include <boost/property_tree/json_parser.hpp> -#include <o3tl/optional.hxx> +#include <optional> void btn_clicked(GtkWidget* pButton, gpointer) { @@ -89,7 +89,7 @@ void doPaste(GtkWidget* pButton, gpointer /*pItem*/) g_free(pTargets); } - o3tl::optional<GdkAtom> oTarget; + std::optional<GdkAtom> oTarget; std::string aTargetName; std::vector<std::string> aPreferredNames = diff --git a/libreofficekit/qa/tilebench/tilebench.cxx b/libreofficekit/qa/tilebench/tilebench.cxx index 8802cb83be4b..28b6bc54d915 100644 --- a/libreofficekit/qa/tilebench/tilebench.cxx +++ b/libreofficekit/qa/tilebench/tilebench.cxx @@ -23,7 +23,7 @@ #include <LibreOfficeKit/LibreOfficeKit.hxx> #include <boost/property_tree/json_parser.hpp> -#include <o3tl/optional.hxx> +#include <optional> using namespace lok; |