diff options
Diffstat (limited to 'src/corelib/itemmodels/qabstractproxymodel_p.h')
| -rw-r--r-- | src/corelib/itemmodels/qabstractproxymodel_p.h | 130 |
1 files changed, 27 insertions, 103 deletions
diff --git a/src/corelib/itemmodels/qabstractproxymodel_p.h b/src/corelib/itemmodels/qabstractproxymodel_p.h index 350735afd1..d33666d00b 100644 --- a/src/corelib/itemmodels/qabstractproxymodel_p.h +++ b/src/corelib/itemmodels/qabstractproxymodel_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 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$ -** -****************************************************************************/ +// 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 QABSTRACTPROXYMODEL_P_H #define QABSTRACTPROXYMODEL_P_H @@ -52,6 +16,7 @@ // // +#include "qabstractproxymodel.h" #include "private/qabstractitemmodel_p.h" #include "private/qproperty_p.h" @@ -59,21 +24,17 @@ QT_REQUIRE_CONFIG(proxymodel); QT_BEGIN_NAMESPACE -class QAbstractProxyModelBindable : public QUntypedBindable -{ -public: - explicit QAbstractProxyModelBindable(QUntypedPropertyData *d, - const QtPrivate::QBindableInterface *i) - : QUntypedBindable(d, i) - { - } -}; - class Q_CORE_EXPORT QAbstractProxyModelPrivate : public QAbstractItemModelPrivate { Q_DECLARE_PUBLIC(QAbstractProxyModel) public: - QAbstractProxyModelPrivate() : QAbstractItemModelPrivate() { } + QAbstractProxyModelPrivate() + : QAbstractItemModelPrivate(), + sourceHadZeroRows(false), + sourceHadZeroColumns(false), + updateVerticalHeader(false), + updateHorizontalHeader(false) + {} void setModelForwarder(QAbstractItemModel *sourceModel) { q_func()->setSourceModel(sourceModel); @@ -82,69 +43,32 @@ public: { Q_EMIT q_func()->sourceModelChanged(QAbstractProxyModel::QPrivateSignal()); } + QAbstractItemModel *getModelForwarder() const { return q_func()->sourceModel(); } + Q_OBJECT_COMPAT_PROPERTY_WITH_ARGS(QAbstractProxyModelPrivate, QAbstractItemModel *, model, &QAbstractProxyModelPrivate::setModelForwarder, - &QAbstractProxyModelPrivate::modelChangedForwarder, nullptr) + &QAbstractProxyModelPrivate::modelChangedForwarder, + &QAbstractProxyModelPrivate::getModelForwarder, nullptr) virtual void _q_sourceModelDestroyed(); + void _q_sourceModelRowsAboutToBeInserted(const QModelIndex &parent, int first, int last); + void _q_sourceModelRowsInserted(const QModelIndex &parent, int first, int last); + void _q_sourceModelRowsRemoved(const QModelIndex &parent, int first, int last); + void _q_sourceModelColumnsAboutToBeInserted(const QModelIndex &parent, int first, int last); + void _q_sourceModelColumnsInserted(const QModelIndex &parent, int first, int last); + void _q_sourceModelColumnsRemoved(const QModelIndex &parent, int first, int last); + void mapDropCoordinatesToSource(int row, int column, const QModelIndex &parent, int *source_row, int *source_column, QModelIndex *source_parent) const; - using ModelPropertyType = decltype(model); -}; + void scheduleHeaderUpdate(Qt::Orientation orientation); + void emitHeaderDataChanged(); -namespace QtPrivate { - -/*! - The biggest trick for adding new QProperty binding support here is the - getter for the sourceModel property (QAbstractProxyModel::sourceModel), - which returns nullptr, while internally using a global staticEmptyModel() - instance. - This lead to inconsistency while binding to a proxy model without source - model. The bound object would point to staticEmptyModel() instance, while - sourceModel() getter returns nullptr. - To solve this issue we need to implement a custom QBindableInterface, with - custom getter and makeBinding methods, that would introduce the required - logic. -*/ - -inline QAbstractItemModel *normalizePotentiallyEmptyModel(QAbstractItemModel *model) -{ - if (model == QAbstractItemModelPrivate::staticEmptyModel()) - return nullptr; - return model; -} - -class QBindableInterfaceForSourceModel -{ - using PropertyType = QAbstractProxyModelPrivate::ModelPropertyType; - using Parent = QBindableInterfaceForProperty<PropertyType>; - using T = typename PropertyType::value_type; - -public: - static constexpr QBindableInterface iface = { - [](const QUntypedPropertyData *d, void *value) -> void { - const auto val = static_cast<const PropertyType *>(d)->value(); - *static_cast<T *>(value) = normalizePotentiallyEmptyModel(val); - }, - Parent::iface.setter, - Parent::iface.getBinding, - Parent::iface.setBinding, - [](const QUntypedPropertyData *d, - const QPropertyBindingSourceLocation &location) -> QUntypedPropertyBinding { - return Qt::makePropertyBinding( - [d]() -> T { - return normalizePotentiallyEmptyModel( - static_cast<const PropertyType *>(d)->value()); - }, - location); - }, - Parent::iface.setObserver, - Parent::iface.metaType - }; + unsigned int sourceHadZeroRows : 1; + unsigned int sourceHadZeroColumns : 1; + unsigned int updateVerticalHeader : 1; + unsigned int updateHorizontalHeader : 1; }; -} // namespace QtPrivate - QT_END_NAMESPACE #endif // QABSTRACTPROXYMODEL_P_H |