--- a/commonuis/CommonDialogs/src/CAknFileSelectionEventHandler.cpp Thu Aug 19 10:11:06 2010 +0300
+++ b/commonuis/CommonDialogs/src/CAknFileSelectionEventHandler.cpp Tue Aug 31 15:28:30 2010 +0300
@@ -24,8 +24,6 @@
#include "CAknFileSelectionModel.h"
#include "MAknFileSelectionObserver.h"
-#include "CAknCommonDialogsPopupList.h"
-#include "CAknCFDFileSystemEvent.h"
#include "AknCFDUtility.h"
@@ -95,12 +93,6 @@
// Destructor
CAknFileSelectionEventHandler::~CAknFileSelectionEventHandler()
{
- if(iFSObserver)
- {
- iFSObserver->Cancel();
- delete iFSObserver;
- iFSObserver = NULL;
- }
}
@@ -298,7 +290,7 @@
{
if( iModel->DirectoryLevel() > 0 ) // We are not in the root folder
{
- while( iModel->DirectoryLevel() > 0 ) // Find until existing contents
+ while( ETrue ) // Find until existing contents
{
entries = iModel->GotoParentFolderL();
PopIndices( aTopItemIndex, aFocusedItemIndex );
@@ -316,10 +308,6 @@
UpdateSoftkeysL( aFocusedItemIndex, aContainer );
returnType = EItemsUpdated;
}
- else
- {
- returnType = ETryingToExit;
- }
}
else // We are in the root folder
{
@@ -396,22 +384,4 @@
return returnType;
}
-void CAknFileSelectionEventHandler::StartFileSystemNotifierL(CAknCommonDialogsPopupList* aPopupList)
- {
- iPopupList = aPopupList;
- TPath path;
- iModel->GetCurrentPath(path);
- iFSObserver = CAknCFDFileSystemEvent::NewL(iCoeEnv->FsSession(),*this,
- ENotifyEntry,path);
- }
-void CAknFileSelectionEventHandler::StopFileSystemNotifier()
- {
- iFSObserver->Cancel();
- }
-void CAknFileSelectionEventHandler::NotifyFileSystemChangedL()
- {
- iModel->UpdateItemListL();
- iPopupList->HandleFileSystemChangedL(iModel);
- iFSObserver->Setup();
- }
// End of File