# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1274780565 -10800 # Node ID 232e127a1fe4c1ff5ef4051106ba64ecc8945540 # Parent 2854d7196aaf6de04f6f8939f65f124c1b2bcfc0 Revision: 201019 Kit: 2010121 diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/GSProfilesPlugin/group/ABLD.BAT --- a/profilesapplication/Profiles/GSProfilesPlugin/group/ABLD.BAT Wed Apr 14 15:57:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -@ECHO OFF - -REM Bldmake-generated batch file - ABLD.BAT -REM ** DO NOT EDIT ** - -perl -S ABLD.PL "\s60\app\devicecontrol\profilesapplication\Profiles\GSProfilesPlugin\group\\" %1 %2 %3 %4 %5 %6 %7 %8 %9 -if errorlevel==1 goto CheckPerl -goto End - -:CheckPerl -perl -v >NUL -if errorlevel==1 echo Is Perl, version 5.003_07 or later, installed? -goto End - -:End diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/GSProfilesPlugin/src/GSProfilesPlugin.cpp --- a/profilesapplication/Profiles/GSProfilesPlugin/src/GSProfilesPlugin.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/GSProfilesPlugin/src/GSProfilesPlugin.cpp Tue May 25 12:42:45 2010 +0300 @@ -20,7 +20,7 @@ #include "GSProfilesPlugin.h" #include #include -#include // GUI Resource +#include // GUI Resource #include #include #include diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileAiwProvider/src/CProfileAiwProvider.cpp --- a/profilesapplication/Profiles/ProfileAiwProvider/src/CProfileAiwProvider.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileAiwProvider/src/CProfileAiwProvider.cpp Tue May 25 12:42:45 2010 +0300 @@ -28,7 +28,7 @@ #include // For KAiwCmdAssign #include // For MAiwNotifyCallback #include // For TResourceReader -#include // For resource texts +#include // For resource texts #include #include // CCoeEnv #include // RConeResourceLoader diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfile3dSettingPage.cpp --- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfile3dSettingPage.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfile3dSettingPage.cpp Tue May 25 12:42:45 2010 +0300 @@ -22,7 +22,7 @@ #include "ProfileSettingsView.hrh" #include -#include +#include #include // For RApaLsSession #include // For BaflUtils #include diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileAlertForSettingItem.cpp --- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileAlertForSettingItem.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileAlertForSettingItem.cpp Tue May 25 12:42:45 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "CProfileAlertForSettingPage.h" diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileFeedbackSettingPage.cpp --- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileFeedbackSettingPage.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileFeedbackSettingPage.cpp Tue May 25 12:42:45 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDES -#include +#include #include // For StringLoader #include // For CAknInformationNote diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileFileListSettingItem.cpp --- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileFileListSettingItem.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileFileListSettingItem.cpp Tue May 25 12:42:45 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include // For TCLFMediaType::ECLFMediaTypeVideo #include // CFeatureDiscovery diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileKeypadVolumeSettingPage.cpp --- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileKeypadVolumeSettingPage.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileKeypadVolumeSettingPage.cpp Tue May 25 12:42:45 2010 +0300 @@ -24,7 +24,7 @@ #include #include // For StringLoader #include // For CAknInformationNote -#include +#include // for power save mode handling #include diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileNameSettingPage.cpp --- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileNameSettingPage.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileNameSettingPage.cpp Tue May 25 12:42:45 2010 +0300 @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "CProfileEngineHandler.h" diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfilePlayingVolumeSettingPage.cpp --- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfilePlayingVolumeSettingPage.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfilePlayingVolumeSettingPage.cpp Tue May 25 12:42:45 2010 +0300 @@ -22,7 +22,7 @@ #include #include -#include +#include #include "CProfileStruct.h" // KProfileMaxProfileNameLength #include // For RApaLsSession #include // For BaflUtils diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileSettingsContainer.cpp --- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileSettingsContainer.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileSettingsContainer.cpp Tue May 25 12:42:45 2010 +0300 @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include #include #include diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileToneHandler.cpp --- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileToneHandler.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileToneHandler.cpp Tue May 25 12:42:45 2010 +0300 @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileToneHandlerDrmFull.cpp --- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileToneHandlerDrmFull.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileToneHandlerDrmFull.cpp Tue May 25 12:42:45 2010 +0300 @@ -26,7 +26,7 @@ #include #include -#include +#include #ifdef RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM #include diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileVibraSettingPage.cpp --- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileVibraSettingPage.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileVibraSettingPage.cpp Tue May 25 12:42:45 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDES -#include +#include #include // For StringLoader #include // For CAknInformationNote diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp --- a/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp Tue May 25 12:42:45 2010 +0300 @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include "CProfileMainContainer.h" diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileApp/UIsrc/CProfileSettingsView.cpp --- a/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileSettingsView.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileSettingsView.cpp Tue May 25 12:42:45 2010 +0300 @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "ProfilePanics.h" #include "CProfileSettingsContainer.h" diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfileApp/group/ProfileApp_reg.rss --- a/profilesapplication/Profiles/ProfileApp/group/ProfileApp_reg.rss Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfileApp/group/ProfileApp_reg.rss Tue May 25 12:42:45 2010 +0300 @@ -17,7 +17,7 @@ #include -#include +#include #include UID2 KUidAppRegistrationResourceFile diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfilesGSTonesPlugin/data/ProfilesGSTonesPluginRsc.rss --- a/profilesapplication/Profiles/ProfilesGSTonesPlugin/data/ProfilesGSTonesPluginRsc.rss Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfilesGSTonesPlugin/data/ProfilesGSTonesPluginRsc.rss Tue May 25 12:42:45 2010 +0300 @@ -20,7 +20,6 @@ NAME TNVW // 4 letter ID // INCLUDES -//#include "GSPrslnPlugin.loc" #include #include @@ -36,8 +35,8 @@ #include #include #include "ProfilesGsTonesPlugin.hrh" -#include -#include +#include +#include // FileListModel path definitions #include // FileListModel structure diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfilesGSTonesPlugin/group/bld.inf --- a/profilesapplication/Profiles/ProfilesGSTonesPlugin/group/bld.inf Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfilesGSTonesPlugin/group/bld.inf Tue May 25 12:42:45 2010 +0300 @@ -22,7 +22,7 @@ DEFAULT PRJ_EXPORTS -../loc/ProfilesGSTonesPlugin.loc APP_LAYER_LOC_EXPORT_PATH(ProfilesGSTonesPlugin.loc) +../loc/ProfilesGSTonesPlugin.loc APP_LAYER_LOC_EXPORT_PATH(profilesgstonesplugin.loc) PRJ_MMPFILES diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfilesGSTonesPlugin/src/CProfilesGSTonesPluginFileListSettingItem.cpp --- a/profilesapplication/Profiles/ProfilesGSTonesPlugin/src/CProfilesGSTonesPluginFileListSettingItem.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfilesGSTonesPlugin/src/CProfilesGSTonesPluginFileListSettingItem.cpp Tue May 25 12:42:45 2010 +0300 @@ -24,7 +24,7 @@ #include // From Profile Engine #include #include "ProfilesGSTonesPlugin.hrh" -#include +#include #include "MProfilesGSTonesPluginItemDataInterface.h" #include "ProfilesDebug.h" diff -r 2854d7196aaf -r 232e127a1fe4 profilesapplication/Profiles/ProfilesGSTonesPlugin/src/ProfilesGSTonesPlugin.cpp --- a/profilesapplication/Profiles/ProfilesGSTonesPlugin/src/ProfilesGSTonesPlugin.cpp Wed Apr 14 15:57:36 2010 +0300 +++ b/profilesapplication/Profiles/ProfilesGSTonesPlugin/src/ProfilesGSTonesPlugin.cpp Tue May 25 12:42:45 2010 +0300 @@ -23,7 +23,7 @@ #include "CProfilesGSTonesPluginSettingsHandler.h" #include "ProfilesDebug.h" #include "ProfilesGSTonesPlugin.hrh" -#include +#include #include // Includes from Profiles Settings View: