# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286141301 -10800 # Node ID f5642d05cce0b2311b8ea5730ff9562c33e52369 # Parent dcd4152cfe554bf5229ab9a6b17d8937198e66b0 Revision: 201037 Kit: 201039 diff -r dcd4152cfe55 -r f5642d05cce0 appfw/apparchitecture/apserv/APSRECCACHE.cpp --- a/appfw/apparchitecture/apserv/APSRECCACHE.cpp Fri Sep 17 08:30:44 2010 +0300 +++ b/appfw/apparchitecture/apserv/APSRECCACHE.cpp Mon Oct 04 00:28:21 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -38,8 +38,13 @@ CRecognitionResultHashMapEntry::~CRecognitionResultHashMapEntry() { - iResult->Close(); - iResult = NULL; + + if(iResult != NULL) + { + iResult->Close(); + iResult = NULL; + } + delete iNext; } diff -r dcd4152cfe55 -r f5642d05cce0 appfw/apparchitecture/group/apparc.iby --- a/appfw/apparchitecture/group/apparc.iby Fri Sep 17 08:30:44 2010 +0300 +++ b/appfw/apparchitecture/group/apparc.iby Mon Oct 04 00:28:21 2010 +0300 @@ -54,7 +54,7 @@ file=ABI_DIR\BUILD_DIR\apfile.dll System\Libs\apfile.dll file=ABI_DIR\BUILD_DIR\aplist.dll System\Libs\aplist.dll file=ABI_DIR\BUILD_DIR\apgrfx.dll System\Libs\apgrfx.dll -file=ABI_DIR\DEBUG_DIR\apserv.dll System\Libs\apserv.dll +file=ABI_DIR\BUILD_DIR\apserv.dll System\Libs\apserv.dll file=ABI_DIR\BUILD_DIR\apsexe.exe System\Programs\apsexe.exe file=ABI_DIR\BUILD_DIR\ServiceRegistry.dll System\Libs\ServiceRegistry.dll diff -r dcd4152cfe55 -r f5642d05cce0 applaunchservices/applaunchplugins/test/tapstart/group/apstarttest_apstart.iby --- a/applaunchservices/applaunchplugins/test/tapstart/group/apstarttest_apstart.iby Fri Sep 17 08:30:44 2010 +0300 +++ b/applaunchservices/applaunchplugins/test/tapstart/group/apstarttest_apstart.iby Mon Oct 04 00:28:21 2010 +0300 @@ -21,9 +21,9 @@ data=ABI_DIR\BUILD_DIR\tapstart_server.exe sys\bin\tapstart_server.exe -//data=DATAZ_\apstarttest\apstarttest_apstart_run.bat \apstarttest_apstart_run.bat +data=DATAZ_\apstarttest\apstarttest_apstart_run.bat \apstarttest_apstart_run.bat -//data=DATAZ_\apstarttest\apstarttest_apstart.script \apstarttest\apstarttest_apstart.script +data=DATAZ_\apstarttest\apstarttest_apstart.script \apstarttest\apstarttest_apstart.script #endif diff -r dcd4152cfe55 -r f5642d05cce0 commonappservices/alarmserver/ConsoleAlarmAlertServer/Source/ConsoleAlarmAlertSession.cpp --- a/commonappservices/alarmserver/ConsoleAlarmAlertServer/Source/ConsoleAlarmAlertSession.cpp Fri Sep 17 08:30:44 2010 +0300 +++ b/commonappservices/alarmserver/ConsoleAlarmAlertServer/Source/ConsoleAlarmAlertSession.cpp Mon Oct 04 00:28:21 2010 +0300 @@ -41,8 +41,11 @@ CancelNotifications(); __FLOG_CLOSE; + if(iServer != NULL) + { CConsoleAlarmAlertSession* session = iServer->WaitingSession(); session = NULL; + } delete iSoundLEDFlasher; delete iSoundCallbackTimer; delete iConsole; diff -r dcd4152cfe55 -r f5642d05cce0 commonappservices/alarmserver/Group/AlarmServer.iby --- a/commonappservices/alarmserver/Group/AlarmServer.iby Fri Sep 17 08:30:44 2010 +0300 +++ b/commonappservices/alarmserver/Group/AlarmServer.iby Mon Oct 04 00:28:21 2010 +0300 @@ -20,11 +20,6 @@ REM Alarm Server -#include -#ifdef SYMBIAN_SYSTEM_STATE_MANAGEMENT -#include -#endif - #ifndef DATAZ_ define DATAZ_ EPOCROOT##epoc32\data\Z #endif diff -r dcd4152cfe55 -r f5642d05cce0 commonappservices/alarmserver/Group/Bld.inf --- a/commonappservices/alarmserver/Group/Bld.inf Fri Sep 17 08:30:44 2010 +0300 +++ b/commonappservices/alarmserver/Group/Bld.inf Mon Oct 04 00:28:21 2010 +0300 @@ -37,7 +37,7 @@ // Console Alarm Alert Server ../ConsoleAlarmAlertServer/Include/ConsoleAlarmAlertServerMain.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(consolealarmalertservermain.h) -AlarmServer.iby /epoc32/rom/include/alarmserver.iby +AlarmServer.iby CORE_MW_LAYER_IBY_EXPORT_PATH(alarmserver.iby) backup_registration.xml /epoc32/data/z/private/101f5027/backup_registration.xml backup_registration.xml /epoc32/release/winscw/udeb/z/private/101f5027/backup_registration.xml diff -r dcd4152cfe55 -r f5642d05cce0 contextframework/cfw/src/cfscriptengine/cfpersistentdata.cpp --- a/contextframework/cfw/src/cfscriptengine/cfpersistentdata.cpp Fri Sep 17 08:30:44 2010 +0300 +++ b/contextframework/cfw/src/cfscriptengine/cfpersistentdata.cpp Mon Oct 04 00:28:21 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2007 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -183,7 +183,7 @@ { FUNC_LOG; - for (TInt i = iPendingTasks.Count(); i > 0; i--) + for (TInt i = iPendingTasks.Count()-1; i >= 0; i--) { CCFPendingPersistencyTask* iTask = iPendingTasks[i]; if ( iTask->Mode() == CCFPendingPersistencyTask::EStore ) diff -r dcd4152cfe55 -r f5642d05cce0 contextframework/cfw/tsrc/public/basic/group/bld.inf --- a/contextframework/cfw/tsrc/public/basic/group/bld.inf Fri Sep 17 08:30:44 2010 +0300 +++ b/contextframework/cfw/tsrc/public/basic/group/bld.inf Mon Oct 04 00:28:21 2010 +0300 @@ -39,7 +39,7 @@ ../data/testsettings/10282BDA.txt\ /epoc32/data/z/private/10202be9/10282BDA.txt ../data/testsettings/10282BDA.txt\ - /epoc32/release/winscw/udeb/Z/private/10202be9/10282BDA.txt + /epoc32/release/winscw/udeb/z/private/10202be9/10282BDA.txt ../data/testsettings/testcontextsourcesetting1.xml\ /epoc32/data/z/private/10282BC4/Settings/10002001/testcontextsourcesetting1.xml diff -r dcd4152cfe55 -r f5642d05cce0 coreapplicationuis/DbRecovery/Src/CDbRecovery.cpp --- a/coreapplicationuis/DbRecovery/Src/CDbRecovery.cpp Fri Sep 17 08:30:44 2010 +0300 +++ b/coreapplicationuis/DbRecovery/Src/CDbRecovery.cpp Mon Oct 04 00:28:21 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -350,7 +350,7 @@ static void PrepareRecoveryL() { // Rename thread - ignore error - User().RenameThread( KDbRecoveryThreadName ); + User::RenameThread( KDbRecoveryThreadName ); CActiveScheduler* scheduler = new(ELeave) CActiveScheduler(); CleanupStack::PushL(scheduler); diff -r dcd4152cfe55 -r f5642d05cce0 coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/bld.inf --- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/bld.inf Fri Sep 17 08:30:44 2010 +0300 +++ b/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/bld.inf Mon Oct 04 00:28:21 2010 +0300 @@ -25,7 +25,7 @@ ../rom/rfscustcmdtest.iby CORE_OS_LAYER_IBY_EXPORT_PATH( rfscustcmdtest.iby ) ../data/excludelist.txt /epoc32/release/winscw/udeb/z/private/100059C9/excludelist.txt ../data/excludelist.txt /epoc32/release/winscw/urel/z/private/100059C9/excludelist.txt -../data/excludelist.txt /epoc32/data/Z/private/100059C9/excludelist.txt +../data/excludelist.txt /epoc32/data/z/private/100059C9/excludelist.txt // Export file for emulator. For HW file come from pkg ../init/rfscustcmdtest.ini /epoc32/winscw/c/testframework/rfscustcmdtest.ini diff -r dcd4152cfe55 -r f5642d05cce0 coreapplicationuis/Rfs/src/rfsCommand.cpp --- a/coreapplicationuis/Rfs/src/rfsCommand.cpp Fri Sep 17 08:30:44 2010 +0300 +++ b/coreapplicationuis/Rfs/src/rfsCommand.cpp Mon Oct 04 00:28:21 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -302,8 +302,8 @@ TFindFile find( iServer->iFs ); CDir* files (NULL); - find.FindWildByPath( fileName, NULL, files ); - if ( files ) + TInt ret = find.FindWildByPath( fileName, NULL, files ); + if ((ret == KErrNone) && files ) { TRACES("CRfsCommand::ExecuteL(): Target file already exists "); return KErrNone; diff -r dcd4152cfe55 -r f5642d05cce0 coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepSilentModeObserver.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepSilentModeObserver.cpp Mon Oct 04 00:28:21 2010 +0300 @@ -0,0 +1,124 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: CSysApCenRepSilentModeObserver implementation. + * +*/ + + +// INCLUDE FILES +#include "SysApCenRepSilentModeObserver.h" +#include "SysApAppUi.h" +#include + +// ========================== MEMBER FUNCTIONS ================================ + +// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +CSysApCenRepSilentModeObserver* CSysApCenRepSilentModeObserver::NewL( ) + { + TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::NewL" ) ) ); + CSysApCenRepSilentModeObserver* self = new ( ELeave ) CSysApCenRepSilentModeObserver( ); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop(); //self + return self; + } + +// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +CSysApCenRepSilentModeObserver::CSysApCenRepSilentModeObserver( ) + { + TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::CSysApCenRepSilentModeObserver" ) ) ); + } + +// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +CSysApCenRepSilentModeObserver::~CSysApCenRepSilentModeObserver() + { + TRACES( RDebug::Print( _L("~CSysApCenRepSilentModeObserver") ) ); + if ( iSilentModeHandler ) + { + iSilentModeHandler->StopListening(); + } + delete iSilentModeHandler; + delete iSession; + } + +// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +void CSysApCenRepSilentModeObserver::ConstructL() + { + TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::ConstructL: trying CRepository::NewL( KCRUidBluetoothPowerState )") ) ); + iSession = CRepository::NewL( KCRUidProfileEngine ); + + iSilentModeHandler = + CCenRepNotifyHandler::NewL( *this, + *iSession, + CCenRepNotifyHandler::EIntKey, + KProEngSilenceMode ); + iSilentModeHandler->StartListeningL(); + } + +// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +void CSysApCenRepSilentModeObserver::HandleNotifyInt( TUint32 aId, TInt aNewValue ) + { + TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyInt(), aId=0x%x, aNewValue=%d" ), aId, aNewValue ) ); + + SilenceIndicatorL(aNewValue); + + } + +// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +void CSysApCenRepSilentModeObserver::HandleNotifyError( TUint32 /* aId */, TInt /* error */, CCenRepNotifyHandler* /* aHandler */ ) + { + TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyError()" ) ) ); + } + +// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +void CSysApCenRepSilentModeObserver::SilenceIndicatorL(TInt aValue) + { + TRACES( RDebug::Print( _L(" CSysApCenRepSilentModeObserver::SilenceIndicatorL" ))); + CHbIndicatorSymbian* indicator = CHbIndicatorSymbian::NewL(); + CleanupStack::PushL(indicator); + _LIT(KSilentmodeindicator,"com.nokia.hb.indicator.controlpanel.cpsilenceindicatorplugin/1.0"); + + + if (aValue) + { + TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyInt() activate silence indicator" ))); + // activate the indicator plugin to display the icon in status bar + indicator->Activate(KSilentmodeindicator); + } + else + { + TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyInt() Deactivate silence indicator" ))); + // deactivate the indicator plugin to remove the icon in the status bar + indicator->Deactivate(KSilentmodeindicator); + } + CleanupStack::PopAndDestroy(indicator); // indicator + } + + +// End of File + diff -r dcd4152cfe55 -r f5642d05cce0 coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepSilentModeObserver.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepSilentModeObserver.h Mon Oct 04 00:28:21 2010 +0300 @@ -0,0 +1,81 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: CSysApCenRepSilentModeObserver class definition. +* +*/ + + +#ifndef SYSAPCENREPSILENTMODEOBSERVER_H +#define SYSAPCENREPSILENTMODEOBSERVER_H + +// INCLUDES +#include +#include +#include "SysAp.hrh" +#include +#include + +// CLASS DECLARATION + + +class CSysApCenRepSilentModeObserver : public CBase, public MCenRepNotifyHandlerCallback + { + public: // Constructors and destructor + /** + * Default constructor + */ + static CSysApCenRepSilentModeObserver* NewL( ); + + /** + * Destructor. + */ + ~CSysApCenRepSilentModeObserver(); + + // From MCenRepNotifyHandlerCallback + void HandleNotifyInt( TUint32 aId, TInt aNewValue ); + void HandleNotifyError( TUint32 aId, TInt error, CCenRepNotifyHandler* aHandler ); + + private: + + /** + * @param None + * @return void + */ + void ConstructL( ); + + + /** + * C++ default constructor. + * @param None + * @return void + */ + CSysApCenRepSilentModeObserver(); + + + //To activate and Deactivate the indicator + void SilenceIndicatorL(TInt avalue); + + + + + private: + + CRepository* iSession; + //To listen to the silentmodekey + CCenRepNotifyHandler* iSilentModeHandler; + }; + +#endif // SYSAPCENREPSILENTMODEOBSERVER_H + +// End of File diff -r dcd4152cfe55 -r f5642d05cce0 coreapplicationuis/advancedtspcontroller/tsrc/stub/group/bld.inf --- a/coreapplicationuis/advancedtspcontroller/tsrc/stub/group/bld.inf Fri Sep 17 08:30:44 2010 +0300 +++ b/coreapplicationuis/advancedtspcontroller/tsrc/stub/group/bld.inf Mon Oct 04 00:28:21 2010 +0300 @@ -20,10 +20,10 @@ PRJ_TESTEXPORTS remconservercaps.mmh /epoc32/include/remcon/remconservercaps.mmh -../data/keyevent.rul /epoc32/data/Z/private/10282bc4/rules/keyevent.rul -../data/keyevent.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyevent.rul -../data/keyincall.rul /epoc32/data/Z/private/10282bc4/rules/keyincall.rul -../data/keyincall.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyincall.rul +../data/keyevent.rul /epoc32/data/z/private/10282bc4/rules/keyevent.rul +../data/keyevent.rul /epoc32/release/winscw/udeb/z/private/10282BC4/Rules/keyevent.rul +../data/keyincall.rul /epoc32/data/z/private/10282bc4/rules/keyincall.rul +../data/keyincall.rul /epoc32/release/winscw/udeb/z/private/10282BC4/Rules/keyincall.rul PRJ_TESTMMPFILES ../../../group/RemConTspController.mmp \ No newline at end of file diff -r dcd4152cfe55 -r f5642d05cce0 coreapplicationuis/hbdeviceinputdialogplugin/src/hbdeviceinputdialogwidget.cpp --- a/coreapplicationuis/hbdeviceinputdialogplugin/src/hbdeviceinputdialogwidget.cpp Fri Sep 17 08:30:44 2010 +0300 +++ b/coreapplicationuis/hbdeviceinputdialogplugin/src/hbdeviceinputdialogwidget.cpp Mon Oct 04 00:28:21 2010 +0300 @@ -42,6 +42,8 @@ { //Translator loaded succesfully then olny construct widgets constructDialog(parameters); + this->actions()[0]->setEnabled(true); + if (!mPrimaryAction) { // If default button provided by HbInputDialog is used, connect into its triggered signal. QAction *action = /*primaryAction()*/this->actions().first(); diff -r dcd4152cfe55 -r f5642d05cce0 coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/bld.inf --- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/bld.inf Fri Sep 17 08:30:44 2010 +0300 +++ b/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/bld.inf Mon Oct 04 00:28:21 2010 +0300 @@ -64,20 +64,20 @@ ../data/testspec_015.txt /epoc32/winscw/c/testdata/testspec_015.txt // Application specific exclude list(s) exported to rom drive -../data/app_spec_rom_001.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_001.exc +../data/app_spec_rom_001.exc /epoc32/data/z/private/102073ea/excludes/app_spec_001.exc ../data/app_spec_rom_001.exc /epoc32/release/winscw/udeb/z/private/102073ea/excludes/app_spec_001.exc ../data/app_spec_rom_001.exc /epoc32/release/winscw/urel/z/private/102073ea/excludes/app_spec_001.exc -../data/app_spec_rom_002.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_002.exc +../data/app_spec_rom_002.exc /epoc32/data/z/private/102073ea/excludes/app_spec_002.exc ../data/app_spec_rom_002.exc /epoc32/release/winscw/udeb/z/private/102073ea/excludes/app_spec_002.exc ../data/app_spec_rom_002.exc /epoc32/release/winscw/urel/z/private/102073ea/excludes/app_spec_002.exc -../data/app_spec_rom_dummy.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_dummy.exc +../data/app_spec_rom_dummy.exc /epoc32/data/z/private/102073ea/excludes/app_spec_dummy.exc ../data/app_spec_rom_dummy.exc /epoc32/release/winscw/udeb/z/private/102073ea/excludes/app_spec_dummy.exc ../data/app_spec_rom_dummy.exc /epoc32/release/winscw/urel/z/private/102073ea/excludes/app_spec_dummy.exc -../data/app_spec_003.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_003.exc -../data/app_spec_004.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_004.exc -../data/app_spec_005.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_005.exc -../data/app_spec_006.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_006.exc -../data/app_spec_007.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_007.exc +../data/app_spec_003.exc /epoc32/data/z/private/102073ea/excludes/app_spec_003.exc +../data/app_spec_004.exc /epoc32/data/z/private/102073ea/excludes/app_spec_004.exc +../data/app_spec_005.exc /epoc32/data/z/private/102073ea/excludes/app_spec_005.exc +../data/app_spec_006.exc /epoc32/data/z/private/102073ea/excludes/app_spec_006.exc +../data/app_spec_007.exc /epoc32/data/z/private/102073ea/excludes/app_spec_007.exc // Application specific test specs and exclude lists diff -r dcd4152cfe55 -r f5642d05cce0 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/bld.inf --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/bld.inf Fri Sep 17 08:30:44 2010 +0300 +++ b/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/bld.inf Mon Oct 04 00:28:21 2010 +0300 @@ -28,7 +28,7 @@ ../sensordatacompensationdevice.rul /epoc32/data/z/private/10282bc4/rules/sensordatacompensationdevice.rul // context source setting for test ps keys -../101FB3E7.xml /epoc32/data/Z/private/10282BC4/Settings/10282C74/101FB3E7.xml +../101FB3E7.xml /epoc32/data/z/private/10282BC4/Settings/10282C74/101FB3E7.xml // Iby export ../../rom/sensordatacontrollerplgtest.iby CORE_MW_LAYER_IBY_EXPORT_PATH( sensordatacontrollerplgtest.iby ) diff -r dcd4152cfe55 -r f5642d05cce0 coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/bld.inf --- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/bld.inf Fri Sep 17 08:30:44 2010 +0300 +++ b/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/bld.inf Mon Oct 04 00:28:21 2010 +0300 @@ -27,14 +27,14 @@ ../conf/sensordatacompensatorplgtest.cfg /epoc32/winscw/c/TestFramework/sensordatacompensatorplgtest.cfg // Rule files -../data/sensordatacompensationui.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationui.rul -../data/sensordatacompensationui.rul /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationui.rul -../data/sensordatacompensationdevice.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationdevice.rul -../data/sensordatacompensationdevice.rul /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationdevice.rul +../data/sensordatacompensationui.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationui.rul +../data/sensordatacompensationui.rul /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationui.rul +../data/sensordatacompensationdevice.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationdevice.rul +../data/sensordatacompensationdevice.rul /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationdevice.rul // context source setting for test ps keys -../data/101FB3E7.xml /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Settings/10282C74/101FB3E7.xml -../data/101FB3E7.xml /epoc32/RELEASE/winscw/UREL/Z/private/10282BC4/Settings/10282C74/101FB3E7.xml +../data/101FB3E7.xml /epoc32/release/winscw/udeb/z/private/10282BC4/Settings/10282C74/101FB3E7.xml +../data/101FB3E7.xml /epoc32/release/winscw/urel/z/private/10282BC4/Settings/10282C74/101FB3E7.xml PRJ_TESTMMPFILES sensordatacompensatorplgtest.mmp diff -r dcd4152cfe55 -r f5642d05cce0 layers.sysdef.xml --- a/layers.sysdef.xml Fri Sep 17 08:30:44 2010 +0300 +++ b/layers.sysdef.xml Mon Oct 04 00:28:21 2010 +0300 @@ -10,10 +10,28 @@ - + - + + + + + + + + + + + + + + + + + + + diff -r dcd4152cfe55 -r f5642d05cce0 package_definition.xml --- a/package_definition.xml Fri Sep 17 08:30:44 2010 +0300 +++ b/package_definition.xml Mon Oct 04 00:28:21 2010 +0300 @@ -1,154 +1,157 @@ + + Nokia + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -156,127 +159,127 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -293,23 +296,23 @@ - + - + - + - + - + @@ -325,20 +328,20 @@ - + - + - + - + diff -r dcd4152cfe55 -r f5642d05cce0 printingsupport/printinguisupport/group/BLD.INF --- a/printingsupport/printinguisupport/group/BLD.INF Fri Sep 17 08:30:44 2010 +0300 +++ b/printingsupport/printinguisupport/group/BLD.INF Mon Oct 04 00:28:21 2010 +0300 @@ -39,7 +39,7 @@ ../inc/prnpath.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(printinguisupport/prnpath.h) ../inc/PRNUIDS.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(prnuids.h) -../group/print.iby /epoc32/rom/include/print.iby +../group/print.iby CORE_MW_LAYER_IBY_EXPORT_PATH(print.iby) PRJ_MMPFILES // specify the .mmp files required for building the important component releasables diff -r dcd4152cfe55 -r f5642d05cce0 startupservices/SplashScreen/inc/SplashScreen.h --- a/startupservices/SplashScreen/inc/SplashScreen.h Fri Sep 17 08:30:44 2010 +0300 +++ b/startupservices/SplashScreen/inc/SplashScreen.h Mon Oct 04 00:28:21 2010 +0300 @@ -155,7 +155,7 @@ CMainWindow (CWsClient* aClient); ~CMainWindow (); void Draw (const TRect& aRect); - CFbsBitmap* ReadSVGL (TFileName aFileName); + CFbsBitmap* ReadSVGL (const TFileName& aFileName); void HandlePointerEvent (TPointerEvent& aPointerEvent); void ConstructL (const TRect& aRect, CWindow* aParent=0); private: diff -r dcd4152cfe55 -r f5642d05cce0 startupservices/SplashScreen/src/SplashScreen.cpp --- a/startupservices/SplashScreen/src/SplashScreen.cpp Fri Sep 17 08:30:44 2010 +0300 +++ b/startupservices/SplashScreen/src/SplashScreen.cpp Mon Oct 04 00:28:21 2010 +0300 @@ -331,7 +331,7 @@ TRACES("CMainWindow::~CMainWindow(): End"); } -CFbsBitmap* CMainWindow::ReadSVGL (TFileName aFileName) +CFbsBitmap* CMainWindow::ReadSVGL (const TFileName& aFileName) { TRACES("CMainWindow::ReadSVGL(): Start"); TFontSpec fontspec; diff -r dcd4152cfe55 -r f5642d05cce0 sysresmonitoring/oommonitor/group/bld.inf --- a/sysresmonitoring/oommonitor/group/bld.inf Fri Sep 17 08:30:44 2010 +0300 +++ b/sysresmonitoring/oommonitor/group/bld.inf Mon Oct 04 00:28:21 2010 +0300 @@ -23,9 +23,9 @@ PRJ_EXPORTS ../rom/oommonitor.iby CORE_MW_LAYER_IBY_EXPORT_PATH(oommonitor.iby) -../data/oomconfig.xml /epoc32/RELEASE/winscw/UDEB/Z/private/10207218/oomconfig.xml -../data/oomconfig.xml /epoc32/RELEASE/winscw/UREL/Z/private/10207218/oomconfig.xml -../data/oomconfig.xml /epoc32/data/Z/private/10207218/oomconfig.xml +../data/oomconfig.xml /epoc32/release/winscw/udeb/z/private/10207218/oomconfig.xml +../data/oomconfig.xml /epoc32/release/winscw/urel/z/private/10207218/oomconfig.xml +../data/oomconfig.xml /epoc32/data/z/private/10207218/oomconfig.xml PRJ_MMPFILES oommonitor.mmp diff -r dcd4152cfe55 -r f5642d05cce0 sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf --- a/sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf Fri Sep 17 08:30:44 2010 +0300 +++ b/sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf Mon Oct 04 00:28:21 2010 +0300 @@ -21,7 +21,7 @@ DEFAULT PRJ_TESTEXPORTS -../../data/oomconfig.xml /epoc32/data/Z/private/10207218/oomconfig.xml +../../data/oomconfig.xml /epoc32/data/z/private/10207218/oomconfig.xml PRJ_TESTMMPFILES diff -r dcd4152cfe55 -r f5642d05cce0 systemsettings/accindicatorplugin/inc/accindicator.h --- a/systemsettings/accindicatorplugin/inc/accindicator.h Fri Sep 17 08:30:44 2010 +0300 +++ b/systemsettings/accindicatorplugin/inc/accindicator.h Mon Oct 04 00:28:21 2010 +0300 @@ -62,15 +62,11 @@ private: QString mDisplayName; - QProcess mProcess; TAccMode mAccMode; int mAccType; QStringList mIndicatorTypes; QStringList mArgs; -private slots: - void processError(QProcess::ProcessError err); // handler for error codes - private: Q_DISABLE_COPY(AccIndicatorPlugin) int mError; diff -r dcd4152cfe55 -r f5642d05cce0 systemsettings/accindicatorplugin/src/accindicator.cpp --- a/systemsettings/accindicatorplugin/src/accindicator.cpp Fri Sep 17 08:30:44 2010 +0300 +++ b/systemsettings/accindicatorplugin/src/accindicator.cpp Mon Oct 04 00:28:21 2010 +0300 @@ -96,8 +96,6 @@ // If it is 3-pole ( i.e., HeadSet or TTY ) and TV-Out enable the handleInteraction() to change the settings. if(mAccMode == EAccModeWiredHeadset || mAccMode == EAccModeWirelessHeadset || mAccMode == EAccModeTextDevice || mAccMode == EAccModeTVOut ) { - QObject::connect( &mProcess, SIGNAL(error(QProcess::ProcessError)), - this, SLOT(processError(QProcess::ProcessError))); QVariant mode,type; mode.setValue((int)mAccMode); @@ -106,7 +104,8 @@ mArgs.append(type.toString()); // Launch the process to show the view. - mProcess.start("accindicatorsettings" , mArgs); + QString program("z://sys//bin//accindicatorsettings.exe"); + QProcess::startDetached(program,mArgs); handled = true; } } @@ -128,7 +127,7 @@ return type; } //for displaying the icon in indicator. - case MonoDecorationNameRole: + case DecorationNameRole: { QString iconName; if(mAccType == KPCWired || mAccType == KPCUSB) @@ -228,23 +227,3 @@ mDisplayName.append(QString("Unknown")); } } - -// ---------------------------------------------------------------------------- -// AccIndicator::processError -// handle the error conditions reurned by the QProcess. -// ---------------------------------------------------------------------------- - -void AccIndicatorPlugin::processError(QProcess::ProcessError err) - { - switch (err) { - case QProcess::FailedToStart: - case QProcess::Crashed: - case QProcess::Timedout: - case QProcess::ReadError: - case QProcess::WriteError: - case QProcess::UnknownError: - break; - default: - break; - } - } diff -r dcd4152cfe55 -r f5642d05cce0 tzservices/tzlocrscfactory/res/timezonegroups.rss --- a/tzservices/tzlocrscfactory/res/timezonegroups.rss Fri Sep 17 08:30:44 2010 +0300 +++ b/tzservices/tzlocrscfactory/res/timezonegroups.rss Mon Oct 04 00:28:21 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -82,4 +82,4 @@ { city_group_id = 12; city_group_name = STRING_city_group_name_12; - } \ No newline at end of file + }