--- a/brandingserver/bsclient/bsclientdefs.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/bsclientdefs.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/bselementfactory.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/bselementfactory.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/bsprocessstarter.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/bsprocessstarter.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/bsprocessstarter.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/bsprocessstarter.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/cbsaccess.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/cbsaccess.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
@@ -20,8 +20,8 @@
// INCLUDE FILES
#include <e32base.h>
-#include <aknsskininstance.h> // skins
-#include <aknsutils.h>
+#include <AknsSkinInstance.h> // skins
+#include <AknsUtils.h>
#include <coemain.h>
#include "cbsaccess.h"
--- a/brandingserver/bsclient/cbsaccess.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/cbsaccess.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/cbsbitmap.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/cbsbitmap.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/cbsbrandobserver.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/cbsbrandobserver.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/cbsbrandobserver.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/cbsbrandobserver.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/cbsclient.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/cbsclient.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/cbsclient.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/cbsclient.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/cbselement.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/cbselement.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/cbselement.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/cbselement.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/cbsfactory.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/cbsfactory.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/cbsiconfileprovider.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/cbsiconfileprovider.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
@@ -20,7 +20,7 @@
// INCLUDE FILES
#include "cbsiconfileprovider.h"
#include <aknappui.h>
-#include <akniconutils.h>
+#include <AknIconUtils.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/brandingserver/bsclient/cbsiconfileprovider.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/cbsiconfileprovider.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
@@ -23,8 +23,8 @@
// INCLUDES
#include <e32base.h>
-#include <aknsitemid.h>
-#include <akniconutils.h>
+#include <AknsItemID.h>
+#include <AknIconUtils.h>
// FORWARD DECLARATIONS
--- a/brandingserver/bsclient/cbsupdater.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/cbsupdater.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/cbsupdater.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/cbsupdater.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/mbsbrandobserverregistrar.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/mbsbrandobserverregistrar.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/tbselementiterator.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/tbselementiterator.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsclient/tbsmdescarrayadapter.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsclient/tbsmdescarrayadapter.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/bsimportconstants.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/bsimportconstants.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/bsserverdefs.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/bsserverdefs.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbsbackupobserver.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbsbackupobserver.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbsbackupobserver.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbsbackupobserver.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbsbrandhandler.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbsbrandhandler.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbsbrandhandler.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbsbrandhandler.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbsibywriter.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbsibywriter.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbsibywriter.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbsibywriter.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbsinstallhandler.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbsinstallhandler.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbsinstallhandler.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbsinstallhandler.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbsserver.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbsserver.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbsserver.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbsserver.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbssession.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbssession.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbssession.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbssession.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbsstorage.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbsstorage.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbsstorage.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbsstorage.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbsstoragemanager.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbsstoragemanager.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/bsserver/cbsstoragemanager.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/bsserver/cbsstoragemanager.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/group/bld.inf Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/group/bld.inf Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/group/bsclient.mmp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/group/bsclient.mmp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/group/bsserver.mmp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/group/bsserver.mmp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/group/bsuids.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/group/bsuids.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/group/debugtrace.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/group/debugtrace.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/inc/bselementfactory.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/inc/bselementfactory.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/inc/cbsbitmap.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/inc/cbsbitmap.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/inc/cbsfactory.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/inc/cbsfactory.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/inc/mbsaccess.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/inc/mbsaccess.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/inc/mbsbackupobserver.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/inc/mbsbackupobserver.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/inc/mbsbackuprestorestateobserver.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/inc/mbsbackuprestorestateobserver.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/inc/mbsbrandchangeobserver.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/inc/mbsbrandchangeobserver.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/inc/mbselement.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/inc/mbselement.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/inc/mbsupdater.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/inc/mbsupdater.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/inc/rbsobjowningptrarray.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/inc/rbsobjowningptrarray.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/inc/rbsobjowningptrarray.inl Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/inc/rbsobjowningptrarray.inl Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/inc/tbselementiterator.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/inc/tbselementiterator.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/inc/tbsmdescarrayadapter.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/inc/tbsmdescarrayadapter.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/rom/brandingserver.iby Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/rom/brandingserver.iby Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/group/bld.inf Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/group/bld.inf Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/group/brandimporter_UID_.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/group/brandimporter_UID_.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/group/importer.mmp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/group/importer.mmp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/group/installer.mmp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/group/installer.mmp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/inc/cbsimportconstants.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/inc/cbsimportconstants.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/inc/cbsimportfilereader.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/inc/cbsimportfilereader.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
@@ -12,153 +12,79 @@
* Contributors:
*
* Description: Import reader opens and reads the XML file to CMDXMLDocument
-
* object
-
*
*/
-
#ifndef CBSIMPORTFILEREADER_H
-
#define CBSIMPORTFILEREADER_H
-
-
#include <e32base.h>
-
#include <gmxmlparser.h>
-
-
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
-
--- a/brandingserver/tools/bsimport/inc/cbsimportmanager.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/inc/cbsimportmanager.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/inc/cbsimportstorage.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/inc/cbsimportstorage.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/inc/cbsimportstoragemanager.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/inc/cbsimportstoragemanager.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/inc/cbsimportxmlparser.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/inc/cbsimportxmlparser.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
@@ -12,307 +12,156 @@
* Contributors:
*
* Description: Parses XML content and stores data to storage
-
*
*/
-
#ifndef CBSIMPORTXMLPARSER_H
-
#define CBSIMPORTXMLPARSER_H
-
-
// INCLUDE FILES
-
#include <e32base.h>
-
#include <f32file.h>
-
#include <gmxmldocument.h>
-
#include <rbsobjowningptrarray.h>
-
#include <mbselement.h>
-
-
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 <branding> and it's child elements.
-
*
-
* @since S60 v3.2
-
* @param aElement to parse
-
*/
-
void ParseDocumentBaseL( CMDXMLNode* aElement );
-
-
-
- /**
-
- * Analyzes a child node of <branding> 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 <branding>
-
+ * Analyzes a child node of <branding> 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 <branding>
+ *
+ * @since S60 v3.2
* @param aNode node to check
-
* @return corresponding TXMLBaseTagTypes value (or EBrandUnknown).
-
*/
-
TXMLBaseTagTypes SolveTagTypeL( CMDXMLNode* aNode );
-
-
- /**
-
- * Parses full <element> node. Returns a newly constructed MBSElement
-
- * from the content of teh node.
-
- * Ownership is transferred!
-
- *
-
- * @since S60 v3.2
-
- * @param aNode <element> node
-
- * @return Concrete element constructed from node.
-
- */
-
- MBSElement* ParseBrandElementL( CMDXMLNode* aNode );
-
-
-
/**
-
- * Converts elements type attribute value to TBSElementType
-
- * (see MBSElement).
-
+ * Parses full <element> node. Returns a newly constructed MBSElement
+ * from the content of teh node.
+ * Ownership is transferred!
*
-
* @since S60 v3.2
-
+ * @param aNode <element> 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 <element_value> tag. Leaves if parse fails.
-
* Ownership is transferred to caller (NodeTextLC)
-
*
-
* @since S60 3.2
-
* @param aNode XML node to parse. should be <element_value>.
-
* @return value from <element_value>
-
*/
-
HBufC* NodeTextLC( CMDXMLNode* elNode );
-
TInt NodeIntL ( CMDXMLNode* elNode );
-
-
/**
-
* Parse <element> 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<MBSElement>& aElementArray );
-
void DoParseBitmapL ( CMDXMLNode* aNode, CBSBitmap*& aBitmap );
-
-
private: // Data
-
-
// Not owned. Storage where to put parsed elements
-
CBSImportStorageManager* iStorage;
-
};
-
-
#endif //CBSIMPORTXMLPARSER_H
-
--- a/brandingserver/tools/bsimport/inc/importlogwriter.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/inc/importlogwriter.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/src/bsbrandremover.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/src/bsbrandremover.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/src/bsbrandremover.h Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/src/bsbrandremover.h Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/src/cbsimportfilereader.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/src/cbsimportfilereader.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/src/cbsimportmanager.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/src/cbsimportmanager.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/src/cbsimportstorage.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/src/cbsimportstorage.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/src/cbsimportstoragemanager.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/src/cbsimportstoragemanager.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
@@ -21,7 +21,7 @@
#include <gmxmlelement.h>
#include <gmxmltext.h>
#include <utf.h>
-#include <aknutils.h>
+#include <AknUtils.h>
#include <bselementfactory.h>
#include <cbsbitmap.h>
--- a/brandingserver/tools/bsimport/src/importer.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/src/importer.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/bsimport/src/installer.cpp Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/bsimport/src/installer.cpp Thu Jul 22 16:37:10 2010 +0100
@@ -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".
*
--- a/brandingserver/tools/makefile/import.mk Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/makefile/import.mk Thu Jul 22 16:37:10 2010 +0100
@@ -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".
#
--- a/brandingserver/tools/sis/brand-example.pkg Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/sis/brand-example.pkg Thu Jul 22 16:37:10 2010 +0100
@@ -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".
;
--- a/brandingserver/tools/sis/make-example.cmd Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/sis/make-example.cmd Thu Jul 22 16:37:10 2010 +0100
@@ -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 "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
--- a/brandingserver/tools/xml/loc2xml.pl Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/xml/loc2xml.pl Thu Jul 22 16:37:10 2010 +0100
@@ -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".
#
--- a/brandingserver/tools/xml/mbg2xml.pl Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/xml/mbg2xml.pl Thu Jul 22 16:37:10 2010 +0100
@@ -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".
#
--- a/brandingserver/tools/xml/xml2h.pl Fri Jun 25 13:49:51 2010 +0100
+++ b/brandingserver/tools/xml/xml2h.pl Thu Jul 22 16:37:10 2010 +0100
@@ -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".
#