Changeset 561 for trunk/src/gui/itemviews/qtreewidget.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/itemviews/qtreewidget.cpp (modified) (50 diffs)

trunk/src/gui/itemviews/qtreewidget.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -76 +76 @@
 
     \ingroup model-view
-    \mainclass
+
 */
 
@@ -578 +578 @@
         return;
 
-    //layoutAboutToBeChanged and layoutChanged will be called by sortChildren 
+    //layoutAboutToBeChanged and layoutChanged will be called by sortChildren
     rootItem->sortChildren(column, order, true);
 }
@@ -623 +623 @@
         lit = sortedInsertionIterator(lit, lst.end(), order, item);
         int newRow = qMax(lit - lst.begin(), 0);
+
+
+
+
         lit = lst.insert(lit, item);
         if (newRow != oldRow) {
@@ -854 +858 @@
         for (int c = 0; c < colCount; ++c) {
             QModelIndex from = createIndex(oldRow, c, item);
-            if (static_cast<QAbstractItemModelPrivate *>(d_ptr)->persistent.indexes.contains(from)) {
+            if (static_cast<QAbstractItemModelPrivate *>(d_ptr)->persistent.indexes.contains(from)) {
                 QModelIndex to = createIndex(r, c, item);
                 fromList << from;
@@ -1577 +1581 @@
         return;
 
-    view->viewport()->update( view->d_func()->itemDecorationRect(view->d_func()->index(this)));
+    view->);
 }
 
@@ -1769 +1773 @@
         if (children.count() && (itemFlags & Qt::ItemIsTristate))
             return childrenCheckState(column);
+
    default:
         if (column >= 0 && column < values.size()) {
@@ -1788 +1793 @@
 {
     int column = view ? view->sortColumn() : 0;
-    return text(column) < other.text(column);
+    const QVariant v1 = data(column, Qt::DisplayRole);
+    const QVariant v2 = other.data(column, Qt::DisplayRole);
+    return QAbstractItemModelPrivate::variantLessThan(v1, v2);
 }
 
@@ -1828 +1835 @@
     out << values << d->display;
 }
+
 
 /*!
@@ -1863 +1871 @@
     return *this;
 }
-
-#endif // QT_NO_DATASTREAM
 
 /*!
@@ -2072 +2078 @@
 {
     QTreeModel *model = (q->view ? qobject_cast<QTreeModel*>(q->view->model()) : 0);
+
+
     model->sortItems(&q->children, column, order);
     if (climb) {
         QList<QTreeWidgetItem*>::iterator it = q->children.begin();
         for (; it != q->children.end(); ++it) {
-            //here we call the private object's method to avoid emitting 
+            //here we call the private object's method to avoid emitting
             //the layoutAboutToBeChanged and layoutChanged signals
             (*it)->d->sortChildren(column, order, climb);
@@ -2278 +2286 @@
 void QTreeWidgetPrivate::_q_sort()
 {
-    Q_Q(QTreeWidget);
     if (sortingEnabled) {
-        int column = q->header()->sortIndicatorSection();
-        Qt::SortOrder order = q->header()->sortIndicatorOrder();
-        model()->sort(column, order);
+        int column = ->sortIndicatorSection();
+        Qt::SortOrder order = ->sortIndicatorOrder();
+        odel()->sort(column, order);
     }
 }
@@ -2291 +2298 @@
     QModelIndexList indices = selected.indexes();
     int i;
-    QTreeModel *m = model();
+    QTreeModel *m = odel();
     for (i = 0; i < indices.count(); ++i) {
         QTreeWidgetItem *item = m->item(indices.at(i));
@@ -2309 +2316 @@
                                         const QModelIndex &bottomRight)
 {
-    Q_Q(QTreeWidget);
     if (sortingEnabled && topLeft.isValid() && bottomRight.isValid()
-        && !model()->sortPendingTimer.isActive()) {
-        int column = q->header()->sortIndicatorSection();
+        && !odel()->sortPendingTimer.isActive()) {
+        int column = ->sortIndicatorSection();
         if (column >= topLeft.column() && column <= bottomRight.column()) {
-            Qt::SortOrder order = q->header()->sortIndicatorOrder();
-            model()->ensureSorted(column, order, topLeft.row(),
+            Qt::SortOrder order = ->sortIndicatorOrder();
+            odel()->ensureSorted(column, order, topLeft.row(),
                                   bottomRight.row(), topLeft.parent());
         }
@@ -2328 +2334 @@
 
   \ingroup model-view
-  \mainclass
+
 
   The QTreeWidget class is a convenience class that provides a standard
@@ -2437 +2443 @@
     expandAll() is invoked.
 
-    \sa isItemExpanded(), itemCollapsed(), expandItem()
+    \sa Expanded(), itemCollapsed(), expandItem()
 */
 
@@ -2449 +2455 @@
     collapseAll() is invoked.
 
-    \sa isItemExpanded(), itemExpanded(), collapseItem()
+    \sa Expanded(), itemExpanded(), collapseItem()
 */
 
@@ -2543 +2549 @@
 {
     Q_D(const QTreeWidget);
-    return d->model()->columnCount();
+    return d->model->columnCount();
 }
 
@@ -2555 +2561 @@
     if (columns < 0)
         return;
-    d->model()->setColumnCount(columns);
+    d->odel()->setColumnCount(columns);
 }
 
@@ -2572 +2578 @@
 {
     Q_D(const QTreeWidget);
-    return d->model()->rootItem;
+    return d->odel()->rootItem;
 }
 
@@ -2585 +2591 @@
 {
     Q_D(const QTreeWidget);
-    return d->model()->rootItem->child(index);
+    return d->odel()->rootItem->child(index);
 }
 
@@ -2600 +2606 @@
 {
     Q_D(const QTreeWidget);
-    return d->model()->rootItem->childCount();
+    return d->odel()->rootItem->childCount();
 }
 
@@ -2614 +2620 @@
 {
     Q_D(QTreeWidget);
-    d->model()->rootItem->insertChild(index, item);
+    d->odel()->rootItem->insertChild(index, item);
 }
 
@@ -2639 +2645 @@
 {
     Q_D(QTreeWidget);
-    return d->model()->rootItem->takeChild(index);
+    return d->odel()->rootItem->takeChild(index);
 }
 
@@ -2648 +2654 @@
 {
     Q_D(QTreeWidget);
-    d->model()->executePendingSort();
-    return d->model()->rootItem->children.indexOf(item);
+    d->odel()->executePendingSort();
+    return d->odel()->rootItem->children.indexOf(item);
 }
 
@@ -2661 +2667 @@
 {
     Q_D(const QTreeWidget);
-    d->model()->executePendingSort();
-    return d->model()->rootItem->children.indexOf(item);
+    d->odel()->executePendingSort();
+    return d->odel()->rootItem->children.indexOf(item);
 }
 
@@ -2677 +2683 @@
 {
     Q_D(QTreeWidget);
-    d->model()->rootItem->insertChildren(index, items);
+    d->odel()->rootItem->insertChildren(index, items);
 }
 
@@ -2699 +2705 @@
 {
     Q_D(const QTreeWidget);
-    return d->model()->headerItem;
+    return d->odel()->headerItem;
 }
 
@@ -2720 +2726 @@
     int oldCount = columnCount();
     if (oldCount < item->columnCount())
-         d->model()->beginInsertColumns(QModelIndex(), oldCount, item->columnCount());
+         d->odel()->beginInsertColumns(QModelIndex(), oldCount, item->columnCount());
     else
-         d->model()->beginRemoveColumns(QModelIndex(), item->columnCount(), oldCount);
-    delete d->model()->headerItem;
-    d->model()->headerItem = item;
+         d->odel()->beginRemoveColumns(QModelIndex(), item->columnCount(), oldCount);
+    delete d->odel()->headerItem;
+    d->odel()->headerItem = item;
     if (oldCount < item->columnCount())
-        d->model()->endInsertColumns();
+        d->odel()->endInsertColumns();
     else
-        d->model()->endRemoveColumns();
-    d->model()->headerDataChanged(Qt::Horizontal, 0, oldCount);
+        d->odel()->endRemoveColumns();
+    d->odel()->headerDataChanged(Qt::Horizontal, 0, oldCount);
 }
 
