From 596cb2753da896a32a165cc7117553c797f698c9 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 13 Jan 2023 16:54:03 +0100 Subject: QSvgGenerator: don't pre-program an explicit default ctor for Qt 7 Default ctors should be implicit so return {} works. Found in 6.5 API review, but not actionable for 6.5, only future Qt 7. Change-Id: I8747aa2646bbfc2af46736f9585b0709541c37d9 Reviewed-by: Giuseppe D'Angelo --- src/svg/qsvggenerator.cpp | 4 +--- src/svg/qsvggenerator.h | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'src') diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index 7ab882d..af39bb9 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -577,15 +577,13 @@ public: \value Svg11 The generated document follows the SVG 1.1 specification. */ -#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) /*! Constructs a new generator using the SVG Tiny 1.2 profile. */ -QSvgGenerator::QSvgGenerator() +QSvgGenerator::QSvgGenerator() // ### Qt 7: inline : QSvgGenerator(SvgVersion::SvgTiny12) { } -#endif /*! \since 6.5 diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h index 2121eb9..6c2059d 100644 --- a/src/svg/qsvggenerator.h +++ b/src/svg/qsvggenerator.h @@ -37,13 +37,8 @@ public: Svg11, }; - // ### Qt 7: unify overloads -#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) QSvgGenerator(); explicit QSvgGenerator(SvgVersion version); -#else - explicit QSvgGenerator(SvgVersion version = SvgVersion::SvgTiny12); -#endif ~QSvgGenerator(); QString title() const; -- cgit v1.2.1