performance: refactored use of RFs so corelib and gui share one session

Opening and closing sessions has a performance impact on Symbian,
so all users of RFs now share a single session.
If a native file engine is written for Symbian (instead of the posix
one currently in use) then that could own the global data instead of
QCoreApplication.

Task-number: 247617
Reviewed-by: jbarron

1 files changed, 2 insertions, 12 deletions

diff --git a/src/gui/kernel/qclipboard_s60.cpp b/src/gui/kernel/qclipboard_s60.cpp
index fe3f579ecc..ca14d78080 100644
--- a/src/gui/kernel/qclipboard_s60.cpp
+++ b/src/gui/kernel/qclipboard_s60.cpp
@@ -49,6 +49,7 @@
 #include "qbuffer.h"
 #include "qwidget.h"
 #include "qevent.h"
+#include "private/qapplication_p.h"
 #include <QtDebug>
 
 // Symbian's clipboard
@@ -83,23 +84,16 @@ public:
 
 private:
     QMimeData* src;
-    RFs iFs;
     bool connection;
 };
 
 QClipboardData::QClipboardData():src(0),connection(true)
 {
     clear();
-    if (KErrNone != iFs.Connect())
-    {
-        qWarning("QClipboardData::fileserver connnect failed");
-        connection = false;
-    }
 }
 
 QClipboardData::~QClipboardData()
 {
-    iFs.Close();
     connection = false;
     delete src;
 }
@@ -110,10 +104,6 @@ void QClipboardData::clear()
     delete src;
     src = newSrc;
 }
-RFs QClipboardData::fsSession()
-{
-    return iFs;
-}
 
 static QClipboardData *internalCbData = 0;
 
@@ -207,7 +197,7 @@ const QMimeData* QClipboard::mimeData(Mode mode) const
     {
         //###fixme when exceptions are added to Qt
         TRAPD(err,{
-            RFs fs = d->fsSession();
+            RFs& fs = QCoreApplicationPrivate::fsSession();
             CClipboard* cb = CClipboard::NewForReadingLC(fs);
             Q_ASSERT(cb);
             RStoreReadStream stream;