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 --- .../itemmodels/qstandarditem/tst_qstandarditem.cpp | 44 +++++++++++----------- .../widgets/itemviews/qcolumnview/qcolumnview.pro | 2 +- .../itemviews/qtableview/tst_qtableview.cpp | 6 +-- .../itemviews/qtablewidget/tst_qtablewidget.cpp | 14 +++---- 4 files changed, 33 insertions(+), 33 deletions(-) (limited to 'tests/auto') 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