--- a/appfw/apparchitecture/group/app-framework_apparc.mrp Thu May 27 13:01:09 2010 +0300
+++ b/appfw/apparchitecture/group/app-framework_apparc.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-framework_apparc
source \sf\mw\appsupport\appfw\apparchitecture
binary \sf\mw\appsupport\appfw\apparchitecture\group all
--- a/appfw/uiftestfw/group/app-framework_testframework.mrp Thu May 27 13:01:09 2010 +0300
+++ b/appfw/uiftestfw/group/app-framework_testframework.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-framework_testframework
source \sf\mw\appsupport\appfw\uiftestfw
--- a/appfw/viewserver/group/app-framework_viewsrv.mrp Thu May 27 13:01:09 2010 +0300
+++ b/appfw/viewserver/group/app-framework_viewsrv.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-framework_viewsrv
source \sf\mw\appsupport\appfw\viewserver
binary \sf\mw\appsupport\appfw\viewserver\group all
--- a/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp Thu May 27 13:01:09 2010 +0300
+++ b/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-framework_amastart
source \sf\mw\appsupport\applaunchservices\aftermarketappstarter
binary \sf\mw\appsupport\applaunchservices\aftermarketappstarter\group all
--- a/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp Thu May 27 13:01:09 2010 +0300
+++ b/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-framework_aplp
source \sf\mw\appsupport\applaunchservices\applaunchplugins
binary \sf\mw\appsupport\applaunchservices\applaunchplugins\group all
--- a/appsupport_info/appsupport_metadata/appsupport_metadata.mrp Thu May 27 13:01:09 2010 +0300
+++ b/appsupport_info/appsupport_metadata/appsupport_metadata.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component appsupport_metadata
source \sf\mw\appsupport\appsupport_info\appsupport_metadata
source \sf\mw\appsupport\package_definition.xml
--- a/commonappservices/alarmserver/ConsoleAlarmAlertServer/app-services_consolealarmalertserver.mrp Thu May 27 13:01:09 2010 +0300
+++ b/commonappservices/alarmserver/ConsoleAlarmAlertServer/app-services_consolealarmalertserver.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-services_consolealarmalertserver
--- a/commonappservices/alarmserver/Group/app-services_alarmserver.mrp Thu May 27 13:01:09 2010 +0300
+++ b/commonappservices/alarmserver/Group/app-services_alarmserver.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-services_alarmserver
source \sf\mw\appsupport\commonappservices\alarmserver
binary \sf\mw\appsupport\commonappservices\alarmserver\Group all
--- a/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp Thu May 27 13:01:09 2010 +0300
+++ b/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-services_testalarmsrv
source \sf\mw\appsupport\commonappservices\alarmservertest
binary \sf\mw\appsupport\commonappservices\alarmservertest\TestAlarmSrv all
--- a/commonappservices/appservicesdocs/app-services_documentation.mrp Thu May 27 13:01:09 2010 +0300
+++ b/commonappservices/appservicesdocs/app-services_documentation.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-services_documentation
source \sf\mw\appsupport\commonappservices\appservicesdocs\
--- a/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp Thu May 27 13:01:09 2010 +0300
+++ b/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-services_BackupRestoreNotification
source \sf\mw\appsupport\commonappservices\backuprestorenotification
binary \sf\mw\appsupport\commonappservices\backuprestorenotification\group all
--- a/commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp Thu May 27 13:01:09 2010 +0300
+++ b/commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-services_coreappstest
source \sf\mw\appsupport\commonappservices\coreappstest
binary \sf\mw\appsupport\commonappservices\coreappstest\Group all
--- a/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp Thu May 27 13:01:09 2010 +0300
+++ b/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component application-protocols_recognisers
source \sf\mw\appsupport\contenthandling\webrecognisers
binary \sf\mw\appsupport\contenthandling\webrecognisers\group all
--- a/coreapplicationuis/SysAp/CenRep/CoreApplicationUIsPrivateCRKeys.h Thu May 27 13:01:09 2010 +0300
+++ b/coreapplicationuis/SysAp/CenRep/CoreApplicationUIsPrivateCRKeys.h Fri Jun 11 13:48:03 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2008 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"
@@ -21,7 +21,7 @@
#define COREAPPLICATIONUISPRIVATECRKEYS_H
// INCLUDES
-#include <coreapplicationuissdkcrkeys.h>
+#include <CoreApplicationUIsSDKCRKeys.h>
// =============================================================================
// CoreAppUIs Configuration API
--- a/coreapplicationuis/SysAp/Src/SysApSatObserver.cpp Thu May 27 13:01:09 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApSatObserver.cpp Fri Jun 11 13:48:03 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"
@@ -18,8 +18,8 @@
// INCLUDE FILES
-#include <RSatRefresh.h>
-#include <RSatSession.h>
+#include <rsatrefresh.h>
+#include <rsatsession.h>
#include <e32debug.h>
#include "SysApSatObserver.h"
#include "SysAp.hrh"
--- a/filehandling/fileconverterfw/group/app-framework_conarc.mrp Thu May 27 13:01:09 2010 +0300
+++ b/filehandling/fileconverterfw/group/app-framework_conarc.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-framework_conarc
source \sf\mw\appsupport\filehandling\fileconverterfw
binary \sf\mw\appsupport\filehandling\fileconverterfw\group all
--- a/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp Thu May 27 13:01:09 2010 +0300
+++ b/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-services_chtmltocrtconv
source \sf\mw\appsupport\filehandling\htmltorichtextconverter
binary \sf\mw\appsupport\filehandling\htmltorichtextconverter\group all
--- a/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp Thu May 27 13:01:09 2010 +0300
+++ b/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-services_richtexttohtmlconv
source \sf\mw\appsupport\filehandling\richtexttohtmlconverter
binary \sf\mw\appsupport\filehandling\richtexttohtmlconverter\Group all
--- a/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp Thu May 27 13:01:09 2010 +0300
+++ b/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component telephony_hwrmuiplugin
source \sf\mw\appsupport\hwresourceadaptation\hwresourcemgruiplugin
binary \sf\mw\appsupport\hwresourceadaptation\hwresourcemgruiplugin\group all
--- a/openenvutils/commandshell/group/oetools_zsh.mrp Thu May 27 13:01:09 2010 +0300
+++ b/openenvutils/commandshell/group/oetools_zsh.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component oetools_zsh
source \sf\mw\appsupport\openenvutils\commandshell
--- a/openenvutils/telnetserver/group/oetools_telnetd.mrp Thu May 27 13:01:09 2010 +0300
+++ b/openenvutils/telnetserver/group/oetools_telnetd.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component oetools_telnetd
source \sf\mw\appsupport\openenvutils\telnetserver
--- a/printingsupport/printinguisupport/group/app-framework_print.mrp Thu May 27 13:01:09 2010 +0300
+++ b/printingsupport/printinguisupport/group/app-framework_print.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-framework_print
source \sf\mw\appsupport\printingsupport\printinguisupport
binary \sf\mw\appsupport\printingsupport\printinguisupport\group all
--- a/sensorsupport/testsensor/group/syslibs_sensors_ssyreference.mrp Thu May 27 13:01:09 2010 +0300
+++ b/sensorsupport/testsensor/group/syslibs_sensors_ssyreference.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component syslibs_sensors_ssyreference
source \sf\mw\appsupport\sensorsupport\testsensor
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest.pkg Thu May 27 13:01:09 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest.pkg Fri Jun 11 13:48:03 2010 +0300
@@ -1,18 +1,3 @@
-;
-; Copyright (c) 2009 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:
-;
;Languages
&EN
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.pkg Thu May 27 13:01:09 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.pkg Fri Jun 11 13:48:03 2010 +0300
@@ -1,18 +1,3 @@
-;
-; Copyright (c) 2009 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:
-;
;Languages
&EN
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/Icons_scalable_dc.mk Thu May 27 13:01:09 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/Icons_scalable_dc.mk Fri Jun 11 13:48:03 2010 +0300
@@ -1,18 +1,3 @@
-#
-# Copyright (c) 2009 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: This is file for creating .mif file (scalable icon)
-#
# ============================================================================
# Name : Icons_scalable_dc.mk
# Part of : t_oomdummyapp
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/build_help.mk Thu May 27 13:01:09 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/build_help.mk Fri Jun 11 13:48:03 2010 +0300
@@ -1,18 +1,3 @@
-#
-# Copyright (c) 2009 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: This make file will build the application help file (.hlp)
-#
# ============================================================================
# Name : build_help.mk
# Part of : t_oomdummyapp
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappmsgs.h Thu May 27 13:01:09 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappmsgs.h Fri Jun 11 13:48:03 2010 +0300
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2009 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 T_OOMDUMMAPPMSGS_H_
#define T_OOMDUMMAPPMSGS_H_
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/sis/t_oomdummyapp_S60_3_X_v_1_0_0.pkg Thu May 27 13:01:09 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/sis/t_oomdummyapp_S60_3_X_v_1_0_0.pkg Fri Jun 11 13:48:03 2010 +0300
@@ -1,18 +1,3 @@
-;
-; Copyright (c) 2009 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:
-;
; Installation file for t_oomdummyapp application
;
; This is an auto-generated PKG file by Carbide.
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/sis/t_oomharness_EKA2.pkg Thu May 27 13:01:09 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/sis/t_oomharness_EKA2.pkg Fri Jun 11 13:48:03 2010 +0300
@@ -1,18 +1,3 @@
-;
-; Copyright (c) 2009 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:
-;
; Installation file for Symbian OS 9.x for generic console application
; Installation file for t_oomharness EXE
;
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/oomtestapps.pkg Thu May 27 13:01:09 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/oomtestapps.pkg Fri Jun 11 13:48:03 2010 +0300
@@ -1,18 +1,3 @@
-;
-; Copyright (c) 2009 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:
-;
;Languages
&EN
--- a/systemsettings/GSAccessoryPlugin/group/bld.inf Thu May 27 13:01:09 2010 +0300
+++ b/systemsettings/GSAccessoryPlugin/group/bld.inf Fri Jun 11 13:48:03 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2008 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"
@@ -23,9 +23,9 @@
PRJ_EXPORTS
../cenrep/AccessoriesCRKeys.h MW_LAYER_PLATFORM_EXPORT_PATH( accessoriescrkeys.h )
-../rom/GSAccsPlugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH( gsaccsplugin.iby )
-../rom/GSAccsPluginResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( gsaccspluginresources.iby )
-../loc/GSAccsPlugin.loc MW_LAYER_LOC_EXPORT_PATH( gsaccsplugin.loc )
+// ../rom/GSAccsPlugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH( gsaccsplugin.iby )
+// ../rom/GSAccsPluginResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( gsaccspluginresources.iby )
+// ../loc/GSAccsPlugin.loc MW_LAYER_LOC_EXPORT_PATH( gsaccsplugin.loc )
// Configurations
../conf/GSAccessoriesPlugin.confml MW_LAYER_CONFML(gsaccessoriesplugin.confml)
--- a/systemsettings/gssensorplugin/group/bld.inf Thu May 27 13:01:09 2010 +0300
+++ b/systemsettings/gssensorplugin/group/bld.inf Fri Jun 11 13:48:03 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2008 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"
@@ -25,11 +25,11 @@
../conf/sensorplugin.confml MW_LAYER_CONFML(sensorplugin.confml)
../conf/sensorplugin_10282DF0.crml MW_LAYER_CRML(sensorplugin_10282DF0.crml)
-../loc/gssensorplugin.loc MW_LAYER_LOC_EXPORT_PATH(gssensorplugin.loc)
+// ../loc/gssensorplugin.loc MW_LAYER_LOC_EXPORT_PATH(gssensorplugin.loc)
// Iby file exports
-../rom/gssensorplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(gssensorplugin.iby)
-../rom/gssenpluginresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(gssenpluginresources.iby)
+// ../rom/gssensorplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(gssensorplugin.iby)
+// ../rom/gssenpluginresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(gssenpluginresources.iby)
PRJ_MMPFILES
// gssensorplugin.mmp
--- a/systemsettings/gssensorplugin/src/gssenbasecontainer.cpp Thu May 27 13:01:09 2010 +0300
+++ b/systemsettings/gssensorplugin/src/gssenbasecontainer.cpp Fri Jun 11 13:48:03 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2008 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"
@@ -189,7 +189,11 @@
// cleanup checkboxOnIcon, checkboxOffIcon, iconArray
CleanupStack::Pop( checkboxOffIcon );
CleanupStack::Pop( checkboxOnIcon );
- CleanupStack::Pop( iconArray );
+
+ if(iconArray)
+ {
+ CleanupStack::Pop( iconArray );
+ }
TRACE_( "[GSSensorPlugin] CGSSenBaseContainer::AddCheckboxIconsL() - return" );
}
--- a/systemsettings/gssensorplugin/src/gssensorplugin.cpp Thu May 27 13:01:09 2010 +0300
+++ b/systemsettings/gssensorplugin/src/gssensorplugin.cpp Fri Jun 11 13:48:03 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 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"
@@ -235,8 +235,8 @@
case EGSSenMenuExit:
{
CheckExitStatusL();
- // Proceed with the command
- aCommand = EAknCmdExit;
+ aCommand = EAknCmdExit; //"break" is removed to continue the flow to default case with the exit command
+ // coverity[MISSING_BREAK]
}
default:
iAppUi->HandleCommandL( aCommand );
--- a/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp Thu May 27 13:01:09 2010 +0300
+++ b/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-services_tzcompiler
source \sf\mw\appsupport\tzpcside\tzcompiler
binary \sf\mw\appsupport\tzpcside\tzcompiler\group all
--- a/tzservices/tzdatabase/group/app-services_tzdb.mrp Thu May 27 13:01:09 2010 +0300
+++ b/tzservices/tzdatabase/group/app-services_tzdb.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-services_tzdb
source \sf\mw\appsupport\tzservices\tzdatabase
binary \sf\mw\appsupport\tzservices\tzdatabase\group all
--- a/tzservices/tzloc/group/app-services_timezonelocalization.mrp Thu May 27 13:01:09 2010 +0300
+++ b/tzservices/tzloc/group/app-services_timezonelocalization.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-services_TimeZoneLocalization
source \sf\mw\appsupport\tzservices\tzloc
binary \sf\mw\appsupport\tzservices\tzloc\group all
--- a/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp Thu May 27 13:01:09 2010 +0300
+++ b/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-services_tzlocalizationrscfactory
source \sf\mw\appsupport\tzservices\tzlocrscfactory
binary \sf\mw\appsupport\tzservices\tzlocrscfactory\group all
--- a/tzservices/tzserver/group/BLD.INF Thu May 27 13:01:09 2010 +0300
+++ b/tzservices/tzserver/group/BLD.INF Fri Jun 11 13:48:03 2010 +0300
@@ -57,7 +57,6 @@
// ROM
TimeZoneServer.iby /epoc32/rom/include/timezoneserver.iby
-Timezoneserver.iby /epoc32/rom/include/core/mw/timezoneserver.iby
PRJ_MMPFILES
TimeZoneClient.mmp
--- a/tzservices/tzserver/group/app-services_tz.mrp Thu May 27 13:01:09 2010 +0300
+++ b/tzservices/tzserver/group/app-services_tz.mrp Fri Jun 11 13:48:03 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 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:
-#
-
component app-services_tz
source \sf\mw\appsupport\tzservices\tzserver
binary \sf\mw\appsupport\tzservices\tzserver\group all