3ec587666f
On 32-bit machines, qsizetype is int, so we don't actually need to QT_REMOVE_SINCE the QByteArrayList_join() helper, because it didn't change. Thanks to Thiago for showing me the QT_POINTER_SIZE trick in a similar change to QVersionNumber. Pick-to: 6.3 Change-Id: Iae6e315107e42da51fcb4e7325b6d40b9c3fe0bc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
148 lines
4.1 KiB
C++
148 lines
4.1 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com>
|
|
** Contact: http://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the QtCore module of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL$
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
|
** packaging of this file. Please review the following information to
|
|
** ensure the GNU Lesser General Public License version 3 requirements
|
|
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 2.0 or (at your option) the GNU General
|
|
** Public license version 3 or any later version approved by the KDE Free
|
|
** Qt Foundation. The licenses are as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
|
** https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#define QT_BUILD_REMOVED_API
|
|
|
|
#include "qglobal.h"
|
|
|
|
QT_USE_NAMESPACE
|
|
|
|
#if QT_REMOVED_SINCE(6, 1)
|
|
|
|
#include "qmetatype.h"
|
|
|
|
// keep in sync with version in header
|
|
int QMetaType::id() const
|
|
{
|
|
if (d_ptr) {
|
|
if (int id = d_ptr->typeId.loadRelaxed())
|
|
return id;
|
|
return idHelper();
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#endif // QT_REMOVED_SINCE(6, 1)
|
|
|
|
#if QT_REMOVED_SINCE(6, 3)
|
|
|
|
#include "tools/qcryptographichash.h"
|
|
|
|
void QCryptographicHash::addData(const QByteArray &data)
|
|
{
|
|
addData(QByteArrayView{data});
|
|
}
|
|
|
|
QByteArray QCryptographicHash::hash(const QByteArray &data, Algorithm method)
|
|
{
|
|
return hash(QByteArrayView{data}, method);
|
|
}
|
|
|
|
#include "quuid.h"
|
|
|
|
QUuid::QUuid(const QString &text)
|
|
: QUuid{qToAnyStringViewIgnoringNull(text)}
|
|
{
|
|
}
|
|
|
|
QUuid::QUuid(const char *text)
|
|
: QUuid{QAnyStringView(text)}
|
|
{
|
|
}
|
|
|
|
QUuid::QUuid(const QByteArray &text)
|
|
: QUuid{qToAnyStringViewIgnoringNull(text)}
|
|
{
|
|
}
|
|
|
|
QUuid QUuid::fromString(QStringView string) noexcept
|
|
{
|
|
return fromString(QAnyStringView{string});
|
|
}
|
|
|
|
QUuid QUuid::fromString(QLatin1String string) noexcept
|
|
{
|
|
return fromString(QAnyStringView{string});
|
|
}
|
|
|
|
QUuid QUuid::fromRfc4122(const QByteArray &bytes)
|
|
{
|
|
return fromRfc4122(qToByteArrayViewIgnoringNull(bytes));
|
|
}
|
|
|
|
#include "qbytearraylist.h"
|
|
|
|
# if QT_POINTER_SIZE != 4
|
|
QByteArray QtPrivate::QByteArrayList_join(const QByteArrayList *that, const char *sep, int seplen)
|
|
{
|
|
return QByteArrayList_join(that, sep, qsizetype(seplen));
|
|
}
|
|
# endif
|
|
|
|
#endif // QT_REMOVED_SINCE(6, 3)
|
|
|
|
#if QT_REMOVED_SINCE(6, 4)
|
|
|
|
#include "qversionnumber.h"
|
|
|
|
QT_WARNING_PUSH
|
|
QT_WARNING_DISABLE_DEPRECATED
|
|
|
|
QVersionNumber QVersionNumber::fromString(const QString &string, int *suffixIndex)
|
|
{
|
|
return fromString(qToAnyStringViewIgnoringNull(string), suffixIndex);
|
|
}
|
|
|
|
QVersionNumber QVersionNumber::fromString(QStringView string, int *suffixIndex)
|
|
{
|
|
return fromString(QAnyStringView{string}, suffixIndex);
|
|
}
|
|
|
|
QVersionNumber QVersionNumber::fromString(QLatin1String string, int *suffixIndex)
|
|
{
|
|
return fromString(QAnyStringView{string}, suffixIndex);
|
|
}
|
|
|
|
QT_WARNING_POP
|
|
|
|
// #include <qotherheader.h>
|
|
// // implement removed functions from qotherheader.h
|
|
|
|
#endif // QT_REMOVED_SINCE(6, 4)
|