diff options
Diffstat (limited to 'src/sql/kernel/qsqlresult_p.h')
| -rw-r--r-- | src/sql/kernel/qsqlresult_p.h | 50 |
1 files changed, 9 insertions, 41 deletions
diff --git a/src/sql/kernel/qsqlresult_p.h b/src/sql/kernel/qsqlresult_p.h index 672f3ac59b..6eebdaaba4 100644 --- a/src/sql/kernel/qsqlresult_p.h +++ b/src/sql/kernel/qsqlresult_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtSql 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QSQLRESULT_P_H #define QSQLRESULT_P_H @@ -53,6 +17,7 @@ #include <QtSql/private/qtsqlglobal_p.h> #include <QtCore/qpointer.h> +#include <QtCore/qhash.h> #include "qsqlerror.h" #include "qsqlresult.h" #include "qsqldriver.h" @@ -65,11 +30,11 @@ QT_BEGIN_NAMESPACE inline Class##Private* drv_d_func() { return !sqldriver ? nullptr : reinterpret_cast<Class *>(static_cast<QSqlDriver*>(sqldriver))->d_func(); } struct QHolder { - QHolder(const QString &hldr = QString(), int index = -1): holderName(hldr), holderPos(index) { } + QHolder(const QString &hldr = QString(), qsizetype index = -1): holderName(hldr), holderPos(index) { } bool operator==(const QHolder &h) const { return h.holderPos == holderPos && h.holderName == holderName; } bool operator!=(const QHolder &h) const { return h.holderPos != holderPos || h.holderName != holderName; } QString holderName; - int holderPos; + qsizetype holderPos; }; class Q_SQL_EXPORT QSqlResultPrivate @@ -107,7 +72,7 @@ public: clearIndex(); } - virtual QString fieldSerial(int) const; + virtual QString fieldSerial(qsizetype) const; QString positionalToNamedBinding(const QString &query) const; QString namedToPositionalBinding(const QString &query); QString holderAt(int index) const; @@ -133,6 +98,9 @@ public: bool active = false; bool isSel = false; bool forwardOnly = false; + bool positionalBindingEnabled = true; + + static bool isVariantNull(const QVariant &variant); }; QT_END_NAMESPACE |