From 3de5a8e78be307145340e0867de53dc607eae59c Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 1 Nov 2012 12:21:11 +0100 Subject: Strip trailing whitespace in itemviews. Using git ls-files -z | xargs -0 sed -i 's/ \+$//' in the relevant directories. Change-Id: I861ef9952fb32ed2db9ec8b67864ec7d0d61f0f2 Reviewed-by: Lars Knoll --- src/corelib/itemmodels/qabstractitemmodel_p.h | 2 +- src/gui/itemmodels/qstandarditemmodel.cpp | 18 ++++----- src/widgets/itemviews/qfileiconprovider.cpp | 2 +- src/widgets/itemviews/qitemeditorfactory.cpp | 2 +- src/widgets/itemviews/qstyleditemdelegate.cpp | 4 +- src/widgets/itemviews/qtableview.cpp | 8 ++-- src/widgets/itemviews/qtreeview.cpp | 2 +- src/widgets/itemviews/qtreewidget.cpp | 2 +- src/widgets/itemviews/qtreewidgetitemiterator.cpp | 2 +- .../itemmodels/qstandarditem/tst_qstandarditem.cpp | 44 +++++++++++----------- .../widgets/itemviews/qcolumnview/qcolumnview.pro | 2 +- .../itemviews/qtableview/tst_qtableview.cpp | 6 +-- .../itemviews/qtablewidget/tst_qtablewidget.cpp | 14 +++---- 13 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/corelib/itemmodels/qabstractitemmodel_p.h b/src/corelib/itemmodels/qabstractitemmodel_p.h index c672888992..e44931a16b 100644 --- a/src/corelib/itemmodels/qabstractitemmodel_p.h +++ b/src/corelib/itemmodels/qabstractitemmodel_p.h @@ -95,7 +95,7 @@ public: void itemsAboutToBeMoved(const QModelIndex &srcParent, int srcFirst, int srcLast, const QModelIndex &destinationParent, int destinationChild, Qt::Orientation); void itemsMoved(const QModelIndex &srcParent, int srcFirst, int srcLast, const QModelIndex &destinationParent, int destinationChild, Qt::Orientation orientation); bool allowMove(const QModelIndex &srcParent, int srcFirst, int srcLast, const QModelIndex &destinationParent, int destinationChild, Qt::Orientation orientation); - + inline QModelIndex createIndex(int row, int column, void *data = 0) const { return q_func()->createIndex(row, column, data); } diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 6e919eb0b2..fdd00fe980 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -2935,7 +2935,7 @@ QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const return data; QByteArray encoded; QDataStream stream(&encoded, QIODevice::WriteOnly); - + QSet itemsSet; QStack stack; itemsSet.reserve(indexes.count()); @@ -2945,7 +2945,7 @@ QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const itemsSet << item; stack.push(item); } - + //remove duplicates childrens { QSet seen; @@ -2954,7 +2954,7 @@ QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const if (seen.contains(itm)) continue; seen.insert(itm); - + const QVector &childList = itm->d_func()->children; for (int i = 0; i < childList.count(); ++i) { QStandardItem *chi = childList.at(i); @@ -2968,17 +2968,17 @@ QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const } } } - + stack.reserve(itemsSet.count()); foreach (QStandardItem *item, itemsSet) { stack.push(item); } - + //stream everything recursively while (!stack.isEmpty()) { QStandardItem *item = stack.pop(); if(itemsSet.contains(item)) { //if the item is selection 'top-level', strem its position - stream << item->row() << item->column(); + stream << item->row() << item->column(); } if(item) { stream << *item << item->columnCount() << item->d_ptr->children.count(); @@ -2996,7 +2996,7 @@ QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const /* \internal Used by QStandardItemModel::dropMimeData - stream out an item and his children + stream out an item and his children */ void QStandardItemModelPrivate::decodeDataRecursive(QDataStream &stream, QStandardItem *item) { @@ -3004,9 +3004,9 @@ void QStandardItemModelPrivate::decodeDataRecursive(QDataStream &stream, QStanda stream >> *item; stream >> colCount >> childCount; item->setColumnCount(colCount); - + int childPos = childCount; - + while(childPos > 0) { childPos--; QStandardItem *child = createItem(); diff --git a/src/widgets/itemviews/qfileiconprovider.cpp b/src/widgets/itemviews/qfileiconprovider.cpp index d073867dbb..43cf8afb79 100644 --- a/src/widgets/itemviews/qfileiconprovider.cpp +++ b/src/widgets/itemviews/qfileiconprovider.cpp @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE \class QFileIconProvider \inmodule QtWidgets - + \brief The QFileIconProvider class provides file icons for the QDirModel and the QFileSystemModel classes. */ diff --git a/src/widgets/itemviews/qitemeditorfactory.cpp b/src/widgets/itemviews/qitemeditorfactory.cpp index 5f24c3ea1b..09e59579b8 100644 --- a/src/widgets/itemviews/qitemeditorfactory.cpp +++ b/src/widgets/itemviews/qitemeditorfactory.cpp @@ -560,7 +560,7 @@ void QExpandingLineEdit::updateMinimumWidth() QStyleOptionFrameV2 opt; initStyleOption(&opt); - + int minWidth = style()->sizeFromContents(QStyle::CT_LineEdit, &opt, QSize(width, 0). expandedTo(QApplication::globalStrut()), this).width(); setMinimumWidth(minWidth); diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp index fa5a62805f..6a330fc7cb 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.cpp +++ b/src/widgets/itemviews/qstyleditemdelegate.cpp @@ -538,9 +538,9 @@ void QStyledItemDelegate::updateEditorGeometry(QWidget *editor, QStyleOptionViewItem opt = option; initStyleOption(&opt, index); - // let the editor take up all available space + // let the editor take up all available space //if the editor is not a QLineEdit - //or it is in a QTableView + //or it is in a QTableView #if !defined(QT_NO_TABLEVIEW) && !defined(QT_NO_LINEEDIT) if (qobject_cast(editor) && !qobject_cast(widget)) opt.showDecorationSelected = editor->style()->styleHint(QStyle::SH_ItemView_ShowDecorationSelected, 0, editor); diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp index 80abb050ee..d84dc608b9 100644 --- a/src/widgets/itemviews/qtableview.cpp +++ b/src/widgets/itemviews/qtableview.cpp @@ -2198,7 +2198,7 @@ int QTableView::sizeHintForRow(int row) const option.rect.setX(columnViewportPosition(index.column())); option.rect.setWidth(columnWidth(index.column())); } - + QWidget *editor = d->editorForIndex(index).widget.data(); if (editor && d->persistent.contains(editor)) { hint = qMax(hint, editor->sizeHint().height()); @@ -2206,7 +2206,7 @@ int QTableView::sizeHintForRow(int row) const int max = editor->maximumSize().height(); hint = qBound(min, hint, max); } - + hint = qMax(hint, itemDelegate(index)->sizeHint(option, index).height()); } @@ -2251,7 +2251,7 @@ int QTableView::sizeHintForColumn(int column) const if (d->verticalHeader->isSectionHidden(logicalRow)) continue; index = d->model->index(logicalRow, column, d->root); - + QWidget *editor = d->editorForIndex(index).widget.data(); if (editor && d->persistent.contains(editor)) { hint = qMax(hint, editor->sizeHint().width()); @@ -2259,7 +2259,7 @@ int QTableView::sizeHintForColumn(int column) const int max = editor->maximumSize().width(); hint = qBound(min, hint, max); } - + hint = qMax(hint, itemDelegate(index)->sizeHint(option, index).width()); } diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index ece5b21ae2..bcaf8dc2c3 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -1716,7 +1716,7 @@ void QTreeView::drawRow(QPainter *painter, const QStyleOptionViewItem &option, // we have to split the focus rect into two rects if (allColumnsShowFocus && !option.showDecorationSelected && header->sectionsMoved() && (header->visualIndex(0) != 0)) { - QRect sectionRect(0, y, header->sectionPosition(0), height); + QRect sectionRect(0, y, header->sectionPosition(0), height); o.rect = style()->visualRect(layoutDirection(), d->viewport->rect(), sectionRect); style()->drawPrimitive(QStyle::PE_FrameFocusRect, &o, painter); } diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp index 5305f64cc9..f689e87f8d 100644 --- a/src/widgets/itemviews/qtreewidget.cpp +++ b/src/widgets/itemviews/qtreewidget.cpp @@ -1477,7 +1477,7 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, QTreeWidgetItem *after /*! Destroys this tree widget item. - + The item will be removed from \l{QTreeWidget}s to which it has been added. This makes it safe to delete an item at any time. diff --git a/src/widgets/itemviews/qtreewidgetitemiterator.cpp b/src/widgets/itemviews/qtreewidgetitemiterator.cpp index 0108b80dcf..c1e2bd8b77 100644 --- a/src/widgets/itemviews/qtreewidgetitemiterator.cpp +++ b/src/widgets/itemviews/qtreewidgetitemiterator.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE \class QTreeWidgetItemIterator \ingroup model-view \inmodule QtWidgets - + \brief The QTreeWidgetItemIterator class provides a way to iterate over the items in a QTreeWidget instance. diff --git a/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp index ca6d2b0585..7949e13a71 100644 --- a/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp +++ b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp @@ -150,59 +150,59 @@ void tst_QStandardItem::getSetData() QString text = QString("text %0").arg(i); item.setText(text); QCOMPARE(item.text(), text); - + QPixmap pixmap(32, 32); pixmap.fill((i == 1) ? Qt::red : Qt::green); QIcon icon(pixmap); item.setIcon(icon); QCOMPARE(item.icon(), icon); - + QString toolTip = QString("toolTip %0").arg(i); item.setToolTip(toolTip); QCOMPARE(item.toolTip(), toolTip); - + QString statusTip = QString("statusTip %0").arg(i); item.setStatusTip(statusTip); QCOMPARE(item.statusTip(), statusTip); - + QString whatsThis = QString("whatsThis %0").arg(i); item.setWhatsThis(whatsThis); QCOMPARE(item.whatsThis(), whatsThis); - + QSize sizeHint(64*i, 48*i); item.setSizeHint(sizeHint); QCOMPARE(item.sizeHint(), sizeHint); - + QFont font; item.setFont(font); QCOMPARE(item.font(), font); - + Qt::Alignment textAlignment((i == 1) ? Qt::AlignLeft|Qt::AlignVCenter : Qt::AlignRight); item.setTextAlignment(textAlignment); QCOMPARE(item.textAlignment(), textAlignment); - + QColor backgroundColor((i == 1) ? Qt::blue : Qt::yellow); item.setBackground(backgroundColor); QCOMPARE(item.background().color(), backgroundColor); - + QColor textColor((i == i) ? Qt::green : Qt::cyan); item.setForeground(textColor); QCOMPARE(item.foreground().color(), textColor); - + Qt::CheckState checkState((i == 1) ? Qt::PartiallyChecked : Qt::Checked); item.setCheckState(checkState); QCOMPARE(item.checkState(), checkState); - + QString accessibleText = QString("accessibleText %0").arg(i); item.setAccessibleText(accessibleText); QCOMPARE(item.accessibleText(), accessibleText); - + QString accessibleDescription = QString("accessibleDescription %0").arg(i); item.setAccessibleDescription(accessibleDescription); QCOMPARE(item.accessibleDescription(), accessibleDescription); - + QCOMPARE(item.text(), text); QCOMPARE(item.icon(), icon); QCOMPARE(item.toolTip(), toolTip); @@ -216,7 +216,7 @@ void tst_QStandardItem::getSetData() QCOMPARE(item.checkState(), checkState); QCOMPARE(item.accessibleText(), accessibleText); QCOMPARE(item.accessibleDescription(), accessibleDescription); - + QCOMPARE(qvariant_cast(item.data(Qt::DisplayRole)), text); QCOMPARE(qvariant_cast(item.data(Qt::DecorationRole)), icon); QCOMPARE(qvariant_cast(item.data(Qt::ToolTipRole)), toolTip); @@ -250,7 +250,7 @@ void tst_QStandardItem::getSetData() item.setData(QVariant(), Qt::CheckStateRole); item.setData(QVariant(), Qt::AccessibleTextRole); item.setData(QVariant(), Qt::AccessibleDescriptionRole); - + QCOMPARE(item.data(Qt::DisplayRole), QVariant()); QCOMPARE(item.data(Qt::DecorationRole), QVariant()); QCOMPARE(item.data(Qt::ToolTipRole), QVariant()); @@ -296,7 +296,7 @@ void tst_QStandardItem::getSetFlags() QVERIFY(item.isDropEnabled()); QVERIFY(item.flags() & Qt::ItemIsDropEnabled); #endif - + QVERIFY(item.isEnabled()); item.setEnabled(false); QVERIFY(!item.isEnabled()); @@ -332,7 +332,7 @@ void tst_QStandardItem::getSetFlags() item.setCheckState(Qt::Checked); item.setCheckable(true); QCOMPARE(item.checkState(), Qt::Checked); -} +} void tst_QStandardItem::getSetRowAndColumnCount() { @@ -427,7 +427,7 @@ void tst_QStandardItem::parent() QCOMPARE(child->parent(), static_cast(0)); item.setChild(0, 0, child); QCOMPARE(child->parent(), &item); - + QStandardItem *childOfChild = new QStandardItem; child->setChild(0, 0, childOfChild); QCOMPARE(childOfChild->parent(), child); @@ -897,7 +897,7 @@ void tst_QStandardItem::takeRow() void tst_QStandardItem::streamItem() { QStandardItem item; - + item.setText(QLatin1String("text")); item.setToolTip(QLatin1String("toolTip")); item.setStatusTip(QLatin1String("statusTip")); @@ -1006,7 +1006,7 @@ void tst_QStandardItem::sortChildren() two->appendRow(new QStandardItem(QLatin1String("e"))); item->appendRow(one); item->appendRow(two); - + QSignalSpy layoutAboutToBeChangedSpy( model, SIGNAL(layoutAboutToBeChanged())); QSignalSpy layoutChangedSpy( @@ -1021,7 +1021,7 @@ void tst_QStandardItem::sortChildren() QCOMPARE(two->child(0)->text(), QLatin1String("f")); QCOMPARE(two->child(1)->text(), QLatin1String("d")); QCOMPARE(two->child(2)->text(), QLatin1String("e")); - + two->sortChildren(0, Qt::AscendingOrder); // verify sorted QCOMPARE(two->child(0)->text(), QLatin1String("d")); @@ -1031,7 +1031,7 @@ void tst_QStandardItem::sortChildren() QCOMPARE(one->child(0)->text(), QLatin1String("c")); QCOMPARE(one->child(1)->text(), QLatin1String("b")); QCOMPARE(one->child(2)->text(), QLatin1String("a")); - + item->sortChildren(0, Qt::AscendingOrder); // verify everything sorted QCOMPARE(one->child(0)->text(), QLatin1String("a")); diff --git a/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro b/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro index 7acbe016d5..4980b45389 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro +++ b/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro @@ -3,6 +3,6 @@ CONFIG += parallel_test QT += widgets widgets-private QT += gui-private core-private testlib -SOURCES += tst_qcolumnview.cpp +SOURCES += tst_qcolumnview.cpp TARGET = tst_qcolumnview DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index 2bccb03845..80d77aa652 100644 --- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -4065,9 +4065,9 @@ void tst_QTableView::taskQTBUG_8777_scrollToSpans() } void tst_QTableView::taskQTBUG_10169_sizeHintForRow() -{ - QtTestTableView tableView; - QStandardItemModel model(1, 3); +{ + QtTestTableView tableView; + QStandardItemModel model(1, 3); model.setData(model.index(0, 0), "Word wrapping text goes here."); tableView.setModel(&model); tableView.verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp index 2c93492fe9..e141ec294d 100644 --- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp +++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp @@ -130,7 +130,7 @@ void tst_QTableWidget::getSetCheck() // QCOMPARE(INT_MAX, obj1.rowCount()); obj1.setRowCount(100); QCOMPARE(100, obj1.rowCount()); - + // int QTableWidget::columnCount() // void QTableWidget::setColumnCount(int) @@ -584,7 +584,7 @@ void tst_QTableWidget::selectedItems() } if (hidden) continue; - + for (int column = 0; columncolumnCount(); ++column) { foreach (int hiddenColumn, hiddenColumns){ if(hiddenColumn == column){ @@ -594,7 +594,7 @@ void tst_QTableWidget::selectedItems() } if (hidden) continue; - + QTableWidgetItem *item = testWidget->item(row, column); if (item && testWidget->isItemSelected(item)) QVERIFY(selectedItems.contains(item)); @@ -1321,7 +1321,7 @@ void tst_QTableWidget::setItemWithSorting() QAbstractItemModel *model = w.model(); QList persistent; - + int ti = 0; for (int r = 0; r < rowCount; ++r) { for (int c = 0; c < columnCount; ++c) { @@ -1330,10 +1330,10 @@ void tst_QTableWidget::setItemWithSorting() } persistent << model->index(r, sortColumn); } - + w.sortItems(sortColumn, static_cast(sortOrder)); w.setSortingEnabled(true); - + QSignalSpy dataChangedSpy(model, SIGNAL(dataChanged(QModelIndex,QModelIndex))); QSignalSpy layoutChangedSpy(model, SIGNAL(layoutChanged())); @@ -1354,7 +1354,7 @@ void tst_QTableWidget::setItemWithSorting() QCOMPARE(w.item(r, c)->text(), str); } } - + for (int k = 0; k < persistent.count(); ++k) { QCOMPARE(persistent.at(k).row(), expectedRows.at(k)); int i = (persistent.at(k).row() * columnCount) + sortColumn; -- cgit v1.2.3