--- a/core/com.nokia.carbide.cpp-feature/feature.xml	Thu May 27 16:59:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp-feature/feature.xml	Thu Jun 03 17:44:38 2010 -0500
@@ -561,13 +561,6 @@
          unpack="false"/>
 
    <plugin
-         id="com.nokia.carbide.cpp.leavescan"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="com.nokia.carbide.cpp.ui"
          download-size="0"
          install-size="0"

--- a/core/com.nokia.carbide.cpp.leavescan/.classpath	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

--- a/core/com.nokia.carbide.cpp.leavescan/.project	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.nokia.carbide.cpp.internal.leavescan</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

--- a/core/com.nokia.carbide.cpp.leavescan/META-INF/MANIFEST.MF	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Leavescan Plug-in
-Bundle-SymbolicName: com.nokia.carbide.cpp.leavescan; singleton:=true
-Bundle-Version: 1.4.0.qualifier
-Bundle-Activator: com.nokia.carbide.cpp.internal.leavescan.LeavescanPlugin
-Bundle-Vendor: Nokia
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt.core,
- com.nokia.carbide.cdt.builder,
- com.nokia.carbide.cpp.sdk.core
-Bundle-ActivationPolicy: lazy

--- a/core/com.nokia.carbide.cpp.leavescan/book.css	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-/*	
-	Nokia DPT Tools CSS
-	Nokia C++ Development Tools Austin
-	Date: 2005/11/04
-	
-*/
-
-/*	Add whitespace around entire display to avoid crowding edges of view 	*/
-/* 	20070523-Removed top margin size to close gap between location breadcrumbs and page title	*/
-html {
-	margin: 0px 10px 10px 10px;
-	}
-
-/* 	Set default font to serif style, 12-pt and plain	*/
-body, p, table {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-/*	Use sans-serif fonts for all title styles	*/
-h1, h2, h3, h4, h5, h6, strong, em {
-	font-family: Arial, Helvetica, sans-serif;
-	color: #000000;	
-	}
-
-h1	{ font-size:20px }
-h2	{ font-size:18px }
-h3	{ font-size:16px }
-h4	{ font-size:14px }
-h5	{ font-size:12px }
-h6	{ font-size:10px }
-
-/*	For headlines at the top of a view, add space	*/
-/*	20070522-added gradiant to background to update visual style of docs	*/
-h1, h2, h3 {
-	background-image: url(html/images/green_fade_left_68_165_28.png);
-	background-repeat: no-repeat;
-	padding:10px 0px 10px 12px;	
-	}
-
-li	{
-	margin-bottom:8px;	
-	margin-top:8px;
-	}
-
-/*	Footer includes space and a gray line above the company logo	*/
-#footer {
-	padding-top:10px;
-	margin-top:20px;
-	border-top:1px solid #999;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	color: #03C;	
-	}
-
-.listing	{
-	font-family: "Courier New", Courier, mono;
-	color: #009;
-	background-color: #EEE;
-	padding: 10px 0px;
-	margin: 10px 0px;
-	}
-
-.code, pre	{
-	font-family: "Courier New", Courier, mono;
-	font-size: 11px;
-	color: #333;
-	}
-
-.step	{
-	/* background-color: #EEE; */
-	/* margin: 10px 0px; */
-	color: #333;
-	border-bottom:2px solid #EEE;
-	}
-	
-.substep	{
-	background-color: #EEE;
-	}
-	
-	
-/*	Figure/Listing/Table titles are centered and gray	*/
-p.table {
-	color: #999;
-	font-weight: bold;
-	padding-top: 5px;
-	}
-
-table	{
-	border: solid #999 1px;
-	table-layout: auto;
-	font-size: 12px;
-	}
-
-td, th	{
-	border: solid #999 1px;
-	padding: 5px;
-	vertical-align:top;
-	}
-	
-/*	20070522-replaced gray with green background to match gradiant color for title	*/
-th	{
-	background-color:#ACD79B;
-	/* background-color:#999;
-	color:#FFF; */
-	}
-
-div.ol.p	{
-	margin-left: 3em;
-	}
-
-/* Make all ordered/unordered list items appear in bold gray */
-div ol > li, div ul > li {
-	font-weight:bold;
-	color: #333;
-	}
-
-div ol > p, div ul > p, div li > p {
-	font-weight:normal;
-	}
-	
-/* Make all H4 and H5 items appear in bold gray against a light green background */
-div h5, div h4	{
-	padding:5px 0px 5px 12px;	
-	background-color:#ECFBEA;
-	/* background-color: #EEE; */
-	font-weight:bold;
-	color: #333;
-	}
-	
-	
-/*	Notes stand out using a light top & bottom borders with dark gray text	*/
-p.note {
-	/* color: #03C; */
-	/* background-color: #FFFF99; */
-	color: #333;
-	padding: 5px;
-	margin-left: 1em;
-	margin-right: 1em;
-	border-top: solid #BBB thin;
-	border-bottom: solid #BBB thin;
-	}
-
-	
-/*	Figure/Listing/Table titles are centered and gray	*/
-p.figure {
-	color: #333;
-	text-align: center;
-	font-weight: bold;
-	}
-
-/*	highly visible red background and white text for things that need fixing before release	*/
-/*  SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
-.fix	{
-	background-color: red;
-	font-weight: bold;
-	color: white;
-	}
-
-.question	{
-	font-style:italic;
-	font-weight:bold;
-	color: #555;
-	}
-	
-.titleSmall {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	}
-
-	
-.plain {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-style: normal;
-	line-height: normal;
-	font-weight: normal;
-	font-variant: normal;
-	color: #000000;
-	text-decoration: none;
-	}
-
-a:link 		{ color: #0033CC }
-a:visited	{ color: #555555 }
-a:hover 	{ color: #0033CC }
-

--- a/core/com.nokia.carbide.cpp.leavescan/build.properties	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               icons/,\
-               html/

--- a/core/com.nokia.carbide.cpp.leavescan/html/cheatsheets/getStarted_tool.xml	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<cheatsheet title="Getting Started with TOOL NAME">
-	<intro>
-		<description>
-		Add TOOL NAME introduction message here.
-		</description> 
-	</intro> 
-	
-	<item title="STEP 1" href="/com.nokia.carbide.cpp.leavescan/html/reference/reference.htm" skip="true" >
-		<description>
-		Add STEP 1 info here and link to more indepth step information.
-		</description>
-	</item>
-
-	<item title="STEP 2" href="/com.nokia.carbide.cpp.leavescan/html/reference/reference.htm" skip="true" >
-		<description>
-		Add additional STEPs as required and link to more indepth step information.
-		</description>
-	</item>
-
-
-</cheatsheet>
\ No newline at end of file

--- a/core/com.nokia.carbide.cpp.leavescan/html/concepts/concepts.htm	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Concepts</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h1>Introduction</h1>
-<p>LeaveScan is a useful tool that can be used regularly against your source code. LeaveScan is a command-line utility developed by Symbian Ltd that verifies that your code respects the naming conventions for leaving functions.</p>
-<p>LeaveScan checks that all functions which have the potential to leave are named according to the Symbian OS convention, with a trailing L. Any function that Leaves, or calls a function that Leaves (other than in a TRAP harness), must have a name ending in L. LeaveScan can be used on your source to indicate areas of code where you may have forgotten to use the naming convention.      By revealing where leaves may occur but are not indicated by the function name, it highlights potential bugs and gives you an opportunity to fix the problem and ensure that your code handles any leaves correctly. </p>
-<h4>Related Topic</h4>
-<p><a href="../reference/reference.htm">How it Works</a></p>
-<p><a href="../tasks/tasks.htm">Using Leavescan</a> </p>
-<div class="step">
-  <p><img src="../images/nokia_copyright.png" alt="copyright" width="280" height="21"></img></p>
-</div>
-</body>
-</html>

Binary file core/com.nokia.carbide.cpp.leavescan/html/images/green_fade_left_68_165_28.png has changed

Binary file core/com.nokia.carbide.cpp.leavescan/html/images/nokia_copyright.png has changed

--- a/core/com.nokia.carbide.cpp.leavescan/html/index.xml	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.index"?>
-
-	<!-- INDEX INSTRUCTIONS
-	
-	Use the index.xml file to define the index entries for the plugin's 
-	help contents. In Eclipse 3.2 and beyond an Index tab appears in the Help
-	viewer making it possible for user to more easily locate subjects of
-	interest to them.
-		
-	In brief, every file used in the help documentation should have at least one
-	associated index entry for it. Ideally, it's simple to make two entries per
-	page by simply re-wording the subject slightly. For example, a view could
-	be indexed twice like this, 1) Breakpoint view, and 2) Views/Breakpoint.
-		
-	-->
-
-
-<index>
-
-	<!-- AAAAAAAA -->
-
-	<!--
-	<entry keyword="--index topic here--" >
-		<topic href="--url to html file here" />
-	</entry>
-	-->
-
-	<!-- BBBBBBBB -->
-	<!-- CCCCCCCC -->	
-	<!-- DDDDDDDD -->	
-	<!-- EEEEEEEE -->	
-	<!-- FFFFFFFF -->
-	<!-- GGGGGGGG -->	
-	<!-- HHHHHHHH -->	
-	<!-- IIIIIIII -->
-	<!-- JJJJJJJJ -->
-	<!-- KKKKKKKK -->
-	<!-- LLLLLLLL -->
-	<entry keyword="Leavescan" >
-	 <topic href="html/concepts/concepts.htm" />
-	</entry>
-	<!-- MMMMMMMM -->
-	<!-- NNNNNNNN -->
-	<!-- OOOOOOOO -->
-	<!-- PPPPPPPP -->
-	<!-- QQQQQQQQ -->
-	<!-- RRRRRRRR -->
-	<!-- SSSSSSSS -->
-	<!-- TTTTTTTT -->
-	<!-- UUUUUUUU -->
-	<!-- VVVVVVVV -->
-	<!-- WWWWWWWW -->
-	<!-- XXXXXXXX -->
-	<!-- YYYYYYYY -->
-	<!-- ZZZZZZZZ -->
-
-</index>
-

--- a/core/com.nokia.carbide.cpp.leavescan/html/nokia.css	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-/*	Nokia DPT Tools CSS
-	Nokia DPT Austin
-	Date: 2006/11/02
-*/
-
-/*	Add whitespace around entire display to avoid crowding edges of view 	*/
-html {
-	margin: 10px;
-	/* fixes gray backgrounds when displayed in external browsers */
-	background-color:#FFFFFF;
-	}
-
-/* 	Set default font to serif style, 12-pt and plain	*/
-body {
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 12px;
-	font-weight: plain;
-}
-
-/*	Use sans-serif fonts for all title styles and Nokia blue	*/
-h1, h2, h3, h4, h5, h6, strong, em {
-	font-family: Arial, Helvetica, sans-serif;
-	color: #333;	
-	}
-
-strong{
-	color: #333;	
-	}
-
-/*	For headlines at the top of a view, add space and a gray line underneath	*/
-h2, h3	{
-	padding:10px 0px;	
-	border-bottom:1px solid #BBB;
-	}
-	
-li	{
-	margin-bottom:8px;	
-	margin-top:8px;	
-	}
-
-
-/*	Footer includes space and a gray line above the company logo	*/
-#footer {
-	padding-top:10px;
-	margin-top:20px;
-	border-top:1px solid #999;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #333;	
-	}
-
-.listing	{
-	font-family: "Courier New", Courier, mono;
-	color: #009;
-	background-color: #EEE;
-	padding: 10px 0px;
-	margin: 10px 0px;
-	}
-
-.code, pre	{
-	font-family: "Courier New", Courier, mono;
-	font-size: 12px;
-	color: #333;
-	}
-
-.step	{
-	/* background-color: #EEE; */
-	/* margin: 10px 0px; */
-	color: #333;
-	border-bottom:2px solid #EEE;
-	}
-	
-.substep	{
-	background-color: #EEE;
-	}
-	
-	
-/*	Figure/Listing/Table titles are centered and gray	*/
-p.table {
-	color: #999;
-	font-weight: bold;
-	padding-top: 5px;
-	}
-
-table	{
-	border: 1px solid #999;
-	table-layout: auto;
-	}
-
-td, th	{
-	border: 1px solid #999;
-	padding: 5px;
-	vertical-align:top;
-	}
-	
-th	{
-	background-color:#999;
-	color:#FFF;
-	}
-
-div.ol.p	{
-	margin-left: 3em;
-	}
-
-/* Make all ordered/unordered list items appear in bold gray */
-div ol > li, div ul > li {
-	font-weight:bold;
-	color: #333;
-	}
-	
-/* Make all H4 and H5 items appear in bold gray against a light gray background */
-div h5, div h4	{
-	padding: 5px;
-	background-color: #EEE;
-	font-weight:bold;
-	color: #333;
-	}
-	
-	
-/*	Notes stand out using a light top & bottom borders with dark gray text	*/
-p.note {
-	/* color: #03C; */
-	/* background-color: #FFFF99; */
-	color: #333;
-	padding: 5px;
-	margin-left: 1em;
-	margin-right: 1em;
-	border-top:1px solid #BBB;
-	border-bottom:1px solid #BBB;
-}
-
-	
-/*	Figure/Listing/Table titles are centered and gray	*/
-p.figure {
-	color: #333;
-	text-align: center;
-	font-weight: bold;
-}
-
-/*	red background and white text for things that need fixing before release	*/
-.fix	{
-	background-color: red;
-	font-weight: bold;
-	color: white;
-	}
-
-.question	{
-	font-style:italic;
-	font-weight:bold;
-	color: #333;
-	}
-	
-.titleSmall {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	}
-
-.copyrightStatement {
-	font-size: 11px;
-	color:			#006699;             /* Symbian blue */
-	}
-
-div.Footer table, div.Footer td, div.Footer th {
-	border: 0px none #000;
-	}

