FCL/sf/app/rndtools: comparison creator/src/creator

equal deleted inserted replaced

-:e6e3e87d58b4
+:4df3a095718c
 #include "creator_factory.h"
 #include "creator_scriptparser.h"
 #include "creator_appui.h"
 #include "creator_app.h" // KUidCreatorApp
 #include "creator_file.h"
-#if(!defined __SERIES60_30__ && !defined __SERIES60_31__)
+#if(!defined __SERIES60_30__ && !defined __SERIES60_31__ && SYMBIAN_VERSION_SUPPORT < SYMBIAN_4)
 #include "creator_contactsetcache.h"
 #endif
 #include <apparc.h>
 #include <eikappui.h>
 	    case ECmdCreatePhoneBookEntryContacts: { iPhonebook->CreateContactEntryL(iCommandArray->At(iCurrentEntry).iParameters); } break;
 	    case ECmdCreatePhoneBookEntryGroups: { iPhonebook->CreateGroupEntryL(iCommandArray->At(iCurrentEntry).iParameters); } break;
 	    case ECmdCreatePhoneBookEntrySubscribedContacts: { iPhonebook->CreateSubscribedContactEntryL(iCommandArray->At(iCurrentEntry).iParameters); } break;
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
 	    case ECmdCreateMiscEntryNotes: { iNotepad->CreateNoteEntryL(reinterpret_cast<CNotepadParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
+#endif
 	    case ECmdCreateLogEntryMissedCalls: { iLogs->CreateMissedCallEntryL(reinterpret_cast<CLogsParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
 	    case ECmdCreateLogEntryReceivedCalls: { iLogs->CreateReceivedCallEntryL(reinterpret_cast<CLogsParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
 	    case ECmdCreateLogEntryDialledNumbers: { iLogs->CreateDialledNumberEntryL(reinterpret_cast<CLogsParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
 case ECmdCreateMiscEntryAccessPoints: { iAccessPoints->CreateConnectionSettingsEntryL(iCommandArray->At(iCurrentEntry).iParameters); } break;
 case ECmdDeleteCreatorIAPs: { iAccessPoints->DeleteAllCreatedByCreatorL(); } break;
 case ECmdCreateMiscEntryLandmarks: { iLandmarks->CreateLandmarkEntryL(reinterpret_cast<CLandmarkParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
 	    case ECmdCreateMessagingEntryMailboxes: { iMailboxes->CreateMailboxEntryL(reinterpret_cast<CMailboxesParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
 #ifdef __PRESENCE
 	     case ECmdCreateMiscEntryIMPSServers: { iIMPS->CreateIMPSServerEntryL(reinterpret_cast<CIMPSParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
 #endif
+#endif
 	    case ECmdCreateMessagingEntryMessages:  { iMessages->CreateMessageEntryL(reinterpret_cast<CMessagesParameters*>(iCommandArray->At(iCurrentEntry).iParameters), ETrue); } break;
 	    case ECmdCreateMessagingEntryMessagesViaScript:  { iMessages->CreateMessageEntryL(reinterpret_cast<CMessagesParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
 	    case ECmdCreateRandomEntrySMSInbox:
 	    case ECmdCreateRandomEntrySMSDrafts:
 iMailboxes->DeleteAllCreatedByCreatorL();
 break;
 }
 case ECmdDeleteNotes:
 {
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
 iNotepad->DeleteAllL();
+#endif
 break;
 }
 case ECmdDeleteIMPSs:
 {
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
+#ifdef __PRESENCE
 iIMPS->DeleteAllL();
+#endif
+#endif
 break;
 }
 case ECmdDeleteCreatorIMPSs:
 {
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
+#ifdef __PRESENCE
 iIMPS->DeleteAllCreatedByCreatorL();
+#endif
+#endif
 break;
 }
 case ECmdDeleteBrowserBookmarks:
 {
 iBrowser->DeleteAllBookmarksL();
 // init all modules here
 TInt err(KErrNone);
 TRAP(err, iBrowser = CCreatorBrowser::NewL(this));
 TRAP(err, iCalendar = CCreatorInterimCalendar::NewL(this));
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
 TRAP(err, iPhonebook = (CCreatorPhonebookBase*)TCreatorFactory::CreatePhoneBookL(this));
 TRAP(err, iNotepad = CCreatorNotepad::NewL(this));
+#endif
 TRAP(err, iLogs = CCreatorLogs::NewL(this));
 TRAP(err, iAccessPoints = (CCreatorConnectionSettingsBase*)TCreatorFactory::CreateConnectionSettingsL(this));
 TRAP(err, iMailboxes = CCreatorMailboxes::NewL(this));
 TRAP(err, iFiles = CCreatorFiles::NewL(this));
 TRAP(err, iMessages = CCreatorMessages::NewL(this));
 TRAP(err, iLandmarks = CCreatorLandmarks::NewL(this));
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
 #ifdef __PRESENCE
 TRAP(err, iIMPS = CCreatorIMPS::NewL(this));
 #endif
+#endif
-#if(!defined __SERIES60_30__ && !defined __SERIES60_31__)
+#if(!defined __SERIES60_30__ && !defined __SERIES60_31__ && SYMBIAN_VERSION_SUPPORT < SYMBIAN_4)
 // Initialize contact-set cache:
 ContactLinkCache::InitializeL();
 #endif
 // ...
 // ...
 iMailboxes = NULL;
 delete iAccessPoints;
 iAccessPoints = NULL;
 delete iLogs;
 iLogs = NULL;
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
 delete iNotepad;
 iNotepad = NULL;
 delete iPhonebook;
 iPhonebook = NULL;
+#endif
 delete iCalendar;
 iCalendar = NULL;
 delete iBrowser;
 iBrowser = NULL;
 delete iLandmarks;
 	CFileMan* fileMan = CFileMan::NewL( iEnv->FsSession() );
 	CleanupStack::PushL( fileMan );
 	fileMan->RmDir( iTempPath->Des() );
 	CleanupStack::PopAndDestroy(); //fileMan
-#if(!defined __SERIES60_30__ && !defined __SERIES60_31__)
+#if(!defined __SERIES60_30__ && !defined __SERIES60_31__ && SYMBIAN_VERSION_SUPPORT < SYMBIAN_4)
 	// Cleanup the contact-set cache:
 	ContactLinkCache::DestroyL();
 #endif
 }
 break;
 	    case ECmdCreateMiscEntryNotes:
 	    case ECmdDeleteNotes:
 {
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
 iUsedOptionsMenuModule = iNotepad;
+#endif
 }
 break;
 	    case ECmdCreateLogEntryMissedCalls:
 	    case ECmdCreateLogEntryReceivedCalls:
 	    case ECmdDeleteCreatorMailboxes:
 {
 iUsedOptionsMenuModule = iMailboxes;
 }
 break;
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
 #ifdef __PRESENCE
 	      case ECmdCreateMiscEntryIMPSServers:
 	      case ECmdDeleteIMPSs:
 	      case ECmdDeleteCreatorIMPSs:
 {
 iUsedOptionsMenuModule = iIMPS;
 }
 break;
 #endif
+#endif
 	      case ECmdCreateFileEntryEmptyFolder:
 	      case ECmdCreateFileEntry3GPP_70kB:
 	      case ECmdCreateFileEntryAAC_100kB:
 	      case ECmdCreateFileEntryAMR_20kB:
 	      case ECmdCreateFileEntryBMP_25kB:
 {
 if ( aCommand == ECmdDeleteAllEntries )
 {
 if ( YesNoQueryDialogL( _L("Delete all entries?") ) )
 {
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
 AppendToCommandArrayL( ECmdDeleteContacts, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteContactGroups, NULL, 1 );
+AppendToCommandArrayL( ECmdDeleteMessages, NULL, 1 );
+AppendToCommandArrayL( ECmdDeleteIMPSs, NULL, 1 );
+AppendToCommandArrayL( ECmdDeleteNotes, NULL, 1 );
+#endif
 AppendToCommandArrayL( ECmdDeleteCalendarEntries, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteBrowserBookmarks, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteBrowserBookmarkFolders, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteBrowserSavedPages, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteBrowserSavedPageFolders, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteLogs, NULL, 1 );
-AppendToCommandArrayL( ECmdDeleteMessages, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteIAPs, NULL, 1 );
-AppendToCommandArrayL( ECmdDeleteIMPSs, NULL, 1 );
-AppendToCommandArrayL( ECmdDeleteNotes, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteLandmarks, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorFiles, NULL, 1 );
 // started exucuting delete commands
 ExecuteFirstCommandL( KDeletingText );
 }
 else if ( aCommand == ECmdDeleteAllCreatorEntries )
 {
 if ( YesNoQueryDialogL( _L("Delete all entries created with Creator?") ) )
 {
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
 AppendToCommandArrayL( ECmdDeleteCreatorContacts, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorContactGroups, NULL, 1 );
+AppendToCommandArrayL( ECmdDeleteCreatorMessages, NULL, 1 );
+AppendToCommandArrayL( ECmdDeleteCreatorIMPSs, NULL, 1 );
+#endif
 AppendToCommandArrayL( ECmdDeleteCreatorCalendarEntries, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorBrowserBookmarks, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorBrowserBookmarkFolders, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorBrowserSavedPages, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorBrowserSavedPageFolders, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorFiles, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorLogs, NULL, 1 );
-AppendToCommandArrayL( ECmdDeleteCreatorMessages, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorIAPs, NULL, 1 );
-AppendToCommandArrayL( ECmdDeleteCreatorIMPSs, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorLandmarks, NULL, 1 );
 // started exucuting delete commands
 ExecuteFirstCommandL( KDeletingText );
 }

changeset 11	4df3a095718c
parent 0	d6fe6244b863