--- a/src/hbcore/gui/hbmainwindow_p.cpp	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow_p.cpp	Mon Oct 04 00:38:12 2010 +0300
@@ -569,38 +569,36 @@
     // Register the view switch animations from the theme.
     // Use HbEffectInternal and the HB_ prefix to prevent general overriding of these effects.
     // Instead, view switch effects can be overridden on a per-instance basis.
-    bool ok = HbEffectInternal::add(
-                  QStringList() << "HB_view" << "HB_view" << "HB_view" << "HB_view",
-                  QStringList() << "view_show_normal" << "view_hide_normal" <<  "view_show_back" << "view_hide_back",
-                  QStringList() << "show" << "hide" << "show_back" << "hide_back");
+    const char *vsType[] = { "HB_view", "HB_view", "HB_view", "HB_view" };
+    const char *vsPath[] = { "view_show_normal", "view_hide_normal", "view_show_back", "view_hide_back" };
+    const char *vsEvent[] = { "show", "hide", "show_back", "hide_back" };
+    bool ok = HbEffectInternal::add(vsType, vsPath, vsEvent, 4);
     if (!ok) {
         hbWarning("HbMainWindow: addViewEffects: atomic registration for show/hide effects failed");
     }
 
     // Register the alternative default.
-    ok = HbEffectInternal::add(
-             QStringList() << "HB_view" << "HB_view" << "HB_view" << "HB_view",
-             QStringList() << "view_show_normal_alt" << "view_hide_normal_alt" << "view_show_back_alt" << "view_hide_back_alt",
-             QStringList() << "show_alt" << "hide_alt" << "show_alt_back" << "hide_alt_back");
+    const char *vsAltPath[] = { "view_show_normal_alt", "view_hide_normal_alt", "view_show_back_alt", "view_hide_back_alt" };
+    const char *vsAltEvent[] = { "show_alt", "hide_alt", "show_alt_back", "hide_alt_back" };
+    ok = HbEffectInternal::add(vsType, vsAltPath, vsAltEvent, 4);
     if (!ok) {
         hbWarning("HbMainWindow: addViewEffects: atomic registration for alternative show/hide effects failed");
     }
 
     // Register titlebar effects.
     // These should be overridable in general (so we use HbEffect and no HB_ prefix).
-    ok = HbEffect::add(
-             QStringList() << "titlebar" << "titlebar" << "titlebar" << "titlebar",
-             QStringList() << "titlebar_disappear" <<  "titlebar_appear" << "titlebar_orient_disappear" << "titlebar_orient_appear",
-             QStringList() << "disappear" << "appear" <<  "disappear_orient" << "appear_orient");
+    const char *tbType[] = { "titlebar", "titlebar", "titlebar", "titlebar" };
+    const char *tbPath[] = { "titlebar_disappear", "titlebar_appear", "titlebar_orient_disappear", "titlebar_orient_appear" };
+    const char *tbEvent[] = { "disappear", "appear",  "disappear_orient", "appear_orient" };
+    ok = HbEffectInternal::add(tbType, tbPath, tbEvent, 4);
     if (!ok) {
         hbWarning("HbMainWindow: addViewEffects: atomic registration for titlebar effects failed");
     }
 
     // Register statusbar effects.
-    ok = HbEffect::add(
-             QStringList() << "statusbar" << "statusbar" << "statusbar" << "statusbar",
-             QStringList() << "statusbar_disappear" <<  "statusbar_appear" << "statusbar_orient_disappear" << "statusbar_orient_appear",
-             QStringList() << "disappear" << "appear" <<  "disappear_orient" << "appear_orient");
+    const char *sbType[] = { "statusbar", "statusbar", "statusbar", "statusbar" };
+    const char *sbPath[] = { "statusbar_disappear",  "statusbar_appear", "statusbar_orient_disappear", "statusbar_orient_appear" };
+    ok = HbEffectInternal::add(sbType, sbPath, tbEvent, 4);
     if (!ok) {
         hbWarning("HbMainWindow: addViewEffects: atomic registration for statusbar effects failed");
     }
@@ -1218,9 +1216,7 @@
     }
     process.Close();
 }
-#endif
 
-#ifdef Q_OS_SYMBIAN
 void HbMainWindowPrivate::deviceDialogConnectionReady(RHbDeviceDialogClientSession *clientSession)
 {
     mDevDlgClientSession = clientSession;
@@ -1228,5 +1224,4 @@
         updateForegroundOrientationPSKey();
     }
 }
-
 #endif //Q_OS_SYMBIAN