# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1273842648 -10800 # Node ID 56a17d4c96b8e3fa90446324377fbd9feea1e3d1 # Parent 5872ac9a5671e01e08cb2e37e6318db75a68ca20 Revision: 201017 Kit: 201019 diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/bsclientdefs.h --- a/brandingserver/bsclient/bsclientdefs.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/bsclientdefs.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/bselementfactory.cpp --- a/brandingserver/bsclient/bselementfactory.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/bselementfactory.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/bsprocessstarter.cpp --- a/brandingserver/bsclient/bsprocessstarter.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/bsprocessstarter.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/bsprocessstarter.h --- a/brandingserver/bsclient/bsprocessstarter.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/bsprocessstarter.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/cbsaccess.cpp --- a/brandingserver/bsclient/cbsaccess.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/cbsaccess.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -20,8 +20,8 @@ // INCLUDE FILES #include -#include // skins -#include +#include // skins +#include #include #include "cbsaccess.h" diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/cbsaccess.h --- a/brandingserver/bsclient/cbsaccess.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/cbsaccess.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/cbsbitmap.cpp --- a/brandingserver/bsclient/cbsbitmap.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/cbsbitmap.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/cbsbrandobserver.cpp --- a/brandingserver/bsclient/cbsbrandobserver.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/cbsbrandobserver.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/cbsbrandobserver.h --- a/brandingserver/bsclient/cbsbrandobserver.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/cbsbrandobserver.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/cbsclient.cpp --- a/brandingserver/bsclient/cbsclient.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/cbsclient.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/cbsclient.h --- a/brandingserver/bsclient/cbsclient.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/cbsclient.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/cbselement.cpp --- a/brandingserver/bsclient/cbselement.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/cbselement.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/cbselement.h --- a/brandingserver/bsclient/cbselement.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/cbselement.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -22,7 +22,7 @@ #include #include "mbselement.h" -#include "RBSObjOwningPtrArray.h" +#include "rbsobjowningptrarray.h" class RWriteStream; diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/cbsfactory.cpp --- a/brandingserver/bsclient/cbsfactory.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/cbsfactory.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/cbsiconfileprovider.cpp --- a/brandingserver/bsclient/cbsiconfileprovider.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/cbsiconfileprovider.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -20,7 +20,7 @@ // INCLUDE FILES #include "cbsiconfileprovider.h" #include -#include +#include // ============================ MEMBER FUNCTIONS =============================== diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/cbsiconfileprovider.h --- a/brandingserver/bsclient/cbsiconfileprovider.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/cbsiconfileprovider.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -23,8 +23,8 @@ // INCLUDES #include -#include -#include +#include +#include // FORWARD DECLARATIONS diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/cbsupdater.cpp --- a/brandingserver/bsclient/cbsupdater.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/cbsupdater.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/cbsupdater.h --- a/brandingserver/bsclient/cbsupdater.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/cbsupdater.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/mbsbrandobserverregistrar.h --- a/brandingserver/bsclient/mbsbrandobserverregistrar.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/mbsbrandobserverregistrar.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/tbselementiterator.cpp --- a/brandingserver/bsclient/tbselementiterator.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/tbselementiterator.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsclient/tbsmdescarrayadapter.cpp --- a/brandingserver/bsclient/tbsmdescarrayadapter.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsclient/tbsmdescarrayadapter.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/bsimportconstants.h --- a/brandingserver/bsserver/bsimportconstants.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/bsimportconstants.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/bsserverdefs.h --- a/brandingserver/bsserver/bsserverdefs.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/bsserverdefs.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbsbackupobserver.cpp --- a/brandingserver/bsserver/cbsbackupobserver.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbsbackupobserver.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbsbackupobserver.h --- a/brandingserver/bsserver/cbsbackupobserver.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbsbackupobserver.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbsbrandhandler.cpp --- a/brandingserver/bsserver/cbsbrandhandler.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbsbrandhandler.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbsbrandhandler.h --- a/brandingserver/bsserver/cbsbrandhandler.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbsbrandhandler.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbsibywriter.cpp --- a/brandingserver/bsserver/cbsibywriter.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbsibywriter.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbsibywriter.h --- a/brandingserver/bsserver/cbsibywriter.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbsibywriter.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbsinstallhandler.cpp --- a/brandingserver/bsserver/cbsinstallhandler.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbsinstallhandler.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbsinstallhandler.h --- a/brandingserver/bsserver/cbsinstallhandler.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbsinstallhandler.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbsserver.cpp --- a/brandingserver/bsserver/cbsserver.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbsserver.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbsserver.h --- a/brandingserver/bsserver/cbsserver.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbsserver.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbssession.cpp --- a/brandingserver/bsserver/cbssession.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbssession.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbssession.h --- a/brandingserver/bsserver/cbssession.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbssession.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbsstorage.cpp --- a/brandingserver/bsserver/cbsstorage.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbsstorage.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbsstorage.h --- a/brandingserver/bsserver/cbsstorage.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbsstorage.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbsstoragemanager.cpp --- a/brandingserver/bsserver/cbsstoragemanager.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbsstoragemanager.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/bsserver/cbsstoragemanager.h --- a/brandingserver/bsserver/cbsstoragemanager.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/bsserver/cbsstoragemanager.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/group/bld.inf --- a/brandingserver/group/bld.inf Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/group/bld.inf Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -34,9 +34,9 @@ ../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/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) diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/group/bsclient.mmp --- a/brandingserver/group/bsclient.mmp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/group/bsclient.mmp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -50,7 +50,7 @@ LIBRARY efsrv.lib LIBRARY flogger.lib LIBRARY estor.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY aknicon.lib //avkon icons LIBRARY cone.lib LIBRARY charconv.lib diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/group/bsserver.mmp --- a/brandingserver/group/bsserver.mmp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/group/bsserver.mmp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/group/bsuids.h --- a/brandingserver/group/bsuids.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/group/bsuids.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/group/debugtrace.h --- a/brandingserver/group/debugtrace.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/group/debugtrace.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/inc/bselementfactory.h --- a/brandingserver/inc/bselementfactory.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/inc/bselementfactory.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/inc/cbsbitmap.h --- a/brandingserver/inc/cbsbitmap.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/inc/cbsbitmap.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/inc/cbsfactory.h --- a/brandingserver/inc/cbsfactory.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/inc/cbsfactory.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/inc/mbsaccess.h --- a/brandingserver/inc/mbsaccess.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/inc/mbsaccess.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -21,7 +21,7 @@ #ifndef __MBSACCESS_H #define __MBSACCESS_H -#include +#include #include #include #include diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/inc/mbsbackupobserver.h --- a/brandingserver/inc/mbsbackupobserver.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/inc/mbsbackupobserver.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/inc/mbsbackuprestorestateobserver.h --- a/brandingserver/inc/mbsbackuprestorestateobserver.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/inc/mbsbackuprestorestateobserver.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -21,7 +21,7 @@ #ifndef __MBSBACKUPRESTORESTATEOBSERVER_H #define __MBSBACKUPRESTORESTATEOBSERVER_H -#include +#include /** diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/inc/mbsbrandchangeobserver.h --- a/brandingserver/inc/mbsbrandchangeobserver.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/inc/mbsbrandchangeobserver.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -21,7 +21,7 @@ #ifndef __MBSBRANDCHANGEOBSERVER_H #define __MBSBRANDCHANGEOBSERVER_H -#include +#include /** diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/inc/mbselement.h --- a/brandingserver/inc/mbselement.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/inc/mbselement.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -21,7 +21,7 @@ #define __MBSELEMENT_H #include -#include +#include enum TBSElementType { diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/inc/mbsupdater.h --- a/brandingserver/inc/mbsupdater.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/inc/mbsupdater.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/inc/rbsobjowningptrarray.h --- a/brandingserver/inc/rbsobjowningptrarray.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/inc/rbsobjowningptrarray.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/inc/rbsobjowningptrarray.inl --- a/brandingserver/inc/rbsobjowningptrarray.inl Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/inc/rbsobjowningptrarray.inl Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/inc/tbselementiterator.h --- a/brandingserver/inc/tbselementiterator.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/inc/tbselementiterator.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/inc/tbsmdescarrayadapter.h --- a/brandingserver/inc/tbsmdescarrayadapter.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/inc/tbsmdescarrayadapter.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/rom/brandingserver.iby --- a/brandingserver/rom/brandingserver.iby Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/rom/brandingserver.iby Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/group/bld.inf --- a/brandingserver/tools/bsimport/group/bld.inf Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/group/bld.inf Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/group/brandimporter_UID_.cpp --- a/brandingserver/tools/bsimport/group/brandimporter_UID_.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/group/brandimporter_UID_.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/group/importer.mmp --- a/brandingserver/tools/bsimport/group/importer.mmp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/group/importer.mmp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/group/installer.mmp --- a/brandingserver/tools/bsimport/group/installer.mmp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/group/installer.mmp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/inc/cbsimportconstants.h --- a/brandingserver/tools/bsimport/inc/cbsimportconstants.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportconstants.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/inc/cbsimportfilereader.h --- a/brandingserver/tools/bsimport/inc/cbsimportfilereader.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportfilereader.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -12,79 +12,153 @@ * Contributors: * * 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 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/inc/cbsimportmanager.h --- a/brandingserver/tools/bsimport/inc/cbsimportmanager.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportmanager.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/inc/cbsimportstorage.h --- a/brandingserver/tools/bsimport/inc/cbsimportstorage.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportstorage.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/inc/cbsimportstoragemanager.h --- a/brandingserver/tools/bsimport/inc/cbsimportstoragemanager.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportstoragemanager.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/inc/cbsimportxmlparser.h --- a/brandingserver/tools/bsimport/inc/cbsimportxmlparser.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/cbsimportxmlparser.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -12,156 +12,307 @@ * Contributors: * * Description: Parses XML content and stores data to storage + * */ + #ifndef CBSIMPORTXMLPARSER_H + #define CBSIMPORTXMLPARSER_H + + // INCLUDE FILES + #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 + * + * @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 ); + + + /** - * Parses full node. Returns a newly constructed MBSElement - * from the content of teh node. - * Ownership is transferred! + + * Converts elements type attribute value to TBSElementType + + * (see MBSElement). + * + * @since S60 v3.2 - * @param aNode node - * @return Concrete element constructed from node. + + * @param aType value of type attribute + + * @return corresponding TBrandingElementType value or KErrNotFound. + */ - 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 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/inc/importlogwriter.h --- a/brandingserver/tools/bsimport/inc/importlogwriter.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/inc/importlogwriter.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/src/bsbrandremover.cpp --- a/brandingserver/tools/bsimport/src/bsbrandremover.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/src/bsbrandremover.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/src/bsbrandremover.h --- a/brandingserver/tools/bsimport/src/bsbrandremover.h Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/src/bsbrandremover.h Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/src/cbsimportfilereader.cpp --- a/brandingserver/tools/bsimport/src/cbsimportfilereader.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportfilereader.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/src/cbsimportmanager.cpp --- a/brandingserver/tools/bsimport/src/cbsimportmanager.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportmanager.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/src/cbsimportstorage.cpp --- a/brandingserver/tools/bsimport/src/cbsimportstorage.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportstorage.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/src/cbsimportstoragemanager.cpp --- a/brandingserver/tools/bsimport/src/cbsimportstoragemanager.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportstoragemanager.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp --- a/brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/src/importer.cpp --- a/brandingserver/tools/bsimport/src/importer.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/src/importer.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/bsimport/src/installer.cpp --- a/brandingserver/tools/bsimport/src/installer.cpp Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/bsimport/src/installer.cpp Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/makefile/import.mk --- a/brandingserver/tools/makefile/import.mk Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/makefile/import.mk Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/sis/brand-example.pkg --- a/brandingserver/tools/sis/brand-example.pkg Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/sis/brand-example.pkg Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +; under the terms of "Eclipse Public License v1.0" ; which accompanies this distribution, and is available ; at the URL "http://www.eclipse.org/legal/epl-v10.html". ; diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/sis/make-example.cmd --- a/brandingserver/tools/sis/make-example.cmd Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/sis/make-example.cmd Fri May 14 16:10:48 2010 +0300 @@ -3,7 +3,7 @@ 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 the License "Eclipse Public License v1.0" +rem under the terms of "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 diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/xml/loc2xml.pl --- a/brandingserver/tools/xml/loc2xml.pl Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/xml/loc2xml.pl Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/xml/mbg2xml.pl --- a/brandingserver/tools/xml/mbg2xml.pl Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/xml/mbg2xml.pl Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r 5872ac9a5671 -r 56a17d4c96b8 brandingserver/tools/xml/xml2h.pl --- a/brandingserver/tools/xml/xml2h.pl Mon May 03 12:49:16 2010 +0300 +++ b/brandingserver/tools/xml/xml2h.pl Fri May 14 16:10:48 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 the License "Eclipse Public License v1.0" +# under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # diff -r 5872ac9a5671 -r 56a17d4c96b8 group/bld.inf --- a/group/bld.inf Mon May 03 12:49:16 2010 +0300 +++ b/group/bld.inf Fri May 14 16:10:48 2010 +0300 @@ -27,7 +27,7 @@ #include "../imsrv_plat/group/bld.inf" #include "../ximpfw/group/bld.inf" #include "../imservices/group/bld.inf" -#include "../brandingserver/group/bld.inf" +#include "../brandingserver/Group/bld.inf" PRJ_TESTMMPFILES diff -r 5872ac9a5671 -r 56a17d4c96b8 imservices/imfeatureplugin/group/bld.inf --- a/imservices/imfeatureplugin/group/bld.inf Mon May 03 12:49:16 2010 +0300 +++ b/imservices/imfeatureplugin/group/bld.inf Fri May 14 16:10:48 2010 +0300 @@ -24,7 +24,7 @@ PRJ_EXPORTS ../rom/imfeatureplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(imfeatureplugin.iby) // ROM SIS stubs -../sis/imfeaturepluginstub.sis /epoc32/data/Z/System/Install/imfeaturepluginstub.sis +../sis/imfeaturepluginstub.sis /epoc32/data/z/system/install/imfeaturepluginstub.sis PRJ_MMPFILES ../srcimdatamodel/group/imdatamodel.mmp diff -r 5872ac9a5671 -r 56a17d4c96b8 imservices/instantmessagingcache/group/bld.inf --- a/imservices/instantmessagingcache/group/bld.inf Mon May 03 12:49:16 2010 +0300 +++ b/imservices/instantmessagingcache/group/bld.inf Fri May 14 16:10:48 2010 +0300 @@ -24,7 +24,7 @@ ../rom/instantmessagingcache.iby CORE_MW_LAYER_IBY_EXPORT_PATH(instantmessagingcache.iby) // ROM SIS stubs -../sis/imcachestub.sis /epoc32/data/Z/System/Install/imcachestub.sis +../sis/imcachestub.sis /epoc32/data/z/system/install/imcachestub.sis // module include #include "../imcacheserver/group/bld.inf" #include "../imcacheclient/group/bld.inf" diff -r 5872ac9a5671 -r 56a17d4c96b8 imservices/xmppsettingsapi/group/bld.inf --- a/imservices/xmppsettingsapi/group/bld.inf Mon May 03 12:49:16 2010 +0300 +++ b/imservices/xmppsettingsapi/group/bld.inf Fri May 14 16:10:48 2010 +0300 @@ -25,10 +25,10 @@ PRJ_EXPORTS ../rom/xmppsettingsapi.iby CORE_MW_LAYER_IBY_EXPORT_PATH(xmppsettingsapi.iby) -1020E334.txt /epoc32/data/Z/private/10202be9/1020E334.txt //temporary -1020E334.txt /epoc32/release/winscw/udeb/Z/private/10202be9/1020E334.txt //temporary +1020E334.txt /epoc32/data/z/private/10202be9/1020e334.txt //temporary +1020E334.txt /epoc32/release/winscw/udeb/z/private/10202be9/1020e334.txt //temporary -1020E334.txt /epoc32/release/winscw/urel/Z/private/10202be9/1020E334.txt //temporary +1020E334.txt /epoc32/release/winscw/urel/z/private/10202be9/1020e334.txt //temporary PRJ_MMPFILES diff -r 5872ac9a5671 -r 56a17d4c96b8 imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt --- a/imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt Mon May 03 12:49:16 2010 +0300 +++ b/imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt Fri May 14 16:10:48 2010 +0300 @@ -12,7 +12,7 @@ # Contributors: # # Description: -# +# # # Doxyfile 1.4.1 diff -r 5872ac9a5671 -r 56a17d4c96b8 imsrv_plat/ximp_core_feature_plugin_api/group/bld.inf --- a/imsrv_plat/ximp_core_feature_plugin_api/group/bld.inf Mon May 03 12:49:16 2010 +0300 +++ b/imsrv_plat/ximp_core_feature_plugin_api/group/bld.inf Fri May 14 16:10:48 2010 +0300 @@ -54,4 +54,4 @@ ../inc/protocoldatahost.inl MW_LAYER_PLATFORM_EXPORT_PATH(protocoldatahost.inl) ../inc/ximpitemparentbase.h MW_LAYER_PLATFORM_EXPORT_PATH(ximpitemparentbase.h) ../inc/ximpsubscriptionitembase.h MW_LAYER_PLATFORM_EXPORT_PATH(ximpsubscriptionitembase.h) -../inc/ximpfeaturepluginifids.hrh MW_LAYER_PLATFORM_EXPORT_PATH(ximpfeaturepluginifids.hrh) +../inc/ximpfeaturepluginIfids.hrh MW_LAYER_PLATFORM_EXPORT_PATH(ximpfeaturepluginifids.hrh) diff -r 5872ac9a5671 -r 56a17d4c96b8 imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt --- a/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt Mon May 03 12:49:16 2010 +0300 +++ b/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt Fri May 14 16:10:48 2010 +0300 @@ -1,6 +1,5 @@ # -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. +# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). #* All rights reserved. # This component and the accompanying materials are made available # under the terms of "Eclipse Public License v1.0" # which accompanies this distribution, and is available @@ -14,7 +13,6 @@ # Description: # # - # Doxyfile 1.4.1 #---------------------------------------------------------------------------