@@ -2746 +2752 @@
     if (columnCount() < labels.count())
         setColumnCount(labels.count());
-    QTreeModel *model = d->model();
-    QTreeWidgetItem *item = model->headerItem;
+    QTreeWidgetItem *item = d->treeModel()->headerItem;
     for (int i = 0; i < labels.count(); ++i)
         item->setText(i, labels.at(i));
@@ -2784 +2789 @@
   Sets the current \a item in the tree widget.
 
-  Depending on the current selection mode, the item may also be selected.
+  Unless the selection mode is \l{QAbstractItemView::}{NoSelection},
+  the item is also be selected.
 
   \sa currentItem(), currentItemChanged()
@@ -2846 +2852 @@
 {
     Q_D(const QTreeWidget);
-    return visualRect(d->index(item));
+    //the visual rect for an item is across all columns. So we need to determine
+        //what is the first and last column and get their visual index rects
+    QModelIndex base = d->index(item);
+    const int firstVisiblesection = header()->logicalIndexAt(- header()->offset());
+    const int lastVisibleSection = header()->logicalIndexAt(header()->length() - header()->offset() - 1);
+    QModelIndex first = base.sibling(base.row(), header()->logicalIndex(firstVisiblesection));
+    QModelIndex last = base.sibling(base.row(), header()->logicalIndex(lastVisibleSection));
+    return visualRect(first) | visualRect(last);
 }
 
