# HG changeset patch
# User rajpuroh
# Date 1271824013 -19800
# Node ID ac50fd48361b437c94b3fe3b7cf6dfc9e1a6d7f9
# Parent  b26acd06ea602a3ee6038e197dd5481414e7e3cc
Second Contribution

diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkbuild/SDK_WINSCW/0_SDK92_Trigger_Build.cmd
--- a/sdkcreationmw/sdkbuild/SDK_WINSCW/0_SDK92_Trigger_Build.cmd	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkbuild/SDK_WINSCW/0_SDK92_Trigger_Build.cmd	Wed Apr 21 09:56:53 2010 +0530
@@ -1,24 +1,8 @@
-@rem
-@rem Copyright (c) 2002-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 which accompanies this distribution, and is available
-@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-@rem
-@rem Initial Contributors:
-@rem Nokia Corporation - initial contribution.
-@rem
-@rem Contributors:
-@rem
-@rem Description: 
-@rem
-
 @echo off
 
 rem SDK build start up script.
 rem Version:  1.2
-
+rem Author: Bakkiaraj bakkiaraj.m@nokia.com
 
 setlocal
 set log_dir="Logs"
@@ -124,7 +108,7 @@
 
 rem Show help
 if /i %1 EQU /? (
-	echo ' 0_SDK_Trigger_Build.cmd [/c ^| /j ^| /l ^| /h] [/t] [/d] [/w] [/s] [nb [san_test]  ^| <phase>] [/o param_x=value ...]
+	echo ' SDK92_Trigger_Build.cmd [/c ^| /j ^| /l ^| /h] [/t] [/d] [/w] [/s] [nb [san_test]  ^| <phase>] [/o param_x=value ...]
 	echo '	/c - Build C++ SDK
 	echo '	/j - Build Java SDK
 	echo '	/l - Build Licensee SDK
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkbuild/sdk_build.pl
--- a/sdkcreationmw/sdkbuild/sdk_build.pl	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkbuild/sdk_build.pl	Wed Apr 21 09:56:53 2010 +0530
@@ -96,6 +96,8 @@
 $CHECK_BUILD = 0;
 $DO_UNPATCH = 0;
 $FINALIZE_S60EX = 0;
+$DO_EMU_PATCH=0;  ## Added to run optimize emulator patch only when complete build is given
+$DO_DB_UPDATE=0;  ## Added to update commsdb only when complete build is given
 
 # Non-edtable configuration
 $FS = '/';  # File separator
@@ -104,16 +106,17 @@
 @VARIANTS  = ("udeb", "urel");
 @SDK_MODULES = (
   "NMIT",
- # "sdkcommonutils",
+ #"sdkcommonutils",
   "msgsimulation",
   "xrpcrt",
   "wsock",
-  "scard",
-#  "MIDP", later needs to be enabled 
+  "new_wsock_3pc",
   "emumenubar",
   "bluetoothdriver",
   #"Tools",
- # "AsyStub"
+  "scard",
+  "MIDP",  
+  "AsyStub"
 );
 
 $PATCH_LIST_FNAME = "sdk_build.conf";
@@ -178,6 +181,24 @@
 
   msg ("Build script started at " . localtime());
   msg ("Cmd line: $0 @ARGV");
+  
+  
+  if ($DO_EMU_PATCH)
+  {
+	  #Apply OptimiseEmulator patch to improve the SDK performance
+	  #Do not remove eval error handling, it will cause issues with build scripts
+	  msg ("Starting Optimise Emulator Patch,  " . localtime());
+	  eval
+	  {
+## 	do_apply_patch_OptimiseEmulator();
+	  };
+	  if ($@)
+	  {
+	        print "\n ERROR: $@";
+	  }
+	  msg ("End of Optimise Emulator Patch,  " . localtime());
+	}
+
 
   open PATCH_LIST, $patch_list_path or die "$DIED_MSG Could not find $patch_list_path!";
 
@@ -387,16 +408,22 @@
     dbg ("Build info: @bld_info");
     check_platform_build (@bld_info);
   }
-
-  if($FINALIZE_S60EX && $BUILD_TYPE != $BUILD_TYPE_MIDP){
-  	dbg ("Finalizing S60 C++ examples:");
-  	do_s60ex_finalizing();
+##  Remove the example application build:  As example application build should happen only after SDK installation. So 
+##  this has to be moved from build phase to sanity test phase
+ # if($FINALIZE_S60EX && $BUILD_TYPE != $BUILD_TYPE_MIDP){
+#  	dbg ("Finalizing S60 C++ examples:");
+ # 	do_s60ex_finalizing();
   	#TODO: Cleaning may not be required for 9.l check and add components in the below function
   	#do_s60_rndtools_cleaning();
-  }
+ # }
   
   
 	msg ("Build script finished at " . localtime());
+	if ($DO_DB_UPDATE)
+	{
+	do_Db_Update();
+     }
+
   close ($LOG_FH) if $LOG;
 }
 
@@ -546,6 +573,9 @@
           $BUILD_JAVA = 1;
           $BUILD_SDK = 1;
           $DO_PATCH = 1;
+          $DO_EMU_PATCH=1;
+          $DO_DB_UPDATE=1;
+         
           if ($DO_DIFF) {
             err ("--diff and --all options are mutually exclusive");
             exit 1;
@@ -831,7 +861,6 @@
       my $group_dir = shift @modules;
       chdir_or_die ("$BUILD_ROOT$group_dir");
       dbg ("Building in $BUILD_ROOT$group_dir");
-      run ("cmd /c bldmake.bat bldfiles");
 
       #modules are optional
       if(@modules>0)
@@ -853,28 +882,27 @@
 # =======================================================================
   {
     # Build java system ams
-  		my $java_group_dir = "sf/app/java/group";
+  		my $java_group_dir = "sf/app/jrt/group";
       chdir_or_die ("$BUILD_ROOT$java_group_dir");
       dbg ("Building in $BUILD_ROOT$java_group_dir");
-      run ("cmd /c bldmake.bat bldfiles");
-      run ("cmd /c abld.bat export");
+      run ("cmd /c sbs export");
       run ("cmd /c pbuild build winscw udeb midp2ams");
       run ("cmd /c pbuild build winscw udeb wma");
       run ("cmd /c pbuild build winscw udeb multimedia11");
-			
-			my $s60ex_dir = $BUILD_ROOT . "$SDK_PROJ_NAME/sdkexamples/javaexamples";
+
+			my $s60ex_dir = $BUILD_ROOT . "$SDK_PROJ_NAME/sdkexamples/java";
 			chdir_or_die ($s60ex_dir);
 			
 			run_build_cmd("ant IAPInfoMIDlet eSWTMIDlet SystemProperties");
 			run_build_cmd("ant copy_documentation");
-		  $cmd = "unzip -o \\\\filerblr\\SP\\AM\\DT_SDK\\SDK_BIS\\Repository\\Java_API\\IAPInfoMIDlet_doc.zip -d Z\:\\PublicSDK\\sdkcreationmw\\sdkexamples\\javaexamples\\dist\\examples\\IAPInfoMIDlet";
+		  $cmd = "unzip -o \\\\filerblr\\SP\\AM\\DT_SDK\\SDK_BIS\\Repository\\Java_API\\IAPInfoMIDlet_doc.zip -d Z\:\\PublicSDK\\sdkcreationmw\\sdkexamples\\java\\dist\\examples\\IAPInfoMIDlet";
       print ($cmd."\n"); system ($cmd);
-      $cmd = "unzip -o \\\\filerblr\\SP\\AM\\DT_SDK\\SDK_BIS\\Repository\\Java_API\\eSWTMIDlet_doc.zip -d Z\:\\PublicSDK\\sdkcreationmw\\sdkexamples\\javaexamples\\dist\\examples\\eSWTMIDlet";
+      $cmd = "unzip -o \\\\filerblr\\SP\\AM\\DT_SDK\\SDK_BIS\\Repository\\Java_API\\eSWTMIDlet_doc.zip -d Z\:\\PublicSDK\\sdkcreationmw\\sdkexamples\\java\\dist\\examples\\eSWTMIDlet";
       print ($cmd."\n"); system ($cmd);
-      $cmd = "unzip -o \\\\filerblr\\SP\\AM\\DT_SDK\\SDK_BIS\\Repository\\Java_API\\SystemPropertiesMidlet_doc.zip -d Z\:\\PublicSDK\\sdkcreationmw\\sdkexamples\\javaexamples\\dist\\examples\\SystemProperties";
+      $cmd = "unzip -o \\\\filerblr\\SP\\AM\\DT_SDK\\SDK_BIS\\Repository\\Java_API\\SystemPropertiesMidlet_doc.zip -d Z\:\\PublicSDK\\sdkcreationmw\\sdkexamples\\java\\dist\\examples\\SystemProperties";
       print ($cmd."\n"); system ($cmd);
-      system("copy /V Z\:\\PublicSDK\\sdkcreationmw\\sdkexamples\\javaexamples\\examples\\examples.html Z\:\\PublicSDK\\sdkcreationmw\\sdkexamples\\javaexamples\\dist\\examples");
-      system("copy /V \\\\filerblr\\SP\\AM\\DT_SDK\\SDK_BIS\\Repository\\Java_API\\build.xml Z\:\\PublicSDK\\sdkcreationmw\\sdkexamples\\javaexamples\\dist\\examples\\IAPInfoMIDlet\\targets");
+      system("copy /V Z\:\\PublicSDK\\sdkcreationmw\\sdkexamples\\java\\examples\\examples.html Z\:\\PublicSDK\\sdkcreationmw\\sdkexamples\\java\\dist\\examples");
+      system("copy /V \\\\filerblr\\SP\\AM\\DT_SDK\\SDK_BIS\\Repository\\Java_API\\build.xml Z\:\\PublicSDK\\sdkcreationmw\\sdkexamples\\java\\dist\\examples\\IAPInfoMIDlet\\targets");
   }
 
 # =======================================================================
@@ -913,10 +941,8 @@
     my $module = shift;
     dbg ("Checking $dir");
     foreach $t (@PLATFORMS) {
-      if (!-e "ABLD.BAT") {
-        run ("cmd /c bldmake.bat bldfiles");
-      }
-      run ("cmd /c abld.bat build -c $t $module");
+
+      run (" cmd /c sbs -c winscw $module");
     }
   }
 
@@ -930,15 +956,14 @@
     chdir_or_die ($dir);
     chdir_to_build_specific_dir ();
     dbg ("Building in " . getcwd);
-    run ("cmd /c bldmake.bat bldfiles");
-    run ("cmd /c abld.bat export");
-    run ("cmd /c abld.bat makefile");
+ 
     foreach $bt (@VARIANTS) {
       if($REBUILD || $CLEAN) {
-        run_build_cmd ( "cmd /c abld.bat clean $bt");
+        run_build_cmd ( "cmd /c sbs clean");
       }
       if (!$CLEAN) {
-        run_build_cmd ( "cmd /c abld.bat -k build $bt");
+        # Build only for winscw , No need to build for ARM targets
+        run_build_cmd ( "cmd /c sbs -c winscw");
       }
     }
   }
@@ -956,10 +981,8 @@
     };
     chdir_to_build_specific_dir ();
     dbg ("Checking " . getcwd);
-    if (!-e "ABLD.BAT") {
-      run ("cmd /c bldmake.bat bldfiles");
-    }
-    run ("cmd /c abld.bat build -c");
+    
+    run ("cmd /c sbs -c winscw");
   }
 
 
@@ -972,18 +995,14 @@
     foreach $t (@PLATFORMS) {
       if (!$CLEAN) 
       {
-        run_build_cmd ( "cmd /c abld.bat makefile $t $module");
+        run_build_cmd ( "cmd /c sbs -m winscw");
       }
       foreach $bt (@VARIANTS) 
       {
-        if($REBUILD || $CLEAN) 
-        {
-          run_build_cmd ( "cmd /c abld.bat clean $t $bt $module");
-        }
-        if (!$CLEAN) 
-        {
-          	run_build_cmd ( "cmd /c abld.bat -k build $t $bt $module");
-        }
+          run_build_cmd ( "cmd /c sbs reallyclean");
+        
+          run_build_cmd ( "cmd /c sbs -c winscw");
+        
       }
     }
   }
@@ -1481,7 +1500,7 @@
   sub do_s60ex_finalizing
 # ========================================================================
   {
-    my $s60ex_dir = $BUILD_ROOT . "$SDK_PROJ_NAME/ExamplesCpp/build";
+    my $s60ex_dir = $BUILD_ROOT . "$SDK_PROJ_NAME/tools_config/build";
     chdir_or_die ($s60ex_dir);
     run ("cmd /c finalize.bat");
   }
@@ -1500,13 +1519,39 @@
       print "\n\n=== Clean up of rnd tools: $rndtools_cleandirs\n\n ===";
       chdir $rndtools_cleandirs or print  " WARNING: Can chdir to $rndtools_cleandirs: $!";
     
-      $cmd = "call bldmake bldfiles";
+ 
+
+      $cmd = "call sbs -m winscw";
       system ($cmd); #==0 or print ($cmd."\n\n");
 
-      $cmd = "call abld makefile";
-      system ($cmd); #==0 or print ($cmd."\n\n");
-
-      $cmd = "call abld reallyclean";
+      $cmd = "call sbs reallyclean";
       system ($cmd); #==0 or print ($cmd."\n\n");
     }
   }
+# ========================================================================
+  sub do_Db_Update()
+# ========================================================================
+  {
+  	
+msg("Updating the commsDb\n");
+my $CommsDb_update = "${BUILD_ROOT}epoc32/release/winscw/udeb";
+chdir_or_die ($CommsDb_update);
+run ("cmd /c ced -dtextshell -- -i c:\\cedout.cfg");
+run ("cmd /c dbcreator -dtextshell --");
+msg("Finished Updating the commsDb\n");
+
+  }
+
+# ========================================================================
+  sub do_apply_patch_OptimiseEmulator
+# ========================================================================
+  {
+    #return 0 if (! -d optEmuPatch);
+    msg("Start Apply Emulator performance boost patching...");
+    my $optEmuPatch = $BUILD_ROOT . "OptimiseEmulator";
+    #Add patch path to System path
+    $ENV{'PATH'}=$optEmuPatch.";".$ENV{'PATH'};
+    chdir_or_die ($optEmuPatch);
+    run ("cmd /c OptimiseEmulator.bat");
+    msg("Finished Applying Emulator performance boost Patch...");
+  }
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkbuild/sdk_env.pl
--- a/sdkcreationmw/sdkbuild/sdk_env.pl	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkbuild/sdk_env.pl	Wed Apr 21 09:56:53 2010 +0530
@@ -138,6 +138,7 @@
 
   # These affect everything...
   $ENV{EPOCROOT} = $EPOCROOT;
+  $ENV{SBS_HOME} = "C:/apps/sbs";
   $ENV{PATH} = $rvct_bin . "$PS$ENV{JAVA_HOME}$FS" . "bin$PS" .
                "$ant_dir$FS" . "bin$PS" .
                "$python_dir$PS" .
@@ -146,9 +147,9 @@
                "$cw_tool_dir$PS$cw_bin_dir$PS" .
                "$msdev_dir$PS$cl_dir$PS$perl_path$PS" .
                "$ENV{SystemRoot}$PS" . "$ENV{SystemRoot}$FS" . "system32$PS" .
-               "$doxy_bin";
+               "$doxy_bin" . "C:/apps/sbs/bin";
 
-#  print "$ENV{JAVA_HOME}\n$ENV{EPOCROOT}\n$ENV{BUILD_ROOT}\n$ENV{MWCIncludes}\n$ENV{PATH}\n$ENV{RVCT21INC}\n$ENV{RVCT21LIB}\n$ENV{ARMROOT}\n";
+  print "$ENV{JAVA_HOME}\n$ENV{EPOCROOT}\n$ENV{BUILD_ROOT}\n$ENV{MWCIncludes}\n$ENV{PATH}\n$ENV{RVCT21INC}\n$ENV{RVCT21LIB}\n$ENV{ARMROOT}\n";
 
 # ======================================================================+
   sub find_prog_or_die
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/general/GeneralSettingsJPanel.java
--- a/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/general/GeneralSettingsJPanel.java	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/general/GeneralSettingsJPanel.java	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 - 2005 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".
 *
@@ -204,7 +204,10 @@
 		 resourceBundle.getString("startlist.description")));
 		 add(startListPanel);
 		 */
-		startListPanel = new JPanel();
+		
+		
+		
+		/*startListPanel = new JPanel();
 		startListPanel.setLayout(new SpringLayout());
 		startListPanel.setBorder(new TitledBorder(resourceBundle
 				.getString("startlist.border.title")));
@@ -235,7 +238,10 @@
 		SpringUtilities.makeCompactGrid(startListPanel, 2, 2,//rows cols
 				GAP * 2, 0,//left and top margins
 				GAP, 0);//gaps between elements
-		add(startListPanel);
+		add(startListPanel);*/
+		
+		
+		
 		// Warning panel
 		JPanel warning = new JPanel(new BorderLayout(5, 5));
 		warning.add(GUI.createTextComponent(resourceBundle
@@ -249,7 +255,7 @@
 			warning.add(warningIcon, BorderLayout.WEST);
 		}
 		add(warning);
-		warning.setBounds(10, 300, 340, 370);
+		warning.setBounds(10, 200, 340, 370);
 	}//GEN-END:initComponents
 
 	public void actionPerformed(java.awt.event.ActionEvent e)
@@ -281,11 +287,12 @@
 		}
 		model.saveSelectedResolution((String) resolutionComboBox
 				.getSelectedItem());
-		model.saveStartMode(trimmedListButton.isSelected());
-		
 		
 		//Change for non critical starter mode
-		model.saveStarterNonCriticalMode(trimmedListButton.isSelected());
+		//Pranav: Commented as startup mode setting is not require.
+		//TODO: Code cleanup is require.
+		//model.saveStartMode(trimmedListButton.isSelected());
+		//model.saveStarterNonCriticalMode(trimmedListButton.isSelected());
 		configurator.saveSettings();
 
 	}
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/general/generalsettings.properties
--- a/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/general/generalsettings.properties	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/general/generalsettings.properties	Wed Apr 21 09:56:53 2010 +0530
@@ -7,7 +7,7 @@
 information.dialog.title=Information
 information.dialog.message=Initial resolution configuration success.
 remainder.dialog.title=Preferences
-remainder.dialog.message=The emulator must be restarted in order to activate the changes.
+remainder.dialog.message=The emulator must be restarted in order to activate the          changes.
 validation.message.memory=Entered value must be between 0 and
 # GUI text
 resolution.border.title=Initial Resolution
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PanConstants.java
--- a/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PanConstants.java	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PanConstants.java	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 - 2005 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".
 *
@@ -45,10 +45,6 @@
     protected static final String BLUETOOTH_ENABLE_LABEL = "bluetooth.enable.label";
     protected static final String BLUETOOTH_COM_PORT_LABEL = "bluetooth.com.port.label";
     protected static final String BLUETOOTH_COM_HCI_LABEL = "bluetooth.hci.label";
-    protected static final String IRDA_BORDER_TITLE = "irda.border.title";
-    protected static final String IRDA_DISABLE_LABEL = "irda.disable.label";
-    protected static final String IRDA_ENABLE_LABEL = "irda.enable.label";
-    protected static final String IRDA_COM_PORT_LABEL = "irda.com.port.label";
     
     /**
      * Creates a new instance of PanConstants
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PanModel.java
--- a/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PanModel.java	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PanModel.java	Wed Apr 21 09:56:53 2010 +0530
@@ -1,165 +1,142 @@
 /*
-* Copyright (c) 2000 - 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
+ * Copyright (c) 2000 - 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"
+ * 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: 
+ *
+ */
 
 package com.nokia.epdt.plugins.s60.pan;
 
-import com.nokia.epdt.core.Constants;
-import org.apache.log4j.Logger;
 import java.io.FileReader;
 import java.io.FileWriter;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.LinkedList;
 
+import org.apache.log4j.Logger;
+
 /**
  * PanModel
- * HCI :
- * [hci] hcidllfilename=
- *  hci_h4.dll
- *  hci_bcsp.dll
- *  hci_usb.dll
+ * HCLT :
+ * 
+ * [hctl]
+ * port= 1
+ * baud_rate= 115200
+ *
  * COM port:
  * -1 = disable
  * 0 - 15 = 1 - 16 enable
  *
  */
