diff -r 139d4b7b2938 -r 99bcbff212ad emailservices/nmclientapi/src/nmapidatapluginfactory.cpp --- a/emailservices/nmclientapi/src/nmapidatapluginfactory.cpp Mon May 24 21:02:02 2010 +0300 +++ b/emailservices/nmclientapi/src/nmapidatapluginfactory.cpp Fri May 28 13:56:43 2010 +0300 @@ -15,6 +15,8 @@ * */ +#include "emailtrace.h" + #include "nmdataplugininterface.h" #include "nmapidatapluginfactory.h" @@ -48,7 +50,7 @@ */ NmApiDataPluginFactory::NmApiDataPluginFactory() { - + NM_FUNCTION; } /*! @@ -56,6 +58,8 @@ */ NmApiDataPluginFactory::~NmApiDataPluginFactory() { + NM_FUNCTION; + if (mPlugin) { delete mPlugin; mPlugin = NULL; @@ -72,6 +76,8 @@ */ NmApiDataPluginFactory *NmApiDataPluginFactory::instance() { + NM_FUNCTION; + if (!mInstance) { mInstance = new NmApiDataPluginFactory(); } @@ -84,6 +90,8 @@ */ void NmApiDataPluginFactory::releaseInstance(NmApiDataPluginFactory *&instance) { + NM_FUNCTION; + //can't have passed out instances if we don't have any if (mInstance) { if (instance == mInstance) { @@ -103,6 +111,8 @@ */ NmDataPluginInterface *NmApiDataPluginFactory::interfaceInstance() { + NM_FUNCTION; + if (!mPlugin) { mPlugin = loadPlugin(); } @@ -114,6 +124,8 @@ */ QObject *NmApiDataPluginFactory::loadPlugin() { + NM_FUNCTION; + if (!mPluginLoader) { const QString KPluginDirectory = "c:\\resource\\plugins"; QDir pluginDir = QDir(KPluginDirectory); @@ -135,6 +147,8 @@ QObject *NmApiDataPluginFactory::plugin() { + NM_FUNCTION; + if (!mPlugin) { mPlugin = loadPlugin(); }