@@ -2875 +2888 @@
     Q_D(QTreeWidget);
     header()->setSortIndicator(column, order);
-    d->model()->sort(column, order);
+    d->model->sort(column, order);
 }
 
@@ -3042 +3055 @@
 {
     Q_D(const QTreeWidget);
-    QModelIndexList indexes = d->model()->match(model()->index(0, column, QModelIndex()),
+    QModelIndexList indexes = d->model->match(model()->index(0, column, QModelIndex()),
                                                 Qt::DisplayRole, text, -1, flags);
     QList<QTreeWidgetItem*> items;
@@ -3060 +3073 @@
 {
     Q_D(const QTreeWidget);
-    if (item == d->model()->headerItem)
+    if (item == d->odel()->headerItem)
         return header()->isHidden();
     if (d->hiddenIndexes.isEmpty())
         return false;
-    QTreeModel::SkipSorting skipSorting(d->model());
+    QTreeModel::SkipSorting skipSorting(d->odel());
     return d->isRowHidden(d->index(item));
 }
@@ -3080 +3093 @@
 {
     Q_D(QTreeWidget);
-    if (item == d->model()->headerItem) {
+    if (item == d->odel()->headerItem) {
         header()->setHidden(hide);
     } else {
@@ -3100 +3113 @@
 {
     Q_D(const QTreeWidget);
-    QTreeModel::SkipSorting skipSorting(d->model());
+    QTreeModel::SkipSorting skipSorting(d->odel());
     return isExpanded(d->index(item));
 }
@@ -3110 +3123 @@
     \sa expandItem(), collapseItem(), itemExpanded()
 
-  \obsolete
-
-  This function is deprecated. Use \l{QTreeWidgetItem::setExpanded()} instead.
+  \obsolete
+
+  This function is deprecated. Use \l{QTreeWidgetItem::setExpanded()} instead.
 */
 void QTreeWidget::setItemExpanded(const QTreeWidgetItem *item, bool expand)
 {
     Q_D(QTreeWidget);
-    QTreeModel::SkipSorting skipSorting(d->model());
+    QTreeModel::SkipSorting skipSorting(d->odel());
     setExpanded(d->index(item), expand);
 }
@@ -3132 +3145 @@
 {
     Q_D(const QTreeWidget);
-    if (item == d->model()->headerItem)
+    if (item == d->odel()->headerItem)
         return false; // We can't set the header items to spanning
     const QModelIndex index = d->index(item);
@@ -3149 +3162 @@
 {
     Q_D(QTreeWidget);
-    if (item == d->model()->headerItem)
+    if (item == d->odel()->headerItem)
         return; // We can't set header items to spanning
     const QModelIndex index = d->index(item);
@@ -3163 +3176 @@
 {
     Q_D(const QTreeWidget);
-    if (item == d->model()->headerItem)
+    if (item == d->odel()->headerItem)
         return 0;
     const QModelIndex index = d->index(item);
@@ -3178 +3191 @@
 {
     Q_D(const QTreeWidget);
-    if (item == d->model()->headerItem)
+    if (item == d->odel()->headerItem)
         return 0;
     const QModelIndex index = d->index(item);
@@ -3218 +3231 @@
 {
     Q_D(QTreeWidget);
-    QTreeModel::SkipSorting skipSorting(d->model());
+    QTreeModel::SkipSorting skipSorting(d->odel());
     expand(d->index(item));
 }
@@ -3231 +3244 @@
 {
     Q_D(QTreeWidget);
-    QTreeModel::SkipSorting skipSorting(d->model());
+    QTreeModel::SkipSorting skipSorting(d->odel());
     collapse(d->index(item));
 }
@@ -3248 +3261 @@
     Q_D(QTreeWidget);
     selectionModel()->clear();
-    d->model()->clear();
+    d->odel()->clear();
 }
 
@@ -3273 +3286 @@
 {
     Q_D(const QTreeWidget);
-    if (d->model()->cachedIndexes.isEmpty()) {
+    if (d->odel()->cachedIndexes.isEmpty()) {
         QList<QModelIndex> indexes;
         for (int i = 0; i < items.count(); ++i) {
@@ -3281 +3294 @@
             }
         }
-        return model()->QAbstractItemModel::mimeData(indexes);
-    }
-    return d->model()->internalMimeData();
+        return ->QAbstractItemModel::mimeData(indexes);
+    }
+    return d->odel()->internalMimeData();
 }
 
@@ -3427 +3440 @@
     Q_D(QTreeWidget);
     if (e->type() == QEvent::Polish)
-        d->model()->executePendingSort();
+        d->odel()->executePendingSort();
     return QTreeView::event(e);
 }