--- a/emailservices/nmclientapi/src/nmapidatapluginfactory.cpp	Fri Jun 11 16:23:29 2010 +0100
+++ b/emailservices/nmclientapi/src/nmapidatapluginfactory.cpp	Thu Jul 22 16:30:28 2010 +0100
@@ -15,23 +15,9 @@
  *
  */
 
-#include "nmdataplugininterface.h"
-#include "nmapidatapluginfactory.h"
+#include "nmapiheaders.h"
 
-// Qt
-#include <QPluginLoader>
-#include <QDir>
-#include <QApplication>
-#include <QLocale>
-#include <QObject>
 
-// nmailbase
-#include "nmcommon.h"
-#include "nmmailbox.h"
-#include "nmmessageenvelope.h"
-#include "nmmessage.h"
-#include "nmmessagepart.h"
-#include "nmfolder.h"
 
 /*!
  \class NmApiDataPluginFactory
@@ -48,7 +34,7 @@
  */
 NmApiDataPluginFactory::NmApiDataPluginFactory()
 {
-
+    NM_FUNCTION;
 }
 
 /*!
@@ -56,6 +42,8 @@
  */
 NmApiDataPluginFactory::~NmApiDataPluginFactory()
 {
+    NM_FUNCTION;
+    
     if (mPlugin) {
         delete mPlugin;
         mPlugin = NULL;
@@ -72,6 +60,8 @@
  */
 NmApiDataPluginFactory *NmApiDataPluginFactory::instance()
 {
+    NM_FUNCTION;
+    
     if (!mInstance) {
         mInstance = new NmApiDataPluginFactory();
     }
@@ -84,6 +74,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 +95,8 @@
  */
 NmDataPluginInterface *NmApiDataPluginFactory::interfaceInstance()
 {
+    NM_FUNCTION;
+    
     if (!mPlugin) {
         mPlugin = loadPlugin();
     }
@@ -114,6 +108,8 @@
  */
 QObject *NmApiDataPluginFactory::loadPlugin()
 {
+    NM_FUNCTION;
+    
     if (!mPluginLoader) {
         const QString KPluginDirectory = "c:\\resource\\plugins";
         QDir pluginDir = QDir(KPluginDirectory);
@@ -135,6 +131,8 @@
 
 QObject *NmApiDataPluginFactory::plugin()
 {
+    NM_FUNCTION;
+    
     if (!mPlugin) {
         mPlugin = loadPlugin();
     }