--- a/core/com.nokia.carbide.cpp.leavescan/html/reference/reference.htm	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>References</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>How it Works </h2>
-<p>LeaveScan works by examining each line of source code and checking that functions which do not terminate in L cannot leave. However, there are a few functions (more accurately, operators) in Symbian OS that may leave but cannot have an L suffix (such as <strong>operator&lt;&lt;</strong> and <strong>operator&gt;&gt;</strong> for <strong>RWriteStream</strong> and <strong>RReadStream</strong> respectively).</p>
-<p>The naming convention cannot be applied appropriately to operators and, unfortunately, LeaveScan does not have the logic needed to recognize operators that may leave. When you use operators that you know have the potential to leave, you&rsquo;ll have to remember to check this code by sight yourself.</p>
-<p>LeaveScan also checks functions which do have a trailing L to see if they really can leave. If functions are encountered which do not leave, LeaveScan raises a warning. However, this scenario can be perfectly valid, for example, when implementing an abstract function such as CActive::RunL(), some implementations may leave but others may not.</p>
-<p>LeaveScan ignores calls in trapped functions, commented out code, i.e. // and /* and */. It also checks for calls to LD, LC and LX functions as well as normal L functions. It also checks for User::Leave(), ELeave, User::LeaveIfError().</p>
-<p>&nbsp;</p>
-<div class="step">
-  <p><img src="../images/nokia_copyright.png" alt="copyright" width="280" height="21"></img></p>
-</div>
-</body>
-</html>

