Automatic merge from PDK_3.0.h CompilerCompatibility
authorWilliam Roberts <williamr@symbian.org>
Sun, 14 Mar 2010 13:11:02 +0000
branchCompilerCompatibility
changeset 15 bcb8d447d716
parent 13 b2bba7f74ac0 (diff)
parent 10 5ef93ea513cb (current diff)
child 40 e35be9ff24b6
child 41 e8fef71da7c6
Automatic merge from PDK_3.0.h
homescreensrv_plat/ai_plugin_management_api/inc/aiscutappuids.hrh
homescreensrv_plat/ai_plugin_management_api/inc/aiscutcontentmodel.h
homescreensrv_plat/ai_plugin_management_api/inc/aiscutdefs.h
homescreensrv_plat/ai_plugin_management_api/inc/aiscutuids.hrh
homescreensrv_plat/ai_shortcut_command_api/ai_shortcut_command_api.metaxml
homescreensrv_plat/ai_shortcut_command_api/group/bld.inf
homescreensrv_plat/ai_shortcut_command_api/inc/aiscutplugindomaincrkeys.h
homescreensrv_plat/idlefw_api/inc/aiuiframeworkobserver.h
homescreensrv_plat/sapi_homescreenplugin/tsrc/group/Nokia_RnDCert_02.der
homescreensrv_plat/sapi_homescreenplugin/tsrc/group/Nokia_RnDCert_02.key
homescreensrv_plat/shortcutplugin_extension_api/group/bld.inf
homescreensrv_plat/shortcutplugin_extension_api/inc/aiscutextdefs.h
homescreensrv_plat/shortcutplugin_extension_api/inc/aiscutextserv.h
homescreensrv_plat/shortcutplugin_extension_api/shortcutplugin_extension_api.metaxml
idlefw/inc/framework/aibackuprestorestatusobserver.h
idlefw/inc/framework/aicallstatusobserver.h
idlefw/inc/framework/aicontentpluginmanager.h
idlefw/inc/framework/aidevicestatusobserver.h
idlefw/inc/framework/aienvironmentchangeobserver.h
idlefw/inc/framework/aifocusobserver.h
idlefw/inc/framework/aifwstartupscheduler.h
idlefw/inc/framework/aikeylockobserver.h
idlefw/inc/framework/ailightstatusobserver.h
idlefw/inc/framework/ainetworklistener.h
idlefw/inc/framework/ainetworkobserver.h
idlefw/inc/framework/ainwsdlgcontroller.h
idlefw/inc/framework/aipluginactivitypstool.h
idlefw/inc/framework/aipluginlifecycleobserver.h
idlefw/inc/framework/aipluginstate.h
idlefw/inc/framework/aipluginstatemachine.h
idlefw/inc/framework/aipluginstatemachineimpl.h
idlefw/inc/framework/aipluginstatemanager.h
idlefw/inc/framework/aipsstatusobserver.h
idlefw/inc/framework/aissaverstatusobserver.h
idlefw/inc/framework/aistatealive.h
idlefw/inc/framework/aistateidle.h
idlefw/inc/framework/aistatesuspended.h
idlefw/inc/framework/aiuiframeworkobserverimpl.h
idlefw/plugins/devicestatus/src/aidevstaplg.rss
idlefw/plugins/devicestatus/src/aidevstaplgres.rss
idlefw/plugins/group/aidevstaplg.mmp
idlefw/plugins/group/aiwsplugin.mmp
idlefw/plugins/pslnactiveidleplugin/data/pslnactiveidleplugin.rss
idlefw/plugins/pslnactiveidleplugin/data/pslnactiveidlepluginrsc.rss
idlefw/plugins/pslnactiveidleplugin/group/bld.inf
idlefw/plugins/pslnactiveidleplugin/group/pslnactiveidleplugin.mmp
idlefw/plugins/pslnactiveidleplugin/group/pslnactiveidlepluginicons.mk
idlefw/plugins/pslnactiveidleplugin/inc/gsactiveidleplugin.h
idlefw/plugins/pslnactiveidleplugin/inc/gsactiveidleplugincontainer.h
idlefw/plugins/pslnactiveidleplugin/inc/pslnactiveidleplugin.h
idlefw/plugins/pslnactiveidleplugin/inc/pslnactiveidleplugin.hrh
idlefw/plugins/pslnactiveidleplugin/inc/pslnactiveidleplugincontainer.h
idlefw/plugins/pslnactiveidleplugin/inc/pslnactiveidlepluginengine.h
idlefw/plugins/pslnactiveidleplugin/inc/pslnactiveidlepluginuids.h
idlefw/plugins/pslnactiveidleplugin/inc/pslnconst.h
idlefw/plugins/pslnactiveidleplugin/loc/pslnactiveidle3plugin.loc
idlefw/plugins/pslnactiveidleplugin/rom/pslnactiveidleplugin.iby
idlefw/plugins/pslnactiveidleplugin/rom/pslnactiveidleplugin_resources.iby
idlefw/plugins/pslnactiveidleplugin/src/gsactiveidleplugin.cpp
idlefw/plugins/pslnactiveidleplugin/src/gsactiveidleplugincontainer.cpp
idlefw/plugins/pslnactiveidleplugin/src/pslnactiveidleplugin.cpp
idlefw/plugins/pslnactiveidleplugin/src/pslnactiveidleplugincontainer.cpp
idlefw/plugins/pslnactiveidleplugin/src/pslnactiveidlepluginengine.cpp
idlefw/plugins/pslnactiveidleplugin/src/pslnactiveidlepluginimplementationtable.cpp
idlefw/plugins/shortcutplugin/BWINS/aiscutextservu.def
idlefw/plugins/shortcutplugin/EABI/aiscutextservu.def
idlefw/plugins/shortcutplugin/cenrep/keys_scutplugin.xls
idlefw/plugins/shortcutplugin/conf/scutplugin.confml
idlefw/plugins/shortcutplugin/conf/scutplugin_10275104.crml
idlefw/plugins/shortcutplugin/group/aiscutextserv.mmp
idlefw/plugins/shortcutplugin/group/aiscutplugin.mmp
idlefw/plugins/shortcutplugin/group/aiscutsettings.mmp
idlefw/plugins/shortcutplugin/group/backup_registration.xml
idlefw/plugins/shortcutplugin/group/bld.inf
idlefw/plugins/shortcutplugin/inc/aidefaultshortcut.h
idlefw/plugins/shortcutplugin/inc/aiscutapptitle.rh
idlefw/plugins/shortcutplugin/inc/aiscutappuidparser.h
idlefw/plugins/shortcutplugin/inc/aiscutfactory.h
idlefw/plugins/shortcutplugin/inc/aiscutpluginprivatecrkeys.h
idlefw/plugins/shortcutplugin/inc/aiscutrepositorywatcher.h
idlefw/plugins/shortcutplugin/inc/aiscutsettings.hrh
idlefw/plugins/shortcutplugin/inc/aiscuttargetshutter.h
idlefw/plugins/shortcutplugin/inc/caiscutengine.h
idlefw/plugins/shortcutplugin/inc/caiscutengine.inl
idlefw/plugins/shortcutplugin/inc/caiscutengineext.h
idlefw/plugins/shortcutplugin/inc/caiscutextdata.h
idlefw/plugins/shortcutplugin/inc/caiscutextdatamodel.h
idlefw/plugins/shortcutplugin/inc/caiscutextserver.h
idlefw/plugins/shortcutplugin/inc/caiscutextsession.h
idlefw/plugins/shortcutplugin/inc/caiscutplugin.h
idlefw/plugins/shortcutplugin/inc/caiscutsettings.h
idlefw/plugins/shortcutplugin/inc/caiscutsettingsapplist.h
idlefw/plugins/shortcutplugin/inc/caiscutsettingsbkmlist.h
idlefw/plugins/shortcutplugin/inc/caiscutsettingscontainer.h
idlefw/plugins/shortcutplugin/inc/caiscutsettingsitem.h
idlefw/plugins/shortcutplugin/inc/caiscutsettingsitem.inl
idlefw/plugins/shortcutplugin/inc/caiscutsettingsmodel.h
idlefw/plugins/shortcutplugin/inc/caiscutshortcut.h
idlefw/plugins/shortcutplugin/inc/caiscutshortcutext.h
idlefw/plugins/shortcutplugin/inc/caiscutshortcutinfo.h
idlefw/plugins/shortcutplugin/inc/caiscuttarget.h
idlefw/plugins/shortcutplugin/inc/caiscuttargetapp.h
idlefw/plugins/shortcutplugin/inc/caiscuttargetbkm.h
idlefw/plugins/shortcutplugin/inc/caiscuttargetempty.h
idlefw/plugins/shortcutplugin/inc/caiscuttargethttp.h
idlefw/plugins/shortcutplugin/inc/caiscuttargetkeylock.h
idlefw/plugins/shortcutplugin/inc/caiscuttargetmessagingview.h
idlefw/plugins/shortcutplugin/inc/caiscuttargetnewmsg.h
idlefw/plugins/shortcutplugin/inc/cpopupeventhandler.h
idlefw/plugins/shortcutplugin/inc/maiscutextdata.h
idlefw/plugins/shortcutplugin/inc/maiscutextmessagehandler.h
idlefw/plugins/shortcutplugin/inc/mpopupeventhandleractions.h
idlefw/plugins/shortcutplugin/inc/taiscutparser.h
idlefw/plugins/shortcutplugin/loc/ai3scutplugin.loc
idlefw/plugins/shortcutplugin/loc/ai3scutsettings.loc
idlefw/plugins/shortcutplugin/rom/aiscutplugin.iby
idlefw/plugins/shortcutplugin/rom/aiscutplugin_resources.iby
idlefw/plugins/shortcutplugin/src/GenPopupFSM.py
idlefw/plugins/shortcutplugin/src/MPopupFSMActions.h
idlefw/plugins/shortcutplugin/src/PopupFSM.cpp
idlefw/plugins/shortcutplugin/src/PopupFSM.h
idlefw/plugins/shortcutplugin/src/PopupTrace.h
idlefw/plugins/shortcutplugin/src/aidefaultshortcut.cpp
idlefw/plugins/shortcutplugin/src/aiscutappuidparser.cpp
idlefw/plugins/shortcutplugin/src/aiscutextserv.cpp
idlefw/plugins/shortcutplugin/src/aiscutfactory.cpp
idlefw/plugins/shortcutplugin/src/aiscutfactoryext.cpp
idlefw/plugins/shortcutplugin/src/aiscutplugin.rss
idlefw/plugins/shortcutplugin/src/aiscutpluginres.rss
idlefw/plugins/shortcutplugin/src/aiscutrepositorywatcher.cpp
idlefw/plugins/shortcutplugin/src/aiscutsettings.rss
idlefw/plugins/shortcutplugin/src/aiscutsettingsres.rss
idlefw/plugins/shortcutplugin/src/aiscuttargetshutter.cpp
idlefw/plugins/shortcutplugin/src/aiscuttexts.rss
idlefw/plugins/shortcutplugin/src/caiscutengine.cpp
idlefw/plugins/shortcutplugin/src/caiscutengineext.cpp
idlefw/plugins/shortcutplugin/src/caiscutextdata.cpp
idlefw/plugins/shortcutplugin/src/caiscutextdatamodel.cpp
idlefw/plugins/shortcutplugin/src/caiscutextserver.cpp
idlefw/plugins/shortcutplugin/src/caiscutextsession.cpp
idlefw/plugins/shortcutplugin/src/caiscutplugin.cpp
idlefw/plugins/shortcutplugin/src/caiscutsettings.cpp
idlefw/plugins/shortcutplugin/src/caiscutsettingsapplist.cpp
idlefw/plugins/shortcutplugin/src/caiscutsettingsbkmlist.cpp
idlefw/plugins/shortcutplugin/src/caiscutsettingscontainer.cpp
idlefw/plugins/shortcutplugin/src/caiscutsettingsimplementationtable.cpp
idlefw/plugins/shortcutplugin/src/caiscutsettingsitem.cpp
idlefw/plugins/shortcutplugin/src/caiscutsettingsmodel.cpp
idlefw/plugins/shortcutplugin/src/caiscutshortcut.cpp
idlefw/plugins/shortcutplugin/src/caiscutshortcutext.cpp
idlefw/plugins/shortcutplugin/src/caiscutshortcutinfo.cpp
idlefw/plugins/shortcutplugin/src/caiscuttarget.cpp
idlefw/plugins/shortcutplugin/src/caiscuttargetapp.cpp
idlefw/plugins/shortcutplugin/src/caiscuttargetbkm.cpp
idlefw/plugins/shortcutplugin/src/caiscuttargetempty.cpp
idlefw/plugins/shortcutplugin/src/caiscuttargethttp.cpp
idlefw/plugins/shortcutplugin/src/caiscuttargetkeylock.cpp
idlefw/plugins/shortcutplugin/src/caiscuttargetmessagingview.cpp
idlefw/plugins/shortcutplugin/src/caiscuttargetnewmsg.cpp
idlefw/plugins/shortcutplugin/src/cpopupeventhandler.cpp
idlefw/plugins/shortcutplugin/src/taiscutparser.cpp
idlefw/plugins/wsplugin/inc/keyhandlertimer.h
idlefw/plugins/wsplugin/inc/keylockcontrol.h
idlefw/plugins/wsplugin/inc/keylockhandler.h
idlefw/plugins/wsplugin/inc/keylockstates.h
idlefw/plugins/wsplugin/inc/keypadsettings.h
idlefw/plugins/wsplugin/inc/logslaunchhandler.h
idlefw/plugins/wsplugin/inc/sindlaunchhandler.h
idlefw/plugins/wsplugin/src/keyhandlertimer.cpp
idlefw/plugins/wsplugin/src/keylockhandler.cpp
idlefw/plugins/wsplugin/src/keylockstates.cpp
idlefw/plugins/wsplugin/src/keypadsettings.cpp
idlefw/plugins/wsplugin/src/logslaunchhandler.cpp
idlefw/plugins/wsplugin/src/sindlaunchhandler.cpp
idlefw/src/framework/aibackuprestorestatusobserver.cpp
idlefw/src/framework/aicallstatusobserver.cpp
idlefw/src/framework/aicontentpluginmanager.cpp
idlefw/src/framework/aienvironmentchangeobserver.cpp
idlefw/src/framework/aifocusobserver.cpp
idlefw/src/framework/aifwstartupscheduler.cpp
idlefw/src/framework/aikeylockobserver.cpp
idlefw/src/framework/ailightstatusobserver.cpp
idlefw/src/framework/ainetworklistener.cpp
idlefw/src/framework/ainwsdlgcontroller.cpp
idlefw/src/framework/aipluginactivitypstool.cpp
idlefw/src/framework/aipluginstatemachineimpl.cpp
idlefw/src/framework/aipluginstatemanager.cpp
idlefw/src/framework/aipsstatusobserver.cpp
idlefw/src/framework/aissaverstatusobserver.cpp
idlefw/src/framework/aistatealive.cpp
idlefw/src/framework/aistateidle.cpp
idlefw/src/framework/aistatesuspended.cpp
idlefw/src/framework/aiuiframeworkobserverimpl.cpp