Fix warnings from deprecating QFileOpenEvent::openFile, update snippet

Amends 76c63936d3d3c937960108da88a56394a0ac70b5 by adjusting the test case.
We still just test that we can open a file based on a filename that we came
up with ourselves.

Also, update usage documentation and make the snippet a bit more relevant.

Change-Id: I5bf00210d74e2a73d5a71a09a5beb1b3f6f8e225
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

2 files changed, 10 insertions, 9 deletions

diff --git a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp
index 6e50a96258..0af605ccb6 100644
--- a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp
+++ b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp
@@ -14,8 +14,8 @@ struct MyApplication : public QGuiApplication
     {
         if (event->type() == QEvent::FileOpen) {
             QFileOpenEvent* ev = static_cast<QFileOpenEvent *>(event);
-            QFile file;
-            bool ok = ev->openFile(file, QFile::Append | QFile::Unbuffered);
+            QFile file(ev->file());
+            bool ok = file.open(QFile::Append | QFile::Unbuffered);
             if (ok)
                 file.write(QByteArray("+external"));
             return true;
diff --git a/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp b/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp
index b526240d88..50671e17f2 100644
--- a/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp
+++ b/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp
@@ -78,8 +78,8 @@ void tst_qfileopenevent::constructor()
 
 QByteArray tst_qfileopenevent::readFileContent(QFileOpenEvent& event)
 {
-    QFile file;
-    event.openFile(file, QFile::ReadOnly);
+    QFile file(event.file());
+    file.open(QFile::ReadOnly);
     file.seek(0);
     QByteArray data = file.readAll();
     return data;
@@ -87,8 +87,8 @@ QByteArray tst_qfileopenevent::readFileContent(QFileOpenEvent& event)
 
 bool tst_qfileopenevent::appendFileContent(QFileOpenEvent& event, const QByteArray& writeContent)
 {
-    QFile file;
-    bool ok = event.openFile(file, QFile::Append | QFile::Unbuffered);
+    QFile file(event.file());
+    bool ok = file.open(QFile::Append | QFile::Unbuffered);
     if (ok)
         ok = file.write(writeContent) == writeContent.size();
     return ok;
@@ -127,8 +127,8 @@ void tst_qfileopenevent::handleLifetime()
     QScopedPointer<QFileOpenEvent> event(createFileAndEvent(QLatin1String("testHandleLifetime"), QByteArray("test content")));
 
     // open a QFile after the original RFile is closed
-    QFile qFile;
-    QCOMPARE(event->openFile(qFile, QFile::Append | QFile::Unbuffered), true);
+    QFile qFile(event->file());
+    QVERIFY(qFile.open(QFile::Append | QFile::Unbuffered));
     event.reset(0);
 
     // write to the QFile after the event is closed
@@ -152,7 +152,8 @@ void tst_qfileopenevent::multiOpen()
 
     QFile files[5];
     for (int i=0; i<5; i++) {
-        QCOMPARE(event->openFile(files[i], QFile::ReadOnly), true);
+        files[i].setFileName(event->file());
+        QVERIFY(files[i].open(QFile::ReadOnly));
     }
     for (int i=0; i<5; i++)
         files[i].seek(i);