--- a/core/com.nokia.carbide.cpp.leavescan/html/tasks/tasks.htm	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Tasks</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Using Leavescan </h2>
-<p>LeaveScan preferences can be defined in Carbide.c++ by selecting <strong>Windows &gt; Preferences...</strong> and expanding the Carbide Extensions group and selecting <strong>Leavescan preferences</strong>. Specify the path to the leavescan command to avoid calling the leavescan stub.</p>
-<p>LeaveScan can  also be run from the command line to scan whole directories and output to a file. You can use the <strong>for</strong> command to scan directories. For example, <strong>for /R %i in (*.cpp) do leavescan %i &gt;&gt; leavescan.out</strong>. This will scan all cpp files in or below the current directory and places the result in leavescan.out.</p>
-<div class="step">
-  <p><img src="../images/nokia_copyright.png" alt="copyright" width="280" height="21"></img></p>
-</div>
-</body>
-</html>

--- a/core/com.nokia.carbide.cpp.leavescan/html/tocConcepts.xml	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc>
-	
-	<!-- Enter topic entries here for Concepts section of help -->
-	
-	<topic label="Introduction" href="html/concepts/concepts.htm" />
-	
-</toc>

--- a/core/com.nokia.carbide.cpp.leavescan/html/tocReference.xml	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc>
-	
-	<!-- Enter topic entries here for References section of help -->
-	
-	<topic label="How it Works" href="html/reference/reference.htm" />
-	
-</toc>

--- a/core/com.nokia.carbide.cpp.leavescan/html/tocTasks.xml	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc>
-	
-	<!-- Enter topic entries here for Tasks section of help -->
-	
-	<topic label="Using Leavescan" href="html/tasks/tasks.htm" />
-	
-</toc>

