diff -r 139d4b7b2938 -r 99bcbff212ad emailuis/nmailuiengine/src/nmdatapluginfactory.cpp --- a/emailuis/nmailuiengine/src/nmdatapluginfactory.cpp Mon May 24 21:02:02 2010 +0300 +++ b/emailuis/nmailuiengine/src/nmdatapluginfactory.cpp Fri May 28 13:56:43 2010 +0300 @@ -38,7 +38,7 @@ */ NmDataPluginFactory::NmDataPluginFactory() { - + NM_FUNCTION; } /*! @@ -46,6 +46,8 @@ */ NmDataPluginFactory::~NmDataPluginFactory() { + NM_FUNCTION; + if (mPluginArray) { qDeleteAll(mPluginArray->begin(), mPluginArray->end()); mPluginArray->clear(); @@ -62,6 +64,8 @@ */ NmDataPluginFactory *NmDataPluginFactory::instance() { + NM_FUNCTION; + if (!mInstance) { mInstance = new NmDataPluginFactory(); } @@ -74,6 +78,8 @@ */ void NmDataPluginFactory::releaseInstance(NmDataPluginFactory *&instance) { + NM_FUNCTION; + //can't have passed out instances if we don't have any if (mInstance) { if (instance == mInstance) { @@ -92,6 +98,8 @@ */ NmDataPluginInterface *NmDataPluginFactory::interfaceInstance(QObject *plugin) { + NM_FUNCTION; + NmDataPluginInterface *pluginInterface = NULL; if (plugin) { pluginInterface= qobject_cast(plugin); @@ -104,6 +112,8 @@ */ NmDataPluginInterface *NmDataPluginFactory::interfaceInstance(NmId mailboxId) { + NM_FUNCTION; + return interfaceInstance(pluginInstance(mailboxId)); } @@ -112,6 +122,8 @@ */ NmApplicationStateInterface *NmDataPluginFactory::applicationStateInterfaceInstance(QObject *plugin) { + NM_FUNCTION; + NmApplicationStateInterface *pluginInterface = NULL; if (plugin) { pluginInterface= qobject_cast(plugin); @@ -124,6 +136,8 @@ */ NmApplicationStateInterface *NmDataPluginFactory::applicationStateInterfaceInstance(NmId mailboxId) { + NM_FUNCTION; + return applicationStateInterfaceInstance(pluginInstance(mailboxId)); } @@ -132,6 +146,8 @@ */ QObject *NmDataPluginFactory::pluginInstance(NmId mailboxId) { + NM_FUNCTION; + QObject *value(NULL); quint64 tmp = mailboxId.id(); @@ -158,6 +174,8 @@ */ QList *NmDataPluginFactory::pluginInstances() { + NM_FUNCTION; + //if plugins have not been already created, do it now. if (!mPluginArray) { mPluginArray = new QList(); @@ -194,6 +212,8 @@ const QDir &pluginDir, const QString &pluginName ) { + NM_FUNCTION; + /*! This creates plugin entity. */