From b11317a64339f5a4bcffc8234ecaf15c7fb416f2 Mon Sep 17 00:00:00 2001 From: Axel Waggershauser Date: Fri, 15 Mar 2013 00:42:15 +0100 Subject: Whitespace cleanup: remove trailing whitespace Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen --- examples/widgets/draganddrop/draggableicons/dragwidget.cpp | 4 ++-- examples/widgets/draganddrop/dropsite/droparea.cpp | 4 ++-- examples/widgets/draganddrop/dropsite/dropsitewindow.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'examples/widgets/draganddrop') diff --git a/examples/widgets/draganddrop/draggableicons/dragwidget.cpp b/examples/widgets/draganddrop/draggableicons/dragwidget.cpp index b13d571a26..5d01ee7619 100644 --- a/examples/widgets/draganddrop/draggableicons/dragwidget.cpp +++ b/examples/widgets/draganddrop/draggableicons/dragwidget.cpp @@ -103,7 +103,7 @@ void DragWidget::dropEvent(QDropEvent *event) if (event->mimeData()->hasFormat("application/x-dnditemdata")) { QByteArray itemData = event->mimeData()->data("application/x-dnditemdata"); QDataStream dataStream(&itemData, QIODevice::ReadOnly); - + QPixmap pixmap; QPoint offset; dataStream >> pixmap >> offset; @@ -143,7 +143,7 @@ void DragWidget::mousePressEvent(QMouseEvent *event) QMimeData *mimeData = new QMimeData; mimeData->setData("application/x-dnditemdata", itemData); //! [2] - + //! [3] QDrag *drag = new QDrag(this); drag->setMimeData(mimeData); diff --git a/examples/widgets/draganddrop/dropsite/droparea.cpp b/examples/widgets/draganddrop/dropsite/droparea.cpp index 8662ec80b3..fcabeb3b62 100644 --- a/examples/widgets/draganddrop/dropsite/droparea.cpp +++ b/examples/widgets/draganddrop/dropsite/droparea.cpp @@ -87,7 +87,7 @@ void DropArea::dropEvent(QDropEvent *event) setText(mimeData->html()); setTextFormat(Qt::RichText); } else if (mimeData->hasText()) { - setText(mimeData->text()); + setText(mimeData->text()); setTextFormat(Qt::PlainText); } else if (mimeData->hasUrls()) { QList urlList = mimeData->urls(); @@ -102,7 +102,7 @@ void DropArea::dropEvent(QDropEvent *event) } //! [dropEvent() function part2] -//! [dropEvent() function part3] +//! [dropEvent() function part3] setBackgroundRole(QPalette::Dark); event->acceptProposedAction(); } diff --git a/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp b/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp index 9b7f0c3de9..d69f4ee2a8 100644 --- a/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp +++ b/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp @@ -103,7 +103,7 @@ void DropSiteWindow::updateFormatsTable(const QMimeData *mimeData) return; //! [updateFormatsTable() part1] -//! [updateFormatsTable() part2] +//! [updateFormatsTable() part2] foreach (QString format, mimeData->formats()) { QTableWidgetItem *formatItem = new QTableWidgetItem(format); formatItem->setFlags(Qt::ItemIsEnabled); @@ -129,7 +129,7 @@ void DropSiteWindow::updateFormatsTable(const QMimeData *mimeData) text.append(hex + " "); } } -//! [updateFormatsTable() part3] +//! [updateFormatsTable() part3] //! [updateFormatsTable() part4] int row = formatsTable->rowCount(); @@ -137,7 +137,7 @@ void DropSiteWindow::updateFormatsTable(const QMimeData *mimeData) formatsTable->setItem(row, 0, new QTableWidgetItem(format)); formatsTable->setItem(row, 1, new QTableWidgetItem(text)); } - + formatsTable->resizeColumnToContents(0); } -//! [updateFormatsTable() part4] +//! [updateFormatsTable() part4] -- cgit v1.2.3