--- a/core/com.nokia.carbide.cpp.leavescan/html/toolTOC.xml	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<!-- 
-	Links tool docs to main TOC for Carbide help in the defined location. 
-	NOTE: Tool name seems to be ignored here for display purposes but needed to
-	make the link_to section work.
--->
-
-<toc label="TOOL NAME" 
-	link_to="../com.nokia.carbide.cpp/nokiaTOC.xml#anchorCarbideMisc" >
-
-	<!--
-		Define the TOOL NAME as it should appear in the TOC. The tool.htm page
-		is the cover page for the tool help.
-	-->
-	<topic label="TOOL NAME" href="html/tool.htm" >
-		
-	   <!--
-		   Following the Eclipse guidelines, the tool help is arranged as Concepts,
-		   References, and Tasks. Each has their own associated XML file to make it
-		   easy to edit each section as well as an overview page.
-	   -->
-	   <topic label="Concepts" 
-		   href="html/concepts/concepts.htm" >
-		   <link toc="tocConcepts.xml" />
-	   </topic>
-			  
-	   <topic label="References" >
-		   href="html/reference/references.htm" >
-		   <link toc="tocReference.xml" />
-	   </topic>
-		   
-	   <topic label="Tasks" >
-		   href="html/tasks/tasks.htm" >
-		   <link toc="tocTasks.xml" />
-	   </topic>
-		
-	</topic>
-		
-</toc>
\ No newline at end of file

Binary file core/com.nokia.carbide.cpp.leavescan/icons/Run_Leavescan.png has changed

--- a/core/com.nokia.carbide.cpp.leavescan/plugin.xml	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-	        adaptable="true"
-            objectClass="org.eclipse.core.resources.IFile"
-            id="com.nokia.carbide.cpp.leavescan.runLeaveScan">
-             <!-- Only show action for Carbide.c++ projects. The leavescan action utilizes some Carbide.c++ specific APIs -->
-             <visibility>
-               <and>
-                 <objectState
-                    name="projectNature"
-                    value="com.nokia.carbide.cdt.builder.carbideCPPBuilderNature"/>
-                  <or>
-                    <objectState
-                       name="extension"
-                       value="cpp"
-                       />
-                     <objectState
-                        name="extension" 
-                        value="cp"
-                        />
-                  </or>
-               </and>
-              </visibility>
-         <action
-               label="Run Leavescan"
-               class="com.nokia.carbide.cpp.internal.leavescan.popup.actions.LeavescanAction"
-               menubarPath="buildGroup"
-               enablesFor="+"
-               icon="icons/Run_Leavescan.png"
-               id="com.nokia.carbide.cpp.leavescan.leaveScanAction">
-         </action>
-      </objectContribution>
-   </extension>
-	
-	<extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-	        adaptable="true"
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.mmp"
-            id="com.nokia.carbide.cpp.leavescan.runLeaveScanOnMMP">
-             <!-- Only show action for Carbide.c++ projects. The leavescan action utilizes some Carbide.c++ specific APIs -->
-             <visibility>
-              <objectState
-                 name="projectNature"
-                 value="com.nokia.carbide.cdt.builder.carbideCPPBuilderNature"/>
-              </visibility>
-         <action
-               label="Run Leavescan on Project MMP"
-               class="com.nokia.carbide.cpp.internal.leavescan.popup.actions.LeavescanAction"
-               menubarPath="buildGroup"
-               enablesFor="1"
-               icon="icons/Run_Leavescan.png"
-               id="com.nokia.carbide.cpp.leavescan.leaveScanActionOnMMP">
-         </action>
-      </objectContribution>
-   </extension>
-	
-	<extension
-         id="LeaveScanErrorParser"
-         name="LeaveScan Error Parser"
-         point="org.eclipse.cdt.core.ErrorParser">
-      <errorparser
-            class="com.nokia.carbide.cpp.internal.leavescan.error.parsers.LeaveScanErrorParser">
-      </errorparser>
-    </extension>
-    
-    <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            name="Leavescan Preferences"
-            class="com.nokia.carbide.cpp.internal.leavescan.ui.LeavescanPreferences"
-            category="com.nokia.carbide.cpp.preferences.ExtensionsPreferencesPage"
-            id="com.nokia.carbide.cpp.leavescan.ui.LeavescanPreferences">
-      </page>
-   </extension>
-   
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <initializer
-            class="com.nokia.carbide.cpp.internal.leavescan.ui.LeavescanPreferenceInitializer">
-      </initializer>
-   </extension>
-   <extension
-         point="org.eclipse.ui.startup">
-   </extension>
-
-
-	<!-- Carbide Tool Help extension -->
-	<!-- Uncomment to add content assist material to the Help system -->
-	<!--
-	<extension point="org.eclipse.help.toc">
-		<toc
-			file="html/toolTOC.xml"
-			primary="true"/>
-	</extension>
-    -->
-	
-	<!-- Carbide.c++ cheatsheets extension -->
-	<!-- Uncomment to add cheatsheet content -->
-	
-	<!-- Rename the "id" as appropriate for your tool -->
-	<!--
-	<extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">
-		<cheatsheet
-			category="com.nokia.carbide.ide.cheatsheets"
-			contentFile="html/cheatsheets/getStarted_tool.xml"
-			id="com.nokia.carbide.cpp.leavescan.tool"
-			name="Tool Example"/>
-	</extension>
-    -->
-	
-	<!-- CONTEXT IDs for CONTEXTUAL HELP in windows, dialogs, and views -->
-	<!-- Uncomment to add F1 user assistance content -->
-	<!--
-	<extension point="org.eclipse.help.contexts" >
-
-       <contexts file="html/context_help/org_eclipse_debug_ui.xml"
-       		plugin="org.eclipse.debug.ui" />
-
-	</extension>
-	-->
-	
-	<!-- Keyword Indexing support -->
-	<!-- Uncomment to add keyword index to Help system -->
-	<!--
-	<extension point="org.eclipse.help.index" >
-        <index file="html/index.xml"/>
-    </extension>
-	-->
-
-</plugin>

