--- a/qtmobility/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.cpp Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.cpp Mon May 03 13:18:40 2010 +0300
@@ -58,15 +58,10 @@
{
}
-void MaliciousAsyncManagerEngine::deref()
-{
- // does this leak?
-}
-
-QString MaliciousAsyncManagerEngine::synthesizedDisplayLabel(const QContact& contact, QContactManager::Error& error) const
+QString MaliciousAsyncManagerEngine::synthesizedDisplayLabel(const QContact& contact, QContactManager::Error* error) const
{
Q_UNUSED(contact);
- error = QContactManager::NotSupportedError;
+ *error = QContactManager::NotSupportedError;
return QString();
}
@@ -113,9 +108,9 @@
}
Q_EXPORT_PLUGIN2(MALICIOUSPLUGINTARGET, MaliciousEngineFactory);
-QContactManagerEngine* MaliciousEngineFactory::engine(const QMap<QString, QString>& parameters, QContactManager::Error& error)
+QContactManagerEngine* MaliciousEngineFactory::engine(const QMap<QString, QString>& parameters, QContactManager::Error* error)
{
Q_UNUSED(parameters);
- error = QContactManager::NoError;
- return &mame;
+ *error = QContactManager::NoError;
+ return new MaliciousAsyncManagerEngine();
}