diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-31 12:11:07 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-10 14:21:48 +0200 |
| commit | 4b9ec075f8f6f1b38a91c43a66fae157415dfae1 (patch) | |
| tree | fff8c29194c6e8ec68fe3c15d5caa0e9101f59c7 /src/corelib | |
| parent | c0e51ee9dfd1f7a8482f9fafdcf72b66f4881ef5 (diff) | |
Remove spurious const from QVariant::convert()'s first parameter
As per ### Qt6 comment.
Task-number: QTBUG-85700
Change-Id: I24292d9f2b8f7781032aa8df2a7a0c58ad4fb6c9
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index e052e3bd34..39a97741e1 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -2023,11 +2023,11 @@ bool QVariant::convert(QMetaType targetType) } /*! - \fn bool QVariant::convert(const int type, void *ptr) const + \fn bool QVariant::convert(int type, void *ptr) const \internal Created for qvariant_cast() usage */ -bool QVariant::convert(const int type, void *ptr) const +bool QVariant::convert(int type, void *ptr) const { return QMetaType::convert(d.type(), constData(), QMetaType(type), ptr); } diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 7d01911333..47103725f8 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -489,7 +489,7 @@ protected: Private d; void create(int type, const void *copy); bool equals(const QVariant &other) const; - bool convert(const int t, void *ptr) const; // ### Qt6: drop const + bool convert(int t, void *ptr) const; private: // force compile error, prevent QVariant(bool) to be called |