summaryrefslogtreecommitdiff
path: root/svgio
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-02-21 07:26:06 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-02-21 14:50:28 +0100
commit9ad252b2e79576119c2d733a1a45fdd9e9f83140 (patch)
tree87fee16145d457b6799a05c389d85270476f7f35 /svgio
parent3aca35f1505fa552eaa316a2d47a60ef52646525 (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 "&lt;"/"&gt;" 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 'svgio')
-rw-r--r--svgio/inc/svgnode.hxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/svgio/inc/svgnode.hxx b/svgio/inc/svgnode.hxx
index ecba14022f57..dd9f53cc9d2f 100644
--- a/svgio/inc/svgnode.hxx
+++ b/svgio/inc/svgnode.hxx
@@ -26,7 +26,7 @@
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <memory>
#include <vector>
-#include <o3tl/optional.hxx>
+#include <optional>
// predefines
namespace svgio
@@ -94,10 +94,10 @@ namespace svgio
std::vector< std::unique_ptr<SvgNode> > maChildren;
/// Id svan value
- o3tl::optional<OUString> mpId;
+ std::optional<OUString> mpId;
/// Class svan value
- o3tl::optional<OUString> mpClass;
+ std::optional<OUString> mpClass;
/// XmlSpace value
XmlSpace maXmlSpace;
@@ -167,11 +167,11 @@ namespace svgio
double getCurrentXHeight() const;
/// Id access
- o3tl::optional<OUString> const & getId() const { return mpId; }
+ std::optional<OUString> const & getId() const { return mpId; }
void setId(OUString const &);
/// Class access
- o3tl::optional<OUString> const & getClass() const { return mpClass; }
+ std::optional<OUString> const & getClass() const { return mpClass; }
void setClass(OUString const &);
/// XmlSpace access