summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfximage.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-05-07 04:23:51 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-05-07 04:23:51 (GMT)
commit572f00d8c2684f6e396d17638ae08bfac57b410e (patch)
tree66b6a32666f159bff3ff21d9322cba2230a65c03 /src/declarative/fx/qfximage.cpp
parentacd9d0a135d054d9766e8c486c276c63c1771104 (diff)
downloadQt-572f00d8c2684f6e396d17638ae08bfac57b410e.zip
Qt-572f00d8c2684f6e396d17638ae08bfac57b410e.tar.gz
Qt-572f00d8c2684f6e396d17638ae08bfac57b410e.tar.bz2
Don't crash
Diffstat (limited to 'src/declarative/fx/qfximage.cpp')
-rw-r--r--src/declarative/fx/qfximage.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp
index 657e9a5..d66846d 100644
--- a/src/declarative/fx/qfximage.cpp
+++ b/src/declarative/fx/qfximage.cpp
@@ -125,8 +125,8 @@ QFxImage::QFxImage(QFxImagePrivate &dd, QFxItem *parent)
QFxImage::~QFxImage()
{
Q_D(const QFxImage);
- if (d->reply)
- d->reply->deleteLater();
+ if (d->sciReply)
+ d->sciReply->deleteLater();
}
/*!
@@ -859,9 +859,9 @@ void QFxImage::setSource(const QString &url)
if (url == d->source)
return;
- if (d->reply) {
- d->reply->deleteLater();
- d->reply = 0;
+ if (d->sciReply) {
+ d->sciReply->deleteLater();
+ d->sciReply = 0;
}
if (!d->url.isEmpty())
@@ -904,8 +904,8 @@ void QFxImage::setSource(const QString &url)
{
QNetworkRequest req(d->url);
req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
- d->reply = qmlEngine(this)->networkAccessManager()->get(req);
- QObject::connect(d->reply, SIGNAL(finished()),
+ d->sciReply = qmlEngine(this)->networkAccessManager()->get(req);
+ QObject::connect(d->sciReply, SIGNAL(finished()),
this, SLOT(sciRequestFinished()));
}
} else {
@@ -958,15 +958,15 @@ void QFxImage::requestFinished()
void QFxImage::sciRequestFinished()
{
Q_D(QFxImage);
- if (d->reply->error() != QNetworkReply::NoError) {
+ if (d->sciReply->error() != QNetworkReply::NoError) {
d->status = Error;
- d->reply->deleteLater();
- d->reply = 0;
+ d->sciReply->deleteLater();
+ d->sciReply = 0;
emit statusChanged(d->status);
} else {
- QFxGridScaledImage sci(d->reply);
- d->reply->deleteLater();
- d->reply = 0;
+ QFxGridScaledImage sci(d->sciReply);
+ d->sciReply->deleteLater();
+ d->sciReply = 0;
setGridScaledImage(sci);
}
}