diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-11-01 12:21:11 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-01 16:10:32 +0100 |
commit | 3de5a8e78be307145340e0867de53dc607eae59c (patch) | |
tree | 66c307a612e3d13241a1c22ffaa10fdd70b0bad0 /src/widgets | |
parent | 731ba8ed08f80644b403556638c7f6229e678ebe (diff) |
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 <lars.knoll@digia.com>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/itemviews/qfileiconprovider.cpp | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qitemeditorfactory.cpp | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qstyleditemdelegate.cpp | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qtableview.cpp | 8 | ||||
-rw-r--r-- | src/widgets/itemviews/qtreeview.cpp | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qtreewidget.cpp | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qtreewidgetitemiterator.cpp | 2 |
7 files changed, 11 insertions, 11 deletions
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<QExpandingLineEdit*>(editor) && !qobject_cast<const QTableView*>(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. |