--- a/filebrowser/engine/engine.cpp	Fri Jun 11 16:29:34 2010 +0100
+++ b/filebrowser/engine/engine.cpp	Thu Jul 22 16:33:59 2010 +0100
@@ -31,14 +31,6 @@
 #include <apaid.h>
 #include <s32file.h>
 
-// hash key selection related includes
-#ifndef __SERIES60_30__
-  #include <centralrepository.h>
-  #include <AknFepInternalCRKeys.h>
-  #include <AvkonInternalCRKeys.h>
-  #include <e32property.h> 
-#endif
-
 // CONSTANTS
 // UID of the application
 const TUid KUidFileBrowser = { 0x102828D6 };
@@ -90,9 +82,6 @@
     TRAP_IGNORE( LoadSettingsL() );
 
     iFileUtils = CFileBrowserFileUtils::NewL(this);
-
-    // get hash key selection value
-    GetHashKeySelectionStatus();
     }
 
 // ---------------------------------------------------------------------------
@@ -101,13 +90,6 @@
     {
     }
 	
-// --------------------------------------------------------------------------------------------
-
-//void CEngine::SetFileListContainer(CFileBrowserFileListContainer* aFileListContainer)
-//    {
-//    iFileListContainer = aFileListContainer;
-//    }
-
 // ---------------------------------------------------------------------------
 
 void CEngine::LoadDFSValueL(CDictionaryFileStore* aDicFS, const TUid& aUid, TInt& aValue)
@@ -172,20 +154,20 @@
     iSettings.iRememberLastPath = EFalse;
     iSettings.iLastPath = KNullDesC;
     iSettings.iRememberFolderSelection = ETrue;
-#if 0 // TODO
-#if(!defined __SERIES60_30__ && !defined __SERIES60_31__ && !defined __S60_32__)
-    if ( AknLayoutUtils::PenEnabled() )
-        {
-        iSettings.iEnableToolbar = ETrue;
-        }
-    else
-        {
-        iSettings.iEnableToolbar = EFalse;
-        }
-#else
-    iSettings.iEnableToolbar = EFalse;
-#endif
-#endif // TODO
+//#if 0 // TODO
+//#if(!defined __SERIES60_30__ && !defined __SERIES60_31__ && !defined __S60_32__)
+//    if ( AknLayoutUtils::PenEnabled() )
+//        {
+//        iSettings.iEnableToolbar = ETrue;
+//        }
+//    else
+//        {
+//        iSettings.iEnableToolbar = EFalse;
+//        }
+//#else
+//    iSettings.iEnableToolbar = EFalse;
+//#endif
+//#endif // TODO
 
     iSettings.iSupportNetworkDrives = EFalse;
     iSettings.iBypassPlatformSecurity = EFalse;
@@ -276,39 +258,6 @@
 
 // --------------------------------------------------------------------------------------------
 
-void CEngine::GetHashKeySelectionStatus()
-    {
-    TBool hashKeySelectionInUse(EFalse);
-    
-#ifndef __SERIES60_30__
-    
-    // get hash key selection value
-    TRAP_IGNORE(
-        CRepository* repository = CRepository::NewLC(KCRUidAknFep);
-        repository->Get(KAknFepHashKeySelection, hashKeySelectionInUse);
-        CleanupStack::PopAndDestroy();
-    );
-    
-    // even if hash key selection is in use, ignore the value in qwerty mode
-    if (hashKeySelectionInUse)
-        {
-        TBool qwertyMode(EFalse);
-        RProperty qwertyModeStatusProperty;
-        qwertyModeStatusProperty.Attach(KCRUidAvkon, KAknQwertyInputModeActive);
-        qwertyModeStatusProperty.Get(qwertyMode);
-        qwertyModeStatusProperty.Close();
-        
-        if (qwertyMode)
-            hashKeySelectionInUse = EFalse;        
-        }
-
-#endif
-
-    iIsHashKeySelectionInUse = hashKeySelectionInUse;
-    }
-    	
-// --------------------------------------------------------------------------------------------
-
 TInt CEngine::LaunchSettingsDialogL()
     {
 	TInt retValue = KErrNone;
@@ -380,7 +329,7 @@
         User::RequestComplete( s, KErrCancel );
         }
 
-    //CAknEnv::StopSchedulerWaitWithBusyMessage( iWait );
+        //CAknEnv::StopSchedulerWaitWithBusyMessage( iWait );
 	iWait.AsyncStop();
 	}