-class PanModel{
+class PanModel {
 	static Logger log = Logger.getLogger(PanModel.class);
 	public static int BT_HCI_USB_INDEX = 2;
-	static LinkedList hciList= new LinkedList();
+	static LinkedList hciList = new LinkedList();
 	{
 		hciList.add(0, "hci_bcsp.dll");
 		hciList.add(1, "hci_h4.dll");
 		hciList.add(BT_HCI_USB_INDEX, "hci_usb.dll");
 	}
-    
-    private PropSets irdaProps = new PropSets();
-    private PropSets btProps = new PropSets();
-    private String epoc32;
-    
-    public PanModel(String epocroot) throws IOException
-    {
-    	this.epoc32 = epocroot;
-    	init();
-    }
-    
-    private static String getResource(String key)
-    {	return PanResourceBundle.getInstance().getValue(key);  }
-    
-    public boolean isBluetoothEnabled(){ return getBluetoothComPort()>=0; }
-    
-    public int getBluetoothHci() {
-    	String hci = btProps.getValue(getResource("bluetooth.esk.sectionName"), 
-			getResource("bluetooth.esk.dllKey"));
-    	return hciList.indexOf(hci); 
-    }
-    public void setBluetoothHci(int index)
-    { 	btProps.setValue(getResource("bluetooth.esk.sectionName"), 
-    			getResource("bluetooth.esk.dllKey"), (String)hciList.get(index)); }
-    
-    public int getBluetoothComPort()
-    {
-			String btPort =  btProps.getValue(getResource("bluetooth.esk.sectionName"), 
-					getResource("bluetooth.esk.portKey"));
-			return Integer.parseInt(btPort);
-    }
-    
-    public void setBluetoothComPort(int comPort)
-    {btProps.setValue(getResource("bluetooth.esk.sectionName"), 
-			getResource("bluetooth.esk.portKey"), Integer.toString(comPort));}
-    		
-    public boolean isIrdaEnabled() { return getIrdaComPort() >=0; }
-    
-    public int getIrdaComPort()
-    {return Integer.parseInt(
-			irdaProps.getValue(getResource("irda.esk.sectionName"), 
-					getResource("irda.esk.portKey"))); }
-    public void setIrdaComPort(int comPort)
-    {irdaProps.setValue(getResource("irda.esk.sectionName"), 
-			getResource("irda.esk.portKey"), Integer.toString(comPort));}
+
+	private PropSets btProps = new PropSets();
+	private String epoc32;
+
+	public PanModel(String epocroot) throws IOException {
+		this.epoc32 = epocroot;
+		init();
+	}
+
+	private static String getResource(String key) {
+		return PanResourceBundle.getInstance().getValue(key);
+	}
+
+	public boolean isBluetoothEnabled() {
+		return getBluetoothComPort() >= 0;
+	}
+
+	public int getBluetoothHci() {
+		String hci = btProps.getValue(getResource("bluetooth.esk.sectionName"),
+				getResource("bluetooth.esk.dllKey"));
+		return hciList.indexOf(hci);
+	}
+
+	public void setBluetoothHci(int index) {
+		btProps.setValue(getResource("bluetooth.esk.sectionName"),
+				getResource("bluetooth.esk.dllKey"), (String) hciList
+						.get(index));
+	}
+
+	public int getBluetoothComPort() {
+		String btPort = btProps.getValue(
+				getResource("bluetooth.esk.sectionName"),
+				getResource("bluetooth.esk.portKey"));
+		return Integer.parseInt(btPort);
+	}
+
+	public void setBluetoothComPort(int comPort) {
+		btProps
+				.setValue(getResource("bluetooth.esk.sectionName"),
+						getResource("bluetooth.esk.portKey"), Integer
+								.toString(comPort));
+	}
 
-    /**
-     * The function reads innitial values from .esk files
-     *
-     */
-    public void init() throws IOException
-    {	//Initialisation of btProps and irdaProps from .esk files:
-    	String btFileName = getBtEskFileName(); 
-    	String irdaFileName = getIrdaEskFileName();
-        
-    	FileReader btReader =null;
-    	FileReader irdaReader =null;
-   		try
-   		{
-   			btReader = new FileReader(btFileName);
-   			btProps.load(btReader);
-   			irdaReader = new FileReader(irdaFileName);
-   			irdaProps.load(irdaReader);
-   		}
-   		catch(IOException ex)
-   		{
-   			throw(ex);
-   		}
-   		finally
-   		{
-   			try{
-   				if(btReader != null) btReader.close();
-   				if(irdaReader != null)irdaReader.close();
-   			}catch(IOException ex)
-   			{log.error("error closing bt or IrDa .esk configuration files:"
-   					+ ex.getMessage());}
-   		}
-    }
-    public void save()
-    {
-    	String btFileName = getBtEskFileName();
-    	String irdaFileName = getIrdaEskFileName();
-        
-    	FileWriter btWriter =null;
-    	FileWriter irdaWriter =null;
-   		try
-   		{
-   			btWriter = new FileWriter(btFileName);
-   			btProps.save(btWriter);
-   			irdaWriter = new FileWriter(irdaFileName);
-   			irdaProps.save(irdaWriter);
-   		}
-   		catch(IOException ex)
-   		{
-   			log.error("Error saving BT or Irda ESK files:"+ex.getMessage());
-   		}
-   		finally
-   		{
-   			try{
-   				if(btWriter != null) btWriter.close();
-   				if(irdaWriter != null)irdaWriter.close();
-   			}catch(IOException ex)
-   			{log.error("error closing bt or IrDa .esk configuration files:"
-   					+ ex.getMessage());}
-   		}
-    	
-    }
-    private String getBtEskFileName()
-    {	return epoc32 + getResource("eskFilePath") 
-		+ "\\"+ getResource("bluetooth.eskFileName");
-    }
-    private String getIrdaEskFileName()
-    {	return epoc32 + getResource("eskFilePath") 
-		+ "\\" + getResource("irda.eskFileName");
-    }
+	/**
+	 * The function reads innitial values from .esk files
+	 *
+	 */
+	public void init() throws IOException { //Initialisation of btProps from .esk file:
+		String btFileName = getBtEskFileName();
+
+		FileReader btReader = null;
+		try {
+			btReader = new FileReader(btFileName);
+			btProps.load(btReader);
+		} catch (IOException ex) {
+			throw (ex);
+		} finally {
+			try {
+				if (btReader != null)
+					btReader.close();
+			} catch (IOException ex) {
+				log.error("Error closing BT ESK configuration files:"
+						+ ex.getMessage());
+			}
+		}
+	}
+
+	public void save() {
+		String btFileName = getBtEskFileName();
+
+		FileWriter btWriter = null;
+		try {
+			btWriter = new FileWriter(btFileName);
+			btProps.save(btWriter);
+		} catch (IOException ex) {
+			log.error("Error saving BT ESK files:" + ex.getMessage());
+		} finally {
+			try {
+				if (btWriter != null)
+					btWriter.close();
+			} catch (IOException ex) {
+				log.error("error closing bt .esk configuration files:"
+						+ ex.getMessage());
+			}
+		}
+
+	}
+
+	private String getBtEskFileName() {
+		return epoc32 + getResource("eskFilePath") + "\\"
+				+ getResource("bluetooth.eskFileName");
+	}
+
 }
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PanPlugin.java
--- a/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PanPlugin.java	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PanPlugin.java	Wed Apr 21 09:56:53 2010 +0530
@@ -1,50 +1,47 @@
 /*
-* Copyright (c) 2000 - 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
+ * Copyright (c) 2000 - 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"
+ * 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: 
+ *
+ */
 
 package com.nokia.epdt.plugins.s60.pan;
 
-import org.apache.log4j.Logger;
 import java.awt.Image;
+import java.io.IOException;
+
 import javax.swing.ImageIcon;
 import javax.swing.JPanel;
-import javax.swing.JOptionPane;
+
+import org.apache.log4j.Logger;
+
+import com.nokia.epdt.core.CoreController;
+import com.nokia.epdt.core.CoreUtils;
+import com.nokia.epdt.core.action.Action;
+import com.nokia.epdt.core.action.ActionEventQueue;
+import com.nokia.epdt.core.action.ActionInterface;
+import com.nokia.epdt.core.action.ActionListener;
+import com.nokia.epdt.core.messaging.MessageInterface;
+import com.nokia.epdt.core.messaging.MessageQueue;
 import com.nokia.epdt.core.plugin.CustomPlugin;
 import com.nokia.epdt.core.plugin.PluginType;
-import com.nokia.epdt.core.messaging.MessageInterface;
-import com.nokia.epdt.core.messaging.MessageListener;
-import com.nokia.epdt.core.messaging.Message;
-import com.nokia.epdt.core.messaging.MessageQueue;
-import com.nokia.epdt.core.action.Action;
-import com.nokia.epdt.core.action.ActionInterface;
-import com.nokia.epdt.core.action.ActionListener;
-import com.nokia.epdt.core.action.ActionEventQueue;
-import com.nokia.epdt.core.CoreController;
-import com.nokia.epdt.core.CoreUtils;
-import com.nokia.epdt.core.connection.ConnectionStatus;
-import java.io.IOException;
 
 /**
  * PanPlugin
  *
  * @version 1.0
  */
-public class PanPlugin extends CustomPlugin
-{
+public class PanPlugin extends CustomPlugin {
 	private static Logger log = Logger.getLogger(PanPlugin.class);
 	private static final Integer UID = Integer.valueOf(PanResourceBundle
 			.getInstance().getValue(PanConstants.PLUGIN_UID), 16);
@@ -55,37 +52,33 @@
 	private ActionEventQueue actionEventQueue;
 	private CoreController coreController;
 	private JPanel jPanel;
+
 	/**
 	 * A ActionListener object is used to receive synchronously delivered actions.
 	 */
-	private class PanPluginActionListener implements ActionListener
-	{
-		public void actionPerformed(Action e)
-		{
-			if (e.getName() == Action.PREFERENCES_OK)
-			{
+	private class PanPluginActionListener implements ActionListener {
+		public void actionPerformed(Action e) {
+			if (e.getName() == Action.PREFERENCES_OK) {
 				actionEventQueue.put(new Action(
 						Action.PREFERENCES_REMOVE_PLUGIN_MODEL_CHANGED,
 						PanPlugin.UID, Action.CORE, new int[0]));
 				panModel.save();
 				actionEventQueue.put(new Action(Action.PREFERENCES_HIDE_PLUGIN,
 						PanPlugin.UID, Action.CORE, new int[0]));
-			} else if (e.getName() == Action.PREFERENCES_APPLY)
-			{
+			} else if (e.getName() == Action.PREFERENCES_APPLY) {
 				actionEventQueue.put(new Action(
 						Action.PREFERENCES_REMOVE_PLUGIN_MODEL_CHANGED,
 						PanPlugin.UID, Action.CORE, new int[0]));
 				panModel.save();
-			} else if (e.getName() == Action.PREFERENCES_CANCEL)
-			{
+			} else if (e.getName() == Action.PREFERENCES_CANCEL) {
 			}
 		}
 	}
+
 	/**
 	 * Creates a new instance of PanPlugin
 	 */
-	public PanPlugin()
-	{
+	public PanPlugin() {
 		super();
 
 	}
@@ -94,8 +87,7 @@
 	 * Getter for property pluginUID.
 	 * @return Value of property pluginUID.
 	 */
-	public Integer getPluginUID()
-	{
+	public Integer getPluginUID() {
 		return PanPlugin.UID;
 	}
 
@@ -103,8 +95,7 @@
 	 * Getter for property pluginType.
 	 * @return Value of property pluginType.
 	 */
-	public PluginType getPluginType()
-	{
+	public PluginType getPluginType() {
 		return PluginType.PREFERENCES;
 	}
 
@@ -112,8 +103,7 @@
 	 * Getter for property name.
 	 * @return Value of property name.
 	 */
-	public String getName()
-	{
+	public String getName() {
 		return PanResourceBundle.getInstance().getValue(
 				PanConstants.PLUGIN_NAME);
 	}
@@ -122,8 +112,7 @@
 	 * Getter for property icon.
 	 * @return Value of property icon.
 	 */
-	public Image getIcon(int type)
-	{
+	public Image getIcon(int type) {
 		return (new ImageIcon()).getImage();
 	}
 
@@ -131,10 +120,8 @@
 	 * Getter for property jPanelView.
 	 * @return plug-in module user interface
 	 */
-	public JPanel getJPanelView()
-	{
-		if (jPanel == null)
-		{
+	public JPanel getJPanelView() {
+		if (jPanel == null) {
 			jPanel = new PanPluginJPanel(this);
 		}
 		return jPanel;
@@ -144,14 +131,11 @@
 	 * Bind the plugin's with the epdt core.
 	 * @param c instance of CoreController that is assosiated with this plugin
 	 */
-	public void bindCore(CoreController c)
-	{
-		try
-		{
+	public void bindCore(CoreController c) {
+		try {
 			panModel = new PanModel(CoreUtils.EpocRoot());
-		} catch (IOException ex)
-		{ //TODO: do something to prevent view from loading
-			log.error("Error loading BT or Irda ESK files: " + ex.getMessage());
+		} catch (IOException ex) { //TODO: do something to prevent view from loading
+			log.error("Error loading BT ESK files: " + ex.getMessage());
 		}
 		coreController = c;
 	}
@@ -160,16 +144,14 @@
 	 * Bind the plugin's with the message interface.
 	 * @param m the message interface which is used to send and receive messages
 	 */
-	public void bindMessageInterface(MessageInterface m)
-	{
+	public void bindMessageInterface(MessageInterface m) {
 	}
 
 	/**
 	 * Bind the plugin's with the action interface.
 	 * @param a the action interface which is used to mediate and receive actions
 	 */
-	public void bindActionInterface(ActionInterface a)
-	{
+	public void bindActionInterface(ActionInterface a) {
 		a.setActionListener(new PanPlugin.PanPluginActionListener(),
 				PanPlugin.UID, ActionListener.PLUGIN);
 		this.actionEventQueue = a.getActionEventQueue();
@@ -178,10 +160,8 @@
 	/**
 	 * Notifies the core that a plugin model is changed
 	 */
-	public void pluginModelChangedAction()
-	{
-		if (actionEventQueue != null)
-		{
+	public void pluginModelChangedAction() {
+		if (actionEventQueue != null) {
 			actionEventQueue.put(new Action(
 					Action.PREFERENCES_PLUGIN_MODEL_CHANGED, PanPlugin.UID,
 					Action.CORE, new int[0]));
@@ -192,8 +172,7 @@
 	 * Returns the data model for this plugin
 	 * @return the data model
 	 */
-	PanModel getModel()
-	{
+	PanModel getModel() {
 		return panModel;
 	}
 }
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PanPluginJPanel.java
--- a/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PanPluginJPanel.java	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PanPluginJPanel.java	Wed Apr 21 09:56:53 2010 +0530
@@ -1,61 +1,53 @@
 /*
-* Copyright (c) 2000 - 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
+ * Copyright (c) 2000 - 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"
+ * 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: 
+ *
+ */
 
 package com.nokia.epdt.plugins.s60.pan;
 
 /* java.awt */
 import java.awt.Component;
-import java.awt.BorderLayout;
+import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.awt.GridBagConstraints;
-
-/* java.awt.event */
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-/* javax.swing */
-import javax.swing.Icon;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
+import javax.swing.ButtonGroup;
+import javax.swing.JComboBox;
 import javax.swing.JLabel;
-import javax.swing.JComboBox;
+import javax.swing.JPanel;
 import javax.swing.JRadioButton;
-import javax.swing.ButtonGroup;
-
-/* javax.swing.border */
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
-/* com.nokia.wtk.util.gui */
+import org.apache.log4j.Logger;
+
+import com.nokia.epdt.core.CoreUtils;
+import com.nokia.wtk.util.gui.BorderPanel;
 import com.nokia.wtk.util.gui.GUI;
-import com.nokia.wtk.util.gui.BorderPanel;
 
 /**
  * PanPluginJPanel
  *
  * @version 1.0
  */
-class PanPluginJPanel extends JPanel
-{
+class PanPluginJPanel extends JPanel {
+	private static Logger log = Logger.getLogger(PanPluginJPanel.class);
 	private static final int GAP = 6;
 	private static final String AUTO_PORT = "auto";
-	private static final String[] HCI_MODULES = new String[]{"BCSP", "H4",
-			"USB"};
+	private static final String[] HCI_MODULES = new String[] { "BCSP"/*, "H4", "USB"*/ };
 	private static final int HCI_USB_INDEX = 2;
 	private static final int MAX_COM_PORTS = 16;
 
@@ -67,30 +59,24 @@
 	private JRadioButton bluetoothDisableJRadioButton;
 	private JRadioButton bluetoothEnableJRadioButton;
 	private JComboBox bluetoothHciJComboBox;
-	private JComboBox irdaComPortJComboBox;
-	private JRadioButton irdaDisableJRadioButton;
-	private JRadioButton irdaEnableJRadioButton;
 
 	/**
 	 * Creates new form PanPluginJPanel
 	 * @param plugin the plugin that creates this panel
 	 * @param connected <code>true</code> if we are connected to the emulator
 	 */
-	PanPluginJPanel(PanPlugin plugin)
-	{
+	PanPluginJPanel(PanPlugin plugin) {
 		super(new GridBagLayout());
 		panPlugin = plugin;
 		panModel = plugin.getModel();
 		initComponents();
 	}
 
-	private static String getResString(String key)
-	{
+	private static String getResString(String key) {
 		return PanResourceBundle.getInstance().getValue(key);
 	}
 
-	JPanel buildOnePanel(String t, JRadioButton b1, JRadioButton b2, JPanel c)
-	{
+	JPanel buildOnePanel(String t, JRadioButton b1, JRadioButton b2, JPanel c) {
 		BorderPanel bp = new BorderPanel(b2);
 		bp.getContentPanel().add(c);
 
@@ -120,15 +106,11 @@
 	/** This method is called from within the constructor to
 	 * initialize the form.
 	 */
-	private void initComponents()
-	{
+	private void initComponents() {
 		Object[] btComPorts = new Object[MAX_COM_PORTS];
-		Object[] irdaComPorts = new Object[MAX_COM_PORTS];
-		for (int i = 0; i < MAX_COM_PORTS; i++)
-		{
+		for (int i = 0; i < MAX_COM_PORTS; i++) {
 			String label = Integer.toString(i + 1);
 			btComPorts[i] = new ComPortItem(label);
-			irdaComPorts[i] = label;
 		}
 
 		bluetoothDisableJRadioButton = new JRadioButton(
@@ -137,21 +119,16 @@
 				getResString(PanConstants.BLUETOOTH_ENABLE_LABEL));
 		bluetoothComPortJComboBox = new JComboBox(btComPorts);
 		bluetoothHciJComboBox = new JComboBox(HCI_MODULES);
-		irdaDisableJRadioButton = new JRadioButton(
-				getResString(PanConstants.IRDA_DISABLE_LABEL));
-		irdaEnableJRadioButton = new JRadioButton(
-				getResString(PanConstants.IRDA_ENABLE_LABEL));
-		irdaComPortJComboBox = new JComboBox(irdaComPorts);
 
 		// Bluetooth
 		JPanel bluetoothEnableJPanel = GUI
-				.createRowPanel(new Component[]{
+				.createRowPanel(new Component[] {
 						new JLabel(
 								getResString(PanConstants.BLUETOOTH_COM_PORT_LABEL)),
 						bluetoothComPortJComboBox,
 						new JLabel(
 								getResString(PanConstants.BLUETOOTH_COM_HCI_LABEL)),
-						bluetoothHciJComboBox});
+						bluetoothHciJComboBox });
 
 		JPanel bluetoothJPanel = buildOnePanel(
 				getResString(PanConstants.BLUETOOTH_BORDER_TITLE),
@@ -160,76 +137,31 @@
 
 		ButtonGroup bluetoothButtonGroup = new ButtonGroup();
 		bluetoothButtonGroup.add(bluetoothDisableJRadioButton);
-		bluetoothDisableJRadioButton.addActionListener(new ActionListener()
-		{
-			public void actionPerformed(ActionEvent evt)
-			{
+		bluetoothDisableJRadioButton.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
 				bluetoothDisableJRadioButtonActionPerformed(evt);
 			}
 		});
 
 		bluetoothButtonGroup.add(bluetoothEnableJRadioButton);
-		bluetoothEnableJRadioButton.addActionListener(new ActionListener()
-		{
-			public void actionPerformed(ActionEvent evt)
-			{
+		bluetoothEnableJRadioButton.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
 				bluetoothEnableJRadioButtonActionPerformed(evt);
 			}
 		});
 
-		bluetoothComPortJComboBox.addActionListener(new ActionListener()
-		{
-			public void actionPerformed(ActionEvent evt)
-			{
+		bluetoothComPortJComboBox.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
 				bluetoothComPortJComboBoxActionPerformed(evt);
 			}
 		});
 
-		bluetoothHciJComboBox.addActionListener(new ActionListener()
-		{
-			public void actionPerformed(ActionEvent evt)
-			{
+		bluetoothHciJComboBox.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
 				bluetoothHciJComboBoxActionPerformed(evt);
 			}
 		});
 
-		// IRDA
-		JPanel irdaEnableJPanel = GUI.createRowPanel(new Component[]{
-				new JLabel(getResString(PanConstants.IRDA_COM_PORT_LABEL)),
-				irdaComPortJComboBox});
-
-		JPanel irdaJPanel = buildOnePanel(
-				getResString(PanConstants.IRDA_BORDER_TITLE),
-				irdaDisableJRadioButton, irdaEnableJRadioButton,
-				irdaEnableJPanel);
-
-		ButtonGroup irdaButtonGroup = new ButtonGroup();
-		irdaButtonGroup.add(irdaDisableJRadioButton);
-		irdaDisableJRadioButton.addActionListener(new ActionListener()
-		{
-			public void actionPerformed(ActionEvent evt)
-			{
-				irdaDisableJRadioButtonActionPerformed(evt);
-			}
-		});
-
-		irdaButtonGroup.add(irdaEnableJRadioButton);
-		irdaEnableJRadioButton.addActionListener(new ActionListener()
-		{
-			public void actionPerformed(ActionEvent evt)
-			{
-				irdaEnableJRadioButtonActionPerformed(evt);
-			}
-		});
-
-		irdaComPortJComboBox.addActionListener(new ActionListener()
-		{
-			public void actionPerformed(ActionEvent evt)
-			{
-				irdaComPortJComboBoxActionPerformed(evt);
-			}
-		});
-
 		JPanel row = new JPanel(new GridBagLayout());
 		GridBagConstraints gbc = new GridBagConstraints();
 		gbc.gridheight = GridBagConstraints.REMAINDER;
@@ -241,7 +173,6 @@
 
 		gbc.insets.right = 0;
 		gbc.gridwidth = GridBagConstraints.REMAINDER;
-		row.add(irdaJPanel, gbc);
 
 		gbc.gridheight = 1;
 		gbc.fill = GridBagConstraints.HORIZONTAL;
@@ -255,103 +186,83 @@
 
 		//Set the initial values, obtained from .esk files:
 		update();
+		log.debug("Done initComponents");
 	}
 
 	/**
 	 * Update UI components from Model:
 	 */
-	public void update()
-	{
+	public void update() {
+		log.debug("update() updateInProgress: " + updateInProgress);
 		// Update Bluetooth panel
-		if (!updateInProgress)
-		{//If the function is not called as the result of components updates,
-			//i.e. there is no update ongiong already
-			updateInProgress = true;
-			boolean bluetoothEnabled = panModel.isBluetoothEnabled();
-			int hci = panModel.getBluetoothHci();
-			boolean usb = (hci == HCI_USB_INDEX);
-			bluetoothDisableJRadioButton.setSelected(!bluetoothEnabled);
-			bluetoothEnableJRadioButton.setSelected(bluetoothEnabled);
-			bluetoothHciJComboBox.setSelectedIndex(bluetoothEnabled ? hci : -1);
-			bluetoothHciJComboBox.setEnabled(bluetoothEnabled);
-			bluetoothComPortJComboBox.setEnabled(bluetoothEnabled);
-			bluetoothComPortJComboBox.setSelectedIndex(panModel
-					.getBluetoothComPort());
-			bluetoothComPortJComboBox.setEnabled(bluetoothEnabled && !usb);
+		try {
+			if (!updateInProgress)
+				log.debug("Inside if loop of update");
+			{//If the function is not called as the result of components updates,
+				//i.e. there is no update ongiong already
+				updateInProgress = true;
+				boolean bluetoothEnabled = panModel.isBluetoothEnabled();
+				log.debug("bluetooth Enable: " + bluetoothEnabled);
+				int hci = panModel.getBluetoothHci();
+				boolean usb = (hci == HCI_USB_INDEX);
+				log.debug("hci USB index: " + hci);
+				bluetoothDisableJRadioButton.setSelected(!bluetoothEnabled);
+				bluetoothEnableJRadioButton.setSelected(bluetoothEnabled);
+				bluetoothHciJComboBox.setSelectedIndex(bluetoothEnabled ? hci
+						: -1);
+				bluetoothHciJComboBox.setEnabled(bluetoothEnabled);
+				bluetoothComPortJComboBox.setEnabled(bluetoothEnabled);
+				log.debug("bluetooth COM port: " + panModel.getBluetoothComPort());
+				bluetoothComPortJComboBox.setSelectedIndex(panModel
+						.getBluetoothComPort());
+				bluetoothComPortJComboBox.setEnabled(bluetoothEnabled && !usb);
 
-			// Update IRDA panel
-			boolean irdaEnabled = panModel.isIrdaEnabled();
-			irdaDisableJRadioButton.setSelected(!irdaEnabled);
-			irdaEnableJRadioButton.setSelected(irdaEnabled);
-			irdaComPortJComboBox.setEnabled(irdaEnabled);
-			irdaComPortJComboBox.setSelectedIndex(panModel.getIrdaComPort());
-			updateInProgress = false;
+				updateInProgress = false;
+				log.debug("If loop over");
+			}
+		} catch (RuntimeException e) {
+			log.debug("Runtime Exception: " + e.getMessage());
+			e.printStackTrace();
 		}
 	}
 
-	private void irdaComPortJComboBoxActionPerformed(ActionEvent evt)
-	{
-		if (!updateInProgress)
-		{//I.e. if update came from UI
-			if (panModel.getBluetoothHci() == panModel.BT_HCI_USB_INDEX || 
-					//HCI is not USB, where com port is selected automatically
-				irdaComPortJComboBox.getSelectedIndex() != panModel
-					.getBluetoothComPort())
-				//or com ports are different
-			{
-				panModel
-						.setIrdaComPort(irdaComPortJComboBox.getSelectedIndex());
-				panPlugin.pluginModelChangedAction();
-			} else
-			{
-				irdaComPortJComboBox
-						.setSelectedIndex(panModel.getIrdaComPort());
-				JOptionPane.showMessageDialog(this,
-						getResString("comPortEqualWarning"),
-						getResString("dialogTitle"), JOptionPane.ERROR_MESSAGE);
+	private void bluetoothEnableJRadioButtonActionPerformed(ActionEvent evt) {
+		if (!updateInProgress) {//I.e. if update came from UI
+
+			log.debug(CoreUtils.EpocRoot() + FindAvailablePort.EXECUTABLE_FILE_NAME);
+
+			FindAvailablePort availPort = FindAvailablePort.findAvailablePort();
+			String port = null;
+			try {
+				port = availPort.getAvailablePortForBT(CoreUtils.EpocRoot()
+						+ FindAvailablePort.EXECUTABLE_FILE_NAME);
+
+				if (port == null) {
+					log.debug(FindAvailablePort.NO_AVAILABLE_PORT_MESSAGE);
+					// We set the default values of com ports (COM 1) when
+					// switching from disabled mode
+					panModel.setBluetoothComPort(0);
+				} else {
+					log.debug(FindAvailablePort.AVAILABLE_PORT_MESSAGE + port);
+					// Set the port
+					int setTempPort = Integer.parseInt(port.trim())-1;
+					panModel.setBluetoothComPort(setTempPort);
+					System.out.println("Output: " + port);
+				}
+			} catch (Exception e) {
+				log.debug("Error reading COM port. BT enabled. Port set to 1.");
+				// Set the default port 1 as a BT port and enable the BT
+				panModel.setBluetoothComPort(0);
+				e.printStackTrace();
 			}
-		}
-	}
 
-	private void irdaEnableJRadioButtonActionPerformed(ActionEvent evt)
-	{
-		if (!updateInProgress)
-		{//I.e. if update came from UI
-			//We set the default values of com ports (COM 1) when switching
-			//from disabled mode
-			panModel.setIrdaComPort(0);
 			panPlugin.pluginModelChangedAction();
 			update();
 		}
 	}
 
-	private void irdaDisableJRadioButtonActionPerformed(ActionEvent evt)
-	{
-		if (!updateInProgress)
-		{//I.e. if update came from UI
-			//Setting com port to -1 means disabling it
-			panModel.setIrdaComPort(-1);
-			panPlugin.pluginModelChangedAction();
-			update();
-		}
-	}
-
-	private void bluetoothEnableJRadioButtonActionPerformed(ActionEvent evt)
-	{
-		if (!updateInProgress)
-		{//I.e. if update came from UI
-			//We set the default values of com ports (COM 1) when switching
-			//from disabled mode
-			panModel.setBluetoothComPort(0);
-			panPlugin.pluginModelChangedAction();
-			update();
-		}
-	}
-
-	private void bluetoothDisableJRadioButtonActionPerformed(ActionEvent evt)
-	{
-		if (!updateInProgress)
-		{//I.e. if update came from UI
+	private void bluetoothDisableJRadioButtonActionPerformed(ActionEvent evt) {
+		if (!updateInProgress) {//I.e. if update came from UI
 			//Setting com port to -1 means disabling it
 			panModel.setBluetoothComPort(-1);
 			panPlugin.pluginModelChangedAction();
@@ -359,13 +270,10 @@
 		}
 	}
 
-	private void bluetoothHciJComboBoxActionPerformed(ActionEvent evt)
-	{
-		if (!updateInProgress)
-		{//I.e. if update came from UI
+	private void bluetoothHciJComboBoxActionPerformed(ActionEvent evt) {
+		if (!updateInProgress) {//I.e. if update came from UI
 			int index = bluetoothHciJComboBox.getSelectedIndex();
-			if (index >= 0)
-			{
+			if (index >= 0) {
 				panModel.setBluetoothHci(index);
 				panPlugin.pluginModelChangedAction();
 				update();
@@ -373,38 +281,25 @@
 		}
 	}
 
-	private void bluetoothComPortJComboBoxActionPerformed(ActionEvent evt)
-	{
-		if (!updateInProgress)
-		{//I.e. if update came from UI
-			if (bluetoothComPortJComboBox.getSelectedIndex() != panModel
-					.getIrdaComPort())
-			{
-				panModel.setBluetoothComPort(bluetoothComPortJComboBox
-						.getSelectedIndex());
-				panPlugin.pluginModelChangedAction();
-			} else
-			{
-				bluetoothComPortJComboBox.setSelectedIndex(panModel
-						.getBluetoothComPort());
-				JOptionPane.showMessageDialog(this,
-						getResString("comPortEqualWarning"),
-						getResString("dialogTitle"), JOptionPane.ERROR_MESSAGE);
-			}
+	private void bluetoothComPortJComboBoxActionPerformed(ActionEvent evt) {
+		if (!updateInProgress) {//I.e. if update came from UI
+
+			panModel.setBluetoothComPort(bluetoothComPortJComboBox
+					.getSelectedIndex());
+			panPlugin.pluginModelChangedAction();
 		}
 	}
 
-	private class ComPortItem
-	{
+	private class ComPortItem {
 		private String comPortNumber;
-		ComPortItem(String label)
-		{
+
+		ComPortItem(String label) {
 			comPortNumber = label;
 		}
-		public String toString()
-		{
-			return panModel.getBluetoothHci() == HCI_USB_INDEX
-					? AUTO_PORT
+
+		public String toString() {
+			
+			return panModel.getBluetoothHci() == HCI_USB_INDEX ? AUTO_PORT
 					: comPortNumber;
 		}
 	}
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PropSets.java
--- a/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PropSets.java	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/PropSets.java	Wed Apr 21 09:56:53 2010 +0530
@@ -1,142 +1,138 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
+ * 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"
+ * 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:
+ *
+ */
 package com.nokia.epdt.plugins.s60.pan;
 
-import java.util.Properties;
+import java.io.FileReader;
 import java.io.FileWriter;
-import java.io.FileReader;
+import java.io.IOException;
 import java.io.LineNumberReader;
-import java.io.IOException;
+import java.util.Enumeration;
 import java.util.LinkedList;
-import java.util.Enumeration;
+import java.util.Properties;
 
 /**
  * 
- * Class PropSets
- * Contains a number of property sets - Sections, each Section is titled:
- *	[title1]
- *	property11= value11
- *	property12= value12
- *
- *	[titleN]
- *	propertyNK= valueNK
- *
- */	
-public class PropSets
-	{
+ * Class PropSets Contains a number of property sets - Sections, each Section is
+ * titled: [title1] property11= value11 property12= value12
+ * 
+ * [titleN] propertyNK= valueNK
+ * 
+ */
+public class PropSets {
 	LinkedList sections = new LinkedList();
-	
-	private class Section
-	{
+
+	private class Section {
 		private String title = new String();
 		private Properties props = new Properties();
-		public Properties getProps()
-		{
+
+		public Properties getProps() {
 			return props;
 		}
-		public void setTitle(String title)
-		{ this.title = title; }
-		public String getTitle()
-		{ return title; }
-		public String getValue(String key)
-		{ return (String)props.get(key); }
-		public void setValue(String key, String value)
-		{ props.put(key, value); }
+
+		public void setTitle(String title) {
+			this.title = title;
+		}
+
+		public String getTitle() {
+			return title;
+		}
 
-		
+		public String getValue(String key) {
+			return (String) props.get(key);
+		}
+
+		public void setValue(String key, String value) {
+			props.put(key, value);
+		}
+
 		/**
 		 * Function for saving a section into FileOutputStream
+		 * 
 		 * @param writer
 		 * @throws IOException
 		 */
-		public void save(FileWriter writer) throws IOException
-		{	
+		public void save(FileWriter writer) throws IOException {
 			String newLine = System.getProperty("line.separator");
 			writer.write(title + newLine);
-			//props.store(writer, null);
+			// props.store(writer, null);
 			Enumeration keys = props.keys();
-			while(keys.hasMoreElements())
-			{
-				String key = (String)keys.nextElement();
-				writer.write(key+"= "+props.getProperty(key)+newLine);
+			while (keys.hasMoreElements()) {
+				String key = (String) keys.nextElement();
+				writer.write(key + "= " + props.getProperty(key) + newLine);
 			}
 			writer.write(newLine);
 		}
 	}
-	
 
 	/**
 	 * Loading sections from file
 	 */
-	public void load(FileReader reader) throws IOException
-	{
+	public void load(FileReader reader) throws IOException {
 		LineNumberReader lineReader = new LineNumberReader(reader);
 		Section currentSection = null;
 		String currentLine;
 
-		while((currentLine = lineReader.readLine()) != null)
-		{
-			if(currentLine.startsWith("[") && currentLine.endsWith("]"))
-			{	//Found a title, i.e. new section
-				//set the new section to be current, the old one will be garbage-collected
+		while ((currentLine = lineReader.readLine()) != null) {
+			if (currentLine.startsWith("[") && currentLine.endsWith("]")) {
+				// Found a title, i.e. new section set the new section
+				// to be current, the old one will be garbage-collected
 				currentSection = new Section();
 				currentSection.setTitle(currentLine);
 				sections.add(currentSection);
-			}
-			else//Found a property
+			} else// Found a property
 			{
-				if(currentSection != null)
-				{	//if there is no current section, we didn't find a title first
-					//therefore we skip the property
+				if (currentSection != null) {
+					// if there is no current section, we didn't find a
+					// title first therefore we skip the property
 					String[] propPair;// = new String[2];
 					propPair = currentLine.toString().split("= ", 2);
-					if(propPair.length==2)
-					{//If we split successfully, add key-value pair, if not - skip the line
+					if (propPair.length == 2) {
+						// If we split successfully, add key-value pair,
+						// if not - skip the line
 						currentSection.getProps().put(propPair[0], propPair[1]);
 					}
 				}
 			}
 		}
 	}
+
 	/**
 	 * Saving Sections to a file
-	 *
+	 * 
 	 */
-	public void save(FileWriter writer) throws IOException
-	{
-		for(int i=0; i< sections.size();i++)
-		{
-			((Section)sections.get(i)).save(writer);
+	public void save(FileWriter writer) throws IOException {
+		for (int i = 0; i < sections.size(); i++) {
+			((Section) sections.get(i)).save(writer);
 		}
 		writer.flush();
 	}
+
 	/**
 	 * Function returns a property value, specified by section name and key
+	 * 
 	 * @param sectionName
 	 * @param key
 	 * @return
 	 */
-	public String getValue(String sectionName, String key)
-	{
-		for(int i=0; i<sections.size(); i++)
-		{
-			if(sectionName.equals( ((Section)sections.get(i)).getTitle() ))
-			{//Found specified section
-				return ((Section)sections.get(i)).getValue(key);
+	public String getValue(String sectionName, String key) {
+		for (int i = 0; i < sections.size(); i++) {
+			if (sectionName.equals(((Section) sections.get(i)).getTitle())) {
+				// Found specified section
+				return ((Section) sections.get(i)).getValue(key);
 			}
 		}
 		return null;
@@ -144,22 +140,20 @@
 
 	/**
 	 * Function sets a property value, specified by section name and key
+	 * 
 	 * @param sectionName
 	 * @param key
 	 * @return 0=success, -1 = error
 	 */
-	public int setValue(String sectionName, String key, String value)
-	{
-		for(int i=0; i<sections.size(); i++)
-		{
-			if(sectionName.equals( ((Section)sections.get(i)).getTitle() ))
-			{//Found specified section
-			((Section)sections.get(i)).setValue(key, value);
-			return 0;
+	public int setValue(String sectionName, String key, String value) {
+		for (int i = 0; i < sections.size(); i++) {
+			if (sectionName.equals(((Section) sections.get(i)).getTitle())) {
+				// Found specified section
+				((Section) sections.get(i)).setValue(key, value);
+				return 0;
 			}
 		}
 		return -1;
-	}	
-	
-	
-	}
\ No newline at end of file
+	}
+
+}
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/pan.properties
--- a/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/pan.properties	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/pan/pan.properties	Wed Apr 21 09:56:53 2010 +0530
@@ -4,7 +4,7 @@
 target.uid=10202059
 # UI labels:
 title=PAN
-message=The emulator must be restarted in order to activate the bluetooth and irda changes.
+message=The emulator must be restarted in order to activate the bluetooth changes.
 comPortEqualWarning=Com ports for bluetooth and IrDa can't be equal
 dialogTitle = Preferences
 bluetooth.border.title=Bluetooth
@@ -12,17 +12,10 @@
 bluetooth.enable.label=Enable
 bluetooth.com.port.label=COM:
 bluetooth.hci.label=HCI:
-irda.border.title=IrDA
-irda.disable.label=Disable
-irda.enable.label=Enable
-irda.com.port.label=COM:
 # ESK file configuration staff:
-eskFilePath=epoc32\\release\\winscw\\udeb\\z\\private\\101f7989\\ESock
-bluetooth.eskFileName=bt.bt.esk
-irda.eskFileName=ir.irda.esk
-bluetooth.esk.sectionName= [hci]
+eskFilePath=epoc32\\release\\winscw\\udeb\\z\\private\\101f7989\\bluetooth
+bluetooth.eskFileName=hctl_uart_original.ini
+bluetooth.esk.sectionName= [hctl]
 bluetooth.esk.portKey= port
 bluetooth.esk.dllKey= hcidllfilename
-irda.esk.sectionName= [tinytp]
-irda.esk.portKey= irPhysicalComPort
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/securityconf/SecConfMainPanel.java
--- a/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/securityconf/SecConfMainPanel.java	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/securityconf/SecConfMainPanel.java	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 - 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".
 *
@@ -27,6 +27,7 @@
 import java.awt.event.ActionListener;
 
 /* javax.swing */
+import javax.swing.JLabel;
 import javax.swing.JTable;
 import javax.swing.JPanel;
 import javax.swing.JComboBox;
@@ -77,15 +78,18 @@
         jDomainCombo = new JComboBox(domains);
         jDomainCombo.setSelectedItem(secConfModel.getSelectedDomain());
 
-        JRadioButton realLifeRadio = new JRadioButton(
-            "Run MIDlets within security domain specified by their certificates");
-        JRadioButton emulatedRadio = new JRadioButton(
-            "Run MIDlets within the following domain:");
+       // JRadioButton realLifeRadio = new JRadioButton(
+       //     "Run MIDlets within security domain specified by their certificates");
+       // JRadioButton emulatedRadio = new JRadioButton(
+       //     "Run MIDlets within the following domain:");
+        JLabel obj_JLabel = new JLabel("Run MIDlets within the following domain:");
+        
 
         ButtonGroup bg = new ButtonGroup();
-        bg.add(realLifeRadio);
-        bg.add(emulatedRadio);
-        if (secConfModel.isEmulatedSecurityMode()) {
+      //  bg.add(realLifeRadio);
+      //  bg.add(emulatedRadio);
+      //  bg.add(obj_JLabel);
+    /*    if (secConfModel.isEmulatedSecurityMode()) {
             realLifeRadio.setSelected(false);
             emulatedRadio.setSelected(true);
             jDomainCombo.setEnabled(true);
@@ -93,13 +97,14 @@
             realLifeRadio.setSelected(true);
             emulatedRadio.setSelected(false);
             jDomainCombo.setEnabled(false);
-        }
+        }*/
 
         jDomainCombo.addActionListener(new DomainSelectionListener());
-        realLifeRadio.addActionListener(new RealLifeRadioListener());
-        emulatedRadio.addActionListener(new EmulatedRadioListener());
+       // realLifeRadio.addActionListener(new RealLifeRadioListener());
+       // emulatedRadio.addActionListener(new EmulatedRadioListener());
 
-        BorderPanel bp = new BorderPanel(emulatedRadio);
+       // BorderPanel bp = new BorderPanel(emulatedRadio);
+        BorderPanel bp = new BorderPanel(obj_JLabel);
         bp.getContentPanel().add(createConfigurationsPanel());
 
         ProtectionDomain d = secConfModel.getSelectedDomain();
@@ -128,7 +133,7 @@
         gbc.anchor = GridBagConstraints.NORTH;
         gbc.insets.left = bp.getBorder().getBorderInsets(bp).left +
             BorderPanel.COMPONENT_INSET_H;
-        add(realLifeRadio, gbc);
+        //add(realLifeRadio, gbc);
 
         gbc.weighty = 1.0;
         gbc.insets.left = 0;
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/securityconf/SecConfModel.java
--- a/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/securityconf/SecConfModel.java	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkconnectivityfw/emuconnectmanager/epdt_java/src/com/nokia/epdt/plugins/s60/securityconf/SecConfModel.java	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2000 - 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".
 *
@@ -85,6 +85,9 @@
             domains = new ArrayList(iProtectionDomains);
             for (int i=domains.size()-1; i>=0; i--) {
                 ProtectionDomain domain = (ProtectionDomain)domains.get(i);
+                
+                if( i ==5 || i == 6)
+                	domains.remove(i);
                 if (domain.isHidden()) domains.remove(i);
             }
         }
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/Doxyfiles/footer.html
--- a/sdkcreationmw/sdkexamples/cppexamples/Doxyfiles/footer.html	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/Doxyfiles/footer.html	Wed Apr 21 09:56:53 2010 +0530
@@ -1,49 +1,482 @@
-<hr>
-
-<table x-use-null-cells
-		style="x-cell-content-align: top;
-				width: 100%;
-				border-spacing: 0px;
-				border-spacing: 0px;"
-		cellspacing=0
-		width=100%>
-  <col style="width: 50%;">
-  <col style="width: 50%;">
+<html xmlns:v="urn:schemas-microsoft-com:vml"
+xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
+xmlns="http://www.w3.org/TR/REC-html40">
 
-  <tr style="x-cell-content-align: top;"
-	valign=top>
-  <td style="width: 50%;
-			padding-right: 10px;
-			padding-left: 10px;
-			border-right-style: None;
-			border-left-style: None;
-			border-top-style: None;
-			border-bottom-style: None;"
-	width=50%>
-  <p style="font-family: Arial;"><small style="font-size: smaller;">© Nokia 2009</small></td>
-  <td style="width: 50%;
-			padding-right: 10px;
-			padding-left: 10px;
-			border-top-style: None;
-			border-bottom-style: None;
-			border-right-style: None;"
-	width=50%>
-  <p style="text-align: right; margin-right: -4px;"
-	align=right><span style="font-weight: bold;"><a href="#Top"
-													title="Back to top"><img
- src="top.gif"
-	x-maintain-ratio=TRUE
-	alt="Back to top"
-	style="border: none;
-			width: 18px;
-			height: 15px;
-			float: none;
-			border-style: none;
-			border-style: none;"
-	width=18
-	height=15
-	border=0></a></span></td></tr>
- </table>
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 12">
+<meta name=Originator content="Microsoft Word 12">
+<link rel=File-List href="footer_files/filelist.xml">
+<link rel=Edit-Time-Data href="footer_files/editdata.mso">
+<!--[if !mso]>
+<style>
+v\:* {behavior:url(#default#VML);}
+o\:* {behavior:url(#default#VML);}
+w\:* {behavior:url(#default#VML);}
+.shape {behavior:url(#default#VML);}
+</style>
+<![endif]--><!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Author>rnagendr</o:Author>
+  <o:LastAuthor>rnagendr</o:LastAuthor>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>0</o:TotalTime>
+  <o:Created>2010-01-11T11:15:00Z</o:Created>
+  <o:LastSaved>2010-01-11T11:15:00Z</o:LastSaved>
+  <o:Pages>1</o:Pages>
+  <o:Words>23</o:Words>
+  <o:Characters>132</o:Characters>
+  <o:Company>Nokia</o:Company>
+  <o:Lines>1</o:Lines>
+  <o:Paragraphs>1</o:Paragraphs>
+  <o:CharactersWithSpaces>154</o:CharactersWithSpaces>
+  <o:Version>12.00</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]-->
+<link rel=themeData href="footer_files/themedata.thmx">
+<link rel=colorSchemeMapping href="footer_files/colorschememapping.xml">
+<!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackMoves>false</w:TrackMoves>
+  <w:TrackFormatting/>
+  <w:ValidateAgainstSchemas/>
+  <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
+  <w:IgnoreMixedContent>false</w:IgnoreMixedContent>
+  <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
+  <w:DoNotPromoteQF/>
+  <w:LidThemeOther>EN-US</w:LidThemeOther>
+  <w:LidThemeAsian>X-NONE</w:LidThemeAsian>
+  <w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>
+  <w:Compatibility>
+   <w:BreakWrappedTables/>
+   <w:SnapToGridInCell/>
+   <w:WrapTextWithPunct/>
+   <w:UseAsianBreakRules/>
+   <w:DontGrowAutofit/>
+   <w:SplitPgBreakAndParaMark/>
+   <w:DontVertAlignCellWithSp/>
+   <w:DontBreakConstrainedForcedTables/>
+   <w:DontVertAlignInTxbx/>
+   <w:Word11KerningPairs/>
+   <w:CachedColBalance/>
+  </w:Compatibility>
+  <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
+  <m:mathPr>
+   <m:mathFont m:val="Cambria Math"/>
+   <m:brkBin m:val="before"/>
+   <m:brkBinSub m:val="&#45;-"/>
+   <m:smallFrac m:val="off"/>
+   <m:dispDef/>
+   <m:lMargin m:val="0"/>
+   <m:rMargin m:val="0"/>
+   <m:defJc m:val="centerGroup"/>
+   <m:wrapIndent m:val="1440"/>
+   <m:intLim m:val="subSup"/>
+   <m:naryLim m:val="undOvr"/>
+  </m:mathPr></w:WordDocument>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:LatentStyles DefLockedState="false" DefUnhideWhenUsed="true"
+  DefSemiHidden="true" DefQFormat="false" DefPriority="99"
+  LatentStyleCount="267">
+  <w:LsdException Locked="false" Priority="0" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="Normal"/>
+  <w:LsdException Locked="false" Priority="9" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="heading 1"/>
+  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 2"/>
+  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 3"/>
+  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 4"/>
+  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 5"/>
+  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 6"/>
+  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 7"/>
+  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 8"/>
+  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 9"/>
+  <w:LsdException Locked="false" Priority="39" Name="toc 1"/>
+  <w:LsdException Locked="false" Priority="39" Name="toc 2"/>
+  <w:LsdException Locked="false" Priority="39" Name="toc 3"/>
+  <w:LsdException Locked="false" Priority="39" Name="toc 4"/>
+  <w:LsdException Locked="false" Priority="39" Name="toc 5"/>
+  <w:LsdException Locked="false" Priority="39" Name="toc 6"/>
+  <w:LsdException Locked="false" Priority="39" Name="toc 7"/>
+  <w:LsdException Locked="false" Priority="39" Name="toc 8"/>
+  <w:LsdException Locked="false" Priority="39" Name="toc 9"/>
+  <w:LsdException Locked="false" Priority="35" QFormat="true" Name="caption"/>
+  <w:LsdException Locked="false" Priority="10" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="Title"/>
+  <w:LsdException Locked="false" Priority="1" Name="Default Paragraph Font"/>
+  <w:LsdException Locked="false" Priority="11" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="Subtitle"/>
+  <w:LsdException Locked="false" Priority="22" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="Strong"/>
+  <w:LsdException Locked="false" Priority="20" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="Emphasis"/>
+  <w:LsdException Locked="false" Priority="59" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Table Grid"/>
+  <w:LsdException Locked="false" UnhideWhenUsed="false" Name="Placeholder Text"/>
+  <w:LsdException Locked="false" Priority="1" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="No Spacing"/>
+  <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light Shading"/>
+  <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light List"/>
+  <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light Grid"/>
+  <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Shading 1"/>
+  <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Shading 2"/>
+  <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium List 1"/>
+  <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium List 2"/>
+  <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 1"/>
+  <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 2"/>
+  <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 3"/>
+  <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Dark List"/>
+  <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful Shading"/>
+  <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful List"/>
+  <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful Grid"/>
+  <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light Shading Accent 1"/>
+  <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light List Accent 1"/>
+  <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light Grid Accent 1"/>
+  <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Shading 1 Accent 1"/>
+  <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Shading 2 Accent 1"/>
+  <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium List 1 Accent 1"/>
+  <w:LsdException Locked="false" UnhideWhenUsed="false" Name="Revision"/>
+  <w:LsdException Locked="false" Priority="34" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="List Paragraph"/>
+  <w:LsdException Locked="false" Priority="29" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="Quote"/>
+  <w:LsdException Locked="false" Priority="30" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="Intense Quote"/>
+  <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium List 2 Accent 1"/>
+  <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 1 Accent 1"/>
+  <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 2 Accent 1"/>
+  <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 3 Accent 1"/>
+  <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Dark List Accent 1"/>
+  <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful Shading Accent 1"/>
+  <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful List Accent 1"/>
+  <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful Grid Accent 1"/>
+  <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light Shading Accent 2"/>
+  <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light List Accent 2"/>
+  <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light Grid Accent 2"/>
+  <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Shading 1 Accent 2"/>
+  <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Shading 2 Accent 2"/>
+  <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium List 1 Accent 2"/>
+  <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium List 2 Accent 2"/>
+  <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 1 Accent 2"/>
+  <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 2 Accent 2"/>
+  <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 3 Accent 2"/>
+  <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Dark List Accent 2"/>
+  <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful Shading Accent 2"/>
+  <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful List Accent 2"/>
+  <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful Grid Accent 2"/>
+  <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light Shading Accent 3"/>
+  <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light List Accent 3"/>
+  <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light Grid Accent 3"/>
+  <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Shading 1 Accent 3"/>
+  <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Shading 2 Accent 3"/>
+  <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium List 1 Accent 3"/>
+  <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium List 2 Accent 3"/>
+  <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 1 Accent 3"/>
+  <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 2 Accent 3"/>
+  <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 3 Accent 3"/>
+  <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Dark List Accent 3"/>
+  <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful Shading Accent 3"/>
+  <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful List Accent 3"/>
+  <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful Grid Accent 3"/>
+  <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light Shading Accent 4"/>
+  <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light List Accent 4"/>
+  <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light Grid Accent 4"/>
+  <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Shading 1 Accent 4"/>
+  <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Shading 2 Accent 4"/>
+  <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium List 1 Accent 4"/>
+  <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium List 2 Accent 4"/>
+  <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 1 Accent 4"/>
+  <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 2 Accent 4"/>
+  <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 3 Accent 4"/>
+  <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Dark List Accent 4"/>
+  <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful Shading Accent 4"/>
+  <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful List Accent 4"/>
+  <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful Grid Accent 4"/>
+  <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light Shading Accent 5"/>
+  <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light List Accent 5"/>
+  <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light Grid Accent 5"/>
+  <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Shading 1 Accent 5"/>
+  <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Shading 2 Accent 5"/>
+  <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium List 1 Accent 5"/>
+  <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium List 2 Accent 5"/>
+  <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 1 Accent 5"/>
+  <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 2 Accent 5"/>
+  <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 3 Accent 5"/>
+  <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Dark List Accent 5"/>
+  <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful Shading Accent 5"/>
+  <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful List Accent 5"/>
+  <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful Grid Accent 5"/>
+  <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light Shading Accent 6"/>
+  <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light List Accent 6"/>
+  <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Light Grid Accent 6"/>
+  <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Shading 1 Accent 6"/>
+  <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Shading 2 Accent 6"/>
+  <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium List 1 Accent 6"/>
+  <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium List 2 Accent 6"/>
+  <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 1 Accent 6"/>
+  <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 2 Accent 6"/>
+  <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Medium Grid 3 Accent 6"/>
+  <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Dark List Accent 6"/>
+  <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful Shading Accent 6"/>
+  <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful List Accent 6"/>
+  <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+   UnhideWhenUsed="false" Name="Colorful Grid Accent 6"/>
+  <w:LsdException Locked="false" Priority="19" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="Subtle Emphasis"/>
+  <w:LsdException Locked="false" Priority="21" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="Intense Emphasis"/>
+  <w:LsdException Locked="false" Priority="31" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="Subtle Reference"/>
+  <w:LsdException Locked="false" Priority="32" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="Intense Reference"/>
+  <w:LsdException Locked="false" Priority="33" SemiHidden="false"
+   UnhideWhenUsed="false" QFormat="true" Name="Book Title"/>
+  <w:LsdException Locked="false" Priority="37" Name="Bibliography"/>
+  <w:LsdException Locked="false" Priority="39" QFormat="true" Name="TOC Heading"/>
+ </w:LatentStyles>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ @font-face
+	{font-family:"Cambria Math";
+	panose-1:2 4 5 3 5 4 6 3 2 4;
+	mso-font-charset:1;
+	mso-generic-font-family:roman;
+	mso-font-format:other;
+	mso-font-pitch:variable;
+	mso-font-signature:0 0 0 0 0 0;}
+@font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:1627400839 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+ p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-unhide:no;
+	mso-style-qformat:yes;
+	mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman","serif";
+	mso-fareast-font-family:"Times New Roman";
+	mso-fareast-theme-font:minor-fareast;}
+p
+	{mso-style-priority:99;
+	mso-margin-top-alt:auto;
+	margin-right:0in;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman","serif";
+	mso-fareast-font-family:"Times New Roman";
+	mso-fareast-theme-font:minor-fareast;}
+p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
+	{mso-style-noshow:yes;
+	mso-style-priority:99;
+	mso-style-link:"Balloon Text Char";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:"Tahoma","sans-serif";
+	mso-fareast-font-family:"Times New Roman";
+	mso-fareast-theme-font:minor-fareast;}
+span.BalloonTextChar
+	{mso-style-name:"Balloon Text Char";
+	mso-style-noshow:yes;
+	mso-style-priority:99;
+	mso-style-unhide:no;
+	mso-style-locked:yes;
+	mso-style-link:"Balloon Text";
+	mso-ansi-font-size:8.0pt;
+	mso-bidi-font-size:8.0pt;
+	font-family:"Tahoma","sans-serif";
+	mso-ascii-font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";
+	mso-fareast-theme-font:minor-fareast;
+	mso-hansi-font-family:Tahoma;
+	mso-bidi-font-family:Tahoma;}
+.MsoChpDefault
+	{mso-style-type:export-only;
+	mso-default-props:yes;
+	font-size:10.0pt;
+	mso-ansi-font-size:10.0pt;
+	mso-bidi-font-size:10.0pt;}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.0in 1.0in 1.0in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+<!--[if gte mso 10]>
+<style>
+ /* Style Definitions */
+ table.MsoNormalTable
+	{mso-style-name:"Table Normal";
+	mso-tstyle-rowband-size:0;
+	mso-tstyle-colband-size:0;
+	mso-style-noshow:yes;
+	mso-style-priority:99;
+	mso-style-qformat:yes;
+	mso-style-parent:"";
+	mso-padding-alt:0in 5.4pt 0in 5.4pt;
+	mso-para-margin:0in;
+	mso-para-margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:10.0pt;
+	font-family:"Times New Roman","serif";}
+</style>
+<![endif]--><!--[if gte mso 9]><xml>
+ <o:shapedefaults v:ext="edit" spidmax="2050"/>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <o:shapelayout v:ext="edit">
+  <o:idmap v:ext="edit" data="1"/>
+ </o:shapelayout></xml><![endif]-->
+</head>
+
+<body lang=EN-US link=blue vlink=purple style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<div class=MsoNormal align=center style='text-align:center'><span
+style='mso-fareast-font-family:"Times New Roman"'>
+
+<hr size=2 width="100%" align=center>
+
+</span></div>
+
+<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width="100%"
+ style='width:100.0%;mso-cellspacing:0in;mso-yfti-tbllook:1184;x-cell-content-align: top;
+ border-spacing: 0px;border-spacing: 0px' x-use-null-cells>
+ <col style="width: 50%;"><col style="width: 50%;">
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes;
+  x-cell-content-align: top'>
+  <td width="50%" valign=top style='width:50.0%;padding:.75pt 7.5pt .75pt 7.5pt'>
+  <p><span style='font-size:10.0pt;font-family:"Arial","sans-serif"'>© Nokia 2010</span><span
+  style='font-family:"Arial","sans-serif"'><o:p></o:p></span></p>
+  </td>
+  <td width="50%" valign=top style='width:50.0%;padding:.75pt 7.5pt .75pt 7.5pt'>
+  <p align=right style='margin-right:-3.0pt;text-align:right'><a href="#Top"
+  title="&quot;Back to top&quot; "><b style='mso-bidi-font-weight:normal'><span
+  style='mso-no-proof:yes;text-decoration:none;text-underline:none'><img
+  border=0 width=18 height=15 id="_x0000_i1026" src=top.gif alt="Back to top"></span></b></a></p>
+  </td>
+ </tr>
+</table>
+
+<p class=MsoNormal><span style='mso-fareast-font-family:"Times New Roman"'><o:p>&nbsp;</o:p></span></p>
+
+</div>
+
 </body>
+
 </html>
-
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/Doxyfiles/header.html
--- a/sdkcreationmw/sdkexamples/cppexamples/Doxyfiles/header.html	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/Doxyfiles/header.html	Wed Apr 21 09:56:53 2010 +0530
@@ -9,4 +9,4 @@
 
 <table border="0" width="100%" height="8" bgcolor="#eeeeee">
 <tr> <td width="100%" height="1"><b><font size="2" color="#000000" face="Arial, Helvetica, sans-serif"><strong><a name=Top></a>
-S60 5th Edition SDK </strong></font></b><br><i>Example Applications Guide</i></td></tr> </table>
\ No newline at end of file
+Nokia Symbian^3 SDK</strong></font></b><br><i>Example Applications Guide</i></td></tr> </table>
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Animation/gui/data/animation_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Animation/gui/data/animation_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Animation/gui/data/animation_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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 <animation.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA000022D
+UID3 0xE000022D
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Animation/gui/inc/animationapplication.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Animation/gui/inc/animationapplication.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Animation/gui/inc/animationapplication.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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".
 *
@@ -24,7 +24,7 @@
 
 // CONSTANTS
 // UID for the application; this should match the uid defined in the mmp file.
-static const TUid KUidAnimationApp = { 0xA000022D };
+static const TUid KUidAnimationApp = { 0xE000022D };
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Animation/sis/animation_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Animation/sis/animation_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Animation/sis/animation_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Language - standard language definitions
 &EN
 
 ; SIS file header
-#{"Animation Example"},(0xA000022D),1,0,0
+#{"Animation Example"},(0xE000022D),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -37,4 +37,4 @@
 "..\..\..\Epoc32\data\z\resource\apps\Animation_aif.mif"		-"!:\resource\apps\Animation_aif.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"					-"!:\private\A000022D\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"					-"!:\private\E000022D\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Animation/sis/animation_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Animation/sis/animation_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Animation/sis/animation_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 
 ; Installation header
-#{"Animation"},(0xA000022D),1,0,0
+#{"Animation"},(0xE000022D),1,0,0
 
 %{"Vendor-EN"}
 :"Vendor"
@@ -38,4 +38,4 @@
 "..\..\..\epoc32\release\gcce\UREL\Animation_server.dll"		-"!:\sys\bin\Animation_server.dll"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"					-"!:\private\A000022D\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"					-"!:\private\E000022D\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/group/bld.inf
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 - 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".
 *
@@ -19,21 +19,14 @@
 
 PRJ_MMPFILES
 
-#ifdef EKA2	// S60 3rd Ed
-audiostream_s60_3rd_ed.mmp
-#else // S60 2nd Ed
-audiostream_s60_2nd_ed.mmp
-#endif
+
+audiostream.mmp
 
 PRJ_EXPORTS
 // Specify the source file followed by its destination here
 // copy will be used to copy the source file to its destination
 // If there's no destination then the source file will be copied
 // to the same name in \epoc32\include
-#ifdef EKA2 // S60 3rd Ed
+
 ..\data\sample.aud ..\winscw\c\private\e01ff1c3\sample.aud
 ..\data\sample.amr ..\winscw\c\private\e01ff1c3\sample.amr
-#else // S60 2nd Ed
-..\data\sample.aud ..\winscw\c\system\Apps\audiostream\sample.aud
-..\data\sample.amr ..\winscw\c\system\Apps\audiostream\sample.amr
-#endif
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/inc/AudioStreamApp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/inc/AudioStreamApp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/inc/AudioStreamApp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 - 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".
 *
@@ -24,13 +24,10 @@
 
 // CONSTANTS
 // UID of the application
-#ifdef __SERIES60_3X__
-// For S60 3rd Edition
+
+
 const TUid KUidAudioStream = { 0xE01FF1C3 };
-#else
-// For S60 1st/2nd Edition
-const TUid KUidAudioStream = { 0x101FF1C3 };
-#endif
+
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/src/AudioStreamApp.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/src/AudioStreamApp.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/src/AudioStreamApp.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 - 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".
 *
@@ -20,9 +20,9 @@
 #include    "AudioStreamApp.h"
 #include    "AudioStreamDocument.h"
 
-#ifdef __SERIES60_3X__
+
 #include 	<eikstart.h>
-#endif
+
 
 
 // ----------------------------------------------------------------------------
@@ -62,17 +62,10 @@
 // S60 3rd Ed and 1st/2nd Ed
 // ---------------------------------------------------------
 //
-#ifdef __SERIES60_3X__
+
 GLDEF_C TInt E32Main()
 	{
 	return EikStart::RunApplication( NewApplication );
 	}
 
-#else
-GLDEF_C TInt E32Dll( TDllReason )
-	{
-	return KErrNone;
-	}
-#endif
-// End of File  
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/src/AudioStreamEngine.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/src/AudioStreamEngine.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/src/AudioStreamEngine.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 - 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".
 *
@@ -33,13 +33,9 @@
 // returns audio data in 4096-byte chunks. In 2nd Edition, ReadL() returns data in 320-byte
 // chunks.
 
-#ifdef __SERIES60_3X__  // 3rd Edition
+
 const TInt KFrameSizePCM = 4096;
 const TInt KFrameCountPCM = 10;
-#else // 2nd Edition
-const TInt KFrameSizePCM = 320;
-const TInt KFrameCountPCM = 128;
-#endif
 
 // Audio data buffer size for AMR encoding. For AMR, the buffer size is the same in
 // both 2nd and 3rd Edition devices (20 ms per frame, a total of 2560 ms in 128 frames).
@@ -97,22 +93,10 @@
 	iStreamStart=0;
 	iStreamEnd=iFrameCount - 1;
 	
-	#ifdef __SERIES60_3X__    
-	// Only in 3rd Edition. The sample.aud/amr can be found in \private\<UID3>\ folder.
-    	User::LeaveIfError( iFs.CreatePrivatePath( EDriveC ) );
+
+
+   	User::LeaveIfError( iFs.CreatePrivatePath( EDriveC ) );
 		User::LeaveIfError( iFs.SetSessionToPrivate( EDriveC ) );
-	#else
-		#ifndef __WINS__  // don't save settings to z-drive in emulator
-			// In 2nd Ed device the sample.aud/amr will be in \system\apps\audiostream\ folder.
-    		TFileName appFullName = iAppUi->Application()->AppFullName();
-    		TParsePtr appPath(appFullName);
-	    	iAudioFilePath = appPath.DriveAndPath();
-		#else 
-			// For 2nd Ed emulator
-			iAudioFilePath.Append(KEmulatorPath);
-		#endif //__WINS__
-		
-	#endif
 	}
 
 // ----------------------------------------------------------------------------
@@ -186,15 +170,7 @@
 	// Open output stream.
 	// Upon completion will receive callback in 
 	// MMdaAudioOutputStreamCallback::MaoscOpenComplete().
-	#ifndef __SERIES60_3X__  // Not 3rd Ed
-		// Some 2nd Edition, FP2 devices (such as Nokia 6630) require the stream to be
-		// reconstructed each time before calling Open() - otherwise the callback
-		// never gets called.
-		if (iOutputStream) delete iOutputStream;
-		iOutputStream = NULL; // In case the following NewL leaves
-		TRAPD(err, iOutputStream = CMdaAudioOutputStream::NewL(*this));
-		PanicIfError(err);
-	#endif
+
 	iOutputStream->Open(&iStreamSettings);
 	}
 
@@ -216,15 +192,7 @@
 	// Open input stream.
 	// Upon completion will receive callback in 
 	// MMdaAudioInputStreamCallback::MaiscOpenComplete().
-	#ifndef __SERIES60_3X__  // Not 3rd Ed
-		// Some 2nd Edition, FP2 devices (such as Nokia 6630) require the stream to be
-		// reconstructed each time before calling Open() - otherwise the callback
-		// never gets called.
-		if (iInputStream) delete iInputStream;
-		iInputStream = NULL; // In case the following NewL leaves
-		TRAPD(err, iInputStream = CMdaAudioInputStream::NewL(*this));
-		PanicIfError(err);
-	#endif
+
 	iInputStream->Open(&iStreamSettings);
 	}
 
@@ -538,14 +506,7 @@
 			// MaiscRecordComplete() will not be called either after exiting this method.
 			// In 3rd Edition, however, iInputStream->Stop() MUST be called in order to reach
 			// MaiscRecordComplete(), otherwise the stream will "hang".
-			#ifdef __SERIES60_3X__
-				// It appears that in 3.2 also calling Stop() here causes crash.
-				// Instead we let MMF to detect that buffer becomes full. It will
-				// then call MaiscRecordComplete() with status KErrOverflow.
-				// Input stream will be stopped there.
-
-				// iInputStream->Stop();
-			#endif
+			
 		    return;
 		  	}		
 		
@@ -670,9 +631,9 @@
 			// MaiscRecordComplete() will not be called either after exiting this method.
 			// In 3rd Edition, however, iOutputStream->Stop() MUST be called in order to reach
 			// MaiscRecordComplete(), otherwise the stream will "hang".
-			#ifdef __SERIES60_3X__
+			
 				iOutputStream->Stop();
-			#endif
+			
 			}
 		else 
 			{
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/src/AudioStreamView.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/src/AudioStreamView.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/AudioStreamExample/src/AudioStreamView.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 - 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".
 *
@@ -55,10 +55,10 @@
 	// create label to display status to user
     iLabel = new (ELeave) CEikLabel;
     iLabel->SetContainerWindowL( *this );
-	#ifndef __SERIES60_3X__
-		// The default font is too big in 2nd Edition devices
+	
+		
 	    iLabel->SetFont( LatinBold12() );      
-	#endif
+	
     // set window size
     SetRect(aRect);
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/CLFExample/group/CLFExampleUID.hrh
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CLFExample/group/CLFExampleUID.hrh	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CLFExample/group/CLFExampleUID.hrh	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -21,7 +21,7 @@
 #define CLFEXAMPLEUID_HRH
 
 // CONSTANTS
-#define KCEUID3 0xA0000237
+#define KCEUID3 0xE0000237
 
 #endif      // CLFEXAMPLEUID_HRH
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/CLFExample/sis/CLFExample_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CLFExample/sis/CLFExample_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CLFExample/sis/CLFExample_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; CLFExample_armv5.pkg
 
@@ -19,7 +19,7 @@
 &EN
 
 ;SIS file header
-#{"CLF Example"},(0xA0000237),1,0,0
+#{"CLF Example"},(0xE0000237),1,0,0
 
 ;Localised Vendor name
 %{"Vendor"}
@@ -37,4 +37,4 @@
 "..\..\..\epoc32\data\z\resource\apps\CLFExample.mif"             -"!:\resource\apps\CLFExample.mif"
 
 ;required for application to be covered by backup/restore facility
-"backup_registration.xml"   -"!:\private\A0000237\backup_registration.xml"
+"backup_registration.xml"   -"!:\private\E0000237\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/CLFExample/sis/CLFExample_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CLFExample/sis/CLFExample_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CLFExample/sis/CLFExample_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; CLFExample_gcce.pkg
 
@@ -19,7 +19,7 @@
 &EN
 
 ;SIS file header
-#{"CLF Example"},(0xA0000237),1,0,0
+#{"CLF Example"},(0xE0000237),1,0,0
 
 ;Localised Vendor name
 %{"Vendor"}
@@ -37,4 +37,4 @@
 "..\..\..\epoc32\data\z\resource\apps\CLFExample.mif"             -"!:\resource\apps\CLFExample.mif"
 
 ;required for application to be covered by backup/restore facility
-"backup_registration.xml"   -"!:\private\A0000237\backup_registration.xml"
+"backup_registration.xml"   -"!:\private\E0000237\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Chat/data/ChatEx_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Chat/data/ChatEx_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Chat/data/ChatEx_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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 <ChatEx.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA0000182
+UID3 0xE0000182
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Chat/inc/ChatApp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Chat/inc/ChatApp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Chat/inc/ChatApp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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".
 *
@@ -24,7 +24,7 @@
 
 // CONSTANTS
 // UID of the application
-const TUid KUidChat = { 0xA0000182 };
+const TUid KUidChat = { 0xE0000182 };
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Chat/sis/Chat_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Chat/sis/Chat_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Chat/sis/Chat_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; Chat_armv5.pkg
 ;Languages
 &EN
 
 ;Header
-#{"Chat"},(0xA0000182),1,0,0
+#{"Chat"},(0xE0000182),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -36,4 +36,4 @@
 "..\..\..\epoc32\data\z\resource\apps\ChatEx.mif"         	-"!:\resource\apps\ChatEx.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"					-"!:\private\A0000182\backup_registration.xml"
+"backup_registration.xml"					-"!:\private\E0000182\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Chat/sis/Chat_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Chat/sis/Chat_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Chat/sis/Chat_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; Chat_gcce.pkg
 ;Languages
 &EN
 
 ;Header
-#{"Chat"},(0xA0000182),1,0,0
+#{"Chat"},(0xE0000182),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -36,4 +36,4 @@
 "..\..\..\epoc32\data\z\resource\apps\ChatEx.mif"         	-"!:\resource\apps\ChatEx.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"					-"!:\private\A0000182\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"					-"!:\private\E0000182\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/client/data/csasync_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/client/data/csasync_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/client/data/csasync_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -21,7 +21,7 @@
 #include <csasync.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA0000226
+UID3 0xE0000226
 
 RESOURCE APP_REGISTRATION_INFO 
     {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/client/inc/csasyncapplication.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/client/inc/csasyncapplication.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/client/inc/csasyncapplication.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-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".
 *
@@ -24,7 +24,7 @@
 
 // CONSTANTS
 // Uid for this application, this should match the one in the mmp file
-const TUid KUidCSAsyncApp = { 0xA0000226 };
+const TUid KUidCSAsyncApp = { 0xE0000226 };
 
 // CLASS DECLARATION
 /**
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/client/inc/timeserversession.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/client/inc/timeserversession.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/client/inc/timeserversession.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-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".
 *
@@ -29,7 +29,7 @@
 // and one synchronous request in progress.
 const TUint KDefaultMessageSlots = 2;
 
-const TUid KServerUid3 = { 0xA0000227 }; // Server UID
+const TUid KServerUid3 = { 0xE0000227 }; // Server UID
 
 _LIT( KTimeServerFilename, "CSAsyncServer" );
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/sis/csasync_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/sis/csasync_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/sis/csasync_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; CSAsync_armv5.pkg
 
@@ -19,7 +19,7 @@
 &EN
 
 ; standard SIS file header
-#{"CSAsync"},(0xA0000226),1,0,0
+#{"CSAsync"},(0xE0000226),1,0,0
 
 ;Localised Vendor name
 %{"VendorEN"}
@@ -39,4 +39,4 @@
 
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A0000226\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"						-"!:\private\E0000226\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/sis/csasync_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/sis/csasync_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerAsync/sis/csasync_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; CSAsync_gcce.pkg
 
@@ -19,7 +19,7 @@
 &EN
 
 ; standard SIS file header
-#{"CSAsync"},(0xA0000226),1,0,0
+#{"CSAsync"},(0xE0000226),1,0,0
 
 ;Localised Vendor name
 %{"VendorEN"}
@@ -39,4 +39,4 @@
 
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A0000226\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"						-"!:\private\E0000226\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/client/data/cssync_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/client/data/cssync_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/client/data/cssync_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -21,7 +21,7 @@
 #include <cssync.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA00001FB
+UID3 0xE00001FB
 
 RESOURCE APP_REGISTRATION_INFO 
     {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/client/inc/cssyncapplication.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/client/inc/cssyncapplication.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/client/inc/cssyncapplication.h	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -25,7 +25,7 @@
 
 // CONSTANTS
 // Uid for this application, this should match the one in the mmp file
-const TUid KUidCSSyncApp = { 0xA00001FB };
+const TUid KUidCSSyncApp = { 0xE00001FB };
 
 // CLASS DECLARATION
 /**
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/client/inc/timeserversession.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/client/inc/timeserversession.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/client/inc/timeserversession.h	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -30,7 +30,7 @@
 static const TUint KDefaultMessageSlots = 0;
 
 // Server UID
-const TUid KServerUid3 = { 0xA00001FC };
+const TUid KServerUid3 = { 0xE00001FC };
 
 _LIT( KTimeServerFilename, "CSSyncServer.EXE" );
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/sis/cssync_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/sis/cssync_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/sis/cssync_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; CSSync_armv5.pkg
 
@@ -19,7 +19,7 @@
 &EN
 
 ; Package header
-#{"CSSync"},(0xA00001FB),1,0,0
+#{"CSSync"},(0xE00001FB),1,0,0
 
 ;Localised Vendor name
 %{"VendorEN"}
@@ -40,4 +40,4 @@
 
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A00001FB\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"						-"!:\private\E00001FB\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/sis/cssync_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/sis/cssync_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ClientServerSync/sis/cssync_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; CSSync_gcce.pkg
 
@@ -19,7 +19,7 @@
 &EN
 
 ; Package header
-#{"CSSync"},(0xA00001FB),1,0,0
+#{"CSSync"},(0xE00001FB),1,0,0
 
 ;Localised Vendor name
 %{"VendorEN"}
@@ -39,4 +39,4 @@
 
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A00001FB\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"						-"!:\private\E00001FB\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/Inc/CommonDialogsExApp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/Inc/CommonDialogsExApp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/Inc/CommonDialogsExApp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -24,7 +24,7 @@
 
 // CONSTANTS
 // UID of the application
-const TUid KUidDLLTest = { 0xA000027B };
+const TUid KUidDLLTest = { 0xE000027B };
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/Sis/CommonDialogsEx_Armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/Sis/CommonDialogsEx_Armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/Sis/CommonDialogsEx_Armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 ;
@@ -17,7 +17,7 @@
 ;Languages
 &EN
 ; Package header
-#{"CommonDialogsEx"},(0xA0007DFD),1,0,0, TYPE=SA
+#{"CommonDialogsEx"},(0xE0007DFD),1,0,0, TYPE=SA
 
 ;
 ;Localised Vendor name
@@ -41,4 +41,4 @@
 ;
 ; Backup & Restore
 ;
-;"backup_registration.xml"-"!:\private\0xA0007DFD\backup_registration.xml"
\ No newline at end of file
+;"backup_registration.xml"-"!:\private\0xE0007DFD\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/Sis/CommonDialogsEx_Gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/Sis/CommonDialogsEx_Gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/Sis/CommonDialogsEx_Gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 ;
@@ -17,7 +17,7 @@
 ;Languages
 &EN
 ; Package header
-#{"CommonDialogsEx"},(0xA0007DFD),1, 0, 0, TYPE=SA
+#{"CommonDialogsEx"},(0xE0007DFD),1, 0, 0, TYPE=SA
 
 ;
 ;Localised Vendor name
@@ -41,4 +41,4 @@
 ;
 ; Backup & Restore
 ;
-;"backup_registration.xml"-"!:\private\0xA0007DFD\backup_registration.xml"
\ No newline at end of file
+;"backup_registration.xml"-"!:\private\0xE0007DFD\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/data/CommonDialogsEx_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/data/CommonDialogsEx_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/data/CommonDialogsEx_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -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 <CommonDialogsEx.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA000027B // application UID
+UID3 0xE000027B // application UID
 
 RESOURCE APP_REGISTRATION_INFO
     {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/doc/_common_dialogs_ex_8mmp-source.html
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/doc/_common_dialogs_ex_8mmp-source.html	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/doc/_common_dialogs_ex_8mmp-source.html	Wed Apr 21 09:56:53 2010 +0530
@@ -34,7 +34,7 @@
 <a name="l00015"></a>00015 
 <a name="l00016"></a>00016 TARGET              CommonDialogsEx.exe
 <a name="l00017"></a>00017 TARGETTYPE          exe
-<a name="l00018"></a>00018 UID                 0x100039CE 0xA000027B
+<a name="l00018"></a>00018 UID                 0x100039CE 0xE000027B
 <a name="l00019"></a>00019 
 <a name="l00020"></a>00020 CAPABILITY          ReadUserData WriteUserData 
 <a name="l00021"></a>00021 VENDORID            0
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/doc/_common_dialogs_ex_app_8h-source.html
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/doc/_common_dialogs_ex_app_8h-source.html	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/CommonDialogsEx/doc/_common_dialogs_ex_app_8h-source.html	Wed Apr 21 09:56:53 2010 +0530
@@ -39,7 +39,7 @@
 <a name="l00020"></a>00020 
 <a name="l00021"></a>00021 <span class="comment">// CONSTANTS</span>
 <a name="l00022"></a>00022 <span class="comment">// UID of the application</span>
-<a name="l00023"></a>00023 <span class="keyword">const</span> TUid KUidDLLTest = { 0xA000027B };
+<a name="l00023"></a>00023 <span class="keyword">const</span> TUid KUidDLLTest = { 0xE000027B };
 <a name="l00024"></a>00024 
 <a name="l00025"></a>00025 <span class="comment">// CLASS DECLARATION</span>
 <a name="l00026"></a>00026 <span class="comment"></span>
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Contacts/data/contacts_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Contacts/data/contacts_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Contacts/data/contacts_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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 <contacts.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA000022E
+UID3 0xE000022E
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Contacts/inc/ccontapp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Contacts/inc/ccontapp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Contacts/inc/ccontapp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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".
 *
@@ -24,7 +24,7 @@
 
 // CONSTANTS
 // UID of the application
-const TUid KUidContacts = { 0xA000022E };
+const TUid KUidContacts = { 0xE000022E };
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Contacts/sis/contacts_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Contacts/sis/contacts_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Contacts/sis/contacts_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 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".
 ;
@@ -24,7 +24,7 @@
 &EN
 ;
 ; Header
-#{"ContactsDB"},(0xA000022E),1,4,0
+#{"ContactsDB"},(0xE000022E),1,4,0
 ;
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -42,4 +42,4 @@
 "..\..\..\Epoc32\data\z\resource\apps\Contacts_aif.mif"		-"!:\resource\apps\Contacts_aif.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"					-"!:\private\A000022E\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"					-"!:\private\E000022E\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Contacts/sis/contacts_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Contacts/sis/contacts_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Contacts/sis/contacts_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 
 ; Installation header
-#{"ContactsDB"},(0xA000022E),1,4,0
+#{"ContactsDB"},(0xE000022E),1,4,0
 
 %{"Vendor-EN"}
 :"Vendor"
@@ -35,4 +35,4 @@
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\Contacts_reg.rsc"	-"!:\private\10003a3f\import\apps\Contacts_reg.rsc"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"					-"!:\private\A000022E\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"					-"!:\private\E000022E\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/DataMobility/inc/datamobility.hrh
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DataMobility/inc/datamobility.hrh	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DataMobility/inc/datamobility.hrh	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -20,7 +20,7 @@
 #ifndef DATAMOBILITY_HRH
 #define DATAMOBILITY_HRH
 
-#define _UID3 0xA000027F
+#define _UID3 0xE000027F
 
 // datamobility enumerate command codes
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/DataMobility/sis/datamobility_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DataMobility/sis/datamobility_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DataMobility/sis/datamobility_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 ;
@@ -24,7 +24,7 @@
 &EN
 
 ; standard SIS file header
-#{"data mobility example"},(0xA000027F),1,0,0
+#{"data mobility example"},(0xE000027F),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -42,4 +42,4 @@
 "..\..\..\epoc32\data\z\resource\apps\datamobility.mif"                     -"!:\resource\apps\datamobility.mif"
 
 ;required for application to be covered by backup/restore facility
-"..\sis\backup_registration.xml"                                            -"!:\private\A000027F\backup_registration.xml"
+"..\sis\backup_registration.xml"                                            -"!:\private\E000027F\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/DataMobility/sis/datamobility_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DataMobility/sis/datamobility_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DataMobility/sis/datamobility_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 ;
@@ -24,7 +24,7 @@
 &EN
 
 ; standard SIS file header
-#{"data mobility example"},(0xA000027F),1,0,0
+#{"data mobility example"},(0xE000027F),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -42,4 +42,4 @@
 "..\..\..\epoc32\data\z\resource\apps\datamobility.mif"                     -"!:\resource\apps\datamobility.mif"
 
 ;required for application to be covered by backup/restore facility
-"..\sis\backup_registration.xml"                                            -"!:\private\A000027F\backup_registration.xml"
+"..\sis\backup_registration.xml"                                            -"!:\private\E000027F\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/data/directorylocalizerex_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/data/directorylocalizerex_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/data/directorylocalizerex_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,14 +11,14 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 #include <appinfo.rh>
 #include <directorylocalizerex.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA0000277 // application UID
+UID3 0xE0000277 // application UID
 
 RESOURCE APP_REGISTRATION_INFO
     {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/inc/directorylocalizerexapp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/inc/directorylocalizerexapp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/inc/directorylocalizerexapp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-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".
 *
@@ -24,7 +24,7 @@
 #include <aknapp.h>
 
 // CONSTANTS
-const TUid KUidDirectoryLocalizerEx = { 0xA0000277 }; // UID of the application.
+const TUid KUidDirectoryLocalizerEx = { 0xE0000277 }; // UID of the application.
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/sis/DirectoryLocalizerEx_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/sis/DirectoryLocalizerEx_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/sis/DirectoryLocalizerEx_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; DirectoryLocalizerEx_armv5.pkg
 ;Languages
 &EN
 
 ;Header
-#{"DirectoryLocalizerEx"},(0xA0000277),1,0,0
+#{"DirectoryLocalizerEx"},(0xE0000277),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -35,4 +35,4 @@
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\DirectoryLocalizerEx_reg.RSC"   -"!:\private\10003a3f\import\apps\DirectoryLocalizerEx_reg.RSC"
 
 ;required for application to be covered by backup/restore facility
-"backup_registration.xml"  -"!:\private\A0000277\backup_registration.xml"
+"backup_registration.xml"  -"!:\private\E0000277\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/sis/DirectoryLocalizerEx_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/sis/DirectoryLocalizerEx_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/sis/DirectoryLocalizerEx_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; Messaging_gcce.pkg
 ;Languages
 &EN
 
 ;Header
-#{"directorylocalizerex"},(0xA0000277),1,0,0
+#{"directorylocalizerex"},(0xE0000277),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -35,6 +35,6 @@
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\directorylocalizerex_reg.RSC"   -"!:\private\10003a3f\import\apps\directorylocalizerex_reg.RSC"
 
 ;required for application to be covered by backup/restore facility
-"backup_registration.xml"  -"!:\private\A0000277\backup_registration.xml"
+"backup_registration.xml"  -"!:\private\E0000277\backup_registration.xml"
 
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/src/directorylocalizerexcontainer.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/src/directorylocalizerexcontainer.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DirectoryLocalizerEx/src/directorylocalizerexcontainer.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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".
 *
@@ -24,7 +24,7 @@
 #include <f32file.h>
 #include <e32des8.h>
 
-#define KAknAtListGray TRgb(0xaaaaaa)
+#define KAknAtListGray TRgb(0xEaaaaa)
 
 
 _LIT( KDLTestExistsDir, "c:\\example\\" );
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/DriveInfo/data/DriveInfo_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DriveInfo/data/DriveInfo_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DriveInfo/data/DriveInfo_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -19,7 +19,7 @@
 #include <appinfo.rh>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA00001F4
+UID3 0xE00001F4
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/DriveInfo/sis/DriveInfo_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DriveInfo/sis/DriveInfo_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DriveInfo/sis/DriveInfo_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; HelloWorldBasic_armv5.pkg
 ;
@@ -19,7 +19,7 @@
 &EN
 
 ; standard SIS file header
-#{"DriveInfo"},(0xA00001F4),1,0,0
+#{"DriveInfo"},(0xE00001F4),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/DriveInfo/sis/DriveInfo_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DriveInfo/sis/DriveInfo_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DriveInfo/sis/DriveInfo_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; DriveInfo_gcce.pkg
 ;
@@ -19,7 +19,7 @@
 &EN
 
 ; standard SIS file header
-#{"DriveInfo"},(0xA00001F4),1,0,0
+#{"DriveInfo"},(0xE00001F4),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/DynamicSettingList/group/DynamicSettingList.mmp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DynamicSettingList/group/DynamicSettingList.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DynamicSettingList/group/DynamicSettingList.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005 - 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".
 *
@@ -17,11 +17,21 @@
 */
 
 
-TARGET				DynamicSettingList.app
-TARGETTYPE			app
-UID					0x100039CE 0x0D6F698F
-TARGETPATH			\system\apps\DynamicSettingList
-LANG				SC
+TARGET				DynamicSettingList.exe
+TARGETTYPE			exe
+
+UID					0x00000000 0x0D6F698F
+VENDORID			0x00000000
+
+SECUREID			0xEA1E2B6C
+CAPABILITY			None
+
+USERINCLUDE 		. 
+USERINCLUDE			..\inc
+
+SYSTEMINCLUDE   \epoc32\include
+SYSTEMINCLUDE    \epoc32\include\mw
+SYSTEMINCLUDE    \epoc32\include\app
 
 SOURCEPATH			..\src
 SOURCE				DynamicSettingList.cpp
@@ -31,15 +41,17 @@
 SOURCE				DynamicSettingListDocument.cpp 
 SOURCE				DynamicSettingListSlider.cpp
 
-SOURCEPATH			..\group
-RESOURCE			DynamicSettingList.rss
-
-USERINCLUDE			..\inc 
+SOURCEPATH			..\data
+START RESOURCE		DynamicSettingList.rss
+	HEADER
+	TARGETPATH		\resource\apps
+	LANG 			SC
+END
 
+START RESOURCE		DynamicSettingList_reg.rss
+  TARGETPATH		\private\10003a3f\import\apps
+END
 
-SYSTEMINCLUDE		\epoc32\include
-SYSTEMINCLUDE    \epoc32\include\mw
-SYSTEMINCLUDE    \epoc32\include\app
 
 LIBRARY				euser.lib
 LIBRARY				apparc.lib
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/DynamicSettingList/group/bld.inf
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DynamicSettingList/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DynamicSettingList/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005 - 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".
 *
@@ -20,12 +20,4 @@
 
 PRJ_MMPFILES
 
-#ifdef EKA2
-
-DynamicSettingList_S60_3rd_ed.mmp
-
-#else
-
 DynamicSettingList.mmp
-
-#endif
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/DynamicSettingList/src/DynamicSettingList.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DynamicSettingList/src/DynamicSettingList.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/DynamicSettingList/src/DynamicSettingList.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005 - 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,16 +11,15 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
 
 // INCLUDE FILES
 #include "DynamicSettingListApplication.h"
-#if defined __SERIES60_3X__
 #include <eikstart.h>
-#endif
+
 
 // Create an application, and return a pointer to it
 EXPORT_C CApaApplication* NewApplication() 
@@ -28,7 +27,6 @@
     return (new CDynamicSettingListApplication);
     }
 
-#if defined __SERIES60_3X__
 // ---------------------------------------------------------
 // E32Main 
 // main function for Symbian OS v9 EXE application.
@@ -39,17 +37,3 @@
     return EikStart::RunApplication ( NewApplication );
     }
 
-#else // !(__SERIES60_30__)
-
-// ---------------------------------------------------------
-// E32Dll(TDllReason) 
-// Entry point function for Symbian Apps
-// Returns: KErrNone: No error
-// ---------------------------------------------------------
-//
-GLDEF_C TInt E32Dll( TDllReason )
-    {
-    return KErrNone;
-    }
-    
-#endif // (__SERIES60_30__)    
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/data/Filelist_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/data/Filelist_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/data/Filelist_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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 <Filelist.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA0000183
+UID3 0xE0000183
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/group/bld.inf
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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,21 +20,21 @@
 
 PRJ_EXPORTS
 
-..\data\folder1\file.txt ..\release\winscw\udeb\z\private\A0000183\folder1\1f_1.txt
-..\data\folder1\file.txt ..\release\winscw\udeb\z\private\A0000183\folder1\1f_2.txt
-..\data\folder1\file.txt ..\release\winscw\udeb\z\private\A0000183\folder1\1f_3.txt
-..\data\folder1\file.txt ..\release\winscw\udeb\z\private\A0000183\folder1\1f_4.txt
-..\data\folder1\file.txt ..\release\winscw\udeb\z\private\A0000183\folder1\1f_5.txt
-..\data\folder1\file.txt ..\release\winscw\udeb\z\private\A0000183\folder1\1f_6.txt
+..\data\folder1\file.txt ..\release\winscw\udeb\z\private\E0000183\folder1\1f_1.txt
+..\data\folder1\file.txt ..\release\winscw\udeb\z\private\E0000183\folder1\1f_2.txt
+..\data\folder1\file.txt ..\release\winscw\udeb\z\private\E0000183\folder1\1f_3.txt
+..\data\folder1\file.txt ..\release\winscw\udeb\z\private\E0000183\folder1\1f_4.txt
+..\data\folder1\file.txt ..\release\winscw\udeb\z\private\E0000183\folder1\1f_5.txt
+..\data\folder1\file.txt ..\release\winscw\udeb\z\private\E0000183\folder1\1f_6.txt
 
-..\data\folder1\file.txt ..\release\winscw\udeb\z\private\A0000183\folder2\2f_1.txt
-..\data\folder1\file.txt ..\release\winscw\udeb\z\private\A0000183\folder2\2f_2.txt
-..\data\folder1\file.txt ..\release\winscw\udeb\z\private\A0000183\folder2\2f_3.txt
-..\data\folder1\file.txt ..\release\winscw\udeb\z\private\A0000183\folder2\2f_4.txt
-..\data\folder1\file.txt ..\release\winscw\udeb\z\private\A0000183\folder2\2f_5.txt
-..\data\folder1\file.txt ..\release\winscw\udeb\z\private\A0000183\folder2\2f_6.txt
-..\data\folder1\file.txt ..\release\winscw\udeb\z\private\A0000183\folder2\2f_7.txt
-..\data\folder1\file.txt ..\release\winscw\udeb\z\private\A0000183\folder2\2f_8.txt
+..\data\folder1\file.txt ..\release\winscw\udeb\z\private\E0000183\folder2\2f_1.txt
+..\data\folder1\file.txt ..\release\winscw\udeb\z\private\E0000183\folder2\2f_2.txt
+..\data\folder1\file.txt ..\release\winscw\udeb\z\private\E0000183\folder2\2f_3.txt
+..\data\folder1\file.txt ..\release\winscw\udeb\z\private\E0000183\folder2\2f_4.txt
+..\data\folder1\file.txt ..\release\winscw\udeb\z\private\E0000183\folder2\2f_5.txt
+..\data\folder1\file.txt ..\release\winscw\udeb\z\private\E0000183\folder2\2f_6.txt
+..\data\folder1\file.txt ..\release\winscw\udeb\z\private\E0000183\folder2\2f_7.txt
+..\data\folder1\file.txt ..\release\winscw\udeb\z\private\E0000183\folder2\2f_8.txt
 
 
 PRJ_MMPFILES
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/inc/FilelistApp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/inc/FilelistApp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/inc/FilelistApp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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".
 *
@@ -24,7 +24,7 @@
 
 // CONSTANTS
 // UID of the application
-const TUid KUidFilelist = { 0xA0000183 };
+const TUid KUidFilelist = { 0xE0000183 };
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/sis/Filelist_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/sis/Filelist_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/sis/Filelist_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; Filelist_armv5.pkg
 ;Languages
 &EN
 
 ;Header
-#{"Filelist"},(0xA0000183),1,0,0
+#{"Filelist"},(0xE0000183),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -37,21 +37,21 @@
 
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A0000183\backup_registration.xml"
+"backup_registration.xml"						-"!:\private\e0000183\backup_registration.xml"
 
-"..\data\folder1\file.txt"                                		-"!:\private\A0000183\folder1\1_f1.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder1\1_f2.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder1\1_f3.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder1\1_f4.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder1\1_f5.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder1\1_f6.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f1.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f2.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f3.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f4.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f5.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f6.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f7.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f8.txt"
+"..\data\folder1\file.txt"                                		-"!:\private\E0000183\folder1\1_f1.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder1\1_f2.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder1\1_f3.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder1\1_f4.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder1\1_f5.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder1\1_f6.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f1.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f2.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f3.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f4.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f5.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f6.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f7.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f8.txt"
 
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/sis/Filelist_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/sis/Filelist_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Filelist/sis/Filelist_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; Filelist_gcce.pkg
 ;Languages
 &EN
 
 ;Header
-#{"Filelist"},(0xA0000183),1,0,0
+#{"Filelist"},(0xE0000183),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -36,21 +36,21 @@
 "..\..\..\epoc32\data\z\resource\apps\Filelist.mif"			-"!:\resource\apps\Filelist.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A0000183\backup_registration.xml"
+"backup_registration.xml"						-"!:\private\E0000183\backup_registration.xml"
 
-"..\data\folder1\file.txt"                                		-"!:\private\A0000183\folder1\1_f1.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder1\1_f2.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder1\1_f3.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder1\1_f4.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder1\1_f5.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder1\1_f6.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f1.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f2.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f3.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f4.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f5.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f6.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f7.txt"
-"..\data\folder1\file.txt"                                 		-"!:\private\A0000183\folder2\2_f8.txt"
+"..\data\folder1\file.txt"                                		-"!:\private\E0000183\folder1\1_f1.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder1\1_f2.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder1\1_f3.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder1\1_f4.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder1\1_f5.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder1\1_f6.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f1.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f2.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f3.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f4.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f5.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f6.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f7.txt"
+"..\data\folder1\file.txt"                                 		-"!:\private\E0000183\folder2\2_f8.txt"
 
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Focusevent/data/focusevent_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Focusevent/data/focusevent_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Focusevent/data/focusevent_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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 <focusevent.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA0000234
+UID3 0xE0000234
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Focusevent/inc/focuseventapplication.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Focusevent/inc/focuseventapplication.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Focusevent/inc/focuseventapplication.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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".
 *
@@ -24,7 +24,7 @@
 
 // CONSTANTS
 // UID for the application; this should match the uid defined in the mmp file.
-const TUid KUidFocusEventApp = { 0xA0000234 };
+const TUid KUidFocusEventApp = { 0xE0000234 };
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Focusevent/sis/focusevent_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Focusevent/sis/focusevent_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Focusevent/sis/focusevent_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ; Languages
 &EN
 
 ; Header
-#{"Focus event Example"},(0xA0000234),1,0,0
+#{"Focus event Example"},(0xE0000234),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -36,4 +36,4 @@
 "..\..\..\epoc32\data\z\resource\apps\FocusEvent_aif.mif"            -"!:\resource\apps\FocusEvent_aif.mif"
 
 ;required for application to be covered by backup/restore facility
-;"backup_registration.xml"						-"!:\private\A0000234\backup_registration.xml"
+;"backup_registration.xml"						-"!:\private\E0000234\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Focusevent/sis/focusevent_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Focusevent/sis/focusevent_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Focusevent/sis/focusevent_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 
 ; Installation header
-#{"Focus event Example"},(0xA0000234),1,0,0
+#{"Focus event Example"},(0xE0000234),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -35,4 +35,4 @@
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\FocusEvent_reg.rsc"	-"!:\private\10003a3f\import\apps\FocusEvent_reg.rsc"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"					-"!:\private\A0000234\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"					-"!:\private\E0000234\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Geoprofiles/GeoprofilesHandler/group/geoprofileshandler.mmp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Geoprofiles/GeoprofilesHandler/group/geoprofileshandler.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Geoprofiles/GeoprofilesHandler/group/geoprofileshandler.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* 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".
 *
@@ -31,7 +31,9 @@
 CAPABILITY      	Location ReadDeviceData WriteDeviceData ReadUserData WriteUserData
 
 // System Includes
-SYSTEMINCLUDE   	. /epoc32/include
+SYSTEMINCLUDE   . /epoc32/include
+SYSTEMINCLUDE   . /epoc32/include/app
+SYSTEMINCLUDE   . /epoc32/include/mw
 
 // User Includes
 USERINCLUDE         ../inc
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Geoprofiles/GeoprofilesUI/group/geoprofilesui.mmp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Geoprofiles/GeoprofilesUI/group/geoprofilesui.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Geoprofiles/GeoprofilesUI/group/geoprofilesui.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* 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".
 *
@@ -36,6 +36,8 @@
 USERINCLUDE     ../../inc
 
 SYSTEMINCLUDE   . /epoc32/include
+SYSTEMINCLUDE   . /epoc32/include/app
+SYSTEMINCLUDE   . /epoc32/include/mw
 
 SOURCEPATH      ../src
 SOURCE          geoprofilesapp.cpp
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/data/graphics_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/data/graphics_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/data/graphics_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -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 <Graphics.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA00001F8
+UID3 0xE00001F8
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/group/bitmaps.mk
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/group/bitmaps.mk	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/group/bitmaps.mk	Wed Apr 21 09:56:53 2010 +0530
@@ -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 @@
 ZDIR=$(EPOCROOT)epoc32\data\z
 endif
 
-TARGETDIR=$(ZDIR)\private\A00001F8
+TARGETDIR=$(ZDIR)\private\E00001F8
 ICONTARGETFILENAME=$(TARGETDIR)\GraphicsAppImages.mbm
 
 HEADERDIR=$(EPOCROOT)epoc32\include
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/inc/graphicsapplication.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/inc/graphicsapplication.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/inc/graphicsapplication.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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".
 *
@@ -27,7 +27,7 @@
 
 // UID for the application; this should correspond
 // to the uid defined in the mmp file
-const TUid KUidGraphicsApp = { 0xA00001F8 };
+const TUid KUidGraphicsApp = { 0xE00001F8 };
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/sis/graphics_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/sis/graphics_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/sis/graphics_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; graphics_armv5.pkg
 ;
@@ -19,7 +19,7 @@
 &EN
 
 ; standard SIS file header
-#{"Graphics Example"},(0xA00001F8),1,0,0
+#{"Graphics Example"},(0xE00001F8),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -36,8 +36,8 @@
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\Graphics_reg.rsc"  -"!:\private\10003a3f\import\apps\Graphics_reg.RSC"
 "..\..\..\epoc32\data\z\resource\apps\Graphics.rsc"                     -"!:\resource\apps\Graphics.rsc"
 "..\..\..\epoc32\data\z\resource\apps\Graphics.mif"                     -"!:\resource\apps\Graphics.mif"
-"..\..\..\epoc32\data\z\private\A00001F8\GraphicsAppImages.mbm"	        -"!:\private\A00001F8\GraphicsAppImages.mbm"
-"..\..\..\epoc32\data\z\private\A00001F8\GraphicsAppImages.mif" 	    -"!:\private\A00001F8\GraphicsAppImages.mif"
+"..\..\..\epoc32\data\z\private\E00001F8\GraphicsAppImages.mbm"	        -"!:\private\E00001F8\GraphicsAppImages.mbm"
+"..\..\..\epoc32\data\z\private\E00001F8\GraphicsAppImages.mif" 	    -"!:\private\E00001F8\GraphicsAppImages.mif"
 
 ;required for application to be covered by backup/restore facility
-"backup_registration.xml"					-"!:\private\A00001f8\backup_registration.xml"
+"backup_registration.xml"					-"!:\private\E00001f8\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/sis/graphics_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/sis/graphics_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Graphics/sis/graphics_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; graphics_gcce.pkg
 ;
@@ -19,7 +19,7 @@
 &EN
 
 ; standard SIS file header
-#{"Graphics Example"},(0xA00001F8),1,0,0
+#{"Graphics Example"},(0xE00001F8),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -36,8 +36,8 @@
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\Graphics_reg.rsc"  -"!:\private\10003a3f\import\apps\Graphics_reg.RSC"
 "..\..\..\epoc32\data\z\resource\apps\Graphics.rsc"                     -"!:\resource\apps\Graphics.rsc"
 "..\..\..\epoc32\data\z\resource\apps\Graphics.mif"                     -"!:\resource\apps\Graphics.mif"
-"..\..\..\epoc32\data\z\private\A00001F8\GraphicsAppImages.mbm"	        -"!:\private\A00001F8\GraphicsAppImages.mbm"
-"..\..\..\epoc32\data\z\private\A00001F8\GraphicsAppImages.mif" 	    -"!:\private\A00001F8\GraphicsAppImages.mif"
+"..\..\..\epoc32\data\z\private\E00001F8\GraphicsAppImages.mbm"	        -"!:\private\E00001F8\GraphicsAppImages.mbm"
+"..\..\..\epoc32\data\z\private\E00001F8\GraphicsAppImages.mif" 	    -"!:\private\E00001F8\GraphicsAppImages.mif"
 
 ;required for application to be covered by backup/restore facility
-"backup_registration.xml"					-"!:\private\A00001f8\backup_registration.xml"
+"backup_registration.xml"					-"!:\private\E00001f8\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/GuiEngine/gui/data/guiengine_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/GuiEngine/gui/data/guiengine_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/GuiEngine/gui/data/guiengine_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -21,7 +21,7 @@
 #include <guiengine.rsg>  // output from resource file compiler
 
 UID2 KUidAppRegistrationResourceFile  // always this value for UID2
-UID3 0xA00001F5  // defined in the mmp file
+UID3 0xE00001F5  // defined in the mmp file
 
 RESOURCE APP_REGISTRATION_INFO
 	{
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/GuiEngine/gui/inc/guiengineapplication.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/GuiEngine/gui/inc/guiengineapplication.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/GuiEngine/gui/inc/guiengineapplication.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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".
 *
@@ -27,8 +27,8 @@
 
 // CONSTANTS
 // UID for the application; this should correspond to the uid defined in the mmp file
-const TUid KUidGuiEngineUi =  { 0xA00001F5 };
-const TUid KUidEngineDll = { 0xA00001F6 };
+const TUid KUidGuiEngineUi =  { 0xE00001F5 };
+const TUid KUidEngineDll = { 0xE00001F6 };
 
 
 // CLASS DECLARATION
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/GuiEngine/sis/guiengine_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/GuiEngine/sis/guiengine_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/GuiEngine/sis/guiengine_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; GuiEngine_armv5.pkg
 ;
@@ -20,7 +20,7 @@
 &EN
 
 ; standard SIS file header
-#{"GuiEngine"},(0xA00001F5),1,0,0
+#{"GuiEngine"},(0xE00001F5),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -40,4 +40,4 @@
 "..\..\..\epoc32\release\armv5\urel\ShapeListManager.dll"                 -"!:\sys\bin\ShapeListManager.dll"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A00001F5\backup_registration.xml"
+"backup_registration.xml"						-"!:\private\E00001F5\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/GuiEngine/sis/guiengine_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/GuiEngine/sis/guiengine_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/GuiEngine/sis/guiengine_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; GuiEngine_gcce.pkg
 ;
@@ -20,7 +20,7 @@
 &EN
 
 ; standard SIS file header
-#{"GuiEngine"},(0xA00001F5),1,0,0
+#{"GuiEngine"},(0xE00001F5),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -40,4 +40,4 @@
 "..\..\..\epoc32\release\gcce\urel\ShapeListManager.dll"                 -"!:\sys\bin\ShapeListManager.dll"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A00001F5\backup_registration.xml"
+"backup_registration.xml"						-"!:\private\E00001F5\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/HapticsExample/data/hapticsexample_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HapticsExample/data/hapticsexample_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HapticsExample/data/hapticsexample_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -20,7 +20,7 @@
 #include <hapticsexample.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA0007DFE
+UID3 0xE0007DFE
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/HapticsExample/sis/hapticsexample_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HapticsExample/sis/hapticsexample_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HapticsExample/sis/hapticsexample_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 ;
@@ -18,7 +18,7 @@
 &EN
 
 ; standard SIS file header
-#{"Haptic Ball"},(0xA0007DFE),1,0,0
+#{"Haptic Ball"},(0xE0007DFE),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -33,4 +33,4 @@
 "..\..\..\epoc32\release\armv5\urel\hapticsexample.exe" -"!:\sys\bin\hapticsexample.exe"
 "..\..\..\epoc32\data\z\resource\apps\hapticsexample.rsc" -"!:\resource\apps\hapticsexample.rsc"
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\hapticsexample_reg.rsc" -"!:\private\10003a3f\import\apps\hapticsexample_reg.rsc"
-"..\..\..\epoc32\data\z\private\a0007dfe\hapticsexample.ivt" -"!:\private\A0007DFE\hapticsexample.ivt"
+"..\..\..\epoc32\data\z\private\E0007dfe\hapticsexample.ivt" -"!:\private\E0007DFE\hapticsexample.ivt"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/HapticsExample/sis/hapticsexample_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HapticsExample/sis/hapticsexample_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HapticsExample/sis/hapticsexample_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 ;
@@ -16,7 +16,7 @@
 &EN
 
 ; standard SIS file header
-#{"Haptic Ball"},(0xA0007DFE),1,0,0
+#{"Haptic Ball"},(0xE0007DFE),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -31,4 +31,4 @@
 "..\..\..\epoc32\release\gcce\urel\hapticsexample.exe" -"!:\sys\bin\hapticsexample.exe"
 "..\..\..\epoc32\data\z\resource\apps\hapticsexample.rsc" -"!:\resource\apps\hapticsexample.rsc"
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\hapticsexample_reg.rsc" -"!:\private\10003a3f\import\apps\hapticsexample_reg.rsc"
-"..\..\..\epoc32\data\z\private\a0007dfe\hapticsexample.ivt" -"!:\private\A0007DFE\hapticsexample.ivt"
+"..\..\..\epoc32\data\z\private\E0007dfe\hapticsexample.ivt" -"!:\private\E0007DFE\hapticsexample.ivt"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/HapticsExample/src/hapticsexampleapplication.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HapticsExample/src/hapticsexampleapplication.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HapticsExample/src/hapticsexampleapplication.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -23,7 +23,7 @@
 /* UID for the application;
  * this should correspond to the uid defined in the mmp file
  */
-const TUid KUidHapticsExampleApp = { 0xA0007DFE };
+const TUid KUidHapticsExampleApp = { 0xE0007DFE };
 
 
 // ---------------------------------------------------------------------------
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/HierarchicalColumnList/data/HierarchicalColumnList_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HierarchicalColumnList/data/HierarchicalColumnList_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HierarchicalColumnList/data/HierarchicalColumnList_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -21,7 +21,7 @@
 #include <HierarchicalColumnList.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA0007E00
+UID3 0xE0007E00
 
 RESOURCE APP_REGISTRATION_INFO
     {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/HierarchicalColumnList/sis/HierarchicalColumnList_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HierarchicalColumnList/sis/HierarchicalColumnList_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HierarchicalColumnList/sis/HierarchicalColumnList_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 
 ; Package header
-#{"HierarchicalColumnList"}, (0xA0007E00), 2, 2, 0
+#{"HierarchicalColumnList"}, (0xE0007E00), 2, 2, 0
 
 ;
 ;Localised Vendor name
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/HierarchicalColumnList/sis/HierarchicalColumnList_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HierarchicalColumnList/sis/HierarchicalColumnList_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HierarchicalColumnList/sis/HierarchicalColumnList_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 
 ; Package header
-#{"HierarchicalColumnList"}, (0xA0007E00), 2, 2, 0
+#{"HierarchicalColumnList"}, (0xE0007E00), 2, 2, 0
 
 ;
 ;Localised Vendor name
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/HierarchicalColumnList/src/HierarchicalColumnListApplication.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HierarchicalColumnList/src/HierarchicalColumnListApplication.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/HierarchicalColumnList/src/HierarchicalColumnListApplication.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -21,7 +21,7 @@
 
 // UID for the application, this should correspond to the uid defined
 // in the mmp file
-static const TUid KUidHierarchicalColumnListApp = { 0xA0007E00 };
+static const TUid KUidHierarchicalColumnListApp = { 0xE0007E00 };
 
 
 // ======== MEMBER FUNCTIONS ========
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/data/IsvTelCallApp_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/data/IsvTelCallApp_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/data/IsvTelCallApp_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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".
 *
@@ -22,7 +22,7 @@
 #include <IsvTelCallApp.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA00001EF // application UID
+UID3 0xE00001EF // application UID
 
 //  RESOURCE DEFINITIONS
 // -----------------------------------------------------------------------------
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/doc/Mainpage.dox
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/doc/Mainpage.dox	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/doc/Mainpage.dox	Wed Apr 21 09:56:53 2010 +0530
@@ -101,7 +101,7 @@
  *
  * Each Symbian OS application has an associated MMP file. The MMP file defines such things as which source files are to be compiled, which libraries to be linked, and so on. To create an IsvTelCallApp DLL, it is necessary to specify the target type and UID in the MMP. These should be set to the values shown below.
  * - TARGETTYPE exe
- * - UID 0xA00001EF
+ * - UID 0xE00001EF
  *
  *
  *
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/inc/IsvTelCallAppApplication.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/inc/IsvTelCallAppApplication.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/inc/IsvTelCallAppApplication.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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,7 +23,7 @@
 #include <aknapp.h>
 
 // CONSTANTS
-const TUid KUidIsvTelCallApp = { 0xA00001EF }; // UID of the application
+const TUid KUidIsvTelCallApp = { 0xE00001EF }; // UID of the application
 
 // CLASS DECLARATION
 /**
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/sis/IsvTelCallApp_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/sis/IsvTelCallApp_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/sis/IsvTelCallApp_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; IsvTelCallApp_armv5.pkg
 
@@ -19,7 +19,7 @@
 &EN
 
 ; Header
-#{"IsvTelCallApp"},(0xA00001EF),1,0,0
+#{"IsvTelCallApp"},(0xE00001EF),1,0,0
 
 ;Localised Vendor name
 %{"Vendor Test EN"}
@@ -37,4 +37,4 @@
 "..\..\..\epoc32\data\z\resource\apps\IsvTelCallApp_icon.mif"-"!:\resource\apps\IsvTelCallApp_icon.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A00001EF\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"						-"!:\private\E00001EF\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/sis/IsvTelCallApp_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/sis/IsvTelCallApp_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelCallApp/sis/IsvTelCallApp_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; IsvTelCallApp.pkg
 
@@ -19,7 +19,7 @@
 &EN
 
 ; Header
-#{"IsvTelCallApp"},(0xA00001EF),1,0,0
+#{"IsvTelCallApp"},(0xE00001EF),1,0,0
 
 ;Localised Vendor name
 %{"Vendor Test EN"}
@@ -37,4 +37,4 @@
 "..\..\..\epoc32\data\z\resource\apps\IsvTelCallApp_icon.mif"-"!:\resource\apps\IsvTelCallApp_icon.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A00001EF\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"						-"!:\private\E00001EF\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/data/IsvTelInfoApp_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/data/IsvTelInfoApp_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/data/IsvTelInfoApp_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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".
 *
@@ -22,7 +22,7 @@
 #include <IsvTelInfoApp.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA00001F0   // application UID
+UID3 0xE00001F0   // application UID
 
 //  RESOURCE DEFINITIONS
 // -----------------------------------------------------------------------------
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/doc/Mainpage.dox
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/doc/Mainpage.dox	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/doc/Mainpage.dox	Wed Apr 21 09:56:53 2010 +0530
@@ -102,7 +102,7 @@
  *
  * Each Symbian OS application has an associated MMP file. The MMP file defines such things as which source files are to be compiled, which libraries to be linked, and so on. To create an IsvTelInfoApp EXE, it is necessary to specify the target type and UID in the MMP. These should be set to the values shown below.
  * - TARGETTYPE exe
- * - UID 0xA00001F0
+ * - UID 0xE00001F0
  *
  *
  *
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/inc/IsvTelInfoAppApplication.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/inc/IsvTelInfoAppApplication.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/inc/IsvTelInfoAppApplication.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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,7 +23,7 @@
 #include <aknapp.h>
 
 // CONSTANTS
-const TUid KUidIsvTelInfoApp = { 0xA00001F0  }; // UID of the application
+const TUid KUidIsvTelInfoApp = { 0xE00001F0  }; // UID of the application
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/sis/IsvTelInfoApp_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/sis/IsvTelInfoApp_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/sis/IsvTelInfoApp_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; IsvTelInfoApp_armv5.pkg
 
@@ -19,7 +19,7 @@
 &EN
 
 ; Header
-#{"IsvTelInfoApp"},(0xA00001F0),1,0,0
+#{"IsvTelInfoApp"},(0xE00001F0),1,0,0
 
 ;Localised Vendor name
 %{"Vendor Test EN"}
@@ -37,4 +37,4 @@
 "..\..\..\epoc32\data\z\resource\apps\IsvTelInfoApp_icon.mif"-"!:\resource\apps\IsvTelInfoApp_icon.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A00001F0\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"						-"!:\private\E00001F0\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/sis/IsvTelInfoApp_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/sis/IsvTelInfoApp_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/IsvTelInfoApp/sis/IsvTelInfoApp_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; IsvTelInfoApp_gcce.pkg
 
@@ -19,7 +19,7 @@
 &EN
 
 ; Header
-#{"IsvTelInfoApp"},(0xA00001F0),1,0,0
+#{"IsvTelInfoApp"},(0xE00001F0),1,0,0
 
 ;Localised Vendor name
 %{"Vendor Test EN"}
@@ -37,4 +37,4 @@
 "..\..\..\epoc32\data\z\resource\apps\IsvTelInfoApp_icon.mif"-"!:\resource\apps\IsvTelInfoApp_icon.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A00001F0\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"						-"!:\private\E00001F0\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/data/Listbox_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/data/Listbox_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/data/Listbox_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -21,7 +21,7 @@
 #include <Listbox.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA0000228
+UID3 0xE0000228
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/group/app_icons.mk
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/group/app_icons.mk	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/group/app_icons.mk	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 #
@@ -23,6 +23,9 @@
 TARGETDIR=$(ZDIR)\resource\apps
 ICONTARGETFILENAME=$(TARGETDIR)\listbox.mif
 
+HEADERDIR=$(EPOCROOT)epoc32\include
+HEADERFILENAME=$(HEADERDIR)\listbox.mbg
+
 ICONDIR=..\gfx
 
 do_nothing :
@@ -39,7 +42,7 @@
 CLEANLIB : do_nothing
 
 RESOURCE :	
-	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME_PRIVATE) \
+	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
 		/c32 $(ICONDIR)\qgn_menu_listbox.svg
 		
     
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/group/listbox_icons.mk
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/group/listbox_icons.mk	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/group/listbox_icons.mk	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 #
@@ -20,7 +20,7 @@
 ZDIR=$(EPOCROOT)epoc32\data\z
 endif
 
-TARGETDIR=$(ZDIR)\private\A0000228
+TARGETDIR=$(ZDIR)\private\E0000228
 ICONTARGETFILENAME=$(TARGETDIR)\Listbox_bitmaps.mif
 
 HEADERDIR=$(EPOCROOT)epoc32\include
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/sis/listbox_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/sis/listbox_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/sis/listbox_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; Listbox_armv5.pkg
 ;
@@ -19,7 +19,7 @@
 &EN
 
 ; standard SIS file header
-#{"Listbox"},(0xA0000228),1,0,0
+#{"Listbox"},(0xE0000228),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -35,8 +35,8 @@
 "..\..\..\epoc32\data\z\resource\apps\Listbox.rsc"              -"!:\resource\apps\Listbox.rsc"
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\Listbox_reg.rsc"  -"!:\private\10003a3f\import\apps\Listbox_reg.rsc"
 "..\..\..\epoc32\data\z\resource\apps\listbox.mif"		-"!:\resource\apps\listbox.mif"
-"..\..\..\epoc32\data\z\private\A0000228\Listbox_bitmaps.mif"        		-"!:\private\A0000228\Listbox_bitmaps.mif"
+"..\..\..\epoc32\data\z\private\E0000228\Listbox_bitmaps.mif"        		-"!:\private\E0000228\Listbox_bitmaps.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A0000228\backup_registration.xml"
+"backup_registration.xml"						-"!:\private\E0000228\backup_registration.xml"
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/sis/listbox_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/sis/listbox_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/sis/listbox_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; listbox_gcce.pkg
 ;
@@ -19,7 +19,7 @@
 &EN
 
 ; standard SIS file header
-#{"Listbox"},(0xA0000228),1,0,0
+#{"Listbox"},(0xE0000228),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -35,8 +35,8 @@
 "..\..\..\epoc32\data\z\resource\apps\Listbox.rsc"              -"!:\resource\apps\Listbox.rsc"
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\Listbox_reg.rsc"  -"!:\private\10003a3f\import\apps\Listbox_reg.rsc"
 "..\..\..\epoc32\data\z\resource\apps\listbox.mif"		-"!:\resource\apps\listbox.mif"
-"..\..\..\epoc32\data\z\private\A0000228\Listbox_bitmaps.mif"        		-"!:\private\A0000228\Listbox_bitmaps.mif"
+"..\..\..\epoc32\data\z\private\E0000228\Listbox_bitmaps.mif"        		-"!:\private\E0000228\Listbox_bitmaps.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A0000228\backup_registration.xml"
+"backup_registration.xml"						-"!:\private\E0000228\backup_registration.xml"
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/src/ListboxApplication.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/src/ListboxApplication.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Listbox/src/ListboxApplication.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -23,7 +23,7 @@
 
 // UID for the application;
 // this should correspond to the uid defined in the mmp file
-const TUid KUidListboxApp = { 0xA0000228 };
+const TUid KUidListboxApp = { 0xE0000228 };
 
 // -----------------------------------------------------------------------------
 // CListboxApplication::CreateDocumentL()
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Localization/group/bld.inf
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Localization/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Localization/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005 - 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".
 *
@@ -21,13 +21,5 @@
 
 
 
-#ifdef EKA2
-
 gnumakefile icons_aif_scalable_dc.mk
-localization_s60_3rd_ed.mmp
-
-#else
-
-localization_s60_2nd_ed.mmp
-
-#endif
+localization.mmp
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Localization/src/localization.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Localization/src/localization.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Localization/src/localization.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005 - 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".
 *
@@ -19,9 +19,7 @@
 
 
 // INCLUDE FILES
-#ifdef __SERIES60_3X__
 #include <eikstart.h>
-#endif
 
 #include "LocalizationApplication.h"
 
@@ -30,19 +28,7 @@
 	return static_cast<CApaApplication*>( new CLocalizationApplication );
 	}
 
-#ifdef __SERIES60_3X__
-
 GLDEF_C TInt E32Main()
 	{
 	return EikStart::RunApplication( NewApplication );
-	}
-	
-#else
-
-GLDEF_C TInt E32Dll( TDllReason )
-    {
-    return KErrNone;
-    }
-
-#endif
-
+	}
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Localization/src/localizationapplication.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Localization/src/localizationapplication.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Localization/src/localizationapplication.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005 - 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".
 *
@@ -26,15 +26,10 @@
 
 // UID for the application;
 // this should correspond to the uid defined in the mmp file
-#ifdef __SERIES60_3X__
 
 const TUid KUidLocalizationApp = { 0xE0005B00 };
 
-#else // on 2nd Ed, makesis doesn't like app UIDs above 0x80000000
 
-const TUid KUidLocalizationApp = { 0x00005B00 };
-    
-#endif
 
 // -----------------------------------------------------------------------------
 // CLocalizationApplication::CreateDocumentL()
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Messaging/data/Messaging_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Messaging/data/Messaging_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Messaging/data/Messaging_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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 <Messaging.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA000018B
+UID3 0xE000018B
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Messaging/inc/MessagingApp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Messaging/inc/MessagingApp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Messaging/inc/MessagingApp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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".
 *
@@ -24,7 +24,7 @@
 
 // CONSTANTS
 // UID of the application
-const TUid KUidMessaging = { 0xA000018B };
+const TUid KUidMessaging = { 0xE000018B };
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Messaging/sis/Messaging_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Messaging/sis/Messaging_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Messaging/sis/Messaging_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; Messaging_armv5.pkg
 ;Languages
 &EN
 
 ;Header
-#{"Messaging"},(0xA000018B),1,0,0
+#{"Messaging"},(0xE000018B),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -36,4 +36,4 @@
 "..\..\..\epoc32\data\z\resource\apps\Messaging.mif"               -"!:\resource\apps\Messaging.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"  -"!:\private\A000018B\backup_registration.xml"
+"backup_registration.xml"  -"!:\private\E000018B\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Messaging/sis/Messaging_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Messaging/sis/Messaging_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Messaging/sis/Messaging_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; Messaging_gcce.pkg
 ;Languages
 &EN
 
 ;Header
-#{"Messaging"},(0xA000018B),1,0,0
+#{"Messaging"},(0xE000018B),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -36,6 +36,6 @@
 "..\..\..\epoc32\data\z\resource\apps\Messaging.mif"               -"!:\resource\apps\Messaging.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"  -"!:\private\A000018B\backup_registration.xml"
+"backup_registration.xml"  -"!:\private\E000018B\backup_registration.xml"
 
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/MyView/doc/MYVIEW4.JPG
Binary file sdkcreationmw/sdkexamples/cppexamples/S60Ex/MyView/doc/MYVIEW4.JPG has changed
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/MyView/group/bld.inf
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/MyView/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/MyView/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2002 - 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".
 *
@@ -24,22 +24,5 @@
 // Specify the .mmp files required for building the important component
 // releasables. 
 
-#ifdef _CARBIDE_CPP_
-
 gnumakefile icons_scalable_dc.mk
-MyView_s60_3rd_ed.mmp
-
-#else
-
-#ifdef EKA2
-
-gnumakefile icons_scalable_dc.mk
-MyView_s60_3rd_ed.mmp
-
-#else
-
-MyView_s60_2nd_ed.mmp
-
-#endif //EKA2
-
-#endif //_CARBIDE_CPP_
\ No newline at end of file
+MyView.mmp
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/MyView/inc/MyViewApp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/MyView/inc/MyViewApp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/MyView/inc/MyViewApp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2002 - 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".
 *
@@ -26,11 +26,8 @@
 
 // CONSTANTS
 // UID of the application
-#ifdef __SERIES60_3X__
+
 const TUid KUidMyView = { 0xE1EF0018  };
-#else
-const TUid KUidMyView = { 0x01EF0018  };
-#endif
 
 
 // CLASS DECLARATION
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/MyView/src/MyViewApp.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/MyView/src/MyViewApp.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/MyView/src/MyViewApp.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2002 - 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".
 *
@@ -22,9 +22,8 @@
 #include    "MyViewApp.h"
 #include    "MyViewDocument.h"
 
-#ifdef __SERIES60_3X__
-    #include <eikstart.h>
-#endif
+#include <eikstart.h>
+
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -63,7 +62,6 @@
     }
 
 
-#ifdef __SERIES60_3X__  //////////// 3rd Ed
 
 // -----------------------------------------------------------------------------
 //	Entry point function for Symbian Apps (3rd Edition)
@@ -74,22 +72,6 @@
 	return EikStart::RunApplication( NewApplication );
 	}
 
-#else /////////// 2nd Ed
-
-
-// ---------------------------------------------------------
-// E32Dll(TDllReason) 
-// Entry point function for EPOC Apps
-// Returns: KErrNone: No error
-// ---------------------------------------------------------
-//
-GLDEF_C TInt E32Dll( TDllReason )
-    {
-    return KErrNone;
-    }
-    
-#endif
-    
 
 // End of File  
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/data/aknexnote_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/data/aknexnote_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/data/aknexnote_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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 <aknexnote.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA0000230
+UID3 0xE0000230
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/inc/aknexnoteapp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/inc/aknexnoteapp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/inc/aknexnoteapp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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".
 *
@@ -25,7 +25,7 @@
 
 // CONSTANTS
 // UID of the application
-const TUid KUidAknExNote = { 0xA0000230 }; 
+const TUid KUidAknExNote = { 0xE0000230 }; 
 
 
 // CLASS DECLARATION
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/inc/aknexnoteconstants.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/inc/aknexnoteconstants.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/inc/aknexnoteconstants.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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,7 +23,7 @@
 // CONSTANTS
 
 // All apllications constants are here.
-const TInt KAknExNoteGray = 0xaaaaaa;
+const TInt KAknExNoteGray = 0xEaaaaa;
 
 const TInt KAknExNoteComponentCount = 1;
 const TInt KAknExNoteMessageBufLength = 256;
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/sis/note_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/sis/note_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/sis/note_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ; Languages
 &EN
 
 ; Header
-#{"Note Example"},(0xA0000230),1,0,0
+#{"Note Example"},(0xE0000230),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -36,4 +36,4 @@
 "..\..\..\epoc32\data\z\resource\apps\AknExNote_aif.mif"            -"!:\resource\apps\AknExNote_aif.mif"
 
 ;required for application to be covered by backup/restore facility
-;"backup_registration.xml"						-"!:\private\A0000230\backup_registration.xml"
+;"backup_registration.xml"						-"!:\private\E0000230\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/sis/note_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/sis/note_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Note/sis/note_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 
 ; Installation header
-#{"Note Example"},(0xA0000230),1,0,0
+#{"Note Example"},(0xE0000230),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -35,4 +35,4 @@
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\AknExNote_reg.rsc"	-"!:\private\10003a3f\import\apps\AknExNote_reg.rsc"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"					-"!:\private\A0000230\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"					-"!:\private\E0000230\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/OcrExample/data/OcrExample_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/OcrExample/data/OcrExample_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/OcrExample/data/OcrExample_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -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 <OcrExample.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA00001F3
+UID3 0xE00001F3
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/OcrExample/inc/OcrExampleUids.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/OcrExample/inc/OcrExampleUids.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/OcrExample/inc/OcrExampleUids.h	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -22,7 +22,7 @@
 #include <e32uid.h>
 
 // application uid
-const TUid KUidOcrExample = { 0xA00001F3 };
+const TUid KUidOcrExample = { 0xE00001F3 };
 
 // main application view uid
 const TUid KUidImageView = { 1 };
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/OcrExample/sis/OCRExample_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/OcrExample/sis/OCRExample_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/OcrExample/sis/OCRExample_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; OCRExample_armv5.pkg
 
@@ -19,7 +19,7 @@
 &EN
 
 ; Header
-#{"OCR Example"},(0xA00001F3),1,0,0
+#{"OCR Example"},(0xE00001F3),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -40,5 +40,5 @@
 "..\data\sample_pics\OCR_doc.jpg"                                         -"!:\Data\Images\OCR_doc.jpg"
 
 ;required for application to be covered by backup/restore facility
-"backup_registration.xml"						-"!:\private\A00001F3\backup_registration.xml"
+"backup_registration.xml"						-"!:\private\E00001F3\backup_registration.xml"
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/OcrExample/sis/OCRExample_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/OcrExample/sis/OCRExample_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/OcrExample/sis/OCRExample_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; OCRExample_gcce.pkg
 
@@ -19,7 +19,7 @@
 &EN
 
 ; Header
-#{"OCR Example"},(0xA00001F3),1,0,0
+#{"OCR Example"},(0xE00001F3),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -40,5 +40,5 @@
 "..\data\sample_pics\OCR_doc.jpg"                                         -"!:\Data\Images\OCR_doc.jpg"
 
 ;required for application to be covered by backup/restore facility
-"backup_registration.xml"						-"!:\private\A00001F3\backup_registration.xml"
+"backup_registration.xml"						-"!:\private\E00001F3\backup_registration.xml"
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/data/aknexpopfield.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/data/aknexpopfield.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/data/aknexpopfield.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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".
 *
@@ -33,7 +33,7 @@
 
 //  CONSTANTS
 #define AKNEXPOPFIELD_TEXT_WIDTH    8
-#define AKNEXPOPFIELD_MBM_FILENAME "\\private\A000022A\\aknexpopfield.mbm"
+#define AKNEXPOPFIELD_MBM_FILENAME "\\private\E000022A\\aknexpopfield.mbm"
 
 //  RESOURCE DEFINITIONS
 // -----------------------------------------------------------------------------
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/data/aknexpopfield_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/data/aknexpopfield_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/data/aknexpopfield_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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 <AknExPopField.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA000022A
+UID3 0xE000022A
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/group/bitmaps.mk
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/group/bitmaps.mk	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/group/bitmaps.mk	Wed Apr 21 09:56:53 2010 +0530
@@ -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 @@
 ZDIR=$(EPOCROOT)epoc32\data\z
 endif
 
-TARGETDIR=$(ZDIR)\private\A000022A
+TARGETDIR=$(ZDIR)\private\E000022A
 ICONTARGETFILENAME=$(TARGETDIR)\AknExPopField.mbm
 
 HEADERDIR=$(EPOCROOT)epoc32\include
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/inc/aknexpopfieldapp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/inc/aknexpopfieldapp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/inc/aknexpopfieldapp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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,7 +23,7 @@
 #include <aknapp.h>
 
 // CONSTANTS
-const TUid KUidAknExPopField = { 0xA000022A }; // UID of the application
+const TUid KUidAknExPopField = { 0xE000022A }; // UID of the application
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/sis/popupfield_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/sis/popupfield_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/sis/popupfield_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ; Languages
 &EN
 
 ; Header
-#{"PopupField Example"},(0xA000022A),1,0,0
+#{"PopupField Example"},(0xE000022A),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -34,8 +34,8 @@
 "..\..\..\epoc32\data\z\resource\apps\AknExPopField.rsc"            -"!:\resource\apps\AknExPopField.rsc"
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\AknExPopField_reg.rsc"  -"!:\private\10003a3f\import\apps\AknExPopField_reg.rsc"
 "..\..\..\epoc32\data\z\resource\apps\AknExPopField_aif.mif"            -"!:\resource\apps\AknExPopField_aif.mif"
-"..\..\..\epoc32\data\z\private\A000022A\aknexpopfield.mbm"	        -"!:\private\A000022A\aknexpopfield.mbm"
-"..\..\..\epoc32\data\z\private\A000022A\aknexpopfield.mif"	        -"!:\private\A000022A\aknexpopfield.mif"
+"..\..\..\epoc32\data\z\private\E000022A\aknexpopfield.mbm"	        -"!:\private\E000022A\aknexpopfield.mbm"
+"..\..\..\epoc32\data\z\private\E000022A\aknexpopfield.mif"	        -"!:\private\E000022A\aknexpopfield.mif"
 
 ;required for application to be covered by backup/restore facility
-;"backup_registration.xml"						-"!:\private\A000022A\backup_registration.xml"
+;"backup_registration.xml"						-"!:\private\E000022A\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/sis/popupfield_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/sis/popupfield_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupField/sis/popupfield_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 
 ; Installation header
-#{"PopupField Example"},(0xA000022A),1,0,0
+#{"PopupField Example"},(0xE000022A),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -33,8 +33,8 @@
 "..\..\..\epoc32\data\z\resource\apps\AknExPopField.rsc"		-"!:\resource\apps\AknExPopField.rsc"
 "..\..\..\epoc32\data\z\resource\apps\AknExPopField_aif.mif"		-"!:\resource\apps\AknExPopField_aif.mif"
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\AknExPopField_reg.rsc"	-"!:\private\10003a3f\import\apps\AknExPopField_reg.rsc"
-"..\..\..\epoc32\data\z\private\A000022A\aknexpopfield.mbm"	        -"!:\private\A000022A\aknexpopfield.mbm"
-"..\..\..\epoc32\data\z\private\A000022A\aknexpopfield.mif"	        -"!:\private\A000022A\aknexpopfield.mif"
+"..\..\..\epoc32\data\z\private\E000022A\aknexpopfield.mbm"	        -"!:\private\E000022A\aknexpopfield.mbm"
+"..\..\..\epoc32\data\z\private\E000022A\aknexpopfield.mif"	        -"!:\private\E000022A\aknexpopfield.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"					-"!:\private\A000022A\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"					-"!:\private\E000022A\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/data/aknexpoplist_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/data/aknexpoplist_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/data/aknexpoplist_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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 <aknexpoplist.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA0000231
+UID3 0xE0000231
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/doc/image_poplist005.gif
Binary file sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/doc/image_poplist005.gif has changed
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/group/Icons.mk
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/group/Icons.mk	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/group/Icons.mk	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 # Copyright (c) 2004-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 @@
 ZDIR=$(EPOCROOT)epoc32\data\z
 endif
 
-TARGETDIR=$(ZDIR)\private\A0000231
+TARGETDIR=$(ZDIR)\private\E0000231
 ICONTARGETFILENAME=$(TARGETDIR)\AknExPopList.mbm
 
 HEADERDIR=$(EPOCROOT)epoc32\include
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/inc/aknexpoplistapp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/inc/aknexpoplistapp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/inc/aknexpoplistapp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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".
 *
@@ -26,7 +26,7 @@
 
 // CONSTANTS
 // UID of the application 
-const TUid KUidAknExPopList = { 0xA0000231 };
+const TUid KUidAknExPopList = { 0xE0000231 };
 
 
 // CLASS DECLARATION
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/inc/aknexpoplistcontainer.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/inc/aknexpoplistcontainer.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/inc/aknexpoplistcontainer.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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".
 *
@@ -25,7 +25,7 @@
  
 // CONSTANTS
 const TInt KNumberOfControls = 0;
-const TInt KRgbColorGray = 0xaaaaaa;
+const TInt KRgbColorGray = 0xEaaaaa;
 
 
 // CLASS DECLARATION
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/sis/popuplist_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/sis/popuplist_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/sis/popuplist_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ; Languages
 &EN
 
 ; Header
-#{"PopupList Example"},(0xA0000231),1,0,0
+#{"PopupList Example"},(0xE0000231),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -34,8 +34,8 @@
 "..\..\..\epoc32\data\z\resource\apps\AknExPopList.rsc"            -"!:\resource\apps\AknExPopList.rsc"
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\AknExPopList_reg.rsc"  -"!:\private\10003a3f\import\apps\AknExPopList_reg.rsc"
 "..\..\..\epoc32\data\z\resource\apps\AknExPopList_aif.mif"            -"!:\resource\apps\AknExPopList_aif.mif"
-"..\..\..\epoc32\data\z\private\A0000231\aknexpoplist.mbm"	        -"!:\private\A0000231\aknexpoplist.mbm"
-"..\..\..\epoc32\data\z\private\A0000231\aknexpoplist.mif"	        -"!:\private\A0000231\aknexpoplist.mif"
+"..\..\..\epoc32\data\z\private\E0000231\aknexpoplist.mbm"	        -"!:\private\E0000231\aknexpoplist.mbm"
+"..\..\..\epoc32\data\z\private\E0000231\aknexpoplist.mif"	        -"!:\private\E0000231\aknexpoplist.mif"
 
 ;required for application to be covered by backup/restore facility
-;"backup_registration.xml"						-"!:\private\A0000231\backup_registration.xml"
+;"backup_registration.xml"						-"!:\private\E0000231\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/sis/popuplist_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/sis/popuplist_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/PopupList/sis/popuplist_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 
 ; Installation header
-#{"PopupList Example"},(0xA0000231),1,0,0
+#{"PopupList Example"},(0xE0000231),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -33,8 +33,8 @@
 "..\..\..\epoc32\data\z\resource\apps\AknExPopList.rsc"		-"!:\resource\apps\AknExPopList.rsc"
 "..\..\..\epoc32\data\z\resource\apps\AknExPopList_aif.mif"		-"!:\resource\apps\AknExPopList_aif.mif"
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\AknExPopList_reg.rsc"	-"!:\private\10003a3f\import\apps\AknExPopList_reg.rsc"
-"..\..\..\epoc32\data\z\private\A0000231\aknexpoplist.mbm"	        -"!:\private\A0000231\aknexpoplist.mbm"
-"..\..\..\epoc32\data\z\private\A0000231\aknexpoplist.mif"	        -"!:\private\A0000231\aknexpoplist.mif"
+"..\..\..\epoc32\data\z\private\E0000231\aknexpoplist.mbm"	        -"!:\private\E0000231\aknexpoplist.mbm"
+"..\..\..\epoc32\data\z\private\E0000231\aknexpoplist.mif"	        -"!:\private\E0000231\aknexpoplist.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"					-"!:\private\A0000231\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"					-"!:\private\E0000231\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/ProgressBar/data/AknExPbar_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ProgressBar/data/AknExPbar_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ProgressBar/data/AknExPbar_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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 <AknExPbar.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA00001F9
+UID3 0xE00001F9
 
 RESOURCE APP_REGISTRATION_INFO 
     {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/ProgressBar/inc/aknexpbarapp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ProgressBar/inc/aknexpbarapp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ProgressBar/inc/aknexpbarapp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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".
 *
@@ -27,7 +27,7 @@
 
 // CONSTANTS
 // UID of the application
-const TUid KUidAknExPbar = { 0xA00001F9 };
+const TUid KUidAknExPbar = { 0xE00001F9 };
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/ProgressBar/sis/progressbar_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ProgressBar/sis/progressbar_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ProgressBar/sis/progressbar_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; ProgressBar_armv5.pkg
 
@@ -19,7 +19,7 @@
 &EN
 
 ; Header
-#{"ProgressBar"},(0xA00001F9),1,0,0
+#{"ProgressBar"},(0xE00001F9),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -38,6 +38,6 @@
 "..\..\..\epoc32\data\z\resource\apps\AknExPbar.mif"                     -"!:\resource\apps\AknExPbar.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A00001F9\backup_registration.xml"
+"backup_registration.xml"						-"!:\private\E00001F9\backup_registration.xml"
 
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/ProgressBar/sis/progressbar_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ProgressBar/sis/progressbar_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/ProgressBar/sis/progressbar_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; ProgressBar_gcce.pkg
 
@@ -19,7 +19,7 @@
 &EN
 
 ; Header
-#{"ProgressBar"},(0xA00001F9),1,0,0
+#{"ProgressBar"},(0xE00001F9),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -38,6 +38,6 @@
 "..\..\..\epoc32\data\z\resource\apps\AknExPbar.mif"                     -"!:\resource\apps\AknExPbar.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"						-"!:\private\A00001F9\backup_registration.xml"
+"backup_registration.xml"						-"!:\private\E00001F9\backup_registration.xml"
 
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/data/aknexquery_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/data/aknexquery_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/data/aknexquery_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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 <aknexquery.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA0000232
+UID3 0xE0000232
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/group/Icons.mk
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/group/Icons.mk	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/group/Icons.mk	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 # Copyright (c) 2004-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 @@
 ZDIR=$(EPOCROOT)epoc32\data\z
 endif
 
-TARGETDIR=$(ZDIR)\private\A0000232
+TARGETDIR=$(ZDIR)\private\E0000232
 ICONTARGETFILENAME=$(TARGETDIR)\AknExQuery.mbm
 
 HEADERDIR=$(EPOCROOT)epoc32\include
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/inc/aknexqueryapp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/inc/aknexqueryapp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/inc/aknexqueryapp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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,7 +23,7 @@
 #include <Aknapp.h>
 
 // CONSTANTS
-const TUid KUidAknExQuery = { 0xA0000232 }; // UID of the application
+const TUid KUidAknExQuery = { 0xE0000232 }; // UID of the application
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/inc/aknexquerycontainer.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/inc/aknexquerycontainer.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/inc/aknexquerycontainer.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004 - 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".
 *
@@ -31,7 +31,7 @@
 // CONSTANTS
 const TInt KAknExQueryTextBufLength = 128;
 
-#define KAknExQueryGray TRgb( 0xaaaaaa )
+#define KAknExQueryGray TRgb( 0xEaaaaa )
 #define AKNEXQUERY_LABEL_ORIGIN TPoint( 0, 0 )
 #define AKNEXQUERY_LABEL2_POSITION TPoint( 0, 20 )
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/sis/query_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/sis/query_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/sis/query_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ; Languages
 &EN
 
 ; Header
-#{"Query Example"},(0xA0000232),1,0,0
+#{"Query Example"},(0xE0000232),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -34,8 +34,8 @@
 "..\..\..\epoc32\data\z\resource\apps\AknExQuery.rsc"            -"!:\resource\apps\AknExQuery.rsc"
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\AknExQuery_reg.rsc"  -"!:\private\10003a3f\import\apps\AknExQuery_reg.rsc"
 "..\..\..\epoc32\data\z\resource\apps\AknExQuery_aif.mif"            -"!:\resource\apps\AknExQuery_aif.mif"
-"..\..\..\epoc32\data\z\private\A0000232\aknexquery.mbm"	        -"!:\private\A0000232\aknexquery.mbm"
-"..\..\..\epoc32\data\z\private\A0000232\aknexquery.mif"	        -"!:\private\A0000232\aknexquery.mif"
+"..\..\..\epoc32\data\z\private\E0000232\aknexquery.mbm"	        -"!:\private\E0000232\aknexquery.mbm"
+"..\..\..\epoc32\data\z\private\E0000232\aknexquery.mif"	        -"!:\private\E0000232\aknexquery.mif"
 
 ;required for application to be covered by backup/restore facility
-;"backup_registration.xml"						-"!:\private\A0000232\backup_registration.xml"
+;"backup_registration.xml"						-"!:\private\E0000232\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/sis/query_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/sis/query_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Query/sis/query_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 
 ; Installation header
-#{"Query Example"},(0xA0000232),1,0,0
+#{"Query Example"},(0xE0000232),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -33,8 +33,8 @@
 "..\..\..\epoc32\data\z\resource\apps\AknExQuery.rsc"		-"!:\resource\apps\AknExQuery.rsc"
 "..\..\..\epoc32\data\z\resource\apps\AknExQuery_aif.mif"		-"!:\resource\apps\AknExQuery_aif.mif"
 "..\..\..\epoc32\data\z\private\10003a3f\import\apps\AknExQuery_reg.rsc"	-"!:\private\10003a3f\import\apps\AknExQuery_reg.rsc"
-"..\..\..\epoc32\data\z\private\A0000232\aknexquery.mbm"	        -"!:\private\A0000232\aknexquery.mbm"
-"..\..\..\epoc32\data\z\private\A0000232\aknexquery.mif"	        -"!:\private\A0000232\aknexquery.mif"
+"..\..\..\epoc32\data\z\private\E0000232\aknexquery.mbm"	        -"!:\private\E0000232\aknexquery.mbm"
+"..\..\..\epoc32\data\z\private\E0000232\aknexquery.mif"	        -"!:\private\E0000232\aknexquery.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"					-"!:\private\A0000232\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"					-"!:\private\E0000232\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Registration/data/Registration_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Registration/data/Registration_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Registration/data/Registration_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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 <Registration.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA00001F1
+UID3 0xE00001F1
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Registration/inc/RegistrationApp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Registration/inc/RegistrationApp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Registration/inc/RegistrationApp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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".
 *
@@ -24,7 +24,7 @@
 
 // CONSTANTS
 // UID of the application
-const TUid KUidRegistration = { 0xA00001F1 };
+const TUid KUidRegistration = { 0xE00001F1 };
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Registration/sis/Registration_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Registration/sis/Registration_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Registration/sis/Registration_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; Registration_armv5.pkg
 ;Languages
 &EN
 
 ;Header
-#{"Registration"},(0xA00001F1),1,0,0
+#{"Registration"},(0xE00001F1),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -38,5 +38,5 @@
 "..\..\..\epoc32\data\z\resource\apps\Registration.mif"               -"!:\resource\apps\Registration.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"     -"!:\private\A00001F1\backup_registration.xml"
+"backup_registration.xml"     -"!:\private\E00001F1\backup_registration.xml"
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/Registration/sis/Registration_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Registration/sis/Registration_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/Registration/sis/Registration_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; Registration_gcce.pkg
 ;Languages
 &EN
 
 ;Header
-#{"Registration"},(0xA00001F1),1,0,0
+#{"Registration"},(0xE00001F1),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -38,5 +38,5 @@
 "..\..\..\epoc32\data\z\resource\apps\Registration.mif"               -"!:\resource\apps\Registration.mif"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"     -"!:\private\A00001F1\backup_registration.xml"
+"backup_registration.xml"     -"!:\private\E00001F1\backup_registration.xml"
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/group/RichTextEditor.mmp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/group/RichTextEditor.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/group/RichTextEditor.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 - 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".
 *
@@ -17,10 +17,41 @@
 */
 
 
-TARGET              RichTextEditor.app
-TARGETTYPE          app
-UID                 0x100039CE 0x01EF0030 
-TARGETPATH          \system\apps\RichTextEditor
+TARGET              RichTextEditor.exe
+TARGETTYPE          exe
+UID                 0x100039ce 0xe1ef0030 
+SECUREID            0xe1ef0030
+CAPABILITY          none
+
+// resources
+
+SOURCEPATH          ..\data
+
+START RESOURCE      RichTextEditor.rss
+	HEADER
+	TARGETPATH      \resource\apps
+END
+
+START RESOURCE      RichTextEditor_reg.rss
+	TARGETPATH      \private\10003a3f\apps
+END
+
+// Additional SOURCE definitions used when importing to Carbide IDE
+#ifdef _CARBIDE_CPP_
+SOURCE              picture.mbm
+SOURCEPATH          ..\sis
+SOURCE              RichTextEditor_S60_3rd_Ed_Carbide.pkg
+#endif  // Carbide
+
+LANG                SC
+
+USERINCLUDE 	    ..\inc
+
+SYSTEMINCLUDE   	\epoc32\include
+SYSTEMINCLUDE    \epoc32\include\mw
+SYSTEMINCLUDE    \epoc32\include\app
+
+// sources
 
 SOURCEPATH          ..\src
 SOURCE              RichTextEditorApp.cpp 
@@ -29,35 +60,19 @@
 SOURCE              RichTextEditorContainer.cpp
 SOURCE              MyPicture.cpp
 
-SOURCEPATH          ..\data
-RESOURCE            RichTextEditor.rss
-RESOURCE            RichTextEditor_caption.rss
-
-// Additional SOURCE definitions used when importing to Carbide IDE
-#ifdef _CARBIDE_CPP_
-SOURCE              picture.mbm
-SOURCEPATH          ..\sis
-SOURCE              RichTextEditor_S60_2nd_Ed_Carbide.pkg
-#endif  // Carbide
-
-LANG                SC
-
-USERINCLUDE         ..\inc
-
-SYSTEMINCLUDE       \epoc32\include
-SYSTEMINCLUDE    \epoc32\include\mw
-SYSTEMINCLUDE    \epoc32\include\app
+// libraries
 
 LIBRARY             euser.lib
-LIBRARY             avkon.lib 
 LIBRARY             apparc.lib
 LIBRARY             cone.lib
 LIBRARY             eikcore.lib 
 LIBRARY             eikcoctl.lib
+LIBRARY             avkon.lib 
 LIBRARY             gdi.lib
 LIBRARY             etext.lib
 LIBRARY             fbscli.lib
 LIBRARY             eikctl.lib
 LIBRARY             estor.lib
+LIBRARY             efsrv.lib
 
-AIF RichTextEditor.aif ..\aif RichTextEditorAif.rss c8 context_pane_icon.bmp context_pane_icon_mask.bmp list_icon.bmp list_icon_mask.bmp
+// eof
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/group/bld.inf
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 - 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".
 *
@@ -19,17 +19,10 @@
 
 
 PRJ_MMPFILES
-#ifdef EKA2
-RichTextEditor_S60_3rd_Ed.mmp
-#else
+
 RichTextEditor.mmp
-#endif
+
 
 PRJ_EXPORTS
-#ifdef EKA2 //3rd edition
+
 ..\data\picture.mbm		..\winscw\c\private\E1EF0030\picture.mbm
-#else //1st edition
-//..\data\picture.mbm		..\Wins\c\system\Apps\RichTextEditor\picture.mbm
-//2nd edition
-..\data\picture.mbm		..\winscw\c\system\apps\RichTextEditor\picture.mbm
-#endif
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/inc/RichTextEditorApp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/inc/RichTextEditorApp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/inc/RichTextEditorApp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 - 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -24,11 +24,9 @@
 
 // CONSTANTS
 // UID of the application
-#ifdef __SERIES60_3X__
+
 const TUid KUidRTE = { 0xE1EF0030 };
-#else
-const TUid KUidRTE = { 0x01EF0030 };
-#endif
+
 // CLASS DECLARATION
 
 /**
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/inc/RichTextEditorContainer.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/inc/RichTextEditorContainer.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/inc/RichTextEditorContainer.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 - 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -57,15 +57,12 @@
 		//! Swicht on/off the Bold/Italic/Underline attributes
 	void SetCharacterBIUAttribL(CEikGlobalTextEditor::TFontStyleFlags );
 
-	#ifdef __SERIES60_3X__
+	
        /**
 		* Change the text's font from 3rd Edition onwards
 		*/
 		void SetFont(TInt aFontId);
-	#else
-		//! Change the text's font
-		void SetFont(const CFont* );
-	#endif
+	
        /**
         * Toggle between strikethrough or not strikethrough text
         */
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/src/RichTextEditorApp.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/src/RichTextEditorApp.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/src/RichTextEditorApp.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 - 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -19,9 +19,9 @@
 // INCLUDE FILES
 #include    "RichTextEditorApp.h"
 #include    "RichTextEditorDocument.h"
-#ifdef __SERIES60_3X__
+
 #include <eikstart.h>
-#endif
+
 // ================= MEMBER FUNCTIONS =======================
 
 // ---------------------------------------------------------
@@ -57,18 +57,7 @@
     return new CRTEApp;
     }
 
-#ifndef __SERIES60_3X__
-// ---------------------------------------------------------
-// E32Dll(TDllReason) 
-// Entry point function for EPOC Apps
-// Returns: KErrNone: No error
-// ---------------------------------------------------------
-//
-GLDEF_C TInt E32Dll( TDllReason )
-{
-    return KErrNone;
-}
-#else
+
 // ---------------------------------------------------------
 // E32Main()
 // Entry point function for new (>= 9.0) EPOC Apps (exe)
@@ -79,6 +68,6 @@
 {
 	return EikStart::RunApplication( NewApplication );
 }
-#endif
+
 // End of File  
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/src/RichTextEditorAppUi.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/src/RichTextEditorAppUi.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/src/RichTextEditorAppUi.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 - 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -20,11 +20,9 @@
 #include "RichTextEditorAppUi.h"
 #include "RichTextEditorContainer.h"
 #include <RichTextEditor.rsg>
-#ifdef __SERIES60_3X__
+
 #include <avkon.hrh> //Font ids
-#else
-#include <AknUtils.h> //Defined font name
-#endif
+
 #include "RichTextEditor.hrh"
 
 #define KEnableSkinFlag 0x1000
@@ -39,11 +37,9 @@
 //
 void CRTEAppUi::ConstructL()
     {
-    #ifdef __SERIES60_3X__
-	BaseConstructL(EAknEnableSkin);
-	#else
-	BaseConstructL(KEnableSkinFlag | KLayoutAwareApp);
-	#endif
+
+   	BaseConstructL(EAknEnableSkin);
+
     iAppContainer = new (ELeave) CRTEContainer;
     iAppContainer->SetMopParent(this);
     iAppContainer->ConstructL( ClientRect() );
@@ -92,26 +88,13 @@
 		// Font names defined at AknUtils.h in 1st and 2nd editions.
 		// Font ids at avkon.hrh from 3rd Edition onwards.
 		case ERichTextCmdAppFont1:
-			#ifdef __SERIES60_3X__
 			iAppContainer->SetFont(EAknLogicalFontPrimaryFont);
-			#else
-			iAppContainer->SetFont(LatinPlain12());
-			#endif
 			break;
 		case ERichTextCmdAppFont2:
-			#ifdef __SERIES60_3X__
 			iAppContainer->SetFont(EAknLogicalFontSecondaryFont);
-			#else
-			// default font at Typo application startup in 1st and 2nd edition.
-			iAppContainer->SetFont(LatinBold12());
-			#endif
 			break;
 		case ERichTextCmdAppFont3:
-			#ifdef __SERIES60_3X__
 			iAppContainer->SetFont(EAknLogicalFontPrimarySmallFont);
-			#else
-			iAppContainer->SetFont(LatinBold19());
-			#endif
 			break;
 		case ERichTextCmdAppSetStrikethrough:
 			iAppContainer->Strike();
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/src/RichTextEditorContainer.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/src/RichTextEditorContainer.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/RichTextEditor/src/RichTextEditorContainer.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 - 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -25,10 +25,8 @@
 #include <RichTextEditor.rsg> // Demo Text Buffer
 #include "mypicture.h"   // CMyPicture 
 #include <AknUtils.h>	
+#include <eikapp.h>
 
-#ifdef __SERIES60_3X__
-#include <eikapp.h>
-#endif
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -75,17 +73,7 @@
 //
 void CRTEContainer::PrepareBitmapL()
 	{
-	#ifndef __SERIES60_3X__
-	TFileName name(KImageBitmapFile);
-	CompleteWithAppPath( name );
-	// windows build wants to install apps on rom drive ( "z:\" )
-	// but we want the data from "c:\" instead
-	#ifdef __WINS__
-	name[ 0 ] = 'C';
-	#endif
-
-    #else // 3rd ed
-
+	
     RFs fsSession;
     User::LeaveIfError(fsSession.Connect());
     CleanupClosePushL( fsSession );
@@ -100,7 +88,7 @@
     name.Insert( 0, parse.Drive() );
     #endif
 
-	#endif
+	
 
 	// Create and Load the Bitmap
 	CFbsBitmap* bitmap = new( ELeave )CFbsBitmap;
@@ -110,9 +98,9 @@
 	iBitmap->AppendL(bitmap);
 
 	CleanupStack::Pop(); //bitmap - container free bitmap at the destructor
-	#ifdef __SERIES60_3X__
+	
     CleanupStack::PopAndDestroy(1, &fsSession);
-    #endif
+  
 	// last item in iBitmap array is ready to Insert
 	}
 
@@ -258,17 +246,14 @@
 	TInt StatusLineHeight = iStatusLine->Font()->HeightInPixels()+6;
 	iStatusLine->SetExtent(TPoint(0, 0),TSize(rect.Width(), StatusLineHeight));
 	
-	#ifdef __SERIES60_3X__
+	
 	TRect ScrollBarRect = iRtEd->ScrollBarFrame()->VerticalScrollBar()->Rect();
 	//In 3rd edition CEikRichTextEditor draw the view for the whole rect and
 	//the scrollbar doesn't show. That is a reason why CEikRichTextEditor Width() is
 	//rect.Width()-ScrollBarRect.Width()
 	iRtEd->SetExtent(TPoint(0,StatusLineHeight), 
 		TSize(rect.Width()-ScrollBarRect.Width(), rect.Height()-StatusLineHeight));
-	#else
-    iRtEd->SetExtent(TPoint(0,StatusLineHeight), 
-    	TSize(rect.Width(), rect.Height()-StatusLineHeight));
-    #endif
+	
     }
 
 // ---------------------------------------------------------
@@ -378,7 +363,7 @@
 	Echo(R_TYPE_DIALOG_TBUF_INDICATOR_CHARACTER_FORMAT);
 	}
 	
-#ifdef __SERIES60_3X__
+
 // ----------------------------------------------------
 // SetFont(TInt aFontId)
 // Change the text's font in the editor 
@@ -401,30 +386,6 @@
 
 	Echo(R_TYPE_DIALOG_TBUF_INDICATOR_FONT);
 	}
-#else
-// ----------------------------------------------------
-// SetFont(const CFont *aFont)
-// Change the text's font in the editor 
-// to the one specified as input parameter for the function 
-// ----------------------------------------------------
-void CRTEContainer::SetFont(const CFont *aFont)
-	{	
-		/*
-	TCursorSelection cs = iRtEd->Selection();
-	
-	SetSelectionL(cs.iCursorPos, cs.iAnchorPos-1);
-	*/
-    TFontSpec fontspec = aFont->FontSpecInTwips();
-    TCharFormat charFormat( fontspec.iTypeface.iName, fontspec.iHeight );
-    TCharFormatMask charFormatMask;
-
-    charFormatMask.SetAttrib(EAttFontTypeface);
-    charFormatMask.SetAttrib(EAttFontHeight);
-	iRtEd->ApplyCharFormatL(charFormat, charFormatMask);
-
-	Echo(R_TYPE_DIALOG_TBUF_INDICATOR_FONT);
-	}
-#endif
 // ----------------------------------------------------
 // Strike()
 // Toggle between strikethrough or not strikethrough text
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/gameengine/Src/SIPExGameEngine.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/gameengine/Src/SIPExGameEngine.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/gameengine/Src/SIPExGameEngine.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-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".
 *
@@ -40,7 +40,7 @@
 #endif
 
 // CONSTANTS
-const TUid KUidSIPExApp = { 0xA00001EB };
+const TUid KUidSIPExApp = { 0xE00001EB };
 
 // -----------------------------------------------------------------------------
 // CSIPExEngine::NewL
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/group/bld.inf
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-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,12 +20,12 @@
 
 PRJ_MMPFILES
 
-gnumakefile ..\gameUI_series60\group\icons_scalable.mk
+gnumakefile ..\gameUI\group\icons_scalable.mk
 
 ..\sipengine\group\SIPExSIPEngine.mmp
 ..\socketengine\group\SIPExSocketEngine.mmp
 ..\gameengine\group\gameengine.mmp
-..\gameUI_series60\group\ui.mmp
+..\gameUI\group\ui.mmp
 ..\resolverplugin\group\resolverplugin.mmp
 
 //  End of File  
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/resolverplugin/Data/A00001EC.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/resolverplugin/Data/A00001EC.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/resolverplugin/Data/A00001EC.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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 @@
 RESOURCE REGISTRY_INFO theInfo
     {
     // UID for the DLL
-    dll_uid = 0xA00001EC;
+    dll_uid = 0xE00001EC;
     // Declare array of interface info
     interfaces = 
         {
@@ -33,7 +33,7 @@
                 {
                 IMPLEMENTATION_INFO
                     {
-                    implementation_uid = 0xA00001EC;
+                    implementation_uid = 0xE00001EC;
                     version_no = 1;
                     // SIPEx UID: Must match to the one SIPEx passes to CSIP::NewL.	
                     default_data = "A00001EB";
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/resolverplugin/Inc/SIPExResolverPlugin.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/resolverplugin/Inc/SIPExResolverPlugin.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/resolverplugin/Inc/SIPExResolverPlugin.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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".
 *
@@ -24,7 +24,7 @@
 #include <SipResolvedClient.h>
 
 
-const TInt32 KSIPExResolverPluginUID = 0xA00001EC;
+const TInt32 KSIPExResolverPluginUID = 0xE00001EC;
 
 // CLASS DEFINITION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/sis/sipex_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/sis/sipex_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/sis/sipex_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; sipex_armv5.pkg
 ;
@@ -20,7 +20,7 @@
 &EN
 
 ; Installation header
-#{"SIPEx"},(0xA00001EB),5,0,0
+#{"SIPEx"},(0xE00001EB),5,0,0
 
 %{"Vendor-EN"}
 :"Vendor"
@@ -45,4 +45,4 @@
 "..\..\..\epoc32\data\z\resource\plugins\SIPExResolverPlugin.rsc"-"!:\resource\plugins\SIPExResolverPlugin.rsc"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"					-"!:\private\A00001EB\backup_registration.xml"
+"backup_registration.xml"					-"!:\private\E00001EB\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/sis/sipex_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/sis/sipex_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SIPExample/sis/sipex_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; sipex_gcce.pkg
 ;
@@ -20,7 +20,7 @@
 &EN
 
 ; Installation header
-#{"SIPEx"},(0xA00001EB),5,0,0
+#{"SIPEx"},(0xE00001EB),5,0,0
 
 %{"Vendor-EN"}
 :"Vendor"
@@ -45,5 +45,5 @@
 "..\..\..\epoc32\data\z\resource\plugins\SIPExResolverPlugin.rsc"-"!:\resource\plugins\SIPExResolverPlugin.rsc"
 
 ;required for application to be covered by backup/restore facility 
-"backup_registration.xml"					-"!:\private\A00001EB\backup_registration.xml"
+"backup_registration.xml"					-"!:\private\E00001EB\backup_registration.xml"
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/SensorExample/sis/sensorexample_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SensorExample/sis/sensorexample_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SensorExample/sis/sensorexample_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,13 +11,13 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 ; Package header
-#{"SensorExample"},(0xA0007DFF),2,2,0
+#{"SensorExample"},(0xE0007DFF),2,2,0
 
 ;
 ;Localised Vendor name
@@ -44,4 +44,4 @@
 ;
 ; Backup & Restore
 ;
-;"backup_registration.xml"-"!:\private\0xA0007DFF\backup_registration.xml"
\ No newline at end of file
+;"backup_registration.xml"-"!:\private\0xE0007DFF\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/SensorExample/sis/sensorexample_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SensorExample/sis/sensorexample_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/SensorExample/sis/sensorexample_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,13 +11,13 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 ; Package header
-#{"SensorExample"},(0xA0007DFF),2,2,0
+#{"SensorExample"},(0xE0007DFF),2,2,0
 
 ;
 ;Localised Vendor name
@@ -44,4 +44,4 @@
 ;
 ; Backup & Restore
 ;
-;"backup_registration.xml"-"!:\private\0xA0007DFF\backup_registration.xml"
\ No newline at end of file
+;"backup_registration.xml"-"!:\private\0xE0007DFF\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/ChoiceListEx/data/ChoiceListEx_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/ChoiceListEx/data/ChoiceListEx_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/ChoiceListEx/data/ChoiceListEx_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -23,7 +23,7 @@
 #include <choicelistex.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA000027D
+UID3 0xE000027D
 
 RESOURCE APP_REGISTRATION_INFO 
 	{
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/ChoiceListEx/sis/ChoiceListEx_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/ChoiceListEx/sis/ChoiceListEx_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/ChoiceListEx/sis/ChoiceListEx_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,13 +11,13 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 ; Package header
-#{"ChoiceListEx"},(0xA000027D),2,2,0
+#{"ChoiceListEx"},(0xE000027D),2,2,0
 
 ;
 ;Localised Vendor name
@@ -40,4 +40,4 @@
 ;
 ; Backup & Restore
 ;
-;"backup_registration.xml"-"!:\private\0xA000027D\backup_registration.xml"
+;"backup_registration.xml"-"!:\private\0xE000027D\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/ChoiceListEx/sis/ChoiceListEx_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/ChoiceListEx/sis/ChoiceListEx_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/ChoiceListEx/sis/ChoiceListEx_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,13 +11,13 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 ; Package header
-#{"ChoiceListEx"},(0xA000027D),2,2,0
+#{"ChoiceListEx"},(0xE000027D),2,2,0
 
 ;
 ;Localised Vendor name
@@ -40,4 +40,4 @@
 ;
 ; Backup & Restore
 ;
-;"backup_registration.xml"-"!:\private\0xA000027D\backup_registration.xml"
\ No newline at end of file
+;"backup_registration.xml"-"!:\private\0xE000027D\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/ChoiceListEx/src/ChoiceListExApp.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/ChoiceListEx/src/ChoiceListExApp.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/ChoiceListEx/src/ChoiceListExApp.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -25,7 +25,7 @@
 
 // UID for the application;
 // this should correspond to the uid defined in the mmp file
-static const TUid KUidChoiceListExApp = {0xA000027D};
+static const TUid KUidChoiceListExApp = {0xE000027D};
 
 // -----------------------------------------------------------------------------
 // CChoiceListExApp::CreateDocumentL()
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/LongTapDetectorEx/data/longtapdetectorexample_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/LongTapDetectorEx/data/longtapdetectorexample_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/LongTapDetectorEx/data/longtapdetectorexample_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -22,7 +22,7 @@
 #include <longtapdetectorexample.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA0000283
+UID3 0xE0000283
 
 RESOURCE APP_REGISTRATION_INFO 
 	{
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/LongTapDetectorEx/sis/longtapdetectorex_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/LongTapDetectorEx/sis/longtapdetectorex_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/LongTapDetectorEx/sis/longtapdetectorex_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,13 +11,13 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 ; Package header
-#{"LongTapDetectorEx"},(0xA0000283),2,2,0
+#{"LongTapDetectorEx"},(0xE0000283),2,2,0
 
 ;
 ;Localised Vendor name
@@ -40,4 +40,4 @@
 ;
 ; Backup & Restore
 ;
-;"backup_registration.xml"-"!:\private\0xA0000283\backup_registration.xml"
+;"backup_registration.xml"-"!:\private\0xE0000283\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/LongTapDetectorEx/sis/longtapdetectorex_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/LongTapDetectorEx/sis/longtapdetectorex_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/LongTapDetectorEx/sis/longtapdetectorex_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,13 +11,13 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 ; Package header
-#{"LongTapDetectorEx"},(0xA0000283),2,2,0
+#{"LongTapDetectorEx"},(0xE0000283),2,2,0
 
 ;
 ;Localised Vendor name
@@ -40,4 +40,4 @@
 ;
 ; Backup & Restore
 ;
-;"backup_registration.xml"-"!:\private\0xA0000283\backup_registration.xml"
\ No newline at end of file
+;"backup_registration.xml"-"!:\private\0xE0000283\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/LongTapDetectorEx/src/longtapdetectorexapp.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/LongTapDetectorEx/src/longtapdetectorexapp.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/LongTapDetectorEx/src/longtapdetectorexapp.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -25,7 +25,7 @@
 
 // UID for the application;
 // this should correspond to the uid defined in the mmp file
-static const TUid KUidLongTapDetectorExApp = {0xA0000283};
+static const TUid KUidLongTapDetectorExApp = {0xE0000283};
 
 // -----------------------------------------------------------------------------
 // CLongTapDetectorExApp::CreateDocumentL()
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/NoughtsAndCrosses/src/noughtsandcrossesdocument.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/NoughtsAndCrosses/src/noughtsandcrossesdocument.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/NoughtsAndCrosses/src/noughtsandcrossesdocument.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,13 +11,16 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
 
 
 // INCLUDE FILES
+
+#include <s32stor.h>
+
 #include "noughtsandcrossesappui.h"
 #include "noughtsandcrossesdocument.h"
 #include "noughtsandcrossesinformationandsettings.h"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/StylusPopupMenuEx/data/styluspopupmenuexample_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/StylusPopupMenuEx/data/styluspopupmenuexample_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/StylusPopupMenuEx/data/styluspopupmenuexample_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -23,7 +23,7 @@
 #include <styluspopupmenuexample.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA0000284
+UID3 0xE0000284
 
 RESOURCE APP_REGISTRATION_INFO 
 	{
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/StylusPopupMenuEx/sis/styluspopupmenuex_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/StylusPopupMenuEx/sis/styluspopupmenuex_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/StylusPopupMenuEx/sis/styluspopupmenuex_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,13 +11,13 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 ; Package header
-#{"StylusPopupMenuEx"},(0xA0000284),2,2,0
+#{"StylusPopupMenuEx"},(0xE0000284),2,2,0
 
 ;
 ;Localised Vendor name
@@ -40,4 +40,4 @@
 ;
 ; Backup & Restore
 ;
-;"backup_registration.xml"-"!:\private\0xA0000284\backup_registration.xml"
\ No newline at end of file
+;"backup_registration.xml"-"!:\private\0xE0000284\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/StylusPopupMenuEx/sis/styluspopupmenuex_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/StylusPopupMenuEx/sis/styluspopupmenuex_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/StylusPopupMenuEx/sis/styluspopupmenuex_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,13 +11,13 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 ; Package header
-#{"StylusPopupMenuEx"},(0xA0000284),2,2,0
+#{"StylusPopupMenuEx"},(0xE0000284),2,2,0
 
 ;
 ;Localised Vendor name
@@ -40,4 +40,4 @@
 ;
 ; Backup & Restore
 ;
-;"backup_registration.xml"-"!:\private\0xA0000284\backup_registration.xml"
\ No newline at end of file
+;"backup_registration.xml"-"!:\private\0xE0000284\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/StylusPopupMenuEx/src/styluspopupmenuexapp.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/StylusPopupMenuEx/src/styluspopupmenuexapp.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/StylusPopupMenuEx/src/styluspopupmenuexapp.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -25,7 +25,7 @@
 
 // UID for the application;
 // this should correspond to the uid defined in the mmp file
-static const TUid KUidStylusPopupMenuExApp = {0xA0000284};
+static const TUid KUidStylusPopupMenuExApp = {0xE0000284};
 
 // -----------------------------------------------------------------------------
 // CStylusPopupMenuExApp::CreateDocumentL()
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/TactileExample/data/TactileExample_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/TactileExample/data/TactileExample_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/TactileExample/data/TactileExample_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* 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 <tactileexample.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA0000282
+UID3 0xE0000282
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/TactileExample/sis/tactileexample_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/TactileExample/sis/tactileexample_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/TactileExample/sis/tactileexample_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,13 +11,13 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 ; Package header
-#{"TactileExample"},(0xA0000282),2,2,0
+#{"TactileExample"},(0xE0000282),2,2,0
 
 ;
 ;Localised Vendor name
@@ -41,4 +41,4 @@
 ;
 ; Backup & Restore
 ;
-;"backup_registration.xml"-"!:\private\0xA0000282\backup_registration.xml"
+;"backup_registration.xml"-"!:\private\0xE0000282\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/TactileExample/sis/tactileexample_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/TactileExample/sis/tactileexample_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/TactileExample/sis/tactileexample_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2004 - 2006 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,13 +11,13 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 
 ;Languages
 &EN
 ; Package header
-#{"TactileExample"},(0xA0000282),2,2,0
+#{"TactileExample"},(0xE0000282),2,2,0
 
 ;
 ;Localised Vendor name
@@ -41,4 +41,4 @@
 ;
 ; Backup & Restore
 ;
-;"backup_registration.xml"-"!:\private\0xA0000282\backup_registration.xml"
\ No newline at end of file
+;"backup_registration.xml"-"!:\private\0xE0000282\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/TactileExample/src/tactileexampleapplication.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/TactileExample/src/tactileexampleapplication.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/TouchEx/TactileExample/src/tactileexampleapplication.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* 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".
 *
@@ -24,7 +24,7 @@
 
 // UID for the application;
 // this should correspond to the uid defined in the mmp file
-const TUid KUidTactileExampleApp = { 0xA0000282 };
+const TUid KUidTactileExampleApp = { 0xE0000282 };
 
 
 // ---------------------------------------------------------------------------
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/UnitEditorEx/data/ueex_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/UnitEditorEx/data/ueex_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/UnitEditorEx/data/ueex_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -23,7 +23,7 @@
 #include <ueex.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA000027A
+UID3 0xE000027A
 
 RESOURCE APP_REGISTRATION_INFO 
 	{
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/UnitEditorEx/sis/ueex_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/UnitEditorEx/sis/ueex_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/UnitEditorEx/sis/ueex_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; UEEx.pkg
 ;
@@ -19,7 +19,7 @@
 &EN
 
 ; standard SIS file header
-#{"UEEx"},(0xA000027A),1,0,0
+#{"UEEx"},(0xE000027A),1,0,0
 
 ;Supports Series 60 v 3.2
 [0x102752AE], 0, 0, 0, {"Series60ProductID"}
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/UnitEditorEx/sis/ueex_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/UnitEditorEx/sis/ueex_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/UnitEditorEx/sis/ueex_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; UEEx.pkg
 ;
@@ -19,7 +19,7 @@
 &EN
 
 ; standard SIS file header
-#{"UEEx"},(0xA000027A),1,0,0
+#{"UEEx"},(0xE000027A),1,0,0
 
 ;Supports Series 60 v 3.2
 [0x102752AE], 0, 0, 0, {"Series60ProductID"}
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/UnitEditorEx/src/ueexapplication.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/UnitEditorEx/src/ueexapplication.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/UnitEditorEx/src/ueexapplication.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -24,7 +24,7 @@
 
 // UID for the application;
 // this should correspond to the uid defined in the mmp file
-static const TUid KUidUEExApp = {0xA000027A};
+static const TUid KUidUEExApp = {0xE000027A};
 
 // -----------------------------------------------------------------------------
 // CUEExApplication::CreateDocumentL()
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/WebClient/data/WebClient_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/WebClient/data/WebClient_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/WebClient/data/WebClient_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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 <WebClient.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA00001E9
+UID3 0xE00001E9
 
 
 RESOURCE APP_REGISTRATION_INFO
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/WebClient/inc/WebClientApp.h
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/WebClient/inc/WebClientApp.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/WebClient/inc/WebClientApp.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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".
 *
@@ -24,7 +24,7 @@
 
 // CONSTANTS
 // UID of the application
-const TUid KUidWebClient = { 0xA00001E9 };
+const TUid KUidWebClient = { 0xE00001E9 };
 
 // CLASS DECLARATION
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/WebClient/sis/WebClient_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/WebClient/sis/WebClient_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/WebClient/sis/WebClient_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; WebClient.pkg
 ;Languages
 &EN
 
 ;Header
-#{"WebClient"},(0xA00001E9),1,0,0
+#{"WebClient"},(0xE00001E9),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -36,4 +36,4 @@
 "..\..\..\epoc32\data\z\resource\apps\WebClient.mif"            -"!:\resource\apps\WebClient.mif"
 
 ;required for application to be covered by backup/restore facility
-"backup_registration.xml"					-"!:\private\A00001E9\backup_registration.xml"
+"backup_registration.xml"					-"!:\private\E00001E9\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/WebClient/sis/WebClient_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/WebClient/sis/WebClient_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/WebClient/sis/WebClient_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,14 +11,14 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; WebClient.pkg
 ;Languages
 &EN
 
 ;Header
-#{"WebClient"},(0xA00001E9),1,0,0
+#{"WebClient"},(0xE00001E9),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN"}
@@ -36,4 +36,4 @@
 "..\..\..\epoc32\data\z\resource\apps\WebClient.mif"            -"!:\resource\apps\WebClient.mif"
 
 ;required for application to be covered by backup/restore facility
-"backup_registration.xml"					-"!:\private\A00001E9\backup_registration.xml"
+"backup_registration.xml"					-"!:\private\E00001E9\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/ExApps_list.html
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/ExApps_list.html	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/ExApps_list.html	Wed Apr 21 09:56:53 2010 +0530
@@ -93,11 +93,6 @@
 							style="font-style: normal;">Contacts Database</a>
  - demonstrates how to use Contacts database.</p></li>
 
-<li><p><a href="../CLFExample/doc/index.html"
-							target=_self
-							style="font-style: normal;">Content Listing Framework</a>
- - demonstrates how to use Content Listing Framework.</p></li>
-
 <li><p><a href="../DataMobility/doc/index.html"
 							target=_self
 							style="font-style: normal;">Data Mobility Example</a>
@@ -147,16 +142,17 @@
  - demonstrates how to split an application into two components, an engine
  dll and a GUI application.</p></li>
 
+<li><p><a href="../HapticsExample/doc/index.html"
+							target=_self
+							style="font-style: normal;">HapticsExample</a>
+ </p></li>
+
 <li><p><a href="../HelloWorldBasic/doc/index.html"
 							target=_self
 							style="font-style: normal;">Hello World Basic</a>
  - demonstrates how to create a simple interactive application in the Symbian
  OS.</p></li>
 
-<li><p><a href="../helpexample/doc/index.html"
-							target=_self
-							style="font-style: normal;">Help</a>
- - demonstrates how to add support for context sensitive help to an application .</p></li>
 
 
 <li><p><a href="../HierarchicalColumnList/doc/index.html"
@@ -174,10 +170,7 @@
  also has additional responsibillty of publishing certain power state related
  Publish &amp; Subscribe properties.</p></li>
 
-<li><p><a href="../IMOpenAPIExample/doc/index.html"
-							target=_self
-							style="font-style: normal;">IM Open API</a>
- - demonstrates how to use the IM Open API. The example is a game, in which moves are sent as instant messages.</p></li>
+
 
 <li><p><a href="../IsvTelCallApp/doc/index.html"
 							target=_self
@@ -302,6 +295,14 @@
 								target=_self
 								style="font-style: normal;">Bumpmap</a></p></li>
 
+<li><p><a href="../OpenGLEx/CrossApi/doc/index.html"
+								target=_self
+								style="font-style: normal;">CrossApi</a></p></li>
+
+<li><p><a href="../OpenGLEx/CrossApiTexturing/doc/index.html"
+								target=_self
+								style="font-style: normal;">CrossApiTexturing</a></p></li>
+
 <li><p><a href="../OpenGLEx/EnvMapping/doc/index.html"
 								target=_self
 								style="font-style: normal;">EnvMapping</a></p></li>
@@ -326,6 +327,10 @@
 								target=_self
 								style="font-style: normal;">MultiTex</a></p></li>
 
+<li><p><a href="../OpenGLEx/NormalMapping/doc/index.html"
+								target=_self
+								style="font-style: normal;">NormalMapping</a></p></li>
+
 <li><p><a href="../OpenGLEx/Particles/doc/index.html"
 								target=_self
 								style="font-style: normal;">Particles</a></p></li>
@@ -358,6 +363,14 @@
 								target=_self
 								style="font-style: normal;">SimpleLight</a></p></li>
 
+<li><p><a href="../OpenGLEx/SimpleShader/doc/index.html"
+								target=_self
+								style="font-style: normal;">SimpleShader</a></p></li>
+
+<li><p><a href="../OpenGLEx/SimpleShape/doc/index.html"
+								target=_self
+								style="font-style: normal;">SimpleShape</a></p></li>
+
 <li><p><a href="../OpenGLEx/Slideshow/doc/index.html"
 								target=_self
 								style="font-style: normal;">Slideshow</a></p></li>
@@ -415,26 +428,26 @@
 
 <ul>
 
-<li><p><a href="../TUIEx/ChoiceListEx/doc/index.html"
+<li><p><a href="../TouchEx/ChoiceListEx/doc/index.html"
 							target=_self
 							style="font-style: normal;">ChoiceList</a> -  demonstrates the use of CAknChoiceList. Using the Options menu, user can create choice lists and edit created choice list content. </p></li>
 
-<li><p><a href="../TUIEx/LongTapDetectorEx/doc/index.html"
+<li><p><a href="../TouchEx/LongTapDetectorEx/doc/index.html"
 							target=_self
 							style="font-style: normal;">LongTapDetector</a>
  - demonstrates the use of CAknLongTapDetector. Receives pointer events from owner application or owner control and returns location if a long tap event occurs.</p></li>
 
-<li><p><a href="../TUIEx/NoughtsAndCrosses/doc/index.html"
+<li><p><a href="../TouchEx/NoughtsAndCrosses/doc/index.html"
 							target=_self
 							style="font-style: normal;">NoughtsAndCrosses</a>
  - demonstrate scalability and the usage of bitmaps and svg-t graphics .</p></li>
 
-<li><p><a href="../TUIEx/StylusPopupMenuEx/doc/index.html"
+<li><p><a href="../TouchEx/StylusPopupMenuEx/doc/index.html"
 							target=_self
 							style="font-style: normal;">StylusPopupMenu</a>
  - demonstrates the use of CAknStylusPopUpMenu.A floating popup menu which is meant for stylus usage only.</p></li>
 
-<li><p><a href="../TUIEx/TactileExample/doc/index.html"
+<li><p><a href="../TouchEx/TactileExample/doc/index.html"
 							target=_self
 							style="font-style: normal;">TactileExample</a>
  - demonstrates how to use Tactile Feedback Client API on Symbian OS application.</p></li>
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-1AAADEA6-89E7-4F54-A3F5-FA74BDE1A21A.html
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-1AAADEA6-89E7-4F54-A3F5-FA74BDE1A21A.html	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-1AAADEA6-89E7-4F54-A3F5-FA74BDE1A21A.html	Wed Apr 21 09:56:53 2010 +0530
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html
   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><meta name="copyright" content="(C) Copyright 2007"/><meta name="DC.rights.owner" content="(C) Copyright 2007"/><meta name="DC.Type" content="mobileconcept"/><meta name="DC.Title" content="Building and running example applications from the command line interface"/><meta name="DC.Format" content="XHTML"/><meta name="DC.Identifier" content="GUID-1AAADEA6-89E7-4F54-A3F5-FA74BDE1A21A"/><title> S60 Example Applications</title><script type="text/javascript" src="js/utils.js">//</script><script type="text/javascript" src="js/gui.js">//</script><script type="text/javascript" src="js/common.js">//</script><script type="text/javascript" src="js/toc.js">//</script><script type="text/javascript" src="js/page.js">//</script><script type="text/javascript" src="js/s60/white_toc.js">//</script><script type="text/javascript" src="js/s60/page.js">//</script><link href="css/html.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/style.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/print.css" rel="stylesheet" type="text/css" media="print"/><link href="css/nwg.css" rel="stylesheet" type="text/css" media="all"/><link href="css/s60/white.css" rel="stylesheet" type="text/css" media="all"/><script>if( self == top ){ window.location.replace( "../../../?topic=/com.nokia.s60.sdk.cppapi_5.0/GUID-441D327D-D737-42A2-BCEA-FE89FBCA2F35/GUID-1AAADEA6-89E7-4F54-A3F5-FA74BDE1A21A.html");}</script>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><meta name="copyright" content="(C) Copyright 2007"/><meta name="DC.rights.owner" content="(C) Copyright 2007"/><meta name="DC.Type" content="mobileconcept"/><meta name="DC.Title" content="Building and running example applications from the command line interface"/><meta name="DC.Format" content="XHTML"/><meta name="DC.Identifier" content="GUID-1AAADEA6-89E7-4F54-A3F5-FA74BDE1A21A"/><title>Example Applications</title><script type="text/javascript" src="js/utils.js">//</script><script type="text/javascript" src="js/gui.js">//</script><script type="text/javascript" src="js/common.js">//</script><script type="text/javascript" src="js/toc.js">//</script><script type="text/javascript" src="js/page.js">//</script><script type="text/javascript" src="js/s60/white_toc.js">//</script><script type="text/javascript" src="js/s60/page.js">//</script><link href="css/html.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/style.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/print.css" rel="stylesheet" type="text/css" media="print"/><link href="css/nwg.css" rel="stylesheet" type="text/css" media="all"/><link href="css/s60/white.css" rel="stylesheet" type="text/css" media="all"/><script>if( self == top ){ window.location.replace( "../../../?topic=/com.nokia.s60.sdk.cppapi_5.0/GUID-441D327D-D737-42A2-BCEA-FE89FBCA2F35/GUID-1AAADEA6-89E7-4F54-A3F5-FA74BDE1A21A.html");}</script>
 </head><body onload="initPage();"><!--BEGIN: HEADER--><!--END: HEADER--><!--BEGIN: BODY SECTION--><div class="body"><!--begin: content--><div class="contentLeft prTxt"><h1 class="pageHeading" id="GUID-1AAADEA6-89E7-4F54-A3F5-FA74BDE1A21A"><a xmlns:d="http://www.pnp-software.com/XSLTdoc" name="GUID-1AAADEA6-89E7-4F54-A3F5-FA74BDE1A21A"><!----></a>Building
 and running example applications from the command line interface</h1>
 <div><h3>Check the current SDK device</h3><p>Before starting to build an example application, you need to ensure
@@ -11,14 +11,14 @@
 <li id="GUID-DE3624BD-FB3A-4AB5-A3EC-7F452CF7F12C"><a xmlns:d="http://www.pnp-software.com/XSLTdoc" name="GUID-DE3624BD-FB3A-4AB5-A3EC-7F452CF7F12C"><!----></a><p>Open the command
 prompt and enter the following command and press enter:</p><p><code>devices</code></p>
 <p>This command displays all Symbian SDK installations available to you,
-for example:</p><p><code>S60_5th_Edition_SDK_v1.0:com.nokia.S60
+for example:</p><p><code>Nokia_Symbian3_SDK_v0.5:com.nokia.s60
 - default</code></p><p>In the above, you can see that in this case
-the <code>S60_5th_Edition_SDK_v1.0:com.nokia.S60</code> is the default (active) SDK
+the <code>Nokia_Symbian3_SDK_v0.5:com.nokia.s60</code> is the default (active) SDK
 (that is, the S60 5th Edition SDK
 1). To switch between devices, use the <code>-setdefault</code> option
 of the <code>devices</code> command. Enter this command to switch
 to the S60 5th Edition SDK :</p>
-<p><code>C:\devices -setdefault S60_5th_Edition_SDK_v1.0:com.nokia.S60</code></p>
+<p><code>C:\devices -setdefault Nokia_Symbian3_SDK_v0.5:com.nokia.s60</code></p>
 <div class="note"><p><strong class="note_title">Note: </strong><code>@</code> is part of the command.</p></div>
 </li>
 </ol><p>For more information, please, refer to  <strong>SDK Help &gt; Symbian Developer
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-5BD549D9-E304-4C3C-AD78-85DAB1F2B5C3.html
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-5BD549D9-E304-4C3C-AD78-85DAB1F2B5C3.html	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-5BD549D9-E304-4C3C-AD78-85DAB1F2B5C3.html	Wed Apr 21 09:56:53 2010 +0530
@@ -4,10 +4,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><meta name="copyright" content="(C) Copyright 2007"/><meta name="DC.rights.owner" content="(C) Copyright 2007"/><meta name="DC.Type" content="mobileconcept"/><meta name="DC.Title" content="About the example applications"/><meta name="DC.Format" content="XHTML"/><meta name="DC.Identifier" content="GUID-5BD549D9-E304-4C3C-AD78-85DAB1F2B5C3"/><title> S60 Example Applications</title><script type="text/javascript" src="js/utils.js">//</script><script type="text/javascript" src="js/gui.js">//</script><script type="text/javascript" src="js/common.js">//</script><script type="text/javascript" src="js/toc.js">//</script><script type="text/javascript" src="js/page.js">//</script><script type="text/javascript" src="js/s60/white_toc.js">//</script><script type="text/javascript" src="js/s60/page.js">//</script><link href="css/html.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/style.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/print.css" rel="stylesheet" type="text/css" media="print"/><link href="css/nwg.css" rel="stylesheet" type="text/css" media="all"/><link href="css/s60/white.css" rel="stylesheet" type="text/css" media="all"/><script>if( self == top ){ window.location.replace( "../../../?topic=/com.nokia.s60.sdk.cppapi_5.0/GUID-441D327D-D737-42A2-BCEA-FE89FBCA2F35/GUID-5BD549D9-E304-4C3C-AD78-85DAB1F2B5C3.html");}</script>
 </head><body onload="initPage();"><!--BEGIN: HEADER--><!--END: HEADER--><!--BEGIN: BODY SECTION--><div class="body"><!--begin: content--><div class="contentLeft prTxt"><h1 class="pageHeading" id="GUID-5BD549D9-E304-4C3C-AD78-85DAB1F2B5C3"><a xmlns:d="http://www.pnp-software.com/XSLTdoc" name="GUID-5BD549D9-E304-4C3C-AD78-85DAB1F2B5C3"><!----></a>About the example applications</h1>
 <div><h3>Selected examples</h3><p>The examples have been chosen to demonstrate a range of Symbian OS and
-S60 object-oriented design and programming techniques.</p></div>
+object-oriented design and programming techniques.</p></div>
 <div><h3>Documentation</h3><p>Documentation is provided for all example applications. The documentation
 consists of an overview of the application as well as class and file documentation.</p><p>Application-specific documentation is located in <code>&lt;S60_SDK_installation_directory&gt;\S60CppExamples\&lt;example_application&gt;\doc\index.html</code>.</p></div>
-<div><h3>Symbian OS and S60 versions</h3><p>The examples are relevant to Symbian OS version 9.4 and the S60 user
+<div><h3>Symbian OS and S60 versions</h3><p>The examples are relevant to Symbian OS version 9.4 and the user
 interface package.</p></div>
 <div><h3>Coding conventions</h3><p>As far as possible, the example code follows relevant C++, Symbian OS
 and S60 coding conventions. A full list of the conventions is given in the
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-805935B9-5829-43BA-B7F3-0825310EE7ED_GUID-15B378FF-6391-4281-A073-92120C898F5D.html
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-805935B9-5829-43BA-B7F3-0825310EE7ED_GUID-15B378FF-6391-4281-A073-92120C898F5D.html	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-805935B9-5829-43BA-B7F3-0825310EE7ED_GUID-15B378FF-6391-4281-A073-92120C898F5D.html	Wed Apr 21 09:56:53 2010 +0530
@@ -3,5 +3,5 @@
   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><meta name="copyright" content="(C) Copyright 2007"/><meta name="DC.rights.owner" content="(C) Copyright 2007"/><meta name="DC.Type" content="master_section"/><meta name="DC.Format" content="XHTML"/><meta name="DC.Identifier" content="GUID-15B378FF-6391-4281-A073-92120C898F5D"/><title> S60 Example Applications</title><script type="text/javascript" src="js/utils.js">//</script><script type="text/javascript" src="js/gui.js">//</script><script type="text/javascript" src="js/common.js">//</script><script type="text/javascript" src="js/toc.js">//</script><script type="text/javascript" src="js/page.js">//</script><script type="text/javascript" src="js/s60/white_toc.js">//</script><script type="text/javascript" src="js/s60/page.js">//</script><link href="css/html.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/style.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/print.css" rel="stylesheet" type="text/css" media="print"/><link href="css/nwg.css" rel="stylesheet" type="text/css" media="all"/><link href="css/s60/white.css" rel="stylesheet" type="text/css" media="all"/><script>if( self == top ){ window.location.replace( "../../../?topic=/com.nokia.s60.sdk.cppapi_5.0/GUID-441D327D-D737-42A2-BCEA-FE89FBCA2F35/GUID-805935B9-5829-43BA-B7F3-0825310EE7ED_GUID-15B378FF-6391-4281-A073-92120C898F5D.html");}</script>
 </head><body onload="initPage();" id="GUID-15B378FF-6391-4281-A073-92120C898F5D"><a xmlns:d="http://www.pnp-software.com/XSLTdoc" name="GUID-15B378FF-6391-4281-A073-92120C898F5D"><!----></a><div class="body"><div class="contentLeft prTxt"><h1 class="pageHeading" id="GUID-3C858CD5-DCC3-44FE-91DF-E6E46B700A2E"><a xmlns:d="http://www.pnp-software.com/XSLTdoc" name="GUID-3C858CD5-DCC3-44FE-91DF-E6E46B700A2E"><!----></a>Building and running example applications from an IDE</h1><p>You can build and run the example applications from Integrated
-Development Environments (IDEs) supported by the S60 5th Edition SDK.</p><div class="nav3"><ul><li><a target="_self" href="GUID-E87DFE55-7AEA-48A3-9BC9-185BE0E147EA.html" class="toc-title toc-topic">Building
+Development Environments (IDEs) supported by the Nokia Symbian^3 SDK.</p><div class="nav3"><ul><li><a target="_self" href="GUID-E87DFE55-7AEA-48A3-9BC9-185BE0E147EA.html" class="toc-title toc-topic">Building
 and running example applications from Carbide.c++</a></li></ul></div></div></div><div class="footer"><hr/><div class="copy">© Nokia 2009</div></div></body></html>
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-805935B9-5829-43BA-B7F3-0825310EE7ED_cover.html
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-805935B9-5829-43BA-B7F3-0825310EE7ED_cover.html	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-805935B9-5829-43BA-B7F3-0825310EE7ED_cover.html	Wed Apr 21 09:56:53 2010 +0530
@@ -1,4 +1,4 @@
 
 <!DOCTYPE html
   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><meta name="copyright" content="(C) Copyright 2007"/><meta name="DC.rights.owner" content="(C) Copyright 2007"/><meta name="DC.Type" content="mobileswmaster"/><meta name="DC.Format" content="XHTML"/><meta name="DC.Identifier" content="GUID-805935B9-5829-43BA-B7F3-0825310EE7ED"/><title> S60 Example Applications</title><script type="text/javascript" src="js/utils.js">//</script><script type="text/javascript" src="js/gui.js">//</script><script type="text/javascript" src="js/common.js">//</script><script type="text/javascript" src="js/toc.js">//</script><script type="text/javascript" src="js/page.js">//</script><script type="text/javascript" src="js/s60/white_toc.js">//</script><script type="text/javascript" src="js/s60/page.js">//</script><link href="css/html.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/style.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/print.css" rel="stylesheet" type="text/css" media="print"/><link href="css/nwg.css" rel="stylesheet" type="text/css" media="all"/><link href="css/s60/white.css" rel="stylesheet" type="text/css" media="all"/></head><body onload="initPage();"><div class="body"><div class="contentLeft prTxt"><h1 class="pageHeading"> S60 Example Applications</h1></div></div></body></html>
\ No newline at end of file
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><meta name="copyright" content="(C) Copyright 2007"/><meta name="DC.rights.owner" content="(C) Copyright 2007"/><meta name="DC.Type" content="mobileswmaster"/><meta name="DC.Format" content="XHTML"/><meta name="DC.Identifier" content="GUID-805935B9-5829-43BA-B7F3-0825310EE7ED"/><title> S60 Example Applications</title><script type="text/javascript" src="js/utils.js">//</script><script type="text/javascript" src="js/gui.js">//</script><script type="text/javascript" src="js/common.js">//</script><script type="text/javascript" src="js/toc.js">//</script><script type="text/javascript" src="js/page.js">//</script><script type="text/javascript" src="js/s60/white_toc.js">//</script><script type="text/javascript" src="js/s60/page.js">//</script><link href="css/html.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/style.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/print.css" rel="stylesheet" type="text/css" media="print"/><link href="css/nwg.css" rel="stylesheet" type="text/css" media="all"/><link href="css/s60/white.css" rel="stylesheet" type="text/css" media="all"/></head><body onload="initPage();"><div class="body"><div class="contentLeft prTxt"><h1 class="pageHeading">Example Applications</h1></div></div></body></html>
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-805935B9-5829-43BA-B7F3-0825310EE7ED_nav.html
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-805935B9-5829-43BA-B7F3-0825310EE7ED_nav.html	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-805935B9-5829-43BA-B7F3-0825310EE7ED_nav.html	Wed Apr 21 09:56:53 2010 +0530
@@ -1,4 +1,4 @@
 
 <!DOCTYPE html
   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/><link href="css/html.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/style.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/print.css" rel="stylesheet" type="text/css" media="print"/><link href="css/nwg.css" rel="stylesheet" type="text/css" media="all"/><link href="css/s60/white.css" rel="stylesheet" type="text/css" media="all"/><title> S60 Example Applications</title></head><body><div class="header"><div class="logo"><img src="images/s60/S60tag_RGB.png" alt="S60 - Open to new features" width="342" height="71"/></div><div class="siteIdentifier"> S60 Example Applications</div></div></body></html>
\ No newline at end of file
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/><link href="css/html.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/style.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/print.css" rel="stylesheet" type="text/css" media="print"/><link href="css/nwg.css" rel="stylesheet" type="text/css" media="all"/><link href="css/s60/white.css" rel="stylesheet" type="text/css" media="all"/><title>Example Applications</title></head><body><div class="header"><div class="siteIdentifier">Example Applications</div></div></body></html>
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-D27DB44A-0F4B-4F5B-8065-91539E938FA1.html
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-D27DB44A-0F4B-4F5B-8065-91539E938FA1.html	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-D27DB44A-0F4B-4F5B-8065-91539E938FA1.html	Wed Apr 21 09:56:53 2010 +0530
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html
   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><meta name="copyright" content="(C) Copyright 2007"/><meta name="DC.rights.owner" content="(C) Copyright 2007"/><meta name="DC.Type" content="mobileconcept"/><meta name="DC.Title" content="Prerequisites"/><meta name="DC.Format" content="XHTML"/><meta name="DC.Identifier" content="GUID-D27DB44A-0F4B-4F5B-8065-91539E938FA1"/><title> S60 Example Applications</title><script type="text/javascript" src="js/utils.js">//</script><script type="text/javascript" src="js/gui.js">//</script><script type="text/javascript" src="js/common.js">//</script><script type="text/javascript" src="js/toc.js">//</script><script type="text/javascript" src="js/page.js">//</script><script type="text/javascript" src="js/s60/white_toc.js">//</script><script type="text/javascript" src="js/s60/page.js">//</script><link href="css/html.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/style.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/print.css" rel="stylesheet" type="text/css" media="print"/><link href="css/nwg.css" rel="stylesheet" type="text/css" media="all"/><link href="css/s60/white.css" rel="stylesheet" type="text/css" media="all"/><script>if( self == top ){ window.location.replace( "../../../?topic=/com.nokia.s60.sdk.cppapi_5.0/GUID-441D327D-D737-42A2-BCEA-FE89FBCA2F35/GUID-D27DB44A-0F4B-4F5B-8065-91539E938FA1.html");}</script>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><meta name="copyright" content="(C) Copyright 2007"/><meta name="DC.rights.owner" content="(C) Copyright 2007"/><meta name="DC.Type" content="mobileconcept"/><meta name="DC.Title" content="Prerequisites"/><meta name="DC.Format" content="XHTML"/><meta name="DC.Identifier" content="GUID-D27DB44A-0F4B-4F5B-8065-91539E938FA1"/><title>Example Applications</title><script type="text/javascript" src="js/utils.js">//</script><script type="text/javascript" src="js/gui.js">//</script><script type="text/javascript" src="js/common.js">//</script><script type="text/javascript" src="js/toc.js">//</script><script type="text/javascript" src="js/page.js">//</script><script type="text/javascript" src="js/s60/white_toc.js">//</script><script type="text/javascript" src="js/s60/page.js">//</script><link href="css/html.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/style.css" rel="stylesheet" type="text/css" media="screen"/><link href="css/print.css" rel="stylesheet" type="text/css" media="print"/><link href="css/nwg.css" rel="stylesheet" type="text/css" media="all"/><link href="css/s60/white.css" rel="stylesheet" type="text/css" media="all"/><script>if( self == top ){ window.location.replace( "../../../?topic=/com.nokia.s60.sdk.cppapi_5.0/GUID-441D327D-D737-42A2-BCEA-FE89FBCA2F35/GUID-D27DB44A-0F4B-4F5B-8065-91539E938FA1.html");}</script>
 </head><body onload="initPage();"><!--BEGIN: HEADER--><!--END: HEADER--><!--BEGIN: BODY SECTION--><div class="body"><!--begin: content--><div class="contentLeft prTxt"><h1 class="pageHeading" id="GUID-D27DB44A-0F4B-4F5B-8065-91539E938FA1"><a xmlns:d="http://www.pnp-software.com/XSLTdoc" name="GUID-D27DB44A-0F4B-4F5B-8065-91539E938FA1"><!----></a>Prerequisites</h1>
 <p>Before you start building and running example applications, you should
 have the following installed on your workstation: </p>
@@ -17,7 +17,7 @@
 Developer Network Downloads</a>. (JRE is included in J2SE.)</p>
 </li>
 <li>
-<p>S60 5th Edition SDK</p>
+<p>Nokia Symbian^3 SDK</p>
 </li>
 <li>
 <p>S60 example applications - delivered with the SDK installation package
@@ -25,6 +25,5 @@
 default)</p>
 </li>
 </ul>
-<p>For further details on prerequisites, please refer to the <em>S60 5th
-Edition SDK Installation Guide</em>.</p>
+<p>For further details on prerequisites, please refer to the <em>Nokia Symbian^3 SDK Installation Guide</em>.</p>
 </div><!--end: content--><!--start: sidebar--><!--end: sidebar--></div><!--END: BODY SECTION--><!--BEGIN: FOOTER--><div class="footer"><hr/><div class="copy">© Nokia 2009</div></div><!--END: FOOTER--></body></html>
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-E87DFE55-7AEA-48A3-9BC9-185BE0E147EA.html
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-E87DFE55-7AEA-48A3-9BC9-185BE0E147EA.html	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/_doc/GUID-E87DFE55-7AEA-48A3-9BC9-185BE0E147EA.html	Wed Apr 21 09:56:53 2010 +0530
@@ -35,7 +35,7 @@
 <p><code>&lt;S60_SDK_installation_directory&gt;\S60CppExamples\HelloWorldBasic\group\helloworldbasic.mmp</code></p>
 </li>
 <li id="GUID-9C669E8F-75A7-42B1-BEF5-5D4685E31A53"><a xmlns:d="http://www.pnp-software.com/XSLTdoc" name="GUID-9C669E8F-75A7-42B1-BEF5-5D4685E31A53"><!----></a><p>In the <strong>SDKs
-and Build Configurations</strong> list, under "All SDKs" select "S60_5th_Edition_SDK_V1.0" and
+and Build Configurations</strong> list, under "All SDKs" select "Nokia Symbian^3" and
 "Emulator Debug(WINSCW)[S60_5th_Edition_SDK_V1.0]".</p></li>
 <li id="GUID-4B288D54-56E3-44C8-87B4-4AB1082D88F1"><a xmlns:d="http://www.pnp-software.com/XSLTdoc" name="GUID-4B288D54-56E3-44C8-87B4-4AB1082D88F1"><!----></a><p>Click <strong>Finish</strong>.</p>
 </li>
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/helloworldbasic/data/HelloWorldBasic_reg.rss
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/helloworldbasic/data/HelloWorldBasic_reg.rss	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/helloworldbasic/data/HelloWorldBasic_reg.rss	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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 <Helloworldbasic.rsg>
 
 UID2 KUidAppRegistrationResourceFile
-UID3 0xA000017F
+UID3 0xE000017F
 
 RESOURCE APP_REGISTRATION_INFO
   {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/helloworldbasic/sis/helloworldbasic_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/helloworldbasic/sis/helloworldbasic_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/helloworldbasic/sis/helloworldbasic_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; helloworldbasic_armv5.pkg
 ;
@@ -19,7 +19,7 @@
 &EN,FI,ZH,JA
 
 ; standard SIS file header
-#{"HelloWorldBasic", "HelloWorldBasic", "HelloWorldBasic", "HelloWorldBasic"},(0xA000017F),1,0,0
+#{"HelloWorldBasic", "HelloWorldBasic", "HelloWorldBasic", "HelloWorldBasic"},(0xE000017F),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN", "Vendor-FI", "Vendor-ZH", "Vendor-JA"}
@@ -45,5 +45,5 @@
 "..\..\..\epoc32\data\z\resource\apps\helloworldbasic_aif.mif" -"!:\resource\apps\helloworldbasic_aif.mif"
 
 ;required for application to be covered by backup/restore facility
-"backup_registration.xml"						-"!:\private\A000017F\backup_registration.xml"
+"backup_registration.xml"						-"!:\private\E000017F\backup_registration.xml"
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/helloworldbasic/sis/helloworldbasic_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/helloworldbasic/sis/helloworldbasic_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/helloworldbasic/sis/helloworldbasic_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; under the terms of the License "Eclipse Public License v1.0"
 ; which accompanies this distribution, and is available
 ; at the URL "http://www.eclipse.org/legal/epl-v10.html".
 ;
@@ -11,7 +11,7 @@
 ;
 ; Contributors:
 ;
-; Description: 
+; Description:
 ;
 ; helloworldbasic_gcce.pkg
 ;
@@ -19,7 +19,7 @@
 &EN,FI,ZH,JA
 
 ; standard SIS file header
-#{"HelloWorldBasic", "HelloWorldBasic", "HelloWorldBasic", "HelloWorldBasic"},(0xA000017F),1,0,0
+#{"HelloWorldBasic", "HelloWorldBasic", "HelloWorldBasic", "HelloWorldBasic"},(0xE000017F),1,0,0
 
 ;Localised Vendor name
 %{"Vendor-EN", "Vendor-FI", "Vendor-ZH", "Vendor-JA"}
@@ -44,5 +44,5 @@
 "..\..\..\epoc32\data\z\resource\apps\helloworldbasic_aif.mif" -"!:\resource\apps\helloworldbasic_aif.mif"
 
 ;required for application to be covered by backup/restore facility
-"backup_registration.xml"						-"!:\private\A000017F\backup_registration.xml"
+"backup_registration.xml"						-"!:\private\E000017F\backup_registration.xml"
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/helloworldbasic/src/helloworldbasicapplication.cpp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/helloworldbasic/src/helloworldbasicapplication.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/helloworldbasic/src/helloworldbasicapplication.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-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".
 *
@@ -24,7 +24,7 @@
 
 // UID for the application;
 // this should correspond to the uid defined in the mmp file
-const TUid KUidHelloWorldBasicApp = { 0xA000017F };
+const TUid KUidHelloWorldBasicApp = { 0xE000017F };
 
 // -----------------------------------------------------------------------------
 // CHelloWorldBasicApplication::CreateDocumentL()
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/helloworld/group/helloworld.mmp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/helloworld/group/helloworld.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/helloworld/group/helloworld.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,14 +11,14 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
 
 TARGET		  helloworld.exe
 TARGETTYPE	  exe
-UID			 0 0xA0007DF8
+UID			 0 0xE0007DF8
 
 USERINCLUDE	 ..\inc
 
@@ -37,15 +37,21 @@
 SYSTEMINCLUDE	    \epoc32\include 
 SYSTEMINCLUDE		\epoc32\include\stdapis
 SYSTEMINCLUDE		\epoc32\include\stdapis\sys
-SYSTEMINCLUDE		\epoc32\include\stdapis\stlport
-SYSTEMINCLUDE		\epoc32\include\stdapis\stlport\stl
+SYSTEMINCLUDE		\epoc32\include\stdapis\stlportv5
+SYSTEMINCLUDE		\epoc32\include\stdapis\stlportv5\stl
 
 STATICLIBRARY	libcrt0.lib
-LIBRARY			libstdcpp.lib
+LIBRARY			libstdcppv5.lib
 LIBRARY			libc.lib
 LIBRARY			libpthread.lib
 LIBRARY			euser.lib
 
 
 OPTION CW -wchar_t on
-MACRO  _WCHAR_T_DECLARED
+//MACRO  _WCHAR_T_DECLARED
+
+MACRO __SYMBIAN_STDCPP_SUPPORT__
+
+// To specify the usage of Standard C++ Semantics
+//Currently Carbide doesnt support this, but command line building for ARMV5 is supported
+STDCPP
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/helloworld/sis/helloworld_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/helloworld/sis/helloworld_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/helloworld/sis/helloworld_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; 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".
 ;
@@ -15,7 +15,7 @@
 ;
 &EN
 ; Package header
-#{"helloworld"},(0xA0007DF8),2,2,0
+#{"helloworld"},(0xE0007DF8),2,2,0
 
 ;
 ;Localised Vendor name
@@ -37,4 +37,4 @@
 ;
 ; Backup & Restore
 ;
-"backup_registration.xml"-"!:\private\A0007DF8\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"-"!:\private\E0007DF8\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/helloworld/sis/helloworld_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/helloworld/sis/helloworld_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/helloworld/sis/helloworld_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; 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".
 ;
@@ -15,7 +15,7 @@
 ;
 &EN
 ; Package header
-#{"helloworld"},(0xA0007DF8),2,2,0
+#{"helloworld"},(0xE0007DF8),2,2,0
 
 ;
 ;Localised Vendor name
@@ -37,4 +37,4 @@
 ;
 ; Backup & Restore
 ;
-"backup_registration.xml"-"!:\private\A0007DF8\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"-"!:\private\E0007DF8\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iostream/group/iostream.mmp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iostream/group/iostream.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iostream/group/iostream.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,14 +11,14 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
 
 TARGET		  		iostream.exe
 TARGETTYPE	  		exe
-UID			 		0 0xA0007DF9
+UID			 		0 0xE0007DF9
 
 USERINCLUDE	 		..\inc
 
@@ -37,16 +37,22 @@
 SYSTEMINCLUDE	    \epoc32\include 
 SYSTEMINCLUDE		\epoc32\include\stdapis
 SYSTEMINCLUDE		\epoc32\include\stdapis\sys
-SYSTEMINCLUDE		\epoc32\include\stdapis\stlport
-SYSTEMINCLUDE		\epoc32\include\stdapis\stlport\stl
+SYSTEMINCLUDE		\epoc32\include\stdapis\stlportv5
+SYSTEMINCLUDE		\epoc32\include\stdapis\stlportv5\stl
 
 
 STATICLIBRARY		libcrt0.lib
-LIBRARY				libstdcpp.lib
+LIBRARY				libstdcppv5.lib
 LIBRARY				libc.lib
 LIBRARY				libpthread.lib
 LIBRARY				euser.lib
 
 
 OPTION CW -wchar_t on
-MACRO  _WCHAR_T_DECLARED
+//MACRO  _WCHAR_T_DECLARED
+
+MACRO __SYMBIAN_STDCPP_SUPPORT__
+
+// To specify the usage of Standard C++ Semantics
+//Currently Carbide doesnt support this, but command line building for ARMV5 is supported
+STDCPP
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iostream/sis/iostream_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iostream/sis/iostream_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iostream/sis/iostream_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; 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".
 ;
@@ -15,7 +15,7 @@
 ;
 &EN
 ; Package header
-#{"iostream"},(0xA0007DF9),2,2,0
+#{"iostream"},(0xE0007DF9),2,2,0
 
 ;
 ;Localised Vendor name
@@ -37,4 +37,4 @@
 ;
 ; Backup & Restore
 ;
-"backup_registration.xml"-"!:\private\A0007DF9\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"-"!:\private\E0007DF9\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iostream/sis/iostream_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iostream/sis/iostream_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iostream/sis/iostream_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; 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".
 ;
@@ -15,7 +15,7 @@
 ;
 &EN
 ; Package header
-#{"iostream"},(0xA0007DF9),2,2,0
+#{"iostream"},(0xE0007DF9),2,2,0
 
 ;
 ;Localised Vendor name
@@ -37,4 +37,4 @@
 ;
 ; Backup & Restore
 ;
-"backup_registration.xml"-"!:\private\A0007DF9\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"-"!:\private\E0007DF9\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iterators/group/iterators.mmp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iterators/group/iterators.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iterators/group/iterators.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,14 +11,14 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
 
 TARGET		  iterators.exe
 TARGETTYPE	  exe
-UID			 0 0xA0007DFA
+UID			 0 0xE0007DFA
 
 USERINCLUDE	 ..\inc
 
@@ -37,17 +37,22 @@
 SYSTEMINCLUDE	    \epoc32\include 
 SYSTEMINCLUDE		\epoc32\include\stdapis
 SYSTEMINCLUDE		\epoc32\include\stdapis\sys
-SYSTEMINCLUDE		\epoc32\include\stdapis\stlport
-SYSTEMINCLUDE		\epoc32\include\stdapis\stlport\stl
+SYSTEMINCLUDE		\epoc32\include\stdapis\stlportv5
+SYSTEMINCLUDE		\epoc32\include\stdapis\stlportv5\stl
 
 
 STATICLIBRARY	libcrt0.lib
-LIBRARY			libstdcpp.lib
+LIBRARY			libstdcppv5.lib
 LIBRARY			libc.lib
 LIBRARY			libpthread.lib
 LIBRARY			euser.lib
 
 
 OPTION CW -wchar_t on
-MACRO  _WCHAR_T_DECLARED
+//MACRO  _WCHAR_T_DECLARED
+
+MACRO __SYMBIAN_STDCPP_SUPPORT__
 
+// To specify the usage of Standard C++ Semantics
+//Currently Carbide doesnt support this, but command line building for ARMV5 is supported
+STDCPP
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iterators/sis/iterators_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iterators/sis/iterators_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iterators/sis/iterators_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; 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".
 ;
@@ -15,7 +15,7 @@
 ;
 &EN
 ; Package header
-#{"iterators"},(0xA0007DFA),2,2,0
+#{"iterators"},(0xE0007DFA),2,2,0
 
 ;
 ;Localised Vendor name
@@ -37,4 +37,4 @@
 ;
 ; Backup & Restore
 ;
-;"backup_registration.xml"-"!:\private\A0007DFA\backup_registration.xml"
\ No newline at end of file
+;"backup_registration.xml"-"!:\private\E0007DFA\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iterators/sis/iterators_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iterators/sis/iterators_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/iterators/sis/iterators_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; 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".
 ;
@@ -15,7 +15,7 @@
 ;
 &EN
 ; Package header
-#{"iterators"},(0xA0007DFA),2,2,0
+#{"iterators"},(0xE0007DFA),2,2,0
 
 ;
 ;Localised Vendor name
@@ -37,4 +37,4 @@
 ;
 ; Backup & Restore
 ;
-;"backup_registration.xml"-"!:\private\A0007DFA\backup_registration.xml"
\ No newline at end of file
+;"backup_registration.xml"-"!:\private\E0007DFA\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/stl/group/stl.mmp
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/stl/group/stl.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/stl/group/stl.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,14 +11,14 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
 
 TARGET		  stl.exe
 TARGETTYPE	  exe
-UID			 0 0xA0007DFB
+UID			 0 0xE0007DFB
 
 USERINCLUDE	 ..\inc
 
@@ -37,17 +37,22 @@
 SYSTEMINCLUDE	    \epoc32\include 
 SYSTEMINCLUDE		\epoc32\include\stdapis
 SYSTEMINCLUDE		\epoc32\include\stdapis\sys
-SYSTEMINCLUDE		\epoc32\include\stdapis\stlport
-SYSTEMINCLUDE		\epoc32\include\stdapis\stlport\stl
+SYSTEMINCLUDE		\epoc32\include\stdapis\stlportv5
+SYSTEMINCLUDE		\epoc32\include\stdapis\stlportv5\stl
 
 STATICLIBRARY	libcrt0.lib
 
-LIBRARY			libstdcpp.lib
+LIBRARY			libstdcppv5.lib
 LIBRARY			libc.lib
 LIBRARY			libpthread.lib
 LIBRARY			euser.lib
 
 
 OPTION CW -wchar_t on
-MACRO  _WCHAR_T_DECLARED
+//MACRO  _WCHAR_T_DECLARED
+
+MACRO __SYMBIAN_STDCPP_SUPPORT__
 
+// To specify the usage of Standard C++ Semantics
+//Currently Carbide doesnt support this, but command line building for ARMV5 is supported
+STDCPP
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/stl/sis/stl_armv5.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/stl/sis/stl_armv5.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/stl/sis/stl_armv5.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; 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".
 ;
@@ -15,7 +15,7 @@
 ;
 &EN
 ; Package header
-#{"stl"},(0xA0007DFB),2,2,0
+#{"stl"},(0xE0007DFB),2,2,0
 
 ;
 ;Localised Vendor name
@@ -37,4 +37,4 @@
 ;
 ; Backup & Restore
 ;
-"backup_registration.xml"-"!:\private\A0007DFB\backup_registration.xml"
+"backup_registration.xml"-"!:\private\E0007DFB\backup_registration.xml"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/stl/sis/stl_gcce.pkg
--- a/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/stl/sis/stl_gcce.pkg	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkexamples/cppexamples/S60Ex/s60opencppex/stl/sis/stl_gcce.pkg	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 ; Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
+; 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".
 ;
@@ -15,7 +15,7 @@
 ;
 &EN
 ; Package header
-#{"stl"},(0xA0007DFB),2,2,0
+#{"stl"},(0xE0007DFB),2,2,0
 
 ;
 ;Localised Vendor name
@@ -37,4 +37,4 @@
 ;
 ; Backup & Restore
 ;
-"backup_registration.xml"-"!:\private\A0007DFB\backup_registration.xml"
\ No newline at end of file
+"backup_registration.xml"-"!:\private\E0007DFB\backup_registration.xml"
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkplatformupdates/sdk_build.conf
--- a/sdkcreationmw/sdkplatformupdates/sdk_build.conf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkplatformupdates/sdk_build.conf	Wed Apr 21 09:56:53 2010 +0530
@@ -16,7 +16,6 @@
 # directory containing epoc32, s60 and src subdirectories).
 
 
-
 sf/os/boardsupport/emulator/emulatorbsp/specific/property.cpp:\
 	sf/os/boardsupport/emulator/emulatorbsp,vwins
 sf/os/boardsupport/emulator/emulatorbsp/inc/gui.h	
@@ -24,10 +23,16 @@
 	sf/os/boardsupport/emulator/emulatorbsp, winsgui
 	
 	
-sf/os/devicesrv/sysstatemgmt/ssmcmdlists/data/criticalappscmdlist.rss:\
+sf/os/devicesrv/sysstatemgmt/ssmcmdlists/data/noncriticalcmdlist.rss:\
 sf/os/devicesrv/sysstatemgmt/ssmcmdlists/group,ssmcmdlists
 
-#added since winsock component was not building correctly
-sf/os/commsfw/datacommsserver/networkinterfacemgr/inc/nifif.h:\
-sf/os/commsfw/datacommsserver/networkinterfacemgr/group
- 
\ No newline at end of file
+
+#Updating comms database- Must for winsock to be recognised as an accesspoint
+epoc32/winscw/c/private/10202be9/persists/cccccc00.cre
+epoc32/release/winscw/udeb/Z/private/10202be9/cccccc00.cre
+
+# This file is required by MMS simulation
+epoc32/winscw/c/system/Data/localmode.ini
+
+# Ini-file patch for the default resolution change
+#epoc32/data/epoc.ini
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/AsyStub/group/AsyStub.mmp
--- a/sdkcreationmw/sdkruntimes/AsyStub/group/AsyStub.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/AsyStub/group/AsyStub.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -17,7 +17,7 @@
 
 #include <platform_paths.hrh>
 
-TARGET          AsyStub.dll
+TARGET          asystub.dll
 TARGETTYPE      PLUGIN
 VENDORID        VID_DEFAULT
 
@@ -28,12 +28,12 @@
 
 SOURCEPATH      ..\src
 
-SOURCE          ASYStubProxy.cpp
-SOURCE          ASYStubCmdHandlerBase.cpp
-SOURCE          ASYStubMainServiceBase.cpp
-SOURCE          ASYStubObserver.cpp
-SOURCE          ASYStubService.cpp
-SOURCE          AsyStubCmdObserver.cpp
+SOURCE          asystubproxy.cpp
+SOURCE          asystubcmdhandlerbase.cpp
+SOURCE          asystubmainservicebase.cpp
+SOURCE          asystubobserver.cpp
+SOURCE          asystubservice.cpp
+SOURCE          asystubcmdobserver.cpp
 
 USERINCLUDE     ..\inc
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/AsyStub/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/AsyStub/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/AsyStub/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -22,6 +22,6 @@
 PRJ_EXPORTS
 
 PRJ_MMPFILES
-AsyStub.mmp
+asystub.mmp
 
 //  End of File  
\ No newline at end of file
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/MIDP/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/MIDP/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/MIDP/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2005 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".
 *
@@ -15,7 +15,7 @@
  *
 */
 
-
+//this needs to be enabled once OMJ implementation is done. Debugagent needs to be updated as per new omj APIs
 #include "..\DebugAgent\group\bld.inf"
 
 PRJ_PLATFORMS
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/MIDP/group/lib.mk
--- a/sdkcreationmw/sdkruntimes/MIDP/group/lib.mk	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/MIDP/group/lib.mk	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 # Copyright (c) 2000 - 2005 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
@@ -11,7 +11,7 @@
 #
 # Contributors:
 #
-# Description: 
+# Description:
 #
 
 !INCLUDE config.mk
@@ -42,7 +42,7 @@
     if not exist "$(PrefsDir)" md "$(PrefsDir)"
     if not exist "$(MidpLibDir)" md "$(MidpLibDir)"
 !IF "$(CFG)" != "UDEB"
-    copy "$(SrcJar)" "$(DestJar)"
+# copy "$(SrcJar)" "$(DestJar)" this is commented out as the source dir epoc32\tools\java\sei\WINSCW\udeb\hmidps60v31\lib\hmidps60v31.jar is not available
 !ENDIF
 
 MAKMAKE FINAL FREEZE LIB CLEANLIB RESOURCE SAVESPACE :
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/MIDP/nei/MidpDebug.jpx
--- a/sdkcreationmw/sdkruntimes/MIDP/nei/MidpDebug.jpx	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/MIDP/nei/MidpDebug.jpx	Wed Apr 21 09:56:53 2010 +0530
@@ -22,7 +22,7 @@
   <property category="runtime.0" name="ConfigurationName" value="Debug"/>
   <property category="runtime.0" name="RunnableType" value="com.borland.jbuilder.runtime.ApplicationRunner"/>
   <property category="runtime.0" name="application.class" value="com.symbian.tools.j2me.sei.emulator.Main"/>
-  <property category="runtime.0" name="application.parameters" value="-Xdevice:S60Emulator -Xdebug -Xrunjdwp:transport=dt_socket,address=2690,server=y -Xdescriptor:&quot;C:\USERS\slava\projects\midp\chess\jar\chess.jad&quot;"/>
+  <property category="runtime.0" name="application.parameters" value="-Xdevice:SymbianEmulator -Xdebug -Xrunjdwp:transport=dt_socket,address=2690,server=y -Xdescriptor:&quot;C:\USERS\slava\projects\midp\chess\jar\chess.jad&quot;"/>
   <property category="runtime.0" name="application.vmparameters" value="-Dsei.trace=true -Dsei.trace.all=true -Depoc.root=z:/ -Dsdk.home=Z:\Series60SDK_dev\Series60_tools\MIDP\dist\S60_3rd_MIDP_SDK -Dxrpc.logon-id=000000000015D665"/>
   <property category="serverservices" name="disabled.services" value=""/>
   <property category="serverservices" name="single.server.name" value="Tomcat 4.0"/>
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/EmulatorLauncher.java
--- a/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/EmulatorLauncher.java	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/EmulatorLauncher.java	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2003 - 2004 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -558,18 +558,37 @@
 	 */
 	protected void assignSessionPorts() throws Exception {
 		Debug.println(this, "+EmulatorLauncher.assignSessionPorts()");
-		// find free verbose port
-		int consolePort = iSession.getFreePort();
-		iVMLaunchArguments.getVMArguments().setVMConsolePort(consolePort);
-		Debug.println(this, "console port: " + consolePort);
+		
+		String[] comm = (String[])iSEICommand.getArguments();
+		for (int i = 0; i < comm.length; i++) {
+			System.out.println(comm[i]);
+		}
+		
+		/* Pranav: 
+		 * Console IP address & port were part of the IDE VM arguments.  
+		 * Those were being used for console/Diagnostic output. Not required...code removed from here..
+		 */ 
+		
 		if (iMode == DEBUG_MODE) {
-			// Emulator in server mode:
-			// Phone VM connects to the port in command line
-			// Emulator in client mode:
-			// Phone VM listens on the port given
-			iVMLaunchArguments.getVMArguments().setVMDebugPort(
-					iSEICommand.getVMRemotePort(),
-					iSEICommand.isEmulatorServerMode());
+			// Emulator in server mode: Phone VM connects to the port in command line
+			// Emulator in client mode: Phone VM listens on the port given
+			
+			//Pranav: Write VM arguments for MIDlet Debug from the iSEICommand
+			String[] seiCommands = (String[])iSEICommand.getArguments();
+			
+			String parmaDebug = "";
+			String paramJdwp = "";
+			for (int i = 0; i < seiCommands.length; i++) {
+				System.out.println(seiCommands[i]);
+				if (seiCommands[i].startsWith("-Xdebug")) parmaDebug = seiCommands[i];
+				else if (seiCommands[i].startsWith("-Xrunjdwp")) paramJdwp = seiCommands[i];
+				
+				if(!parmaDebug.equals("") && !paramJdwp.equals("")){
+					break;
+				}
+			}
+			iVMLaunchArguments.getVMArguments().setVMDebugPort(iSEICommand.getVMRemotePort(), parmaDebug.trim(), paramJdwp.trim());
+			
 			Debug.println(this, "debug port: " + iSEICommand.getVMRemotePort());
 		}
 	}
@@ -632,41 +651,6 @@
 			lib = new File(new File(SDKRuntimeProperties.EPOC_HOME)
 					.getParentFile().getParentFile(), "lib");
 		}
-		/*if (lib.isDirectory()) {
-			String[] jars = lib.list(new FilenameFilter() {
-				public boolean accept(File dir, String name) {
-					return (name.toLowerCase().endsWith(".jar") || name
-							.toLowerCase().endsWith(".zip"));
-				}
-			});
-			if (jars != null && jars.length > 0) {
-				for (int i = 0; i < jars.length; i++) {
-					JarFile jarFile = new JarFile(lib.getAbsolutePath()
-							+ File.separatorChar + jars[i]);
-					Manifest manifest = jarFile.getManifest();
-					if(manifest != null)
-					{
-						Attributes atr = manifest.getMainAttributes();
-						String apiName = atr.getValue("API");
-						String apiVersion = atr
-								.getValue("API-Specification-Version");
-						if(!apiName.equalsIgnoreCase("CLDC") && !apiName.equalsIgnoreCase("MIDP")){
-							if(optionalApis.length()>0){ optionalApis.append(", ");}
-							optionalApis.append(apiName + "-" + apiVersion);
-						}
-					}
-				}
-
-				// TODO
-				// 1) Form an array of API names from jar manifests:
-				// profile, configuration, optionalAPIs
-				// 2) Form an array of API names from properties file
-				// 3) Form resulting array of API names:
-				// add an api to the array 1. from JAR array,
-				// if absent - from properties array
-
-			}
-		}*/
 		
 		if (lib.isDirectory()) {
 			String[] jars = lib.list(new FilenameFilter() {
@@ -700,24 +684,8 @@
 					}
 				}
 
-				// TODO
-				// 1) Form an array of API names from jar manifests:
-				// profile, configuration, optionalAPIs
-				// 2) Form an array of API names from properties file
-				// 3) Form resulting array of API names:
-				// add an api to the array 1. from JAR array,
-				// if absent - from properties array
-
 			}
 		}
-		/*for (int i = 0; i < defaultOptionalApis.length; i++) {
-			String defaultApiName = defaultOptionalApis[i]
-					.substring(0, defaultOptionalApis[i].indexOf('-'));
-			if (optionalApis.indexOf(defaultApiName) == -1) {
-				optionalApis.append(", " + defaultOptionalApis[i]);
-			}
-		}*/
-
 		System.out.println("Profile: " + profile);
 		System.out.println("Configuration: " + configuration);
 		System.out.println("Optional: " + optionalApis);
@@ -875,6 +843,7 @@
 			String epocLine = "";
 			String resolutionFileName = "";
 			while ((epocLine = bReader.readLine()) != null) {
+				if (!epocLine.equals("")){
 				if (epocLine.substring(0, epocLine.indexOf(" ")).trim().equals(
 						"configuration")) {
 					
@@ -905,6 +874,7 @@
 					
 					break;
 				}
+				}
 			}
 		} catch (Exception e) {
 			System.err.println("Error: " + e.getMessage());
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/commands/VMLaunchArguments.java
--- a/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/commands/VMLaunchArguments.java	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/commands/VMLaunchArguments.java	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2003 - 2004 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -78,12 +78,6 @@
   // Members
   //
 
-
-  /**
-   * MIDlet suite AMS arguments
-   */
-  private MIDletSuiteAMSArguments iAMSArguments = new MIDletSuiteAMSArguments();
-
   /**
    * VM arguments
    */
@@ -155,18 +149,6 @@
    * @param aSEICommand SEI command
    */
   public VMLaunchArguments(SEICommand aSEICommand) {
-    //properties
-    if(aSEICommand.getSystemProperties() != null)
-    {
-      Map props = aSEICommand.getSystemProperties();
-      String key;
-      for(Iterator iter = props.keySet().iterator(); iter.hasNext(); )
-      {
-        key = (String)iter.next();
-        iAMSArguments.setSystemProperty(key, (String)props.get(key));
-      }
-    }
-
     //verbose
     for(Iterator iter = aSEICommand.getVerboseTypes().iterator();iter.hasNext() ;)
     {
@@ -195,18 +177,6 @@
     return iVMArguments;
   }
 
-
-  /**
-   * Get MIDlet suite AMS arguments
-   *
-   * @return MIDlet suite AMS arguments
-   */
-  public MIDletSuiteAMSArguments getMIDletSuiteAMSArguments()
-  {
-    return iAMSArguments;
-  }
-
-
   /**
    * Get MIDlet info
    *
@@ -238,7 +208,8 @@
    */
   public void dump(DataOutputStream aDos) throws IOException{
     iMIDletInfo.dump(aDos);
-    aDos.writeUTF(iVMArguments.getArguments() + " " + iAMSArguments.getArguments());
+    //No need to write AMSArguments to the OutputStream 
+    aDos.writeUTF(iVMArguments.getArguments());
   }
 
 }
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/queries.properties
--- a/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/queries.properties	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/queries.properties	Wed Apr 21 09:56:53 2010 +0530
@@ -1,29 +1,30 @@
 # Supported devices list
-device.list: S60Emulator, S60Device
+device.list: SymbianEmulator, SymbianDevice
 uei.version: 1.0.2
+java.runtime.support: 2.1
 sdk.home: .
 
 # Properties required by J2MEWTK
 kvem.class.path: bin/epoc32/tools/ecmt/nei.jar
 kvem.main: com.nokia.j2me.sei.NokiaEmulator
 
-# S60Emulator device options
-S60Emulator.screen.width: 240
-S60Emulator.screen.height: 320
-S60Emulator.screen.isColor: true
-S60Emulator.screen.bitDepth: 12
-S60Emulator.screen.isTouch: false
-S60Emulator.security.domains: Manufacturer, Operator, Trusted_Third_Party, Untrusted, User_defined, Minimal
-S60Emulator.bootclasspath: /lib/j9_23_j9midps60.zip
-S60Emulator.apis: /lib/j9_23_j9midps60.zip
+# SymbianEmulator device options
+SymbianEmulator.screen.width: 240
+SymbianEmulator.screen.height: 320
+SymbianEmulator.screen.isColor: true
+SymbianEmulator.screen.bitDepth: 12
+SymbianEmulator.screen.isTouch: false
+SymbianEmulator.security.domains: Manufacturer, Operator, Trusted_Third_Party, Untrusted
+SymbianEmulator.bootclasspath: /lib/java_signature_test.jar,/lib/java_public_api.jar
+SymbianEmulator.apis: /lib/java_signature_test.jar,/lib/java_public_api.jar
 
-# S60Device device options
-S60Device.screen.width: 240
-S60Device.screen.height: 320
-S60Device.screen.isColor: true
-S60Device.screen.bitDepth: 12
-S60Device.screen.isTouch: false
-S60Device.security.domains: Manufacturer, Operator, Trusted_Third_Party, Untrusted, User_defined, Minimal
-S60Device.bootclasspath: /lib/j9_23_j9midps60.zip
-S60Device.apis: /lib/j9_23_j9midps60.zip
+# SymbianDevice device options
+SymbianDevice.screen.width: 240
+SymbianDevice.screen.height: 320
+SymbianDevice.screen.isColor: true
+SymbianDevice.screen.bitDepth: 12
+SymbianDevice.screen.isTouch: false
+SymbianDevice.security.domains: Manufacturer, Operator, Trusted_Third_Party, Untrusted
+SymbianDevice.bootclasspath: /lib/java_signature_test.jar,/lib/java_public_api.jar
+SymbianDevice.apis: /lib/java_signature_test.jar,/lib/java_public_api.jar
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/session/RemoteSession.java
--- a/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/session/RemoteSession.java	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/session/RemoteSession.java	Wed Apr 21 09:56:53 2010 +0530
@@ -288,13 +288,14 @@
    *
    * @throws Exception if some error occured
    */
-  public synchronized MIDletSuiteInfo[] getInstalledMIDletSuitesInfo() throws Exception {
+  //public synchronized MIDletSuiteInfo[] getInstalledMIDletSuitesInfo() throws Exception {
     //get suites
-    ListSuitesCommand listSuitesCmd = new ListSuitesCommand();
+    /*ListSuitesCommand listSuitesCmd = new ListSuitesCommand();
     listSuitesCmd.execute(iDis, iDos);
     MIDletSuiteInfo[] suites = listSuitesCmd.getInstalledSuites();
-    return suites;
-  }
+    return suites;*/
+	 // return null;
+  //}
 
 
   /**
@@ -348,12 +349,12 @@
    *
    * @throws Exception if some error occured
    */
-    public synchronized int getFreePort() throws Exception {
+    /*public synchronized int getFreePort() throws Exception {
       //get ports
       GetPortCommand portCmd = new GetPortCommand(1);
       portCmd.execute(iDis, iDos);
       return portCmd.getFreePorts()[0];
-    }
+    }*/
 
     /**
      * Get SEI-Slave TCP Inet address
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/session/Session.java
--- a/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/session/Session.java	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/session/Session.java	Wed Apr 21 09:56:53 2010 +0530
@@ -161,7 +161,7 @@
    *
    * @throws Exception if some error occured
    */
-  public abstract int getFreePort() throws Exception;
+  //public abstract int getFreePort() throws Exception;
 
 
 
@@ -233,7 +233,7 @@
    *
    * @throws Exception if some error occured
    */
-  public abstract MIDletSuiteInfo[] getInstalledMIDletSuitesInfo() throws Exception;
+  //public abstract MIDletSuiteInfo[] getInstalledMIDletSuitesInfo() throws Exception;
 
 
   /**
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/session/device2session.properties
--- a/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/session/device2session.properties	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/session/device2session.properties	Wed Apr 21 09:56:53 2010 +0530
@@ -8,8 +8,8 @@
 #
 
 #available sessions
-S60Emulator: com.nokia.j2me.sei.EmulatorSession
-S60Device: com.nokia.j2me.sei.GatewaySession
+SymbianEmulator: com.nokia.j2me.sei.EmulatorSession
+SymbianDevice: com.nokia.j2me.sei.GatewaySession
 
 # default session
-default: S60Emulator
+default: SymbianEmulator
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/version.properties
--- a/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/version.properties	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/emulator/version.properties	Wed Apr 21 09:56:53 2010 +0530
@@ -8,7 +8,7 @@
 #
 # Version information for -version query
 #
-SDK_NAME=S60 5th Edition SDK v1.0
+SDK_NAME=Nokia Symbian3 SDK 0.5 
 PROFILE=MIDP-2.1
 CONFIGURATION=CLDC-1.1
 OPTIONAL=ESWT-1.0.3,MMAPI-1.2,J2ME-XMLRPC-1.0,SATSA-1.2,JSR179-1.0,JSR180-1.0,JSR184-1.0,JSR226-1.0,JSR234-1.0,JSR75-1.0,JSR82-1.1,WMA-1.1,WMA-2.0
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/preferences/KDPPreferences.java
--- a/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/preferences/KDPPreferences.java	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/tools/j2me/sei/preferences/KDPPreferences.java	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2003 - 2004 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -27,8 +27,8 @@
 
 public class KDPPreferences implements Serializable {
 
-  public static final String EMULATOR_SESSION_NAME = "S60Emulator";
-  public static final String DEVICE_SESSION_NAME = "S60Device";
+  public static final String EMULATOR_SESSION_NAME = "SymbianEmulator";
+  public static final String DEVICE_SESSION_NAME = "SymbianDevice";
   
   //
   // Constant default values
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/vm/VMArguments.java
--- a/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/vm/VMArguments.java	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/MIDP/nei/src/com/symbian/vm/VMArguments.java	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2003 - 2004 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -91,21 +91,24 @@
   // Operations
   //
 
-  /**
-   * Set VM debug port.
-   *
-   * @param int debug port
-   */
-  public void setVMDebugPort(int aDebugPort, boolean isVmInServerMode) {
+	/**
+	 * Method has been updated to set the -Xdebug and -Xrunjdwp as part of VM argument for MIDlet debugging
+	 *
+	 * @param aDebugPort int debug port
+	 * @param peramXdebug String -Xdebug parameter
+	 * @param peramXrunjdwp String -Xrunjdwp parameter
+	 */
+	public void setVMDebugPort(int aDebugPort, String peramXdebug,
+			String peramXrunjdwp) {
     iDebugPort = aDebugPort;
-    //iArguments.append(" ").append(DEBUG_ARG).
-    //    append(" ").append(DEBUG_PORT_ARG).append(" ").append(iDebugPort);
     
-    iArguments.append(" -ide_server_mode "+ (isVmInServerMode?"y":"n"));
-    // The address should be set in console settings already, do not do that:
-    //iArguments.append(" -ide_addr 127.0.0.1");
-    iArguments.append(" -ide_port ").append(iDebugPort);
-    
+		// Previous args: Ignoring it....
+		//iArguments.append(" -ide_server_mode "+ (isVmInServerMode?"y":"n"));
+		//iArguments.append(" -ide_port ").append(iDebugPort);
+
+		iArguments.append(peramXdebug + " ");
+		iArguments.append(peramXrunjdwp);
+
   }
 
   /**
@@ -122,6 +125,7 @@
    *
    * @param VM console port
    */
+	// Pranav: Method is no longer useful - Keep it for time being and will remove in future.
   public void setVMConsolePort(int aConsolePort) {
     iConsolePort = aConsolePort;
     iArguments.append(" -ide_addr 127.0.0.1");
@@ -134,6 +138,7 @@
    *
    * @return VM console port
    */
+	// Pranav: Method is no longer useful - Keep it for time being and will remove in future.
   public int getVMConsolePort(){
     return iConsolePort;
   }
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/NMIT/dscli/dscli.dsp
--- a/sdkcreationmw/sdkruntimes/NMIT/dscli/dscli.dsp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/NMIT/dscli/dscli.dsp	Wed Apr 21 09:56:53 2010 +0530
@@ -59,7 +59,7 @@
 TargetName=sdkw
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copying release files...
-PostBuild_Cmds=if exist ..\..\..\..\epoc32\release\wins\urel echo ..\..\..\..\epoc32\release\wins\urel\$(TargetName).exe	if exist ..\..\..\..\epoc32\release\wins\urel copy $(TargetPath) ..\..\..\..\epoc32\release\wins\urel\$(TargetName).exe	if exist ..\..\..\..\epoc32\release\winscw\urel echo ..\..\..\..\epoc32\release\winscw\urel\$(TargetName).exe	if exist ..\..\..\..\epoc32\release\winscw\urel copy $(TargetPath) ..\..\..\..\epoc32\release\winscw\urel\$(TargetName).exe	if exist ..\..\..\..\epoc32\release\winscw\udeb echo ..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).exe	if exist ..\..\..\..\epoc32\release\winscw\udeb copy $(TargetPath) ..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).exe
+PostBuild_Cmds=if exist ..\..\..\..\..\epoc32\release\wins\urel echo ..\..\..\..\..\epoc32\release\wins\urel\$(TargetName).exe	if exist ..\..\..\..\..\epoc32\release\wins\urel copy $(TargetPath) ..\..\..\..\..\epoc32\release\wins\urel\$(TargetName).exe	if exist ..\..\..\..\..\epoc32\release\winscw\urel echo ..\..\..\..\..\epoc32\release\winscw\urel\$(TargetName).exe	if exist ..\..\..\..\..\epoc32\release\winscw\urel copy $(TargetPath) ..\..\..\..\..\epoc32\release\winscw\urel\$(TargetName).exe	if exist ..\..\..\..\..\epoc32\release\winscw\udeb echo ..\..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).exe	if exist ..\..\..\..\..\epoc32\release\winscw\udeb copy $(TargetPath) ..\..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).exe
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "dscli - Win32 Debug"
@@ -91,7 +91,7 @@
 TargetName=sdkw
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copying debug files...
-PostBuild_Cmds=if exist ..\..\..\..\epoc32\release\wins\udeb echo ..\..\..\..\epoc32\release\wins\udeb\$(TargetName).exe	if exist ..\..\..\..\epoc32\release\wins\udeb copy $(TargetPath) ..\..\..\..\epoc32\release\wins\udeb\$(TargetName).exe
+PostBuild_Cmds=if exist ..\..\..\..\..\epoc32\release\wins\udeb echo ..\..\..\..\..\epoc32\release\wins\udeb\$(TargetName).exe	if exist ..\..\..\..\..\epoc32\release\wins\udeb copy $(TargetPath) ..\..\..\..\..\epoc32\release\wins\udeb\$(TargetName).exe
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "dscli - Win32 Debug Console"
@@ -123,7 +123,7 @@
 TargetName=sdk
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copying debug files...
-PostBuild_Cmds=if exist ..\..\..\..\epoc32\release\wins\udeb echo ..\..\..\..\epoc32\release\wins\udeb\$(TargetName).exe	if exist ..\..\..\..\epoc32\release\wins\udeb copy $(TargetPath) ..\..\..\..\epoc32\release\wins\udeb\$(TargetName).exe
+PostBuild_Cmds=if exist ..\..\..\..\..\epoc32\release\wins\udeb echo ..\..\..\..\..\epoc32\release\wins\udeb\$(TargetName).exe	if exist ..\..\..\..\..\epoc32\release\wins\udeb copy $(TargetPath) ..\..\..\..\..\epoc32\release\wins\udeb\$(TargetName).exe
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "dscli - Win32 Release Console"
@@ -157,7 +157,7 @@
 TargetName=sdk
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copying release files...
-PostBuild_Cmds=if exist ..\..\..\..\epoc32\release\wins\urel echo ..\..\..\..\epoc32\release\wins\urel\$(TargetName).exe	if exist ..\..\..\..\epoc32\release\wins\urel copy $(TargetPath) ..\..\..\..\epoc32\release\wins\urel\$(TargetName).exe	if exist ..\..\..\..\epoc32\release\winscw\urel echo ..\..\..\..\epoc32\release\winscw\urel\$(TargetName).exe	if exist ..\..\..\..\epoc32\release\winscw\urel copy $(TargetPath) ..\..\..\..\epoc32\release\winscw\urel\$(TargetName).exe	if exist ..\..\..\..\epoc32\release\winscw\udeb echo ..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).exe	if exist ..\..\..\..\epoc32\release\winscw\udeb copy $(TargetPath) ..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).exe
+PostBuild_Cmds=if exist ..\..\..\..\..\epoc32\release\wins\urel echo ..\..\..\..\..\epoc32\release\wins\urel\$(TargetName).exe	if exist ..\..\..\..\..\epoc32\release\wins\urel copy $(TargetPath) ..\..\..\..\..\epoc32\release\wins\urel\$(TargetName).exe	if exist ..\..\..\..\..\epoc32\release\winscw\urel echo ..\..\..\..\..\epoc32\release\winscw\urel\$(TargetName).exe	if exist ..\..\..\..\..\epoc32\release\winscw\urel copy $(TargetPath) ..\..\..\..\..\epoc32\release\winscw\urel\$(TargetName).exe	if exist ..\..\..\..\..\epoc32\release\winscw\udeb echo ..\..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).exe	if exist ..\..\..\..\..\epoc32\release\winscw\udeb copy $(TargetPath) ..\..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).exe
 # End Special Build Tool
 
 !ENDIF 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/NMIT/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/NMIT/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/NMIT/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -23,4 +23,5 @@
 //nmakefile instregw.mk
 nmakefile sdkw.mk
 nmakefile sdk.mk
+..\..\..\sdkcommonutils\util\group\Openlib.mmp
 #endif
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/Common/group/EcmtCommonPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/Common/group/EcmtCommonPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/Common/group/EcmtCommonPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -23,20 +23,20 @@
 #include "..\inc\EcmtCommonPluginUids.h"
 #include <data_caging_paths.hrh>
 
-TARGET          EcmtCommonPlugin.dll
+TARGET          ecmtcommonplugin.dll
 TARGETTYPE      PLUGIN
 UID             KECOM_DLL_UID KCOMMONPLUGIN_DLL_UID
 CAPABILITY	CAP_ECOM_PLUGIN
 VENDORID	VID_DEFAULT
 
 SOURCEPATH	..\src
-SOURCE		EcmtCommonPluginMain.cpp
-SOURCE		EcmtFile.cpp
-SOURCE		EcmtSeekFile.cpp
+SOURCE		ecmtcommonpluginmain.cpp
+SOURCE		ecmtfile.cpp
+SOURCE		ecmtseekfile.cpp
 
-SOURCE		EcmtCommonPluginBase.cpp
-SOURCE		EcmtPanPlugin.cpp
-SOURCE		EcmtEmuConfigPlugin.cpp
+SOURCE		ecmtcommonpluginbase.cpp
+SOURCE		ecmtpanplugin.cpp
+SOURCE		ecmtemuconfigplugin.cpp
 
 USERINCLUDE	..\inc
 USERINCLUDE     ..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/Common/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/Common/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/Common/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -21,7 +21,7 @@
 
 PRJ_MMPFILES
 #ifdef WINS
-EcmtCommonPlugin.mmp
+ecmtcommonplugin.mmp
 #endif //WINS
 
 //  End of File  
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/Ethernet/group/EcmtEthernetPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/Ethernet/group/EcmtEthernetPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/Ethernet/group/EcmtEthernetPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -20,17 +20,17 @@
 #include "..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc\EcmtUids.h"
 #include "..\inc\EcmtEthernetPluginUids.h"
 
-TARGET          EcmtEthernetPlugin.dll
+TARGET          ecmtethernetplugin.dll
 TARGETTYPE      PLUGIN
 UID             KECOM_DLL_UID KETHERNETPLUGIN_DLL_UID
 CAPABILITY      CAP_ECOM_PLUGIN
 VENDORID        VID_DEFAULT
 
 SOURCEPATH      ..\src
-SOURCE          EcmtEthernetPlugin.cpp
+SOURCE          ecmtethernetplugin.cpp
 SOURCEPATH      ..\..\Common\src
-SOURCE          EcmtCommonPluginBase.cpp
-SOURCE          EcmtFile.cpp
+SOURCE          ecmtcommonpluginbase.cpp
+SOURCE          ecmtfile.cpp
 
 USERINCLUDE     ..\inc
 USERINCLUDE     ..\..\Common\inc
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/Ethernet/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/Ethernet/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/Ethernet/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -23,7 +23,7 @@
 WINSCW
 
 PRJ_MMPFILES
-EcmtEthernetPlugin.mmp
+ecmtethernetplugin.mmp
 
 #endif // !SDK_MIDP
 #endif // WINS
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/EventSim/group/EcmtEventSimPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/EventSim/group/EcmtEventSimPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/EventSim/group/EcmtEventSimPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -21,17 +21,17 @@
 #include "..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc\EcmtUids.h"
 #include "..\inc\EcmtEventSimPluginUids.h"
 
-TARGET          EcmtEventSimPlugin.dll
+TARGET          ecmteventsimplugin.dll
 TARGETTYPE      PLUGIN
 UID             KECOM_DLL_UID KEVENTSIMPLUGIN_DLL_UID
 CAPABILITY      CAP_ECOM_PLUGIN -CommDD -MultimediaDD -SurroundingsDD -TrustedUI -DRM -NetworkControl
 VENDORID        VID_DEFAULT
 
 SOURCEPATH	..\src
-SOURCE		EcmtEventSimPlugin.cpp
-SOURCE		EventWrapper.cpp
-SOURCE		EcmtMMCEvent.cpp
-SOURCE 		WinsDrives.cpp
+SOURCE		ecmteventsimplugin.cpp
+SOURCE		eventwrapper.cpp
+SOURCE		ecmtmmcevent.cpp
+SOURCE 		winsdrives.cpp
 
 //MMC
 USERINCLUDE     ..\..\Common\inc
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/EventSim/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/EventSim/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/EventSim/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -22,7 +22,7 @@
 
 PRJ_MMPFILES
 #ifdef WINS
-//EcmtEventSimPlugin.mmp
+//ecmteventsimplugin.mmp
 #endif //WINS
 
 //  End of File  
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/HttpTraffic/group/EcmtHttpTrafficPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/HttpTraffic/group/EcmtHttpTrafficPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/HttpTraffic/group/EcmtHttpTrafficPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -19,7 +19,7 @@
 #include <data_caging_paths.hrh>
 #include "..\inc\HttpPluginUids.h"
 
-TARGET      EcmtHttpTrafficPlugin.dll
+TARGET      ecmthttptrafficplugin.dll
 TARGETTYPE  PLUGIN 
 
 #ifdef WINS
@@ -33,7 +33,7 @@
 UID 0x10009D8D KHTTPPLUGINFILTER_DLL_UID 
 
 SOURCEPATH ..\src
-SOURCE HttpPluginFilter.cpp
+SOURCE httppluginfilter.cpp
 
 USERINCLUDE ..\inc
 SYSTEMINCLUDE \epoc32\include
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/HttpTraffic/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/HttpTraffic/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/HttpTraffic/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -20,6 +20,6 @@
 DEFAULT
 
 PRJ_MMPFILES
-EcmtHttpTrafficPlugin.mmp
+ecmthttptrafficplugin.mmp
 
 //  End of File  
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/MidpDebug/group/EcmtMidpDebugPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/MidpDebug/group/EcmtMidpDebugPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/MidpDebug/group/EcmtMidpDebugPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -19,7 +19,7 @@
 #include "..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc\EcmtUids.h"
 #include "..\inc\EcmtMidpDebugPluginUids.h"
 
-TARGET      EcmtMidpDebugPlugin.dll
+TARGET      ecmtmidpdebugplugin.dll
 TARGETTYPE  PLUGIN
 
 #ifdef WINS
@@ -33,10 +33,10 @@
 UID KECOM_DLL_UID KECMT_MIDP_DEBUG_PLUGIN_UID
 
 SOURCEPATH    ..\src
-SOURCE        EcmtMidpDebugPlugin.cpp
-SOURCE        EcmtMidpDebugSession.cpp
-SOURCE        EcmtMidpDebugConnection.cpp
-SOURCE        EcmtMidpDebugTrace.cpp
+SOURCE        ecmtmidpdebugplugin.cpp
+SOURCE        ecmtmidpdebugsession.cpp
+SOURCE        ecmtmidpdebugconnection.cpp
+SOURCE        ecmtmidpdebugtrace.cpp
 
 USERINCLUDE   ..\inc
 USERINCLUDE   ..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/MidpDebug/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/MidpDebug/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/MidpDebug/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -20,4 +20,4 @@
 DEFAULT
 
 PRJ_MMPFILES
-EcmtMidpDebugPlugin.mmp
+ecmtmidpdebugplugin.mmp
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/MsgRelay/group/EcmtMsgRelayPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/MsgRelay/group/EcmtMsgRelayPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/MsgRelay/group/EcmtMsgRelayPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -20,20 +20,24 @@
 #include "..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc\EcmtUids.h"
 #include "..\inc\EcmtMsgRelayPluginUids.h"
 
-TARGET          EcmtMsgRelayPlugin.dll
+TARGET          ecmtmsgrelayplugin.dll
 TARGETTYPE      PLUGIN
 UID             KECOM_DLL_UID KECMTMSGRELAYPLUGIN_DLL_UID
 CAPABILITY		CAP_ECOM_PLUGIN
 VENDORID		VID_DEFAULT
 
 SOURCEPATH	..\src
-SOURCE		EcmtMsgRelayPlugin.cpp MessageRelayAppDll.cpp
+SOURCE		ecmtmsgrelayplugin.cpp messagerelayappdll.cpp
 
 USERINCLUDE	..\inc
 USERINCLUDE	..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc
+USERINCLUDE ..\..\..\..\sdkcommonutils\util\Inc
 SYSTEMINCLUDE	\epoc32\include
 SYSTEMINCLUDE	\epoc32\include\ecom
-SYSTEMINCLUDE	\epoc32\include\OpenLIB
+//SYSTEMINCLUDE	\epoc32\include\OpenLIB
+SYSTEMINCLUDE  \epoc32\include\platform
+SYSTEMINCLUDE  \epoc32\include\mw
+SYSTEMINCLUDE  \epoc32\include\platform\mw
 
 LIBRARY		euser.lib charconv.lib
 LIBRARY		efsrv.lib estor.lib gsmu.lib
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/MsgRelay/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/MsgRelay/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/MsgRelay/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -21,7 +21,7 @@
 
 PRJ_MMPFILES
 #ifdef WINS
-EcmtMsgRelayPlugin.mmp
+ecmtmsgrelayplugin.mmp
 #endif
 
 //  End of File  
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/NCI/group/EcmtNCIPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/NCI/group/EcmtNCIPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/NCI/group/EcmtNCIPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -21,19 +21,19 @@
 #include "..\inc\EcmtNCIPluginUids.h"
 
 
-TARGET          EcmtNCIPlugin.dll
+TARGET          ecmtnciplugin.dll
 TARGETTYPE      PLUGIN
 UID             KECOM_DLL_UID KECMTNCIPLUGIN_DLL_UID
 CAPABILITY      CAP_ECOM_PLUGIN
 VENDORID        VID_DEFAULT
 
 SOURCEPATH	..\src
-SOURCE		EcmtNCIPlugin.cpp 
-SOURCE		MsgSvrDll.cpp
-SOURCE		MsgSvrEng.cpp
-SOURCE		MsgCommandConnection.cpp
-SOURCE		SmsFileHandler.cpp
-SOURCE		Timeoutimer.cpp
+SOURCE		ecmtnciplugin.cpp 
+SOURCE		msgsvrdll.cpp
+SOURCE		msgsvreng.cpp
+SOURCE		msgcommandconnection.cpp
+SOURCE		smsfilehandler.cpp
+SOURCE		timeoutimer.cpp
 SOURCE		message.cpp
 
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/NCI/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/NCI/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/NCI/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -21,7 +21,7 @@
 
 PRJ_MMPFILES
 #ifdef WINS
-EcmtNCIPlugin.mmp
+ecmtnciplugin.mmp
 #endif //WINS
 
 //  End of File  
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/PushURL/group/EcmtPushURLPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/PushURL/group/EcmtPushURLPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/PushURL/group/EcmtPushURLPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -20,7 +20,7 @@
 #include "..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc\EcmtUids.h"
 #include "..\inc\PushURLUids.h"
 
-TARGET      EcmtPushURLPlugin.dll
+TARGET      ecmtpushurlplugin.dll
 TARGETTYPE  PLUGIN
 
 #ifdef WINS
@@ -34,7 +34,7 @@
 UID KECOM_DLL_UID KPUSH_URL_PLUGIN_DLL_UID
 
 SOURCEPATH ..\src
-SOURCE PushURL.cpp
+SOURCE pushurl.cpp
 
 USERINCLUDE  ..\inc
 USERINCLUDE     ..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/PushURL/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/PushURL/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/PushURL/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -20,6 +20,6 @@
 DEFAULT
 
 PRJ_MMPFILES
-EcmtPushURLPlugin.mmp
+ecmtpushurlplugin.mmp
 
 //  End of File  
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/SDK/group/EcmtSdkPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/SDK/group/EcmtSdkPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/SDK/group/EcmtSdkPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -20,14 +20,14 @@
 #include "..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc\EcmtUids.h"
 #include "..\inc\EcmtSdkPluginUids.h"
 
-TARGET          EcmtSdkPlugin.dll
+TARGET          ecmtsdkplugin.dll
 TARGETTYPE      PLUGIN
 UID             KECOM_DLL_UID KSDKPLUGIN_DLL_UID
 CAPABILITY      CAP_ECOM_PLUGIN
 VENDORID        VID_DEFAULT
 
 SOURCEPATH	..\src
-SOURCE		EcmtSdkPlugin.cpp
+SOURCE		ecmtsdkplugin.cpp
 
 USERINCLUDE	..\inc
 USERINCLUDE     ..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/SDK/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/SDK/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/SDK/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -21,7 +21,7 @@
 
 PRJ_MMPFILES
 #ifdef WINS
-EcmtSDKPlugin.mmp
+ecmtsdkplugin.mmp
 #endif
 
 //  End of File  
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/SEIForward/group/EcmtSeiForwardPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/SEIForward/group/EcmtSeiForwardPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/SEIForward/group/EcmtSeiForwardPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -20,16 +20,16 @@
 #include "..\..\..\Core\inc\EcmtUids.h"
 #include "..\inc\EcmtSeiForwardPluginUids.h"
 
-TARGET          EcmtSeiForwardPlugin.dll
+TARGET          ecmtseiforwardplugin.dll
 TARGETTYPE      PLUGIN
 UID             KECOM_DLL_UID KSEIFORWARDPLUGIN_DLL_UID
 CAPABILITY		CAP_ECOM_PLUGIN
 VENDORID		VID_DEFAULT
 
 SOURCEPATH	..\src
-SOURCE		EcmtSeiForwardPlugin.cpp
-SOURCE		SocketListener.cpp
-SOURCE		SymbianSocket.cpp
+SOURCE		ecmtseiforwardplugin.cpp
+SOURCE		socketlistener.cpp
+SOURCE		symbiansocket.cpp
 
 USERINCLUDE	..\inc
 USERINCLUDE     ..\..\..\Core\inc
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/SEIForward/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/SEIForward/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/SEIForward/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -20,6 +20,6 @@
 DEFAULT
 
 PRJ_MMPFILES
-EcmtSEIForwardPlugin.mmp
+ecmtseiforwardplugin.mmp
 
 //  End of File  
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/SEIagent/group/EcmtSeiAgentPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/SEIagent/group/EcmtSeiAgentPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/SEIagent/group/EcmtSeiAgentPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -20,14 +20,14 @@
 #include "..\..\..\Core\inc\EcmtUids.h"
 #include "..\inc\EcmtSeiAgentPluginUids.h"
 
-TARGET          EcmtSeiAgentPlugin.dll
+TARGET          ecmtseiagentplugin.dll
 TARGETTYPE      PLUGIN
 UID             KECOM_DLL_UID KSEIAGENTPLUGIN_DLL_UID
 CAPABILITY		CAP_ECOM_PLUGIN PowerMgmt
 VENDORID		VID_DEFAULT
 
 SOURCEPATH	..\src
-SOURCE		EcmtSeiAgentPlugin.cpp
+SOURCE		ecmtseiagentplugin.cpp
 
 
 USERINCLUDE	..\inc
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/SEIagent/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/SEIagent/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/SEIagent/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -20,6 +20,6 @@
 DEFAULT
 
 PRJ_MMPFILES
-EcmtSEIAgentPlugin.mmp
+ecmtseiagentplugin.mmp
 
 //  End of File  
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/SimPsy/group/EcmtSimPsyPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/SimPsy/group/EcmtSimPsyPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/SimPsy/group/EcmtSimPsyPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -21,14 +21,14 @@
 #include "..\inc\EcmtSimPsyPluginUids.h"
 #include <data_caging_paths.hrh>
 
-TARGET          EcmtSimPsyPlugin.dll
+TARGET          ecmtsimpsyplugin.dll
 TARGETTYPE      PLUGIN
 UID             KECOM_DLL_UID KSIMPSYPLUGIN_DLL_UID
 CAPABILITY		CAP_ECOM_PLUGIN
 VENDORID		VID_DEFAULT
 
 SOURCEPATH	..\src
-SOURCE		EcmtSimPsyPlugin.cpp
+SOURCE		ecmtsimpsyplugin.cpp
 
 USERINCLUDE	..\inc
 USERINCLUDE     ..\..\..\Core\inc
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/SimPsy/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/SimPsy/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/SimPsy/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -20,6 +20,6 @@
 DEFAULT
 
 PRJ_MMPFILES
-EcmtSimPsyPlugin.mmp
+ecmtsimpsyplugin.mmp
 
 //  End of File  
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/SocketForward/group/EcmtSocketForwardPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/SocketForward/group/EcmtSocketForwardPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/SocketForward/group/EcmtSocketForwardPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -21,7 +21,7 @@
 #include "..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc\EcmtUids.h"
 #include "..\inc\EcmtSocketForwardPluginUids.h"
 
-TARGET          EcmtSocketForwardPlugin.dll
+TARGET          ecmtsocketforwardplugin.dll
 TARGETTYPE      PLUGIN
 UID             KECOM_DLL_UID KSOCKETFORWARDPLUGIN_DLL_UID
 
@@ -34,8 +34,8 @@
 VENDORID		VID_DEFAULT
 
 SOURCEPATH	..\src
-SOURCE		EcmtSocketForwardPlugin.cpp
-SOURCE		SymbianSocket.cpp
+SOURCE		ecmtsocketforwardplugin.cpp
+SOURCE		symbiansocket.cpp
 
 USERINCLUDE	..\inc
 USERINCLUDE     ..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/SocketForward/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/SocketForward/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/SocketForward/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -20,6 +20,6 @@
 DEFAULT
 
 PRJ_MMPFILES
-EcmtSocketForwardPlugin.mmp
+ecmtsocketforwardplugin.mmp
 
 //  End of File  
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/TaskManager/group/EcmtTaskManagerPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/TaskManager/group/EcmtTaskManagerPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/TaskManager/group/EcmtTaskManagerPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -20,7 +20,7 @@
 #include "..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc\EcmtUids.h"
 #include "..\inc\EcmtTaskManagerPluginUids.h"
 
-TARGET          EcmtTaskManagerPlugin.dll
+TARGET          ecmttaskmanagerplugin.dll
 TARGETTYPE      PLUGIN
 UID             KECOM_DLL_UID KTASKMANAGERPLUGIN_DLL_UID
 
@@ -33,8 +33,8 @@
 VENDORID		VID_DEFAULT
 
 SOURCEPATH	..\src
-SOURCE		EcmtTaskManagerPlugin.cpp
-SOURCE		MovingAverage.cpp
+SOURCE		ecmttaskmanagerplugin.cpp
+SOURCE		movingaverage.cpp
 
 USERINCLUDE	..\inc
 USERINCLUDE     ..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/TaskManager/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/TaskManager/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/TaskManager/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -20,6 +20,6 @@
 DEFAULT
 
 PRJ_MMPFILES
-EcmtTaskManagerPlugin.mmp
+ecmttaskmanagerplugin.mmp
 
 //  End of File  
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/Wsock/group/EcmtWsockPlugin.mmp
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/Wsock/group/EcmtWsockPlugin.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/Wsock/group/EcmtWsockPlugin.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -20,15 +20,15 @@
 #include "..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc\EcmtUids.h"
 #include "..\inc\EcmtWsockPluginUids.h"
 
-TARGET          EcmtWsockPlugin.dll
+TARGET          ecmtwsockplugin.dll
 TARGETTYPE      PLUGIN
 UID             KECOM_DLL_UID KWSOCKPLUGIN_UID
 CAPABILITY      CAP_ECOM_PLUGIN
 VENDORID        VID_DEFAULT
 
 SOURCEPATH	..\src
-SOURCE		EcmtWsockPlugin.cpp
-SOURCE		EcmtWsockSettings.cpp
+SOURCE		ecmtwsockplugin.cpp
+SOURCE		ecmtwsocksettings.cpp
 
 USERINCLUDE	..\inc
 USERINCLUDE     ..\..\..\..\sdkconnectivityfw\emuconnectserver\Core\inc
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emulatorplugins/Wsock/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/emulatorplugins/Wsock/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emulatorplugins/Wsock/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -21,5 +21,5 @@
 
 PRJ_MMPFILES
 #ifdef WINS
-EcmtWsockPlugin.mmp
+ecmtwsockplugin.mmp
 #endif //WINS
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emumenubar/gateway/engine/build/Release/GwEngine.lib
Binary file sdkcreationmw/sdkruntimes/emumenubar/gateway/engine/build/Release/GwEngine.lib has changed
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emumenubar/group/EcmtMenubar.mmp
--- a/sdkcreationmw/sdkruntimes/emumenubar/group/EcmtMenubar.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emumenubar/group/EcmtMenubar.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -175,9 +175,9 @@
 // The path here must be relative (as opposed to WIN32_LIBRARY where
 // path must be absolute - how convenient!).
 #ifdef DEBUG_LIBS
-LIBRARY   ..\..\..\..\PublicSDK\sdkcreationmw\sdkcommonutils\mslibs\msvcrtd.lib
+LIBRARY   msvcrtd.lib
 #else
-LIBRARY   ..\..\..\..\PublicSDK\sdkcreationmw\sdkcommonutils\mslibs\msvcrt.lib
+LIBRARY   msvcrt.lib
 #endif
 
 START WINS
@@ -198,7 +198,7 @@
 WIN32_LIBRARY 	\PublicSDK\sdkcreationmw\sdkcommonutils\mslibs\shell32.lib
 WIN32_LIBRARY	\PublicSDK\sdkcreationmw\sdkcommonutils\mslibs\ole32.lib
 
-WIN32_RESOURCE  ..\menubar\ECMT_MENUBAR_RC
+WIN32_RESOURCE  ..\menubar\EcmtMenubar.rc
 
 WIN32_LIBRARY   user32.lib
 WIN32_LIBRARY   kernel32.lib
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/emumenubar/menubar/Push.cpp
--- a/sdkcreationmw/sdkruntimes/emumenubar/menubar/Push.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/emumenubar/menubar/Push.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -38,6 +38,7 @@
 #include <PushMessage.h>
 #include <PushDispatcher.h>
 #include <CPushHandlerBase.h>
+#include <viewclipartner.h>
 
 // We define CWatcherLog locally because CWatcherLog::NewL is not
 // exported from watcher.dll
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/msgsimulation/MsgSession/Src/MsgSessionDll.cpp
--- a/sdkcreationmw/sdkruntimes/msgsimulation/MsgSession/Src/MsgSessionDll.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/msgsimulation/MsgSession/Src/MsgSessionDll.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -22,7 +22,7 @@
 #include <e32std.h>         // GLDEF_C
 #include <e32base.h>
 #include "MsgSession.h"
-#include "sysini.h"
+#include "..\..\..\..\sdkcommonutils\util\Inc\sysini.h"
 
 #define KInitialMessageBufferSize		1024
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/agt/wsocka.cpp
--- a/sdkcreationmw/sdkruntimes/wsock/agt/wsocka.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/agt/wsocka.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,16 +2,13 @@
 * Copyright (c) 2004-2005 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: 
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/group/bld.inf
--- a/sdkcreationmw/sdkruntimes/wsock/group/bld.inf	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/group/bld.inf	Wed Apr 21 09:56:53 2010 +0530
@@ -2,16 +2,13 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
-* Description: 
 *
 */
 // 
@@ -34,5 +31,5 @@
 PRJ_MMPFILES
 wsock.mmp
 wsocka.mmp
-wsocki.mmp
+//wsocki.mmp
 wsock6.mmp
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/group/wsock.mmp
--- a/sdkcreationmw/sdkruntimes/wsock/group/wsock.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/group/wsock.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -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".
 *
@@ -50,11 +50,12 @@
 SOURCE          WinsockServProvider.cpp
 SOURCE          WinsockSelectThread.cpp
 SOURCE          WinsockHostResolver.cpp
-SOURCE          WinsockUtils.cpp
+SOURCE          WinsockUtils.cpp        
+
+//winsockflow.c winsockmcpr.cpp
 
 USERINCLUDE     ..\inc
 MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   \epoc32\include
 SYSTEMINCLUDE   \epoc32\include\comms-infras
 
 LIBRARY         euser.lib
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/group/wsock6.mmp
--- a/sdkcreationmw/sdkruntimes/wsock/group/wsock6.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/group/wsock6.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,16 +2,13 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
-* Description: 
 *
 */
 //
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/group/wsocka.mmp
--- a/sdkcreationmw/sdkruntimes/wsock/group/wsocka.mmp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/group/wsocka.mmp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 //
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/inc/WinsockAgent.h
--- a/sdkcreationmw/sdkruntimes/wsock/inc/WinsockAgent.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/inc/WinsockAgent.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,16 +2,13 @@
 * Copyright (c) 2004-2005 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: 
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/inc/WinsockAgentCallback.h
--- a/sdkcreationmw/sdkruntimes/wsock/inc/WinsockAgentCallback.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/inc/WinsockAgentCallback.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/inc/WinsockAgentFactory.h
--- a/sdkcreationmw/sdkruntimes/wsock/inc/WinsockAgentFactory.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/inc/WinsockAgentFactory.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/inc/WinsockHostResolver.h
--- a/sdkcreationmw/sdkruntimes/wsock/inc/WinsockHostResolver.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/inc/WinsockHostResolver.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,16 +2,13 @@
 * Copyright (c) 2004-2005 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: 
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/inc/WinsockInterface.h
--- a/sdkcreationmw/sdkruntimes/wsock/inc/WinsockInterface.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/inc/WinsockInterface.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -26,7 +26,7 @@
 const TInt KWinsockInterfaceSignature = KWinsockInterfaceUid;
 
 class CWinsockInterface : public CNifIfLink, 
-                          public MNifIfExtendedManagementInterface,
+                         // public MNifIfExtendedManagementInterface,
                           public MNifAgentExtendedManagementInterface
 {
 private:
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/inc/WinsockInterfaceFactory.h
--- a/sdkcreationmw/sdkruntimes/wsock/inc/WinsockInterfaceFactory.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/inc/WinsockInterfaceFactory.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,16 +2,13 @@
 * Copyright (c) 2004-2005 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: 
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/inc/WinsockProtocol.h
--- a/sdkcreationmw/sdkruntimes/wsock/inc/WinsockProtocol.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/inc/WinsockProtocol.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,16 +2,13 @@
 * Copyright (c) 2004-2005 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: 
 *
 */
 
@@ -23,6 +20,9 @@
 #include <es_prot.h>
 #include <time.h>
 #include "WinsockInterface.h"
+#include <es_prot_internal.h>
+#include <nifif_internal.h>
+
 
 // IpHlpApi.dll data structures, needed by GetAdaptersInfo
 typedef struct _WinsockIpAddressString {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/inc/WinsockProtocolFamily.h
--- a/sdkcreationmw/sdkruntimes/wsock/inc/WinsockProtocolFamily.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/inc/WinsockProtocolFamily.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -41,6 +41,7 @@
     // Access to the list of protocols
     static TInt ProtocolCount();
     static void ProtocolNames(TDes& aNetworks);
+    static void ProtocolNamesfownetwork(TDes& aNetworks);
     static const TServerProtocolDesc* ProtocolDesc(TInt aIndex);
 
     // CProtocolFamilyBase
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/inc/WinsockSelectThread.h
--- a/sdkcreationmw/sdkruntimes/wsock/inc/WinsockSelectThread.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/inc/WinsockSelectThread.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/inc/WinsockServProvider.h
--- a/sdkcreationmw/sdkruntimes/wsock/inc/WinsockServProvider.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/inc/WinsockServProvider.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -23,6 +23,7 @@
 #include <es_prot.h>
 #include <in_sock.h>
 #include "WinsockSelectThread.h"
+#include <in_sock_internal.h>
 
 // Comms Framework Migration Guide for NIFs and v1.5 PRTs.doc
 #define V1_5_PRT_INTERFACE
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/inc/WinsockUid.h
--- a/sdkcreationmw/sdkruntimes/wsock/inc/WinsockUid.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/inc/WinsockUid.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/inc/WinsockUtils.h
--- a/sdkcreationmw/sdkruntimes/wsock/inc/WinsockUtils.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/inc/WinsockUtils.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,16 +2,13 @@
 * Copyright (c) 2004-2005 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: 
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/inc/wsock.h
--- a/sdkcreationmw/sdkruntimes/wsock/inc/wsock.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/inc/wsock.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,16 +2,13 @@
 * Copyright (c) 2004-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: 
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/src/WinsockAgent.cpp
--- a/sdkcreationmw/sdkruntimes/wsock/src/WinsockAgent.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/src/WinsockAgent.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -76,6 +76,8 @@
         iDisconnector->Cancel();
         delete iDisconnector;
     }
+    
+  
 }
 
 void CWinsockAgent::ConstructL()
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/src/WinsockAgentCallback.cpp
--- a/sdkcreationmw/sdkruntimes/wsock/src/WinsockAgentCallback.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/src/WinsockAgentCallback.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/src/WinsockAgentFactory.cpp
--- a/sdkcreationmw/sdkruntimes/wsock/src/WinsockAgentFactory.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/src/WinsockAgentFactory.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,16 +2,13 @@
 * Copyright (c) 2004-2005 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: 
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/src/WinsockHostResolver.cpp
--- a/sdkcreationmw/sdkruntimes/wsock/src/WinsockHostResolver.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/src/WinsockHostResolver.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/src/WinsockInterface.cpp
--- a/sdkcreationmw/sdkruntimes/wsock/src/WinsockInterface.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/src/WinsockInterface.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -20,6 +20,7 @@
 #include "wsock.h"
 #include "WinsockInterface.h"
 #include "WinsockProtocolFamily.h"
+#include <es_enum_partner.h>
 
 const TInt KWinsockSubConnectionId = 1;
 const TConnectionType EWinsockConnectionType = EConnectionEthernet;
@@ -250,7 +251,7 @@
     TRACE3("Control(%d,%08X), %d bytes",aLevel,aName,aOption.Length());
 	switch (aLevel)
     {
-    case KCOLInterface:
+  /*  case KCOLInterface:
         switch (aName)
         {
         case KCOGetNifEMIPtr:
@@ -273,7 +274,7 @@
             break;
         }
         break;
-
+*/
     case KCOLAgent:
         switch (aName)
         {
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/src/WinsockInterfaceFactory.cpp
--- a/sdkcreationmw/sdkruntimes/wsock/src/WinsockInterfaceFactory.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/src/WinsockInterfaceFactory.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/src/WinsockProtocol.cpp
--- a/sdkcreationmw/sdkruntimes/wsock/src/WinsockProtocol.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/src/WinsockProtocol.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/src/WinsockProtocolFamily.cpp
--- a/sdkcreationmw/sdkruntimes/wsock/src/WinsockProtocolFamily.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/src/WinsockProtocolFamily.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,16 +2,13 @@
 * Copyright (c) 2004-2005 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: 
 *
 */
 
@@ -52,6 +49,39 @@
     }
 };
 
+#if 0
+
+TWinProtocolDescInit IP(_S("ip"),
+    KAfInet,  KSockStream,  KProtocolInetTcp, KSIStreamBased | KSIInOrder |
+    KSIReliable | KSIGracefulClose | KSIPeekData | KSIUrgentData, 
+    KSocketMessageSizeIsStream, ESocketSupport,
+    SOCK_STREAM, IPPROTO_TCP);
+
+#ifdef WSOCK_IPV6
+
+TWinProtocolDescInit IP6(_S("ip6"),
+    KAfInet6,  KSockStream,  KProtocolInetTcp, KSIStreamBased | KSIInOrder |
+    KSIReliable | KSIGracefulClose | KSIPeekData | KSIUrgentData, 
+    KSocketMessageSizeIsStream, ESocketSupport,
+    SOCK_STREAM, IPPROTO_TCP);
+#endif
+
+// NOTE: the order of protocols must match the order of entries in the
+// ip.tcp.esk file (at the time of thie writing this file was located 
+// in c:\private\101f7989\ESock directory).
+static const TWinProtocolDesc* ipProtocols[] = {
+     &IP,
+#ifdef WSOCK_IPV6
+     &IP6
+#endif // WSOCK_IPV6
+};
+#else
+TWinProtocolDescInit IP(_S("ip"),
+    KAfInet,  KSockStream,  KProtocolInetTcp, KSIStreamBased | KSIInOrder |
+    KSIReliable | KSIGracefulClose | KSIPeekData | KSIUrgentData, 
+    KSocketMessageSizeIsStream, ESocketSupport,
+    SOCK_STREAM, IPPROTO_IP);
+
 TWinProtocolDescInit TCP(_S("tcp"),
     KAfInet,  KSockStream,  KProtocolInetTcp, KSIStreamBased | KSIInOrder |
     KSIReliable | KSIGracefulClose | KSIPeekData | KSIUrgentData, 
@@ -77,6 +107,13 @@
     SOCK_RAW, IPPROTO_ICMPV6);
 
 #ifdef WSOCK_IPV6
+
+TWinProtocolDescInit IP6(_S("ip6"),
+    KAfInet6,  KSockStream,  KProtocolInetTcp, KSIStreamBased | KSIInOrder |
+    KSIReliable | KSIGracefulClose | KSIPeekData | KSIUrgentData, 
+    KSocketMessageSizeIsStream, ESocketSupport,
+    SOCK_STREAM, IPPROTO_IP);
+
 TWinProtocolDescInit TCP6(_S("tcp"),
     KAfInet6,  KSockStream,  KProtocolInetTcp, KSIStreamBased | KSIInOrder |
     KSIReliable | KSIGracefulClose | KSIPeekData | KSIUrgentData, 
@@ -103,16 +140,18 @@
 
 #endif // WSOCK_IPV6
 
+
+
 // NOTE: the order of protocols must match the order of entries in the
 // ip.tcp.esk file (at the time of thie writing this file was located 
 // in c:\private\101f7989\ESock directory).
 static const TWinProtocolDesc* ipProtocols[] = {
-    &TCP,&UDP,&ICMP4,&ICMP6,
+    &IP,&TCP,&UDP,&ICMP4,&ICMP6,
 #ifdef WSOCK_IPV6
-    &TCP6,&UDP6,&ICMP46,&ICMP66
+    &IP6,&TCP6,&UDP6,&ICMP46,&ICMP66
 #endif // WSOCK_IPV6
 };
-
+#endif
 CWinsockProtocolFamily::CWinsockProtocolFamily(TUint aAddrFamily) :
 iAddrFamily(aAddrFamily)
 {
@@ -150,6 +189,34 @@
 }
 
 // Returns comma separated list of protocol names
+void CWinsockProtocolFamily::ProtocolNamesfownetwork(TDes& aProtocols)
+{
+    aProtocols.SetLength(0);
+ /*   for (TInt i=0; i<N(ipProtocols); i++)
+    {
+        TBool alreadyThere = EFalse;
+        for (TInt k=0; k<i; k++)
+        {
+            if (!ipProtocols[i]->iName.Compare(ipProtocols[k]->iName))
+            {
+                alreadyThere = ETrue;
+                break;
+            }
+        }
+        if (!alreadyThere)
+        {
+            if (i > 0) aProtocols.Append(',');
+            aProtocols.Append(ipProtocols[i]->iName);
+        }
+    }*/
+    aProtocols.Append(ipProtocols[0]->iName);
+    aProtocols.Append(',');
+    aProtocols.Append(ipProtocols[5]->iName);
+    
+    TRACE1("ProtocolNames: %S",&aProtocols);
+}
+
+// Returns comma separated list of protocol names
 void CWinsockProtocolFamily::ProtocolNames(TDes& aProtocols)
 {
     aProtocols.SetLength(0);
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/src/WinsockSelectThread.cpp
--- a/sdkcreationmw/sdkruntimes/wsock/src/WinsockSelectThread.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/src/WinsockSelectThread.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/src/WinsockServProvider.cpp
--- a/sdkcreationmw/sdkruntimes/wsock/src/WinsockServProvider.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/src/WinsockServProvider.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/src/WinsockUtils.cpp
--- a/sdkcreationmw/sdkruntimes/wsock/src/WinsockUtils.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/src/WinsockUtils.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/src/wsock.cpp
--- a/sdkcreationmw/sdkruntimes/wsock/src/wsock.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/src/wsock.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
@@ -612,7 +612,7 @@
 
     // We will need the list of networks and the agent ame
     TBuf<KCommsDbSvrMaxFieldLength> networks;
-    CWinsockProtocolFamily::ProtocolNames(networks);
+    CWinsockProtocolFamily::ProtocolNamesfownetwork(networks);
 
     // Column names
     TPtrC IdColumn(COMMDB_ID);
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/wsock/wsock6/wsock6.cpp
--- a/sdkcreationmw/sdkruntimes/wsock/wsock6/wsock6.cpp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/wsock/wsock6/wsock6.cpp	Wed Apr 21 09:56:53 2010 +0530
@@ -2,16 +2,13 @@
 * Copyright (c) 2004-2005 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: 
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/xrpcrt/group/xrpcrt.dsp
--- a/sdkcreationmw/sdkruntimes/xrpcrt/group/xrpcrt.dsp	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/xrpcrt/group/xrpcrt.dsp	Wed Apr 21 09:56:53 2010 +0530
@@ -60,8 +60,8 @@
 TargetName=xrpcrt
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copying release files...
-PostBuild_Cmds=if exist ..\..\..\..\epoc32\release\wins\urel echo ..\..\..\..\epoc32\release\wins\urel\$(TargetName).dll	if exist ..\..\..\..\epoc32\release\wins\urel echo ..\..\..\..\epoc32\release\wins\urel\$(TargetName).lib	if exist ..\..\..\..\epoc32\release\wins\urel copy $(TargetPath) ..\..\..\..\epoc32\release\wins\urel\$(TargetName).dll	if exist ..\..\..\..\epoc32\release\wins\urel copy $(OutDir)\$(TargetName).lib ..\..\..\..\epoc32\release\wins\urel\$(TargetName).lib	if exist ..\..\..\..\epoc32\release\winscw\urel echo ..\..\..\..\epoc32\release\winscw\urel\$(TargetName).dll	if exist ..\..\..\..\epoc32\release\winscw\urel echo ..\..\..\..\epoc32\release\winscw\urel\$(TargetName).lib	if exist ..\..\..\..\epoc32\release\winscw\urel copy $(TargetPath) ..\..\..\..\epoc32\release\winscw\urel\$(TargetName).dll	if exist ..\..\..\..\epoc32\release\winscw\urel copy $(OutDir)\$(TargetName).lib ..\..\..\..\epoc32\release\winscw\urel\$(TargetName).lib	if exist ..\..\..\..\epoc32\release\winscw\udeb echo ..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).dll	if exist ..\..\..\..\epoc32\release\winscw\udeb echo ..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).lib	if exist\
- ..\..\..\..\epoc32\release\winscw\udeb copy $(TargetPath)    ..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).dll	if exist ..\..\..\..\epoc32\release\winscw\udeb copy $(OutDir)\$(TargetName).lib ..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).lib
+PostBuild_Cmds=if exist ..\..\..\..\..\epoc32\release\wins\urel echo ..\..\..\..\..\epoc32\release\wins\urel\$(TargetName).dll	if exist ..\..\..\..\..\epoc32\release\wins\urel echo ..\..\..\..\..\epoc32\release\wins\urel\$(TargetName).lib	if exist ..\..\..\..\..\epoc32\release\wins\urel copy $(TargetPath) ..\..\..\..\..\epoc32\release\wins\urel\$(TargetName).dll	if exist ..\..\..\..\..\epoc32\release\wins\urel copy $(OutDir)\$(TargetName).lib ..\..\..\..\..\epoc32\release\wins\urel\$(TargetName).lib	if exist ..\..\..\..\..\epoc32\release\winscw\urel echo ..\..\..\..\..\epoc32\release\winscw\urel\$(TargetName).dll	if exist ..\..\..\..\..\epoc32\release\winscw\urel echo ..\..\..\..\..\epoc32\release\winscw\urel\$(TargetName).lib	if exist ..\..\..\..\..\epoc32\release\winscw\urel copy $(TargetPath) ..\..\..\..\..\epoc32\release\winscw\urel\$(TargetName).dll	if exist ..\..\..\..\..\epoc32\release\winscw\urel copy $(OutDir)\$(TargetName).lib ..\..\..\..\..\epoc32\release\winscw\urel\$(TargetName).lib	if exist ..\..\..\..\..\epoc32\release\winscw\udeb echo ..\..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).dll	if exist ..\..\..\..\..\epoc32\release\winscw\udeb echo ..\..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).lib	if exist ..\..\..\..\..\epoc32\release\winscw\udeb copy $(TargetPath)\
+   ..\..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).dll	if exist ..\..\..\..\..\epoc32\release\winscw\udeb copy $(OutDir)\$(TargetName).lib ..\..\..\..\..\epoc32\release\winscw\udeb\$(TargetName).lib
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "xrpcrt - Win32 Debug"
@@ -78,7 +78,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XRPCRT_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../NmitShared/src/native" /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XRPCRT_EXPORTS" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../NmitShared/src/native" /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XRPCRT_EXPORTS" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/xrpcrt/include/xrpcrt.h
--- a/sdkcreationmw/sdkruntimes/xrpcrt/include/xrpcrt.h	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/xrpcrt/include/xrpcrt.h	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *
 */
 
diff -r b26acd06ea60 -r ac50fd48361b sdkcreationmw/sdkruntimes/xrpcrt/src/xrpcrt.c
--- a/sdkcreationmw/sdkruntimes/xrpcrt/src/xrpcrt.c	Mon Mar 08 12:09:11 2010 +0530
+++ b/sdkcreationmw/sdkruntimes/xrpcrt/src/xrpcrt.c	Wed Apr 21 09:56:53 2010 +0530
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 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".
 *