From cdf0c5905b3477c6cd01c519f883b7bb55447120 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 2 Oct 2013 11:37:33 +0200 Subject: [PATCH] Fix temporary file leak in tst_qfiledialog2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I5a1e601e3aa6e84300efa09bfbd9232fecab903e Reviewed-by: Oliver Wolff Reviewed-by: Tony Sarajärvi Reviewed-by: David Faure --- .../widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index 98b096031e..b9e6c82d84 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -1199,10 +1199,9 @@ void tst_QFileDialog2::task259105_filtersCornerCases() void tst_QFileDialog2::QTBUG4419_lineEditSelectAll() { QString tempPath = tempDir.path(); - QTemporaryFile *t; - t = new QTemporaryFile(tempPath + "/tst_qfiledialog2_lineEditSelectAll.XXXXXX"); - t->open(); - QNonNativeFileDialog fd(0, "TestFileDialog", t->fileName()); + QTemporaryFile temporaryFile(tempPath + "/tst_qfiledialog2_lineEditSelectAll.XXXXXX"); + QVERIFY(temporaryFile.open()); + QNonNativeFileDialog fd(0, "TestFileDialog", temporaryFile.fileName()); fd.setDirectory(tempPath); fd.setViewMode(QFileDialog::List); @@ -1218,8 +1217,8 @@ void tst_QFileDialog2::QTBUG4419_lineEditSelectAll() QLineEdit *lineEdit = fd.findChild("fileNameEdit"); QVERIFY(lineEdit); - QTRY_COMPARE(tempPath + QChar('/') + lineEdit->text(), t->fileName()); - QCOMPARE(tempPath + QChar('/') + lineEdit->selectedText(), t->fileName()); + QTRY_COMPARE(tempPath + QChar('/') + lineEdit->text(), temporaryFile.fileName()); + QCOMPARE(tempPath + QChar('/') + lineEdit->selectedText(), temporaryFile.fileName()); } void tst_QFileDialog2::QTBUG6558_showDirsOnly()