1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove spurious const from QVariant::convert()'s first parameter

Browse Source 
As per ### Qt6 comment.

Task-number: QTBUG-85700
Change-Id: I24292d9f2b8f7781032aa8df2a7a0c58ad4fb6c9
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Edward Welbourne 2020-08-31 12:11:07 +02:00
parent c0e51ee9df
commit 4b9ec075f8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qvariant.cpp
View File

@ -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 \internal
Created for qvariant_cast() usage 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); return QMetaType::convert(d.type(), constData(), QMetaType(type), ptr);
} }

4
src/corelib/kernel/qvariant.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the QtCore module of the Qt Toolkit. ** This file is part of the QtCore module of the Qt Toolkit.
@ -489,7 +489,7 @@ protected:
Private d; Private d;
void create(int type, const void *copy); void create(int type, const void *copy);
bool equals(const QVariant &other) const; 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: private:
// force compile error, prevent QVariant(bool) to be called // force compile error, prevent QVariant(bool) to be called