--- a/emailservices/emailframework/src/CFSFWImplementation.cpp Thu Aug 19 09:38:05 2010 +0300
+++ b/emailservices/emailframework/src/CFSFWImplementation.cpp Tue Aug 31 15:04:17 2010 +0300
@@ -15,13 +15,17 @@
*
*/
+#include "emailtrace.h"
-#include "emailtrace.h"
-#include "cfsfwimplementation.h"
+//<qmail>
+#include <nmcommonheaders.h>
+//</qmail>
+
+#include "CFSFWImplementation.h"
//<cmail>
-#include "cfsmailplugin.h"
+#include "CFSMailPlugin.h"
//</cmail>
-#include "cfsmailpluginmanager.h"
+#include "CFSMailPluginManager.h"
// ================= MEMBER FUNCTIONS ==========================================
// -----------------------------------------------------------------------------
@@ -29,7 +33,8 @@
// -----------------------------------------------------------------------------
CFSFWImplementation::CFSFWImplementation()
{
- FUNC_LOG;
+ NM_FUNCTION;
+
iPluginManager = NULL;
}
@@ -38,7 +43,8 @@
// -----------------------------------------------------------------------------
CFSFWImplementation::~CFSFWImplementation()
{
- FUNC_LOG;
+ NM_FUNCTION;
+
delete iPluginManager;
}
// -----------------------------------------------------------------------------
@@ -46,11 +52,12 @@
// -----------------------------------------------------------------------------
CFSFWImplementation* CFSFWImplementation::NewLC(TInt aConfiguration)
{
- FUNC_LOG;
- CFSFWImplementation* impl = new (ELeave) CFSFWImplementation();
- CleanupStack:: PushL(impl);
- impl->ConstructL(aConfiguration);
- return impl;
+ NM_FUNCTION;
+
+ CFSFWImplementation* impl = new (ELeave) CFSFWImplementation();
+ CleanupStack:: PushL(impl);
+ impl->ConstructL(aConfiguration);
+ return impl;
}
// -----------------------------------------------------------------------------
@@ -58,10 +65,11 @@
// -----------------------------------------------------------------------------
CFSFWImplementation* CFSFWImplementation::NewL(TInt aConfiguration)
{
- FUNC_LOG;
- CFSFWImplementation* impl = CFSFWImplementation::NewLC(aConfiguration);
- CleanupStack:: Pop(impl);
- return impl;
+ NM_FUNCTION;
+
+ CFSFWImplementation* impl = CFSFWImplementation::NewLC(aConfiguration);
+ CleanupStack:: Pop(impl);
+ return impl;
}
// -----------------------------------------------------------------------------
@@ -69,7 +77,8 @@
// -----------------------------------------------------------------------------
void CFSFWImplementation::ConstructL(TInt aConfiguration)
{
- FUNC_LOG;
+ NM_FUNCTION;
+
// create plugin manager
iPluginManager = CFSMailPluginManager::NewL(aConfiguration);
}
@@ -79,7 +88,8 @@
// -----------------------------------------------------------------------------
CFSMailPluginManager& CFSFWImplementation::GetPluginManager( )
{
- FUNC_LOG;
+ NM_FUNCTION;
+
return *iPluginManager;
}