--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenustates_global.h	Mon Sep 27 11:52:00 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenustates_global.h	Wed Oct 06 16:06:24 2010 +0300
@@ -20,6 +20,7 @@
 
 #include <QDebug>
 #include <QtGlobal>
+#include "hsmenuservice_global.h"
 
 #ifndef MENUSTATES_UNITTEST
 #define HS_STATES_TEST_CLASS(className)
@@ -70,96 +71,4 @@
 static const char *const HS_COLLECTION_DIALOG_CREATE_NEW_ACTION="qtl_dialog_softkey_2_left";
 static const char *const HS_COLLECTION_DIALOG_CANCEL_ACTION="qtl_dialog_softkey_2_right";
 
-
-/*!
- To enable logging of function entry and exit use the following flag for qmake:
- -config nft
- To include in logs extra information about RAM and heap usage, define an additional constant e.g. in ProductVariant.hrh:
- #define NFT_RAM
- */
-
-#ifdef NFT
-#ifdef Q_OS_SYMBIAN
-#include <hal.h>
-#include <e32std.h>
-#endif
-#endif
-
-#ifdef NFT
-
-#define HSMENUTEST(aText) qDebug() << QString(aText)
-
-#ifdef Q_OS_SYMBIAN
-#ifdef NFT_RAM
-#define HSMENUTEST_FREERAM_ENTRY(function) \
-    TInt HSMENUTEST_ENTRY_RAM(0); \
-    TInt HSMENUTEST_ENTRY_HEAP(0); \
-    TInt HSMENUTEST_ENTRY_HEAP_SIZE(0); \
-    { \
-        TInt allRAM(0); \
-        HAL::Get(HAL::EMemoryRAM, allRAM); \
-        HAL::Get(HAL::EMemoryRAMFree, HSMENUTEST_ENTRY_RAM); \
-        RHeap &heap = User::Heap(); \
-        TInt biggestBlock(0); \
-        HSMENUTEST_ENTRY_HEAP = heap.Available(biggestBlock); \
-        HSMENUTEST_ENTRY_HEAP_SIZE = heap.Size(); \
-        qDebug("(nft) " function " - Memory (kB) - Free RAM: %d, Heap size: %d, Free heap: %d", \
-               HSMENUTEST_ENTRY_RAM >> 10, HSMENUTEST_ENTRY_HEAP_SIZE >> 10, \
-               HSMENUTEST_ENTRY_HEAP >> 10); \
-    }
-
-#define HSMENUTEST_FREERAM_EXIT(function) \
-    { \
-        TInt allRAM(0); \
-        TInt freeRAM(0); \
-        HAL::Get(HAL::EMemoryRAM, allRAM); \
-        HAL::Get(HAL::EMemoryRAMFree, freeRAM); \
-        RHeap &heap = User::Heap(); \
-        TInt biggestBlock(0); \
-        TInt heapFree = heap.Available(biggestBlock); \
-        TInt heapSize = heap.Size(); \
-        qDebug("(nft) " function " - Memory (kB) - Free RAM: %d, Heap size: %d, Free heap: %d", \
-               freeRAM >> 10, heapSize >> 10, heapFree >> 10); \
-        qDebug("(nft) " function " - Memory (kB) - RAM diff: %d, Heap size diff: %d, Free heap diff: %d", \
-               (freeRAM-HSMENUTEST_ENTRY_RAM) >> 10, (heapSize-HSMENUTEST_ENTRY_HEAP_SIZE) >> 10, \
-               (heapFree-HSMENUTEST_ENTRY_HEAP) >> 10); \
-    }
-
-#else
-
-#define HSMENUTEST_FREERAM_ENTRY(function)
-#define HSMENUTEST_FREERAM_EXIT(function)
-
-#endif
-
-#define HSMENUTESTTIME_ENTRY(function) \
-    TInt64 HSMENUTEST_ENTRY_TIME(0); \
-    { \
-        TTime t; \
-        t.UniversalTime(); \
-        qDebug("\n" function "      entry:%20lld", t.Int64()); \
-        HSMENUTEST_ENTRY_TIME = t.Int64(); \
-    }
-
-#define HSMENUTESTTIME_EXIT(function) { \
-        TTime t; \
-        t.UniversalTime(); \
-        qDebug("\n" function "      entry:%20lld\n" function " difference:%20lld", t.Int64(), \
-               t.Int64()-HSMENUTEST_ENTRY_TIME); \
-    }
-
-#define HSMENUTEST_FUNC_ENTRY(function)   HSMENUTEST_FREERAM_ENTRY(function) \
-    HSMENUTESTTIME_ENTRY(function)
-#define HSMENUTEST_FUNC_EXIT(function)    HSMENUTESTTIME_EXIT(function) \
-    HSMENUTEST_FREERAM_EXIT(function)
-
-#else //Q_OS_SYMBIAN
-#define HSMENUTEST_FUNC_ENTRY(function)   qDebug()<< function << " entry";
-#define HSMENUTEST_FUNC_EXIT(function)    qDebug()<< function << " exit";
-#endif //Q_OS_SYMBIAN
-#else //NFT
-#define HSMENUTEST_FUNC_ENTRY(function)
-#define HSMENUTEST_FUNC_EXIT(function)
-#endif //NFT
-
 #endif //HSMENUSTATES_GLOBAL_H