# HG changeset patch # User William Roberts # Date 1279812726 -3600 # Node ID 5b14749788d7ff2694ff4b0c334af6fc67eb91dc # Parent a32b19fb291e5fc121275ee62e406cb1bc6a6d06# Parent 36f374c67aa87169387ff7215fe6c69e1f15b498 Catchup to latest Symbian^4 diff -r 36f374c67aa8 -r 5b14749788d7 email/imap4mtm/group/messaging_email_imap.history.xml diff -r 36f374c67aa8 -r 5b14749788d7 email/imap4mtm/group/messaging_email_imap.mrp diff -r 36f374c67aa8 -r 5b14749788d7 email/imap4mtm/imapprotocolcontroller/src/cimapprotocolcontroller.cpp diff -r 36f374c67aa8 -r 5b14749788d7 email/imap4mtm/imapservermtm/src/cimapupsresponsewaiter.cpp diff -r 36f374c67aa8 -r 5b14749788d7 email/imap4mtm/imapservermtm/test/group/bld.inf diff -r 36f374c67aa8 -r 5b14749788d7 email/imap4mtm/imapservermtm/test/group/t_unit_imapservermtm_server.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/imap4mtm/imapsession/src/cimapcommand.cpp diff -r 36f374c67aa8 -r 5b14749788d7 email/imap4mtm/imapsyncmanager/src/cimapfolder.cpp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/clientmtms/group/IMCMCOPY.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/clientmtms/src/MIUTMSG.CPP diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/clientmtms/test/group/T_imcm04.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/clientmtms/test/testrom/bld.inf diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/group/messaging_email.history.xml diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/group/messaging_email.mrp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/popservermtm/src/POPS.CPP diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/popservermtm/src/POPSRFSH.CPP diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/popservermtm/test/group/T_POPSECURESOCKETS.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/popservermtm/test/group/T_PopFullDsk.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/popservermtm/test/group/T_pops4.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/popservermtm/test/group/T_pops5.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/popservermtm/test/group/T_pops6.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/popservermtm/test/group/T_popsCancelProgress.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/popservermtm/test/group/T_pops_synchronise.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/popservermtm/test/testrom/bld.inf diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/servermtmutils/src/imcvrecv.cpp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/servermtmutils/test/group/T_IMSK01.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/servermtmutils/test/testrom/bld.inf diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/smtpservermtm/test/group/T_SMTS01.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/smtpservermtm/test/group/T_SMTS02.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/smtpservermtm/test/group/T_SMTSSECURESOCKETS.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/smtpservermtm/test/group/T_smts00.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/smtpservermtm/test/group/t_smtssmtpauth.mmp diff -r 36f374c67aa8 -r 5b14749788d7 email/pop3andsmtpmtm/smtpservermtm/test/testrom/bld.inf diff -r 36f374c67aa8 -r 5b14749788d7 inc/convergedmessage.h diff -r 36f374c67aa8 -r 5b14749788d7 inc/msgnotificationdialogpluginkeys.h diff -r 36f374c67aa8 -r 5b14749788d7 inc/unidatamodelloader.h diff -r 36f374c67aa8 -r 5b14749788d7 inc/unidatamodelplugininterface.h diff -r 36f374c67aa8 -r 5b14749788d7 inc/unieditorplugininterface.h diff -r 36f374c67aa8 -r 5b14749788d7 inc/unieditorpluginloader.h diff -r 36f374c67aa8 -r 5b14749788d7 layers.sysdef.xml diff -r 36f374c67aa8 -r 5b14749788d7 messaging_info/messaging_metadata/messaging_metadata.mrp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/messagingapp.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/bwins/msghistoryu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/client/bwins/csserverclientapiu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/client/eabi/csserverclientapiu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/client/src/ccsrequesthandler.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/client/src/rcssession.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/msgappfw.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/msghistory/src/msghistoryprivate.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/msghistory/src/msgitem.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/inc/ccscontactsresolver.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/inc/ccsconversation.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/inc/ccsconversationcache.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/inc/ccsconversationcachehelper.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/inc/ccsconversationcontact.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/inc/ccsconversationdeletehandler.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/inc/ccsconversationmarkreadhandler.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/inc/ccssession.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/src/ccscontactsresolver.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/src/ccsconversation.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/src/ccsconversationcache.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/src/ccsconversationcachehelper.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/src/ccsconversationcontact.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/src/ccsconversationdeletehandler.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/src/ccsconversationmarkreadhandler.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/server/src/ccssession.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/utils/bwins/csutilsu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/utils/eabi/csutilsu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/utils/src/ccsclientconversation.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgappfw/utils/src/ccsdebug.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgerrornotifier/src/msgerrornotifiersvc.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgindicatorplugin/inc/msgindicator.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgindicatorplugin/inc/msgindicator_p.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgindicatorplugin/inc/msgindicatorplugin.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgindicatorplugin/msgindicatorplugin.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgindicatorplugin/src/msgindicator.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgindicatorplugin/src/msgindicator_p.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgindicatorplugin/src/msgindicatorplugin.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgnotificationdialogplugin/inc/msgnotificationdialogwidget.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgnotificationdialogplugin/src/msgnotificationdialogplugin.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgnotificationdialogplugin/src/msgnotificationdialogwidget.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgnotifications.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgnotifier/inc/msgnotifier.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgnotifier/inc/msgnotifier_p.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgnotifier/msgnotifier.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgnotifier/src/main.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgnotifier/src/msgnotifier.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgnotifications/msgnotifier/src/msgnotifier_p.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgsettings/bwins/settingsviewu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgsettings/eabi/settingsviewu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgsettings/msgsettings.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgsettings/settingsview/inc/msgsettingsform.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgsettings/settingsview/inc/msgsettingsview.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgsettings/settingsview/inc/msgsmscentersettingsform.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgsettings/settingsview/inc/msgsmscenterview.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgsettings/settingsview/settingsview.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgsettings/settingsview/src/msgsettingsdataformcustomitem.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgsettings/settingsview/src/msgsettingsform.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgsettings/settingsview/src/msgsettingsview.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgsettings/settingsview/src/msgsmscentersettingsform.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgsettings/settingsview/src/msgsmscenterview.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/appengine.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/inc/conversationmsgstorehandler.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/inc/conversationsengine.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/inc/conversationsengine_p.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/inc/conversationsenginedefines.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/inc/conversationsengineutility.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/inc/conversationsmodel.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/inc/conversationssummarymodel.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/src/conversationmsgstorehandler.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/src/conversationsengine.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/src/conversationsengine_p.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/src/conversationsengineutility.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/src/conversationsmodel.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/src/conversationssummarymodel.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/appengine/src/draftsmodel.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/bwins/appengineu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/bwins/conversationviewu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/bwins/msguiutilsu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/bwins/unifiededitoru.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/bwins/unifiedvieweru.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/conversationview/conversationview.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/conversationview/conversationview.qrc diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/conversationview/inc/msgcontactcardwidget.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/conversationview/inc/msgconversationbaseview.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/conversationview/inc/msgconversationview.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/conversationview/inc/msgconversationviewitem.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/conversationview/inc/msgconversationwidget.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/conversationview/inc/msgeditorwidget.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/conversationview/src/msgcontactcardwidget.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/conversationview/src/msgconversationbaseview.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/conversationview/src/msgconversationview.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/conversationview/src/msgconversationviewitem.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/conversationview/src/msgconversationwidget.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/conversationview/src/msgeditorwidget.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/eabi/appengineu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/eabi/conversationviewu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/eabi/msguiutilsu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/eabi/unifiededitoru.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/eabi/unifiedvieweru.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/inc/msgbaseview.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/inc/draftslistview.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/inc/msglistview.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/inc/msglistviewitem.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/inc/msgserviceinterface.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/inc/msgviewmanager.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/messaging_service.xml diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/msgapp.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/msgapp.qrc diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/resources/xml/msglistviewitem.css diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/resources/xml/msglistviewitem.widgetml diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/rom/msgapp.iby diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/src/draftslistview.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/src/msglistview.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/src/msglistviewitem.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/src/msgmainwindow.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/src/msgserviceinterface.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgapp/src/msgviewmanager.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msgui.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msguiutils/inc/mmsconformancecheck.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msguiutils/inc/msgsendutil.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msguiutils/msguiutils.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msguiutils/src/mmsconformancecheck.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/msguiutils/src/msgsendutil.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiededitor/inc/msgunieditoraddress.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiededitor/inc/msgunieditorattachment.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiededitor/inc/msgunieditorbody.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiededitor/inc/msgunieditorprocessimageoperation.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiededitor/inc/msgunieditorsubject.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiededitor/inc/msgunieditorview.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiededitor/src/msgunieditoraddress.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiededitor/src/msgunieditorattachment.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiededitor/src/msgunieditorbody.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiededitor/src/msgunieditorprocessimageoperation.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiededitor/src/msgunieditorsubject.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiededitor/src/msgunieditorview.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiededitor/unifiededitor.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiededitor/unifiededitor.qrc diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/inc/unicontentswidget.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/inc/unifiedviewer.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/inc/uniscrollarea.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/inc/univieweraddresscontainer.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/inc/univieweraddresswidget.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/inc/univiewerbodywidget.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/inc/univiewerdetailswidget.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/inc/univiewerfeeder.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/inc/univiewerfeeder_p.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/inc/univiewerheadercontainer.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/inc/univiewertextitem.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/inc/univiewslidewidget.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/resources/layouts/univiewerbodywidget.css diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/resources/layouts/univiewerbodywidget.widgetml diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/resources/layouts/univiewerdetailswidget.css diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/resources/layouts/univiewerdetailswidget_color.css diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/src/unicontentswidget.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/src/unifiedviewer.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/src/uniscrollarea.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/src/univieweraddresscontainer.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/src/univieweraddresswidget.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/src/univiewerbodywidget.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/src/univiewerdetailswidget.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/src/univiewerfeeder.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/src/univiewerfeeder_p.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/src/univiewerheadercontainer.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/src/univiewertextitem.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/src/univiewslidewidget.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/unifiedviewer.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgui/unifiedviewer/unifiedviewer.qrc diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/bwins/convergedmessageutilsu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/convergedmessageutils/inc/convergedmessageimpl.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/convergedmessageutils/src/convergedmessage.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/convergedmessageutils/src/convergedmessageimpl.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/eabi/convergedmessageutilsu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/msgutils.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/unidatautils/unidatamodel/inc/UniDataModel.inl diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/unidatautils/unidatamodel/inc/UniSmilModel.inl diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/unidatautils/unidatamodel/src/UniDataModel.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/unieditorutils/bwins/editorgenutilsu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/unieditorutils/eabi/editorgenutilsu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/unieditorutils/editorgenutils/inc/UniEditorGenUtils.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/unieditorutils/editorgenutils/src/UniEditorGenUtils.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/unieditorutils/unieditorplugins/unieditormmsplugin/src/unieditormmsplugin_p.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/unieditorutils/unieditorplugins/unieditorsmsplugin/inc/unieditorsmsplugin_p.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/unieditorutils/unieditorplugins/unieditorsmsplugin/src/unieditorsmsplugin.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/unieditorutils/unieditorplugins/unieditorsmsplugin/src/unieditorsmsplugin_p.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/msgutils/unieditorutils/unieditorutils.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/shareui/inc/shareuiprivate.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/shareui/rom/shareui.iby diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/shareui/shareui.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/shareui/sis/shareui.pkg diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/shareui/sis/shareui_stub.pkg diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/shareui/src/shareui.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/shareui/src/shareuiprivate.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/shareui/tsrc/testshareui/rom/testshareui.iby diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/shareui/tsrc/testshareui/sis/testshareui.pkg diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/shareui/tsrc/testshareui/sis/testshareui.sisx diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/shareui/tsrc/testshareui/testshareui.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/smartmessaging/bwins/ringbcu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/smartmessaging/eabi/ringbcu.def diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/smartmessaging/ringbc/inc/ringbc.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/smartmessaging/ringbc/inc/ringbc_p.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/smartmessaging/ringbc/src/ringbc.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingapp/smartmessaging/ringbc/src/ringbc_p.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/messagingappbase.pro diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/msgmedia/group/MsgMedia.mmp --- a/messagingappbase/msgmedia/group/MsgMedia.mmp Tue Jul 06 14:12:40 2010 +0300 +++ b/messagingappbase/msgmedia/group/MsgMedia.mmp Thu Jul 22 16:32:06 2010 +0100 @@ -79,7 +79,7 @@ LIBRARY msgcommonutils.lib STATICLIBRARY hxmetadatautil.lib -#if defined( ARMCC ) +#if defined( EABI ) deffile ./eabi.def #elif defined( WINS ) deffile ./wins.DEF diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/msgmedia/src/MmsConformance.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/msgmedia/src/MsgMediaInfo.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/msgmedia/src/MsgMediaResolver.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/Group/messaging_obex.history.xml diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/Group/messaging_obex.mrp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/Rom/obex.hby diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/TObexMTM/obexstub/BluetoothSdpStub/sdp/agent/SdpagentStub.mmp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/TObexMTM/obexstub/BluetoothSdpStub/sdp/bld.inf diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/TObexMTM/obexstub/IrobexStub/group/BLD.INF diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/TObexMTM/obexstub/IrobexStub/group/irobexstub.mmp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/TObexMTM/testutils/msgth/group/msgth.mmp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/btmtm/btclient/Include/btcmtm.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/btmtm/btclient/group/BLD.INF diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/btmtm/btclient/group/btcmtm.mmp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/btmtm/btclient/source/btcmtm.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/btmtm/btserver/group/BLD.INF diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/btmtm/btserver/group/btsmtm.mmp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/btmtm/btserver/source/btsendop.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/irmtm/irclient/group/BLD.INF diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/irmtm/irclient/group/ircmtm.MMP diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/irmtm/irclient/include/IRCMTM.H diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/irmtm/irclient/source/Ircmtm.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/irmtm/irserver/group/BLD.INF diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/irmtm/irserver/group/IRSMTM.MMP diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/obexmtm/obexclient/group/BLD.INF diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/obexmtm/obexclient/group/obexClientMtm.mmp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/obexmtm/obexclient/include/obexClientMtm.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/obexmtm/obexclient/source/obexClientMtm.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/obexmtm/obexserver/group/BLD.INF diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/obexmtm/obexserver/group/obexServerMtm.mmp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/obexmtm/obexserver/source/obexSendOp_normal.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/obexmtm/obexutil/group/BLD.INF diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/obexmtm/obexutil/group/obexMtmUtil.mmp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/obexmtm/obexutil/source/ObexSdpUtils.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/obexmtm/obexutil/source/obexMtmUtil.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/obexmtms/obexmtm/obexutil/source/obexpasswordexternaliser.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/smilparser/GROUP/messaging_gmxml.history.xml diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/smilparser/GROUP/messaging_gmxml.mrp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/smilparser/Rom/Gmxml.iby diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/smilparser/SMILdtd/GROUP/smildtd.mmp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/smilparser/SMILdtd/GROUP/smiltranslatortest.mmp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/smilparser/SMILdtd/GROUP/t_smil_dom.mmp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/smilparser/SMILdtd/INC/SmilDtd.h diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/smilparser/SMILdtd/SRC/Smildtd.cpp diff -r 36f374c67aa8 -r 5b14749788d7 messagingappbase/smilparser/SMILdtd/tsrc/smiltranslatortest.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/applicationadapter/bld/mmsapplicationadapter.mmp --- a/mmsengine/applicationadapter/bld/mmsapplicationadapter.mmp Tue Jul 06 14:12:40 2010 +0300 +++ b/mmsengine/applicationadapter/bld/mmsapplicationadapter.mmp Thu Jul 22 16:32:06 2010 +0100 @@ -49,7 +49,7 @@ -#if defined(ARMCC) +#if defined(EABI) deffile ../eabi/mmsapplicationadapter.def //#elif defined( WINSCW ) //deffile ../bwinscw/mmsapplicationadapter.def diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/clientmtm/bld/mmsclient.mmp --- a/mmsengine/clientmtm/bld/mmsclient.mmp Tue Jul 06 14:12:40 2010 +0300 +++ b/mmsengine/clientmtm/bld/mmsclient.mmp Thu Jul 22 16:32:06 2010 +0100 @@ -58,7 +58,7 @@ // remove comments from this macro if no logging wanted MACRO _NO_MMSC_LOGGING_ -#if defined(ARMCC) +#if defined(EABI) deffile ../eabi/mmscli.def //#elif defined( WINSCW ) //deffile ../bwinscw/mmscli.def diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/clientmtm/inc/mmsnotificationclient.h diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/clientmtm/src/mmsclient.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/clientmtm/src/mmsnotificationclient.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/conf/mmsengine.confml diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/genutils/bld/mmsgenutils.mmp --- a/mmsengine/genutils/bld/mmsgenutils.mmp Tue Jul 06 14:12:40 2010 +0300 +++ b/mmsengine/genutils/bld/mmsgenutils.mmp Thu Jul 22 16:32:06 2010 +0100 @@ -54,7 +54,7 @@ //LIBRARY Pbk2Presentation.lib DEBUGLIBRARY flogger.lib -#if defined(ARMCC) +#if defined(EABI) deffile ../eabi/mmsgenutils.def #elif defined( WINS ) DEFFILE ../bwins/wins.def diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/genutils/src/mmsgenutils.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/inc/mmsgenutils.h diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmscodec/bld/mmscodec.mmp --- a/mmsengine/mmscodec/bld/mmscodec.mmp Tue Jul 06 14:12:40 2010 +0300 +++ b/mmsengine/mmscodec/bld/mmscodec.mmp Thu Jul 22 16:32:06 2010 +0100 @@ -80,7 +80,7 @@ DEBUGLIBRARY flogger.lib #endif -#if defined( ARMCC ) +#if defined( EABI ) deffile ../eabi/mmscodec.def //#elif defined( WINSCW ) //deffile ../bwinscw/mmscodec.def diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmscodec/src/mmsdecode.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmscodec/src/mmsencode.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmscodecclient/bld/mmscodecclient.mmp --- a/mmsengine/mmscodecclient/bld/mmscodecclient.mmp Tue Jul 06 14:12:40 2010 +0300 +++ b/mmsengine/mmscodecclient/bld/mmscodecclient.mmp Thu Jul 22 16:32:06 2010 +0100 @@ -50,7 +50,7 @@ LANG SC -#if defined(ARMCC) +#if defined(EABI) deffile ../eabi/mmscodecclient.def //#elif defined( WINSCW ) //deffile ../bwinscw/mmscodecclient.def diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmscodecclient/src/mmscodecclient.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsconf/messaging_mmssettings-config.history.xml diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsconf/messaging_mmssettings-config.mrp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsconf/mmssettings_10202d4c.crml diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsconninit/src/mmsconninit.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsengine.pro diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmshttptransport/bld/mmstransport.mmp --- a/mmsengine/mmshttptransport/bld/mmstransport.mmp Tue Jul 06 14:12:40 2010 +0300 +++ b/mmsengine/mmshttptransport/bld/mmstransport.mmp Thu Jul 22 16:32:06 2010 +0100 @@ -73,7 +73,7 @@ DEBUGLIBRARY flogger.lib #endif -#if defined( ARMCC ) +#if defined( EABI ) deffile ../eabi/mmstransport.def #elif defined( WINSCW ) deffile ../bwinscw/mmstransport.def diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmshttptransport/inc/mmssession.h diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmshttptransport/inc/mmstransaction.h diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmshttptransport/src/mmstransaction.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsmessage/bld/mmsmessage.mmp --- a/mmsengine/mmsmessage/bld/mmsmessage.mmp Tue Jul 06 14:12:40 2010 +0300 +++ b/mmsengine/mmsmessage/bld/mmsmessage.mmp Thu Jul 22 16:32:06 2010 +0100 @@ -71,7 +71,7 @@ DEBUGLIBRARY flogger.lib -#if defined(ARMCC) +#if defined(EABI) deffile ../eabi/mmsmessage.def #elif defined( WINS ) DEFFILE ../bwins/wins.def diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsmessage/inc/mmsmessageoperation.h diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsmessage/inc/mmsownnumber.h diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsmessage/src/mmsheaders.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsmessage/src/mmsmessageoperation.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsmessage/src/mmsownnumber.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmspushhandler/bld/mmspushhandler.mmp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmspushhandler/inc/CMmsPushHandler.h diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmspushhandler/src/101F4693.rss diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmspushhandler/src/CMmsPushHandler.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/bld/mmsserver.mmp --- a/mmsengine/mmsserver/bld/mmsserver.mmp Tue Jul 06 14:12:40 2010 +0300 +++ b/mmsengine/mmsserver/bld/mmsserver.mmp Thu Jul 22 16:32:06 2010 +0100 @@ -94,7 +94,7 @@ DEBUGLIBRARY flogger.lib #endif -#if defined(ARMCC) +#if defined(EABI) deffile ../eabi/mmsserver.def #elif defined( WINS ) DEFFILE ../bwins/mmsserver.def diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/inc/mmsbaseoperation.h diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/inc/mmsdeleteoperation.h diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/inc/mmsforwardoperation.h diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/inc/mmslog.h diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/inc/mmsserver.h diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/src/mmsbaseoperation.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/src/mmsdeleteoperation.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/src/mmsforwardoperation.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/src/mmslog.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/src/mmsmmboxlist.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/src/mmsreadreport.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/src/mmsreceivemessage.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/src/mmssendoperation.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserver/src/mmsserver.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserversettings/bld/mmsserversettings.mmp --- a/mmsengine/mmsserversettings/bld/mmsserversettings.mmp Tue Jul 06 14:12:40 2010 +0300 +++ b/mmsengine/mmsserversettings/bld/mmsserversettings.mmp Thu Jul 22 16:32:06 2010 +0100 @@ -50,7 +50,7 @@ LIBRARY mmsconninit.lib LIBRARY bafl.lib -#if defined( ARMCC ) +#if defined( EABI ) deffile ../eabi/mmsserversettings.def #elif defined( WINSCW ) deffile ../bwinscw/mmsserversettings.def diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserversettings/src/mmsmessagestoreutils.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserversettings/src/mmsregisteredapplications.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserversettings/src/mmsschedulesettingsutils.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmsserversettings/src/mmssettings.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmssettings/group/messaging_mmssettings.mrp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmssettings/group/mmsgenericsettings.mmp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmssettings/src/cmmssettings.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmssettings/test/group/T_MmsSettings.mmp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmssettings/test/inc/T_MmsSettings.h diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmswatcher/bld/mmswatcher.mmp --- a/mmsengine/mmswatcher/bld/mmswatcher.mmp Tue Jul 06 14:12:40 2010 +0300 +++ b/mmsengine/mmswatcher/bld/mmswatcher.mmp Thu Jul 22 16:32:06 2010 +0100 @@ -77,7 +77,7 @@ DEBUGLIBRARY flogger.lib #endif -/*#if defined(ARMCC) +/*#if defined(EABI) deffile ../eabi/mmswatcher.def #elif defined( WINSCW ) deffile ../bwinscw/mmswatcher.def diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/mmswatcher/src/mmswatcher.cpp diff -r 36f374c67aa8 -r 5b14749788d7 mmsengine/rom/MmsEngine.iby diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/clientmtm/bwins/V2_SMCMU.DEF diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/clientmtm/eabi/v2_smcmu.def diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/clientmtm/inc/SMSCLNT.H diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/clientmtm/src/SMSCLNT.CPP diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/group/messaging_sms.history.xml diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/group/messaging_sms.mrp diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/servermtm/inc/SMSSERV.H diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/servermtm/src/SMSSERV.CPP diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/servermtm/src/SMSSOUTB.CPP diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/test/class0smsnotifier/group/class0smsUInotifier.mmp diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/test/group/T_CSmsSettings.mmp diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/test/group/T_SmsSendAs.mmp diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/test/group/t_SmsReplyToServer.mmp diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/test/group/t_SmsSpecialIndicationsServer.mmp diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/test/group/t_smsinit.mmp diff -r 36f374c67aa8 -r 5b14749788d7 mobilemessaging/smsmtm/test/testrom/bld.inf diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/conversation_services_client_api/inc/ccsrequesthandler.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/conversation_services_client_api/inc/rcssession.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/conversation_services_utilities_api/inc/ccsclientconversation.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/conversation_services_utilities_api/inc/ccsdefs.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/messaging_history_api/inc/msgitem.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/messaging_media_resolver_api/inc/MsgAudioInfo.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/messaging_media_resolver_api/inc/MsgImageInfo.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/messaging_media_resolver_api/inc/MsgMediaInfo.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/messaging_media_resolver_api/inc/MsgMediaResolver.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/messaging_media_resolver_api/inc/MsgTextInfo.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/messaging_media_resolver_api/inc/MsgVideoInfo.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/mms_codec_client_api/inc/mmscodecclient.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/mms_codec_client_api/tsrc/src/MmsCodecClientApiTestBlocks.cpp diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/mms_conformance_api/inc/MmsConformance.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/mms_conformance_api/tsrc/inc/MMSConformanceAPITest.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/mms_engine_settings_api/inc/MmsEngineInternalCRKeys.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/shareui_api/inc/shareui.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_plat/shareui_api/inc/shareuidialog.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_pub/mms_client_mtm_api/inc/mmsclient.h diff -r 36f374c67aa8 -r 5b14749788d7 msg_pub/mms_client_mtm_api/tsrc/bc/src/MMSClientMTMBCTesterController.cpp diff -r 36f374c67aa8 -r 5b14749788d7 msg_pub/mms_client_mtm_api/tsrc/src/MmsClientMtmApiTest.cpp