Changeset 846 for trunk/src/gui/itemviews/qitemselectionmodel.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/itemviews/qitemselectionmodel.cpp (modified) (10 diffs)

trunk/src/gui/itemviews/qitemselectionmodel.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -293 +293 @@
 
 /*!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     Returns the list of model index items stored in the selection.
 */
@@ -525 +546 @@
         result->append(QItemSelectionRange(tl, br));
         right = other_right;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 }
@@ -731 +773 @@
     savedPersistentCurrentIndexes.clear();
 
-    // optimisation for when all indexes are selected
+    // optimiation for when all indexes are selected
     // (only if there is lots of items (1000) because this is not entirely correct)
     if (ranges.isEmpty() && currentSelection.count() == 1) {
@@ -794 +836 @@
             QModelIndex nextTl = colSpans.at(i).topLeft();
             QModelIndex nextBr = colSpans.at(i).bottomRight();
+
+
+
+
             if ((nextTl.column() == prevTl.column()) && (nextBr.column() == br.column())
                 && (nextTl.row() == prevTl.row() + 1) && (nextBr.row() == br.row() + 1)) {
@@ -891 +937 @@
     : QObject(*new QItemSelectionModelPrivate, model)
 {
-    d_func()->model = model;
-    if (model) {
-        connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
-                this, SLOT(_q_rowsAboutToBeRemoved(QModelIndex,int,int)));
-        connect(model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
-                this, SLOT(_q_columnsAboutToBeRemoved(QModelIndex,int,int)));
-        connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
-                this, SLOT(_q_rowsAboutToBeInserted(QModelIndex,int,int)));
-        connect(model, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
-                this, SLOT(_q_columnsAboutToBeInserted(QModelIndex,int,int)));
-        connect(model, SIGNAL(layoutAboutToBeChanged()),
-                this, SLOT(_q_layoutAboutToBeChanged()));
-        connect(model, SIGNAL(layoutChanged()),
-                this, SLOT(_q_layoutChanged()));
-    }
+    d_func()->initModel(model);
 }
 
@@ -914 +946 @@
     : QObject(*new QItemSelectionModelPrivate, parent)
 {
-    d_func()->model = model;
-    if (model) {
-        connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
-                this, SLOT(_q_rowsAboutToBeRemoved(QModelIndex,int,int)));
-        connect(model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
-                this, SLOT(_q_columnsAboutToBeRemoved(QModelIndex,int,int)));
-        connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
-                this, SLOT(_q_rowsAboutToBeInserted(QModelIndex,int,int)));
-        connect(model, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
-                this, SLOT(_q_columnsAboutToBeInserted(QModelIndex,int,int)));
-        connect(model, SIGNAL(layoutAboutToBeChanged()),
-                this, SLOT(_q_layoutAboutToBeChanged()));
-        connect(model, SIGNAL(layoutChanged()),
-                this, SLOT(_q_layoutChanged()));
-    }
+    d_func()->initModel(model);
 }
 
@@ -937 +955 @@
     : QObject(dd, model)
 {
-    d_func()->model = model;
-    if (model) {
-        connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
-                this, SLOT(_q_rowsAboutToBeRemoved(QModelIndex,int,int)));
-        connect(model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
-                this, SLOT(_q_columnsAboutToBeRemoved(QModelIndex,int,int)));
-        connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
-                this, SLOT(_q_rowsAboutToBeInserted(QModelIndex,int,int)));
-        connect(model, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
-                this, SLOT(_q_columnsAboutToBeInserted(QModelIndex,int,int)));
-        connect(model, SIGNAL(layoutAboutToBeChanged()),
-                this, SLOT(_q_layoutAboutToBeChanged()));
-        connect(model, SIGNAL(layoutChanged()),
-                this, SLOT(_q_layoutChanged()));
-    }
+    dd.initModel(model);
 }
 
@@ -959 +963 @@
 QItemSelectionModel::~QItemSelectionModel()
 {
-    Q_D(QItemSelectionModel);
-    if (d->model) {
-        disconnect(d->model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
-                this, SLOT(_q_rowsAboutToBeRemoved(QModelIndex,int,int)));
-        disconnect(d->model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
-                this, SLOT(_q_columnsAboutToBeRemoved(QModelIndex,int,int)));
-        disconnect(d->model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
-                this, SLOT(_q_rowsAboutToBeInserted(QModelIndex,int,int)));
-        disconnect(d->model, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
-                this, SLOT(_q_columnsAboutToBeInserted(QModelIndex,int,int)));
-        disconnect(d->model, SIGNAL(layoutAboutToBeChanged()),
-                this, SLOT(_q_layoutAboutToBeChanged()));
-        disconnect(d->model, SIGNAL(layoutChanged()),
-                this, SLOT(_q_layoutChanged()));
-    }
 }
 
@@ -1071 +1060 @@
     // store old selection
     QItemSelection sel = selection;
+
+
+
+
+
+
+
+
+
+
+
+
+
     QItemSelection old = d->ranges;
     old.merge(d->currentSelection, d->currentCommand);