--- a/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp Thu Jul 01 11:20:10 2010 +0300
+++ b/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp Fri Jul 16 11:04:43 2010 +0300
@@ -453,7 +453,7 @@
void CAccSrvConnectionController::HandleConnectionUpdateValidationL(
const TAccPolGenericID& aGenericID,
TAccPolGenericID& aOldGenericId,
- const CAccSrvSettingsHandler* aCaller,
+ const CAccSrvSettingsHandler* /*aCaller*/,
TInt aError )
{
COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::HandleConnectionUpdateValidationL()" );
--- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp Thu Jul 01 11:20:10 2010 +0300
+++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/edidhandler.cpp Fri Jul 16 11:04:43 2010 +0300
@@ -542,7 +542,6 @@
INFO_1( "Updating the Rawdata for the Block %d...", iCurrentBlock );
iEdidParserPtr->UpdateRawDataL(dataBlockDes);
- iCurrentBlock++;
if( inbrOfExtensions >= 2 )
{
inbrOfExtensions = inbrOfExtensions - 2;
@@ -555,6 +554,7 @@
if( inbrOfExtensions )
{
+ iCurrentBlock++;
iRetryCounter = KErrNone;
if( ReadEDIDDataL() != KErrNone )
@@ -587,12 +587,11 @@
}
}
}
+ TRACE_EDID_DATA( *iEdidParserPtr );
+
+ iFSM.Input( EPDEIfEDIDHandler, EPDEIfEDIDHandlerEventEdidDataFetched );
+ iRetryCounter = KErrNone;
}
-
- TRACE_EDID_DATA( *iEdidParserPtr );
-
- iFSM.Input( EPDEIfEDIDHandler, EPDEIfEDIDHandlerEventEdidDataFetched );
- iRetryCounter = KErrNone;
}
else
{
@@ -637,7 +636,7 @@
// RunL
//------------------------------------------------------------------------------
//
-TInt CEDIDHandler::RunError( TInt aError )
+TInt CEDIDHandler::RunError( TInt /*aError*/ )
{
FUNC_LOG;
--- a/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/tvoutconfigforhdmi.cpp Thu Jul 01 11:20:10 2010 +0300
+++ b/accessoryservices/pluggeddisplay/pluggeddisplayengine/src/tvoutconfigforhdmi.cpp Fri Jul 16 11:04:43 2010 +0300
@@ -645,7 +645,7 @@
//
// ----------------------------------------------------------------------------
//
-TInt CTVOutConfigForHDMI::RunError( TInt aError )
+TInt CTVOutConfigForHDMI::RunError( TInt /*aError*/ )
{
FUNC_LOG;
--- a/resourceinterfaces/fmtransmittercontrol/src/HWRMFmTxStatusObserver.cpp Thu Jul 01 11:20:10 2010 +0300
+++ b/resourceinterfaces/fmtransmittercontrol/src/HWRMFmTxStatusObserver.cpp Fri Jul 16 11:04:43 2010 +0300
@@ -203,20 +203,7 @@
// -----------------------------------------------------------------------------
//
TFmTxState CHWRMFmTxStatusObserver::Status()
- {
- COMPONENT_TRACE1( _L( "HWRM FM Tx Client - CHWRMFmTxStatusObserver::Status()" ));
-
- TInt value(EFmTxStateUnknown);
-
- TInt err = RProperty::Get(KPSUidHWRMFmTx, KHWRMFmTxStatus, value);
-
- if ( err == KErrNone )
- {
- COMPONENT_TRACE1( _L( "HWRM FM Tx Client - CHWRMFmTxStatusObserver::Status - RPropert::Get ok" ) );
-
- iFmTxState = static_cast<TFmTxState>(value);
- }
-
+ {
COMPONENT_TRACE2( _L( "HWRM FM Tx Client - CHWRMFmTxStatusObserver::Status - return 0x%x" ), iFmTxState );
return iFmTxState;
--- a/resourcemgmt/hwresourcesmgr/power/inc/HWRMPower.h Thu Jul 01 11:20:10 2010 +0300
+++ b/resourcemgmt/hwresourcesmgr/power/inc/HWRMPower.h Fri Jul 16 11:04:43 2010 +0300
@@ -62,9 +62,20 @@
* User::WaitForRequest(status);
* User::LeaveIfError(status.Int());
*
-* // Start receiving periodical voltage measurements.
+* // Start receiving periodical power measurements.
+* //
+* // Note: There is a maximum reporting period defined for each product through the
+* // CenRep Key KPowerMaxReportingPeriod defined in HWRMPowerDomainCRKeys.h.
+* // The reporting will stop after this maximum reporting period by default.
+* // The application can configure this dynamically.
+* // Setting maximum report period to zero results in infinite notifications.
+* //
* TRequestStatus& statusStart;
-* TIntervalMultiple intervalMultiple = EThreeTimesBaseTimeInterval;
+* TInt intervalMultiple = 3; // Three times the base time interval.
+* //
+* // Note: The base time interval is different for each product.
+* // GetBaseTimeIntervalL API returns this value.
+* //
* power->StartAverageVoltageReporting(statusStart, intervalMultiple);
*
* User::WaitForRequest(statusStart);
--- a/resourcemgmt/powerandmemorynotificationservice/group/bld.inf Thu Jul 01 11:20:10 2010 +0300
+++ b/resourcemgmt/powerandmemorynotificationservice/group/bld.inf Fri Jul 16 11:04:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -49,6 +49,7 @@
../group/PwrCliTests.bat /epoc32/data/z/system/test/pwrclitests.bat
#ifdef SYSLIBS_TEST
../group/PwrCliTest.iby /epoc32/rom/include/pwrclitest.iby
+../inc/e32consf.h /epoc32/include/e32consf.h
#endif
PRJ_TESTMMPFILES
--- a/resourcemgmt/powerandmemorynotificationservice/group/t_pwrbasic.mmp Thu Jul 01 11:20:10 2010 +0300
+++ b/resourcemgmt/powerandmemorynotificationservice/group/t_pwrbasic.mmp Fri Jul 16 11:04:43 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"
@@ -29,6 +29,8 @@
SOURCE t_pwrbasic.cpp
LIBRARY euser.lib
-LIBRARY powermgrcli.lib
+LIBRARY powermgrcli.lib
+LIBRARY efsrv.lib
+LIBRARY charconv.lib
SMPSAFE
--- a/resourcemgmt/powerandmemorynotificationservice/group/t_pwroffevents.mmp Thu Jul 01 11:20:10 2010 +0300
+++ b/resourcemgmt/powerandmemorynotificationservice/group/t_pwroffevents.mmp Fri Jul 16 11:04:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 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"
@@ -41,6 +41,7 @@
#if defined (SYMBIAN_SSM_GRACEFUL_SHUTDOWN)
LIBRARY ssmcmn.lib estor.lib
#endif
+LIBRARY charconv.lib
SMPSAFE
--- a/resourcemgmt/powerandmemorynotificationservice/group/t_shutdownserver.mmp Thu Jul 01 11:20:10 2010 +0300
+++ b/resourcemgmt/powerandmemorynotificationservice/group/t_shutdownserver.mmp Fri Jul 16 11:04:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -42,6 +42,7 @@
#if defined (SYMBIAN_SSM_GRACEFUL_SHUTDOWN)
LIBRARY ssmcmn.lib estor.lib
#endif
+LIBRARY charconv.lib
SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/resourcemgmt/powerandmemorynotificationservice/inc/e32consf.h Fri Jul 16 11:04:43 2010 +0300
@@ -0,0 +1,163 @@
+// Copyright (c) 2009-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:
+//
+
+#ifndef __E32CONSF_H__
+#define __E32CONSF_H__
+
+#include <e32std.h>
+#include <e32cons.h>
+#include <e32test.h>
+#include <f32file.h>
+
+#include <utf.h>
+
+class CConsoleFile: public CConsoleBase
+ {
+public:
+ static CConsoleFile* New(const TDesC& aLogFileName)
+ {
+ CConsoleFile* self = new CConsoleFile();
+ if (self)
+ {
+ if (self->Construct(aLogFileName))
+ {
+ delete self;
+ self = NULL;
+ }
+ }
+ return self;
+ }
+
+ virtual ~CConsoleFile()
+ {
+ iFile.Close();
+ iFs.Close();
+ }
+
+private:
+ CConsoleFile()
+ :CConsoleBase()
+ {
+ }
+
+ TInt Construct(const TDesC& aLogFileName)
+ {
+ TInt err=iFs.Connect();
+ if (!err)
+ {
+ (void)iFs.MkDirAll(aLogFileName);
+ if (iFile.Replace(iFs, aLogFileName, EFileShareExclusive | EFileWrite))
+ {
+ err=iFile.Create(iFs, aLogFileName, EFileShareExclusive | EFileWrite);
+ }
+ }
+ return err;
+ }
+
+ void DoWriteL(const TDesC &aDes)
+ {
+ HBufC8* outBuf = CnvUtfConverter::ConvertFromUnicodeToUtf8L(aDes);
+ (void)iFile.Write(*outBuf);
+ delete outBuf;
+ }
+
+private: // CConsoleBase
+ virtual TInt Create(const TDesC& /*aTitle*/,TSize /*aSize*/)
+ {
+ return KErrNone;
+ }
+
+ virtual void Read(TRequestStatus& aStatus)
+ {
+ TRequestStatus* status = &aStatus;
+ User::RequestComplete(status, (TInt)EKeyNull);
+ }
+
+ virtual void ReadCancel()
+ {
+ }
+
+ virtual void Write(const TDesC &aDes)
+ {
+ // so that RTest::Title can be called before the TrapHandler has been created
+ CTrapCleanup* tc = NULL;
+ if (!User::TrapHandler())
+ {
+ tc = CTrapCleanup::New();
+ }
+ TRAP_IGNORE(DoWriteL(aDes));
+ delete tc;
+ }
+
+ virtual TPoint CursorPos() const
+ {
+ return TPoint(0,0);
+ }
+
+ virtual void SetCursorPosAbs(const TPoint& /*aPoint*/)
+ {
+ }
+
+ virtual void SetCursorPosRel(const TPoint& /*aPoint*/)
+ {
+ }
+
+ virtual void SetCursorHeight(TInt /*aPercentage*/)
+ {
+ }
+
+ virtual void SetTitle(const TDesC& /*aTitle*/)
+ {
+ }
+
+ virtual void ClearScreen()
+ {
+ }
+
+ virtual void ClearToEndOfLine()
+ {
+ }
+
+ virtual TSize ScreenSize() const
+ {
+ return TSize(0,0);
+ }
+
+ virtual TKeyCode KeyCode() const
+ {
+ return EKeyNull;
+ }
+
+ virtual TUint KeyModifiers() const
+ {
+ return 0;
+ }
+
+private:
+ RFs iFs;
+ RFile iFile;
+ };
+
+void LogRTestToFile(RTest& aTest)
+ {
+ RProcess myProcess;
+ TParsePtrC parsePtr(myProcess.FileName());
+ TFileName logFileName;
+ TPtrC fileNameWithoutExtension = parsePtr.Name();
+ logFileName.Format(_L("c:\\logs\\testexecute\\%S.htm"), &fileNameWithoutExtension);
+ aTest.SetConsole(CConsoleFile::New(logFileName)); // SMH - Setting NULL console is OK
+ }
+
+#endif // __E32CONSF_H__
--- a/resourcemgmt/powerandmemorynotificationservice/tsrc/t_pwrbasic.cpp Thu Jul 01 11:20:10 2010 +0300
+++ b/resourcemgmt/powerandmemorynotificationservice/tsrc/t_pwrbasic.cpp Fri Jul 16 11:04:43 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"
@@ -19,6 +19,7 @@
#include <e32test.h> //RTest
#include <e32svr.h> //RDebug
#include <savenotf.h> //RSaveSession, MSaveObserver, CSaveNotifier
+#include <e32consf.h> //for logging to file
static RTest TheTest(_L("T_PwrBasic"));
const TInt KOneSec = 1000000;
@@ -447,6 +448,8 @@
TInt E32Main()
{
+ LogRTestToFile(TheTest);
+ TheTest.Title();
__UHEAP_MARK;
CTrapCleanup* tc = CTrapCleanup::New();
TEST(tc != NULL);
--- a/resourcemgmt/powerandmemorynotificationservice/tsrc/t_pwroffevents.cpp Thu Jul 01 11:20:10 2010 +0300
+++ b/resourcemgmt/powerandmemorynotificationservice/tsrc/t_pwroffevents.cpp Fri Jul 16 11:04:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 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"
@@ -18,6 +18,7 @@
#include <e32test.h> //RTest
#include <e32svr.h> //RDebug
#include <savenotf.h> //RSaveSession, MSaveObserver, CSaveNotifier
+#include <e32consf.h> //for logging to file
#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
#include <shutdownsrv.h> //CServShutdownServer
#else //SYMBIAN_ENABLE_SPLIT_HEADERS
@@ -288,6 +289,8 @@
TInt E32Main()
{
+ LogRTestToFile(TheTest);
+ TheTest.Title();
__UHEAP_MARK;
CTrapCleanup* tc = CTrapCleanup::New();
TEST(tc != NULL);
--- a/resourcemgmt/powerandmemorynotificationservice/tsrc/t_shutdownserver.cpp Thu Jul 01 11:20:10 2010 +0300
+++ b/resourcemgmt/powerandmemorynotificationservice/tsrc/t_shutdownserver.cpp Fri Jul 16 11:04:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -16,6 +16,7 @@
#include <e32test.h> //RTest
#include <e32svr.h> //RDebug
#include <savenotf.h> //RSaveSession, MSaveObserver, CSaveNotifier
+#include <e32consf.h> //for logging to file
#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
#include <shutdownsrv.h> //CServShutdownServer
#else //SYMBIAN_ENABLE_SPLIT_HEADERS
@@ -294,6 +295,8 @@
TInt E32Main()
{
+ LogRTestToFile(TheTest);
+ TheTest.Title();
CTrapCleanup* tc = CTrapCleanup::New();
TEST(tc != NULL);
--- a/sensorservices/tiltcompensationssy/src/tcstatetiltlistendata.cpp Thu Jul 01 11:20:10 2010 +0300
+++ b/sensorservices/tiltcompensationssy/src/tcstatetiltlistendata.cpp Fri Jul 16 11:04:43 2010 +0300
@@ -471,6 +471,11 @@
// Reset state
ResetState( ETrue );
}
+ else
+ {
+ if( iTimerToSend )
+ iTimerToSend->Start();
+ }
}
// ----------------------------------------------------------------------------------
--- a/sysstatemgmt/group/bld.inf Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/group/bld.inf Fri Jul 16 11:04:43 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -24,6 +24,9 @@
PRJ_MMPFILES
+#include "../systemstatemgr/group/bld.inf"
+#include "../systemstatereferenceplugins/group/bld.inf"
+#include "../systemstateplugins/group/bld.inf"
#include "../ssmmapperutility/group/bld.inf"
#include "../ssmpolicyplugins/group/bld.inf"
#include "../ssmutilityplugins/group/bld.inf"
@@ -32,9 +35,6 @@
#include "../syslangutil/group/bld.inf"
#include "../sysrestart/group/bld.inf"
#include "../systemstarter/group/bld.inf"
-#include "../systemstatemgr/group/bld.inf"
-#include "../systemstatereferenceplugins/group/bld.inf"
-#include "../systemstateplugins/group/bld.inf"
#include "../sysuiprovider/group/bld.inf"
--- a/sysstatemgmt/ssmpolicyplugins/ssmfailpolicy/src/ssmfailpolicy.cpp Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/ssmpolicyplugins/ssmfailpolicy/src/ssmfailpolicy.cpp Fri Jul 16 11:04:43 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -60,7 +60,7 @@
// ---------------------------------------------------------------------------
//
TBool CSsmFailPolicy::GetNextState(
- TSsmState aCurrentTransition,
+ TSsmState INFO_PARAM( aCurrentTransition ),
TInt /*aReason*/,
TInt ERROR_PARAM( aError ),
TInt ERROR_PARAM( aSeverity ),
--- a/sysstatemgmt/syslangutil/ssmlangselcmd/src/ssmlangselcmd.cpp Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/syslangutil/ssmlangselcmd/src/ssmlangselcmd.cpp Fri Jul 16 11:04:43 2010 +0300
@@ -401,7 +401,8 @@
{
TBool isValid( EFalse );
//Validate and get the selected settings
- TRAPD( errorCode, isValid = ValidateAndGetSettingsL( aLastSelectedLang, aLastSelectedRegion, aLastSelectedCollation ) );
+ TInt errorCode = KErrNone;
+ TRAP( errorCode, isValid = ValidateAndGetSettingsL( aLastSelectedLang, aLastSelectedRegion, aLastSelectedCollation ) );
ERROR_1( errorCode, "Validation failed for the selected Language, region and Collation with error %d", errorCode );
return isValid;
}
--- a/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappgood.mmp Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappgood.mmp Fri Jul 16 11:04:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 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"
@@ -27,7 +27,6 @@
USERINCLUDE ../inc
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-//SYSTEMINCLUDE /epoc32/include/techview
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib
--- a/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappnorv.mmp Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappnorv.mmp Fri Jul 16 11:04:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 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"
@@ -25,7 +25,6 @@
USERINCLUDE .
USERINCLUDE ../inc
-//SYSTEMINCLUDE /epoc32/include/techview
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
--- a/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapppanic.mmp Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapppanic.mmp Fri Jul 16 11:04:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 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"
@@ -25,7 +25,6 @@
USERINCLUDE .
USERINCLUDE ../inc
-//SYSTEMINCLUDE /epoc32/include/techview
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
--- a/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapppaniczero.mmp Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapppaniczero.mmp Fri Jul 16 11:04:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 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"
@@ -25,7 +25,6 @@
USERINCLUDE .
USERINCLUDE ../inc
-//SYSTEMINCLUDE /epoc32/include/techview
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
--- a/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapprvafterretry.mmp Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapprvafterretry.mmp Fri Jul 16 11:04:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 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"
@@ -26,7 +26,6 @@
USERINCLUDE ../inc
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-//SYSTEMINCLUDE /epoc32/include/techview
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib
--- a/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapprverror.mmp Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestapprverror.mmp Fri Jul 16 11:04:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 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"
@@ -25,7 +25,6 @@
USERINCLUDE .
USERINCLUDE ../inc
-//SYSTEMINCLUDE /epoc32/include/techview
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
--- a/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappslow.mmp Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/group/ssmtestappslow.mmp Fri Jul 16 11:04:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 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"
@@ -28,7 +28,6 @@
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
MW_LAYER_SYSTEMINCLUDE
-//SYSTEMINCLUDE /epoc32/include/techview
LIBRARY euser.lib
LIBRARY apparc.lib
--- a/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappgood.rss Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappgood.rss Fri Jul 16 11:04:43 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"
--- a/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappnorv.rss Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappnorv.rss Fri Jul 16 11:04:43 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"
--- a/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapppanic.rss Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapppanic.rss Fri Jul 16 11:04:43 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"
--- a/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapppaniczero.rss Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapppaniczero.rss Fri Jul 16 11:04:43 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"
--- a/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapprvafterretry.rss Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapprvafterretry.rss Fri Jul 16 11:04:43 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"
--- a/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapprverror.rss Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestapprverror.rss Fri Jul 16 11:04:43 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"
--- a/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappslow.rss Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/test/testapps/src/ssmtestappslow.rss Fri Jul 16 11:04:43 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"
--- a/sysstatemgmt/systemstateplugins/test/testapps/group/gsatestappgood.mmp Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/test/testapps/group/gsatestappgood.mmp Fri Jul 16 11:04:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 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"
@@ -28,7 +28,6 @@
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
MW_LAYER_SYSTEMINCLUDE
-//SYSTEMINCLUDE /epoc32/include/techview
LIBRARY euser.lib
LIBRARY apparc.lib
--- a/sysstatemgmt/systemstateplugins/test/testapps/src/gsatestappgood_reg.rss Thu Jul 01 11:20:10 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/test/testapps/src/gsatestappgood_reg.rss Fri Jul 16 11:04:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 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"