Skip to content

Commit 8c0dcf1

Browse files
committed
Delete copy-assign for QTZP backends
Nothing should be using it and one or two of them would need non-trivial implementation if not deleted. Change-Id: I4769eaba8abff1d7915e17e2ab010f7ec8e02551 Reviewed-by: Giuseppe D'Angelo <[email protected]> Reviewed-by: Marc Mutz <[email protected]>
1 parent 4be99b1 commit 8c0dcf1

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

src/corelib/time/qtimezoneprivate_p.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ QT_BEGIN_NAMESPACE
4747

4848
class Q_AUTOTEST_EXPORT QTimeZonePrivate : public QSharedData
4949
{
50+
// Nothing should be copy-assigning instances of either this or its derived
51+
// classes (only clone() should copy, using the copy-constructor):
52+
bool operator=(const QTimeZonePrivate &) const = delete;
5053
public:
5154
// Version of QTimeZone::OffsetData struct using msecs for efficiency
5255
struct Data {
@@ -174,6 +177,7 @@ template<> QTimeZonePrivate *QSharedDataPointer<QTimeZonePrivate>::clone();
174177

175178
class Q_AUTOTEST_EXPORT QUtcTimeZonePrivate final : public QTimeZonePrivate
176179
{
180+
bool operator=(const QUtcTimeZonePrivate &) const = delete;
177181
public:
178182
// Create default UTC time zone
179183
QUtcTimeZonePrivate();
@@ -236,6 +240,7 @@ class Q_AUTOTEST_EXPORT QUtcTimeZonePrivate final : public QTimeZonePrivate
236240
#if QT_CONFIG(timezone_tzdb)
237241
class QChronoTimeZonePrivate final : public QTimeZonePrivate
238242
{
243+
bool operator=(const QChronoTimeZonePrivate &) const = delete;
239244
QChronoTimeZonePrivate(const QChronoTimeZonePrivate &) = default;
240245
public:
241246
QChronoTimeZonePrivate();
@@ -265,6 +270,7 @@ class QChronoTimeZonePrivate final : public QTimeZonePrivate
265270
#elif defined(Q_OS_DARWIN)
266271
class Q_AUTOTEST_EXPORT QMacTimeZonePrivate final : public QTimeZonePrivate
267272
{
273+
bool operator=(const QMacTimeZonePrivate &) const = delete;
268274
public:
269275
// Create default time zone
270276
QMacTimeZonePrivate();
@@ -310,6 +316,7 @@ class Q_AUTOTEST_EXPORT QMacTimeZonePrivate final : public QTimeZonePrivate
310316
#elif defined(Q_OS_ANDROID)
311317
class QAndroidTimeZonePrivate final : public QTimeZonePrivate
312318
{
319+
bool operator=(const QAndroidTimeZonePrivate &) const = delete;
313320
public:
314321
// Create default time zone
315322
QAndroidTimeZonePrivate();
@@ -378,6 +385,7 @@ struct QTzTimeZoneCacheEntry
378385

379386
class Q_AUTOTEST_EXPORT QTzTimeZonePrivate final : public QTimeZonePrivate
380387
{
388+
bool operator=(const QTzTimeZonePrivate &) const = delete;
381389
QTzTimeZonePrivate(const QTzTimeZonePrivate &) = default;
382390
public:
383391
// Create default time zone
@@ -430,6 +438,7 @@ class Q_AUTOTEST_EXPORT QTzTimeZonePrivate final : public QTimeZonePrivate
430438
#elif QT_CONFIG(icu)
431439
class Q_AUTOTEST_EXPORT QIcuTimeZonePrivate final : public QTimeZonePrivate
432440
{
441+
bool operator=(const QIcuTimeZonePrivate &) const = delete;
433442
public:
434443
// Create default time zone
435444
QIcuTimeZonePrivate();
@@ -473,6 +482,7 @@ class Q_AUTOTEST_EXPORT QIcuTimeZonePrivate final : public QTimeZonePrivate
473482
#elif defined(Q_OS_WIN)
474483
class Q_AUTOTEST_EXPORT QWinTimeZonePrivate final : public QTimeZonePrivate
475484
{
485+
bool operator=(const QWinTimeZonePrivate &) const = delete;
476486
public:
477487
struct QWinTransitionRule {
478488
int startYear;

0 commit comments

Comments
 (0)