--- a/core/com.nokia.carbide.cpp.leavescan/src/com/nokia/carbide/cpp/internal/leavescan/LeavescanPlugin.java	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
-* Copyright (c) 2007-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.
-*
-*/
-package com.nokia.carbide.cpp.internal.leavescan;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IStartup;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class LeavescanPlugin extends AbstractUIPlugin implements IStartup {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "com.nokia.carbide.cpp.leavescan";
-
-	// The shared instance
-	private static LeavescanPlugin plugin;
-	
-	private static IPreferenceStore prefsStore;
-	
-	/**
-	 * The constructor
-	 */
-	public LeavescanPlugin() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		getLeaveScanPrefsStore();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static LeavescanPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-	
-	public static IPreferenceStore getLeaveScanPrefsStore(){
-		if (prefsStore == null){
-			prefsStore = getDefault().getPreferenceStore();
-		}
-		
-		return prefsStore;
-	}
-
-	public void earlyStartup() {
-	}
-	                                              
-}

--- a/core/com.nokia.carbide.cpp.leavescan/src/com/nokia/carbide/cpp/internal/leavescan/error/parsers/LeaveScanErrorParser.java	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
-* Copyright (c) 2007-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.
-*
-*/
-package com.nokia.carbide.cpp.internal.leavescan.error.parsers;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.cdt.core.ErrorParserManager;
-import org.eclipse.cdt.core.IErrorParser;
-import org.eclipse.cdt.core.IMarkerGenerator;
-import org.eclipse.core.resources.IFile;
-
-public class LeaveScanErrorParser implements IErrorParser {
-
-	private Pattern leaveScanErrorPattern = Pattern.compile("(.*)?(\\((\\d+)\\))\\s+:\\s+(.*)"); //$NON-NLS-1$;
-	private Pattern leaveScanWarningPattern = Pattern.compile("(.*)?(\\((\\d+)\\))\\s+:\\s+Warning\\s+(.*)"); //$NON-NLS-1$;
-	
-
-	
-	public LeaveScanErrorParser() {
-	}
-
-	public boolean processLine(String line, ErrorParserManager errorParserManager) {
-		// Known patterns.
-		//
-		// (a) warning
-		// <file>(<line number>) : Warning - <message>
-		// e.g..... 
-		// C:\Symbian\UIQ3SDK\Examples\UIQ\QMyDirectory\Src\MyDirectoryAppUi.cpp(211) : Warning - CMyDirectoryAppUi::DoMergeCategoriesL appears to contain no leavers.
-		//
-		//
-		// (b) error
-		// <file>(<line number>) : <message>
-		// e.g....
-		// C:\Symbian\9.1\S60_3rd_MR\Examples\Basics\StaticDLL\CreateStaticDLL.cpp(40) : CMessenger::Construct Calls a function that can leave. QUALIFIED WITH-> // copy given string into own descriptor
-
-		Matcher warningMatcher = leaveScanWarningPattern.matcher(line);
-		if (warningMatcher.matches()) {
-			String fileName = warningMatcher.group(1);
-			IFile file = errorParserManager.findFileName(fileName);
-			String lineNumberStr = warningMatcher.group(3);
-			int lineNumber = Integer.parseInt(lineNumberStr);
-			String msgDescription = warningMatcher.group(4);
-			msgDescription = msgDescription.trim();
-			errorParserManager.generateMarker(file, lineNumber,	msgDescription, IMarkerGenerator.SEVERITY_WARNING, null);
-			return true;
-		}
-		
-		Matcher errorMatcher = leaveScanErrorPattern.matcher(line);
-		if (errorMatcher.matches()) {
-			String fileName = errorMatcher.group(1);
-			IFile file = errorParserManager.findFileName(fileName);
-			String lineNumberStr = errorMatcher.group(3);
-			int lineNumber = Integer.parseInt(lineNumberStr);
-			String msgDescription = errorMatcher.group(4);
-			msgDescription = msgDescription.trim();
-			errorParserManager.generateMarker(file, lineNumber,	msgDescription, IMarkerGenerator.SEVERITY_ERROR_RESOURCE, null);
-			return true;
-		}
-		
-		// check for other process errors
-		if (line.toLowerCase().contains("the system cannot find the path specified") ||
-			line.toLowerCase().contains("is not supported in this release") ||
-			line.toLowerCase().contains("is not recognized as an internal or external command")){
-			errorParserManager.generateMarker(null, -1,	"Cannot run leavescan. Check that leavescan is on your PATH or go to the Carbide.c++ > Leavescan Preferences and set the Leavescan Directory. Leavescan.exe can be found at: http://www3.symbiandevnet.com/faq.nsf/0/f3765f69e4fb9baa80256a570051b952?OpenDocument", IMarkerGenerator.SEVERITY_ERROR_BUILD, null);
-
-		}
-
-		return false;
-	}
-	
-}

