--- a/wlanutilities/wlanwizard/src/wlanwizardpagesummary.cpp	Wed Jun 23 19:25:42 2010 +0300
+++ b/wlanutilities/wlanwizard/src/wlanwizardpagesummary.cpp	Tue Jul 06 15:29:22 2010 +0300
@@ -25,9 +25,7 @@
 #include <HbStyleLoader>
 
 // User includes
-#ifdef ICT_RESULT_ENUM
-#include "wlanqtutilscommon.h"
-#endif
+#include "wlanqtutils.h"
 #include "wlanwizard_p.h"
 #include "wlanwizardplugin.h"
 #include "wlanwizardsummaryviewitem.h"
@@ -99,22 +97,6 @@
 }
 
 /*!
-   See WlanWizardPage::nextId()
-   
-   @note this method is never called, because 'Next' toolbar button is not
-   visible in summary page.
-   
-   @param [out] removeFromStack return value is always false
-   
-   @return WlanWizardPageInternal::PageNone
- */
-int WlanWizardPageSummary::nextId(bool &removeFromStack) const
-{
-    removeFromStack = false;
-    return WlanWizardPage::PageNone;
-}
-
-/*!
    Loads docml.
  */
 void WlanWizardPageSummary::loadDocml()
@@ -157,7 +139,6 @@
         ret = hbTrId("txt_occ_dblist_network_mode_val_adhoc");
         break;
 
-     case CMManagerShim::Infra:
      default:
          Q_ASSERT(mode == CMManagerShim::Infra); 
          if (mWizard->configuration(WlanWizardPrivate::ConfHiddenWlan).toBool()) {
@@ -205,7 +186,6 @@
         }
         break;
         
-    case CMManagerShim::WlanSecModeOpen:
     default:
         Q_ASSERT(mode == CMManagerShim::WlanSecModeOpen);
         ret = hbTrId("txt_occ_dblist_security_mode_val_open");
@@ -229,31 +209,23 @@
 
     // TODO: Hotspot: no need to show destination..
     QString value;
-#ifdef ICT_RESULT_ENUM
+
     switch (mWizard->configuration(WlanWizardPrivate::ConfIctStatus).toInt()) {
-    case IctsPassed:
+    case WlanQtUtils::IctPassed:
         value = hbTrId("txt_occ_dblist_destination_val_internet");
         appendToList(row, hbTrId("txt_occ_dblist_destination"), value);
         break;
-    case IctsHotspotPassed:
-        // Add nothing to list. 
-        break;
-    case IctsCanceled:
-        // TODO: Next page: gereric error page. movement should be done from processsettings page not here.
-        break;
-    case IctsFailed:
-    default:
+        
+    case WlanQtUtils::IctFailed:
         value = hbTrId("txt_occ_dblist_destination_val_uncategorized");
         appendToList(row, hbTrId("txt_occ_dblist_destination"), value);
+        break;
+        
+    default:
+        Q_ASSERT(WlanQtUtils::IctHotspotPassed == mWizard->configuration(WlanWizardPrivate::ConfIctStatus).toInt());
+        // Add nothing to list.
+        break;
     }
-#else
-    if (mWizard->configuration(WlanWizardPrivate::ConfIctStatus).toBool()) {
-        value = hbTrId("txt_occ_dblist_destination_val_internet");
-    } else {
-        value = hbTrId("txt_occ_dblist_destination_val_uncategorized");
-    }
-	appendToList(row, hbTrId("txt_occ_dblist_destination"), value);
-#endif
 }
 
 /*!