--- a/brandingserver/BSClient/cbsaccess.cpp Fri Apr 16 23:09:29 2010 +0530
+++ b/brandingserver/BSClient/cbsaccess.cpp Sat May 01 17:56:09 2010 +0530
@@ -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/cbselement.h Fri Apr 16 23:09:29 2010 +0530
+++ b/brandingserver/BSClient/cbselement.h Sat May 01 17:56:09 2010 +0530
@@ -22,7 +22,7 @@
#include <e32std.h>
#include "mbselement.h"
-#include "RBSObjOwningPtrArray.h"
+#include "rbsobjowningptrarray.h"
class RWriteStream;
--- a/brandingserver/BSClient/cbsiconfileprovider.cpp Fri Apr 16 23:09:29 2010 +0530
+++ b/brandingserver/BSClient/cbsiconfileprovider.cpp Sat May 01 17:56:09 2010 +0530
@@ -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 Apr 16 23:09:29 2010 +0530
+++ b/brandingserver/BSClient/cbsiconfileprovider.h Sat May 01 17:56:09 2010 +0530
@@ -23,8 +23,8 @@
// INCLUDES
#include <e32base.h>
-#include <AknsItemID.h>
-#include <AknIconUtils.h>
+#include <aknsitemid.h>
+#include <akniconutils.h>
// FORWARD DECLARATIONS
--- a/brandingserver/Group/BSClient.mmp Fri Apr 16 23:09:29 2010 +0530
+++ b/brandingserver/Group/BSClient.mmp Sat May 01 17:56:09 2010 +0530
@@ -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
--- a/brandingserver/Group/bld.inf Fri Apr 16 23:09:29 2010 +0530
+++ b/brandingserver/Group/bld.inf Sat May 01 17:56:09 2010 +0530
@@ -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)
--- a/brandingserver/Inc/mbsaccess.h Fri Apr 16 23:09:29 2010 +0530
+++ b/brandingserver/Inc/mbsaccess.h Sat May 01 17:56:09 2010 +0530
@@ -21,7 +21,7 @@
#ifndef __MBSACCESS_H
#define __MBSACCESS_H
-#include <E32Std.h>
+#include <e32std.h>
#include <mbselement.h>
#include <bamdesca.h>
#include <f32file.h>
--- a/brandingserver/Inc/mbsbackuprestorestateobserver.h Fri Apr 16 23:09:29 2010 +0530
+++ b/brandingserver/Inc/mbsbackuprestorestateobserver.h Sat May 01 17:56:09 2010 +0530
@@ -21,7 +21,7 @@
#ifndef __MBSBACKUPRESTORESTATEOBSERVER_H
#define __MBSBACKUPRESTORESTATEOBSERVER_H
-#include <E32Std.h>
+#include <e32std.h>
/**
--- a/brandingserver/Inc/mbsbrandchangeobserver.h Fri Apr 16 23:09:29 2010 +0530
+++ b/brandingserver/Inc/mbsbrandchangeobserver.h Sat May 01 17:56:09 2010 +0530
@@ -21,7 +21,7 @@
#ifndef __MBSBRANDCHANGEOBSERVER_H
#define __MBSBRANDCHANGEOBSERVER_H
-#include <E32Std.h>
+#include <e32std.h>
/**
--- a/brandingserver/Inc/mbselement.h Fri Apr 16 23:09:29 2010 +0530
+++ b/brandingserver/Inc/mbselement.h Sat May 01 17:56:09 2010 +0530
@@ -21,7 +21,7 @@
#define __MBSELEMENT_H
#include <e32std.h>
-#include <RBSObjOwningPtrArray.h>
+#include <rbsobjowningptrarray.h>
enum TBSElementType
{
--- a/brandingserver/tools/bsimport/inc/cbsimportxmlparser.h Fri Apr 16 23:09:29 2010 +0530
+++ b/brandingserver/tools/bsimport/inc/cbsimportxmlparser.h Sat May 01 17:56:09 2010 +0530
@@ -23,7 +23,7 @@
#include <e32base.h>
#include <f32file.h>
#include <gmxmldocument.h>
-#include <RBSObjOwningPtrArray.h>
+#include <rbsobjowningptrarray.h>
#include <mbselement.h>
class CMDXMLNode;
--- a/brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp Fri Apr 16 23:09:29 2010 +0530
+++ b/brandingserver/tools/bsimport/src/cbsimportxmlparser.cpp Sat May 01 17:56:09 2010 +0530
@@ -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/group/bld.inf Fri Apr 16 23:09:29 2010 +0530
+++ b/group/bld.inf Sat May 01 17:56:09 2010 +0530
@@ -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
--- a/imservices/imfeatureplugin/group/bld.inf Fri Apr 16 23:09:29 2010 +0530
+++ b/imservices/imfeatureplugin/group/bld.inf Sat May 01 17:56:09 2010 +0530
@@ -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
--- a/imservices/instantmessagingcache/group/bld.inf Fri Apr 16 23:09:29 2010 +0530
+++ b/imservices/instantmessagingcache/group/bld.inf Sat May 01 17:56:09 2010 +0530
@@ -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"
--- a/imservices/xmppsettingsapi/group/bld.inf Fri Apr 16 23:09:29 2010 +0530
+++ b/imservices/xmppsettingsapi/group/bld.inf Sat May 01 17:56:09 2010 +0530
@@ -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
--- a/imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt Fri Apr 16 23:09:29 2010 +0530
+++ b/imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt Sat May 01 17:56:09 2010 +0530
@@ -1,20 +1,19 @@
-#
-# 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 "Symbian Foundation License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-#
-
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Interface for Search info object.
+*
+*/
# Doxyfile 1.4.1
#---------------------------------------------------------------------------
--- a/imsrv_plat/ximp_core_feature_plugin_api/group/bld.inf Fri Apr 16 23:09:29 2010 +0530
+++ b/imsrv_plat/ximp_core_feature_plugin_api/group/bld.inf Sat May 01 17:56:09 2010 +0530
@@ -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)
--- a/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt Fri Apr 16 23:09:29 2010 +0530
+++ b/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt Sat May 01 17:56:09 2010 +0530
@@ -1,19 +1,21 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+#/*TYPE TESTCLASS*/
+#/*
+#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 "Symbian Foundation License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
#
# Contributors:
#
-# Description:
+# Description: MMP file for STIF Test Framework's TestScripter
+# testclass test module.
#
-#
+#*/
# Doxyfile 1.4.1