diff -r 4e8ebe173323 -r 23b5d6a29cce homescreenapp/hsutils/src/hsimagefetcherclient.cpp --- a/homescreenapp/hsutils/src/hsimagefetcherclient.cpp Mon May 03 12:24:59 2010 +0300 +++ b/homescreenapp/hsutils/src/hsimagefetcherclient.cpp Fri May 14 15:43:04 2010 +0300 @@ -27,7 +27,6 @@ namespace { - const char gFetcherService[] = "com.nokia.services.media"; const char gFetcherInterface[] = "image"; const char gFetcherOperation[] = "fetch(QVariantMap,QVariant)"; } @@ -50,7 +49,7 @@ : QObject(parent) { } -#endif // Q_OS_SYMBIAN +#endif // Q_OS_SYMBIAN // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- @@ -59,7 +58,7 @@ { #ifdef Q_OS_SYMBIAN delete mReq; -#endif // Q_OS_SYMBIAN +#endif // Q_OS_SYMBIAN } // --------------------------------------------------------------------------- @@ -68,13 +67,13 @@ void HsImageFetcherClient::fetch() { #ifdef Q_OS_SYMBIAN - qDebug() << "HsImageFetcherClient::fetch START"; - + qDebug() << "HsImageFetcherClient::fetch START"; + if (mReq) { delete mReq; mReq = 0; } - + mReq = mAppMgr.create(gFetcherInterface, gFetcherOperation, false); if (mReq) { // Connect signals once @@ -83,14 +82,14 @@ } else { qCritical() << "HsImageFetcherClient::fetch -> Create request failed"; return; - } + } if (!(mReq)->send()) { qCritical() << "HsImageFetcherClient::fetch -> Send failed" << mReq->lastErrorMessage();; } qDebug() << "HsImageFetcherClient::fetch END"; -#endif // Q_OS_SYMBIAN +#endif // Q_OS_SYMBIAN } @@ -102,17 +101,17 @@ // disconnect error signal as it will give -4999 (EConnectionClosed) error afterwards even though image // is fetched successfully disconnect(mReq, SIGNAL(requestError(int,const QString&)), this, SLOT(handleError(int,const QString&))); - + XQAiwRequest *request = static_cast(sender()); int implementationId=-1; implementationId = (request->descriptor().property(XQAiwInterfaceDescriptor::ImplementationId)).toInt(); - + if (result.canConvert()) { qDebug("HsImageFetcherClient::%x:handleOk result=%s,%s", implementationId, result.typeName(), qPrintable(result.value())); - + emit fetchCompleted(result.value()); } else if (result.canConvert()) { QStringList resultList = result.value(); @@ -121,7 +120,7 @@ QString msg = QString("HsImageFetcherClient::handleOk, size=")+QString::number( resultList.size() )+QString("\n"); for (int i(0), size(resultList.size()); i < size; ++i) { msg += QString::number(i) + QString(":") + resultList[i] + QString("\n"); - } + } qDebug()<(sender()); int implementationId = -1; implementationId = (request->descriptor().property(XQAiwInterfaceDescriptor::ImplementationId)).toInt(); - + qCritical("HsImageFetcherClient::%x:handleError code=%d, errorMessage:%s", implementationId, errorCode, qPrintable(errorMessage)); emit fetchFailed(errorCode, errorMessage); #else Q_UNUSED(errorCode) Q_UNUSED(errorMessage) -#endif // Q_OS_SYMBIAN +#endif // Q_OS_SYMBIAN } #ifdef COVERAGE_MEASUREMENT