feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Trk: Using QScopedPointer in trk::LauncherPrivate::CopyState to ensure deletion

Browse Source 
Reviewed-by: con
This commit is contained in:
Robert Loehning
2009-09-28 13:53:43 +02:00
parent fa25a821f2
commit 5583dd7ad1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/trk/launcher.cpp
View File

@@ -37,6 +37,7 @@
#include <QtCore/QDebug>
#include <QtCore/QQueue>
#include <QtCore/QFile>
#include <QtCore/QScopedPointer>
namespace trk {
@@ -45,7 +46,7 @@ struct LauncherPrivate {
QString sourceFileName;
QString destinationFileName;
uint copyFileHandle;
QByteArray *data;
QScopedPointer<QByteArray> data;
int position;
};
@@ -305,7 +306,7 @@ void Launcher::handleFileCreation(const TrkResult &result)
d->m_copyState.copyFileHandle = extractInt(data + 2);
QFile file(d->m_copyState.sourceFileName);
file.open(QIODevice::ReadOnly);
d->m_copyState.data = new QByteArray(file.readAll());
d->m_copyState.data.reset(new QByteArray(file.readAll()));
d->m_copyState.position = 0;
file.close();
continueCopying();
@@ -339,8 +340,7 @@ void Launcher::continueCopying()
appendInt(&ba, d->m_copyState.copyFileHandle, TargetByteOrder);
appendInt(&ba, QDateTime::currentDateTime().toTime_t(), TargetByteOrder);
d->m_device.sendTrkMessage(TrkCloseFile, TrkCallback(this, &Launcher::handleFileCreated), ba);
delete d->m_copyState.data;
d->m_copyState.data = 0;
d->m_copyState.data.reset();
}
}