--- a/src/hbcore/theme/hbthemeclient_symbian_p.cpp	Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_symbian_p.cpp	Fri Sep 17 08:32:10 2010 +0300
@@ -417,8 +417,8 @@
 #endif
     TInt err = SendReceive(EStyleSheetLookup, args);
 #ifdef THEME_SERVER_TRACES
-    qDebug("Time elapsed in IPC is : %d ms", time.elapsed());
-#endif
+    THEME_GENERIC_DEBUG() << "Time elapsed in IPC:" << time.elapsed() << "ms";
+#endif    
 
     if (KErrNone == err) {
         if (stylesheetInfo.offset >= 0) {
@@ -466,9 +466,7 @@
 */
 HbEffectFxmlData *HbThemeClientPrivate::getSharedEffect(const QString &filePath)
 {
-#ifdef THEME_SERVER_TRACES
-    qDebug() << "HbThemeClientPrivate::getSharedEffect" << filePath;
-#endif
+    THEME_GENERIC_DEBUG() << "HbThemeClientPrivate::getSharedEffect" << filePath;
     if ( !clientConnected ) {
         return 0;
     }
@@ -487,23 +485,21 @@
     time.start();
 #endif
     TInt err = SendReceive(EEffectLookupFilePath, args);
-#ifdef THEME_SERVER_TRACES
-    qDebug() << "Time elapsed in EEffectLookupFilePath IPC is : %d ms" << time.elapsed();
-#endif
+#ifdef THEME_SERVER_TRACES    
+    THEME_GENERIC_DEBUG() << "Time elapsed in EEffectLookupFilePath IPC:" << time.elapsed() << "ms";
+#endif    
 
     if (KErrNone == err) {
-#ifdef THEME_SERVER_TRACES
-        qDebug() << "HbThemeClientPrivate::getSharedEffect effectInfo.offSet is:"
+        THEME_GENERIC_DEBUG() << "HbThemeClientPrivate::getSharedEffect effectInfo.offSet is:"
                  <<  effectInfo.offset;
-#endif
         if (effectInfo.offset >= 0) {
             fxmlData = HbMemoryUtils::getAddress<HbEffectFxmlData>(
                 HbMemoryManager::SharedMemory, effectInfo.offset);
         } else {
-            qWarning() << "get effect offset error!" << effectInfo.offset;
+            THEME_GENERIC_DEBUG() << "effect offset invalid: " << effectInfo.offset;
         }
     } else {
-        qWarning() << "get effect sendreceive error!" << (int)err;
+        THEME_GENERIC_DEBUG() << "effect sendreceive error:" << err;
     }
     return fxmlData;
 }
@@ -515,9 +511,7 @@
 */
 bool HbThemeClientPrivate::addSharedEffect(const QString &filePath)
 {
-#ifdef THEME_SERVER_TRACES
-    qDebug() << "HbThemeClientPrivate::addSharedEffect" << filePath;
-#endif
+    THEME_GENERIC_DEBUG() << Q_FUNC_INFO << "with filePath:" << filePath;
     if ( !clientConnected ) {
         return false;
     }
@@ -534,25 +528,21 @@
     time.start();
 #endif
     TInt err = SendReceive(EEffectAdd, args);
-#ifdef THEME_SERVER_TRACES
-    qDebug("Time elapsed in EEffectAdd IPC is : %d ms", time.elapsed());
-#endif
+#ifdef THEME_SERVER_TRACES    
+    THEME_GENERIC_DEBUG() << "Time elapsed in EEffectAdd IPC:" << time.elapsed() << "ms";
+#endif    
 
     if (KErrNone == err) {
         TInt result = sharedInfo();
-#ifdef THEME_SERVER_TRACES
-        qDebug() << "TInt result (offset):" << result;
-#endif
+        THEME_GENERIC_DEBUG() << "TInt result (offset):" << result;
 
         if (result >= 0) {
-#ifdef THEME_SERVER_TRACES
-            qDebug() << "add effect results returning TRUE";
-#endif
+            THEME_GENERIC_DEBUG() << "add effect results returning TRUE";
             return true;
         }
-        qWarning() << "add effect offset error!" << (int) result;
+        THEME_GENERIC_DEBUG() << "effect offset error:" << result;
     } else {
-        qWarning() << "add effect sendreceive error!" << (int) err;
+        THEME_GENERIC_DEBUG() << "effect sendreceive error:" << (int) err;
     }
     return false;
 }
@@ -678,7 +668,7 @@
 {
     if ( !clientConnected ) {
         if(!connectToServer()) {
-            qWarning() << "Theme client unable to connect to server in HbThemeClientPrivate::deviceProfiles";
+            THEME_GENERIC_DEBUG() << Q_FUNC_INFO << "connect to theme server failed";
             return 0;
         }
     }
@@ -702,10 +692,8 @@
  */
 void HbThemeClientPrivate::handleThemeChange(const QString &themeName)
 {
-#ifdef THEME_SERVER_TRACES
-        qDebug() << Q_FUNC_INFO <<"themeChanged(): called";
-#endif
-        hbInstance->theme()->d_ptr->handleThemeChange(themeName);
+    THEME_GENERIC_DEBUG() << Q_FUNC_INFO;
+    hbInstance->theme()->d_ptr->handleThemeChange(themeName);
 }
 
 /**
@@ -849,16 +837,13 @@
 {
     int freeSharedMem = -1;
     if ( !clientConnected ) {
-        qWarning() << "Theme client unable to connect to server in HbThemeClientPrivate::freeSharedMemory";
+        THEME_GENERIC_DEBUG() << Q_FUNC_INFO << "connect to theme server failed.";
         return freeSharedMem;
     }
 
     TPckg<int> freeInfo(freeSharedMem);
     TIpcArgs args(0, &freeInfo);
     TInt err = SendReceive(EFreeSharedMem, args);
-#ifdef THEME_SERVER_TRACES
-    qDebug() << "HbThemeClientPrivate::freeSharedMemory end";
-#endif
     return freeSharedMem;
 }
 
@@ -869,7 +854,7 @@
 {
     int allocatedSharedMem = -1;
     if ( !clientConnected ) {
-        qWarning() << "Theme client unable to connect to server in HbThemeClientPrivate::allocatedSharedMemory";
+        THEME_GENERIC_DEBUG() << Q_FUNC_INFO << "connect to theme server failed.";
         return allocatedSharedMem;
     }
 
@@ -886,7 +871,7 @@
 {
     int allocatedHeapMem = -1;
     if ( !clientConnected ) {
-        qWarning() << "Theme client unable to connect to server in HbThemeClientPrivate::allocatedHeapMemory";
+        THEME_GENERIC_DEBUG() << Q_FUNC_INFO << "connect to theme server failed.";
         return allocatedHeapMem;
     }
 
@@ -943,7 +928,7 @@
 {
     if ( !clientConnected ) {
         if(!connectToServer()) {
-            qWarning() << "Theme client unable to connect to server in HbThemeClientPrivate::typefaceInfo";
+            hbWarning() << "Theme client unable to connect to server in HbThemeClientPrivate::typefaceInfo";
             return 0;
         }
     }