--- a/core/com.nokia.carbide.cpp.leavescan/src/com/nokia/carbide/cpp/internal/leavescan/popup/actions/LeavescanAction.java	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,308 +0,0 @@
-/*
-* Copyright (c) 2007-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.
-*
-*/
-package com.nokia.carbide.cpp.internal.leavescan.popup.actions;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
-import com.nokia.carbide.cdt.builder.EpocEngineHelper;
-import com.nokia.carbide.cdt.builder.builder.CarbideCPPBuilder;
-import com.nokia.carbide.cdt.builder.builder.CarbideCommandLauncher;
-import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
-import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo;
-import com.nokia.carbide.cpp.internal.leavescan.LeavescanPlugin;
-import com.nokia.carbide.cpp.internal.leavescan.ui.LeavescanPreferenceConstants;
-
-public class LeavescanAction implements IObjectActionDelegate {
-	
-	private ISelection selection;
-	
-	// id definied from plugin.xml
-	public static final String LEAVE_SCAN_ACTION_POP_UP_ID = "com.nokia.carbide.cpp.leavescan.leaveScanAction";
-	public static final String LEAVE_SCAN_ACTION_MMP_POP_UP_ID = "com.nokia.carbide.cpp.leavescan.leaveScanActionOnMMP";
-
-	
-	/**
-	 * Constructor for Action1.
-	 */
-	public LeavescanAction() {
-		super();
-	}
-
-	/**
-	 * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		if (action.getId().equals(LEAVE_SCAN_ACTION_POP_UP_ID)){
-			// scan the selected source file(s)
-			handleLeaveScanAction(action);
-		} else if (action.getId().equals(LEAVE_SCAN_ACTION_MMP_POP_UP_ID)){
-			// scan the selected source file(s)
-			handleLeaveScanActionOnMMP(action);
-		}
-	}
-
-	/**
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.selection = selection;
-	}
-	
-	/**
-	 * Run leavescan on source file selection(s)
-	 * @param action
-	 */
-	private void handleLeaveScanAction(IAction action){
-		// get the project each file belongs to...
-		HashMap<IProject, List<IPath>> projectSourceMap = new HashMap<IProject, List<IPath>>();
-		if (selection != null && selection instanceof IStructuredSelection) {
-			Iterator iter = ((IStructuredSelection)selection).iterator();
-			while (iter.hasNext()) {
-				Object selItem = iter.next();
-				if (selItem instanceof IFile) {
-					IProject currProject = ((IResource)selItem).getProject();
-					if (projectSourceMap.get(currProject) == null){
-						// project is not a key, create a new key/value entry
-						List<IPath> pathList = new ArrayList<IPath>();
-						pathList.add(((IResource)selItem).getLocation());
-						projectSourceMap.put(currProject, pathList);
-
-					} else {
-						// this key already exists, update the source list
-						List<IPath> pathList  = projectSourceMap.get(currProject);
-						pathList.add(((IResource)selItem).getLocation());
-						projectSourceMap.put(currProject, pathList);  // 2+ paths exist for this project
-					}
-				}
-			}
-		}
-		
-		// Get the leavescan preferences...
-		IPreferenceStore store = LeavescanPlugin.getLeaveScanPrefsStore();
-		final boolean noisyOutput =  store.getBoolean(LeavescanPreferenceConstants.LEAVESCAN_NOISY_OUTPUT);
-		final String leaveScanFolder = store.getString(LeavescanPreferenceConstants.LEAVESCAN_FOLDER);
-		
-		for (final IProject project : projectSourceMap.keySet()){
-			final List<IPath> finalPathList = projectSourceMap.get(project);	
-			// Run a job on each project. The arguments for leavescan is:
-			// leavescan [-h|-n|-v|-N] <iFilename.cpp> [<iFilename.cpp> ...]
-			//
-			//            -h: This help.
-			//            -n: Noisy output - provides diagnostics (if available).
-			//            -N: Very noisy output - provides diagnostics (if available).
-			//            -v: Displays version (for build & automation systems).
-			Job buildJob = new Job("Running Leave Scan on Project: " + project.getName()) { //$NON-NLS-1$
-				protected IStatus run(IProgressMonitor monitor){
-					
-					final String[] leaveScanParserIds = new String[] {
-				        "com.nokia.carbide.cpp.leavescan.LeaveScanErrorParser"
-				        };
-					
-			        ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project);
-			        try {
-			        	CarbideCPPBuilder.removeAllMarkers(project);
-			        } catch (CoreException e){
-			        	e.printStackTrace();
-			        }
-			        IPath workingDir = cpi.getINFWorkingDirectory();
-					CarbideCommandLauncher cmdLauncher = new CarbideCommandLauncher(project, monitor, leaveScanParserIds, workingDir);
-					cmdLauncher.startTimingStats();
-					int fileCount = 1;
-					int listSize = finalPathList.size();
-					for (IPath currPath : finalPathList){
-						
-						//System.out.print("\nProject: " + project.getName() + " | Source File: " + currPath.toOSString()); // Debug
-						
-						ICarbideBuildConfiguration defaultConfig = cpi.getDefaultConfiguration();
-						monitor.beginTask("Running leavescan.", 100);
-						
-						double dWorked = ((double)fileCount / (double)listSize) * 100;
-						monitor.worked((int)dWorked);
-						String taskName = "Running leavescan on file \"" + currPath.toOSString() + "\" for project \"" + project.getName() + ".";
-						monitor.setTaskName(taskName);
-						cmdLauncher.writeToConsole("\n***" + taskName + "\n");
-						// Construct the leavescan arguments
-						List<String> leaveScanArgList = new ArrayList<String>();
-						leaveScanArgList.add("/c");
-						
-						if (leaveScanFolder.length() > 0){
-							leaveScanArgList.add(leaveScanFolder + "leavescan.exe");
-						} else {
-							leaveScanArgList.add("leavescan.exe");
-						}
-
-						if (noisyOutput) {
-							leaveScanArgList.add("-N");
-						} else {
-							leaveScanArgList.add("-n");
-						}
-						
-						leaveScanArgList.add(currPath.toOSString());
-						String[] args = new String[leaveScanArgList.size()];
-						leaveScanArgList.toArray(args);
-						cmdLauncher.showCommand(true);
-						
-						// executeCommand, a special extension to the regular execute which will handle
-						// writing the console output, error parsing, and creating error markers.
-						cmdLauncher.executeCommand(CarbideCommandLauncher.getCmdExeLocation(), args, CarbideCPPBuilder.getResolvedEnvVars(defaultConfig), workingDir);
-						
-						fileCount++;
-					}
-					cmdLauncher.writeToConsole(cmdLauncher.getTimingStats());
-					return new Status(IStatus.OK, LeavescanPlugin.PLUGIN_ID, IStatus.OK, "LeaveScan Complete", null); 
-				}
-			};
-			
-			buildJob.setPriority(Job.BUILD);
-			buildJob.schedule();
-		}
-	}
-	
-	/**
-	 * Run leavescan on all the sources in the current project MMP file.
-	 * The sources files will be build configuration specifc (i.e. MMP is preprocessed) to return
-	 * platform specific source list.
-	 * @param action - The IAction interface from the eclipse core
-	 */
-	private void handleLeaveScanActionOnMMP(IAction action){
-		// get the project each file belongs to...
-		IProject project = null;
-		IPath mmpFile = null;
-		if (selection != null && selection instanceof IStructuredSelection) {
-			Iterator iter = ((IStructuredSelection)selection).iterator();
-			while (iter.hasNext()) {
-				Object selItem = iter.next();
-				if (selItem instanceof IFile) {
-					project = ((IResource)selItem).getProject();
-					mmpFile = ((IResource)selItem).getLocation();
-					//System.out.print("\nMMP File Selected: " + ((IResource)selItem).getLocation());
-				}
-			}
-		}
-		
-		if (project == null){
-			return;
-		}
-		
-		// Get the leavescan preferences...
-		IPreferenceStore store = LeavescanPlugin.getLeaveScanPrefsStore();
-		final boolean noisyOutput =  store.getBoolean(LeavescanPreferenceConstants.LEAVESCAN_NOISY_OUTPUT);
-		final String leaveScanFolder = store.getString(LeavescanPreferenceConstants.LEAVESCAN_FOLDER);
-		
-		ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project);
-		if (cpi.getDefaultConfiguration() == null)
-        	return;
-		
-		List<IPath> sourceFileList = new ArrayList<IPath>();
-		// Get the list of source files for the default configuration this MMP is associated with.
-		sourceFileList = EpocEngineHelper.getSourceFilesForConfiguration(cpi.getDefaultConfiguration(), mmpFile);
-		
-		final List<IPath> finalPathList = new ArrayList<IPath>(sourceFileList);	
-		final IProject finalProject = project;
-		final Path finalMMPPath = new Path(mmpFile.toOSString());
-		Job buildJob = new Job("Running Leave Scan on MMP: " + mmpFile.toOSString()) { //$NON-NLS-1$
-			protected IStatus run(IProgressMonitor monitor){
-				
-				final String[] leaveScanParserIds = new String[] {
-			        "com.nokia.carbide.cpp.leavescan.LeaveScanErrorParser"
-			        };
-				
-		        ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(finalProject);
-		        try {
-		        	CarbideCPPBuilder.removeAllMarkers(finalProject);
-		        } catch (CoreException e){
-		        	e.printStackTrace();
-		        }
-		        IPath workingDir = cpi.getINFWorkingDirectory();
-				CarbideCommandLauncher cmdLauncher = new CarbideCommandLauncher(finalProject, monitor, leaveScanParserIds, workingDir);
-				cmdLauncher.startTimingStats();
-				int fileCount = 1;
-				int listSize = finalPathList.size();
-				for (IPath currPath : finalPathList){
-					
-					//System.out.print("\nMMP Project: " + finalMMPPath.lastSegment() + " | Source File: " + currPath.toOSString()); // Debug
-					
-					ICarbideBuildConfiguration defaultConfig = cpi.getDefaultConfiguration();
-					monitor.beginTask("Running leavescan.", 100);
-					
-					double dWorked = ((double)fileCount / (double)listSize) * 100;
-					monitor.worked((int)dWorked);
-					String taskName = "Running leavescan on file \"" + currPath.toOSString() + "\" for MMP \"" + finalMMPPath.lastSegment() + ".";
-					monitor.setTaskName(taskName);
-					cmdLauncher.writeToConsole("\n***" + taskName + "\n");
-					// Construct the leavescan arguments
-					List<String> leaveScanArgList = new ArrayList<String>();
-					leaveScanArgList.add("/c");
-					
-					if (leaveScanFolder.length() > 0){
-						leaveScanArgList.add(leaveScanFolder + "leavescan.exe");
-					} else {
-						leaveScanArgList.add("leavescan.exe");
-					}
-
-					if (noisyOutput) {
-						leaveScanArgList.add("-N");
-					} else {
-						leaveScanArgList.add("-n");
-					}
-					
-					leaveScanArgList.add(currPath.toOSString());
-					String[] args = new String[leaveScanArgList.size()];
-					leaveScanArgList.toArray(args);
-					cmdLauncher.showCommand(true);
-					
-					// executeCommand, a special extension to the regular execute which will handle
-					// writing the console output, error parsing, and creating error markers.
-					cmdLauncher.executeCommand(CarbideCommandLauncher.getCmdExeLocation(), args, CarbideCPPBuilder.getResolvedEnvVars(defaultConfig), workingDir);
-					
-					fileCount++;
-				}
-				cmdLauncher.writeToConsole(cmdLauncher.getTimingStats());
-				return new Status(IStatus.OK, LeavescanPlugin.PLUGIN_ID, IStatus.OK, "LeaveScan Complete", null); 
-			}
-		};
-		
-		buildJob.setPriority(Job.BUILD);
-		buildJob.schedule();
-		
-	}
-
-}

