# HG changeset patch # User William Roberts # Date 1268572431 0 # Node ID 5e70f222339871226297c6f8095abbdb71f5e825 # Parent 7b661a6e51d059dd407e2129a1735dd049615f9c# Parent ea4b2e4f7cacae15dca8cdbfd9aa6448c9f80262 Automatic merge from PDK_3.0.h diff -r 7b661a6e51d0 -r 5e70f2223398 browserutilities/connectionmanager/Src/ConnectionObservers.cpp --- a/browserutilities/connectionmanager/Src/ConnectionObservers.cpp Fri Mar 05 16:37:58 2010 -0800 +++ b/browserutilities/connectionmanager/Src/ConnectionObservers.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -22,6 +22,7 @@ #include #include #include +#include #include #include "ConnectionManagerLogger.h" diff -r 7b661a6e51d0 -r 5e70f2223398 browserutilities/connectionmanager/Src/InternetConnectionManager.cpp --- a/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp Fri Mar 05 16:37:58 2010 -0800 +++ b/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff -r 7b661a6e51d0 -r 5e70f2223398 codhandler/codui/group/CodUi.mmp --- a/codhandler/codui/group/CodUi.mmp Fri Mar 05 16:37:58 2010 -0800 +++ b/codhandler/codui/group/CodUi.mmp Sun Mar 14 13:13:51 2010 +0000 @@ -57,7 +57,8 @@ USERINCLUDE ../inc USERINCLUDE ../../CodEng/inc -MW_LAYER_SYSTEMINCLUDE +// MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE LIBRARY efsrv.lib LIBRARY apparc.lib diff -r 7b661a6e51d0 -r 5e70f2223398 codhandler/roapapp/group/RoapApp.mmp --- a/codhandler/roapapp/group/RoapApp.mmp Fri Mar 05 16:37:58 2010 -0800 +++ b/codhandler/roapapp/group/RoapApp.mmp Sun Mar 14 13:13:51 2010 +0000 @@ -54,7 +54,8 @@ USERINCLUDE ../inc -MW_LAYER_SYSTEMINCLUDE +// MW_LAYER_SYSTEMINCLUDE +APP_LAYER_SYSTEMINCLUDE LIBRARY efsrv.lib LIBRARY apparc.lib diff -r 7b661a6e51d0 -r 5e70f2223398 web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h --- a/web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h Fri Mar 05 16:37:58 2010 -0800 +++ b/web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h Sun Mar 14 13:13:51 2010 +0000 @@ -1,22 +1,25 @@ /* -* Copyright (c) 2002 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". +* ============================================================================== +* Name : favouritesenginetest.h +* Part of : ?Subsystem_name / FavouritesEngineTest +* +* Description : FavouritesEngineTest test module. +* Version: 0.5 * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* Copyright (C) 2002 Nokia Corporation. +* This material, including documentation and any related +* computer programs, is protected by copyright controlled by +* Nokia Corporation. All rights are reserved. Copying, +* including reproducing, storing, adapting or translating, any +* or all of this material requires the prior written consent of +* Nokia Corporation. This material also contains confidential +* information which may not be disclosed to others without the +* prior written consent of Nokia Corporation. * -* Description: FavouritesEngineTest test module. -* +* ============================================================================ */ - #ifndef FAVOURITESENGINETEST_H #define FAVOURITESENGINETEST_H diff -r 7b661a6e51d0 -r 5e70f2223398 web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp Fri Mar 05 16:37:58 2010 -0800 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -1,22 +1,25 @@ /* -* Copyright (c) 2006 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". +* ============================================================================== +* Name : FavouritesEngineTest.cpp +* Part of : ?Subsystem_name / FavouritesEngineTest +* +* Description : FavouritesBCTest class member functions +* Version: 0.5 * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* Copyright (C) 2006 Nokia Corporation. +* This material, including documentation and any related +* computer programs, is protected by copyright controlled by +* Nokia Corporation. All rights are reserved. Copying, +* including reproducing, storing, adapting or translating, any +* or all of this material requires the prior written consent of +* Nokia Corporation. This material also contains confidential +* information which may not be disclosed to others without the +* prior written consent of Nokia Corporation. * -* Description: FavouritesBCTest class member functions -* +* ============================================================================ */ - // INCLUDE FILES #include #include "favouritesenginetest.h" diff -r 7b661a6e51d0 -r 5e70f2223398 web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp Fri Mar 05 16:37:58 2010 -0800 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -1,23 +1,26 @@ /* -* Copyright (c) 2008 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". +* ============================================================================ +* Name: FavouritesItemTestCases.cpp +* Part of: FavouritesEngineTest class member functions +* +* Description: +* +* Version: 1.0 * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* Copyright (C) 2008 Nokia Corporation. +* This material, including documentation and any related +* computer programs, is protected by copyright controlled by +* Nokia Corporation. All rights are reserved. Copying, +* including reproducing, storing, adapting or translating, any +* or all of this material requires the prior written consent of +* Nokia Corporation. This material also contains confidential +* information which may not be disclosed to others without the +* prior written consent of Nokia Corporation. * -* Description: -* -* +* ============================================================================ */ - // INCLUDE FILES #include #include "favouritesenginetest.h" diff -r 7b661a6e51d0 -r 5e70f2223398 web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp Fri Mar 05 16:37:58 2010 -0800 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -1,23 +1,26 @@ /* -* Copyright (c) 2002 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". +* ============================================================================ +* Name: FavouritesWapApTestCases.cpp +* Part of: FavouritesEngineTest class member functions +* +* Description: +* +* Version: 0.5 * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: +* Copyright (C) 2002 Nokia Corporation. +* This material, including documentation and any related +* computer programs, is protected by copyright controlled by +* Nokia Corporation. All rights are reserved. Copying, +* including reproducing, storing, adapting or translating, any +* or all of this material requires the prior written consent of +* Nokia Corporation. This material also contains confidential +* information which may not be disclosed to others without the +* prior written consent of Nokia Corporation. * -* Description: -* -* +* ============================================================================ */ - // INCLUDE FILES #include #include "favouritesenginetest.h" diff -r 7b661a6e51d0 -r 5e70f2223398 webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h --- a/webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h Fri Mar 05 16:37:58 2010 -0800 +++ b/webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h Sun Mar 14 13:13:51 2010 +0000 @@ -1,23 +1,25 @@ /* -* Copyright (c) 2008 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 file contains the header file of the CWidgetBackupRegistryXml class. +* ============================================================================== +* Name : WidgetRegistryXml.h +* Part of : Widget Registry +* Interface : Widget Registry API +* Description : This file contains the header file of the CWidgetBackupRegistryXml class. * * This class processes persistent registry data in XML. +* Version : %version: % * +* Copyright © 2008 Nokia Corporation. +* This material, including documentation and any related +* computer programs, is protected by copyright controlled by +* Nokia Corporation. All rights are reserved. Copying, +* including reproducing, storing, adapting or translating, any +* or all of this material requires the prior written consent of +* Nokia Corporation. This material also contains confidential +* information which may not be disclosed to others without the +* prior written consent of Nokia Corporation. +* ============================================================================== */ - #ifndef WIDGETBACKUPREGISTRYXML_H #define WIDGETBACKUPREGISTRYXML_H diff -r 7b661a6e51d0 -r 5e70f2223398 webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp --- a/webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp Fri Mar 05 16:37:58 2010 -0800 +++ b/webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -1,20 +1,24 @@ -/* -* Copyright (c) 2008 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: Processes registry persistent data in XML. -* -*/ +// +// ============================================================================== +// Name : WidgetBackupRegistryXml.cpp +// Part of : WidgetRegistry +// Interface : +// Description : Processes registry persistent data in XML. +// Version : 5.0 +// +// Copyright © 2008 Nokia Corporation. +// This material, including documentation and any related +// computer programs, is protected by copyright controlled by +// Nokia Corporation. All rights are reserved. Copying, +// including reproducing, storing, adapting or translating, any +// or all of this material requires the prior written consent of +// Nokia Corporation. This material also contains confidential +// information which may not be disclosed to others without the +// prior written consent of Nokia Corporation. +// ============================================================================== +/// +// INCLUDE FILES #include #include diff -r 7b661a6e51d0 -r 5e70f2223398 webengine/widgetregistry/Server/inc/WidgetMMCHandler.h --- a/webengine/widgetregistry/Server/inc/WidgetMMCHandler.h Fri Mar 05 16:37:58 2010 -0800 +++ b/webengine/widgetregistry/Server/inc/WidgetMMCHandler.h Sun Mar 14 13:13:51 2010 +0000 @@ -1,21 +1,22 @@ /* -* Copyright (c) 2008 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". +* ============================================================================ +* Name : WidgetMMCHandler.h +* Part of : Widget Registry +* Description : Acts on MMC card insertion/removal +* Version : 3.1 * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Acts on MMC card insertion/removal -* +* Copyright © 2008 Nokia Corporation. +* This material, including documentation and any related +* computer programs, is protected by copyright controlled by +* Nokia Corporation. All rights are reserved. Copying, +* including reproducing, storing, adapting or translating, any +* or all of this material requires the prior written consent of +* Nokia Corporation. This material also contains confidential +* information which may not be disclosed to others without the +* prior written consent of Nokia Corporation. +* ============================================================================= */ - #ifndef WIDGETMMCHANDLER_H #define WIDGETMMCHANDLER_H diff -r 7b661a6e51d0 -r 5e70f2223398 webengine/widgetregistry/Server/src/WidgetMMCHandler.cpp --- a/webengine/widgetregistry/Server/src/WidgetMMCHandler.cpp Fri Mar 05 16:37:58 2010 -0800 +++ b/webengine/widgetregistry/Server/src/WidgetMMCHandler.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -1,22 +1,26 @@ -/* -* Copyright (c) 2006 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: Handle notifications of MMC events. -* -* -* -*/ +// +// ============================================================================ +// Name : WidgetMMCHandler.cpp +// Part of : SW Installer UIs / WidgetInstallerUI +// +// Description: Handle notifications of MMC events. +// +// +// Version : 3.1 +// +// Copyright © 2006 Nokia Corporation. +// This material, including documentation and any related +// computer programs, is protected by copyright controlled by +// Nokia Corporation. All rights are reserved. Copying, +// including reproducing, storing, adapting or translating, any +// or all of this material requires the prior written consent of +// Nokia Corporation. This material also contains confidential +// information which may not be disclosed to others without the +// prior written consent of Nokia Corporation. +// ============================================================================== +/// +// INCLUDE FILES #include "WidgetMMCHandler.h" #include "WidgetRegistry.h" diff -r 7b661a6e51d0 -r 5e70f2223398 webengine/wrtharvester/inc/wrtusbhandler.h --- a/webengine/wrtharvester/inc/wrtusbhandler.h Fri Mar 05 16:37:58 2010 -0800 +++ b/webengine/wrtharvester/inc/wrtusbhandler.h Sun Mar 14 13:13:51 2010 +0000 @@ -1,21 +1,22 @@ /* -* Copyright (c) 2008 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". +* ============================================================================ +* Name : WrtUsbHandler.h +* Part of : Widget Registry +* Description : Acts on MMC card insertion/removal +* Version : 3.1 * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Acts on MMC card insertion/removal -* +* Copyright © 2008 Nokia Corporation. +* This material, including documentation and any related +* computer programs, is protected by copyright controlled by +* Nokia Corporation. All rights are reserved. Copying, +* including reproducing, storing, adapting or translating, any +* or all of this material requires the prior written consent of +* Nokia Corporation. This material also contains confidential +* information which may not be disclosed to others without the +* prior written consent of Nokia Corporation. +* ============================================================================= */ - #ifndef WIDGETMMCHANDLER_H #define WIDGETMMCHANDLER_H diff -r 7b661a6e51d0 -r 5e70f2223398 webengine/wrtharvester/rom/wrtharvesterResources.iby --- a/webengine/wrtharvester/rom/wrtharvesterResources.iby Fri Mar 05 16:37:58 2010 -0800 +++ b/webengine/wrtharvester/rom/wrtharvesterResources.iby Sun Mar 14 13:13:51 2010 +0000 @@ -1,22 +1,22 @@ /* -* 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". +* ============================================================================= +* Name : wrtharvesterResources.iby +* Part of : +* Description : The resource iby file contains resource that needs to be +* localized for wrtharvester +* Version : %version: 1 % * -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: The resource iby file contains resource that needs to be -* localized for wrtharvester -* +* Copyright (c) 2009 Nokia. All rights reserved. +* This material, including documentation and any related computer +* programs, is protected by copyright controlled by Nokia. All +* rights are reserved. Copying, including reproducing, storing, +* adapting or translating, any or all of this material requires the +* prior written consent of Nokia. This material also contains +* confidential information which may not be disclosed to others +* without the prior written consent of Nokia. +* ============================================================================ */ - #ifndef WRTHARVESTERRESOURCES_IBY #define WRTHARVESTERRESOURCES_IBY diff -r 7b661a6e51d0 -r 5e70f2223398 webengine/wrtharvester/src/wrtusbhandler.cpp --- a/webengine/wrtharvester/src/wrtusbhandler.cpp Fri Mar 05 16:37:58 2010 -0800 +++ b/webengine/wrtharvester/src/wrtusbhandler.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -1,22 +1,26 @@ -/* -* Copyright (c) 2006 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: Handle notifications of MMC events. -* -* -* -*/ +// +// ============================================================================ +// Name : WidgetMMCHandler.cpp +// Part of : SW Installer UIs / WidgetInstallerUI +// +// Description: Handle notifications of MMC events. +// +// +// Version : 3.1 +// +// Copyright © 2006 Nokia Corporation. +// This material, including documentation and any related +// computer programs, is protected by copyright controlled by +// Nokia Corporation. All rights are reserved. Copying, +// including reproducing, storing, adapting or translating, any +// or all of this material requires the prior written consent of +// Nokia Corporation. This material also contains confidential +// information which may not be disclosed to others without the +// prior written consent of Nokia Corporation. +// ============================================================================== +/// +// INCLUDE FILES #include "wrtusbhandler.h" #include "wrtharvester.h" #include "wrtusbhandler.h" diff -r 7b661a6e51d0 -r 5e70f2223398 widgets/widgetapp/inc/WidgetUiNetworkListener.h --- a/widgets/widgetapp/inc/WidgetUiNetworkListener.h Fri Mar 05 16:37:58 2010 -0800 +++ b/widgets/widgetapp/inc/WidgetUiNetworkListener.h Sun Mar 14 13:13:51 2010 +0000 @@ -1,20 +1,22 @@ -/* -* Copyright (c) 2008, 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: -* -*/ - +// +//============================================================================== +// Name : WidgetUiNetworkListener.h +// Part of : WidgetUI +// Interface : +// Description : +// Version : %version: 5.1.1.3.3 % +// +// Copyright 2008, 2009 Nokia Corporation. +// This material, including documentation and any related +// computer programs, is protected by copyright controlled by +// Nokia Corporation. All rights are reserved. Copying, +// including reproducing, storing, adapting or translating, any +// or all of this material requires the prior written consent of +// Nokia Corporation. This material also contains confidential +// information which may not be disclosed to others without the +// prior written consent of Nokia Corporation. +//============================================================================== +// #ifndef WIDGETUINETWORKLISTENER_H_ #define WIDGETUINETWORKLISTENER_H_ diff -r 7b661a6e51d0 -r 5e70f2223398 widgets/widgetapp/src/WidgetUiNetworkListener.cpp --- a/widgets/widgetapp/src/WidgetUiNetworkListener.cpp Fri Mar 05 16:37:58 2010 -0800 +++ b/widgets/widgetapp/src/WidgetUiNetworkListener.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -1,20 +1,22 @@ -/* -* Copyright (c) 2008, 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: -* -*/ - +// +//============================================================================== +// Name : WidgetUiNetworkListener.cpp +// Part of : WidgetUI +// Interface : +// Description : +// Version : %version: 5.1.1.3.3 % +// +// Copyright 2008, 2009 Nokia Corporation. +// This material, including documentation and any related +// computer programs, is protected by copyright controlled by +// Nokia Corporation. All rights are reserved. Copying, +// including reproducing, storing, adapting or translating, any +// or all of this material requires the prior written consent of +// Nokia Corporation. This material also contains confidential +// information which may not be disclosed to others without the +// prior written consent of Nokia Corporation. +//============================================================================== +// #include "WidgetUiNetworkListener.h"