summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2023-01-13 16:54:03 +0100
committerMarc Mutz <marc.mutz@qt.io>2023-01-18 13:25:15 +0100
commit596cb2753da896a32a165cc7117553c797f698c9 (patch)
tree6b72c5a27375731e9fc0297cd66f91e60932a136 /src
parent152b32879dff9e174f96ef77c22a6096b6a048ac (diff)
downloadqtsvg-596cb2753da896a32a165cc7117553c797f698c9.tar.gz
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 <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/svg/qsvggenerator.cpp4
-rw-r--r--src/svg/qsvggenerator.h5
2 files changed, 1 insertions, 8 deletions
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;