diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-30 17:48:32 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-12-01 14:57:16 +0100 |
commit | 7e403195e574be5174815a51cf5c42f06f76a87a (patch) | |
tree | c6147bcac095cd387f06dee63a25e15db6ca84c6 /include/cppcanvas | |
parent | boost::optional: replace uses of get_value_or with value_or (diff) | |
download | core-7e403195e574be5174815a51cf5c42f06f76a87a.tar.gz core-7e403195e574be5174815a51cf5c42f06f76a87a.zip |
Introduce o3tl::optional as an alias for std::optional
...with a boost::optional fallback for Xcode < 10 (as std::optional is only
available starting with Xcode 10 according to
<https://en.cppreference.com/w/cpp/compiler_support>, and our baseline for iOS
and macOS is still Xcode 9.3 according to README.md). And mechanically rewrite
all code to use o3tl::optional instead of boost::optional.
One immediate benefit is that disabling -Wmaybe-uninitialized for GCC as per
fed7c3deb3f4ec81f78967c2d7f3c4554398cb9d "Slience bogus
-Werror=maybe-uninitialized" should no longer be necessary (and whose check
happened to no longer trigger for GCC 10 trunk, even though that compiler would
still emit bogus -Wmaybe-uninitialized for uses of boost::optional under
--enable-optimized, which made me ponder whether this switch from
boost::optional to std::optional would be a useful thing to do; I keep that
configure.ac check for now, though, and will only remove it in a follow up
commit).
Another longer-term benefit is that the code is now already in good shape for an
eventual switch to std::optional (a switch we would have done anyway once we no
longer need to support Xcode < 10).
Only desktop/qa/desktop_lib/test_desktop_lib.cxx heavily uses
boost::property_tree::ptree::get_child_optional returning boost::optional, so
let it keep using boost::optional for now.
After a number of preceding commits have paved the way for this change, this
commit is completely mechanical, done with
> git ls-files -z | grep -vz -e '^bin/find-unneeded-includes$' -e '^configure.ac$' -e '^desktop/qa/desktop_lib/test_desktop_lib.cxx$' -e '^dictionaries$' -e '^external/' -e '^helpcontent2$' -e '^include/IwyuFilter_include.yaml$' -e '^sc/IwyuFilter_sc.yaml$' -e '^solenv/gdb/boost/optional.py$' -e '^solenv/vs/LibreOffice.natvis$' -e '^translations$' -e '\.svg$' | xargs -0 sed -i -E -e 's|\<boost(/optional)?/optional\.hpp\>|o3tl/optional.hxx|g' -e 's/\<boost(\s*)::(\s*)(make_)?optional\>/o3tl\1::\2\3optional/g' -e 's/\<boost(\s*)::(\s*)none\>/o3tl\1::\2nullopt/g'
(before committing include/o3tl/optional.hxx, and relying on some GNU features).
It excludes some files where mention of boost::optional et al should apparently
not be changed (and the sub-repo directory stubs). It turned out that all uses
of boost::none across the code base were in combination with boost::optional, so
had all to be rewritten as o3tl::nullopt.
Change-Id: Ibfd9f4b3d5a8aee6e6eed310b988c4e5ffd8b11b
Reviewed-on: https://gerrit.libreoffice.org/84128
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/cppcanvas')
-rw-r--r-- | include/cppcanvas/renderer.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/cppcanvas/renderer.hxx b/include/cppcanvas/renderer.hxx index 113bda783f20..ed1dc04a11f7 100644 --- a/include/cppcanvas/renderer.hxx +++ b/include/cppcanvas/renderer.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> #include <rtl/ustring.hxx> -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <cppcanvas/canvasgraphic.hxx> #include <cppcanvas/color.hxx> @@ -100,16 +100,16 @@ namespace cppcanvas struct Parameters { /// Optionally forces the fill color attribute for all actions - ::boost::optional< IntSRGBA > maFillColor; + ::o3tl::optional< IntSRGBA > maFillColor; /// Optionally forces the line color attribute for all actions - ::boost::optional< IntSRGBA > maLineColor; + ::o3tl::optional< IntSRGBA > maLineColor; /// Optionally forces the text color attribute for all actions - ::boost::optional< IntSRGBA > maTextColor; + ::o3tl::optional< IntSRGBA > maTextColor; /// Optionally forces the given fontname for all text actions - ::boost::optional< OUString > maFontName; + ::o3tl::optional< OUString > maFontName; /** Optionally transforms all text output actions with the given matrix (in addition to the overall canvas @@ -119,16 +119,16 @@ namespace cppcanvas rect coordinate system, i.e. the metafile is assumed to be contained in the unit rect. */ - ::boost::optional< ::basegfx::B2DHomMatrix > maTextTransformation; + ::o3tl::optional< ::basegfx::B2DHomMatrix > maTextTransformation; /// Optionally forces the given font weight for all text actions - ::boost::optional< sal_Int8 > maFontWeight; + ::o3tl::optional< sal_Int8 > maFontWeight; /// Optionally forces the given font letter form (italics etc.) for all text actions - ::boost::optional< sal_Int8 > maFontLetterForm; + ::o3tl::optional< sal_Int8 > maFontLetterForm; /// Optionally forces underlining for all text actions - ::boost::optional< bool > maFontUnderline; + ::o3tl::optional< bool > maFontUnderline; }; }; |