--- a/core/com.nokia.carbide.cpp.leavescan/src/com/nokia/carbide/cpp/internal/leavescan/ui/LeavescanPreferenceConstants.java	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/*
-* Copyright (c) 2007-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.
-*
-*/
-package com.nokia.carbide.cpp.internal.leavescan.ui;
-
-public class LeavescanPreferenceConstants {
-	
-	public final static String LEAVESCAN_NOISY_OUTPUT = "leavescanEnableNoisyOutput"; //$NON-NLS-1$
-	public final static String LEAVESCAN_FOLDER = "leavescanFolder"; //$NON-NLS-1$
-}

--- a/core/com.nokia.carbide.cpp.leavescan/src/com/nokia/carbide/cpp/internal/leavescan/ui/LeavescanPreferenceInitializer.java	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2007-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.
-*
-*/
-package com.nokia.carbide.cpp.internal.leavescan.ui;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import com.nokia.carbide.cpp.internal.leavescan.LeavescanPlugin;
-
-/**
- * Class used to initialize default preference values.
- */
-public class LeavescanPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = LeavescanPlugin.getLeaveScanPrefsStore();
-		store.setDefault(LeavescanPreferenceConstants.LEAVESCAN_NOISY_OUTPUT, false);
-		store.setDefault(LeavescanPreferenceConstants.LEAVESCAN_FOLDER, "");
-	}
-
-}

