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/qtconcurrent/imagescaling/imagescaling.cpp | 11 +++++------ examples/qtconcurrent/progressdialog/main.cpp | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'examples/qtconcurrent') diff --git a/examples/qtconcurrent/imagescaling/imagescaling.cpp b/examples/qtconcurrent/imagescaling/imagescaling.cpp index 6a0a73e867..01083edb4e 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.cpp +++ b/examples/qtconcurrent/imagescaling/imagescaling.cpp @@ -50,8 +50,8 @@ QImage scale(const QString &imageFileName) return image.scaled(QSize(imageSize, imageSize), Qt::IgnoreAspectRatio, Qt::SmoothTransformation); } -Images::Images(QWidget *parent) -: QWidget(parent) +Images::Images(QWidget *parent) + : QWidget(parent) { setWindowTitle(tr("Image loading and scaling example")); resize(800, 600); @@ -66,11 +66,11 @@ Images::Images(QWidget *parent) cancelButton = new QPushButton(tr("Cancel")); cancelButton->setEnabled(false); connect(cancelButton, SIGNAL(clicked()), imageScaling, SLOT(cancel())); - + pauseButton = new QPushButton(tr("Pause/Resume")); pauseButton->setEnabled(false); connect(pauseButton, SIGNAL(clicked()), imageScaling, SLOT(togglePaused())); - + QHBoxLayout *buttonLayout = new QHBoxLayout(); buttonLayout->addWidget(openButton); buttonLayout->addWidget(cancelButton); @@ -101,7 +101,7 @@ void Images::open() } // Show a file open dialog at QStandardPaths::PicturesLocation. - QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Images"), + QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Images"), QStandardPaths::writableLocation(QStandardPaths::PicturesLocation), "*.jpg *.png"); @@ -143,4 +143,3 @@ void Images::finished() } #endif // QT_NO_CONCURRENT - diff --git a/examples/qtconcurrent/progressdialog/main.cpp b/examples/qtconcurrent/progressdialog/main.cpp index 155bb2ee11..c646105db6 100644 --- a/examples/qtconcurrent/progressdialog/main.cpp +++ b/examples/qtconcurrent/progressdialog/main.cpp @@ -69,7 +69,7 @@ int main(int argc, char **argv) // Create a progress dialog. QProgressDialog dialog; dialog.setLabelText(QString("Progressing using %1 thread(s)...").arg(QThread::idealThreadCount())); - + // Create a QFutureWatcher and connect signals and slots. QFutureWatcher futureWatcher; QObject::connect(&futureWatcher, SIGNAL(finished()), &dialog, SLOT(reset())); @@ -82,7 +82,7 @@ int main(int argc, char **argv) // Display the dialog and start the event loop. dialog.exec(); - + futureWatcher.waitForFinished(); // Query the future to check if was canceled. -- cgit v1.2.3