# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1272880156 -10800 # Node ID 5872ac9a5671e01e08cb2e37e6318db75a68ca20 # Parent 7e0cc21eb164d2be213a556b28943d8add3f86f8 Revision: 201015 Kit: 201018 diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/bsclientdefs.h --- a/brandingserver/bsclient/bsclientdefs.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/bsclientdefs.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,9 +11,10 @@ * * Contributors: * -* Description:CBSClientdefs.h +* Description: CBSClientdefs.h * */ + #ifndef __BRANDINGDEFS_H__ #define __BRANDINGDEFS_H__ #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/bselementfactory.cpp --- a/brandingserver/bsclient/bselementfactory.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/bselementfactory.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,14 +11,15 @@ * * Contributors: * -* Description: bselementfactory.cpp +* Description: bselementfactory.cpp * */ + // INCLUDE FILES -#include "debugtrace.h" +#include "DebugTrace.h" #include "bselementfactory.h" #include "cbselement.h" diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/bsprocessstarter.cpp --- a/brandingserver/bsclient/bsprocessstarter.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/bsprocessstarter.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,12 +11,13 @@ * * Contributors: * -* Description: bsprocessstarter.cpp +* Description: bsprocessstarter.cpp * */ + // INCLUDE FILES #include "bsprocessstarter.h" -#include +#include #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/bsprocessstarter.h --- a/brandingserver/bsclient/bsprocessstarter.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/bsprocessstarter.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,9 +11,10 @@ * * Contributors: * -* Description: bsprocessstarter.h +* Description: bsprocessstarter.h * */ + #ifndef __PROCESSSTARTER_H__ #define __PROCESSSTARTER_H__ diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/cbsaccess.cpp --- a/brandingserver/bsclient/cbsaccess.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/cbsaccess.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: CBSAccess.cpp +* Description: CBSAccess.cpp * */ + // INCLUDE FILES #include @@ -25,7 +26,7 @@ #include "cbsaccess.h" #include "cbsbitmap.h" -#include "debugtrace.h" +#include "DebugTrace.h" #include "mbsaccess.h" #include "mbsupdater.h" #include "cbsiconfileprovider.h" diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/cbsaccess.h --- a/brandingserver/bsclient/cbsaccess.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/cbsaccess.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: cbsaccess.h * -* Description: cbsaccess.h +* Description: cbsaccess.h * */ + #ifndef __CBSACCESS_H__ #define __CBSACCESS_H__ #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/cbsbitmap.cpp --- a/brandingserver/bsclient/cbsbitmap.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/cbsbitmap.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: cbsbitmap.cpp +* Description: cbsbitmap.cpp * */ + // INCLUDE FILES #include "e32base.h" diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/cbsbrandobserver.cpp --- a/brandingserver/bsclient/cbsbrandobserver.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/cbsbrandobserver.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,9 +11,10 @@ * * Contributors: * -* Description: cbsbrandobserver.cpp +* Description: cbsbrandobserver.cpp * */ + // INCLUDE FILES #include "cbsbrandobserver.h" diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/cbsbrandobserver.h --- a/brandingserver/bsclient/cbsbrandobserver.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/cbsbrandobserver.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: CBSBrandObserver.h +* Description: CBSBrandObserver.h * */ + #ifndef __CBSBRANDOBSERVER_H__ #define __CBSBRANDOBSERVER_H__ #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/cbsclient.cpp --- a/brandingserver/bsclient/cbsclient.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/cbsclient.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: CBSClient.cpp +* Description: CBSClient.cpp * */ + // INCLUDE FILES #include "cbsclient.h" #include "bsclientdefs.h" @@ -27,7 +28,7 @@ #include "cbsbrandobserver.h" #include #include -#include "debugtrace.h" +#include "DebugTrace.h" // ============================================================== // ======================== CLIENT ============================== diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/cbsclient.h --- a/brandingserver/bsclient/cbsclient.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/cbsclient.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: CBSClient.h +* Description: CBSClient.h * */ + #ifndef __CBSCLIENT_H__ #define __CBSCLIENT_H__ #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/cbselement.cpp --- a/brandingserver/bsclient/cbselement.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/cbselement.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,9 +11,10 @@ * * Contributors: * -* Description: cbselement.cpp +* Description: cbselement.cpp * */ + // INCLUDE FILES #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/cbselement.h --- a/brandingserver/bsclient/cbselement.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/cbselement.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,17 +11,18 @@ * * Contributors: * -* Description: cbselement.h +* Description: cbselement.h * */ + #ifndef __CBSELEMENT_H__ #define __CBSELEMENT_H__ #include #include "mbselement.h" -#include "rbsobjowningptrarray.h" +#include "RBSObjOwningPtrArray.h" class RWriteStream; diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/cbsfactory.cpp --- a/brandingserver/bsclient/cbsfactory.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/cbsfactory.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,10 +11,11 @@ * * Contributors: * -* Description: Factory for creating branding +* Description: Factory for creating branding * */ + // INCLUDE FILES #include "cbsfactory.h" #include "cbsaccess.h" @@ -22,7 +23,7 @@ #include "mbsaccess.h" #include "mbsupdater.h" #include "cbsclient.h" -#include "debugtrace.h" +#include "DebugTrace.h" // ============================ MEMBER FUNCTIONS =============================== diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/cbsiconfileprovider.cpp --- a/brandingserver/bsclient/cbsiconfileprovider.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/cbsiconfileprovider.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,15 +11,16 @@ * * Contributors: * -* Description: Icon file provider. +* Description: Icon file provider. * */ + // INCLUDE FILES #include "cbsiconfileprovider.h" #include -#include +#include // ============================ MEMBER FUNCTIONS =============================== diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/cbsiconfileprovider.h --- a/brandingserver/bsclient/cbsiconfileprovider.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/cbsiconfileprovider.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,19 +11,20 @@ * * Contributors: * -* Description: Icon file provider. +* Description: Icon file provider. * */ + #ifndef CBSICONFILEPROVIDER_H #define CBSICONFILEPROVIDER_H // INCLUDES #include -#include -#include +#include +#include // FORWARD DECLARATIONS diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/cbsupdater.cpp --- a/brandingserver/bsclient/cbsupdater.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/cbsupdater.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,17 +11,18 @@ * * Contributors: * -* Description: CBSUpdater.cpp +* Description: CBSUpdater.cpp * */ + // INCLUDE FILES #include "e32base.h" #include "cbsupdater.h" -#include "debugtrace.h" +#include "DebugTrace.h" #include "mbsaccess.h" #include "bselementfactory.h" #include "mbselement.h" diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/cbsupdater.h --- a/brandingserver/bsclient/cbsupdater.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/cbsupdater.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: CBSUpdater.h +* Description: CBSUpdater.h * */ + #ifndef __CBSUPDATER_H__ #define __CBSUPDATER_H__ #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/mbsbrandobserverregistrar.h --- a/brandingserver/bsclient/mbsbrandobserverregistrar.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/mbsbrandobserverregistrar.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,16 +11,17 @@ * * Contributors: * -* Description: MBSBrandObserverRegistrar.h +* Description: MBSBrandObserverRegistrar.h * */ + #ifndef __MBSBRANDOBSERVERREGISTRAR_H #define __MBSBRANDOBSERVERREGISTRAR_H -#include +#include /** diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/tbselementiterator.cpp --- a/brandingserver/bsclient/tbselementiterator.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/tbselementiterator.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,12 +11,13 @@ * * Contributors: * -* Description: tbselementiterator.cpp +* Description: tbselementiterator.cpp * */ + // INCLUDE FILES #include "tbselementiterator.h" #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsclient/tbsmdescarrayadapter.cpp --- a/brandingserver/bsclient/tbsmdescarrayadapter.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsclient/tbsmdescarrayadapter.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,10 +11,11 @@ * * Contributors: * -* Description: One value adapter for MDesCArray. +* Description: One value adapter for MDesCArray. * */ + // INCLUDES #include "tbsmdescarrayadapter.h" #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/bsimportconstants.h --- a/brandingserver/bsserver/bsimportconstants.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/bsimportconstants.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,9 +11,10 @@ * * Contributors: * -* Description: BrandingServer constants. +* Description: BrandingServer constants. * */ + // CONSTANTS // Characters to strip from xml text values diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/bsserverdefs.h --- a/brandingserver/bsserver/bsserverdefs.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/bsserverdefs.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,9 +11,10 @@ * * Contributors: * -* Description: server defintions. +* Description: server defintions. * */ + #ifndef __BSSERVERDEFS_H__ #define __BSSERVERDEFS_H__ #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbsbackupobserver.cpp --- a/brandingserver/bsserver/cbsbackupobserver.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbsbackupobserver.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Stores element data and writes it to stream +* Description: Stores element data and writes it to stream * */ + #include #include "cbsbackupobserver.h" diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbsbackupobserver.h --- a/brandingserver/bsserver/cbsbackupobserver.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbsbackupobserver.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Gets and notifies backup and Restore events from system +* Description: Gets and notifies backup and Restore events from system * */ + #ifndef CBSBACKUPOBSERVER_H #define CBSBACKUPOBSERVER_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbsbrandhandler.cpp --- a/brandingserver/bsserver/cbsbrandhandler.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbsbrandhandler.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,16 +11,17 @@ * * Contributors: * -* Description: CBSBrandHandler.cpp +* Description: CBSBrandHandler.cpp * */ + // INCLUDE FILES #include "cbsbrandhandler.h" #include "bselementfactory.h" -#include "debugtrace.h" +#include "DebugTrace.h" #include "cbsstoragemanager.h" #include "cbsbitmap.h" #include "bsimportconstants.h" diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbsbrandhandler.h --- a/brandingserver/bsserver/cbsbrandhandler.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbsbrandhandler.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,15 +11,16 @@ * * Contributors: * -* Description: CBSBrandHandler.h +* Description: CBSBrandHandler.h * */ + #ifndef __CBSBRANDHANDLER_H__ #define __CBSBRANDHANDLER_H__ -#include "RBSObjOwningPtrArray.h" +#include "rbsobjowningptrarray.h" #include #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbsibywriter.cpp --- a/brandingserver/bsserver/cbsibywriter.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbsibywriter.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Writes IBY files +* Description: Writes IBY files * */ + #include #include #include @@ -23,7 +24,7 @@ #include "cbsibywriter.h" #include "bsimportconstants.h" //#include "importlogwriter.h" -#include "debugtrace.h" +#include "DebugTrace.h" // CONSTANTS _LIT8( KIBYHeader1, "\n#ifndef __BRAND_" ); diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbsibywriter.h --- a/brandingserver/bsserver/cbsibywriter.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbsibywriter.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Writes IBY files +* Description: Writes IBY files * */ + #ifndef CBSIBYWRITER_H #define CBSIBYWRITER_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbsinstallhandler.cpp --- a/brandingserver/bsserver/cbsinstallhandler.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbsinstallhandler.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: CBSInstallhandler.cpp +* Description: CBSInstallhandler.cpp * */ + // INCLUDE FILES #include #include @@ -25,7 +26,7 @@ #include #include "cbsinstallhandler.h" -#include "debugtrace.h" +#include "DebugTrace.h" #include "bsimportconstants.h" #include "cbsstoragemanager.h" diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbsinstallhandler.h --- a/brandingserver/bsserver/cbsinstallhandler.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbsinstallhandler.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: cbsinstallhandler.h +* Description: cbsinstallhandler.h * */ + #ifndef __CBSINSTALLHANDLER_H__ #define __CBSINSTALLHANDLER_H__ diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbsserver.cpp --- a/brandingserver/bsserver/cbsserver.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbsserver.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: cbsserver.cpp +* Description: cbsserver.cpp * */ + // INCLUDE FILES #define __INCLUDE_CAPABILITY_NAMES__ @@ -24,7 +25,7 @@ #include "cbsserver.h" #include "cbssession.h" #include "bsserverdefs.h" -#include "debugtrace.h" +#include "DebugTrace.h" #include "cbsstoragemanager.h" #include "cbsinstallhandler.h" #include "cbsbackupobserver.h" diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbsserver.h --- a/brandingserver/bsserver/cbsserver.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbsserver.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: CBSSERVER.H +* Description: CBSSERVER.H * */ + #ifndef __CBSSERVER_H__ #define __CBSSERVER_H__ #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbssession.cpp --- a/brandingserver/bsserver/cbssession.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbssession.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,18 +11,19 @@ * * Contributors: * -* Description: CBSSession.cpp +* Description: CBSSession.cpp * */ + // INCLUDE FILES #include #include #include "cbssession.h" #include "cbsserver.h" -#include "debugtrace.h" +#include "DebugTrace.h" #include "cbsbrandhandler.h" #include "cbsstoragemanager.h" #include "cbsstorage.h" diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbssession.h --- a/brandingserver/bsserver/cbssession.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbssession.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,17 +11,18 @@ * * Contributors: * -* Description: cbssession.h +* Description: cbssession.h * */ + #ifndef __CBSSESSION_H__ #define __CBSSESSION_H__ #include #include -#include "RBSObjOwningPtrArray.h" +#include "rbsobjowningptrarray.h" #include "bsserverdefs.h" #include "mbsbackupobserver.h" diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbsstorage.cpp --- a/brandingserver/bsserver/cbsstorage.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbsstorage.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,14 +11,15 @@ * * Contributors: * -* Description: Stores element data and writes it to stream +* Description: Stores element data and writes it to stream * */ + #include "cbsstorage.h" #include "bsimportconstants.h" -#include "debugtrace.h" +#include "DebugTrace.h" #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbsstorage.h --- a/brandingserver/bsserver/cbsstorage.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbsstorage.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Stores element data and writes it to stream +* Description: Stores element data and writes it to stream * */ + #ifndef CBSSTORAGE_H #define CBSSTORAGE_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbsstoragemanager.cpp --- a/brandingserver/bsserver/cbsstoragemanager.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbsstoragemanager.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Stores element data and writes it to stream +* Description: Stores element data and writes it to stream * */ + #include #include #include @@ -34,7 +35,7 @@ #include "cbssession.h" #include "mbsupdater.h" //#include "importlogwriter.h" -#include "debugtrace.h" +#include "DebugTrace.h" // ======== MEMBER FUNCTIONS ======== @@ -266,6 +267,7 @@ langBuf.Length() + KDot().Length() * 3 + KMaxVersionLenght; fileName = HBufC::NewLC( length ); + if(fileName){ TPtr file( fileName->Des() ); // [application_id]\[brand_id]\[def_filename][language_id] @@ -285,11 +287,9 @@ file.Append( KDot() ); file.Append( versionBuffer ); } - - if( fileName ) - { - CleanupStack::Pop( fileName ); - } + + CleanupStack::Pop( fileName ); + } return fileName; } diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/bsserver/cbsstoragemanager.h --- a/brandingserver/bsserver/cbsstoragemanager.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/bsserver/cbsstoragemanager.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Storage handler +* Description: Storage handler * */ + #ifndef CBSSTORAGEMANAGER_H #define CBSSTORAGEMANAGER_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/group/bld.inf --- a/brandingserver/group/bld.inf Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/group/bld.inf Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,35 +11,36 @@ * * Contributors: * -* Description: branding server BLD.INF which builds, tools and also server and client. +* Description: branding server BLD.INF which builds, tools and also server and client. * */ + #include PRJ_PLATFORMS DEFAULT PRJ_MMPFILES -bsclient.mmp -bsserver.mmp +BSClient.mmp +BSServer.mmp ../tools/bsimport/group/importer.mmp ../tools/bsimport/group/installer.mmp PRJ_EXPORTS // Headers exported to source tree -../inc/cbsfactory.h MW_LAYER_PLATFORM_EXPORT_PATH(cbsfactory.h) -../inc/mbsaccess.h MW_LAYER_PLATFORM_EXPORT_PATH(mbsaccess.h) -../inc/mbsupdater.h MW_LAYER_PLATFORM_EXPORT_PATH(mbsupdater.h) -../inc/mbselement.h MW_LAYER_PLATFORM_EXPORT_PATH(mbselement.h) -../inc/cbsbitmap.h MW_LAYER_PLATFORM_EXPORT_PATH(cbsbitmap.h) -../inc/bselementfactory.h MW_LAYER_PLATFORM_EXPORT_PATH(bselementfactory.h) -../inc/TBSElementIterator.h MW_LAYER_PLATFORM_EXPORT_PATH(TBSElementIterator.h) -../inc/RBSObjOwningPtrArray.h MW_LAYER_PLATFORM_EXPORT_PATH(RBSObjOwningPtrArray.h) -../inc/RBSObjOwningPtrArray.inl MW_LAYER_PLATFORM_EXPORT_PATH(RBSObjOwningPtrArray.inl) -../inc/mbsbrandchangeobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(mbsbrandchangeobserver.h) -../inc/mbsbackuprestorestateobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(mbsbackuprestorestateobserver.h) +../Inc/cbsfactory.h MW_LAYER_PLATFORM_EXPORT_PATH(cbsfactory.h) +../Inc/mbsaccess.h MW_LAYER_PLATFORM_EXPORT_PATH(mbsaccess.h) +../Inc/mbsupdater.h MW_LAYER_PLATFORM_EXPORT_PATH(mbsupdater.h) +../Inc/mbselement.h MW_LAYER_PLATFORM_EXPORT_PATH(mbselement.h) +../Inc/cbsbitmap.h MW_LAYER_PLATFORM_EXPORT_PATH(cbsbitmap.h) +../Inc/bselementfactory.h MW_LAYER_PLATFORM_EXPORT_PATH(bselementfactory.h) +../Inc/tbselementiterator.h MW_LAYER_PLATFORM_EXPORT_PATH(TBSElementIterator.h) +../Inc/rbsobjowningptrarray.h MW_LAYER_PLATFORM_EXPORT_PATH(RBSObjOwningPtrArray.h) +../Inc/rbsobjowningptrarray.inl MW_LAYER_PLATFORM_EXPORT_PATH(RBSObjOwningPtrArray.inl) +../Inc/mbsbrandchangeobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(mbsbrandchangeobserver.h) +../Inc/mbsbackuprestorestateobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(mbsbackuprestorestateobserver.h) -../group/backup_registration.xml z:/private/102828dd/backup_registration.xml +../Group/backup_registration.xml z:/private/102828dd/backup_registration.xml // Exporting iby file diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/group/bsclient.mmp --- a/brandingserver/group/bsclient.mmp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/group/bsclient.mmp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,9 +11,10 @@ * * Contributors: * -* Description: Branding server client component project descripton file. +* Description: Branding server client component project descripton file. * */ + #include "bsuids.h" #include #include @@ -25,7 +26,7 @@ VENDORID VID_DEFAULT -SOURCEPATH ../bsclient +SOURCEPATH ../BSClient SOURCE cbsclient.cpp SOURCE bsprocessstarter.cpp SOURCE cbsfactory.cpp @@ -38,9 +39,9 @@ SOURCE cbsiconfileprovider.cpp -USERINCLUDE ../group -USERINCLUDE ../bsserver -USERINCLUDE ../bsclient +USERINCLUDE ../Group +USERINCLUDE ../BSServer +USERINCLUDE ../BSClient APP_LAYER_SYSTEMINCLUDE diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/group/bsserver.mmp --- a/brandingserver/group/bsserver.mmp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/group/bsserver.mmp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,9 +11,10 @@ * * Contributors: * -* Description: Branding server, server comopnent project description file. +* Description: Branding server, server comopnent project description file. * */ + #include "bsuids.h" #include #include @@ -45,10 +46,10 @@ -USERINCLUDE ../group -USERINCLUDE ../bsserver -USERINCLUDE ../bsclient -USERINCLUDE ../inc +USERINCLUDE ../Group +USERINCLUDE ../BSServer +USERINCLUDE ../BSClient +USERINCLUDE ../Inc APP_LAYER_SYSTEMINCLUDE diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/group/bsuids.h --- a/brandingserver/group/bsuids.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/group/bsuids.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,9 +11,10 @@ * * Contributors: * -* Description: BRANDINGSERVER UIDs +* Description: BRANDINGSERVER UIDs * */ + #ifndef __BRANDINGUIDS_H #define __BRANDINGUIDS_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/group/debugtrace.h --- a/brandingserver/group/debugtrace.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/group/debugtrace.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,9 +11,10 @@ * * Contributors: * -* Description: Debug Traces. +* Description: Debug Traces. * */ + #ifndef __DEBUGTRACE_H__ #define __DEBUGTRACE_H__ diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/inc/bselementfactory.h --- a/brandingserver/inc/bselementfactory.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/inc/bselementfactory.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,15 +11,16 @@ * * Contributors: * -* Description: bselementfactory.h +* Description: bselementfactory.h * */ + #ifndef __BSELEMENTFACTORY_H #define __BSELEMENTFACTORY_H -#include +#include #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/inc/cbsbitmap.h --- a/brandingserver/inc/cbsbitmap.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/inc/cbsbitmap.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,12 +11,13 @@ * * Contributors: * -* Description: cbsbitmap.h +* Description: cbsbitmap.h * */ + #ifndef __CBSBITMAP_H__ #define __CBSBITMAP_H__ diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/inc/cbsfactory.h --- a/brandingserver/inc/cbsfactory.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/inc/cbsfactory.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,10 +11,11 @@ * * Contributors: * -* Description: cbsfactory.h +* Description: cbsfactory.h * */ + #ifndef __CBSFACTORY_H #define __CBSFACTORY_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/inc/mbsaccess.h --- a/brandingserver/inc/mbsaccess.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/inc/mbsaccess.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,12 +11,13 @@ * * Contributors: * -* Description: MBSAccess +* Description: MBSAccess * */ + #ifndef __MBSACCESS_H #define __MBSACCESS_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/inc/mbsbackupobserver.h --- a/brandingserver/inc/mbsbackupobserver.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/inc/mbsbackupobserver.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Backup and Restore observer interface +* Description: Backup and Restore observer interface * */ + #ifndef __MBSBACKUPOBSERVER_H #define __MBSBACKUPOBSERVER_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/inc/mbsbackuprestorestateobserver.h --- a/brandingserver/inc/mbsbackuprestorestateobserver.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/inc/mbsbackuprestorestateobserver.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2007 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,12 +11,13 @@ * * Contributors: * -* Description: MBS Backup restore observer definition. +* Description: MBS Backup restore observer definition. * */ + #ifndef __MBSBACKUPRESTORESTATEOBSERVER_H #define __MBSBACKUPRESTORESTATEOBSERVER_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/inc/mbsbrandchangeobserver.h --- a/brandingserver/inc/mbsbrandchangeobserver.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/inc/mbsbrandchangeobserver.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,12 +11,13 @@ * * Contributors: * -* Description: MBSBrandChangeObserver +* Description: MBSBrandChangeObserver * */ + #ifndef __MBSBRANDCHANGEOBSERVER_H #define __MBSBRANDCHANGEOBSERVER_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/inc/mbselement.h --- a/brandingserver/inc/mbselement.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/inc/mbselement.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,16 +11,17 @@ * * Contributors: * -* Description: MBSElement.h +* Description: MBSElement.h * */ + #ifndef __MBSELEMENT_H #define __MBSELEMENT_H -#include -#include +#include +#include enum TBSElementType { diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/inc/mbsupdater.h --- a/brandingserver/inc/mbsupdater.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/inc/mbsupdater.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,16 +11,17 @@ * * Contributors: * -* Description: MBSUpdater +* Description: MBSUpdater * */ + #ifndef __MBSUPDATER_H #define __MBSUPDATER_H - #include + #include #include class MBSBackupRestoreStateObserver ; diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/inc/rbsobjowningptrarray.h --- a/brandingserver/inc/rbsobjowningptrarray.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/inc/rbsobjowningptrarray.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,10 +11,11 @@ * * Contributors: * -* Description: RBSOBJOWNINGPTRaRRAY.H +* Description: RBSOBJOWNINGPTRaRRAY.H * */ + #ifndef _RBSOBJOWNINGPTRARRAY_H #define _RBSOBJOWNINGPTRARRAY_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/inc/rbsobjowningptrarray.inl --- a/brandingserver/inc/rbsobjowningptrarray.inl Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/inc/rbsobjowningptrarray.inl Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: rbsobjowningptrarray.inl +* Description: rbsobjowningptrarray.inl * */ + #include // ----------------------------------------------------------------------------- diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/inc/tbselementiterator.h --- a/brandingserver/inc/tbselementiterator.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/inc/tbselementiterator.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,12 +11,13 @@ * * Contributors: * -* Description: tbselementiterator.h +* Description: tbselementiterator.h * */ + #ifndef TBSELEMENTITERATOR_H #define TBSELEMENTITERATOR_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/inc/tbsmdescarrayadapter.h --- a/brandingserver/inc/tbsmdescarrayadapter.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/inc/tbsmdescarrayadapter.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,10 +11,11 @@ * * Contributors: * -* Description: One value adapter for MDesCArray. +* Description: One value adapter for MDesCArray. * */ + #ifndef TBSMDESCARRAYADAPTER_H__ #define TBSMDESCARRAYADAPTER_H__ diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/rom/brandingserver.iby --- a/brandingserver/rom/brandingserver.iby Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/rom/brandingserver.iby Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,9 +11,10 @@ * * Contributors: * -* Description: Branding Server IBY +* Description: Branding Server IBY * */ + #ifndef __BS_IBY__ #define __BS_IBY__ diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/sis/bs.pkg --- a/brandingserver/sis/bs.pkg Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/sis/bs.pkg Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ ; 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" +; under the terms of the License "Eclipse Public License v1.0" ; which accompanies this distribution, and is available ; at the URL "http://www.eclipse.org/legal/epl-v10.html". ; @@ -11,9 +11,8 @@ ; ; Contributors: ; -; Description: +; Description: ; -;Language &EN ;Header diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/sis/bsstub.pkg --- a/brandingserver/sis/bsstub.pkg Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/sis/bsstub.pkg Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ ; 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" +; under the terms of the License "Eclipse Public License v1.0" ; which accompanies this distribution, and is available ; at the URL "http://www.eclipse.org/legal/epl-v10.html". ; @@ -11,20 +11,7 @@ ; ; Contributors: ; -; Description: -; -; -; Package file for presencefw SIS stub in ROM -; and a ximp framework upgrade SIS. -; Including the stub in ROM enables components -; defined in stub to be updated by SIS installer. -; When adding or removing components from presencefw -; please update this pkg file and create an updated -; stub to group directory. -; -; To create SIS stub: makesis -s ximpfw_upgrade.pkg ximpfwstub.sis -; Copy ximpfwstub.sis to z:\system\install\ximpfwstub.sis -; or use abld export to export it automatically. +; Description: ; ;Language diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/group/bld.inf --- a/brandingserver/tools/bsimport/group/bld.inf Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/group/bld.inf Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,9 +11,10 @@ * * Contributors: * -* Description: bld.inf file project inclusions. +* Description: bld.inf file project inclusions. * */ + // BLD.INF PRJ_MMPFILES diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/group/brandimporter_UID_.cpp --- a/brandingserver/tools/bsimport/group/brandimporter_UID_.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/group/brandimporter_UID_.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,9 +11,10 @@ * * Contributors: * -* Description: UID file +* Description: UID file * */ + // Makmake-generated uid source file #include #pragma data_seg(".SYMBIAN") diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/group/importer.mmp --- a/brandingserver/tools/bsimport/group/importer.mmp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/group/importer.mmp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Project definition file for project bsimport +* Description: Project definition file for project bsimport * */ + #include TARGET bsimport.exe diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/group/installer.mmp --- a/brandingserver/tools/bsimport/group/installer.mmp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/group/installer.mmp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Project definition file for project bsinstall +* Description: Project definition file for project bsinstall * */ + #include TARGET bsinstall.exe diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/inc/cbsimportconstants.h --- a/brandingserver/tools/bsimport/inc/cbsimportconstants.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportconstants.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,9 +11,10 @@ * * Contributors: * -* Description: Constants header file +* Description: Constants header file * */ + // CONSTANTS // default build language diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/inc/cbsimportfilereader.h --- a/brandingserver/tools/bsimport/inc/cbsimportfilereader.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportfilereader.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,153 +11,80 @@ * * Contributors: * -* Description: Import reader opens and reads the XML file to CMDXMLDocument - +* Description: Import reader opens and reads the XML file to CMDXMLDocument * object - * */ #ifndef CBSIMPORTFILEREADER_H - #define CBSIMPORTFILEREADER_H - - #include - #include - - class CMDXMLDocument; - class CActiveScheduler; - - /** - * Import reader opens and reads the XML file to CMDXMLDocument object - * - * @lib brandimporter.exe - * @since S60 v3.2 - */ - class CBSImportFileReader : public CBase, - public MMDXMLParserObserver - { - public: - - static CBSImportFileReader* NewL( TBool aUseScheduler ); - - static CBSImportFileReader* NewLC( TBool aUseScheduler ); - - ~CBSImportFileReader(); - - /** - * Reads XML file to CMDXMLDocument object - * - * @since S60 v3.2 - * @param aFs file system handle - * @param aFileName XML file to read - */ - CMDXMLDocument* ReadXMLFileL( RFs& aFs, const TDesC& aFileName ); - - private: - - void ConstructL(); - - CBSImportFileReader( TBool aUseScheduler ); - - // from base class MMDXMLParserObserver - - /** - * From MMDXMLParserObserver. - * Writes text to log - * - * @since S60 v3.2 - * @param aText text to write - */ - void ParseFileCompleteL(); - - private: // Data - - // Own. XML parser - CMDXMLParser* iParser; - - // Own. XML document from parser - CMDXMLDocument* iDocument; - - // Own. ActiveScheduler - CActiveScheduler* iScheduler; - - // Own. Scheduler waiter. Used when we can't use scheduler directly. - CActiveSchedulerWait* iWaiter; - - // Wheter we use CActiveScheduler or CActiveSchedulerWait - TBool iUseScheduler; - }; - - #endif //CBSIMPORTFILEREADER_H - diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/inc/cbsimportmanager.h --- a/brandingserver/tools/bsimport/inc/cbsimportmanager.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportmanager.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Import manager handles the reading, parsing and writing of +* Description: Import manager handles the reading, parsing and writing of * Brand data. * */ + #ifndef CBSIMPORTMANAGER_H #define CBSIMPORTMANAGER_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/inc/cbsimportstorage.h --- a/brandingserver/tools/bsimport/inc/cbsimportstorage.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportstorage.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Stores element data and writes it to stream +* Description: Stores element data and writes it to stream * */ + #ifndef CBSIMPORTSTORAGE_H #define CBSIMPORTSTORAGE_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/inc/cbsimportstoragemanager.h --- a/brandingserver/tools/bsimport/inc/cbsimportstoragemanager.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportstoragemanager.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Storage handler +* Description: Storage handler * */ + #ifndef CBSIMPORTSTORAGEMANAGER_H #define CBSIMPORTSTORAGEMANAGER_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/inc/cbsimportxmlparser-1.h --- a/brandingserver/tools/bsimport/inc/cbsimportxmlparser-1.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportxmlparser-1.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,6 +11,7 @@ * * Contributors: * -* Description: Parses XML content and stores data to storage* +* Description: Parses XML content and stores data to storage* */ + #ifndef CBSIMPORTXMLPARSER_H#define CBSIMPORTXMLPARSER_H// INCLUDE FILES#include #include #include #include #include class CMDXMLNode;class CBSImportStorageManager;// CLASS DEFINITIONclass CBSImportXMLParser : public CBase {private: // Definitions struct TImportBitmap { TInt iBitmapId; TInt iBitmapMaskId; TInt iSkinId; TInt iSkinMaskId; }; enum TXMLBaseTagTypes { EBrandUnknown, EBrandAppID, EBrandID, EBrandLanguage, EBrandVersion, EBrandElement }; public: static CBSImportXMLParser* NewL( CBSImportStorageManager* aStorage ); static CBSImportXMLParser* NewLC( CBSImportStorageManager* aStorage ); ~CBSImportXMLParser(); /** * Parse XML document and store data to storage * * @since S60 3.2 * @param aDocument XML document to parse * @return none */ void ParseDocumentL( CMDXMLDocument& aDocument );private: CBSImportXMLParser( CBSImportStorageManager* aStorage ); void ConstructL(); /** * Parses full the base element and it's child elements. * * @since S60 v3.2 * @param aElement to parse */ void ParseDocumentBaseL( CMDXMLNode* aElement ); /** * Analyzes a child node of and stores the value to storage. * Ignores undetected XML nodes. * * @since S60 v3.2 * @param aElement to parse */ void AnalyzeNodeL( CMDXMLNode* aNode ); /** * Converts a given node to TXMLBaseTagTypes. This can handle all * child nodes of * * @since S60 v3.2 * @param aNode node to check * @return corresponding TXMLBaseTagTypes value (or EBrandUnknown). */ TXMLBaseTagTypes SolveTagTypeL( CMDXMLNode* aNode ); /** * Parses full node. Returns a newly constructed MBSElement * from the content of teh node. * Ownership is transferred! * * @since S60 v3.2 * @param aNode node * @return Concrete element constructed from node. */ MBSElement* ParseBrandElementL( CMDXMLNode* aNode ); /** * Converts elements type attribute value to TBSElementType * (see MBSElement). * * @since S60 v3.2 * @param aType value of type attribute * @return corresponding TBrandingElementType value or KErrNotFound. */ TInt SolveElementType( const TDesC& aType ); /** * Search a child node with name inside another node. Returns the first match * * @since S60 v3.2 * @param aNode parent node to search * @param aTagName Child nodes name * @return found node or NULL if not found; */ CMDXMLNode* SearchChild( CMDXMLNode* aNode, const TDesC& aChildName ); /** * Parse value from tag. Leaves if parse fails. * Ownership is transferred to caller (NodeTextLC) * * @since S60 3.2 * @param aNode XML node to parse. should be . * @return value from */ HBufC* NodeTextLC( CMDXMLNode* elNode ); TInt NodeIntL ( CMDXMLNode* elNode ); /** * Parse tag for given value type. Leaves if parsing fails. * * @since S60 3.2 * @param aNode XML node to parse * @param aValue Parsed value * @return none */ void DoParseIntegerL( CMDXMLNode* aNode, TInt& aValue ); void DoParseTextL ( CMDXMLNode* aNode, HBufC*& aText ); void DoParseFileL ( CMDXMLNode* aNode, HBufC*& aText ); void DoParseListL ( CMDXMLNode* aNode, RBSObjOwningPtrArray& aElementArray ); void DoParseBitmapL ( CMDXMLNode* aNode, CBSBitmap*& aBitmap ); private: // Data // Not owned. Storage where to put parsed elements CBSImportStorageManager* iStorage; };#endif //CBSIMPORTXMLPARSER_H \ No newline at end of file diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/inc/cbsimportxmlparser.h --- a/brandingserver/tools/bsimport/inc/cbsimportxmlparser.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportxmlparser.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,307 +11,157 @@ * * Contributors: * -* Description: Parses XML content and stores data to storage - +* Description: Parses XML content and stores data to storage * */ #ifndef CBSIMPORTXMLPARSER_H - #define CBSIMPORTXMLPARSER_H - - // INCLUDE FILES - #include - #include - -#include - -#include - +#include +#include #include - - class CMDXMLNode; - class CBSImportStorageManager; - - // CLASS DEFINITION - class CBSImportXMLParser : public CBase - { - private: // Definitions - - struct TImportBitmap - { - TInt iBitmapId; - TInt iBitmapMaskId; - TInt iSkinId; - TInt iSkinMaskId; - }; - - enum TXMLBaseTagTypes - { - EBrandUnknown, - EBrandAppID, - EBrandID, - EBrandLanguage, - EBrandVersion, - EBrandElement - }; - - public: - - static CBSImportXMLParser* NewL( CBSImportStorageManager* aStorage ); - - static CBSImportXMLParser* NewLC( CBSImportStorageManager* aStorage ); - - ~CBSImportXMLParser(); - - /** - * Parse XML document and store data to storage - * - * @since S60 3.2 - * @param aDocument XML document to parse - * @return none - */ - void ParseDocumentL( CMDXMLDocument& aDocument ); - - private: - - CBSImportXMLParser( CBSImportStorageManager* aStorage ); - - void ConstructL(); - - /** - * Parses full the base element and it's child elements. - * - * @since S60 v3.2 - * @param aElement to parse - */ - void ParseDocumentBaseL( CMDXMLNode* aElement ); - - - - /** - - * Analyzes a child node of and stores the value to storage. - - * Ignores undetected XML nodes. - - * - - * @since S60 v3.2 - - * @param aElement to parse - - */ - - void AnalyzeNodeL( CMDXMLNode* aNode ); - - /** - - * Converts a given node to TXMLBaseTagTypes. This can handle all - - * child nodes of - + * Analyzes a child node of and stores the value to storage. + * Ignores undetected XML nodes. * - * @since S60 v3.2 - + * @param aElement to parse + */ + void AnalyzeNodeL( CMDXMLNode* aNode ); + + /** + * Converts a given node to TXMLBaseTagTypes. This can handle all + * child nodes of + * + * @since S60 v3.2 * @param aNode node to check - * @return corresponding TXMLBaseTagTypes value (or EBrandUnknown). - */ - TXMLBaseTagTypes SolveTagTypeL( CMDXMLNode* aNode ); - - - /** - - * Parses full node. Returns a newly constructed MBSElement - - * from the content of teh node. - - * Ownership is transferred! - - * - - * @since S60 v3.2 - - * @param aNode node - - * @return Concrete element constructed from node. - - */ - - MBSElement* ParseBrandElementL( CMDXMLNode* aNode ); - - - /** - - * Converts elements type attribute value to TBSElementType - - * (see MBSElement). - + * Parses full node. Returns a newly constructed MBSElement + * from the content of teh node. + * Ownership is transferred! * - * @since S60 v3.2 - + * @param aNode node + * @return Concrete element constructed from node. + */ + MBSElement* ParseBrandElementL( CMDXMLNode* aNode ); + + /** + * Converts elements type attribute value to TBSElementType + * (see MBSElement). + * + * @since S60 v3.2 * @param aType value of type attribute - * @return corresponding TBrandingElementType value or KErrNotFound. - */ - TInt SolveElementType( const TDesC& aType ); - - /** - * Search a child node with name inside another node. Returns the first match - * - * @since S60 v3.2 - * @param aNode parent node to search - * @param aTagName Child nodes name - * @return found node or NULL if not found; - */ - CMDXMLNode* SearchChild( CMDXMLNode* aNode, const TDesC& aChildName ); - - /** - * Parse value from tag. Leaves if parse fails. - * Ownership is transferred to caller (NodeTextLC) - * - * @since S60 3.2 - * @param aNode XML node to parse. should be . - * @return value from - */ - HBufC* NodeTextLC( CMDXMLNode* elNode ); - TInt NodeIntL ( CMDXMLNode* elNode ); - - /** - * Parse tag for given value type. Leaves if parsing fails. - * - * @since S60 3.2 - * @param aNode XML node to parse - * @param aValue Parsed value - * @return none - */ - void DoParseIntegerL( CMDXMLNode* aNode, TInt& aValue ); - void DoParseTextL ( CMDXMLNode* aNode, HBufC*& aText ); - void DoParseFileL ( CMDXMLNode* aNode, HBufC*& aText ); - void DoParseListL ( CMDXMLNode* aNode, RBSObjOwningPtrArray& aElementArray ); - void DoParseBitmapL ( CMDXMLNode* aNode, CBSBitmap*& aBitmap ); - - private: // Data - - // Not owned. Storage where to put parsed elements - CBSImportStorageManager* iStorage; - }; - - #endif //CBSIMPORTXMLPARSER_H - diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/inc/importlogwriter.h --- a/brandingserver/tools/bsimport/inc/importlogwriter.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/importlogwriter.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,12 +11,13 @@ * * Contributors: * -* Description: Log writer macros +* Description: Log writer macros * */ + /* * * Description: diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/src/bsbrandremover.cpp --- a/brandingserver/tools/bsimport/src/bsbrandremover.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/src/bsbrandremover.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,10 +11,11 @@ * * Contributors: * -* Description: Removes brands from branding server +* Description: Removes brands from branding server * */ + #include #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/src/bsbrandremover.h --- a/brandingserver/tools/bsimport/src/bsbrandremover.h Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/src/bsbrandremover.h Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,10 +11,11 @@ * * Contributors: * -* Description: Helper class for removing brands +* Description: Helper class for removing brands * */ + #ifndef BSBRANDREMOVER_H #define BSBRANDREMOVER_H diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/src/cbsimportfilereader.cpp --- a/brandingserver/tools/bsimport/src/cbsimportfilereader.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportfilereader.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,12 +11,13 @@ * * Contributors: * -* Description: Import reader opens and reads the XML file to CMDXMLDocument +* Description: Import reader opens and reads the XML file to CMDXMLDocument * object * */ + #include #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/src/cbsimportmanager.cpp --- a/brandingserver/tools/bsimport/src/cbsimportmanager.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportmanager.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,12 +11,13 @@ * * Contributors: * -* Description: Import manager handles the reading, parsing and writing of +* Description: Import manager handles the reading, parsing and writing of * Brand data. * */ + #include #include #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/src/cbsimportstorage.cpp --- a/brandingserver/tools/bsimport/src/cbsimportstorage.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportstorage.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Stores element data and writes it to stream +* Description: Stores element data and writes it to stream * */ + #include #include #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/src/cbsimportstoragemanager.cpp --- a/brandingserver/tools/bsimport/src/cbsimportstoragemanager.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportstoragemanager.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Stores element data and writes it to stream +* Description: Stores element data and writes it to stream * */ + #include #include #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp --- a/brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,16 +11,17 @@ * * Contributors: * -* Description: Parses XML content and stores data to storage +* Description: Parses XML content and stores data to storage * */ + #include -#include -#include +#include +#include #include -#include +#include #include #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/src/importer.cpp --- a/brandingserver/tools/bsimport/src/importer.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/src/importer.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Global methods for brandimporter +* Description: Global methods for brandimporter * */ + #include #include #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/bsimport/src/installer.cpp --- a/brandingserver/tools/bsimport/src/installer.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/bsimport/src/installer.cpp Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006-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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,11 +11,12 @@ * * Contributors: * -* Description: Global methods for brandinstaller +* Description: Global methods for brandinstaller * */ + #include #include #include diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/makefile/import.mk --- a/brandingserver/tools/makefile/import.mk Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/makefile/import.mk Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ # 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" +# under the terms of the License "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # @@ -11,7 +11,7 @@ # # Contributors: # -# Description: make file +# Description: make file # diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/sis/brand-example.pkg --- a/brandingserver/tools/sis/brand-example.pkg Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/sis/brand-example.pkg Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ ; Copyright (c) 2006-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" +; under the terms of the License "Eclipse Public License v1.0" ; which accompanies this distribution, and is available ; at the URL "http://www.eclipse.org/legal/epl-v10.html". ; @@ -11,7 +11,7 @@ ; ; Contributors: ; -; Description: Example PKG file for branding installer +; Description: Example PKG file for branding installer ; ; -------- general -------- diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/sis/make-example.cmd --- a/brandingserver/tools/sis/make-example.cmd Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/sis/make-example.cmd Mon May 03 12:49:16 2010 +0300 @@ -1,8 +1,9 @@ +@echo off rem rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). rem All rights reserved. rem This component and the accompanying materials are made available -rem under the terms of "Eclipse Public License v1.0" +rem under the terms of the License "Eclipse Public License v1.0" rem which accompanies this distribution, and is available rem at the URL "http://www.eclipse.org/legal/epl-v10.html". rem @@ -11,8 +12,9 @@ rem rem Contributors: rem -rem Description: Example to make the brand sis file +rem Description: Example to make the brand sis file rem +@echo on @echo off call t:\epoc32\tools\makesis brand-example.pkg diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/xml/loc2xml.pl --- a/brandingserver/tools/xml/loc2xml.pl Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/xml/loc2xml.pl Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ # Copyright (c) 2006-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" +# under the terms of the License "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # @@ -11,7 +11,7 @@ # # Contributors: # -# Description: Converts loc file into branding xml file +# Description: Converts loc file into branding xml file # #------------------------------------------------------------------------------ diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/xml/mbg2xml.pl --- a/brandingserver/tools/xml/mbg2xml.pl Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/xml/mbg2xml.pl Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ # Copyright (c) 2006-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" +# under the terms of the License "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # @@ -11,7 +11,7 @@ # # Contributors: # -# Description: Converts mbg file into branding xml file +# Description: Converts mbg file into branding xml file # # SETUP diff -r 7e0cc21eb164 -r 5872ac9a5671 brandingserver/tools/xml/xml2h.pl --- a/brandingserver/tools/xml/xml2h.pl Fri Apr 16 15:16:51 2010 +0300 +++ b/brandingserver/tools/xml/xml2h.pl Mon May 03 12:49:16 2010 +0300 @@ -2,7 +2,7 @@ # Copyright (c) 2006-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" +# under the terms of the License "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # @@ -11,7 +11,7 @@ # # Contributors: # -# Description: Writes a header file based on brand xml file +# Description: Writes a header file based on brand xml file # #------------------------------------------------------------------------------ diff -r 7e0cc21eb164 -r 5872ac9a5671 imservices/imfeatureplugin/srcimdatamodel/imconversation/conversationsubscriptionitem.h --- a/imservices/imfeatureplugin/srcimdatamodel/imconversation/conversationsubscriptionitem.h Fri Apr 16 15:16:51 2010 +0300 +++ b/imservices/imfeatureplugin/srcimdatamodel/imconversation/conversationsubscriptionitem.h Mon May 03 12:49:16 2010 +0300 @@ -71,7 +71,7 @@ * Ownership is transferred! * @param aList New blocklist. */ - void SetConversationInfoL(CImConversationInfoImp* aImMessage); + IMPORT_C void SetConversationInfoL(CImConversationInfoImp* aImMessage); public: // From MXIMPSubscriptionItem /** diff -r 7e0cc21eb164 -r 5872ac9a5671 imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp --- a/imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp Mon May 03 12:49:16 2010 +0300 @@ -100,7 +100,8 @@ } case EIMOperationCompleted : { - iUpdateHandler.HandleIMCacheEventL( EIMCacheRequestCompleted, NULL ); + iUpdateHandler.HandleIMCacheEventL( EIMCacheRequestCompleted, NULL ); + break; } case EIMOperationChatStarted : { diff -r 7e0cc21eb164 -r 5872ac9a5671 imsrv_plat/ximp_im_data_model_api/inc/imoperationfactoryimp.h --- a/imsrv_plat/ximp_im_data_model_api/inc/imoperationfactoryimp.h Fri Apr 16 15:16:51 2010 +0300 +++ b/imsrv_plat/ximp_im_data_model_api/inc/imoperationfactoryimp.h Mon May 03 12:49:16 2010 +0300 @@ -11,8 +11,8 @@ * * Contributors: * -* Description: Im Service Connection operation factory - * +* Description: Interface for Search info object. +* */ diff -r 7e0cc21eb164 -r 5872ac9a5671 ximpfw/core/srcprocessor/ximphostimp.cpp --- a/ximpfw/core/srcprocessor/ximphostimp.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/ximpfw/core/srcprocessor/ximphostimp.cpp Mon May 03 12:49:16 2010 +0300 @@ -137,7 +137,8 @@ for ( int i = 0;i < 5;i++ ) { - iCallBack.Append( new ( ELeave ) CAsyncCallBack( CActive::EPriorityHigh ) ); + TInt Ret = iCallBack.Append( new ( ELeave ) CAsyncCallBack( CActive::EPriorityHigh ) ); + UNUSED_FORMAL_PARAM(Ret); } iCallBack[ECompleteRequestCallback]->Set( TCallBack( CompleteRequestCallback, this ) ); diff -r 7e0cc21eb164 -r 5872ac9a5671 ximpfw/core/srcprocessor/ximphostimp.h --- a/ximpfw/core/srcprocessor/ximphostimp.h Fri Apr 16 15:16:51 2010 +0300 +++ b/ximpfw/core/srcprocessor/ximphostimp.h Mon May 03 12:49:16 2010 +0300 @@ -28,6 +28,7 @@ #include "ximprequestidbuilder.h" + class CXIMPOperationBase; class CXIMPEventManager; class MXIMPObjectFactory; @@ -52,6 +53,8 @@ class CProtocolPresenceDataHostImp; class MProtocolDataHost; +#define UNUSED_FORMAL_PARAM(p) (void) p + /** * Presence connection host. diff -r 7e0cc21eb164 -r 5872ac9a5671 ximpfw/presence/srcpresencecache/presencecacheserver/presencecacheservicestore.cpp --- a/ximpfw/presence/srcpresencecache/presencecacheserver/presencecacheservicestore.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/ximpfw/presence/srcpresencecache/presencecacheserver/presencecacheservicestore.cpp Mon May 03 12:49:16 2010 +0300 @@ -137,10 +137,10 @@ TInt CPresenceCacheServiceStore::AddBlind(CPresenceCacheBuddyStore* aBuddyStore) { TRACE( _L("CPresenceCacheServiceStore::AddBlind - begin") ); - TRACE_1( _L("______identity: %S"), &(aBuddyStore->BuddyId()->Identity())); - - if(!aBuddyStore) - return KErrArgument; + if(aBuddyStore) + TRACE_1( _L("______identity: %S"), &(aBuddyStore->BuddyId()->Identity())); + else + return KErrArgument; iBuddyStoreCollection.Append(aBuddyStore); @@ -163,13 +163,16 @@ (MPresenceBuddyInfo* aBuddyPresInfo) { TRACE( _L("CPresenceCacheServiceStore::AddOrReplacePresence - begin") ); - TRACE_1( _L("______identity: %S"), &(aBuddyPresInfo->BuddyId()->Identity())); + CPresenceCacheBuddyStore* newBuddyStore(NULL); - if(!aBuddyPresInfo) - return newBuddyStore; - + if(aBuddyPresInfo) + TRACE_1( _L("______identity: %S"), &(aBuddyPresInfo->BuddyId()->Identity())); + else + { + return newBuddyStore; + } TBool oldPresExists(EFalse); TInt count = iBuddyStoreCollection.Count(); diff -r 7e0cc21eb164 -r 5872ac9a5671 ximpfw/presence/srcpresencecache/presencecacheserver/presencecachesession.cpp --- a/ximpfw/presence/srcpresencecache/presencecacheserver/presencecachesession.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/ximpfw/presence/srcpresencecache/presencecacheserver/presencecachesession.cpp Mon May 03 12:49:16 2010 +0300 @@ -740,8 +740,11 @@ CleanupStack::Pop(serviceStore); } buddyStore = CPresenceCacheBuddyStore::NewLC(serviceStore,identity); - err = serviceStore->AddBlind(buddyStore); //ownership transferred - CleanupStack::Pop(buddyStore); + if(buddyStore) + { + err = serviceStore->AddBlind(buddyStore); //ownership transferred + CleanupStack::Pop(buddyStore); + } CleanupStack::Pop(identity); } else diff -r 7e0cc21eb164 -r 5872ac9a5671 ximpfw/presence/srcpresencedatamodel/presencecache/presencebuddyinfolistimp.cpp --- a/ximpfw/presence/srcpresencedatamodel/presencecache/presencebuddyinfolistimp.cpp Fri Apr 16 15:16:51 2010 +0300 +++ b/ximpfw/presence/srcpresencedatamodel/presencecache/presencebuddyinfolistimp.cpp Mon May 03 12:49:16 2010 +0300 @@ -141,9 +141,10 @@ MPresenceBuddyInfo* aPresenceBuddyInfo) { TRACE( _L("CPresenceBuddyInfoListImp::AddOrReplace - begin") ); - TRACE_1( _L("______identity: %S"), &(aPresenceBuddyInfo->BuddyId()->Identity())); - if(!aPresenceBuddyInfo) - return KErrArgument; + if(aPresenceBuddyInfo) + TRACE_1( _L("______identity: %S"), &(aPresenceBuddyInfo->BuddyId()->Identity())); + else + return KErrArgument; if ( (ServiceName() != KNullDesC) && (ExtractService( aPresenceBuddyInfo->BuddyId()->Identity()).Compare( ServiceName()) ))