--- a/core/com.nokia.carbide.cpp.leavescan/src/com/nokia/carbide/cpp/internal/leavescan/ui/LeavescanPreferences.java	Thu May 27 16:59:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-/*
-* Copyright (c) 2007-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.
-*
-*/
-package com.nokia.carbide.cpp.internal.leavescan.ui;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-import com.nokia.carbide.cpp.internal.leavescan.LeavescanPlugin;
-
-public class LeavescanPreferences extends PreferencePage implements
-		IWorkbenchPreferencePage,Listener {
-
-	private Text leaveScanDirEditText;
-	private Button browseButton;
-	private Button veryNoisyOuputButton;
-	public static final String LEAVESCAN_PREF_HELP_ID = LeavescanPlugin.PLUGIN_ID + ".leavescan_prefs_page"; //$NON-NLS-1$
-
-	/**
-	 * Create the preference page
-	 */
-	public LeavescanPreferences() {
-		super();
-	}
-
-	/**
-	 * Create contents of the preference page
-	 * @param parent
-	 */
-	@Override
-	public Control createContents(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		final GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 3;
-		container.setLayout(gridLayout);
-
-		final Label leavescanDirectoryLabel = new Label(container, SWT.NONE);
-		leavescanDirectoryLabel.setToolTipText("Choose the directory where leavescan.exe lives.");
-		leavescanDirectoryLabel.setText("Leavescan Directory:");
-
-		leaveScanDirEditText = new Text(container, SWT.BORDER);
-		leaveScanDirEditText.setLayoutData(new GridData(250, SWT.DEFAULT));
-
-		browseButton = new Button(container, SWT.NONE);
-		browseButton.setToolTipText("Choose the directory where leavescan.exe lives.");
-		browseButton.setText("Browse...");
-		browseButton.addListener(SWT.Selection, this);
-		
-		veryNoisyOuputButton = new Button(container, SWT.CHECK);
-		veryNoisyOuputButton.setToolTipText("When enabled, -N is passed to leavescan for very verbose output. Otherwise -n is passed for minimal output.");
-		veryNoisyOuputButton.setText("Very noisy ouput");
-		
-		getPrefsStoreValues();
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(super.getControl(), LEAVESCAN_PREF_HELP_ID);
-		
-		return container;
-	}
-
-	/**
-	 * Initialize the preference page
-	 */
-	public void init(IWorkbench workbench) {
-		// Initialize the preference page
-	}
-	
-	public void handleEvent(Event event) {
-		if (event.widget == browseButton) {
-			handleBrowse();
-		} 
-		
-	}
-	
-	private void getPrefsStoreValues(){
-		IPreferenceStore store = LeavescanPlugin.getLeaveScanPrefsStore();
-		boolean noisyOutput =  store.getBoolean(LeavescanPreferenceConstants.LEAVESCAN_NOISY_OUTPUT);
-		veryNoisyOuputButton.setSelection(noisyOutput);
-		
-		String leaveScanFolder = store.getString(LeavescanPreferenceConstants.LEAVESCAN_FOLDER);
-		leaveScanDirEditText.setText(leaveScanFolder);
-	}
-
-	@Override
-	protected void performDefaults() {
-		veryNoisyOuputButton.setSelection(false);
-		leaveScanDirEditText.setText("");
-		super.performDefaults();
-	}
-
-	@Override
-	public boolean performOk() {
-			
-		IPreferenceStore store = LeavescanPlugin.getLeaveScanPrefsStore();
-	
-		String leaveScanDir = leaveScanDirEditText.getText();
-		if (leaveScanDir.length() > 0){
-			if (!leaveScanDir.endsWith("\\")){
-				leaveScanDir += "\\";
-				leaveScanDirEditText.setText(leaveScanDir);
-			}
-		}
-		
-		if (leaveScanDir.length() > 0){
-			IPath leaveScanPath = new Path(leaveScanDir);
-			if (!leaveScanPath.toFile().exists()){
-				if (!MessageDialog.openQuestion(getShell(), "Directory does not exist.", "The directory " + leaveScanPath + " does not exist.\n\nDo you want to continue?")){
-					return false;
-				}
-			}
-		}
-		
-		store.setValue(LeavescanPreferenceConstants.LEAVESCAN_FOLDER, leaveScanDir);
-		store.setValue(LeavescanPreferenceConstants.LEAVESCAN_NOISY_OUTPUT, veryNoisyOuputButton.getSelection());
-		
-		return super.performOk();
-	}
-	
-	private void handleBrowse() {
-	    String selectedDir = showBrowseDialog();
-	    if (selectedDir != null) {
-	        if (!selectedDir.equals(leaveScanDirEditText.getText())) {
-	        	leaveScanDirEditText.setText(selectedDir);
-	        }
-	    }
-	}
-
-    private String showBrowseDialog() {
-        DirectoryDialog dialog = new DirectoryDialog(leaveScanDirEditText.getShell(), SWT.OPEN);
-        dialog.setText("Choose a folder...");
-        dialog.setFilterPath(leaveScanDirEditText.getText());
-        return dialog.open();
-    }
-
-}

--- a/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/ui/ICarbideSharedImages.java	Thu May 27 16:59:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/ui/ICarbideSharedImages.java	Thu Jun 03 17:44:38 2010 -0500
@@ -251,10 +251,6 @@
 	 */
 	public static final String IMG_ROM_LOG_16_16 = "ROM_Log.png";										//$NON-NLS-1$
 	/**
-	 * File path: icons/Run_Leavescan.png
-	 */
-	public static final String IMG_LEAVESCAN_16_16 = "Run_Leavescan.png";								//$NON-NLS-1$
-	/**
 	 * File path: icons/Start_Resource_Block.png
 	 */
 	public static final String IMG_START_RESOURCE_BLOCK_16_16 = "Start_Resource_Block.png";			//$NON-NLS-1$