summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2010-11-05 13:23:38 (GMT)
committerJoão Abecasis <joao.abecasis@nokia.com>2011-02-10 12:26:32 (GMT)
commit977638104d091dd8780f4d1bee79bf014d6a2fe9 (patch)
treed1f69fc55690c6316fa5e7a2e5ae928ce1d0c28a
parent713eed0b830dc11c69adab3bc5a9b1b6b3814a18 (diff)
downloadQt-977638104d091dd8780f4d1bee79bf014d6a2fe9.zip
Qt-977638104d091dd8780f4d1bee79bf014d6a2fe9.tar.gz
Qt-977638104d091dd8780f4d1bee79bf014d6a2fe9.tar.bz2
Added a file handle to QFileOpenEvent on Symbian
QFileOpenEvent needs to tell the recipient what file to open. Normally that is by filename. But on Symbian, some files can only be opened from an already-open file handle that has been passed in. For example data caged files in c:\private or z:\sys. So QFileOpenEvent needs to be able to hold a Symbian file handle so that the recipient can access any file requested of it. Coming soon... a method by which the reciever can access the file without knowing about all this messy file handle stuff going on behind the scenes. Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
-rw-r--r--src/gui/kernel/qevent.h4
-rw-r--r--src/gui/s60framework/qs60maindocument.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 0499a6d..88a7a8a 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -60,6 +60,10 @@
class RFile;
#endif
+#ifdef Q_OS_SYMBIAN
+class RFile;
+#endif
+
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
diff --git a/src/gui/s60framework/qs60maindocument.cpp b/src/gui/s60framework/qs60maindocument.cpp
index 51a6ac9..d53aac1 100644
--- a/src/gui/s60framework/qs60maindocument.cpp
+++ b/src/gui/s60framework/qs60maindocument.cpp
@@ -127,10 +127,6 @@ void QS60MainDocument::OpenFileL(CFileStore *&aFileStore, RFile &aFile)
{
QCoreApplication* app = QCoreApplication::instance();
QFileOpenEvent* event = new QFileOpenEvent(aFile);
- TFileName name;
- aFile.FullName(name);
- QString qname = qt_TDesC2QString(name);
- QFileOpenEvent* event = new QFileOpenEvent(qname);
}
QT_END_NAMESPACE