summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qclipboard_s60.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/kernel/qclipboard_s60.cpp')
-rw-r--r--src/gui/kernel/qclipboard_s60.cpp18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/gui/kernel/qclipboard_s60.cpp b/src/gui/kernel/qclipboard_s60.cpp
index 942e4d1..26ea844 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
@@ -78,28 +79,19 @@ public:
bool connected()
{ return connection; }
void clear();
- RFs fsSession();
-
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 +102,6 @@ void QClipboardData::clear()
delete src;
src = newSrc;
}
-RFs QClipboardData::fsSession()
-{
- return iFs;
-}
static QClipboardData *internalCbData = 0;
@@ -206,7 +194,7 @@ const QMimeData* QClipboard::mimeData(Mode mode) const
if (d)
{
TRAPD(err,{
- RFs fs = d->fsSession();
+ RFs& fs = QCoreApplicationPrivate::fsSession();
CClipboard* cb = CClipboard::NewForReadingLC(fs);
Q_ASSERT(cb);
RStoreReadStream stream;
@@ -232,7 +220,7 @@ void QClipboard::setMimeData(QMimeData* src, Mode mode)
if (d)
{
TRAPD(err,{
- RFs fs = d->fsSession();
+ RFs& fs = QCoreApplicationPrivate::fsSession();
CClipboard* cb = CClipboard::NewForWritingLC(fs);
RStoreWriteStream stream;
TStreamId stid = stream.CreateLC(cb->Store());