# HG changeset patch
# User Chad Peckham <chad.peckham@nokia.com>
# Date 1239050811 18000
# Node ID 05c4630a6d7301eb83afdbd76dd906cd3a3fd30c
# Parent  15fe054c087213a267b66711ee7e86169746b266# Parent  1e709f6eead9c9edaf9e79abdf82be893ad3d1f0
merge two heads

diff -r 15fe054c0872 -r 05c4630a6d73 .branch.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.branch.txt	Mon Apr 06 15:46:51 2009 -0500
@@ -0,0 +1,2 @@
+default
+
diff -r 15fe054c0872 -r 05c4630a6d73 .hgignore
--- a/.hgignore	Mon Apr 06 15:44:39 2009 -0500
+++ b/.hgignore	Mon Apr 06 15:46:51 2009 -0500
@@ -2,7 +2,7 @@
 syntax: glob
 bin
 runtime
-.DS_Store
+\.DS_Store
 connectivity/com.nokia.tcf/os/*
 connectivity/com.nokia.tcf/native/TCFNative/*/Release
 connectivity/com.nokia.tcf/native/TCFNative/*/Debug
diff -r 15fe054c0872 -r 05c4630a6d73 builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.input.txt
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.input.txt	Mon Apr 06 15:44:39 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.input.txt	Mon Apr 06 15:46:51 2009 -0500
@@ -39,4 +39,11 @@
 
 make: *** Waiting for unfinished jobs....
 
-</buildlog>
\ No newline at end of file
+</buildlog>
+
+<![CDATA[
++ C:/APPS/rvct22_616/bin/armlink.exe --diag_suppress 6331 --bpabi --reloc --no_scanlib --datacompressor=off --debug --dll --split --rw-base 0x400000 --symver_soname --soname 'helloworld{000a0000}[e800005a].exe' --entry _E32Startup 'P:/epoc32/release/armv5/udeb/eexe.lib(uc_exe_.o)' -o P:/epoc32/release/armv5/udeb/helloworld.exe.sym --symbols --list P:/epoc32/release/armv5/udeb/helloworld.exe.map --via P:/epoc32/build/helloworld/c_34df0185eb73bae4/helloworld_exe/armv5/udeb/helloworld_udeb_objects.via P:/epoc32/release/armv5/udeb/usrt2_2.lib P:/epoc32/release/armv5/lib/euser.dso P:/epoc32/release/armv5/lib/apparc.dso P:/epoc32/release/armv5/lib/cone.dso P:/epoc32/release/armv5/lib/eikcore.dso P:/epoc32/release/armv5/lib/gdi.dso P:/epoc32/release/armv5/lib/drtaeabi.dso P:/epoc32/release/armv5/lib/dfpaeabi.dso P:/epoc32/release/armv5/lib/dfprvct2_2.dso P:/epoc32/release/armv5/lib/drtrvct2_2.dso 'C:/APPS/rvct22_616/lib/armlib/h_t__uf.l(switch8.o)'
+Fatal error: L6002U: Could not open file P:/epoc32/build/helloworld/c_34df0185eb73bae4/helloworld_exe/armv5/udeb/HelloWorld_AppUi.o: No such file or directory
+Not enough information to list image symbols.
+Finished: 1 information, 0 warning, 0 error and 1 fatal error messages.
+]]>
diff -r 15fe054c0872 -r 05c4630a6d73 builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.regression.xml
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.regression.xml	Mon Apr 06 15:44:39 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.regression.xml	Mon Apr 06 15:46:51 2009 -0500
@@ -1,4 +1,6 @@
 <root>
 <!--Error Marker at index 0-->
 <marker_info external_path_string="^EMPTY^" file="^EMPTY^" line_number="-1" message="While Searching for a SPECIFIED DEFFILE: file not found: L:/src/common/generic/app-framework/cone/bwins/CONExu.DEF" severity="1" variable_name="^EMPTY^"/>
+<!--Error Marker at index 1-->
+<marker_info external_path_string="^EMPTY^" file="^EMPTY^" line_number="0" message="Fatal error: L6002U: Could not open file P:/epoc32/build/helloworld/c_34df0185eb73bae4/helloworld_exe/armv5/udeb/HelloWorld_AppUi.o: No such file or directory" severity="3" variable_name="^EMPTY^"/>
 </root>
\ No newline at end of file
diff -r 15fe054c0872 -r 05c4630a6d73 builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/AllTests.java
--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/AllTests.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/AllTests.java	Mon Apr 06 15:46:51 2009 -0500
@@ -27,6 +27,7 @@
 		//$JUnit-BEGIN$
 		suite.addTestSuite(TestRVCTErrorParser.class);
 		suite.addTestSuite(TestMakmakeErrorParser.class);
+		suite.addTestSuite(TestSBSv2ErrorParser.class);
 		//$JUnit-END$
 		return suite;
 	}
diff -r 15fe054c0872 -r 05c4630a6d73 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/RVCTCompilerErrorParser.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/RVCTCompilerErrorParser.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/RVCTCompilerErrorParser.java	Mon Apr 06 15:46:51 2009 -0500
@@ -39,6 +39,7 @@
 		// e.g. "no source": Error:  #5: cannot open source input file "\CarbideB18_workspace\BlackFlag\group\SRC\dbg_debug_menu.cpp": No such file or directory
 		if (aLine.contains("No such file or directory")){
 			aErrorParserManager.generateMarker(aErrorParserManager.getProject(), 0, aLine, IMarkerGenerator.SEVERITY_ERROR_BUILD, null);
+			return true;
 		}
 		
 		
diff -r 15fe054c0872 -r 05c4630a6d73 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionSettingsPage.java
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionSettingsPage.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionSettingsPage.java	Mon Apr 06 15:46:51 2009 -0500
@@ -799,8 +799,10 @@
 					agentTestTabComposite.layout(true, true);
 				}
 				disposeConnectedService();
-				String buttonLabel = Messages.getString("ConnectionSettingsPage.StartServiceTestButtonLabel"); //$NON-NLS-1$
-				serviceTestButton.setText(buttonLabel);
+				if (!serviceTestButton.isDisposed()) {
+					String buttonLabel = Messages.getString("ConnectionSettingsPage.StartServiceTestButtonLabel"); //$NON-NLS-1$
+					serviceTestButton.setText(buttonLabel);
+				}
 			}
 		});
 	}
diff -r 15fe054c0872 -r 05c4630a6d73 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java	Mon Apr 06 15:46:51 2009 -0500
@@ -26,6 +26,7 @@
 import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
 import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.IConnectionsManagerListener;
 import com.nokia.carbide.remoteconnections.settings.ui.SettingsWizard;
+import com.nokia.cpp.internal.api.utils.core.TextUtils;
 
 import org.eclipse.jface.action.*;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -81,7 +82,7 @@
 	private static final Image CONNECTION_IMG = CONNECTION_IMGDESC.createImage();
 	private static final Color COLOR_RED = new Color(Display.getDefault(), 192, 0, 0);
 	private static final Color COLOR_GREEN = new Color(Display.getDefault(), 0, 128, 0);
-	private static final Color COLOR_YELLOW = new Color(Display.getDefault(), 192, 192, 0);
+	private static final Color COLOR_ELECTRIC = new Color(Display.getDefault(), 0, 0, 255);
 	private static final Color COLOR_GREY = new Color(Display.getDefault(), 96, 96, 96);
 	private static final String NEW_ACTION = "ConnectionsView.new"; //$NON-NLS-1$
 	private static final String EDIT_ACTION = "ConnectionsView.edit"; //$NON-NLS-1$
@@ -114,7 +115,7 @@
 						Display.getDefault().asyncExec(new Runnable() {
 							public void run() {
 								if (!isDisposed) {
-									viewer.refresh(treeNode, true);
+									viewer.refresh(true);
 									packColumns();
 								}
 							}
@@ -180,8 +181,12 @@
 		public Image getImage(Object obj) {
 			TreeNode node = (TreeNode) obj;
 			Object value = node.getValue();
-			if (value instanceof IConnection)
+			if (value instanceof IConnection) {
+				if (isConnectionInUse((IConnection) value)) {
+					return STATUS_INUSE_IMG;
+				}
 				return CONNECTION_IMG;
+			}
 			else if (value instanceof IConnectedService) {
 				EStatus status = ((IConnectedService) value).getStatus().getEStatus();
 				switch (status) {
@@ -190,13 +195,26 @@
 				case UP:
 					return STATUS_AVAIL_IMG;
 				case IN_USE:
-					return STATUS_INUSE_IMG;
+					return CONNECTION_IMG;
 				case UNKNOWN:
 					return STATUS_UNK_IMG;
 				}
 			}
 			return null;
 		}
+
+		private boolean isConnectionInUse(IConnection connection) {
+			Collection<IConnectedService> connectedServices = 
+				RemoteConnectionsActivator.getConnectionsManager().getConnectedServices(connection);
+			// if any service is in-use, then connection is in-use
+			for (IConnectedService connectedService : connectedServices) {
+				IStatus status = connectedService.getStatus();
+				if (status.getEStatus().equals(EStatus.IN_USE))
+					return true;
+			}
+			
+			return false;
+		}
 	}
 	
 	private class StatusLabelProvider extends ColumnLabelProvider {
@@ -206,8 +224,28 @@
 			Object value = node.getValue();
 			if (value instanceof IConnectedService) {
 				IStatus status = ((IConnectedService) value).getStatus();
-				return status.getShortDescription();
+				if (!status.getEStatus().equals(EStatus.IN_USE)) // if in-use, we show it in the connection row
+					return status.getShortDescription();
+			}
+			else if (value instanceof IConnection) {
+				IStatus status = getFirstInUseStatus((IConnection) value);
+				if (status != null)
+					return status.getShortDescription();
 			}
+				
+			return null;
+		}
+
+		private IStatus getFirstInUseStatus(IConnection connection) {
+			Collection<IConnectedService> connectedServices = 
+				RemoteConnectionsActivator.getConnectionsManager().getConnectedServices(connection);
+			// if any service is in-use, then connection is in-use
+			for (IConnectedService connectedService : connectedServices) {
+				IStatus status = connectedService.getStatus();
+				if (status.getEStatus().equals(EStatus.IN_USE))
+					return status;
+			}
+			
 			return null;
 		}
 
@@ -222,16 +260,37 @@
 					return COLOR_RED;
 				case UP:
 					return COLOR_GREEN;
-				case IN_USE:
-					return COLOR_YELLOW;
 				case UNKNOWN:
 					return COLOR_GREY;
 				}
 			}
+			else if (value instanceof IConnection) // only showing in-use for connections
+				return COLOR_ELECTRIC;
+			
 			return null;
 		}
 	}
 	
+	public class DescriptionLabelProvider extends ColumnLabelProvider {
+		
+		@Override
+		public String getText(Object obj) {
+			TreeNode node = (TreeNode) obj;
+			Object value = node.getValue();
+			if (value instanceof IConnectedService) {
+				IStatus status = ((IConnectedService) value).getStatus();
+				if (!status.getEStatus().equals(EStatus.IN_USE)) { // if in-use, we show it in the connection row
+					String longDescription = status.getLongDescription();
+					if (longDescription != null)
+						longDescription = TextUtils.canonicalizeNewlines(longDescription, " ");
+					return longDescription;
+				}
+			}
+			
+			return null;
+		}
+	}
+
 	private class TypeLabelProvider extends ColumnLabelProvider {
 		
 		public String getText(Object obj) {
@@ -319,6 +378,10 @@
 		statusColumn.setLabelProvider(new StatusLabelProvider());
 		statusColumn.getColumn().setText(Messages.getString("ConnectionsView.StatusColumnHeader")); //$NON-NLS-1$
 		
+		TreeViewerColumn descriptionColumn = new TreeViewerColumn(viewer, SWT.LEFT);
+		descriptionColumn.setLabelProvider(new DescriptionLabelProvider());
+		descriptionColumn.getColumn().setText("Description");
+		
 		viewer.setContentProvider(new TreeNodeContentProvider());
 		viewer.setInput(loadConnections());
 		viewer.expandAll();
diff -r 15fe054c0872 -r 05c4630a6d73 core/carbide_releases/readme/background_carbide.jpg
Binary file core/carbide_releases/readme/background_carbide.jpg has changed
diff -r 15fe054c0872 -r 05c4630a6d73 core/carbide_releases/readme/readme_sdks.html
--- a/core/carbide_releases/readme/readme_sdks.html	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/carbide_releases/readme/readme_sdks.html	Mon Apr 06 15:46:51 2009 -0500
@@ -1,69 +1,65 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>SDK Support in Carbide.c++</title>
-<style type="text/css">
-<!--
-body { background-image: url(background_carbide.jpg);}
-.style1 {font-size: x-small}
-.style2 {font-family: "Courier New", Courier, mono}
-.style3 {color: #FF0000; font-weight: bold}
-.style4 {font-weight: bold}
-.style5 {color: #FFFFFF; }
--->
-</style>
-</head>
-
-<body >
-
-<h2>You're not done installing just yet... </h2>
-<p>Release: 2.0.3<br>
-  Revised:&nbsp;Feb 2009</p>
-<p>Read the <b>Release Notes</b> and <b>What's New</b> for the latest infomation about this product. In Carbide.c++ simply click  <b>Help &gt; Help Contents &gt; Carbide Help</b>.</p>
-<p>To complete your installation and start Symbian C++ application development, you <span class="style3">must</span>  install the following: </p>
-<table width="80%"  border="0">
-  <tr>
-    <td height="30" valign="bottom"><h3 class="style4">Installing Perl </h3></td>
-  </tr>
-  <tr>
-    <td height="71" bgcolor="#ffffff">
-    <p>The Carbide.c++ tools require a copy of Perl to run  build scripts:</p>
-	<b>Perl</b> (<a href="http://www.activestate.com">www.activestate.com</a>)
-  <ul>
-        <li><A href="ftp://ftp.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.635-MSWin32-x86.msi">ActivePerl-5.6.1.635</a> (5.6.1 is required by Symbian tools, later versions will not work) </li>
-    </ul></td>
-  </tr>
-</table>
-<table width="80%"  border="0">
-  <tr>
-    <td height="30" valign="bottom"><h3 class="style4">Installing SDKs</h3></td>
-  </tr>
-  <tr>
-    <td bgcolor="#ffffff">
-		<p>Also, you must  install at least one of the following  SDKs to develop Symbian applications:
-</p>
-		<p><b>NOTE</b> Carbide.c++ requires SDKs built to support  <span class="style2">WINSCW</span> format. </p>
-		<p><strong>S60 Platform SDKs</strong> (<a href="http://forum.nokia.com/info/sw.nokia.com/id/4a7149a5-95a5-4726-913a-3c6f21eb65a5/S60-SDK-0616-3.0-mr.html">forum.nokia.com/main/resources/tools_and_sdks/carbide/</a>) </p>
-	      <ul>
-	        <li>S60 5th Edition
-	        <li>S60 3rd Edition, FP2 
-	        <li>S60 3rd Edition, FP1
-	        <li>S60 3rd Edition, MR 
-            </ul>
-	<p><strong>Qt SDKs</strong> (<a href="http://www.trolltech.com/">www.trolltech.com</a>) </p>
-      <ul>
-        <li>Qt SDK for S60        
-      </ul>
-      <p><strong>UIQ SDKs</strong> (<a href="http://developer.uiq.com/">developer.uiq.com</a>) </p>
-      <ul>
-        <li>UIQ 3.1        
-        <li>UIQ 3.0        
-      </ul></td>
-  </tr>
-</table>
-<hr size="1" noshade>
-<p class="footer style1" >Copyright &copy;2006-2008 Nokia Corporation</p>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>SDK Support in Carbide.c++</title>
+<style type="text/css">
+<!--
+.style6 {font-weight: bold}
+-->
+</style>
+</head>
+
+<body background="background_carbide.jpg">
+
+<h2>You're not done installing just yet... </h2>
+<p>Release: 2.1.0<br>
+  Revised:&nbsp;April 2009</p>
+<p>Read the <b>Release Notes</b> and <b>Bug Fixes</b> for the latest infomation about this product. In Carbide.c++ simply click the <b>Help &gt; Help Contents &gt; Carbide.c++ User Guide</b> to find the pages.</p>
+<p>To complete your installation and start Symbian C++ application development, you <span class="style3">must</span>  install the following: </p>
+<table width="80%"  border="0">
+  <tr>
+    <td height="30" valign="bottom"><h3 class="style4">Installing Perl </h3></td>
+  </tr>
+  <tr>
+    <td height="71" bgcolor="#ffffff">
+    <p>The Carbide.c++ tools require a copy of Perl to run  build scripts:</p>
+	<b>Perl</b> (<a href="http://www.activestate.com">www.activestate.com</a>)
+  <ul>
+        <li><A href="ftp://ftp.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.635-MSWin32-x86.msi">ActivePerl-5.6.1.635</a> (5.6.1 is required by Symbian tools, later versions will not work) </li>
+    </ul></td>
+  </tr>
+</table>
+<table width="80%"  border="0">
+  <tr>
+    <td height="30" valign="bottom"><h3 class="style4">Installing SDKs</h3></td>
+  </tr>
+  <tr>
+    <td bgcolor="#ffffff">
+		<p>Also, you must  install at least one of the following  SDKs to develop Symbian applications:
+</p>
+		<p><b>NOTE</b> Carbide.c++ requires SDKs built to support  <span class="style2">WINSCW</span> format. </p>
+		<p><strong>S60 Platform SDKs</strong> (<a href="http://forum.nokia.com/info/sw.nokia.com/id/4a7149a5-95a5-4726-913a-3c6f21eb65a5/S60-SDK-0616-3.0-mr.html">forum.nokia.com/main/resources/tools_and_sdks/carbide/</a>) </p>
+	      <ul>
+	        <li>S60 5th Edition
+	        <li>S60 3rd Edition, FP2 
+	        <li>S60 3rd Edition, FP1
+	        <li>S60 3rd Edition, MR 
+            </ul>
+	<p><strong>Qt SDKs</strong> (<a href="http://www.trolltech.com/">www.trolltech.com</a>) </p>
+      <ul>
+        <li>Qt SDK for S60        
+      </ul>
+      <p><strong>UIQ SDKs</strong> (<a href="http://developer.uiq.com/">developer.uiq.com</a>) </p>
+      <ul>
+        <li>UIQ 3.1        
+        <li>UIQ 3.0        
+      </ul></td>
+  </tr>
+</table>
+<p>&nbsp;</p>
+<div id="footer"><span class="style6">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
+License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></span></div>
+</body>
+</html>
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp-feature/feature.xml
--- a/core/com.nokia.carbide.cpp-feature/feature.xml	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp-feature/feature.xml	Mon Apr 06 15:46:51 2009 -0500
@@ -2,7 +2,7 @@
 <feature
       id="com.nokia.carbide.cpp"
       label="%featureName"
-      version="2.0.3.qualifier"
+      version="2.1.0.qualifier"
       provider-name="Nokia"
       plugin="com.nokia.carbide.cpp"
       image="Carbide_Image.png">
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner.tests/src/com/nokia/carbide/cpp/codescanner/tests/CSConfigManagerTest.java
--- a/core/com.nokia.carbide.cpp.codescanner.tests/src/com/nokia/carbide/cpp/codescanner/tests/CSConfigManagerTest.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner.tests/src/com/nokia/carbide/cpp/codescanner/tests/CSConfigManagerTest.java	Mon Apr 06 15:46:51 2009 -0500
@@ -171,6 +171,7 @@
 		assertTrue(settings.get(CSPreferenceConstants.RULE_SEVERITIES).length() > 0);
 		assertTrue(settings.get(CSPreferenceConstants.RULES_ENABLED).length() > 0);
 		assertTrue(settings.get(CSPreferenceConstants.CCLASSIGNORE).length() > 0);
+		assertTrue(settings.get(CSPreferenceConstants.ICONS).length() == 0);
 		assertTrue(settings.get(CSPreferenceConstants.LFUNCTIONIGNORE).length() > 0);
 		assertTrue(settings.get(CSPreferenceConstants.LONGLINES_LENGTH).length() > 0);
 		assertTrue(settings.get(CSPreferenceConstants.OPENIGNORE).length() > 0);
@@ -194,6 +195,7 @@
 		assertTrue(store.getString(CSPreferenceConstants.RULE_SEVERITIES).length() > 0);
 		assertTrue(store.getString(CSPreferenceConstants.RULES_ENABLED).length() > 0);
 		assertTrue(store.getString(CSPreferenceConstants.CCLASSIGNORE).length() > 0);
+		assertTrue(store.getString(CSPreferenceConstants.ICONS).length() >= 0);
 		assertTrue(store.getString(CSPreferenceConstants.LFUNCTIONIGNORE).length() > 0);
 		assertTrue(store.getString(CSPreferenceConstants.LONGLINES_LENGTH).length() > 0);
 		assertTrue(store.getString(CSPreferenceConstants.OPENIGNORE).length() > 0);
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner.tests/src/com/nokia/carbide/cpp/codescanner/tests/CSConfigSettingsTest.java
--- a/core/com.nokia.carbide.cpp.codescanner.tests/src/com/nokia/carbide/cpp/codescanner/tests/CSConfigSettingsTest.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner.tests/src/com/nokia/carbide/cpp/codescanner/tests/CSConfigSettingsTest.java	Mon Apr 06 15:46:51 2009 -0500
@@ -309,13 +309,27 @@
 		assertTrue(result.equals("secret"));
 	}
 
+	public void testGetScriptIcons() throws Exception {
+		String result = "";
+		result = this.configSettings.getScriptIcons();
+		assertNull(result);
+	}
+
+	public void testSetScriptIcons() throws Exception {
+		this.configSettings.setScriptIcons("myicon.png");
+		String result = "";
+		result = this.configSettings.getScriptIcons();
+		assertNotNull(result);
+		assertTrue(result.equals("myicon.png"));
+	}
+
 	public void testGetScriptLFunctionIgnore() throws Exception {
 		String result = "";
 		result = this.configSettings.getScriptLFunctionIgnore();
 		assertTrue(result.length() > 0);
 	}
 
-	public void testSetLFunctionCClassIgnore() throws Exception {
+	public void testSetScriptLFunctionIgnore() throws Exception {
 		this.configSettings.setScriptLFunctionIgnore("RunL|MyfuncL");
 		String result = "";
 		result = this.configSettings.getScriptLFunctionIgnore();
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/Tools/codescanner.exe
Binary file core/com.nokia.carbide.cpp.codescanner/Tools/codescanner.exe has changed
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/Tools/release_notes.txt
--- a/core/com.nokia.carbide.cpp.codescanner/Tools/release_notes.txt	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/Tools/release_notes.txt	Mon Apr 06 15:46:51 2009 -0500
@@ -1,6 +1,71 @@
+# #################################################################
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Symbian Foundation License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# #################################################################
+
 Nokia CodeScanner Command Line Tool Release Notes
 =================================================
 
+Version 2.1.2
+=============
+- Added new IAD rule to check flag usage. IA must not use R&D flags 
+nor feature flags via preprocessor statements in the source code. 
+This means bldvariant.hrh and productvariant.hrh should not be used.
+This new rule is set to low severity in the "Other" category by 
+default. It can be configured by adding a <flags> script element 
+in the configuration file. 
+Example :
+<codescannerConfig>
+  <scripts>
+    <flags category="other" 
+           enable="true" 
+           severity="low"/>
+  </scripts>
+</codescannerConfig>
+
+- Added new IAD rule to check Central Repository usage. IA cannot 
+assume that the Central Repository is set up fully. This means the 
+return value of CRepository::get() cannot be ignored.
+This new rule is set to low severity in the "Other" category by 
+default. It can be configured by adding a <crepository> script 
+element in the configuration file. 
+Example :
+<codescannerConfig>
+  <scripts>
+    <crepository category="other" 
+                 enable="true" 
+                 severity="low"/>
+  </scripts>
+</codescannerConfig>
+
+- Added new IAD rule to check customizable icons. Due to device 
+customization requirements, IA must not remove any customization 
+done by the variant team. This means IA cannot include customizable 
+icons.
+This new rule is set to low severity in the "Other" category by 
+default. It can be configured by adding a <customizableicons> 
+script element in the configuration file. Names of icons can be 
+specified in the <iconsRE> element.
+Example :
+<codescannerConfig>
+  <scripts>
+    <customizableicons category="other" 
+                       enable="true" 
+                       severity="low">
+      <iconsRE>iconA.bmp|iconB.svg|iconC</iconsRE>
+    </customizableicons>
+  </scripts>
+</codescannerConfig>
+
+
 Version 2.1.1
 =============
 - Added support for user-defined rules. This can be done by
@@ -18,17 +83,16 @@
     </customrule>
   </customrules>
 </codescannerConfig>
-Please refer to the document "CodeScanner XML Configuration File 
-Specification" (CodeScanner_XML_ConfigFile_Spec.doc) for more
-information on this new element.
+More information on the syntax of this new element can be found in 
+the document "CodeScanner_XML_ConfigFile_Spec.doc".
 
 - When scanning with low severity rules, CodeScanner now 
 generates informative messages instead of warnings when the 
 StdOut output format is selected.
 
 - Added support to disable individual error/warning via
-CodeScanner command embedded in comments. The format of this
-command : 
+CodeScanner commands embedded in comments. The command has the 
+following format : 
   codescanner(::<rule name>)+
 Example :
 void CTestCase::Foo()
@@ -59,6 +123,9 @@
   </scripts>
 </codescannerConfig>
 
+-Updated the function parser in CodeScanner to filter out constant 
+initialization.
+
 - Updated active object checking rule to ignore After() from 
 RTimer type member variables.
 
@@ -413,14 +480,3 @@
 python2.5-2.5.1/Lib/wsgiref.egg-info
 
 Please refer to the document "python 2_5_1 licenses.txt" for licensing info.
-
-
-This version of CodeScanner is intended for Nokia internal use only.
-
-Please report any problems found to : 
-support.carbide@nokia.com
-
-
-Stephen Chong
-Nokia Corporation
-stephen.chong@nokia.com
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/book.css
--- a/core/com.nokia.carbide.cpp.codescanner/book.css	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/book.css	Mon Apr 06 15:46:51 2009 -0500
@@ -1,184 +1,184 @@
-/*	
-	Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-	All rights reserved. 
-	License: http://www.eclipse.org/legal/epl-v10.html
-*/
-
-/*	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: 2px 10px 10px 10px;
-	}
-
-/* 	Set default font to serif style, 12-pt and plain	*/
-body, p, table {
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 13px;
-	font-weight: normal;
-}
-
-/*	Use sans-serif fonts for all title styles	*/
-h1, h2, h3, h4, h5, h6, strong, em {
-	font-family: Helvetica, sans-serif;
-	color: #000000;	
-	}
-
-h1	{ font-size:20px }
-h2	{ font-size:18px }
-h3	{ font-size:16px }
-h4	{ font-size:14px }
-h5	{ font-size:13px }
-h6	{ font-size:12px }
-
-/*	For headlines at the top of a view, add space	*/
-/*	20090224-changed green fade to gold header image	*/
-h1, h2, h3 {
-	background-image: url(html/images/brand/gold_header.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: Helvetica, sans-serif;
-	font-size: 11px;
-	color:#333;
-	}
-
-.listing	{
-	font-family: "Courier New", Courier, mono;
-	color: #000000;
-	background-color: #FFFFCC;
-	margin: 5px 0px;
-	}
-		
-.code, pre	{
-	font-family: "Courier New", Courier, mono;
-	font-size: 13px;
-	color: #000000;
-	}
-
-.step	{
-	/* background-color: #EEE; */
-	/* margin: 10px 0px; */
-	color: #111;
-	/* 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: 13px;
-	}
-
-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:#FDDD1F;	/* 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:#FFFF66;
-	/* background-color: #EEE; */
-	font-weight:bold;
-	color: #000000;
-	}
-	
-	
-/*	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: Helvetica, sans-serif;
-	font-size: 11px;
-	}
-
-	
-.plain {
-	font-family: 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 }
+/*	
+	Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+	All rights reserved. 
+	License: http://www.eclipse.org/legal/epl-v10.html
+*/
+
+/*	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: 2px 10px 10px 10px;
+	}
+
+/* 	Set default font to serif style, 12-pt and plain	*/
+body, p, table {
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-size: 13px;
+	font-weight: normal;
+}
+
+/*	Use sans-serif fonts for all title styles	*/
+h1, h2, h3, h4, h5, h6, strong, em {
+	font-family: Helvetica, sans-serif;
+	color: #000000;	
+	}
+
+h1	{ font-size:20px }
+h2	{ font-size:18px }
+h3	{ font-size:16px }
+h4	{ font-size:14px }
+h5	{ font-size:13px }
+h6	{ font-size:12px }
+
+/*	For headlines at the top of a view, add space	*/
+/*	20090224-changed green fade to gold header image	*/
+h1, h2, h3 {
+	background-image: url(html/images/brand/gold_header.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: Helvetica, sans-serif;
+	font-size: 11px;
+	color:#333;
+	}
+
+.listing	{
+	font-family: "Courier New", Courier, mono;
+	color: #000000;
+	background-color: #FFFFCC;
+	margin: 5px 0px;
+	}
+		
+.code, pre	{
+	font-family: "Courier New", Courier, mono;
+	font-size: 13px;
+	color: #000000;
+	}
+
+.step	{
+	/* background-color: #EEE; */
+	/* margin: 10px 0px; */
+	color: #111;
+	/* 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: 13px;
+	}
+
+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:#FDDD1F;	/* 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:#FFFF66;
+	/* background-color: #EEE; */
+	font-weight:bold;
+	color: #000000;
+	}
+	
+	
+/*	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: Helvetica, sans-serif;
+	font-size: 10px;
+	}
+
+	
+.plain {
+	font-family: 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 }
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/html/codescanner.htm
--- a/core/com.nokia.carbide.cpp.codescanner/html/codescanner.htm	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/html/codescanner.htm	Mon Apr 06 15:46:51 2009 -0500
@@ -1,32 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<title>CodeScanner User Guide</title>
-    <link href="../book.css" rel="stylesheet" type="text/css">
-	<style>
-		table, td, th { border: 0px none #FFF; }
-	</style>
-</head>
-
-<body background="images/brand/background_carbide.jpg" >
-<p>&nbsp;</p>
-<table width="530" border="0" align="center" cellpadding="0" cellspacing="5" bgcolor="#FFFFFF" >
-  <tr>
-    <td width="215"><img src="images/brand/about_cpp.png" width="225" height="200"></td>
-    <td width="294" valign="bottom"><p align="right"><b><img src="images/brand/brandmark_cpp.gif" width="106" height="52"></b></p>
-      <p align="right">&nbsp;</p>
-      <p align="right">&nbsp;</p>
-      <p align="right">&nbsp;</p>
-      <p class="titleSmall">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2"><h1 align="center">CodeScanner User Guide</h1>
-    <p align="center" class="titleSmall">Version 2.1.1; February, 2009</p></td>
-  </tr>
-</table>
-<p align="center">&nbsp;</p>
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>CodeScanner User Guide</title>
+    <link href="../book.css" rel="stylesheet" type="text/css">
+	<style>
+		table, td, th { border: 0px none #FFF; }
+	</style>
+</head>
+
+<body background="images/brand/background_carbide.jpg" >
+<p>&nbsp;</p>
+<table width="530" border="0" align="center" cellpadding="0" cellspacing="5" bgcolor="#FFFFFF" >
+  <tr>
+    <td width="215"><img src="images/brand/about_cpp.png" width="225" height="200"></td>
+    <td width="294" valign="bottom"><p align="right"><b><img src="images/brand/brandmark_cpp.gif" width="106" height="52"></b></p>
+      <p align="right">&nbsp;</p>
+      <p align="right">&nbsp;</p>
+      <p class="titleSmall">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2"><h1 align="center">CodeScanner User Guide</h1>
+    <p align="center" class="titleSmall">Version 2.1.3; April, 2009</p></td>
+  </tr>
+</table>
+<p align="center">&nbsp;</p>
+</body>
 </html>
\ No newline at end of file
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/html/images/brand/about_cpp.png
Binary file core/com.nokia.carbide.cpp.codescanner/html/images/brand/about_cpp.png has changed
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/html/images/brand/background_carbide.jpg
Binary file core/com.nokia.carbide.cpp.codescanner/html/images/brand/background_carbide.jpg has changed
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/schema/CSConfig.ecore
--- a/core/com.nokia.carbide.cpp.codescanner/schema/CSConfig.ecore	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/schema/CSConfig.ecore	Mon Apr 06 15:46:51 2009 -0500
@@ -813,6 +813,37 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CrepositoryType">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="crepository_._type"/>
+      <details key="kind" value="empty"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" eType="#//CategoryType"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="category"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enable" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="enable"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="severity" eType="#//SeverityType"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="severity"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CtltargettypeType">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="ctltargettype_._type"/>
@@ -844,6 +875,45 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CustomizableiconsType">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="customizableicons_._type"/>
+      <details key="kind" value="elementOnly"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconsRE" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="iconsRE"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" eType="#//CategoryType"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="category"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enable" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="enable"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="severity" eType="#//SeverityType"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="severity"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CustomrulesType">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="customrules_._type"/>
@@ -1309,6 +1379,15 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="crepository" upperBound="-2"
+        eType="#//CrepositoryType" volatile="true" transient="true" derived="true"
+        containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="crepository"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="ctltargettype" upperBound="-2"
         eType="#//CtltargettypeType" volatile="true" transient="true" derived="true"
         containment="true" resolveProxies="false">
@@ -1318,6 +1397,15 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="customizableicons" upperBound="-2"
+        eType="#//CustomizableiconsType" volatile="true" transient="true" derived="true"
+        containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="customizableicons"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="customrule" upperBound="-2"
         eType="#//CustomruleType" volatile="true" transient="true" derived="true"
         containment="true" resolveProxies="false">
@@ -1489,6 +1577,15 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="flags" upperBound="-2"
+        eType="#//FlagsType" volatile="true" transient="true" derived="true" containment="true"
+        resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="flags"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="foff" upperBound="-2" eType="#//FoffType"
         volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -1549,6 +1646,15 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconsRE" unique="false"
+        upperBound="-2" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
+        volatile="true" transient="true" derived="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="iconsRE"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="ifassignments" upperBound="-2"
         eType="#//IfassignmentsType" volatile="true" transient="true" derived="true"
         containment="true" resolveProxies="false">
@@ -2622,6 +2728,37 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FlagsType">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="flags_._type"/>
+      <details key="kind" value="empty"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" eType="#//CategoryType"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="category"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enable" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="enable"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="severity" eType="#//SeverityType"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="severity"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FoffType">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="foff_._type"/>
@@ -4464,6 +4601,14 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="crepository" eType="#//CrepositoryType"
+        volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="crepository"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="ctltargettype" eType="#//CtltargettypeType"
         volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -4472,6 +4617,14 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="customizableicons" eType="#//CustomizableiconsType"
+        volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="customizableicons"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="debugrom" eType="#//DebugromType"
         volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -4576,6 +4729,14 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="flags" eType="#//FlagsType"
+        volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="flags"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="foff" eType="#//FoffType"
         volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/schema/CSConfig.genmodel
--- a/core/com.nokia.carbide.cpp.codescanner/schema/CSConfig.genmodel	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/schema/CSConfig.genmodel	Mon Apr 06 15:46:51 2009 -0500
@@ -2,10 +2,8 @@
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/com.nokia.carbide.cpp.codescanner/src"
-    modelPluginID="com.nokia.carbide.cpp.codescanner" modelName="CSConfig" editPluginClass="com.nokia.carbide.cpp.codescanner.gen.CSConfig.provider.CSConfigEditPlugin"
-    editorPluginClass="com.nokia.carbide.cpp.codescanner.gen.CSConfig.presentation.CSConfigEditorPlugin"
-    testSuiteClass="com.nokia.carbide.cpp.codescanner.tests.gen.CSConfigAllTests"
-    importerID="org.eclipse.xsd.ecore.importer" complianceLevel="5.0">
+    modelPluginID="com.nokia.carbide.cpp.codescanner" modelName="CSConfig" importerID="org.eclipse.xsd.ecore.importer"
+    complianceLevel="5.0" copyrightFields="false">
   <foreignModel>CSConfig.xsd</foreignModel>
   <genPackages prefix="CSConfig" basePackage="com.nokia.carbide.cpp.internal.codescanner.gen"
       resource="XML" disposableProviderFactory="true" loadInitialization="true" literalsInterface="false"
@@ -155,11 +153,22 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//ControlornullType/enable"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//ControlornullType/severity"/>
     </genClasses>
+    <genClasses ecoreClass="CSConfig.ecore#//CrepositoryType">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//CrepositoryType/category"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//CrepositoryType/enable"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//CrepositoryType/severity"/>
+    </genClasses>
     <genClasses ecoreClass="CSConfig.ecore#//CtltargettypeType">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//CtltargettypeType/category"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//CtltargettypeType/enable"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//CtltargettypeType/severity"/>
     </genClasses>
+    <genClasses ecoreClass="CSConfig.ecore#//CustomizableiconsType">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//CustomizableiconsType/iconsRE"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//CustomizableiconsType/category"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//CustomizableiconsType/enable"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//CustomizableiconsType/severity"/>
+    </genClasses>
     <genClasses ecoreClass="CSConfig.ecore#//CustomrulesType">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//CustomrulesType/customrule"/>
     </genClasses>
@@ -224,7 +233,9 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/constnames"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/consttdescptr"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/controlornull"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/crepository"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/ctltargettype"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/customizableicons"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/customrule"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/customrules"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/debugrom"/>
@@ -244,6 +255,7 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/exportpurevirtual"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/externaldriveletters"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//DocumentRoot/filetype"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/flags"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/foff"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/forbiddenwords"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/forgottoputptroncleanupstack"/>
@@ -251,6 +263,7 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/functionality"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/goto"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/high"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//DocumentRoot/iconsRE"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/ifassignments"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/ifpreprocessor"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference CSConfig.ecore#//DocumentRoot/inheritanceorder"/>
@@ -386,6 +399,11 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//ExternaldrivelettersType/enable"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//ExternaldrivelettersType/severity"/>
     </genClasses>
+    <genClasses ecoreClass="CSConfig.ecore#//FlagsType">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//FlagsType/category"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//FlagsType/enable"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//FlagsType/severity"/>
+    </genClasses>
     <genClasses ecoreClass="CSConfig.ecore#//FoffType">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//FoffType/category"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CSConfig.ecore#//FoffType/enable"/>
@@ -682,7 +700,9 @@
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/constnames"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/consttdescptr"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/controlornull"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/crepository"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/ctltargettype"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/customizableicons"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/debugrom"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/declarename"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/deleteMemberVariable"/>
@@ -696,6 +716,7 @@
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/exportinline"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/exportpurevirtual"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/externaldriveletters"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/flags"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/foff"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/forbiddenwords"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference CSConfig.ecore#//ScriptsType/forgottoputptroncleanupstack"/>
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/schema/CSConfig.xsd
--- a/core/com.nokia.carbide.cpp.codescanner/schema/CSConfig.xsd	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/schema/CSConfig.xsd	Mon Apr 06 15:46:51 2009 -0500
@@ -185,7 +185,9 @@
 				<xs:element minOccurs="0" ref="constnames"/>
 				<xs:element minOccurs="0" ref="consttdescptr"/>
 				<xs:element minOccurs="0" ref="controlornull"/>
+				<xs:element minOccurs="0" ref="crepository"/>
 				<xs:element minOccurs="0" ref="ctltargettype"/>
+				<xs:element minOccurs="0" ref="customizableicons"/>
 				<xs:element minOccurs="0" ref="debugrom"/>
 				<xs:element minOccurs="0" ref="declarename"/>
 				<xs:element minOccurs="0" ref="deleteMemberVariable"/>
@@ -199,6 +201,7 @@
 				<xs:element minOccurs="0" ref="exportinline"/>
 				<xs:element minOccurs="0" ref="exportpurevirtual"/>
 				<xs:element minOccurs="0" ref="externaldriveletters"/>
+				<xs:element minOccurs="0" ref="flags"/>
 				<xs:element minOccurs="0" ref="foff"/>
 				<xs:element minOccurs="0" ref="forbiddenwords"/>
 				<xs:element minOccurs="0" ref="forgottoputptroncleanupstack"/>
@@ -633,6 +636,7 @@
 			<xs:attribute ref="category"/>
 		</xs:complexType>
 	</xs:element>
+	<xs:element name="iconsRE" type="xs:string"/>
 	<xs:element name="high">
 		<xs:complexType>
 			<xs:attribute name="enable" type="xs:boolean" use="required"/>
@@ -681,6 +685,13 @@
 			<xs:attribute ref="category"/>
 		</xs:complexType>
 	</xs:element>
+	<xs:element name="flags">
+		<xs:complexType>
+			<xs:attribute name="enable" type="xs:boolean" use="required"/>
+			<xs:attribute ref="severity"/>
+			<xs:attribute ref="category"/>
+		</xs:complexType>
+	</xs:element>
 	<xs:element name="filetype" type="xs:string"/>
 	<xs:element name="externaldriveletters">
 		<xs:complexType>
@@ -800,6 +811,16 @@
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
+	<xs:element name="customizableicons">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="iconsRE"/>
+			</xs:sequence>
+			<xs:attribute name="enable" type="xs:boolean" use="required"/>
+			<xs:attribute ref="severity"/>
+			<xs:attribute ref="category"/>
+		</xs:complexType>
+	</xs:element>
 	<xs:element name="ctltargettype">
 		<xs:complexType>
 			<xs:attribute name="enable" type="xs:boolean" use="required"/>
@@ -807,6 +828,13 @@
 			<xs:attribute ref="category"/>
 		</xs:complexType>
 	</xs:element>
+	<xs:element name="crepository">
+		<xs:complexType>
+			<xs:attribute name="enable" type="xs:boolean" use="required"/>
+			<xs:attribute ref="severity"/>
+			<xs:attribute ref="category"/>
+		</xs:complexType>
+	</xs:element>
 	<xs:element name="controlornull">
 		<xs:complexType>
 			<xs:attribute name="enable" type="xs:boolean" use="required"/>
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/config/CSConfigManager.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/config/CSConfigManager.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/config/CSConfigManager.java	Mon Apr 06 15:46:51 2009 -0500
@@ -323,6 +323,11 @@
 
 		configSettings.setScriptCClassIgnore(pageSettings.get(CSPreferenceConstants.CCLASSIGNORE));
 		configSettings.setScriptForbiddenWords(pageSettings.get(CSPreferenceConstants.FORBIDEENWORDS));
+		String icons = pageSettings.get(CSPreferenceConstants.ICONS);
+		if (icons.length() == 0) {
+			icons = null;
+		}
+		configSettings.setScriptIcons(icons);
 		configSettings.setScriptLFunctionIgnore(pageSettings.get(CSPreferenceConstants.LFUNCTIONIGNORE));
 		configSettings.setScriptLongLinesLength(pageSettings.getInt(CSPreferenceConstants.LONGLINES_LENGTH));
 		configSettings.setScriptOpenIgnore(pageSettings.get(CSPreferenceConstants.OPENIGNORE));
@@ -405,6 +410,11 @@
 
 		configSettings.setScriptCClassIgnore(store.getString(CSPreferenceConstants.CCLASSIGNORE));
 		configSettings.setScriptForbiddenWords(store.getString(CSPreferenceConstants.FORBIDEENWORDS));
+		String icons = store.getString(CSPreferenceConstants.ICONS);
+		if (icons != null && icons.length() == 0) {
+			icons = null;
+		}
+		configSettings.setScriptIcons(icons);
 		configSettings.setScriptLFunctionIgnore(store.getString(CSPreferenceConstants.LFUNCTIONIGNORE));
 		configSettings.setScriptLongLinesLength(store.getInt(CSPreferenceConstants.LONGLINES_LENGTH));
 		configSettings.setScriptOpenIgnore(store.getString(CSPreferenceConstants.OPENIGNORE));
@@ -477,6 +487,7 @@
 
     		settings.put(CSPreferenceConstants.CCLASSIGNORE, getCClassIgnoreFromConfig(configSettings));
     		settings.put(CSPreferenceConstants.FORBIDEENWORDS, getForbiddenWordsFromConfig(configSettings));
+    		settings.put(CSPreferenceConstants.ICONS, getIconsFromConfig(configSettings));
     		settings.put(CSPreferenceConstants.LFUNCTIONIGNORE, getLFunctionIgnoreFromConfig(configSettings));
     		settings.put(CSPreferenceConstants.LONGLINES_LENGTH, getLongLinesLengthFromConfig(configSettings));
     		settings.put(CSPreferenceConstants.OPENIGNORE, getOpenIgnoreFromConfig(configSettings));
@@ -540,6 +551,7 @@
 
     		store.setValue(CSPreferenceConstants.CCLASSIGNORE, getCClassIgnoreFromConfig(configSettings));
     		store.setValue(CSPreferenceConstants.FORBIDEENWORDS, getForbiddenWordsFromConfig(configSettings));
+    		store.setValue(CSPreferenceConstants.ICONS, getIconsFromConfig(configSettings));
     		store.setValue(CSPreferenceConstants.LFUNCTIONIGNORE, getLFunctionIgnoreFromConfig(configSettings));
     		store.setValue(CSPreferenceConstants.LONGLINES_LENGTH, getLongLinesLengthFromConfig(configSettings));
         	store.setValue(CSPreferenceConstants.OPENIGNORE, getOpenIgnoreFromConfig(configSettings));
@@ -610,6 +622,23 @@
 	}
 
 	/**
+	 * Get the customizable icons list from from a CodeScanner configuration settings. 
+	 * If the list does not exist in, get it from the default configuration settings.
+	 * @param configSettings - CodeScanner configuration settings to be read
+	 * @return customizable icons list as a string
+	 */
+	private String getIconsFromConfig(CSConfigSettings configSettings) {
+		String value = configSettings.getScriptIcons();
+		if (value == null) {
+			value = getDefaultConfig().getScriptIcons();
+		}
+		if (value == null) {
+			value = "";
+		}
+		return value;
+	}
+
+	/**
 	 * Get the L-function ignore list from from a CodeScanner configuration settings. 
 	 * If the list does not exist in, get it from the default configuration settings.
 	 * @param configSettings - CodeScanner configuration settings to be read
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/config/CSConfigSettings.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/config/CSConfigSettings.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/config/CSConfigSettings.java	Mon Apr 06 15:46:51 2009 -0500
@@ -340,8 +340,12 @@
 				return this.csConfig.getScripts().getConsttdescptr();
 			case script_controlornull:
 				return this.csConfig.getScripts().getControlornull();
+			case script_crepository:
+				return this.csConfig.getScripts().getCrepository();
 			case script_ctltargettype:
 				return this.csConfig.getScripts().getCtltargettype();
+			case script_customizableicons:
+				return this.csConfig.getScripts().getCustomizableicons();
 			case script_debugrom:
 				return this.csConfig.getScripts().getDebugrom();
 			case script_declarename:
@@ -366,8 +370,8 @@
 				return this.csConfig.getScripts().getExportinline();
 			case script_exportpurevirtual:
 				return this.csConfig.getScripts().getExportpurevirtual();
-//			case script_externaldriveletters:
-//				return this.csConfig.getScripts().getExternaldriveletters();
+			case script_flags:
+				return this.csConfig.getScripts().getFlags();
 			case script_foff:
 				return this.csConfig.getScripts().getFoff();
 			case script_forbiddenwords:
@@ -553,8 +557,12 @@
 				return this.csConfig.getScripts().getConsttdescptr().isEnable();
 			case script_controlornull:
 				return this.csConfig.getScripts().getControlornull().isEnable();
+			case script_crepository:
+				return this.csConfig.getScripts().getCrepository().isEnable();
 			case script_ctltargettype:
 				return this.csConfig.getScripts().getCtltargettype().isEnable();
+			case script_customizableicons:
+				return this.csConfig.getScripts().getCustomizableicons().isEnable();
 			case script_debugrom:
 				return this.csConfig.getScripts().getDebugrom().isEnable();
 			case script_declarename:
@@ -579,8 +587,8 @@
 				return this.csConfig.getScripts().getExportinline().isEnable();
 			case script_exportpurevirtual:
 				return this.csConfig.getScripts().getExportpurevirtual().isEnable();
-//			case script_externaldriveletters:
-//				return this.csConfig.getScripts().getExternaldriveletters().isEnable();
+			case script_flags:
+				return this.csConfig.getScripts().getFlags().isEnable();
 			case script_foff:
 				return this.csConfig.getScripts().getFoff().isEnable();
 			case script_forbiddenwords:
@@ -784,9 +792,15 @@
 			case script_controlornull:
 				this.csConfig.getScripts().getControlornull().setEnable(value);
 				break;
+			case script_crepository:
+				this.csConfig.getScripts().getCrepository().setEnable(value);
+				break;
 			case script_ctltargettype:
 				this.csConfig.getScripts().getCtltargettype().setEnable(value);
 				break;
+			case script_customizableicons:
+				this.csConfig.getScripts().getCustomizableicons().setEnable(value);
+				break;
 			case script_debugrom:
 				this.csConfig.getScripts().getDebugrom().setEnable(value);
 				break;
@@ -823,9 +837,9 @@
 			case script_exportpurevirtual:
 				this.csConfig.getScripts().getExportpurevirtual().setEnable(value);
 				break;
-//			case script_externaldriveletters:
-//				this.csConfig.getScripts().getExternaldriveletters().setEnable(value);
-//				break;
+			case script_flags:
+				this.csConfig.getScripts().getFlags().setEnable(value);
+				break;
 			case script_foff:
 				this.csConfig.getScripts().getFoff().setEnable(value);
 				break;
@@ -1079,8 +1093,12 @@
 				return this.csConfig.getScripts().getConsttdescptr().getCategory().toString();
 			case script_controlornull:
 				return this.csConfig.getScripts().getControlornull().getCategory().toString();
+			case script_crepository:
+				return this.csConfig.getScripts().getCrepository().getCategory().toString();
 			case script_ctltargettype:
 				return this.csConfig.getScripts().getCtltargettype().getCategory().toString();
+			case script_customizableicons:
+				return this.csConfig.getScripts().getCustomizableicons().getCategory().toString();
 			case script_debugrom:
 				return this.csConfig.getScripts().getDebugrom().getCategory().toString();
 			case script_declarename:
@@ -1105,8 +1123,8 @@
 				return this.csConfig.getScripts().getExportinline().getCategory().toString();
 			case script_exportpurevirtual:
 				return this.csConfig.getScripts().getExportpurevirtual().getCategory().toString();
-//			case script_externaldriveletters:
-//				return this.csConfig.getScripts().getExternaldriveletters().getCategory().toString();
+			case script_flags:
+				return this.csConfig.getScripts().getFlags().getCategory().toString();
 			case script_foff:
 				return this.csConfig.getScripts().getFoff().getCategory().toString();
 			case script_forbiddenwords:
@@ -1311,9 +1329,15 @@
 			case script_controlornull:
 				this.csConfig.getScripts().getControlornull().setCategory(category);
 				break;
+			case script_crepository:
+				this.csConfig.getScripts().getCrepository().setCategory(category);
+				break;
 			case script_ctltargettype:
 				this.csConfig.getScripts().getCtltargettype().setCategory(category);
 				break;
+			case script_customizableicons:
+				this.csConfig.getScripts().getCustomizableicons().setCategory(category);
+				break;
 			case script_debugrom:
 				this.csConfig.getScripts().getDebugrom().setCategory(category);
 				break;
@@ -1350,9 +1374,9 @@
 			case script_exportpurevirtual:
 				this.csConfig.getScripts().getExportpurevirtual().setCategory(category);
 				break;
-//			case script_externaldriveletters:
-//				this.csConfig.getScripts().getExternaldriveletters().setCategory(category);
-//				break;
+			case script_flags:
+				this.csConfig.getScripts().getFlags().setCategory(category);
+				break;
 			case script_foff:
 				this.csConfig.getScripts().getFoff().setCategory(category);
 				break;
@@ -1606,8 +1630,12 @@
 				return this.csConfig.getScripts().getConsttdescptr().getSeverity().toString();
 			case script_controlornull:
 				return this.csConfig.getScripts().getControlornull().getSeverity().toString();
+			case script_crepository:
+				return this.csConfig.getScripts().getCrepository().getSeverity().toString();
 			case script_ctltargettype:
 				return this.csConfig.getScripts().getCtltargettype().getSeverity().toString();
+			case script_customizableicons:
+				return this.csConfig.getScripts().getCustomizableicons().getSeverity().toString();
 			case script_debugrom:
 				return this.csConfig.getScripts().getDebugrom().getSeverity().toString();
 			case script_declarename:
@@ -1632,8 +1660,8 @@
 				return this.csConfig.getScripts().getExportinline().getSeverity().toString();
 			case script_exportpurevirtual:
 				return this.csConfig.getScripts().getExportpurevirtual().getSeverity().toString();
-//			case script_externaldriveletters:
-//				return this.csConfig.getScripts().getExternaldriveletters().getSeverity().toString();
+			case script_flags:
+				return this.csConfig.getScripts().getFlags().getSeverity().toString();
 			case script_foff:
 				return this.csConfig.getScripts().getFoff().getSeverity().toString();
 			case script_forbiddenwords:
@@ -1838,9 +1866,15 @@
 			case script_controlornull:
 				this.csConfig.getScripts().getControlornull().setSeverity(severity);
 				break;
+			case script_crepository:
+				this.csConfig.getScripts().getCrepository().setSeverity(severity);
+				break;
 			case script_ctltargettype:
 				this.csConfig.getScripts().getCtltargettype().setSeverity(severity);
 				break;
+			case script_customizableicons:
+				this.csConfig.getScripts().getCustomizableicons().setSeverity(severity);
+				break;
 			case script_debugrom:
 				this.csConfig.getScripts().getDebugrom().setSeverity(severity);
 				break;
@@ -1877,9 +1911,9 @@
 			case script_exportpurevirtual:
 				this.csConfig.getScripts().getExportpurevirtual().setSeverity(severity);
 				break;
-//			case script_externaldriveletters:
-//				this.csConfig.getScripts().getExternaldriveletters().setSeverity(severity);
-//				break;
+			case script_flags:
+				this.csConfig.getScripts().getFlags().setSeverity(severity);
+				break;
 			case script_foff:
 				this.csConfig.getScripts().getFoff().setSeverity(severity);
 				break;
@@ -2123,6 +2157,22 @@
 	}
 
 	/**
+	 * Retrieve the iconsRE value of the customizableicons script
+	 * @return iconsRE
+	 */
+	public String getScriptIcons() {
+		return this.csConfig.getScripts().getCustomizableicons().getIconsRE();
+	}
+
+	/**
+	 * Set the iconsRE value of the customizableicons script
+	 * @param value - new iconsRE value
+	 */
+	public void setScriptIcons(String value)	 {
+		this.csConfig.getScripts().getCustomizableicons().setIconsRE(value);
+	}
+
+	/**
 	 * Retrieve the LFunctionIgnoreRE value of the LFunctionCantLeave script
 	 * @return LFunctionIgnoreRE
 	 */
@@ -2483,12 +2533,25 @@
 		script_Controlornull.setSeverity(SeverityType.HIGH);
 		scripts.setControlornull(script_Controlornull);
 
+		CrepositoryType script_Crepository = CSConfigFactory.eINSTANCE.createCrepositoryType();
+		script_Crepository.setCategory(CategoryType.OTHER);
+		script_Crepository.setEnable(true);
+		script_Crepository.setSeverity(SeverityType.LOW);
+		scripts.setCrepository(script_Crepository);
+
 		CtltargettypeType script_Ctltargettype = CSConfigFactory.eINSTANCE.createCtltargettypeType();
 		script_Ctltargettype.setCategory(CategoryType.FUNCTIONALITY);
 		script_Ctltargettype.setEnable(true);
 		script_Ctltargettype.setSeverity(SeverityType.MEDIUM);
 		scripts.setCtltargettype(script_Ctltargettype);
 
+		CustomizableiconsType script_Customizableicons = CSConfigFactory.eINSTANCE.createCustomizableiconsType();
+		script_Customizableicons.setCategory(CategoryType.OTHER);
+		script_Customizableicons.setEnable(true);
+		script_Customizableicons.setSeverity(SeverityType.LOW);
+		//script_Customizableicons.setIconsRE("");
+		scripts.setCustomizableicons(script_Customizableicons);
+
 		DebugromType script_Debugrom = CSConfigFactory.eINSTANCE.createDebugromType();
 		script_Debugrom.setCategory(CategoryType.PERFORMANCE);
 		script_Debugrom.setEnable(true);
@@ -2561,11 +2624,11 @@
 		script_Exportpurevirtual.setSeverity(SeverityType.MEDIUM);
 		scripts.setExportpurevirtual(script_Exportpurevirtual);
 
-//		ExternaldrivelettersType script_Externaldriveletters = CSConfigFactory.eINSTANCE.createExternaldrivelettersType();
-//		script_Externaldriveletters.setCategory(CategoryType.CANPANIC);
-//		script_Externaldriveletters.setEnable(true);
-//		script_Externaldriveletters.setSeverity(SeverityType.HIGH);
-//		scripts.setExternaldriveletters(script_Externaldriveletters);
+		FlagsType script_Flags = CSConfigFactory.eINSTANCE.createFlagsType();
+		script_Flags.setCategory(CategoryType.OTHER);
+		script_Flags.setEnable(true);
+		script_Flags.setSeverity(SeverityType.LOW);
+		scripts.setFlags(script_Flags);
 
 		FoffType script_Foff = CSConfigFactory.eINSTANCE.createFoffType();
 		script_Foff.setCategory(CategoryType.CODEREVIEW);
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/config/CSRule.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/config/CSRule.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/config/CSRule.java	Mon Apr 06 15:46:51 2009 -0500
@@ -123,8 +123,12 @@
 			return Messages.getString("CSRule.Consttdescptr");
 		case script_controlornull:
 			return Messages.getString("CSRule.Controlornull");
+		case script_crepository:
+			return Messages.getString("CSRule.Crepository");
 		case script_ctltargettype:
 			return Messages.getString("CSRule.Ctltargettype");
+		case script_customizableicons:
+			return Messages.getString("CSRule.Customizableicons");
 		case script_debugrom:
 			return Messages.getString("CSRule.Debugrom");
 		case script_declarename:
@@ -149,8 +153,8 @@
 			return Messages.getString("CSRule.Exportinline");
 		case script_exportpurevirtual:
 			return Messages.getString("CSRule.Exportpurevirtual");
-//		case script_externaldriveletters:
-//			return Messages.getString("CSRule.Externaldriveletters");
+		case script_flags:
+			return Messages.getString("CSRule.Flags");
 		case script_foff:
 			return Messages.getString("CSRule.Foff");
 		case script_forbiddenwords:
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/config/CSScript.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/config/CSScript.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/config/CSScript.java	Mon Apr 06 15:46:51 2009 -0500
@@ -40,7 +40,9 @@
 	script_constnames("constnames"),
 	script_consttdescptr("consttdescptr"),
 	script_controlornull("controlornull"),
+	script_crepository("crepository"),
 	script_ctltargettype("ctltargettype"),
+	script_customizableicons("customizableicons"),
 	script_debugrom("debugrom"),
 	script_declarename("declarename"),
 	script_deleteMemberVariable("deleteMemberVariable"),
@@ -53,7 +55,7 @@
 	script_enumnames("enumnames"),
 	script_exportinline("exportinline"),
 	script_exportpurevirtual("exportpurevirtual"),
-	//script_externaldriveletters("externaldriveletters"),
+	script_flags("flags"),
 	script_foff("foff"),
 	script_forbiddenwords("forbiddenwords"),
 	script_forgottoputptroncleanupstack("forgottoputptroncleanupstack"),
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/CSConfigFactory.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/CSConfigFactory.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/CSConfigFactory.java	Mon Apr 06 15:46:51 2009 -0500
@@ -253,6 +253,15 @@
 	ControlornullType createControlornullType();
 
 	/**
+	 * Returns a new object of class '<em>Crepository Type</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Crepository Type</em>'.
+	 * @generated
+	 */
+	CrepositoryType createCrepositoryType();
+
+	/**
 	 * Returns a new object of class '<em>Ctltargettype Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -262,6 +271,15 @@
 	CtltargettypeType createCtltargettypeType();
 
 	/**
+	 * Returns a new object of class '<em>Customizableicons Type</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Customizableicons Type</em>'.
+	 * @generated
+	 */
+	CustomizableiconsType createCustomizableiconsType();
+
+	/**
 	 * Returns a new object of class '<em>Customrules Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -415,6 +433,15 @@
 	ExternaldrivelettersType createExternaldrivelettersType();
 
 	/**
+	 * Returns a new object of class '<em>Flags Type</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Flags Type</em>'.
+	 * @generated
+	 */
+	FlagsType createFlagsType();
+
+	/**
 	 * Returns a new object of class '<em>Foff Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/CSConfigPackage.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/CSConfigPackage.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/CSConfigPackage.java	Mon Apr 06 15:46:51 2009 -0500
@@ -1232,6 +1232,52 @@
 	int CONTROLORNULL_TYPE_FEATURE_COUNT = 3;
 
 	/**
+	 * The meta object id for the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CrepositoryTypeImpl <em>Crepository Type</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CrepositoryTypeImpl
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getCrepositoryType()
+	 * @generated
+	 */
+	int CREPOSITORY_TYPE = 24;
+
+	/**
+	 * The feature id for the '<em><b>Category</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREPOSITORY_TYPE__CATEGORY = 0;
+
+	/**
+	 * The feature id for the '<em><b>Enable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREPOSITORY_TYPE__ENABLE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Severity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREPOSITORY_TYPE__SEVERITY = 2;
+
+	/**
+	 * The number of structural features of the '<em>Crepository Type</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREPOSITORY_TYPE_FEATURE_COUNT = 3;
+
+	/**
 	 * The meta object id for the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CtltargettypeTypeImpl <em>Ctltargettype Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1239,7 +1285,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getCtltargettypeType()
 	 * @generated
 	 */
-	int CTLTARGETTYPE_TYPE = 24;
+	int CTLTARGETTYPE_TYPE = 25;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -1278,6 +1324,61 @@
 	int CTLTARGETTYPE_TYPE_FEATURE_COUNT = 3;
 
 	/**
+	 * The meta object id for the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CustomizableiconsTypeImpl <em>Customizableicons Type</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CustomizableiconsTypeImpl
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getCustomizableiconsType()
+	 * @generated
+	 */
+	int CUSTOMIZABLEICONS_TYPE = 26;
+
+	/**
+	 * The feature id for the '<em><b>Icons RE</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUSTOMIZABLEICONS_TYPE__ICONS_RE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Category</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUSTOMIZABLEICONS_TYPE__CATEGORY = 1;
+
+	/**
+	 * The feature id for the '<em><b>Enable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUSTOMIZABLEICONS_TYPE__ENABLE = 2;
+
+	/**
+	 * The feature id for the '<em><b>Severity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUSTOMIZABLEICONS_TYPE__SEVERITY = 3;
+
+	/**
+	 * The number of structural features of the '<em>Customizableicons Type</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUSTOMIZABLEICONS_TYPE_FEATURE_COUNT = 4;
+
+	/**
 	 * The meta object id for the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CustomrulesTypeImpl <em>Customrules Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1285,7 +1386,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getCustomrulesType()
 	 * @generated
 	 */
-	int CUSTOMRULES_TYPE = 25;
+	int CUSTOMRULES_TYPE = 27;
 
 	/**
 	 * The feature id for the '<em><b>Customrule</b></em>' containment reference list.
@@ -1313,7 +1414,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getCustomruleType()
 	 * @generated
 	 */
-	int CUSTOMRULE_TYPE = 26;
+	int CUSTOMRULE_TYPE = 28;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1395,7 +1496,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getDebugromType()
 	 * @generated
 	 */
-	int DEBUGROM_TYPE = 27;
+	int DEBUGROM_TYPE = 29;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -1441,7 +1542,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getDeclarenameType()
 	 * @generated
 	 */
-	int DECLARENAME_TYPE = 28;
+	int DECLARENAME_TYPE = 30;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -1487,7 +1588,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getDeleteMemberVariableType()
 	 * @generated
 	 */
-	int DELETE_MEMBER_VARIABLE_TYPE = 29;
+	int DELETE_MEMBER_VARIABLE_TYPE = 31;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -1533,7 +1634,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getDestructorType()
 	 * @generated
 	 */
-	int DESTRUCTOR_TYPE = 30;
+	int DESTRUCTOR_TYPE = 32;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -1579,7 +1680,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getDocumentationType()
 	 * @generated
 	 */
-	int DOCUMENTATION_TYPE = 31;
+	int DOCUMENTATION_TYPE = 33;
 
 	/**
 	 * The feature id for the '<em><b>Enable</b></em>' attribute.
@@ -1607,7 +1708,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getDocumentRoot()
 	 * @generated
 	 */
-	int DOCUMENT_ROOT = 32;
+	int DOCUMENT_ROOT = 34;
 
 	/**
 	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
@@ -1862,13 +1963,31 @@
 	int DOCUMENT_ROOT__CONTROLORNULL = 27;
 
 	/**
+	 * The feature id for the '<em><b>Crepository</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOCUMENT_ROOT__CREPOSITORY = 28;
+
+	/**
 	 * The feature id for the '<em><b>Ctltargettype</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__CTLTARGETTYPE = 28;
+	int DOCUMENT_ROOT__CTLTARGETTYPE = 29;
+
+	/**
+	 * The feature id for the '<em><b>Customizableicons</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOCUMENT_ROOT__CUSTOMIZABLEICONS = 30;
 
 	/**
 	 * The feature id for the '<em><b>Customrule</b></em>' containment reference.
@@ -1877,7 +1996,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__CUSTOMRULE = 29;
+	int DOCUMENT_ROOT__CUSTOMRULE = 31;
 
 	/**
 	 * The feature id for the '<em><b>Customrules</b></em>' containment reference.
@@ -1886,7 +2005,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__CUSTOMRULES = 30;
+	int DOCUMENT_ROOT__CUSTOMRULES = 32;
 
 	/**
 	 * The feature id for the '<em><b>Debugrom</b></em>' containment reference.
@@ -1895,7 +2014,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__DEBUGROM = 31;
+	int DOCUMENT_ROOT__DEBUGROM = 33;
 
 	/**
 	 * The feature id for the '<em><b>Declarename</b></em>' containment reference.
@@ -1904,7 +2023,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__DECLARENAME = 32;
+	int DOCUMENT_ROOT__DECLARENAME = 34;
 
 	/**
 	 * The feature id for the '<em><b>Delete Member Variable</b></em>' containment reference.
@@ -1913,7 +2032,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__DELETE_MEMBER_VARIABLE = 33;
+	int DOCUMENT_ROOT__DELETE_MEMBER_VARIABLE = 35;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -1922,7 +2041,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__DESCRIPTION = 34;
+	int DOCUMENT_ROOT__DESCRIPTION = 36;
 
 	/**
 	 * The feature id for the '<em><b>Destructor</b></em>' containment reference.
@@ -1931,7 +2050,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__DESTRUCTOR = 35;
+	int DOCUMENT_ROOT__DESTRUCTOR = 37;
 
 	/**
 	 * The feature id for the '<em><b>Documentation</b></em>' containment reference.
@@ -1940,7 +2059,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__DOCUMENTATION = 36;
+	int DOCUMENT_ROOT__DOCUMENTATION = 38;
 
 	/**
 	 * The feature id for the '<em><b>Double Semi Colon</b></em>' containment reference.
@@ -1949,7 +2068,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__DOUBLE_SEMI_COLON = 37;
+	int DOCUMENT_ROOT__DOUBLE_SEMI_COLON = 39;
 
 	/**
 	 * The feature id for the '<em><b>Driveletters</b></em>' containment reference.
@@ -1958,7 +2077,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__DRIVELETTERS = 38;
+	int DOCUMENT_ROOT__DRIVELETTERS = 40;
 
 	/**
 	 * The feature id for the '<em><b>Eikbuttons</b></em>' containment reference.
@@ -1967,7 +2086,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__EIKBUTTONS = 39;
+	int DOCUMENT_ROOT__EIKBUTTONS = 41;
 
 	/**
 	 * The feature id for the '<em><b>Eikonenvstatic</b></em>' containment reference.
@@ -1976,7 +2095,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__EIKONENVSTATIC = 40;
+	int DOCUMENT_ROOT__EIKONENVSTATIC = 42;
 
 	/**
 	 * The feature id for the '<em><b>Enummembers</b></em>' containment reference.
@@ -1985,7 +2104,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__ENUMMEMBERS = 41;
+	int DOCUMENT_ROOT__ENUMMEMBERS = 43;
 
 	/**
 	 * The feature id for the '<em><b>Enumnames</b></em>' containment reference.
@@ -1994,7 +2113,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__ENUMNAMES = 42;
+	int DOCUMENT_ROOT__ENUMNAMES = 44;
 
 	/**
 	 * The feature id for the '<em><b>Exclude</b></em>' attribute.
@@ -2003,7 +2122,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__EXCLUDE = 43;
+	int DOCUMENT_ROOT__EXCLUDE = 45;
 
 	/**
 	 * The feature id for the '<em><b>Exportinline</b></em>' containment reference.
@@ -2012,7 +2131,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__EXPORTINLINE = 44;
+	int DOCUMENT_ROOT__EXPORTINLINE = 46;
 
 	/**
 	 * The feature id for the '<em><b>Exportpurevirtual</b></em>' containment reference.
@@ -2021,7 +2140,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__EXPORTPUREVIRTUAL = 45;
+	int DOCUMENT_ROOT__EXPORTPUREVIRTUAL = 47;
 
 	/**
 	 * The feature id for the '<em><b>Externaldriveletters</b></em>' containment reference.
@@ -2030,7 +2149,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__EXTERNALDRIVELETTERS = 46;
+	int DOCUMENT_ROOT__EXTERNALDRIVELETTERS = 48;
 
 	/**
 	 * The feature id for the '<em><b>Filetype</b></em>' attribute.
@@ -2039,7 +2158,16 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__FILETYPE = 47;
+	int DOCUMENT_ROOT__FILETYPE = 49;
+
+	/**
+	 * The feature id for the '<em><b>Flags</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOCUMENT_ROOT__FLAGS = 50;
 
 	/**
 	 * The feature id for the '<em><b>Foff</b></em>' containment reference.
@@ -2048,7 +2176,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__FOFF = 48;
+	int DOCUMENT_ROOT__FOFF = 51;
 
 	/**
 	 * The feature id for the '<em><b>Forbiddenwords</b></em>' containment reference.
@@ -2057,7 +2185,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__FORBIDDENWORDS = 49;
+	int DOCUMENT_ROOT__FORBIDDENWORDS = 52;
 
 	/**
 	 * The feature id for the '<em><b>Forgottoputptroncleanupstack</b></em>' containment reference.
@@ -2066,7 +2194,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__FORGOTTOPUTPTRONCLEANUPSTACK = 50;
+	int DOCUMENT_ROOT__FORGOTTOPUTPTRONCLEANUPSTACK = 53;
 
 	/**
 	 * The feature id for the '<em><b>Friend</b></em>' containment reference.
@@ -2075,7 +2203,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__FRIEND = 51;
+	int DOCUMENT_ROOT__FRIEND = 54;
 
 	/**
 	 * The feature id for the '<em><b>Functionality</b></em>' containment reference.
@@ -2084,7 +2212,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__FUNCTIONALITY = 52;
+	int DOCUMENT_ROOT__FUNCTIONALITY = 55;
 
 	/**
 	 * The feature id for the '<em><b>Goto</b></em>' containment reference.
@@ -2093,7 +2221,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__GOTO = 53;
+	int DOCUMENT_ROOT__GOTO = 56;
 
 	/**
 	 * The feature id for the '<em><b>High</b></em>' containment reference.
@@ -2102,7 +2230,16 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__HIGH = 54;
+	int DOCUMENT_ROOT__HIGH = 57;
+
+	/**
+	 * The feature id for the '<em><b>Icons RE</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOCUMENT_ROOT__ICONS_RE = 58;
 
 	/**
 	 * The feature id for the '<em><b>Ifassignments</b></em>' containment reference.
@@ -2111,7 +2248,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__IFASSIGNMENTS = 55;
+	int DOCUMENT_ROOT__IFASSIGNMENTS = 59;
 
 	/**
 	 * The feature id for the '<em><b>Ifpreprocessor</b></em>' containment reference.
@@ -2120,7 +2257,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__IFPREPROCESSOR = 56;
+	int DOCUMENT_ROOT__IFPREPROCESSOR = 60;
 
 	/**
 	 * The feature id for the '<em><b>Inheritanceorder</b></em>' containment reference.
@@ -2129,7 +2266,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__INHERITANCEORDER = 57;
+	int DOCUMENT_ROOT__INHERITANCEORDER = 61;
 
 	/**
 	 * The feature id for the '<em><b>Input</b></em>' attribute.
@@ -2138,7 +2275,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__INPUT = 58;
+	int DOCUMENT_ROOT__INPUT = 62;
 
 	/**
 	 * The feature id for the '<em><b>Intleaves</b></em>' containment reference.
@@ -2147,7 +2284,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__INTLEAVES = 59;
+	int DOCUMENT_ROOT__INTLEAVES = 63;
 
 	/**
 	 * The feature id for the '<em><b>Jmp</b></em>' containment reference.
@@ -2156,7 +2293,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__JMP = 60;
+	int DOCUMENT_ROOT__JMP = 64;
 
 	/**
 	 * The feature id for the '<em><b>Keyword</b></em>' containment reference.
@@ -2165,7 +2302,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__KEYWORD = 61;
+	int DOCUMENT_ROOT__KEYWORD = 65;
 
 	/**
 	 * The feature id for the '<em><b>Leave</b></em>' containment reference.
@@ -2174,7 +2311,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__LEAVE = 62;
+	int DOCUMENT_ROOT__LEAVE = 66;
 
 	/**
 	 * The feature id for the '<em><b>Leave No Error</b></em>' containment reference.
@@ -2183,7 +2320,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__LEAVE_NO_ERROR = 63;
+	int DOCUMENT_ROOT__LEAVE_NO_ERROR = 67;
 
 	/**
 	 * The feature id for the '<em><b>Leavingoperators</b></em>' containment reference.
@@ -2192,7 +2329,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__LEAVINGOPERATORS = 64;
+	int DOCUMENT_ROOT__LEAVINGOPERATORS = 68;
 
 	/**
 	 * The feature id for the '<em><b>Legal</b></em>' containment reference.
@@ -2201,7 +2338,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__LEGAL = 65;
+	int DOCUMENT_ROOT__LEGAL = 69;
 
 	/**
 	 * The feature id for the '<em><b>LFunction Cant Leave</b></em>' containment reference.
@@ -2210,7 +2347,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__LFUNCTION_CANT_LEAVE = 66;
+	int DOCUMENT_ROOT__LFUNCTION_CANT_LEAVE = 70;
 
 	/**
 	 * The feature id for the '<em><b>LFunction Ignore RE</b></em>' attribute.
@@ -2219,7 +2356,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__LFUNCTION_IGNORE_RE = 67;
+	int DOCUMENT_ROOT__LFUNCTION_IGNORE_RE = 71;
 
 	/**
 	 * The feature id for the '<em><b>Link</b></em>' attribute.
@@ -2228,7 +2365,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__LINK = 68;
+	int DOCUMENT_ROOT__LINK = 72;
 
 	/**
 	 * The feature id for the '<em><b>Localisation</b></em>' containment reference.
@@ -2237,7 +2374,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__LOCALISATION = 69;
+	int DOCUMENT_ROOT__LOCALISATION = 73;
 
 	/**
 	 * The feature id for the '<em><b>Longlines</b></em>' containment reference.
@@ -2246,7 +2383,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__LONGLINES = 70;
+	int DOCUMENT_ROOT__LONGLINES = 74;
 
 	/**
 	 * The feature id for the '<em><b>Low</b></em>' containment reference.
@@ -2255,7 +2392,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__LOW = 71;
+	int DOCUMENT_ROOT__LOW = 75;
 
 	/**
 	 * The feature id for the '<em><b>Lxr</b></em>' attribute.
@@ -2264,7 +2401,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__LXR = 72;
+	int DOCUMENT_ROOT__LXR = 76;
 
 	/**
 	 * The feature id for the '<em><b>Lxrversion</b></em>' attribute.
@@ -2273,7 +2410,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__LXRVERSION = 73;
+	int DOCUMENT_ROOT__LXRVERSION = 77;
 
 	/**
 	 * The feature id for the '<em><b>Magicnumbers</b></em>' containment reference.
@@ -2282,7 +2419,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__MAGICNUMBERS = 74;
+	int DOCUMENT_ROOT__MAGICNUMBERS = 78;
 
 	/**
 	 * The feature id for the '<em><b>Mclassdestructor</b></em>' containment reference.
@@ -2291,7 +2428,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__MCLASSDESTRUCTOR = 75;
+	int DOCUMENT_ROOT__MCLASSDESTRUCTOR = 79;
 
 	/**
 	 * The feature id for the '<em><b>Medium</b></em>' containment reference.
@@ -2300,7 +2437,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__MEDIUM = 76;
+	int DOCUMENT_ROOT__MEDIUM = 80;
 
 	/**
 	 * The feature id for the '<em><b>Memberlc</b></em>' containment reference.
@@ -2309,7 +2446,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__MEMBERLC = 77;
+	int DOCUMENT_ROOT__MEMBERLC = 81;
 
 	/**
 	 * The feature id for the '<em><b>Membervariablecallld</b></em>' containment reference.
@@ -2318,7 +2455,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__MEMBERVARIABLECALLLD = 78;
+	int DOCUMENT_ROOT__MEMBERVARIABLECALLLD = 82;
 
 	/**
 	 * The feature id for the '<em><b>Missingcancel</b></em>' containment reference.
@@ -2327,7 +2464,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__MISSINGCANCEL = 79;
+	int DOCUMENT_ROOT__MISSINGCANCEL = 83;
 
 	/**
 	 * The feature id for the '<em><b>Missingcclass</b></em>' containment reference.
@@ -2336,7 +2473,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__MISSINGCCLASS = 80;
+	int DOCUMENT_ROOT__MISSINGCCLASS = 84;
 
 	/**
 	 * The feature id for the '<em><b>Mmpsourcepath</b></em>' containment reference.
@@ -2345,7 +2482,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__MMPSOURCEPATH = 81;
+	int DOCUMENT_ROOT__MMPSOURCEPATH = 85;
 
 	/**
 	 * The feature id for the '<em><b>Multilangrsc</b></em>' containment reference.
@@ -2354,7 +2491,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__MULTILANGRSC = 82;
+	int DOCUMENT_ROOT__MULTILANGRSC = 86;
 
 	/**
 	 * The feature id for the '<em><b>Multipledeclarations</b></em>' containment reference.
@@ -2363,7 +2500,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__MULTIPLEDECLARATIONS = 83;
+	int DOCUMENT_ROOT__MULTIPLEDECLARATIONS = 87;
 
 	/**
 	 * The feature id for the '<em><b>Multipleinheritance</b></em>' containment reference.
@@ -2372,7 +2509,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__MULTIPLEINHERITANCE = 84;
+	int DOCUMENT_ROOT__MULTIPLEINHERITANCE = 88;
 
 	/**
 	 * The feature id for the '<em><b>Mydocs</b></em>' containment reference.
@@ -2381,7 +2518,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__MYDOCS = 85;
+	int DOCUMENT_ROOT__MYDOCS = 89;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -2390,7 +2527,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__NAME = 86;
+	int DOCUMENT_ROOT__NAME = 90;
 
 	/**
 	 * The feature id for the '<em><b>Namespace</b></em>' containment reference.
@@ -2399,7 +2536,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__NAMESPACE = 87;
+	int DOCUMENT_ROOT__NAMESPACE = 91;
 
 	/**
 	 * The feature id for the '<em><b>Newlreferences</b></em>' containment reference.
@@ -2408,7 +2545,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__NEWLREFERENCES = 88;
+	int DOCUMENT_ROOT__NEWLREFERENCES = 92;
 
 	/**
 	 * The feature id for the '<em><b>Noleavetrap</b></em>' containment reference.
@@ -2417,7 +2554,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__NOLEAVETRAP = 89;
+	int DOCUMENT_ROOT__NOLEAVETRAP = 93;
 
 	/**
 	 * The feature id for the '<em><b>Nonconsthbufc</b></em>' containment reference.
@@ -2426,7 +2563,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__NONCONSTHBUFC = 90;
+	int DOCUMENT_ROOT__NONCONSTHBUFC = 94;
 
 	/**
 	 * The feature id for the '<em><b>Nonconsttdesc</b></em>' containment reference.
@@ -2435,7 +2572,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__NONCONSTTDESC = 91;
+	int DOCUMENT_ROOT__NONCONSTTDESC = 95;
 
 	/**
 	 * The feature id for the '<em><b>Nonleavenew</b></em>' containment reference.
@@ -2444,7 +2581,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__NONLEAVENEW = 92;
+	int DOCUMENT_ROOT__NONLEAVENEW = 96;
 
 	/**
 	 * The feature id for the '<em><b>Nonunicodeskins</b></em>' containment reference.
@@ -2453,7 +2590,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__NONUNICODESKINS = 93;
+	int DOCUMENT_ROOT__NONUNICODESKINS = 97;
 
 	/**
 	 * The feature id for the '<em><b>Null</b></em>' containment reference.
@@ -2462,7 +2599,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__NULL = 94;
+	int DOCUMENT_ROOT__NULL = 98;
 
 	/**
 	 * The feature id for the '<em><b>Open</b></em>' containment reference.
@@ -2471,7 +2608,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__OPEN = 95;
+	int DOCUMENT_ROOT__OPEN = 99;
 
 	/**
 	 * The feature id for the '<em><b>Open Ignore RE</b></em>' attribute.
@@ -2480,7 +2617,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__OPEN_IGNORE_RE = 96;
+	int DOCUMENT_ROOT__OPEN_IGNORE_RE = 100;
 
 	/**
 	 * The feature id for the '<em><b>Other</b></em>' containment reference.
@@ -2489,7 +2626,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__OTHER = 97;
+	int DOCUMENT_ROOT__OTHER = 101;
 
 	/**
 	 * The feature id for the '<em><b>Outputformat</b></em>' attribute.
@@ -2498,7 +2635,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__OUTPUTFORMAT = 98;
+	int DOCUMENT_ROOT__OUTPUTFORMAT = 102;
 
 	/**
 	 * The feature id for the '<em><b>Panic</b></em>' containment reference.
@@ -2507,7 +2644,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__PANIC = 99;
+	int DOCUMENT_ROOT__PANIC = 103;
 
 	/**
 	 * The feature id for the '<em><b>Performance</b></em>' containment reference.
@@ -2516,7 +2653,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__PERFORMANCE = 100;
+	int DOCUMENT_ROOT__PERFORMANCE = 104;
 
 	/**
 	 * The feature id for the '<em><b>Pointertoarrays</b></em>' containment reference.
@@ -2525,7 +2662,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__POINTERTOARRAYS = 101;
+	int DOCUMENT_ROOT__POINTERTOARRAYS = 105;
 
 	/**
 	 * The feature id for the '<em><b>Pragmadisable</b></em>' containment reference.
@@ -2534,7 +2671,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__PRAGMADISABLE = 102;
+	int DOCUMENT_ROOT__PRAGMADISABLE = 106;
 
 	/**
 	 * The feature id for the '<em><b>Pragmamessage</b></em>' containment reference.
@@ -2543,7 +2680,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__PRAGMAMESSAGE = 103;
+	int DOCUMENT_ROOT__PRAGMAMESSAGE = 107;
 
 	/**
 	 * The feature id for the '<em><b>Pragmaother</b></em>' containment reference.
@@ -2552,7 +2689,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__PRAGMAOTHER = 104;
+	int DOCUMENT_ROOT__PRAGMAOTHER = 108;
 
 	/**
 	 * The feature id for the '<em><b>Privateinheritance</b></em>' containment reference.
@@ -2561,7 +2698,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__PRIVATEINHERITANCE = 105;
+	int DOCUMENT_ROOT__PRIVATEINHERITANCE = 109;
 
 	/**
 	 * The feature id for the '<em><b>Pushaddrvar</b></em>' containment reference.
@@ -2570,7 +2707,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__PUSHADDRVAR = 106;
+	int DOCUMENT_ROOT__PUSHADDRVAR = 110;
 
 	/**
 	 * The feature id for the '<em><b>Pushmember</b></em>' containment reference.
@@ -2579,7 +2716,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__PUSHMEMBER = 107;
+	int DOCUMENT_ROOT__PUSHMEMBER = 111;
 
 	/**
 	 * The feature id for the '<em><b>Readresource</b></em>' containment reference.
@@ -2588,7 +2725,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__READRESOURCE = 108;
+	int DOCUMENT_ROOT__READRESOURCE = 112;
 
 	/**
 	 * The feature id for the '<em><b>Resourcenotoncleanupstack</b></em>' containment reference.
@@ -2597,7 +2734,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__RESOURCENOTONCLEANUPSTACK = 109;
+	int DOCUMENT_ROOT__RESOURCENOTONCLEANUPSTACK = 113;
 
 	/**
 	 * The feature id for the '<em><b>Resourcesonheap</b></em>' containment reference.
@@ -2606,7 +2743,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__RESOURCESONHEAP = 110;
+	int DOCUMENT_ROOT__RESOURCESONHEAP = 114;
 
 	/**
 	 * The feature id for the '<em><b>Returndescriptoroutofscope</b></em>' containment reference.
@@ -2615,7 +2752,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__RETURNDESCRIPTOROUTOFSCOPE = 111;
+	int DOCUMENT_ROOT__RETURNDESCRIPTOROUTOFSCOPE = 115;
 
 	/**
 	 * The feature id for the '<em><b>Rfs</b></em>' containment reference.
@@ -2624,7 +2761,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__RFS = 112;
+	int DOCUMENT_ROOT__RFS = 116;
 
 	/**
 	 * The feature id for the '<em><b>Rssnames</b></em>' containment reference.
@@ -2633,7 +2770,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__RSSNAMES = 113;
+	int DOCUMENT_ROOT__RSSNAMES = 117;
 
 	/**
 	 * The feature id for the '<em><b>Scripts</b></em>' containment reference.
@@ -2642,7 +2779,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__SCRIPTS = 114;
+	int DOCUMENT_ROOT__SCRIPTS = 118;
 
 	/**
 	 * The feature id for the '<em><b>Severities</b></em>' containment reference.
@@ -2651,16 +2788,16 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__SEVERITIES = 115;
-
-	/**
-	 * The feature id for the '<em><b>Severity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__SEVERITY = 116;
+	int DOCUMENT_ROOT__SEVERITIES = 119;
+
+	/**
+	 * The feature id for the '<em><b>Severity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOCUMENT_ROOT__SEVERITY = 120;
 
 	/**
 	 * The feature id for the '<em><b>Sources</b></em>' containment reference.
@@ -2669,7 +2806,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__SOURCES = 117;
+	int DOCUMENT_ROOT__SOURCES = 121;
 
 	/**
 	 * The feature id for the '<em><b>Stringliterals</b></em>' containment reference.
@@ -2678,7 +2815,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__STRINGLITERALS = 118;
+	int DOCUMENT_ROOT__STRINGLITERALS = 122;
 
 	/**
 	 * The feature id for the '<em><b>Stringsinresourcefiles</b></em>' containment reference.
@@ -2687,7 +2824,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__STRINGSINRESOURCEFILES = 119;
+	int DOCUMENT_ROOT__STRINGSINRESOURCEFILES = 123;
 
 	/**
 	 * The feature id for the '<em><b>Struct</b></em>' containment reference.
@@ -2696,7 +2833,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__STRUCT = 120;
+	int DOCUMENT_ROOT__STRUCT = 124;
 
 	/**
 	 * The feature id for the '<em><b>Tcclasses</b></em>' containment reference.
@@ -2705,7 +2842,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__TCCLASSES = 121;
+	int DOCUMENT_ROOT__TCCLASSES = 125;
 
 	/**
 	 * The feature id for the '<em><b>Tclassdestructor</b></em>' containment reference.
@@ -2714,7 +2851,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__TCLASSDESTRUCTOR = 122;
+	int DOCUMENT_ROOT__TCLASSDESTRUCTOR = 126;
 
 	/**
 	 * The feature id for the '<em><b>Timestampedoutput</b></em>' attribute.
@@ -2723,7 +2860,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__TIMESTAMPEDOUTPUT = 123;
+	int DOCUMENT_ROOT__TIMESTAMPEDOUTPUT = 127;
 
 	/**
 	 * The feature id for the '<em><b>Title</b></em>' attribute.
@@ -2732,7 +2869,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__TITLE = 124;
+	int DOCUMENT_ROOT__TITLE = 128;
 
 	/**
 	 * The feature id for the '<em><b>Todocomments</b></em>' containment reference.
@@ -2741,7 +2878,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__TODOCOMMENTS = 125;
+	int DOCUMENT_ROOT__TODOCOMMENTS = 129;
 
 	/**
 	 * The feature id for the '<em><b>Trapcleanup</b></em>' containment reference.
@@ -2750,7 +2887,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__TRAPCLEANUP = 126;
+	int DOCUMENT_ROOT__TRAPCLEANUP = 130;
 
 	/**
 	 * The feature id for the '<em><b>Trapeleave</b></em>' containment reference.
@@ -2759,7 +2896,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__TRAPELEAVE = 127;
+	int DOCUMENT_ROOT__TRAPELEAVE = 131;
 
 	/**
 	 * The feature id for the '<em><b>Traprunl</b></em>' containment reference.
@@ -2768,7 +2905,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__TRAPRUNL = 128;
+	int DOCUMENT_ROOT__TRAPRUNL = 132;
 
 	/**
 	 * The feature id for the '<em><b>Trspassing</b></em>' containment reference.
@@ -2777,7 +2914,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__TRSPASSING = 129;
+	int DOCUMENT_ROOT__TRSPASSING = 133;
 
 	/**
 	 * The feature id for the '<em><b>Uids</b></em>' containment reference.
@@ -2786,7 +2923,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__UIDS = 130;
+	int DOCUMENT_ROOT__UIDS = 134;
 
 	/**
 	 * The feature id for the '<em><b>Uncompressedaif</b></em>' containment reference.
@@ -2795,7 +2932,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__UNCOMPRESSEDAIF = 131;
+	int DOCUMENT_ROOT__UNCOMPRESSEDAIF = 135;
 
 	/**
 	 * The feature id for the '<em><b>Uncompressedbmp</b></em>' containment reference.
@@ -2804,7 +2941,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__UNCOMPRESSEDBMP = 132;
+	int DOCUMENT_ROOT__UNCOMPRESSEDBMP = 136;
 
 	/**
 	 * The feature id for the '<em><b>Unicodesource</b></em>' containment reference.
@@ -2813,7 +2950,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__UNICODESOURCE = 133;
+	int DOCUMENT_ROOT__UNICODESOURCE = 137;
 
 	/**
 	 * The feature id for the '<em><b>Userafter</b></em>' containment reference.
@@ -2822,7 +2959,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__USERAFTER = 134;
+	int DOCUMENT_ROOT__USERAFTER = 138;
 
 	/**
 	 * The feature id for the '<em><b>Userfree</b></em>' containment reference.
@@ -2831,7 +2968,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__USERFREE = 135;
+	int DOCUMENT_ROOT__USERFREE = 139;
 
 	/**
 	 * The feature id for the '<em><b>User Wait For Request</b></em>' containment reference.
@@ -2840,7 +2977,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__USER_WAIT_FOR_REQUEST = 136;
+	int DOCUMENT_ROOT__USER_WAIT_FOR_REQUEST = 140;
 
 	/**
 	 * The feature id for the '<em><b>Variablenames</b></em>' containment reference.
@@ -2849,7 +2986,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__VARIABLENAMES = 137;
+	int DOCUMENT_ROOT__VARIABLENAMES = 141;
 
 	/**
 	 * The feature id for the '<em><b>Voidparameter</b></em>' containment reference.
@@ -2858,7 +2995,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__VOIDPARAMETER = 138;
+	int DOCUMENT_ROOT__VOIDPARAMETER = 142;
 
 	/**
 	 * The feature id for the '<em><b>Words RE</b></em>' attribute.
@@ -2867,7 +3004,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__WORDS_RE = 139;
+	int DOCUMENT_ROOT__WORDS_RE = 143;
 
 	/**
 	 * The feature id for the '<em><b>Worryingcomments</b></em>' containment reference.
@@ -2876,7 +3013,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__WORRYINGCOMMENTS = 140;
+	int DOCUMENT_ROOT__WORRYINGCOMMENTS = 144;
 
 	/**
 	 * The feature id for the '<em><b>Worry RE</b></em>' attribute.
@@ -2885,16 +3022,16 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__WORRY_RE = 141;
-
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENT_ROOT__CATEGORY = 142;
+	int DOCUMENT_ROOT__WORRY_RE = 145;
+
+	/**
+	 * The feature id for the '<em><b>Category</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DOCUMENT_ROOT__CATEGORY = 146;
 
 	/**
 	 * The feature id for the '<em><b>Severity1</b></em>' attribute.
@@ -2903,7 +3040,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__SEVERITY1 = 143;
+	int DOCUMENT_ROOT__SEVERITY1 = 147;
 
 	/**
 	 * The number of structural features of the '<em>Document Root</em>' class.
@@ -2912,7 +3049,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT_FEATURE_COUNT = 144;
+	int DOCUMENT_ROOT_FEATURE_COUNT = 148;
 
 	/**
 	 * The meta object id for the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DoubleSemiColonTypeImpl <em>Double Semi Colon Type</em>}' class.
@@ -2922,7 +3059,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getDoubleSemiColonType()
 	 * @generated
 	 */
-	int DOUBLE_SEMI_COLON_TYPE = 33;
+	int DOUBLE_SEMI_COLON_TYPE = 35;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -2968,7 +3105,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getDrivelettersType()
 	 * @generated
 	 */
-	int DRIVELETTERS_TYPE = 34;
+	int DRIVELETTERS_TYPE = 36;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3014,7 +3151,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getEikbuttonsType()
 	 * @generated
 	 */
-	int EIKBUTTONS_TYPE = 35;
+	int EIKBUTTONS_TYPE = 37;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3060,7 +3197,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getEikonenvstaticType()
 	 * @generated
 	 */
-	int EIKONENVSTATIC_TYPE = 36;
+	int EIKONENVSTATIC_TYPE = 38;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3106,7 +3243,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getEnummembersType()
 	 * @generated
 	 */
-	int ENUMMEMBERS_TYPE = 37;
+	int ENUMMEMBERS_TYPE = 39;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3152,7 +3289,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getEnumnamesType()
 	 * @generated
 	 */
-	int ENUMNAMES_TYPE = 38;
+	int ENUMNAMES_TYPE = 40;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3198,7 +3335,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getExportinlineType()
 	 * @generated
 	 */
-	int EXPORTINLINE_TYPE = 39;
+	int EXPORTINLINE_TYPE = 41;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3244,7 +3381,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getExportpurevirtualType()
 	 * @generated
 	 */
-	int EXPORTPUREVIRTUAL_TYPE = 40;
+	int EXPORTPUREVIRTUAL_TYPE = 42;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3290,7 +3427,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getExternaldrivelettersType()
 	 * @generated
 	 */
-	int EXTERNALDRIVELETTERS_TYPE = 41;
+	int EXTERNALDRIVELETTERS_TYPE = 43;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3329,6 +3466,52 @@
 	int EXTERNALDRIVELETTERS_TYPE_FEATURE_COUNT = 3;
 
 	/**
+	 * The meta object id for the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.FlagsTypeImpl <em>Flags Type</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.FlagsTypeImpl
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getFlagsType()
+	 * @generated
+	 */
+	int FLAGS_TYPE = 44;
+
+	/**
+	 * The feature id for the '<em><b>Category</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLAGS_TYPE__CATEGORY = 0;
+
+	/**
+	 * The feature id for the '<em><b>Enable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLAGS_TYPE__ENABLE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Severity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLAGS_TYPE__SEVERITY = 2;
+
+	/**
+	 * The number of structural features of the '<em>Flags Type</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLAGS_TYPE_FEATURE_COUNT = 3;
+
+	/**
 	 * The meta object id for the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.FoffTypeImpl <em>Foff Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -3336,7 +3519,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getFoffType()
 	 * @generated
 	 */
-	int FOFF_TYPE = 42;
+	int FOFF_TYPE = 45;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3382,7 +3565,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getForbiddenwordsType()
 	 * @generated
 	 */
-	int FORBIDDENWORDS_TYPE = 43;
+	int FORBIDDENWORDS_TYPE = 46;
 
 	/**
 	 * The feature id for the '<em><b>Words RE</b></em>' attribute.
@@ -3437,7 +3620,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getForgottoputptroncleanupstackType()
 	 * @generated
 	 */
-	int FORGOTTOPUTPTRONCLEANUPSTACK_TYPE = 44;
+	int FORGOTTOPUTPTRONCLEANUPSTACK_TYPE = 47;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3483,7 +3666,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getFriendType()
 	 * @generated
 	 */
-	int FRIEND_TYPE = 45;
+	int FRIEND_TYPE = 48;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3529,7 +3712,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getFunctionalityType()
 	 * @generated
 	 */
-	int FUNCTIONALITY_TYPE = 46;
+	int FUNCTIONALITY_TYPE = 49;
 
 	/**
 	 * The feature id for the '<em><b>Enable</b></em>' attribute.
@@ -3557,7 +3740,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getGotoType()
 	 * @generated
 	 */
-	int GOTO_TYPE = 47;
+	int GOTO_TYPE = 50;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3603,7 +3786,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getHighType()
 	 * @generated
 	 */
-	int HIGH_TYPE = 48;
+	int HIGH_TYPE = 51;
 
 	/**
 	 * The feature id for the '<em><b>Enable</b></em>' attribute.
@@ -3631,7 +3814,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getIfassignmentsType()
 	 * @generated
 	 */
-	int IFASSIGNMENTS_TYPE = 49;
+	int IFASSIGNMENTS_TYPE = 52;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3677,7 +3860,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getIfpreprocessorType()
 	 * @generated
 	 */
-	int IFPREPROCESSOR_TYPE = 50;
+	int IFPREPROCESSOR_TYPE = 53;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3723,7 +3906,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getInheritanceorderType()
 	 * @generated
 	 */
-	int INHERITANCEORDER_TYPE = 51;
+	int INHERITANCEORDER_TYPE = 54;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3769,7 +3952,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getIntleavesType()
 	 * @generated
 	 */
-	int INTLEAVES_TYPE = 52;
+	int INTLEAVES_TYPE = 55;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3815,7 +3998,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getJmpType()
 	 * @generated
 	 */
-	int JMP_TYPE = 53;
+	int JMP_TYPE = 56;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3861,7 +4044,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getKeywordType()
 	 * @generated
 	 */
-	int KEYWORD_TYPE = 54;
+	int KEYWORD_TYPE = 57;
 
 	/**
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
@@ -3898,7 +4081,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getLeaveNoErrorType()
 	 * @generated
 	 */
-	int LEAVE_NO_ERROR_TYPE = 55;
+	int LEAVE_NO_ERROR_TYPE = 58;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3944,7 +4127,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getLeaveType()
 	 * @generated
 	 */
-	int LEAVE_TYPE = 56;
+	int LEAVE_TYPE = 59;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -3990,7 +4173,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getLeavingoperatorsType()
 	 * @generated
 	 */
-	int LEAVINGOPERATORS_TYPE = 57;
+	int LEAVINGOPERATORS_TYPE = 60;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4036,7 +4219,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getLegalType()
 	 * @generated
 	 */
-	int LEGAL_TYPE = 58;
+	int LEGAL_TYPE = 61;
 
 	/**
 	 * The feature id for the '<em><b>Enable</b></em>' attribute.
@@ -4064,7 +4247,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getLFunctionCantLeaveType()
 	 * @generated
 	 */
-	int LFUNCTION_CANT_LEAVE_TYPE = 59;
+	int LFUNCTION_CANT_LEAVE_TYPE = 62;
 
 	/**
 	 * The feature id for the '<em><b>LFunction Ignore RE</b></em>' attribute.
@@ -4119,7 +4302,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getLocalisationType()
 	 * @generated
 	 */
-	int LOCALISATION_TYPE = 60;
+	int LOCALISATION_TYPE = 63;
 
 	/**
 	 * The feature id for the '<em><b>Enable</b></em>' attribute.
@@ -4147,7 +4330,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getLonglinesType()
 	 * @generated
 	 */
-	int LONGLINES_TYPE = 61;
+	int LONGLINES_TYPE = 64;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4202,7 +4385,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getLowType()
 	 * @generated
 	 */
-	int LOW_TYPE = 62;
+	int LOW_TYPE = 65;
 
 	/**
 	 * The feature id for the '<em><b>Enable</b></em>' attribute.
@@ -4230,7 +4413,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getMagicnumbersType()
 	 * @generated
 	 */
-	int MAGICNUMBERS_TYPE = 63;
+	int MAGICNUMBERS_TYPE = 66;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4276,7 +4459,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getMclassdestructorType()
 	 * @generated
 	 */
-	int MCLASSDESTRUCTOR_TYPE = 64;
+	int MCLASSDESTRUCTOR_TYPE = 67;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4322,7 +4505,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getMediumType()
 	 * @generated
 	 */
-	int MEDIUM_TYPE = 65;
+	int MEDIUM_TYPE = 68;
 
 	/**
 	 * The feature id for the '<em><b>Enable</b></em>' attribute.
@@ -4350,7 +4533,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getMemberlcType()
 	 * @generated
 	 */
-	int MEMBERLC_TYPE = 66;
+	int MEMBERLC_TYPE = 69;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4396,7 +4579,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getMembervariablecallldType()
 	 * @generated
 	 */
-	int MEMBERVARIABLECALLLD_TYPE = 67;
+	int MEMBERVARIABLECALLLD_TYPE = 70;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4442,7 +4625,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getMissingcancelType()
 	 * @generated
 	 */
-	int MISSINGCANCEL_TYPE = 68;
+	int MISSINGCANCEL_TYPE = 71;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4488,7 +4671,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getMissingcclassType()
 	 * @generated
 	 */
-	int MISSINGCCLASS_TYPE = 69;
+	int MISSINGCCLASS_TYPE = 72;
 
 	/**
 	 * The feature id for the '<em><b>Cclass Ignore RE</b></em>' attribute.
@@ -4543,7 +4726,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getMmpsourcepathType()
 	 * @generated
 	 */
-	int MMPSOURCEPATH_TYPE = 70;
+	int MMPSOURCEPATH_TYPE = 73;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4589,7 +4772,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getMultilangrscType()
 	 * @generated
 	 */
-	int MULTILANGRSC_TYPE = 71;
+	int MULTILANGRSC_TYPE = 74;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4635,7 +4818,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getMultipledeclarationsType()
 	 * @generated
 	 */
-	int MULTIPLEDECLARATIONS_TYPE = 72;
+	int MULTIPLEDECLARATIONS_TYPE = 75;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4681,7 +4864,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getMultipleinheritanceType()
 	 * @generated
 	 */
-	int MULTIPLEINHERITANCE_TYPE = 73;
+	int MULTIPLEINHERITANCE_TYPE = 76;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4727,7 +4910,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getMydocsType()
 	 * @generated
 	 */
-	int MYDOCS_TYPE = 74;
+	int MYDOCS_TYPE = 77;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4773,7 +4956,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getNamespaceType()
 	 * @generated
 	 */
-	int NAMESPACE_TYPE = 75;
+	int NAMESPACE_TYPE = 78;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4819,7 +5002,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getNewlreferencesType()
 	 * @generated
 	 */
-	int NEWLREFERENCES_TYPE = 76;
+	int NEWLREFERENCES_TYPE = 79;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4865,7 +5048,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getNoleavetrapType()
 	 * @generated
 	 */
-	int NOLEAVETRAP_TYPE = 77;
+	int NOLEAVETRAP_TYPE = 80;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4911,7 +5094,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getNonconsthbufcType()
 	 * @generated
 	 */
-	int NONCONSTHBUFC_TYPE = 78;
+	int NONCONSTHBUFC_TYPE = 81;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -4957,7 +5140,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getNonconsttdescType()
 	 * @generated
 	 */
-	int NONCONSTTDESC_TYPE = 79;
+	int NONCONSTTDESC_TYPE = 82;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5003,7 +5186,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getNonleavenewType()
 	 * @generated
 	 */
-	int NONLEAVENEW_TYPE = 80;
+	int NONLEAVENEW_TYPE = 83;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5049,7 +5232,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getNonunicodeskinsType()
 	 * @generated
 	 */
-	int NONUNICODESKINS_TYPE = 81;
+	int NONUNICODESKINS_TYPE = 84;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5095,7 +5278,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getNullType()
 	 * @generated
 	 */
-	int NULL_TYPE = 82;
+	int NULL_TYPE = 85;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5141,7 +5324,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getOpenType()
 	 * @generated
 	 */
-	int OPEN_TYPE = 83;
+	int OPEN_TYPE = 86;
 
 	/**
 	 * The feature id for the '<em><b>Open Ignore RE</b></em>' attribute.
@@ -5196,7 +5379,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getOtherType()
 	 * @generated
 	 */
-	int OTHER_TYPE = 84;
+	int OTHER_TYPE = 87;
 
 	/**
 	 * The feature id for the '<em><b>Enable</b></em>' attribute.
@@ -5224,7 +5407,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getPanicType()
 	 * @generated
 	 */
-	int PANIC_TYPE = 85;
+	int PANIC_TYPE = 88;
 
 	/**
 	 * The feature id for the '<em><b>Enable</b></em>' attribute.
@@ -5252,7 +5435,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getPerformanceType()
 	 * @generated
 	 */
-	int PERFORMANCE_TYPE = 86;
+	int PERFORMANCE_TYPE = 89;
 
 	/**
 	 * The feature id for the '<em><b>Enable</b></em>' attribute.
@@ -5280,7 +5463,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getPointertoarraysType()
 	 * @generated
 	 */
-	int POINTERTOARRAYS_TYPE = 87;
+	int POINTERTOARRAYS_TYPE = 90;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5326,7 +5509,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getPragmadisableType()
 	 * @generated
 	 */
-	int PRAGMADISABLE_TYPE = 88;
+	int PRAGMADISABLE_TYPE = 91;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5372,7 +5555,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getPragmamessageType()
 	 * @generated
 	 */
-	int PRAGMAMESSAGE_TYPE = 89;
+	int PRAGMAMESSAGE_TYPE = 92;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5418,7 +5601,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getPragmaotherType()
 	 * @generated
 	 */
-	int PRAGMAOTHER_TYPE = 90;
+	int PRAGMAOTHER_TYPE = 93;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5464,7 +5647,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getPrivateinheritanceType()
 	 * @generated
 	 */
-	int PRIVATEINHERITANCE_TYPE = 91;
+	int PRIVATEINHERITANCE_TYPE = 94;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5510,7 +5693,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getPushaddrvarType()
 	 * @generated
 	 */
-	int PUSHADDRVAR_TYPE = 92;
+	int PUSHADDRVAR_TYPE = 95;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5556,7 +5739,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getPushmemberType()
 	 * @generated
 	 */
-	int PUSHMEMBER_TYPE = 93;
+	int PUSHMEMBER_TYPE = 96;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5602,7 +5785,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getReadresourceType()
 	 * @generated
 	 */
-	int READRESOURCE_TYPE = 94;
+	int READRESOURCE_TYPE = 97;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5648,7 +5831,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getResourcenotoncleanupstackType()
 	 * @generated
 	 */
-	int RESOURCENOTONCLEANUPSTACK_TYPE = 95;
+	int RESOURCENOTONCLEANUPSTACK_TYPE = 98;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5694,7 +5877,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getResourcesonheapType()
 	 * @generated
 	 */
-	int RESOURCESONHEAP_TYPE = 96;
+	int RESOURCESONHEAP_TYPE = 99;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5740,7 +5923,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getReturndescriptoroutofscopeType()
 	 * @generated
 	 */
-	int RETURNDESCRIPTOROUTOFSCOPE_TYPE = 97;
+	int RETURNDESCRIPTOROUTOFSCOPE_TYPE = 100;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5786,7 +5969,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getRfsType()
 	 * @generated
 	 */
-	int RFS_TYPE = 98;
+	int RFS_TYPE = 101;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5832,7 +6015,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getRssnamesType()
 	 * @generated
 	 */
-	int RSSNAMES_TYPE = 99;
+	int RSSNAMES_TYPE = 102;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -5878,7 +6061,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getScriptsType()
 	 * @generated
 	 */
-	int SCRIPTS_TYPE = 100;
+	int SCRIPTS_TYPE = 103;
 
 	/**
 	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
@@ -6052,13 +6235,31 @@
 	int SCRIPTS_TYPE__CONTROLORNULL = 18;
 
 	/**
+	 * The feature id for the '<em><b>Crepository</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SCRIPTS_TYPE__CREPOSITORY = 19;
+
+	/**
 	 * The feature id for the '<em><b>Ctltargettype</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__CTLTARGETTYPE = 19;
+	int SCRIPTS_TYPE__CTLTARGETTYPE = 20;
+
+	/**
+	 * The feature id for the '<em><b>Customizableicons</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SCRIPTS_TYPE__CUSTOMIZABLEICONS = 21;
 
 	/**
 	 * The feature id for the '<em><b>Debugrom</b></em>' containment reference.
@@ -6067,7 +6268,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__DEBUGROM = 20;
+	int SCRIPTS_TYPE__DEBUGROM = 22;
 
 	/**
 	 * The feature id for the '<em><b>Declarename</b></em>' containment reference.
@@ -6076,7 +6277,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__DECLARENAME = 21;
+	int SCRIPTS_TYPE__DECLARENAME = 23;
 
 	/**
 	 * The feature id for the '<em><b>Delete Member Variable</b></em>' containment reference.
@@ -6085,7 +6286,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__DELETE_MEMBER_VARIABLE = 22;
+	int SCRIPTS_TYPE__DELETE_MEMBER_VARIABLE = 24;
 
 	/**
 	 * The feature id for the '<em><b>Destructor</b></em>' containment reference.
@@ -6094,7 +6295,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__DESTRUCTOR = 23;
+	int SCRIPTS_TYPE__DESTRUCTOR = 25;
 
 	/**
 	 * The feature id for the '<em><b>Double Semi Colon</b></em>' containment reference.
@@ -6103,7 +6304,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__DOUBLE_SEMI_COLON = 24;
+	int SCRIPTS_TYPE__DOUBLE_SEMI_COLON = 26;
 
 	/**
 	 * The feature id for the '<em><b>Driveletters</b></em>' containment reference.
@@ -6112,7 +6313,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__DRIVELETTERS = 25;
+	int SCRIPTS_TYPE__DRIVELETTERS = 27;
 
 	/**
 	 * The feature id for the '<em><b>Eikbuttons</b></em>' containment reference.
@@ -6121,7 +6322,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__EIKBUTTONS = 26;
+	int SCRIPTS_TYPE__EIKBUTTONS = 28;
 
 	/**
 	 * The feature id for the '<em><b>Eikonenvstatic</b></em>' containment reference.
@@ -6130,7 +6331,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__EIKONENVSTATIC = 27;
+	int SCRIPTS_TYPE__EIKONENVSTATIC = 29;
 
 	/**
 	 * The feature id for the '<em><b>Enummembers</b></em>' containment reference.
@@ -6139,7 +6340,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__ENUMMEMBERS = 28;
+	int SCRIPTS_TYPE__ENUMMEMBERS = 30;
 
 	/**
 	 * The feature id for the '<em><b>Enumnames</b></em>' containment reference.
@@ -6148,7 +6349,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__ENUMNAMES = 29;
+	int SCRIPTS_TYPE__ENUMNAMES = 31;
 
 	/**
 	 * The feature id for the '<em><b>Exportinline</b></em>' containment reference.
@@ -6157,7 +6358,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__EXPORTINLINE = 30;
+	int SCRIPTS_TYPE__EXPORTINLINE = 32;
 
 	/**
 	 * The feature id for the '<em><b>Exportpurevirtual</b></em>' containment reference.
@@ -6166,7 +6367,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__EXPORTPUREVIRTUAL = 31;
+	int SCRIPTS_TYPE__EXPORTPUREVIRTUAL = 33;
 
 	/**
 	 * The feature id for the '<em><b>Externaldriveletters</b></em>' containment reference.
@@ -6175,7 +6376,16 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__EXTERNALDRIVELETTERS = 32;
+	int SCRIPTS_TYPE__EXTERNALDRIVELETTERS = 34;
+
+	/**
+	 * The feature id for the '<em><b>Flags</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SCRIPTS_TYPE__FLAGS = 35;
 
 	/**
 	 * The feature id for the '<em><b>Foff</b></em>' containment reference.
@@ -6184,7 +6394,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__FOFF = 33;
+	int SCRIPTS_TYPE__FOFF = 36;
 
 	/**
 	 * The feature id for the '<em><b>Forbiddenwords</b></em>' containment reference.
@@ -6193,7 +6403,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__FORBIDDENWORDS = 34;
+	int SCRIPTS_TYPE__FORBIDDENWORDS = 37;
 
 	/**
 	 * The feature id for the '<em><b>Forgottoputptroncleanupstack</b></em>' containment reference.
@@ -6202,7 +6412,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__FORGOTTOPUTPTRONCLEANUPSTACK = 35;
+	int SCRIPTS_TYPE__FORGOTTOPUTPTRONCLEANUPSTACK = 38;
 
 	/**
 	 * The feature id for the '<em><b>Friend</b></em>' containment reference.
@@ -6211,7 +6421,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__FRIEND = 36;
+	int SCRIPTS_TYPE__FRIEND = 39;
 
 	/**
 	 * The feature id for the '<em><b>Goto</b></em>' containment reference.
@@ -6220,7 +6430,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__GOTO = 37;
+	int SCRIPTS_TYPE__GOTO = 40;
 
 	/**
 	 * The feature id for the '<em><b>Ifassignments</b></em>' containment reference.
@@ -6229,7 +6439,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__IFASSIGNMENTS = 38;
+	int SCRIPTS_TYPE__IFASSIGNMENTS = 41;
 
 	/**
 	 * The feature id for the '<em><b>Ifpreprocessor</b></em>' containment reference.
@@ -6238,7 +6448,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__IFPREPROCESSOR = 39;
+	int SCRIPTS_TYPE__IFPREPROCESSOR = 42;
 
 	/**
 	 * The feature id for the '<em><b>Inheritanceorder</b></em>' containment reference.
@@ -6247,7 +6457,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__INHERITANCEORDER = 40;
+	int SCRIPTS_TYPE__INHERITANCEORDER = 43;
 
 	/**
 	 * The feature id for the '<em><b>Intleaves</b></em>' containment reference.
@@ -6256,7 +6466,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__INTLEAVES = 41;
+	int SCRIPTS_TYPE__INTLEAVES = 44;
 
 	/**
 	 * The feature id for the '<em><b>Jmp</b></em>' containment reference.
@@ -6265,7 +6475,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__JMP = 42;
+	int SCRIPTS_TYPE__JMP = 45;
 
 	/**
 	 * The feature id for the '<em><b>Leave</b></em>' containment reference.
@@ -6274,7 +6484,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__LEAVE = 43;
+	int SCRIPTS_TYPE__LEAVE = 46;
 
 	/**
 	 * The feature id for the '<em><b>Leave No Error</b></em>' containment reference.
@@ -6283,7 +6493,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__LEAVE_NO_ERROR = 44;
+	int SCRIPTS_TYPE__LEAVE_NO_ERROR = 47;
 
 	/**
 	 * The feature id for the '<em><b>Leavingoperators</b></em>' containment reference.
@@ -6292,7 +6502,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__LEAVINGOPERATORS = 45;
+	int SCRIPTS_TYPE__LEAVINGOPERATORS = 48;
 
 	/**
 	 * The feature id for the '<em><b>LFunction Cant Leave</b></em>' containment reference.
@@ -6301,7 +6511,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__LFUNCTION_CANT_LEAVE = 46;
+	int SCRIPTS_TYPE__LFUNCTION_CANT_LEAVE = 49;
 
 	/**
 	 * The feature id for the '<em><b>Longlines</b></em>' containment reference.
@@ -6310,7 +6520,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__LONGLINES = 47;
+	int SCRIPTS_TYPE__LONGLINES = 50;
 
 	/**
 	 * The feature id for the '<em><b>Magicnumbers</b></em>' containment reference.
@@ -6319,7 +6529,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__MAGICNUMBERS = 48;
+	int SCRIPTS_TYPE__MAGICNUMBERS = 51;
 
 	/**
 	 * The feature id for the '<em><b>Mclassdestructor</b></em>' containment reference.
@@ -6328,7 +6538,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__MCLASSDESTRUCTOR = 49;
+	int SCRIPTS_TYPE__MCLASSDESTRUCTOR = 52;
 
 	/**
 	 * The feature id for the '<em><b>Memberlc</b></em>' containment reference.
@@ -6337,7 +6547,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__MEMBERLC = 50;
+	int SCRIPTS_TYPE__MEMBERLC = 53;
 
 	/**
 	 * The feature id for the '<em><b>Membervariablecallld</b></em>' containment reference.
@@ -6346,7 +6556,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__MEMBERVARIABLECALLLD = 51;
+	int SCRIPTS_TYPE__MEMBERVARIABLECALLLD = 54;
 
 	/**
 	 * The feature id for the '<em><b>Missingcancel</b></em>' containment reference.
@@ -6355,7 +6565,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__MISSINGCANCEL = 52;
+	int SCRIPTS_TYPE__MISSINGCANCEL = 55;
 
 	/**
 	 * The feature id for the '<em><b>Missingcclass</b></em>' containment reference.
@@ -6364,7 +6574,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__MISSINGCCLASS = 53;
+	int SCRIPTS_TYPE__MISSINGCCLASS = 56;
 
 	/**
 	 * The feature id for the '<em><b>Mmpsourcepath</b></em>' containment reference.
@@ -6373,7 +6583,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__MMPSOURCEPATH = 54;
+	int SCRIPTS_TYPE__MMPSOURCEPATH = 57;
 
 	/**
 	 * The feature id for the '<em><b>Multilangrsc</b></em>' containment reference.
@@ -6382,7 +6592,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__MULTILANGRSC = 55;
+	int SCRIPTS_TYPE__MULTILANGRSC = 58;
 
 	/**
 	 * The feature id for the '<em><b>Multipledeclarations</b></em>' containment reference.
@@ -6391,7 +6601,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__MULTIPLEDECLARATIONS = 56;
+	int SCRIPTS_TYPE__MULTIPLEDECLARATIONS = 59;
 
 	/**
 	 * The feature id for the '<em><b>Multipleinheritance</b></em>' containment reference.
@@ -6400,7 +6610,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__MULTIPLEINHERITANCE = 57;
+	int SCRIPTS_TYPE__MULTIPLEINHERITANCE = 60;
 
 	/**
 	 * The feature id for the '<em><b>Mydocs</b></em>' containment reference.
@@ -6409,7 +6619,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__MYDOCS = 58;
+	int SCRIPTS_TYPE__MYDOCS = 61;
 
 	/**
 	 * The feature id for the '<em><b>Namespace</b></em>' containment reference.
@@ -6418,7 +6628,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__NAMESPACE = 59;
+	int SCRIPTS_TYPE__NAMESPACE = 62;
 
 	/**
 	 * The feature id for the '<em><b>Newlreferences</b></em>' containment reference.
@@ -6427,7 +6637,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__NEWLREFERENCES = 60;
+	int SCRIPTS_TYPE__NEWLREFERENCES = 63;
 
 	/**
 	 * The feature id for the '<em><b>Noleavetrap</b></em>' containment reference.
@@ -6436,7 +6646,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__NOLEAVETRAP = 61;
+	int SCRIPTS_TYPE__NOLEAVETRAP = 64;
 
 	/**
 	 * The feature id for the '<em><b>Nonconsthbufc</b></em>' containment reference.
@@ -6445,7 +6655,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__NONCONSTHBUFC = 62;
+	int SCRIPTS_TYPE__NONCONSTHBUFC = 65;
 
 	/**
 	 * The feature id for the '<em><b>Nonconsttdesc</b></em>' containment reference.
@@ -6454,7 +6664,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__NONCONSTTDESC = 63;
+	int SCRIPTS_TYPE__NONCONSTTDESC = 66;
 
 	/**
 	 * The feature id for the '<em><b>Nonleavenew</b></em>' containment reference.
@@ -6463,7 +6673,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__NONLEAVENEW = 64;
+	int SCRIPTS_TYPE__NONLEAVENEW = 67;
 
 	/**
 	 * The feature id for the '<em><b>Nonunicodeskins</b></em>' containment reference.
@@ -6472,7 +6682,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__NONUNICODESKINS = 65;
+	int SCRIPTS_TYPE__NONUNICODESKINS = 68;
 
 	/**
 	 * The feature id for the '<em><b>Null</b></em>' containment reference.
@@ -6481,7 +6691,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__NULL = 66;
+	int SCRIPTS_TYPE__NULL = 69;
 
 	/**
 	 * The feature id for the '<em><b>Open</b></em>' containment reference.
@@ -6490,7 +6700,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__OPEN = 67;
+	int SCRIPTS_TYPE__OPEN = 70;
 
 	/**
 	 * The feature id for the '<em><b>Pointertoarrays</b></em>' containment reference.
@@ -6499,7 +6709,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__POINTERTOARRAYS = 68;
+	int SCRIPTS_TYPE__POINTERTOARRAYS = 71;
 
 	/**
 	 * The feature id for the '<em><b>Pragmadisable</b></em>' containment reference.
@@ -6508,7 +6718,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__PRAGMADISABLE = 69;
+	int SCRIPTS_TYPE__PRAGMADISABLE = 72;
 
 	/**
 	 * The feature id for the '<em><b>Pragmamessage</b></em>' containment reference.
@@ -6517,7 +6727,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__PRAGMAMESSAGE = 70;
+	int SCRIPTS_TYPE__PRAGMAMESSAGE = 73;
 
 	/**
 	 * The feature id for the '<em><b>Pragmaother</b></em>' containment reference.
@@ -6526,7 +6736,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__PRAGMAOTHER = 71;
+	int SCRIPTS_TYPE__PRAGMAOTHER = 74;
 
 	/**
 	 * The feature id for the '<em><b>Privateinheritance</b></em>' containment reference.
@@ -6535,7 +6745,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__PRIVATEINHERITANCE = 72;
+	int SCRIPTS_TYPE__PRIVATEINHERITANCE = 75;
 
 	/**
 	 * The feature id for the '<em><b>Pushaddrvar</b></em>' containment reference.
@@ -6544,7 +6754,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__PUSHADDRVAR = 73;
+	int SCRIPTS_TYPE__PUSHADDRVAR = 76;
 
 	/**
 	 * The feature id for the '<em><b>Pushmember</b></em>' containment reference.
@@ -6553,7 +6763,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__PUSHMEMBER = 74;
+	int SCRIPTS_TYPE__PUSHMEMBER = 77;
 
 	/**
 	 * The feature id for the '<em><b>Readresource</b></em>' containment reference.
@@ -6562,7 +6772,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__READRESOURCE = 75;
+	int SCRIPTS_TYPE__READRESOURCE = 78;
 
 	/**
 	 * The feature id for the '<em><b>Resourcenotoncleanupstack</b></em>' containment reference.
@@ -6571,7 +6781,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__RESOURCENOTONCLEANUPSTACK = 76;
+	int SCRIPTS_TYPE__RESOURCENOTONCLEANUPSTACK = 79;
 
 	/**
 	 * The feature id for the '<em><b>Resourcesonheap</b></em>' containment reference.
@@ -6580,7 +6790,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__RESOURCESONHEAP = 77;
+	int SCRIPTS_TYPE__RESOURCESONHEAP = 80;
 
 	/**
 	 * The feature id for the '<em><b>Returndescriptoroutofscope</b></em>' containment reference.
@@ -6589,7 +6799,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__RETURNDESCRIPTOROUTOFSCOPE = 78;
+	int SCRIPTS_TYPE__RETURNDESCRIPTOROUTOFSCOPE = 81;
 
 	/**
 	 * The feature id for the '<em><b>Rfs</b></em>' containment reference.
@@ -6598,7 +6808,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__RFS = 79;
+	int SCRIPTS_TYPE__RFS = 82;
 
 	/**
 	 * The feature id for the '<em><b>Rssnames</b></em>' containment reference.
@@ -6607,7 +6817,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__RSSNAMES = 80;
+	int SCRIPTS_TYPE__RSSNAMES = 83;
 
 	/**
 	 * The feature id for the '<em><b>Stringliterals</b></em>' containment reference.
@@ -6616,7 +6826,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__STRINGLITERALS = 81;
+	int SCRIPTS_TYPE__STRINGLITERALS = 84;
 
 	/**
 	 * The feature id for the '<em><b>Stringsinresourcefiles</b></em>' containment reference.
@@ -6625,7 +6835,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__STRINGSINRESOURCEFILES = 82;
+	int SCRIPTS_TYPE__STRINGSINRESOURCEFILES = 85;
 
 	/**
 	 * The feature id for the '<em><b>Struct</b></em>' containment reference.
@@ -6634,7 +6844,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__STRUCT = 83;
+	int SCRIPTS_TYPE__STRUCT = 86;
 
 	/**
 	 * The feature id for the '<em><b>Tcclasses</b></em>' containment reference.
@@ -6643,7 +6853,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__TCCLASSES = 84;
+	int SCRIPTS_TYPE__TCCLASSES = 87;
 
 	/**
 	 * The feature id for the '<em><b>Tclassdestructor</b></em>' containment reference.
@@ -6652,7 +6862,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__TCLASSDESTRUCTOR = 85;
+	int SCRIPTS_TYPE__TCLASSDESTRUCTOR = 88;
 
 	/**
 	 * The feature id for the '<em><b>Todocomments</b></em>' containment reference.
@@ -6661,7 +6871,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__TODOCOMMENTS = 86;
+	int SCRIPTS_TYPE__TODOCOMMENTS = 89;
 
 	/**
 	 * The feature id for the '<em><b>Trapcleanup</b></em>' containment reference.
@@ -6670,7 +6880,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__TRAPCLEANUP = 87;
+	int SCRIPTS_TYPE__TRAPCLEANUP = 90;
 
 	/**
 	 * The feature id for the '<em><b>Trapeleave</b></em>' containment reference.
@@ -6679,7 +6889,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__TRAPELEAVE = 88;
+	int SCRIPTS_TYPE__TRAPELEAVE = 91;
 
 	/**
 	 * The feature id for the '<em><b>Traprunl</b></em>' containment reference.
@@ -6688,7 +6898,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__TRAPRUNL = 89;
+	int SCRIPTS_TYPE__TRAPRUNL = 92;
 
 	/**
 	 * The feature id for the '<em><b>Trspassing</b></em>' containment reference.
@@ -6697,7 +6907,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__TRSPASSING = 90;
+	int SCRIPTS_TYPE__TRSPASSING = 93;
 
 	/**
 	 * The feature id for the '<em><b>Uids</b></em>' containment reference.
@@ -6706,7 +6916,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__UIDS = 91;
+	int SCRIPTS_TYPE__UIDS = 94;
 
 	/**
 	 * The feature id for the '<em><b>Uncompressedaif</b></em>' containment reference.
@@ -6715,7 +6925,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__UNCOMPRESSEDAIF = 92;
+	int SCRIPTS_TYPE__UNCOMPRESSEDAIF = 95;
 
 	/**
 	 * The feature id for the '<em><b>Uncompressedbmp</b></em>' containment reference.
@@ -6724,7 +6934,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__UNCOMPRESSEDBMP = 93;
+	int SCRIPTS_TYPE__UNCOMPRESSEDBMP = 96;
 
 	/**
 	 * The feature id for the '<em><b>Unicodesource</b></em>' containment reference.
@@ -6733,7 +6943,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__UNICODESOURCE = 94;
+	int SCRIPTS_TYPE__UNICODESOURCE = 97;
 
 	/**
 	 * The feature id for the '<em><b>Userafter</b></em>' containment reference.
@@ -6742,7 +6952,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__USERAFTER = 95;
+	int SCRIPTS_TYPE__USERAFTER = 98;
 
 	/**
 	 * The feature id for the '<em><b>Userfree</b></em>' containment reference.
@@ -6751,7 +6961,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__USERFREE = 96;
+	int SCRIPTS_TYPE__USERFREE = 99;
 
 	/**
 	 * The feature id for the '<em><b>User Wait For Request</b></em>' containment reference.
@@ -6760,7 +6970,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__USER_WAIT_FOR_REQUEST = 97;
+	int SCRIPTS_TYPE__USER_WAIT_FOR_REQUEST = 100;
 
 	/**
 	 * The feature id for the '<em><b>Variablenames</b></em>' containment reference.
@@ -6769,7 +6979,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__VARIABLENAMES = 98;
+	int SCRIPTS_TYPE__VARIABLENAMES = 101;
 
 	/**
 	 * The feature id for the '<em><b>Voidparameter</b></em>' containment reference.
@@ -6778,7 +6988,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__VOIDPARAMETER = 99;
+	int SCRIPTS_TYPE__VOIDPARAMETER = 102;
 
 	/**
 	 * The feature id for the '<em><b>Worryingcomments</b></em>' containment reference.
@@ -6787,7 +6997,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE__WORRYINGCOMMENTS = 100;
+	int SCRIPTS_TYPE__WORRYINGCOMMENTS = 103;
 
 	/**
 	 * The number of structural features of the '<em>Scripts Type</em>' class.
@@ -6796,7 +7006,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SCRIPTS_TYPE_FEATURE_COUNT = 101;
+	int SCRIPTS_TYPE_FEATURE_COUNT = 104;
 
 	/**
 	 * The meta object id for the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.SeveritiesTypeImpl <em>Severities Type</em>}' class.
@@ -6806,7 +7016,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getSeveritiesType()
 	 * @generated
 	 */
-	int SEVERITIES_TYPE = 101;
+	int SEVERITIES_TYPE = 104;
 
 	/**
 	 * The feature id for the '<em><b>High</b></em>' containment reference.
@@ -6852,7 +7062,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getSourcesType()
 	 * @generated
 	 */
-	int SOURCES_TYPE = 102;
+	int SOURCES_TYPE = 105;
 
 	/**
 	 * The feature id for the '<em><b>Exclude</b></em>' attribute list.
@@ -6880,7 +7090,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getStringliteralsType()
 	 * @generated
 	 */
-	int STRINGLITERALS_TYPE = 103;
+	int STRINGLITERALS_TYPE = 106;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -6926,7 +7136,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getStringsinresourcefilesType()
 	 * @generated
 	 */
-	int STRINGSINRESOURCEFILES_TYPE = 104;
+	int STRINGSINRESOURCEFILES_TYPE = 107;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -6972,7 +7182,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getStructType()
 	 * @generated
 	 */
-	int STRUCT_TYPE = 105;
+	int STRUCT_TYPE = 108;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7018,7 +7228,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getTcclassesType()
 	 * @generated
 	 */
-	int TCCLASSES_TYPE = 106;
+	int TCCLASSES_TYPE = 109;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7064,7 +7274,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getTclassdestructorType()
 	 * @generated
 	 */
-	int TCLASSDESTRUCTOR_TYPE = 107;
+	int TCLASSDESTRUCTOR_TYPE = 110;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7110,7 +7320,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getTodocommentsType()
 	 * @generated
 	 */
-	int TODOCOMMENTS_TYPE = 108;
+	int TODOCOMMENTS_TYPE = 111;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7156,7 +7366,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getTrapcleanupType()
 	 * @generated
 	 */
-	int TRAPCLEANUP_TYPE = 109;
+	int TRAPCLEANUP_TYPE = 112;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7202,7 +7412,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getTrapeleaveType()
 	 * @generated
 	 */
-	int TRAPELEAVE_TYPE = 110;
+	int TRAPELEAVE_TYPE = 113;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7248,7 +7458,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getTraprunlType()
 	 * @generated
 	 */
-	int TRAPRUNL_TYPE = 111;
+	int TRAPRUNL_TYPE = 114;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7294,7 +7504,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getTrspassingType()
 	 * @generated
 	 */
-	int TRSPASSING_TYPE = 112;
+	int TRSPASSING_TYPE = 115;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7340,7 +7550,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getUidsType()
 	 * @generated
 	 */
-	int UIDS_TYPE = 113;
+	int UIDS_TYPE = 116;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7386,7 +7596,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getUncompressedaifType()
 	 * @generated
 	 */
-	int UNCOMPRESSEDAIF_TYPE = 114;
+	int UNCOMPRESSEDAIF_TYPE = 117;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7432,7 +7642,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getUncompressedbmpType()
 	 * @generated
 	 */
-	int UNCOMPRESSEDBMP_TYPE = 115;
+	int UNCOMPRESSEDBMP_TYPE = 118;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7478,7 +7688,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getUnicodesourceType()
 	 * @generated
 	 */
-	int UNICODESOURCE_TYPE = 116;
+	int UNICODESOURCE_TYPE = 119;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7524,7 +7734,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getUserafterType()
 	 * @generated
 	 */
-	int USERAFTER_TYPE = 117;
+	int USERAFTER_TYPE = 120;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7570,7 +7780,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getUserfreeType()
 	 * @generated
 	 */
-	int USERFREE_TYPE = 118;
+	int USERFREE_TYPE = 121;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7616,7 +7826,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getUserWaitForRequestType()
 	 * @generated
 	 */
-	int USER_WAIT_FOR_REQUEST_TYPE = 119;
+	int USER_WAIT_FOR_REQUEST_TYPE = 122;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7662,7 +7872,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getVariablenamesType()
 	 * @generated
 	 */
-	int VARIABLENAMES_TYPE = 120;
+	int VARIABLENAMES_TYPE = 123;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7708,7 +7918,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getVoidparameterType()
 	 * @generated
 	 */
-	int VOIDPARAMETER_TYPE = 121;
+	int VOIDPARAMETER_TYPE = 124;
 
 	/**
 	 * The feature id for the '<em><b>Category</b></em>' attribute.
@@ -7754,7 +7964,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getWorryingcommentsType()
 	 * @generated
 	 */
-	int WORRYINGCOMMENTS_TYPE = 122;
+	int WORRYINGCOMMENTS_TYPE = 125;
 
 	/**
 	 * The feature id for the '<em><b>Worry RE</b></em>' attribute.
@@ -7809,7 +8019,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getCategoryType()
 	 * @generated
 	 */
-	int CATEGORY_TYPE = 123;
+	int CATEGORY_TYPE = 126;
 
 	/**
 	 * The meta object id for the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType <em>Severity Type</em>}' enum.
@@ -7819,7 +8029,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getSeverityType()
 	 * @generated
 	 */
-	int SEVERITY_TYPE = 124;
+	int SEVERITY_TYPE = 127;
 
 	/**
 	 * The meta object id for the '<em>Category Type Object</em>' data type.
@@ -7829,7 +8039,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getCategoryTypeObject()
 	 * @generated
 	 */
-	int CATEGORY_TYPE_OBJECT = 125;
+	int CATEGORY_TYPE_OBJECT = 128;
 
 	/**
 	 * The meta object id for the '<em>Severity Type Object</em>' data type.
@@ -7839,7 +8049,7 @@
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CSConfigPackageImpl#getSeverityTypeObject()
 	 * @generated
 	 */
-	int SEVERITY_TYPE_OBJECT = 126;
+	int SEVERITY_TYPE_OBJECT = 129;
 
 
 	/**
@@ -8941,6 +9151,49 @@
 	EAttribute getControlornullType_Severity();
 
 	/**
+	 * Returns the meta object for class '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType <em>Crepository Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Crepository Type</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType
+	 * @generated
+	 */
+	EClass getCrepositoryType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#getCategory <em>Category</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Category</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#getCategory()
+	 * @see #getCrepositoryType()
+	 * @generated
+	 */
+	EAttribute getCrepositoryType_Category();
+
+	/**
+	 * Returns the meta object for the attribute '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#isEnable <em>Enable</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Enable</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#isEnable()
+	 * @see #getCrepositoryType()
+	 * @generated
+	 */
+	EAttribute getCrepositoryType_Enable();
+
+	/**
+	 * Returns the meta object for the attribute '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#getSeverity <em>Severity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Severity</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#getSeverity()
+	 * @see #getCrepositoryType()
+	 * @generated
+	 */
+	EAttribute getCrepositoryType_Severity();
+
+	/**
 	 * Returns the meta object for class '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CtltargettypeType <em>Ctltargettype Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -8984,6 +9237,60 @@
 	EAttribute getCtltargettypeType_Severity();
 
 	/**
+	 * Returns the meta object for class '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType <em>Customizableicons Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Customizableicons Type</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType
+	 * @generated
+	 */
+	EClass getCustomizableiconsType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getIconsRE <em>Icons RE</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Icons RE</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getIconsRE()
+	 * @see #getCustomizableiconsType()
+	 * @generated
+	 */
+	EAttribute getCustomizableiconsType_IconsRE();
+
+	/**
+	 * Returns the meta object for the attribute '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getCategory <em>Category</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Category</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getCategory()
+	 * @see #getCustomizableiconsType()
+	 * @generated
+	 */
+	EAttribute getCustomizableiconsType_Category();
+
+	/**
+	 * Returns the meta object for the attribute '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#isEnable <em>Enable</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Enable</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#isEnable()
+	 * @see #getCustomizableiconsType()
+	 * @generated
+	 */
+	EAttribute getCustomizableiconsType_Enable();
+
+	/**
+	 * Returns the meta object for the attribute '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getSeverity <em>Severity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Severity</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getSeverity()
+	 * @see #getCustomizableiconsType()
+	 * @generated
+	 */
+	EAttribute getCustomizableiconsType_Severity();
+
+	/**
 	 * Returns the meta object for class '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomrulesType <em>Customrules Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -9603,6 +9910,17 @@
 	EReference getDocumentRoot_Controlornull();
 
 	/**
+	 * Returns the meta object for the containment reference '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getCrepository <em>Crepository</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Crepository</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getCrepository()
+	 * @see #getDocumentRoot()
+	 * @generated
+	 */
+	EReference getDocumentRoot_Crepository();
+
+	/**
 	 * Returns the meta object for the containment reference '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getCtltargettype <em>Ctltargettype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -9614,6 +9932,17 @@
 	EReference getDocumentRoot_Ctltargettype();
 
 	/**
+	 * Returns the meta object for the containment reference '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getCustomizableicons <em>Customizableicons</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Customizableicons</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getCustomizableicons()
+	 * @see #getDocumentRoot()
+	 * @generated
+	 */
+	EReference getDocumentRoot_Customizableicons();
+
+	/**
 	 * Returns the meta object for the containment reference '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getCustomrule <em>Customrule</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -9823,6 +10152,17 @@
 	EAttribute getDocumentRoot_Filetype();
 
 	/**
+	 * Returns the meta object for the containment reference '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getFlags <em>Flags</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Flags</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getFlags()
+	 * @see #getDocumentRoot()
+	 * @generated
+	 */
+	EReference getDocumentRoot_Flags();
+
+	/**
 	 * Returns the meta object for the containment reference '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getFoff <em>Foff</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -9900,6 +10240,17 @@
 	EReference getDocumentRoot_High();
 
 	/**
+	 * Returns the meta object for the attribute '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getIconsRE <em>Icons RE</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Icons RE</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getIconsRE()
+	 * @see #getDocumentRoot()
+	 * @generated
+	 */
+	EAttribute getDocumentRoot_IconsRE();
+
+	/**
 	 * Returns the meta object for the containment reference '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getIfassignments <em>Ifassignments</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -11266,6 +11617,49 @@
 	EAttribute getExternaldrivelettersType_Severity();
 
 	/**
+	 * Returns the meta object for class '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType <em>Flags Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Flags Type</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType
+	 * @generated
+	 */
+	EClass getFlagsType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#getCategory <em>Category</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Category</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#getCategory()
+	 * @see #getFlagsType()
+	 * @generated
+	 */
+	EAttribute getFlagsType_Category();
+
+	/**
+	 * Returns the meta object for the attribute '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#isEnable <em>Enable</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Enable</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#isEnable()
+	 * @see #getFlagsType()
+	 * @generated
+	 */
+	EAttribute getFlagsType_Enable();
+
+	/**
+	 * Returns the meta object for the attribute '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#getSeverity <em>Severity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Severity</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#getSeverity()
+	 * @see #getFlagsType()
+	 * @generated
+	 */
+	EAttribute getFlagsType_Severity();
+
+	/**
 	 * Returns the meta object for class '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FoffType <em>Foff Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -13825,6 +14219,17 @@
 	EReference getScriptsType_Controlornull();
 
 	/**
+	 * Returns the meta object for the containment reference '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getCrepository <em>Crepository</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Crepository</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getCrepository()
+	 * @see #getScriptsType()
+	 * @generated
+	 */
+	EReference getScriptsType_Crepository();
+
+	/**
 	 * Returns the meta object for the containment reference '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getCtltargettype <em>Ctltargettype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -13836,6 +14241,17 @@
 	EReference getScriptsType_Ctltargettype();
 
 	/**
+	 * Returns the meta object for the containment reference '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getCustomizableicons <em>Customizableicons</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Customizableicons</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getCustomizableicons()
+	 * @see #getScriptsType()
+	 * @generated
+	 */
+	EReference getScriptsType_Customizableicons();
+
+	/**
 	 * Returns the meta object for the containment reference '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getDebugrom <em>Debugrom</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -13979,6 +14395,17 @@
 	EReference getScriptsType_Externaldriveletters();
 
 	/**
+	 * Returns the meta object for the containment reference '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getFlags <em>Flags</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Flags</em>'.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getFlags()
+	 * @see #getScriptsType()
+	 * @generated
+	 */
+	EReference getScriptsType_Flags();
+
+	/**
 	 * Returns the meta object for the containment reference '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getFoff <em>Foff</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -15687,7 +16114,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the meta object for data type '<em>Category Type Object</em>'.
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType
-	 * @model instanceClass="com.nokia.carbide.cpp.codescanner.gen.CSConfig.CategoryType"
+	 * @model instanceClass="com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType"
 	 *        extendedMetaData="name='category_._type:Object' baseType='category_._type'"
 	 * @generated
 	 */
@@ -15699,7 +16126,7 @@
 	 * <!-- end-user-doc -->
 	 * @return the meta object for data type '<em>Severity Type Object</em>'.
 	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType
-	 * @model instanceClass="com.nokia.carbide.cpp.codescanner.gen.CSConfig.SeverityType"
+	 * @model instanceClass="com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType"
 	 *        extendedMetaData="name='severity_._type:Object' baseType='severity_._type'"
 	 * @generated
 	 */
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/CrepositoryType.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/CrepositoryType.java	Mon Apr 06 15:46:51 2009 -0500
@@ -0,0 +1,209 @@
+/*
+* 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.carbide.cpp.internal.codescanner.gen.CSConfig;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Crepository Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#getCategory <em>Category</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#isEnable <em>Enable</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#getSeverity <em>Severity</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getCrepositoryType()
+ * @model extendedMetaData="name='crepository_._type' kind='empty'"
+ * @generated
+ */
+public interface CrepositoryType extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Category</b></em>' attribute.
+	 * The literals are from the enumeration {@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Category</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Category</em>' attribute.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType
+	 * @see #isSetCategory()
+	 * @see #unsetCategory()
+	 * @see #setCategory(CategoryType)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getCrepositoryType_Category()
+	 * @model unsettable="true"
+	 *        extendedMetaData="kind='attribute' name='category' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	CategoryType getCategory();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#getCategory <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Category</em>' attribute.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType
+	 * @see #isSetCategory()
+	 * @see #unsetCategory()
+	 * @see #getCategory()
+	 * @generated
+	 */
+	void setCategory(CategoryType value);
+
+	/**
+	 * Unsets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#getCategory <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetCategory()
+	 * @see #getCategory()
+	 * @see #setCategory(CategoryType)
+	 * @generated
+	 */
+	void unsetCategory();
+
+	/**
+	 * Returns whether the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#getCategory <em>Category</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Category</em>' attribute is set.
+	 * @see #unsetCategory()
+	 * @see #getCategory()
+	 * @see #setCategory(CategoryType)
+	 * @generated
+	 */
+	boolean isSetCategory();
+
+	/**
+	 * Returns the value of the '<em><b>Enable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Enable</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Enable</em>' attribute.
+	 * @see #isSetEnable()
+	 * @see #unsetEnable()
+	 * @see #setEnable(boolean)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getCrepositoryType_Enable()
+	 * @model unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean" required="true"
+	 *        extendedMetaData="kind='attribute' name='enable' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	boolean isEnable();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#isEnable <em>Enable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Enable</em>' attribute.
+	 * @see #isSetEnable()
+	 * @see #unsetEnable()
+	 * @see #isEnable()
+	 * @generated
+	 */
+	void setEnable(boolean value);
+
+	/**
+	 * Unsets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#isEnable <em>Enable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetEnable()
+	 * @see #isEnable()
+	 * @see #setEnable(boolean)
+	 * @generated
+	 */
+	void unsetEnable();
+
+	/**
+	 * Returns whether the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#isEnable <em>Enable</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Enable</em>' attribute is set.
+	 * @see #unsetEnable()
+	 * @see #isEnable()
+	 * @see #setEnable(boolean)
+	 * @generated
+	 */
+	boolean isSetEnable();
+
+	/**
+	 * Returns the value of the '<em><b>Severity</b></em>' attribute.
+	 * The literals are from the enumeration {@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Severity</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Severity</em>' attribute.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType
+	 * @see #isSetSeverity()
+	 * @see #unsetSeverity()
+	 * @see #setSeverity(SeverityType)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getCrepositoryType_Severity()
+	 * @model unsettable="true"
+	 *        extendedMetaData="kind='attribute' name='severity' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	SeverityType getSeverity();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#getSeverity <em>Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Severity</em>' attribute.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType
+	 * @see #isSetSeverity()
+	 * @see #unsetSeverity()
+	 * @see #getSeverity()
+	 * @generated
+	 */
+	void setSeverity(SeverityType value);
+
+	/**
+	 * Unsets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#getSeverity <em>Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetSeverity()
+	 * @see #getSeverity()
+	 * @see #setSeverity(SeverityType)
+	 * @generated
+	 */
+	void unsetSeverity();
+
+	/**
+	 * Returns whether the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType#getSeverity <em>Severity</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Severity</em>' attribute is set.
+	 * @see #unsetSeverity()
+	 * @see #getSeverity()
+	 * @see #setSeverity(SeverityType)
+	 * @generated
+	 */
+	boolean isSetSeverity();
+
+} // CrepositoryType
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/CustomizableiconsType.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/CustomizableiconsType.java	Mon Apr 06 15:46:51 2009 -0500
@@ -0,0 +1,237 @@
+/*
+* 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.carbide.cpp.internal.codescanner.gen.CSConfig;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Customizableicons Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getIconsRE <em>Icons RE</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getCategory <em>Category</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#isEnable <em>Enable</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getSeverity <em>Severity</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getCustomizableiconsType()
+ * @model extendedMetaData="name='customizableicons_._type' kind='elementOnly'"
+ * @generated
+ */
+public interface CustomizableiconsType extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Icons RE</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Icons RE</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Icons RE</em>' attribute.
+	 * @see #setIconsRE(String)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getCustomizableiconsType_IconsRE()
+	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+	 *        extendedMetaData="kind='element' name='iconsRE' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	String getIconsRE();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getIconsRE <em>Icons RE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Icons RE</em>' attribute.
+	 * @see #getIconsRE()
+	 * @generated
+	 */
+	void setIconsRE(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Category</b></em>' attribute.
+	 * The literals are from the enumeration {@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Category</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Category</em>' attribute.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType
+	 * @see #isSetCategory()
+	 * @see #unsetCategory()
+	 * @see #setCategory(CategoryType)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getCustomizableiconsType_Category()
+	 * @model unsettable="true"
+	 *        extendedMetaData="kind='attribute' name='category' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	CategoryType getCategory();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getCategory <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Category</em>' attribute.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType
+	 * @see #isSetCategory()
+	 * @see #unsetCategory()
+	 * @see #getCategory()
+	 * @generated
+	 */
+	void setCategory(CategoryType value);
+
+	/**
+	 * Unsets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getCategory <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetCategory()
+	 * @see #getCategory()
+	 * @see #setCategory(CategoryType)
+	 * @generated
+	 */
+	void unsetCategory();
+
+	/**
+	 * Returns whether the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getCategory <em>Category</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Category</em>' attribute is set.
+	 * @see #unsetCategory()
+	 * @see #getCategory()
+	 * @see #setCategory(CategoryType)
+	 * @generated
+	 */
+	boolean isSetCategory();
+
+	/**
+	 * Returns the value of the '<em><b>Enable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Enable</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Enable</em>' attribute.
+	 * @see #isSetEnable()
+	 * @see #unsetEnable()
+	 * @see #setEnable(boolean)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getCustomizableiconsType_Enable()
+	 * @model unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean" required="true"
+	 *        extendedMetaData="kind='attribute' name='enable' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	boolean isEnable();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#isEnable <em>Enable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Enable</em>' attribute.
+	 * @see #isSetEnable()
+	 * @see #unsetEnable()
+	 * @see #isEnable()
+	 * @generated
+	 */
+	void setEnable(boolean value);
+
+	/**
+	 * Unsets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#isEnable <em>Enable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetEnable()
+	 * @see #isEnable()
+	 * @see #setEnable(boolean)
+	 * @generated
+	 */
+	void unsetEnable();
+
+	/**
+	 * Returns whether the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#isEnable <em>Enable</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Enable</em>' attribute is set.
+	 * @see #unsetEnable()
+	 * @see #isEnable()
+	 * @see #setEnable(boolean)
+	 * @generated
+	 */
+	boolean isSetEnable();
+
+	/**
+	 * Returns the value of the '<em><b>Severity</b></em>' attribute.
+	 * The literals are from the enumeration {@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Severity</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Severity</em>' attribute.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType
+	 * @see #isSetSeverity()
+	 * @see #unsetSeverity()
+	 * @see #setSeverity(SeverityType)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getCustomizableiconsType_Severity()
+	 * @model unsettable="true"
+	 *        extendedMetaData="kind='attribute' name='severity' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	SeverityType getSeverity();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getSeverity <em>Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Severity</em>' attribute.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType
+	 * @see #isSetSeverity()
+	 * @see #unsetSeverity()
+	 * @see #getSeverity()
+	 * @generated
+	 */
+	void setSeverity(SeverityType value);
+
+	/**
+	 * Unsets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getSeverity <em>Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetSeverity()
+	 * @see #getSeverity()
+	 * @see #setSeverity(SeverityType)
+	 * @generated
+	 */
+	void unsetSeverity();
+
+	/**
+	 * Returns whether the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType#getSeverity <em>Severity</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Severity</em>' attribute is set.
+	 * @see #unsetSeverity()
+	 * @see #getSeverity()
+	 * @see #setSeverity(SeverityType)
+	 * @generated
+	 */
+	boolean isSetSeverity();
+
+} // CustomizableiconsType
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/DocumentRoot.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/DocumentRoot.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/DocumentRoot.java	Mon Apr 06 15:46:51 2009 -0500
@@ -59,7 +59,9 @@
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getConstnames <em>Constnames</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getConsttdescptr <em>Consttdescptr</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getControlornull <em>Controlornull</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getCrepository <em>Crepository</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getCtltargettype <em>Ctltargettype</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getCustomizableicons <em>Customizableicons</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getCustomrule <em>Customrule</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getCustomrules <em>Customrules</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getDebugrom <em>Debugrom</em>}</li>
@@ -79,6 +81,7 @@
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getExportpurevirtual <em>Exportpurevirtual</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getExternaldriveletters <em>Externaldriveletters</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getFiletype <em>Filetype</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getFlags <em>Flags</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getFoff <em>Foff</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getForbiddenwords <em>Forbiddenwords</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getForgottoputptroncleanupstack <em>Forgottoputptroncleanupstack</em>}</li>
@@ -86,6 +89,7 @@
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getFunctionality <em>Functionality</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getGoto <em>Goto</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getHigh <em>High</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getIconsRE <em>Icons RE</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getIfassignments <em>Ifassignments</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getIfpreprocessor <em>Ifpreprocessor</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getInheritanceorder <em>Inheritanceorder</em>}</li>
@@ -912,6 +916,33 @@
 	void setControlornull(ControlornullType value);
 
 	/**
+	 * Returns the value of the '<em><b>Crepository</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Crepository</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Crepository</em>' containment reference.
+	 * @see #setCrepository(CrepositoryType)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getDocumentRoot_Crepository()
+	 * @model containment="true" upper="-2" transient="true" volatile="true" derived="true"
+	 *        extendedMetaData="kind='element' name='crepository' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	CrepositoryType getCrepository();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getCrepository <em>Crepository</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Crepository</em>' containment reference.
+	 * @see #getCrepository()
+	 * @generated
+	 */
+	void setCrepository(CrepositoryType value);
+
+	/**
 	 * Returns the value of the '<em><b>Ctltargettype</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -939,6 +970,33 @@
 	void setCtltargettype(CtltargettypeType value);
 
 	/**
+	 * Returns the value of the '<em><b>Customizableicons</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Customizableicons</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Customizableicons</em>' containment reference.
+	 * @see #setCustomizableicons(CustomizableiconsType)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getDocumentRoot_Customizableicons()
+	 * @model containment="true" upper="-2" transient="true" volatile="true" derived="true"
+	 *        extendedMetaData="kind='element' name='customizableicons' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	CustomizableiconsType getCustomizableicons();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getCustomizableicons <em>Customizableicons</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Customizableicons</em>' containment reference.
+	 * @see #getCustomizableicons()
+	 * @generated
+	 */
+	void setCustomizableicons(CustomizableiconsType value);
+
+	/**
 	 * Returns the value of the '<em><b>Customrule</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -1452,6 +1510,33 @@
 	void setFiletype(String value);
 
 	/**
+	 * Returns the value of the '<em><b>Flags</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Flags</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Flags</em>' containment reference.
+	 * @see #setFlags(FlagsType)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getDocumentRoot_Flags()
+	 * @model containment="true" upper="-2" transient="true" volatile="true" derived="true"
+	 *        extendedMetaData="kind='element' name='flags' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	FlagsType getFlags();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getFlags <em>Flags</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Flags</em>' containment reference.
+	 * @see #getFlags()
+	 * @generated
+	 */
+	void setFlags(FlagsType value);
+
+	/**
 	 * Returns the value of the '<em><b>Foff</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -1641,6 +1726,33 @@
 	void setHigh(HighType value);
 
 	/**
+	 * Returns the value of the '<em><b>Icons RE</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Icons RE</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Icons RE</em>' attribute.
+	 * @see #setIconsRE(String)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getDocumentRoot_IconsRE()
+	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" upper="-2" transient="true" volatile="true" derived="true"
+	 *        extendedMetaData="kind='element' name='iconsRE' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	String getIconsRE();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot#getIconsRE <em>Icons RE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Icons RE</em>' attribute.
+	 * @see #getIconsRE()
+	 * @generated
+	 */
+	void setIconsRE(String value);
+
+	/**
 	 * Returns the value of the '<em><b>Ifassignments</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/FlagsType.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/FlagsType.java	Mon Apr 06 15:46:51 2009 -0500
@@ -0,0 +1,209 @@
+/*
+* 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.carbide.cpp.internal.codescanner.gen.CSConfig;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Flags Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#getCategory <em>Category</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#isEnable <em>Enable</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#getSeverity <em>Severity</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getFlagsType()
+ * @model extendedMetaData="name='flags_._type' kind='empty'"
+ * @generated
+ */
+public interface FlagsType extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Category</b></em>' attribute.
+	 * The literals are from the enumeration {@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Category</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Category</em>' attribute.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType
+	 * @see #isSetCategory()
+	 * @see #unsetCategory()
+	 * @see #setCategory(CategoryType)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getFlagsType_Category()
+	 * @model unsettable="true"
+	 *        extendedMetaData="kind='attribute' name='category' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	CategoryType getCategory();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#getCategory <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Category</em>' attribute.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType
+	 * @see #isSetCategory()
+	 * @see #unsetCategory()
+	 * @see #getCategory()
+	 * @generated
+	 */
+	void setCategory(CategoryType value);
+
+	/**
+	 * Unsets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#getCategory <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetCategory()
+	 * @see #getCategory()
+	 * @see #setCategory(CategoryType)
+	 * @generated
+	 */
+	void unsetCategory();
+
+	/**
+	 * Returns whether the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#getCategory <em>Category</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Category</em>' attribute is set.
+	 * @see #unsetCategory()
+	 * @see #getCategory()
+	 * @see #setCategory(CategoryType)
+	 * @generated
+	 */
+	boolean isSetCategory();
+
+	/**
+	 * Returns the value of the '<em><b>Enable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Enable</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Enable</em>' attribute.
+	 * @see #isSetEnable()
+	 * @see #unsetEnable()
+	 * @see #setEnable(boolean)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getFlagsType_Enable()
+	 * @model unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean" required="true"
+	 *        extendedMetaData="kind='attribute' name='enable' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	boolean isEnable();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#isEnable <em>Enable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Enable</em>' attribute.
+	 * @see #isSetEnable()
+	 * @see #unsetEnable()
+	 * @see #isEnable()
+	 * @generated
+	 */
+	void setEnable(boolean value);
+
+	/**
+	 * Unsets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#isEnable <em>Enable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetEnable()
+	 * @see #isEnable()
+	 * @see #setEnable(boolean)
+	 * @generated
+	 */
+	void unsetEnable();
+
+	/**
+	 * Returns whether the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#isEnable <em>Enable</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Enable</em>' attribute is set.
+	 * @see #unsetEnable()
+	 * @see #isEnable()
+	 * @see #setEnable(boolean)
+	 * @generated
+	 */
+	boolean isSetEnable();
+
+	/**
+	 * Returns the value of the '<em><b>Severity</b></em>' attribute.
+	 * The literals are from the enumeration {@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Severity</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Severity</em>' attribute.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType
+	 * @see #isSetSeverity()
+	 * @see #unsetSeverity()
+	 * @see #setSeverity(SeverityType)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getFlagsType_Severity()
+	 * @model unsettable="true"
+	 *        extendedMetaData="kind='attribute' name='severity' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	SeverityType getSeverity();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#getSeverity <em>Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Severity</em>' attribute.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType
+	 * @see #isSetSeverity()
+	 * @see #unsetSeverity()
+	 * @see #getSeverity()
+	 * @generated
+	 */
+	void setSeverity(SeverityType value);
+
+	/**
+	 * Unsets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#getSeverity <em>Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetSeverity()
+	 * @see #getSeverity()
+	 * @see #setSeverity(SeverityType)
+	 * @generated
+	 */
+	void unsetSeverity();
+
+	/**
+	 * Returns whether the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType#getSeverity <em>Severity</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Severity</em>' attribute is set.
+	 * @see #unsetSeverity()
+	 * @see #getSeverity()
+	 * @see #setSeverity(SeverityType)
+	 * @generated
+	 */
+	boolean isSetSeverity();
+
+} // FlagsType
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/ScriptsType.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/ScriptsType.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/ScriptsType.java	Mon Apr 06 15:46:51 2009 -0500
@@ -48,7 +48,9 @@
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getConstnames <em>Constnames</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getConsttdescptr <em>Consttdescptr</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getControlornull <em>Controlornull</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getCrepository <em>Crepository</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getCtltargettype <em>Ctltargettype</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getCustomizableicons <em>Customizableicons</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getDebugrom <em>Debugrom</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getDeclarename <em>Declarename</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getDeleteMemberVariable <em>Delete Member Variable</em>}</li>
@@ -62,6 +64,7 @@
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getExportinline <em>Exportinline</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getExportpurevirtual <em>Exportpurevirtual</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getExternaldriveletters <em>Externaldriveletters</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getFlags <em>Flags</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getFoff <em>Foff</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getForbiddenwords <em>Forbiddenwords</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getForgottoputptroncleanupstack <em>Forgottoputptroncleanupstack</em>}</li>
@@ -642,6 +645,33 @@
 	void setControlornull(ControlornullType value);
 
 	/**
+	 * Returns the value of the '<em><b>Crepository</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Crepository</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Crepository</em>' containment reference.
+	 * @see #setCrepository(CrepositoryType)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getScriptsType_Crepository()
+	 * @model containment="true" transient="true" volatile="true" derived="true"
+	 *        extendedMetaData="kind='element' name='crepository' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	CrepositoryType getCrepository();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getCrepository <em>Crepository</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Crepository</em>' containment reference.
+	 * @see #getCrepository()
+	 * @generated
+	 */
+	void setCrepository(CrepositoryType value);
+
+	/**
 	 * Returns the value of the '<em><b>Ctltargettype</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -669,6 +699,33 @@
 	void setCtltargettype(CtltargettypeType value);
 
 	/**
+	 * Returns the value of the '<em><b>Customizableicons</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Customizableicons</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Customizableicons</em>' containment reference.
+	 * @see #setCustomizableicons(CustomizableiconsType)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getScriptsType_Customizableicons()
+	 * @model containment="true" transient="true" volatile="true" derived="true"
+	 *        extendedMetaData="kind='element' name='customizableicons' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	CustomizableiconsType getCustomizableicons();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getCustomizableicons <em>Customizableicons</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Customizableicons</em>' containment reference.
+	 * @see #getCustomizableicons()
+	 * @generated
+	 */
+	void setCustomizableicons(CustomizableiconsType value);
+
+	/**
 	 * Returns the value of the '<em><b>Debugrom</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -1020,6 +1077,33 @@
 	void setExternaldriveletters(ExternaldrivelettersType value);
 
 	/**
+	 * Returns the value of the '<em><b>Flags</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Flags</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Flags</em>' containment reference.
+	 * @see #setFlags(FlagsType)
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage#getScriptsType_Flags()
+	 * @model containment="true" transient="true" volatile="true" derived="true"
+	 *        extendedMetaData="kind='element' name='flags' namespace='##targetNamespace'"
+	 * @generated
+	 */
+	FlagsType getFlags();
+
+	/**
+	 * Sets the value of the '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType#getFlags <em>Flags</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Flags</em>' containment reference.
+	 * @see #getFlags()
+	 * @generated
+	 */
+	void setFlags(FlagsType value);
+
+	/**
 	 * Returns the value of the '<em><b>Foff</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/CSConfig.ecore
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/CSConfig.ecore	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/CSConfig.ecore	Mon Apr 06 15:46:51 2009 -0500
@@ -813,6 +813,37 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CrepositoryType">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="crepository_._type"/>
+      <details key="kind" value="empty"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" eType="#//CategoryType"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="category"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enable" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="enable"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="severity" eType="#//SeverityType"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="severity"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CtltargettypeType">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="ctltargettype_._type"/>
@@ -844,6 +875,45 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CustomizableiconsType">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="customizableicons_._type"/>
+      <details key="kind" value="elementOnly"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconsRE" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="iconsRE"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" eType="#//CategoryType"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="category"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enable" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="enable"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="severity" eType="#//SeverityType"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="severity"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CustomrulesType">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="customrules_._type"/>
@@ -1309,6 +1379,15 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="crepository" upperBound="-2"
+        eType="#//CrepositoryType" volatile="true" transient="true" derived="true"
+        containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="crepository"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="ctltargettype" upperBound="-2"
         eType="#//CtltargettypeType" volatile="true" transient="true" derived="true"
         containment="true" resolveProxies="false">
@@ -1318,6 +1397,15 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="customizableicons" upperBound="-2"
+        eType="#//CustomizableiconsType" volatile="true" transient="true" derived="true"
+        containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="customizableicons"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="customrule" upperBound="-2"
         eType="#//CustomruleType" volatile="true" transient="true" derived="true"
         containment="true" resolveProxies="false">
@@ -1489,6 +1577,15 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="flags" upperBound="-2"
+        eType="#//FlagsType" volatile="true" transient="true" derived="true" containment="true"
+        resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="flags"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="foff" upperBound="-2" eType="#//FoffType"
         volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -1549,6 +1646,15 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconsRE" unique="false"
+        upperBound="-2" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
+        volatile="true" transient="true" derived="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="iconsRE"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="ifassignments" upperBound="-2"
         eType="#//IfassignmentsType" volatile="true" transient="true" derived="true"
         containment="true" resolveProxies="false">
@@ -2622,6 +2728,37 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FlagsType">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="flags_._type"/>
+      <details key="kind" value="empty"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" eType="#//CategoryType"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="category"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enable" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="enable"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="severity" eType="#//SeverityType"
+        unsettable="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="severity"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FoffType">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="foff_._type"/>
@@ -4464,6 +4601,14 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="crepository" eType="#//CrepositoryType"
+        volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="crepository"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="ctltargettype" eType="#//CtltargettypeType"
         volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -4472,6 +4617,14 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="customizableicons" eType="#//CustomizableiconsType"
+        volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="customizableicons"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="debugrom" eType="#//DebugromType"
         volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -4576,6 +4729,14 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="flags" eType="#//FlagsType"
+        volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="flags"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="foff" eType="#//FoffType"
         volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/CSConfigFactoryImpl.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/CSConfigFactoryImpl.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/CSConfigFactoryImpl.java	Mon Apr 06 15:46:51 2009 -0500
@@ -96,7 +96,9 @@
 			case CSConfigPackage.CONSTNAMES_TYPE: return createConstnamesType();
 			case CSConfigPackage.CONSTTDESCPTR_TYPE: return createConsttdescptrType();
 			case CSConfigPackage.CONTROLORNULL_TYPE: return createControlornullType();
+			case CSConfigPackage.CREPOSITORY_TYPE: return createCrepositoryType();
 			case CSConfigPackage.CTLTARGETTYPE_TYPE: return createCtltargettypeType();
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE: return createCustomizableiconsType();
 			case CSConfigPackage.CUSTOMRULES_TYPE: return createCustomrulesType();
 			case CSConfigPackage.CUSTOMRULE_TYPE: return createCustomruleType();
 			case CSConfigPackage.DEBUGROM_TYPE: return createDebugromType();
@@ -114,6 +116,7 @@
 			case CSConfigPackage.EXPORTINLINE_TYPE: return createExportinlineType();
 			case CSConfigPackage.EXPORTPUREVIRTUAL_TYPE: return createExportpurevirtualType();
 			case CSConfigPackage.EXTERNALDRIVELETTERS_TYPE: return createExternaldrivelettersType();
+			case CSConfigPackage.FLAGS_TYPE: return createFlagsType();
 			case CSConfigPackage.FOFF_TYPE: return createFoffType();
 			case CSConfigPackage.FORBIDDENWORDS_TYPE: return createForbiddenwordsType();
 			case CSConfigPackage.FORGOTTOPUTPTRONCLEANUPSTACK_TYPE: return createForgottoputptroncleanupstackType();
@@ -487,6 +490,16 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public CrepositoryType createCrepositoryType() {
+		CrepositoryTypeImpl crepositoryType = new CrepositoryTypeImpl();
+		return crepositoryType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public CtltargettypeType createCtltargettypeType() {
 		CtltargettypeTypeImpl ctltargettypeType = new CtltargettypeTypeImpl();
 		return ctltargettypeType;
@@ -497,6 +510,16 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public CustomizableiconsType createCustomizableiconsType() {
+		CustomizableiconsTypeImpl customizableiconsType = new CustomizableiconsTypeImpl();
+		return customizableiconsType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public CustomrulesType createCustomrulesType() {
 		CustomrulesTypeImpl customrulesType = new CustomrulesTypeImpl();
 		return customrulesType;
@@ -667,6 +690,16 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public FlagsType createFlagsType() {
+		FlagsTypeImpl flagsType = new FlagsTypeImpl();
+		return flagsType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public FoffType createFoffType() {
 		FoffTypeImpl foffType = new FoffTypeImpl();
 		return foffType;
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/CSConfigPackageImpl.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/CSConfigPackageImpl.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/CSConfigPackageImpl.java	Mon Apr 06 15:46:51 2009 -0500
@@ -230,6 +230,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass crepositoryTypeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass ctltargettypeTypeEClass = null;
 
 	/**
@@ -237,6 +244,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass customizableiconsTypeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass customrulesTypeEClass = null;
 
 	/**
@@ -356,6 +370,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass flagsTypeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass foffTypeEClass = null;
 
 	/**
@@ -2010,9 +2031,48 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getCrepositoryType() {
+		if (crepositoryTypeEClass == null) {
+			crepositoryTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(26);
+		}
+		return crepositoryTypeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCrepositoryType_Category() {
+        return (EAttribute)getCrepositoryType().getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCrepositoryType_Enable() {
+        return (EAttribute)getCrepositoryType().getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCrepositoryType_Severity() {
+        return (EAttribute)getCrepositoryType().getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getCtltargettypeType() {
 		if (ctltargettypeTypeEClass == null) {
-			ctltargettypeTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(26);
+			ctltargettypeTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(27);
 		}
 		return ctltargettypeTypeEClass;
 	}
@@ -2049,9 +2109,57 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getCustomizableiconsType() {
+		if (customizableiconsTypeEClass == null) {
+			customizableiconsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(28);
+		}
+		return customizableiconsTypeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCustomizableiconsType_IconsRE() {
+        return (EAttribute)getCustomizableiconsType().getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCustomizableiconsType_Category() {
+        return (EAttribute)getCustomizableiconsType().getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCustomizableiconsType_Enable() {
+        return (EAttribute)getCustomizableiconsType().getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCustomizableiconsType_Severity() {
+        return (EAttribute)getCustomizableiconsType().getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getCustomrulesType() {
 		if (customrulesTypeEClass == null) {
-			customrulesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(27);
+			customrulesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(29);
 		}
 		return customrulesTypeEClass;
 	}
@@ -2072,7 +2180,7 @@
 	 */
 	public EClass getCustomruleType() {
 		if (customruleTypeEClass == null) {
-			customruleTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(28);
+			customruleTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(30);
 		}
 		return customruleTypeEClass;
 	}
@@ -2147,7 +2255,7 @@
 	 */
 	public EClass getDebugromType() {
 		if (debugromTypeEClass == null) {
-			debugromTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(29);
+			debugromTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(31);
 		}
 		return debugromTypeEClass;
 	}
@@ -2186,7 +2294,7 @@
 	 */
 	public EClass getDeclarenameType() {
 		if (declarenameTypeEClass == null) {
-			declarenameTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(30);
+			declarenameTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(32);
 		}
 		return declarenameTypeEClass;
 	}
@@ -2225,7 +2333,7 @@
 	 */
 	public EClass getDeleteMemberVariableType() {
 		if (deleteMemberVariableTypeEClass == null) {
-			deleteMemberVariableTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(31);
+			deleteMemberVariableTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(33);
 		}
 		return deleteMemberVariableTypeEClass;
 	}
@@ -2264,7 +2372,7 @@
 	 */
 	public EClass getDestructorType() {
 		if (destructorTypeEClass == null) {
-			destructorTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(32);
+			destructorTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(34);
 		}
 		return destructorTypeEClass;
 	}
@@ -2303,7 +2411,7 @@
 	 */
 	public EClass getDocumentationType() {
 		if (documentationTypeEClass == null) {
-			documentationTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(33);
+			documentationTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(35);
 		}
 		return documentationTypeEClass;
 	}
@@ -2324,7 +2432,7 @@
 	 */
 	public EClass getDocumentRoot() {
 		if (documentRootEClass == null) {
-			documentRootEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(34);
+			documentRootEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(36);
 		}
 		return documentRootEClass;
 	}
@@ -2586,8 +2694,26 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getDocumentRoot_Crepository() {
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(28);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EReference getDocumentRoot_Ctltargettype() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(28);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(29);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDocumentRoot_Customizableicons() {
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(30);
 	}
 
 	/**
@@ -2596,7 +2722,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Customrule() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(29);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(31);
 	}
 
 	/**
@@ -2605,7 +2731,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Customrules() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(30);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(32);
 	}
 
 	/**
@@ -2614,7 +2740,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Debugrom() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(31);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(33);
 	}
 
 	/**
@@ -2623,7 +2749,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Declarename() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(32);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(34);
 	}
 
 	/**
@@ -2632,7 +2758,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_DeleteMemberVariable() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(33);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(35);
 	}
 
 	/**
@@ -2641,7 +2767,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Description() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(34);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(36);
 	}
 
 	/**
@@ -2650,7 +2776,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Destructor() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(35);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(37);
 	}
 
 	/**
@@ -2659,7 +2785,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Documentation() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(36);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(38);
 	}
 
 	/**
@@ -2668,7 +2794,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_DoubleSemiColon() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(37);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(39);
 	}
 
 	/**
@@ -2677,7 +2803,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Driveletters() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(38);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(40);
 	}
 
 	/**
@@ -2686,7 +2812,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Eikbuttons() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(39);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(41);
 	}
 
 	/**
@@ -2695,7 +2821,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Eikonenvstatic() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(40);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(42);
 	}
 
 	/**
@@ -2704,7 +2830,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Enummembers() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(41);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(43);
 	}
 
 	/**
@@ -2713,7 +2839,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Enumnames() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(42);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(44);
 	}
 
 	/**
@@ -2722,7 +2848,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Exclude() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(43);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(45);
 	}
 
 	/**
@@ -2731,7 +2857,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Exportinline() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(44);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(46);
 	}
 
 	/**
@@ -2740,7 +2866,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Exportpurevirtual() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(45);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(47);
 	}
 
 	/**
@@ -2749,7 +2875,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Externaldriveletters() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(46);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(48);
 	}
 
 	/**
@@ -2758,7 +2884,16 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Filetype() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(47);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(49);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDocumentRoot_Flags() {
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(50);
 	}
 
 	/**
@@ -2767,7 +2902,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Foff() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(48);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(51);
 	}
 
 	/**
@@ -2776,7 +2911,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Forbiddenwords() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(49);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(52);
 	}
 
 	/**
@@ -2785,7 +2920,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Forgottoputptroncleanupstack() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(50);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(53);
 	}
 
 	/**
@@ -2794,7 +2929,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Friend() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(51);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(54);
 	}
 
 	/**
@@ -2803,7 +2938,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Functionality() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(52);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(55);
 	}
 
 	/**
@@ -2812,7 +2947,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Goto() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(53);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(56);
 	}
 
 	/**
@@ -2821,7 +2956,16 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_High() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(54);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(57);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDocumentRoot_IconsRE() {
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(58);
 	}
 
 	/**
@@ -2830,7 +2974,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Ifassignments() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(55);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(59);
 	}
 
 	/**
@@ -2839,7 +2983,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Ifpreprocessor() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(56);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(60);
 	}
 
 	/**
@@ -2848,7 +2992,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Inheritanceorder() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(57);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(61);
 	}
 
 	/**
@@ -2857,7 +3001,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Input() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(58);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(62);
 	}
 
 	/**
@@ -2866,7 +3010,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Intleaves() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(59);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(63);
 	}
 
 	/**
@@ -2875,7 +3019,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Jmp() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(60);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(64);
 	}
 
 	/**
@@ -2884,7 +3028,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Keyword() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(61);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(65);
 	}
 
 	/**
@@ -2893,7 +3037,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Leave() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(62);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(66);
 	}
 
 	/**
@@ -2902,7 +3046,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_LeaveNoError() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(63);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(67);
 	}
 
 	/**
@@ -2911,7 +3055,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Leavingoperators() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(64);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(68);
 	}
 
 	/**
@@ -2920,7 +3064,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Legal() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(65);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(69);
 	}
 
 	/**
@@ -2929,7 +3073,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_LFunctionCantLeave() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(66);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(70);
 	}
 
 	/**
@@ -2938,7 +3082,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_LFunctionIgnoreRE() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(67);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(71);
 	}
 
 	/**
@@ -2947,7 +3091,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Link() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(68);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(72);
 	}
 
 	/**
@@ -2956,7 +3100,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Localisation() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(69);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(73);
 	}
 
 	/**
@@ -2965,7 +3109,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Longlines() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(70);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(74);
 	}
 
 	/**
@@ -2974,7 +3118,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Low() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(71);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(75);
 	}
 
 	/**
@@ -2983,7 +3127,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Lxr() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(72);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(76);
 	}
 
 	/**
@@ -2992,7 +3136,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Lxrversion() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(73);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(77);
 	}
 
 	/**
@@ -3001,7 +3145,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Magicnumbers() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(74);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(78);
 	}
 
 	/**
@@ -3010,7 +3154,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Mclassdestructor() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(75);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(79);
 	}
 
 	/**
@@ -3019,7 +3163,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Medium() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(76);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(80);
 	}
 
 	/**
@@ -3028,7 +3172,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Memberlc() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(77);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(81);
 	}
 
 	/**
@@ -3037,7 +3181,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Membervariablecallld() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(78);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(82);
 	}
 
 	/**
@@ -3046,7 +3190,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Missingcancel() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(79);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(83);
 	}
 
 	/**
@@ -3055,7 +3199,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Missingcclass() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(80);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(84);
 	}
 
 	/**
@@ -3064,7 +3208,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Mmpsourcepath() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(81);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(85);
 	}
 
 	/**
@@ -3073,7 +3217,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Multilangrsc() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(82);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(86);
 	}
 
 	/**
@@ -3082,7 +3226,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Multipledeclarations() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(83);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(87);
 	}
 
 	/**
@@ -3091,7 +3235,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Multipleinheritance() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(84);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(88);
 	}
 
 	/**
@@ -3100,7 +3244,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Mydocs() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(85);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(89);
 	}
 
 	/**
@@ -3109,7 +3253,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Name() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(86);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(90);
 	}
 
 	/**
@@ -3118,7 +3262,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Namespace() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(87);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(91);
 	}
 
 	/**
@@ -3127,7 +3271,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Newlreferences() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(88);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(92);
 	}
 
 	/**
@@ -3136,7 +3280,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Noleavetrap() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(89);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(93);
 	}
 
 	/**
@@ -3145,7 +3289,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Nonconsthbufc() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(90);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(94);
 	}
 
 	/**
@@ -3154,7 +3298,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Nonconsttdesc() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(91);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(95);
 	}
 
 	/**
@@ -3163,7 +3307,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Nonleavenew() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(92);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(96);
 	}
 
 	/**
@@ -3172,7 +3316,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Nonunicodeskins() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(93);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(97);
 	}
 
 	/**
@@ -3181,7 +3325,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Null() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(94);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(98);
 	}
 
 	/**
@@ -3190,7 +3334,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Open() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(95);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(99);
 	}
 
 	/**
@@ -3199,7 +3343,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_OpenIgnoreRE() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(96);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(100);
 	}
 
 	/**
@@ -3208,7 +3352,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Other() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(97);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(101);
 	}
 
 	/**
@@ -3217,7 +3361,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Outputformat() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(98);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(102);
 	}
 
 	/**
@@ -3226,7 +3370,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Panic() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(99);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(103);
 	}
 
 	/**
@@ -3235,7 +3379,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Performance() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(100);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(104);
 	}
 
 	/**
@@ -3244,7 +3388,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Pointertoarrays() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(101);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(105);
 	}
 
 	/**
@@ -3253,7 +3397,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Pragmadisable() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(102);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(106);
 	}
 
 	/**
@@ -3262,7 +3406,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Pragmamessage() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(103);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(107);
 	}
 
 	/**
@@ -3271,7 +3415,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Pragmaother() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(104);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(108);
 	}
 
 	/**
@@ -3280,7 +3424,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Privateinheritance() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(105);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(109);
 	}
 
 	/**
@@ -3289,7 +3433,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Pushaddrvar() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(106);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(110);
 	}
 
 	/**
@@ -3298,7 +3442,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Pushmember() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(107);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(111);
 	}
 
 	/**
@@ -3307,7 +3451,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Readresource() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(108);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(112);
 	}
 
 	/**
@@ -3316,7 +3460,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Resourcenotoncleanupstack() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(109);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(113);
 	}
 
 	/**
@@ -3325,7 +3469,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Resourcesonheap() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(110);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(114);
 	}
 
 	/**
@@ -3334,7 +3478,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Returndescriptoroutofscope() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(111);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(115);
 	}
 
 	/**
@@ -3343,7 +3487,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Rfs() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(112);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(116);
 	}
 
 	/**
@@ -3352,7 +3496,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Rssnames() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(113);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(117);
 	}
 
 	/**
@@ -3361,7 +3505,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Scripts() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(114);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(118);
 	}
 
 	/**
@@ -3370,7 +3514,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Severities() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(115);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(119);
 	}
 
 	/**
@@ -3379,7 +3523,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Sources() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(117);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(121);
 	}
 
 	/**
@@ -3388,7 +3532,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Stringliterals() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(118);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(122);
 	}
 
 	/**
@@ -3397,7 +3541,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Stringsinresourcefiles() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(119);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(123);
 	}
 
 	/**
@@ -3406,7 +3550,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Struct() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(120);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(124);
 	}
 
 	/**
@@ -3415,7 +3559,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Tcclasses() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(121);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(125);
 	}
 
 	/**
@@ -3424,7 +3568,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Tclassdestructor() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(122);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(126);
 	}
 
 	/**
@@ -3433,7 +3577,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Timestampedoutput() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(123);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(127);
 	}
 
 	/**
@@ -3442,7 +3586,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Title() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(124);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(128);
 	}
 
 	/**
@@ -3451,7 +3595,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Todocomments() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(125);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(129);
 	}
 
 	/**
@@ -3460,7 +3604,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Trapcleanup() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(126);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(130);
 	}
 
 	/**
@@ -3469,7 +3613,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Trapeleave() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(127);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(131);
 	}
 
 	/**
@@ -3478,7 +3622,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Traprunl() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(128);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(132);
 	}
 
 	/**
@@ -3487,7 +3631,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Trspassing() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(129);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(133);
 	}
 
 	/**
@@ -3496,7 +3640,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Uids() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(130);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(134);
 	}
 
 	/**
@@ -3505,7 +3649,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Uncompressedaif() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(131);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(135);
 	}
 
 	/**
@@ -3514,7 +3658,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Uncompressedbmp() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(132);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(136);
 	}
 
 	/**
@@ -3523,7 +3667,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Unicodesource() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(133);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(137);
 	}
 
 	/**
@@ -3532,7 +3676,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Userafter() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(134);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(138);
 	}
 
 	/**
@@ -3541,7 +3685,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Userfree() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(135);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(139);
 	}
 
 	/**
@@ -3550,7 +3694,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_UserWaitForRequest() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(136);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(140);
 	}
 
 	/**
@@ -3559,7 +3703,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Variablenames() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(137);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(141);
 	}
 
 	/**
@@ -3568,7 +3712,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Voidparameter() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(138);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(142);
 	}
 
 	/**
@@ -3577,7 +3721,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_WordsRE() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(139);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(143);
 	}
 
 	/**
@@ -3586,7 +3730,7 @@
 	 * @generated
 	 */
 	public EReference getDocumentRoot_Worryingcomments() {
-        return (EReference)getDocumentRoot().getEStructuralFeatures().get(140);
+        return (EReference)getDocumentRoot().getEStructuralFeatures().get(144);
 	}
 
 	/**
@@ -3595,7 +3739,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_WorryRE() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(141);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(145);
 	}
 
 	/**
@@ -3604,7 +3748,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Category() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(142);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(146);
 	}
 
 	/**
@@ -3613,7 +3757,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Severity1() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(143);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(147);
 	}
 
 	/**
@@ -3622,7 +3766,7 @@
 	 * @generated
 	 */
 	public EAttribute getDocumentRoot_Severity() {
-        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(116);
+        return (EAttribute)getDocumentRoot().getEStructuralFeatures().get(120);
 	}
 
 	/**
@@ -3632,7 +3776,7 @@
 	 */
 	public EClass getDoubleSemiColonType() {
 		if (doubleSemiColonTypeEClass == null) {
-			doubleSemiColonTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(35);
+			doubleSemiColonTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(37);
 		}
 		return doubleSemiColonTypeEClass;
 	}
@@ -3671,7 +3815,7 @@
 	 */
 	public EClass getDrivelettersType() {
 		if (drivelettersTypeEClass == null) {
-			drivelettersTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(36);
+			drivelettersTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(38);
 		}
 		return drivelettersTypeEClass;
 	}
@@ -3710,7 +3854,7 @@
 	 */
 	public EClass getEikbuttonsType() {
 		if (eikbuttonsTypeEClass == null) {
-			eikbuttonsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(37);
+			eikbuttonsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(39);
 		}
 		return eikbuttonsTypeEClass;
 	}
@@ -3749,7 +3893,7 @@
 	 */
 	public EClass getEikonenvstaticType() {
 		if (eikonenvstaticTypeEClass == null) {
-			eikonenvstaticTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(38);
+			eikonenvstaticTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(40);
 		}
 		return eikonenvstaticTypeEClass;
 	}
@@ -3788,7 +3932,7 @@
 	 */
 	public EClass getEnummembersType() {
 		if (enummembersTypeEClass == null) {
-			enummembersTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(39);
+			enummembersTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(41);
 		}
 		return enummembersTypeEClass;
 	}
@@ -3827,7 +3971,7 @@
 	 */
 	public EClass getEnumnamesType() {
 		if (enumnamesTypeEClass == null) {
-			enumnamesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(40);
+			enumnamesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(42);
 		}
 		return enumnamesTypeEClass;
 	}
@@ -3866,7 +4010,7 @@
 	 */
 	public EClass getExportinlineType() {
 		if (exportinlineTypeEClass == null) {
-			exportinlineTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(41);
+			exportinlineTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(43);
 		}
 		return exportinlineTypeEClass;
 	}
@@ -3905,7 +4049,7 @@
 	 */
 	public EClass getExportpurevirtualType() {
 		if (exportpurevirtualTypeEClass == null) {
-			exportpurevirtualTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(42);
+			exportpurevirtualTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(44);
 		}
 		return exportpurevirtualTypeEClass;
 	}
@@ -3944,7 +4088,7 @@
 	 */
 	public EClass getExternaldrivelettersType() {
 		if (externaldrivelettersTypeEClass == null) {
-			externaldrivelettersTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(43);
+			externaldrivelettersTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(45);
 		}
 		return externaldrivelettersTypeEClass;
 	}
@@ -3981,9 +4125,48 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getFlagsType() {
+		if (flagsTypeEClass == null) {
+			flagsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(46);
+		}
+		return flagsTypeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getFlagsType_Category() {
+        return (EAttribute)getFlagsType().getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getFlagsType_Enable() {
+        return (EAttribute)getFlagsType().getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getFlagsType_Severity() {
+        return (EAttribute)getFlagsType().getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getFoffType() {
 		if (foffTypeEClass == null) {
-			foffTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(44);
+			foffTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(47);
 		}
 		return foffTypeEClass;
 	}
@@ -4022,7 +4205,7 @@
 	 */
 	public EClass getForbiddenwordsType() {
 		if (forbiddenwordsTypeEClass == null) {
-			forbiddenwordsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(45);
+			forbiddenwordsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(48);
 		}
 		return forbiddenwordsTypeEClass;
 	}
@@ -4070,7 +4253,7 @@
 	 */
 	public EClass getForgottoputptroncleanupstackType() {
 		if (forgottoputptroncleanupstackTypeEClass == null) {
-			forgottoputptroncleanupstackTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(46);
+			forgottoputptroncleanupstackTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(49);
 		}
 		return forgottoputptroncleanupstackTypeEClass;
 	}
@@ -4109,7 +4292,7 @@
 	 */
 	public EClass getFriendType() {
 		if (friendTypeEClass == null) {
-			friendTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(47);
+			friendTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(50);
 		}
 		return friendTypeEClass;
 	}
@@ -4148,7 +4331,7 @@
 	 */
 	public EClass getFunctionalityType() {
 		if (functionalityTypeEClass == null) {
-			functionalityTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(48);
+			functionalityTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(51);
 		}
 		return functionalityTypeEClass;
 	}
@@ -4169,7 +4352,7 @@
 	 */
 	public EClass getGotoType() {
 		if (gotoTypeEClass == null) {
-			gotoTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(49);
+			gotoTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(52);
 		}
 		return gotoTypeEClass;
 	}
@@ -4208,7 +4391,7 @@
 	 */
 	public EClass getHighType() {
 		if (highTypeEClass == null) {
-			highTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(50);
+			highTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(53);
 		}
 		return highTypeEClass;
 	}
@@ -4229,7 +4412,7 @@
 	 */
 	public EClass getIfassignmentsType() {
 		if (ifassignmentsTypeEClass == null) {
-			ifassignmentsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(51);
+			ifassignmentsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(54);
 		}
 		return ifassignmentsTypeEClass;
 	}
@@ -4268,7 +4451,7 @@
 	 */
 	public EClass getIfpreprocessorType() {
 		if (ifpreprocessorTypeEClass == null) {
-			ifpreprocessorTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(52);
+			ifpreprocessorTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(55);
 		}
 		return ifpreprocessorTypeEClass;
 	}
@@ -4307,7 +4490,7 @@
 	 */
 	public EClass getInheritanceorderType() {
 		if (inheritanceorderTypeEClass == null) {
-			inheritanceorderTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(53);
+			inheritanceorderTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(56);
 		}
 		return inheritanceorderTypeEClass;
 	}
@@ -4346,7 +4529,7 @@
 	 */
 	public EClass getIntleavesType() {
 		if (intleavesTypeEClass == null) {
-			intleavesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(54);
+			intleavesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(57);
 		}
 		return intleavesTypeEClass;
 	}
@@ -4385,7 +4568,7 @@
 	 */
 	public EClass getJmpType() {
 		if (jmpTypeEClass == null) {
-			jmpTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(55);
+			jmpTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(58);
 		}
 		return jmpTypeEClass;
 	}
@@ -4424,7 +4607,7 @@
 	 */
 	public EClass getKeywordType() {
 		if (keywordTypeEClass == null) {
-			keywordTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(56);
+			keywordTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(59);
 		}
 		return keywordTypeEClass;
 	}
@@ -4454,7 +4637,7 @@
 	 */
 	public EClass getLeaveNoErrorType() {
 		if (leaveNoErrorTypeEClass == null) {
-			leaveNoErrorTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(57);
+			leaveNoErrorTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(60);
 		}
 		return leaveNoErrorTypeEClass;
 	}
@@ -4493,7 +4676,7 @@
 	 */
 	public EClass getLeaveType() {
 		if (leaveTypeEClass == null) {
-			leaveTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(58);
+			leaveTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(61);
 		}
 		return leaveTypeEClass;
 	}
@@ -4532,7 +4715,7 @@
 	 */
 	public EClass getLeavingoperatorsType() {
 		if (leavingoperatorsTypeEClass == null) {
-			leavingoperatorsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(59);
+			leavingoperatorsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(62);
 		}
 		return leavingoperatorsTypeEClass;
 	}
@@ -4571,7 +4754,7 @@
 	 */
 	public EClass getLegalType() {
 		if (legalTypeEClass == null) {
-			legalTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(60);
+			legalTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(63);
 		}
 		return legalTypeEClass;
 	}
@@ -4592,7 +4775,7 @@
 	 */
 	public EClass getLFunctionCantLeaveType() {
 		if (lFunctionCantLeaveTypeEClass == null) {
-			lFunctionCantLeaveTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(61);
+			lFunctionCantLeaveTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(64);
 		}
 		return lFunctionCantLeaveTypeEClass;
 	}
@@ -4640,7 +4823,7 @@
 	 */
 	public EClass getLocalisationType() {
 		if (localisationTypeEClass == null) {
-			localisationTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(62);
+			localisationTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(65);
 		}
 		return localisationTypeEClass;
 	}
@@ -4661,7 +4844,7 @@
 	 */
 	public EClass getLonglinesType() {
 		if (longlinesTypeEClass == null) {
-			longlinesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(63);
+			longlinesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(66);
 		}
 		return longlinesTypeEClass;
 	}
@@ -4709,7 +4892,7 @@
 	 */
 	public EClass getLowType() {
 		if (lowTypeEClass == null) {
-			lowTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(64);
+			lowTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(67);
 		}
 		return lowTypeEClass;
 	}
@@ -4730,7 +4913,7 @@
 	 */
 	public EClass getMagicnumbersType() {
 		if (magicnumbersTypeEClass == null) {
-			magicnumbersTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(65);
+			magicnumbersTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(68);
 		}
 		return magicnumbersTypeEClass;
 	}
@@ -4769,7 +4952,7 @@
 	 */
 	public EClass getMclassdestructorType() {
 		if (mclassdestructorTypeEClass == null) {
-			mclassdestructorTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(66);
+			mclassdestructorTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(69);
 		}
 		return mclassdestructorTypeEClass;
 	}
@@ -4808,7 +4991,7 @@
 	 */
 	public EClass getMediumType() {
 		if (mediumTypeEClass == null) {
-			mediumTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(67);
+			mediumTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(70);
 		}
 		return mediumTypeEClass;
 	}
@@ -4829,7 +5012,7 @@
 	 */
 	public EClass getMemberlcType() {
 		if (memberlcTypeEClass == null) {
-			memberlcTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(68);
+			memberlcTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(71);
 		}
 		return memberlcTypeEClass;
 	}
@@ -4868,7 +5051,7 @@
 	 */
 	public EClass getMembervariablecallldType() {
 		if (membervariablecallldTypeEClass == null) {
-			membervariablecallldTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(69);
+			membervariablecallldTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(72);
 		}
 		return membervariablecallldTypeEClass;
 	}
@@ -4907,7 +5090,7 @@
 	 */
 	public EClass getMissingcancelType() {
 		if (missingcancelTypeEClass == null) {
-			missingcancelTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(70);
+			missingcancelTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(73);
 		}
 		return missingcancelTypeEClass;
 	}
@@ -4946,7 +5129,7 @@
 	 */
 	public EClass getMissingcclassType() {
 		if (missingcclassTypeEClass == null) {
-			missingcclassTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(71);
+			missingcclassTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(74);
 		}
 		return missingcclassTypeEClass;
 	}
@@ -4994,7 +5177,7 @@
 	 */
 	public EClass getMmpsourcepathType() {
 		if (mmpsourcepathTypeEClass == null) {
-			mmpsourcepathTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(72);
+			mmpsourcepathTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(75);
 		}
 		return mmpsourcepathTypeEClass;
 	}
@@ -5033,7 +5216,7 @@
 	 */
 	public EClass getMultilangrscType() {
 		if (multilangrscTypeEClass == null) {
-			multilangrscTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(73);
+			multilangrscTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(76);
 		}
 		return multilangrscTypeEClass;
 	}
@@ -5072,7 +5255,7 @@
 	 */
 	public EClass getMultipledeclarationsType() {
 		if (multipledeclarationsTypeEClass == null) {
-			multipledeclarationsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(74);
+			multipledeclarationsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(77);
 		}
 		return multipledeclarationsTypeEClass;
 	}
@@ -5111,7 +5294,7 @@
 	 */
 	public EClass getMultipleinheritanceType() {
 		if (multipleinheritanceTypeEClass == null) {
-			multipleinheritanceTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(75);
+			multipleinheritanceTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(78);
 		}
 		return multipleinheritanceTypeEClass;
 	}
@@ -5150,7 +5333,7 @@
 	 */
 	public EClass getMydocsType() {
 		if (mydocsTypeEClass == null) {
-			mydocsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(76);
+			mydocsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(79);
 		}
 		return mydocsTypeEClass;
 	}
@@ -5189,7 +5372,7 @@
 	 */
 	public EClass getNamespaceType() {
 		if (namespaceTypeEClass == null) {
-			namespaceTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(77);
+			namespaceTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(80);
 		}
 		return namespaceTypeEClass;
 	}
@@ -5228,7 +5411,7 @@
 	 */
 	public EClass getNewlreferencesType() {
 		if (newlreferencesTypeEClass == null) {
-			newlreferencesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(78);
+			newlreferencesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(81);
 		}
 		return newlreferencesTypeEClass;
 	}
@@ -5267,7 +5450,7 @@
 	 */
 	public EClass getNoleavetrapType() {
 		if (noleavetrapTypeEClass == null) {
-			noleavetrapTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(79);
+			noleavetrapTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(82);
 		}
 		return noleavetrapTypeEClass;
 	}
@@ -5306,7 +5489,7 @@
 	 */
 	public EClass getNonconsthbufcType() {
 		if (nonconsthbufcTypeEClass == null) {
-			nonconsthbufcTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(80);
+			nonconsthbufcTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(83);
 		}
 		return nonconsthbufcTypeEClass;
 	}
@@ -5345,7 +5528,7 @@
 	 */
 	public EClass getNonconsttdescType() {
 		if (nonconsttdescTypeEClass == null) {
-			nonconsttdescTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(81);
+			nonconsttdescTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(84);
 		}
 		return nonconsttdescTypeEClass;
 	}
@@ -5384,7 +5567,7 @@
 	 */
 	public EClass getNonleavenewType() {
 		if (nonleavenewTypeEClass == null) {
-			nonleavenewTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(82);
+			nonleavenewTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(85);
 		}
 		return nonleavenewTypeEClass;
 	}
@@ -5423,7 +5606,7 @@
 	 */
 	public EClass getNonunicodeskinsType() {
 		if (nonunicodeskinsTypeEClass == null) {
-			nonunicodeskinsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(83);
+			nonunicodeskinsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(86);
 		}
 		return nonunicodeskinsTypeEClass;
 	}
@@ -5462,7 +5645,7 @@
 	 */
 	public EClass getNullType() {
 		if (nullTypeEClass == null) {
-			nullTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(84);
+			nullTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(87);
 		}
 		return nullTypeEClass;
 	}
@@ -5501,7 +5684,7 @@
 	 */
 	public EClass getOpenType() {
 		if (openTypeEClass == null) {
-			openTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(85);
+			openTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(88);
 		}
 		return openTypeEClass;
 	}
@@ -5549,7 +5732,7 @@
 	 */
 	public EClass getOtherType() {
 		if (otherTypeEClass == null) {
-			otherTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(86);
+			otherTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(89);
 		}
 		return otherTypeEClass;
 	}
@@ -5570,7 +5753,7 @@
 	 */
 	public EClass getPanicType() {
 		if (panicTypeEClass == null) {
-			panicTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(87);
+			panicTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(90);
 		}
 		return panicTypeEClass;
 	}
@@ -5591,7 +5774,7 @@
 	 */
 	public EClass getPerformanceType() {
 		if (performanceTypeEClass == null) {
-			performanceTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(88);
+			performanceTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(91);
 		}
 		return performanceTypeEClass;
 	}
@@ -5612,7 +5795,7 @@
 	 */
 	public EClass getPointertoarraysType() {
 		if (pointertoarraysTypeEClass == null) {
-			pointertoarraysTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(89);
+			pointertoarraysTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(92);
 		}
 		return pointertoarraysTypeEClass;
 	}
@@ -5651,7 +5834,7 @@
 	 */
 	public EClass getPragmadisableType() {
 		if (pragmadisableTypeEClass == null) {
-			pragmadisableTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(90);
+			pragmadisableTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(93);
 		}
 		return pragmadisableTypeEClass;
 	}
@@ -5690,7 +5873,7 @@
 	 */
 	public EClass getPragmamessageType() {
 		if (pragmamessageTypeEClass == null) {
-			pragmamessageTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(91);
+			pragmamessageTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(94);
 		}
 		return pragmamessageTypeEClass;
 	}
@@ -5729,7 +5912,7 @@
 	 */
 	public EClass getPragmaotherType() {
 		if (pragmaotherTypeEClass == null) {
-			pragmaotherTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(92);
+			pragmaotherTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(95);
 		}
 		return pragmaotherTypeEClass;
 	}
@@ -5768,7 +5951,7 @@
 	 */
 	public EClass getPrivateinheritanceType() {
 		if (privateinheritanceTypeEClass == null) {
-			privateinheritanceTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(93);
+			privateinheritanceTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(96);
 		}
 		return privateinheritanceTypeEClass;
 	}
@@ -5807,7 +5990,7 @@
 	 */
 	public EClass getPushaddrvarType() {
 		if (pushaddrvarTypeEClass == null) {
-			pushaddrvarTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(94);
+			pushaddrvarTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(97);
 		}
 		return pushaddrvarTypeEClass;
 	}
@@ -5846,7 +6029,7 @@
 	 */
 	public EClass getPushmemberType() {
 		if (pushmemberTypeEClass == null) {
-			pushmemberTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(95);
+			pushmemberTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(98);
 		}
 		return pushmemberTypeEClass;
 	}
@@ -5885,7 +6068,7 @@
 	 */
 	public EClass getReadresourceType() {
 		if (readresourceTypeEClass == null) {
-			readresourceTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(96);
+			readresourceTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(99);
 		}
 		return readresourceTypeEClass;
 	}
@@ -5924,7 +6107,7 @@
 	 */
 	public EClass getResourcenotoncleanupstackType() {
 		if (resourcenotoncleanupstackTypeEClass == null) {
-			resourcenotoncleanupstackTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(97);
+			resourcenotoncleanupstackTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(100);
 		}
 		return resourcenotoncleanupstackTypeEClass;
 	}
@@ -5963,7 +6146,7 @@
 	 */
 	public EClass getResourcesonheapType() {
 		if (resourcesonheapTypeEClass == null) {
-			resourcesonheapTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(98);
+			resourcesonheapTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(101);
 		}
 		return resourcesonheapTypeEClass;
 	}
@@ -6002,7 +6185,7 @@
 	 */
 	public EClass getReturndescriptoroutofscopeType() {
 		if (returndescriptoroutofscopeTypeEClass == null) {
-			returndescriptoroutofscopeTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(99);
+			returndescriptoroutofscopeTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(102);
 		}
 		return returndescriptoroutofscopeTypeEClass;
 	}
@@ -6041,7 +6224,7 @@
 	 */
 	public EClass getRfsType() {
 		if (rfsTypeEClass == null) {
-			rfsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(100);
+			rfsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(103);
 		}
 		return rfsTypeEClass;
 	}
@@ -6080,7 +6263,7 @@
 	 */
 	public EClass getRssnamesType() {
 		if (rssnamesTypeEClass == null) {
-			rssnamesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(101);
+			rssnamesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(104);
 		}
 		return rssnamesTypeEClass;
 	}
@@ -6119,7 +6302,7 @@
 	 */
 	public EClass getScriptsType() {
 		if (scriptsTypeEClass == null) {
-			scriptsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(102);
+			scriptsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(105);
 		}
 		return scriptsTypeEClass;
 	}
@@ -6300,8 +6483,26 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getScriptsType_Crepository() {
+        return (EReference)getScriptsType().getEStructuralFeatures().get(19);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EReference getScriptsType_Ctltargettype() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(19);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(20);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getScriptsType_Customizableicons() {
+        return (EReference)getScriptsType().getEStructuralFeatures().get(21);
 	}
 
 	/**
@@ -6310,7 +6511,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Debugrom() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(20);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(22);
 	}
 
 	/**
@@ -6319,7 +6520,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Declarename() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(21);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(23);
 	}
 
 	/**
@@ -6328,7 +6529,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_DeleteMemberVariable() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(22);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(24);
 	}
 
 	/**
@@ -6337,7 +6538,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Destructor() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(23);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(25);
 	}
 
 	/**
@@ -6346,7 +6547,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_DoubleSemiColon() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(24);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(26);
 	}
 
 	/**
@@ -6355,7 +6556,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Driveletters() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(25);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(27);
 	}
 
 	/**
@@ -6364,7 +6565,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Eikbuttons() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(26);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(28);
 	}
 
 	/**
@@ -6373,7 +6574,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Eikonenvstatic() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(27);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(29);
 	}
 
 	/**
@@ -6382,7 +6583,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Enummembers() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(28);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(30);
 	}
 
 	/**
@@ -6391,7 +6592,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Enumnames() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(29);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(31);
 	}
 
 	/**
@@ -6400,7 +6601,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Exportinline() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(30);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(32);
 	}
 
 	/**
@@ -6409,7 +6610,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Exportpurevirtual() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(31);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(33);
 	}
 
 	/**
@@ -6418,7 +6619,16 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Externaldriveletters() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(32);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(34);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getScriptsType_Flags() {
+        return (EReference)getScriptsType().getEStructuralFeatures().get(35);
 	}
 
 	/**
@@ -6427,7 +6637,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Foff() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(33);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(36);
 	}
 
 	/**
@@ -6436,7 +6646,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Forbiddenwords() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(34);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(37);
 	}
 
 	/**
@@ -6445,7 +6655,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Forgottoputptroncleanupstack() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(35);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(38);
 	}
 
 	/**
@@ -6454,7 +6664,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Friend() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(36);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(39);
 	}
 
 	/**
@@ -6463,7 +6673,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Goto() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(37);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(40);
 	}
 
 	/**
@@ -6472,7 +6682,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Ifassignments() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(38);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(41);
 	}
 
 	/**
@@ -6481,7 +6691,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Ifpreprocessor() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(39);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(42);
 	}
 
 	/**
@@ -6490,7 +6700,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Inheritanceorder() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(40);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(43);
 	}
 
 	/**
@@ -6499,7 +6709,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Intleaves() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(41);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(44);
 	}
 
 	/**
@@ -6508,7 +6718,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Jmp() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(42);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(45);
 	}
 
 	/**
@@ -6517,7 +6727,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Leave() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(43);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(46);
 	}
 
 	/**
@@ -6526,7 +6736,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_LeaveNoError() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(44);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(47);
 	}
 
 	/**
@@ -6535,7 +6745,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Leavingoperators() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(45);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(48);
 	}
 
 	/**
@@ -6544,7 +6754,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_LFunctionCantLeave() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(46);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(49);
 	}
 
 	/**
@@ -6553,7 +6763,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Longlines() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(47);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(50);
 	}
 
 	/**
@@ -6562,7 +6772,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Magicnumbers() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(48);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(51);
 	}
 
 	/**
@@ -6571,7 +6781,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Mclassdestructor() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(49);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(52);
 	}
 
 	/**
@@ -6580,7 +6790,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Memberlc() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(50);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(53);
 	}
 
 	/**
@@ -6589,7 +6799,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Membervariablecallld() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(51);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(54);
 	}
 
 	/**
@@ -6598,7 +6808,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Missingcancel() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(52);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(55);
 	}
 
 	/**
@@ -6607,7 +6817,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Missingcclass() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(53);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(56);
 	}
 
 	/**
@@ -6616,7 +6826,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Mmpsourcepath() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(54);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(57);
 	}
 
 	/**
@@ -6625,7 +6835,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Multilangrsc() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(55);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(58);
 	}
 
 	/**
@@ -6634,7 +6844,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Multipledeclarations() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(56);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(59);
 	}
 
 	/**
@@ -6643,7 +6853,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Multipleinheritance() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(57);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(60);
 	}
 
 	/**
@@ -6652,7 +6862,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Mydocs() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(58);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(61);
 	}
 
 	/**
@@ -6661,7 +6871,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Namespace() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(59);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(62);
 	}
 
 	/**
@@ -6670,7 +6880,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Newlreferences() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(60);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(63);
 	}
 
 	/**
@@ -6679,7 +6889,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Noleavetrap() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(61);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(64);
 	}
 
 	/**
@@ -6688,7 +6898,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Nonconsthbufc() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(62);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(65);
 	}
 
 	/**
@@ -6697,7 +6907,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Nonconsttdesc() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(63);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(66);
 	}
 
 	/**
@@ -6706,7 +6916,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Nonleavenew() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(64);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(67);
 	}
 
 	/**
@@ -6715,7 +6925,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Nonunicodeskins() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(65);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(68);
 	}
 
 	/**
@@ -6724,7 +6934,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Null() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(66);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(69);
 	}
 
 	/**
@@ -6733,7 +6943,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Open() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(67);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(70);
 	}
 
 	/**
@@ -6742,7 +6952,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Pointertoarrays() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(68);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(71);
 	}
 
 	/**
@@ -6751,7 +6961,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Pragmadisable() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(69);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(72);
 	}
 
 	/**
@@ -6760,7 +6970,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Pragmamessage() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(70);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(73);
 	}
 
 	/**
@@ -6769,7 +6979,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Pragmaother() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(71);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(74);
 	}
 
 	/**
@@ -6778,7 +6988,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Privateinheritance() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(72);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(75);
 	}
 
 	/**
@@ -6787,7 +6997,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Pushaddrvar() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(73);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(76);
 	}
 
 	/**
@@ -6796,7 +7006,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Pushmember() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(74);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(77);
 	}
 
 	/**
@@ -6805,7 +7015,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Readresource() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(75);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(78);
 	}
 
 	/**
@@ -6814,7 +7024,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Resourcenotoncleanupstack() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(76);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(79);
 	}
 
 	/**
@@ -6823,7 +7033,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Resourcesonheap() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(77);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(80);
 	}
 
 	/**
@@ -6832,7 +7042,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Returndescriptoroutofscope() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(78);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(81);
 	}
 
 	/**
@@ -6841,7 +7051,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Rfs() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(79);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(82);
 	}
 
 	/**
@@ -6850,7 +7060,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Rssnames() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(80);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(83);
 	}
 
 	/**
@@ -6859,7 +7069,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Stringliterals() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(81);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(84);
 	}
 
 	/**
@@ -6868,7 +7078,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Stringsinresourcefiles() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(82);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(85);
 	}
 
 	/**
@@ -6877,7 +7087,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Struct() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(83);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(86);
 	}
 
 	/**
@@ -6886,7 +7096,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Tcclasses() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(84);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(87);
 	}
 
 	/**
@@ -6895,7 +7105,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Tclassdestructor() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(85);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(88);
 	}
 
 	/**
@@ -6904,7 +7114,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Todocomments() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(86);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(89);
 	}
 
 	/**
@@ -6913,7 +7123,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Trapcleanup() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(87);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(90);
 	}
 
 	/**
@@ -6922,7 +7132,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Trapeleave() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(88);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(91);
 	}
 
 	/**
@@ -6931,7 +7141,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Traprunl() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(89);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(92);
 	}
 
 	/**
@@ -6940,7 +7150,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Trspassing() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(90);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(93);
 	}
 
 	/**
@@ -6949,7 +7159,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Uids() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(91);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(94);
 	}
 
 	/**
@@ -6958,7 +7168,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Uncompressedaif() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(92);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(95);
 	}
 
 	/**
@@ -6967,7 +7177,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Uncompressedbmp() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(93);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(96);
 	}
 
 	/**
@@ -6976,7 +7186,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Unicodesource() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(94);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(97);
 	}
 
 	/**
@@ -6985,7 +7195,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Userafter() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(95);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(98);
 	}
 
 	/**
@@ -6994,7 +7204,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Userfree() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(96);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(99);
 	}
 
 	/**
@@ -7003,7 +7213,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_UserWaitForRequest() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(97);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(100);
 	}
 
 	/**
@@ -7012,7 +7222,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Variablenames() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(98);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(101);
 	}
 
 	/**
@@ -7021,7 +7231,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Voidparameter() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(99);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(102);
 	}
 
 	/**
@@ -7030,7 +7240,7 @@
 	 * @generated
 	 */
 	public EReference getScriptsType_Worryingcomments() {
-        return (EReference)getScriptsType().getEStructuralFeatures().get(100);
+        return (EReference)getScriptsType().getEStructuralFeatures().get(103);
 	}
 
 	/**
@@ -7040,7 +7250,7 @@
 	 */
 	public EClass getSeveritiesType() {
 		if (severitiesTypeEClass == null) {
-			severitiesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(103);
+			severitiesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(106);
 		}
 		return severitiesTypeEClass;
 	}
@@ -7079,7 +7289,7 @@
 	 */
 	public EClass getSourcesType() {
 		if (sourcesTypeEClass == null) {
-			sourcesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(106);
+			sourcesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(109);
 		}
 		return sourcesTypeEClass;
 	}
@@ -7100,7 +7310,7 @@
 	 */
 	public EClass getStringliteralsType() {
 		if (stringliteralsTypeEClass == null) {
-			stringliteralsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(107);
+			stringliteralsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(110);
 		}
 		return stringliteralsTypeEClass;
 	}
@@ -7139,7 +7349,7 @@
 	 */
 	public EClass getStringsinresourcefilesType() {
 		if (stringsinresourcefilesTypeEClass == null) {
-			stringsinresourcefilesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(108);
+			stringsinresourcefilesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(111);
 		}
 		return stringsinresourcefilesTypeEClass;
 	}
@@ -7178,7 +7388,7 @@
 	 */
 	public EClass getStructType() {
 		if (structTypeEClass == null) {
-			structTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(109);
+			structTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(112);
 		}
 		return structTypeEClass;
 	}
@@ -7217,7 +7427,7 @@
 	 */
 	public EClass getTcclassesType() {
 		if (tcclassesTypeEClass == null) {
-			tcclassesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(110);
+			tcclassesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(113);
 		}
 		return tcclassesTypeEClass;
 	}
@@ -7256,7 +7466,7 @@
 	 */
 	public EClass getTclassdestructorType() {
 		if (tclassdestructorTypeEClass == null) {
-			tclassdestructorTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(111);
+			tclassdestructorTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(114);
 		}
 		return tclassdestructorTypeEClass;
 	}
@@ -7295,7 +7505,7 @@
 	 */
 	public EClass getTodocommentsType() {
 		if (todocommentsTypeEClass == null) {
-			todocommentsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(112);
+			todocommentsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(115);
 		}
 		return todocommentsTypeEClass;
 	}
@@ -7334,7 +7544,7 @@
 	 */
 	public EClass getTrapcleanupType() {
 		if (trapcleanupTypeEClass == null) {
-			trapcleanupTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(113);
+			trapcleanupTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(116);
 		}
 		return trapcleanupTypeEClass;
 	}
@@ -7373,7 +7583,7 @@
 	 */
 	public EClass getTrapeleaveType() {
 		if (trapeleaveTypeEClass == null) {
-			trapeleaveTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(114);
+			trapeleaveTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(117);
 		}
 		return trapeleaveTypeEClass;
 	}
@@ -7412,7 +7622,7 @@
 	 */
 	public EClass getTraprunlType() {
 		if (traprunlTypeEClass == null) {
-			traprunlTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(115);
+			traprunlTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(118);
 		}
 		return traprunlTypeEClass;
 	}
@@ -7451,7 +7661,7 @@
 	 */
 	public EClass getTrspassingType() {
 		if (trspassingTypeEClass == null) {
-			trspassingTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(116);
+			trspassingTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(119);
 		}
 		return trspassingTypeEClass;
 	}
@@ -7490,7 +7700,7 @@
 	 */
 	public EClass getUidsType() {
 		if (uidsTypeEClass == null) {
-			uidsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(117);
+			uidsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(120);
 		}
 		return uidsTypeEClass;
 	}
@@ -7529,7 +7739,7 @@
 	 */
 	public EClass getUncompressedaifType() {
 		if (uncompressedaifTypeEClass == null) {
-			uncompressedaifTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(118);
+			uncompressedaifTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(121);
 		}
 		return uncompressedaifTypeEClass;
 	}
@@ -7568,7 +7778,7 @@
 	 */
 	public EClass getUncompressedbmpType() {
 		if (uncompressedbmpTypeEClass == null) {
-			uncompressedbmpTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(119);
+			uncompressedbmpTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(122);
 		}
 		return uncompressedbmpTypeEClass;
 	}
@@ -7607,7 +7817,7 @@
 	 */
 	public EClass getUnicodesourceType() {
 		if (unicodesourceTypeEClass == null) {
-			unicodesourceTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(120);
+			unicodesourceTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(123);
 		}
 		return unicodesourceTypeEClass;
 	}
@@ -7646,7 +7856,7 @@
 	 */
 	public EClass getUserafterType() {
 		if (userafterTypeEClass == null) {
-			userafterTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(121);
+			userafterTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(124);
 		}
 		return userafterTypeEClass;
 	}
@@ -7685,7 +7895,7 @@
 	 */
 	public EClass getUserfreeType() {
 		if (userfreeTypeEClass == null) {
-			userfreeTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(122);
+			userfreeTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(125);
 		}
 		return userfreeTypeEClass;
 	}
@@ -7724,7 +7934,7 @@
 	 */
 	public EClass getUserWaitForRequestType() {
 		if (userWaitForRequestTypeEClass == null) {
-			userWaitForRequestTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(123);
+			userWaitForRequestTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(126);
 		}
 		return userWaitForRequestTypeEClass;
 	}
@@ -7763,7 +7973,7 @@
 	 */
 	public EClass getVariablenamesType() {
 		if (variablenamesTypeEClass == null) {
-			variablenamesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(124);
+			variablenamesTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(127);
 		}
 		return variablenamesTypeEClass;
 	}
@@ -7802,7 +8012,7 @@
 	 */
 	public EClass getVoidparameterType() {
 		if (voidparameterTypeEClass == null) {
-			voidparameterTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(125);
+			voidparameterTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(128);
 		}
 		return voidparameterTypeEClass;
 	}
@@ -7841,7 +8051,7 @@
 	 */
 	public EClass getWorryingcommentsType() {
 		if (worryingcommentsTypeEClass == null) {
-			worryingcommentsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(126);
+			worryingcommentsTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(129);
 		}
 		return worryingcommentsTypeEClass;
 	}
@@ -7901,7 +8111,7 @@
 	 */
 	public EEnum getSeverityType() {
 		if (severityTypeEEnum == null) {
-			severityTypeEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(104);
+			severityTypeEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(107);
 		}
 		return severityTypeEEnum;
 	}
@@ -7925,7 +8135,7 @@
 	 */
 	public EDataType getSeverityTypeObject() {
 		if (severityTypeObjectEDataType == null) {
-			severityTypeObjectEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(105);
+			severityTypeObjectEDataType = (EDataType)EPackage.Registry.INSTANCE.getEPackage(CSConfigPackage.eNS_URI).getEClassifiers().get(108);
 		}
 		return severityTypeObjectEDataType;
 	}
@@ -8001,7 +8211,7 @@
 	@Override
 	protected void fixInstanceClass(EClassifier eClassifier) {
 		if (eClassifier.getInstanceClassName() == null) {
-			eClassifier.setInstanceClassName("com.nokia.carbide.cpp.codescanner.gen.CSConfig." + eClassifier.getName());
+			eClassifier.setInstanceClassName("com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig." + eClassifier.getName());
 			setGeneratedClassName(eClassifier);
 		}
 	}
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/CrepositoryTypeImpl.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/CrepositoryTypeImpl.java	Mon Apr 06 15:46:51 2009 -0500
@@ -0,0 +1,390 @@
+/*
+* 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.carbide.cpp.internal.codescanner.gen.CSConfig.impl;
+
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Crepository Type</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CrepositoryTypeImpl#getCategory <em>Category</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CrepositoryTypeImpl#isEnable <em>Enable</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CrepositoryTypeImpl#getSeverity <em>Severity</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CrepositoryTypeImpl extends EObjectImpl implements CrepositoryType {
+	/**
+	 * The default value of the '{@link #getCategory() <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCategory()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final CategoryType CATEGORY_EDEFAULT = CategoryType.CANPANIC;
+
+	/**
+	 * The cached value of the '{@link #getCategory() <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCategory()
+	 * @generated
+	 * @ordered
+	 */
+	protected CategoryType category = CATEGORY_EDEFAULT;
+
+	/**
+	 * This is true if the Category attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean categoryESet;
+
+	/**
+	 * The default value of the '{@link #isEnable() <em>Enable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isEnable()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean ENABLE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isEnable() <em>Enable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isEnable()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean enable = ENABLE_EDEFAULT;
+
+	/**
+	 * This is true if the Enable attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean enableESet;
+
+	/**
+	 * The default value of the '{@link #getSeverity() <em>Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSeverity()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final SeverityType SEVERITY_EDEFAULT = SeverityType.HIGH;
+
+	/**
+	 * The cached value of the '{@link #getSeverity() <em>Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSeverity()
+	 * @generated
+	 * @ordered
+	 */
+	protected SeverityType severity = SEVERITY_EDEFAULT;
+
+	/**
+	 * This is true if the Severity attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean severityESet;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CrepositoryTypeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSConfigPackage.eINSTANCE.getCrepositoryType();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CategoryType getCategory() {
+		return category;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCategory(CategoryType newCategory) {
+		CategoryType oldCategory = category;
+		category = newCategory == null ? CATEGORY_EDEFAULT : newCategory;
+		boolean oldCategoryESet = categoryESet;
+		categoryESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CSConfigPackage.CREPOSITORY_TYPE__CATEGORY, oldCategory, category, !oldCategoryESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetCategory() {
+		CategoryType oldCategory = category;
+		boolean oldCategoryESet = categoryESet;
+		category = CATEGORY_EDEFAULT;
+		categoryESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, CSConfigPackage.CREPOSITORY_TYPE__CATEGORY, oldCategory, CATEGORY_EDEFAULT, oldCategoryESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetCategory() {
+		return categoryESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isEnable() {
+		return enable;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setEnable(boolean newEnable) {
+		boolean oldEnable = enable;
+		enable = newEnable;
+		boolean oldEnableESet = enableESet;
+		enableESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CSConfigPackage.CREPOSITORY_TYPE__ENABLE, oldEnable, enable, !oldEnableESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetEnable() {
+		boolean oldEnable = enable;
+		boolean oldEnableESet = enableESet;
+		enable = ENABLE_EDEFAULT;
+		enableESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, CSConfigPackage.CREPOSITORY_TYPE__ENABLE, oldEnable, ENABLE_EDEFAULT, oldEnableESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetEnable() {
+		return enableESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SeverityType getSeverity() {
+		return severity;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSeverity(SeverityType newSeverity) {
+		SeverityType oldSeverity = severity;
+		severity = newSeverity == null ? SEVERITY_EDEFAULT : newSeverity;
+		boolean oldSeverityESet = severityESet;
+		severityESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CSConfigPackage.CREPOSITORY_TYPE__SEVERITY, oldSeverity, severity, !oldSeverityESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetSeverity() {
+		SeverityType oldSeverity = severity;
+		boolean oldSeverityESet = severityESet;
+		severity = SEVERITY_EDEFAULT;
+		severityESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, CSConfigPackage.CREPOSITORY_TYPE__SEVERITY, oldSeverity, SEVERITY_EDEFAULT, oldSeverityESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetSeverity() {
+		return severityESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CSConfigPackage.CREPOSITORY_TYPE__CATEGORY:
+				return getCategory();
+			case CSConfigPackage.CREPOSITORY_TYPE__ENABLE:
+				return isEnable() ? Boolean.TRUE : Boolean.FALSE;
+			case CSConfigPackage.CREPOSITORY_TYPE__SEVERITY:
+				return getSeverity();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CSConfigPackage.CREPOSITORY_TYPE__CATEGORY:
+				setCategory((CategoryType)newValue);
+				return;
+			case CSConfigPackage.CREPOSITORY_TYPE__ENABLE:
+				setEnable(((Boolean)newValue).booleanValue());
+				return;
+			case CSConfigPackage.CREPOSITORY_TYPE__SEVERITY:
+				setSeverity((SeverityType)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CSConfigPackage.CREPOSITORY_TYPE__CATEGORY:
+				unsetCategory();
+				return;
+			case CSConfigPackage.CREPOSITORY_TYPE__ENABLE:
+				unsetEnable();
+				return;
+			case CSConfigPackage.CREPOSITORY_TYPE__SEVERITY:
+				unsetSeverity();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CSConfigPackage.CREPOSITORY_TYPE__CATEGORY:
+				return isSetCategory();
+			case CSConfigPackage.CREPOSITORY_TYPE__ENABLE:
+				return isSetEnable();
+			case CSConfigPackage.CREPOSITORY_TYPE__SEVERITY:
+				return isSetSeverity();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (category: ");
+		if (categoryESet) result.append(category); else result.append("<unset>");
+		result.append(", enable: ");
+		if (enableESet) result.append(enable); else result.append("<unset>");
+		result.append(", severity: ");
+		if (severityESet) result.append(severity); else result.append("<unset>");
+		result.append(')');
+		return result.toString();
+	}
+
+} //CrepositoryTypeImpl
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/CustomizableiconsTypeImpl.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/CustomizableiconsTypeImpl.java	Mon Apr 06 15:46:51 2009 -0500
@@ -0,0 +1,444 @@
+/*
+* 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.carbide.cpp.internal.codescanner.gen.CSConfig.impl;
+
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Customizableicons Type</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CustomizableiconsTypeImpl#getIconsRE <em>Icons RE</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CustomizableiconsTypeImpl#getCategory <em>Category</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CustomizableiconsTypeImpl#isEnable <em>Enable</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.CustomizableiconsTypeImpl#getSeverity <em>Severity</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CustomizableiconsTypeImpl extends EObjectImpl implements CustomizableiconsType {
+	/**
+	 * The default value of the '{@link #getIconsRE() <em>Icons RE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIconsRE()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ICONS_RE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getIconsRE() <em>Icons RE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIconsRE()
+	 * @generated
+	 * @ordered
+	 */
+	protected String iconsRE = ICONS_RE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getCategory() <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCategory()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final CategoryType CATEGORY_EDEFAULT = CategoryType.CANPANIC;
+
+	/**
+	 * The cached value of the '{@link #getCategory() <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCategory()
+	 * @generated
+	 * @ordered
+	 */
+	protected CategoryType category = CATEGORY_EDEFAULT;
+
+	/**
+	 * This is true if the Category attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean categoryESet;
+
+	/**
+	 * The default value of the '{@link #isEnable() <em>Enable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isEnable()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean ENABLE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isEnable() <em>Enable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isEnable()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean enable = ENABLE_EDEFAULT;
+
+	/**
+	 * This is true if the Enable attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean enableESet;
+
+	/**
+	 * The default value of the '{@link #getSeverity() <em>Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSeverity()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final SeverityType SEVERITY_EDEFAULT = SeverityType.HIGH;
+
+	/**
+	 * The cached value of the '{@link #getSeverity() <em>Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSeverity()
+	 * @generated
+	 * @ordered
+	 */
+	protected SeverityType severity = SEVERITY_EDEFAULT;
+
+	/**
+	 * This is true if the Severity attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean severityESet;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CustomizableiconsTypeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSConfigPackage.eINSTANCE.getCustomizableiconsType();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getIconsRE() {
+		return iconsRE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setIconsRE(String newIconsRE) {
+		String oldIconsRE = iconsRE;
+		iconsRE = newIconsRE;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CSConfigPackage.CUSTOMIZABLEICONS_TYPE__ICONS_RE, oldIconsRE, iconsRE));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CategoryType getCategory() {
+		return category;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCategory(CategoryType newCategory) {
+		CategoryType oldCategory = category;
+		category = newCategory == null ? CATEGORY_EDEFAULT : newCategory;
+		boolean oldCategoryESet = categoryESet;
+		categoryESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CSConfigPackage.CUSTOMIZABLEICONS_TYPE__CATEGORY, oldCategory, category, !oldCategoryESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetCategory() {
+		CategoryType oldCategory = category;
+		boolean oldCategoryESet = categoryESet;
+		category = CATEGORY_EDEFAULT;
+		categoryESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, CSConfigPackage.CUSTOMIZABLEICONS_TYPE__CATEGORY, oldCategory, CATEGORY_EDEFAULT, oldCategoryESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetCategory() {
+		return categoryESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isEnable() {
+		return enable;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setEnable(boolean newEnable) {
+		boolean oldEnable = enable;
+		enable = newEnable;
+		boolean oldEnableESet = enableESet;
+		enableESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CSConfigPackage.CUSTOMIZABLEICONS_TYPE__ENABLE, oldEnable, enable, !oldEnableESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetEnable() {
+		boolean oldEnable = enable;
+		boolean oldEnableESet = enableESet;
+		enable = ENABLE_EDEFAULT;
+		enableESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, CSConfigPackage.CUSTOMIZABLEICONS_TYPE__ENABLE, oldEnable, ENABLE_EDEFAULT, oldEnableESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetEnable() {
+		return enableESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SeverityType getSeverity() {
+		return severity;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSeverity(SeverityType newSeverity) {
+		SeverityType oldSeverity = severity;
+		severity = newSeverity == null ? SEVERITY_EDEFAULT : newSeverity;
+		boolean oldSeverityESet = severityESet;
+		severityESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CSConfigPackage.CUSTOMIZABLEICONS_TYPE__SEVERITY, oldSeverity, severity, !oldSeverityESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetSeverity() {
+		SeverityType oldSeverity = severity;
+		boolean oldSeverityESet = severityESet;
+		severity = SEVERITY_EDEFAULT;
+		severityESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, CSConfigPackage.CUSTOMIZABLEICONS_TYPE__SEVERITY, oldSeverity, SEVERITY_EDEFAULT, oldSeverityESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetSeverity() {
+		return severityESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__ICONS_RE:
+				return getIconsRE();
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__CATEGORY:
+				return getCategory();
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__ENABLE:
+				return isEnable() ? Boolean.TRUE : Boolean.FALSE;
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__SEVERITY:
+				return getSeverity();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__ICONS_RE:
+				setIconsRE((String)newValue);
+				return;
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__CATEGORY:
+				setCategory((CategoryType)newValue);
+				return;
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__ENABLE:
+				setEnable(((Boolean)newValue).booleanValue());
+				return;
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__SEVERITY:
+				setSeverity((SeverityType)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__ICONS_RE:
+				setIconsRE(ICONS_RE_EDEFAULT);
+				return;
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__CATEGORY:
+				unsetCategory();
+				return;
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__ENABLE:
+				unsetEnable();
+				return;
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__SEVERITY:
+				unsetSeverity();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__ICONS_RE:
+				return ICONS_RE_EDEFAULT == null ? iconsRE != null : !ICONS_RE_EDEFAULT.equals(iconsRE);
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__CATEGORY:
+				return isSetCategory();
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__ENABLE:
+				return isSetEnable();
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE__SEVERITY:
+				return isSetSeverity();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (iconsRE: ");
+		result.append(iconsRE);
+		result.append(", category: ");
+		if (categoryESet) result.append(category); else result.append("<unset>");
+		result.append(", enable: ");
+		if (enableESet) result.append(enable); else result.append("<unset>");
+		result.append(", severity: ");
+		if (severityESet) result.append(severity); else result.append("<unset>");
+		result.append(')');
+		return result.toString();
+	}
+
+} //CustomizableiconsTypeImpl
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/DocumentRootImpl.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/DocumentRootImpl.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/DocumentRootImpl.java	Mon Apr 06 15:46:51 2009 -0500
@@ -17,6 +17,135 @@
 
 package com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl;
 
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.AccessArrayElementWithoutCheck2Type;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.AccessArrayElementWithoutCheckType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ActivestartType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ActivestopType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ArgumentsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ArraypassingType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ArrayptrcleanupType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.AssertdebuginvariantType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.BaddefinesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.BaseconstructType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CallActiveObjectWithoutCheckingOrStoppingType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CanpanicType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoriesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ChangenotificationType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CleanupType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CodereviewType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CodescannerConfigType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CodingstandardsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CommentcodeType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ConnectAndDontCloseMemberVariableType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ConnectType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ConstnamesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ConsttdescptrType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ControlornullType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CtltargettypeType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomruleType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomrulesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DebugromType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DeclarenameType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DeleteMemberVariableType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DestructorType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentRoot;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DocumentationType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DoubleSemiColonType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DrivelettersType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.EikbuttonsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.EikonenvstaticType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.EnummembersType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.EnumnamesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ExportinlineType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ExportpurevirtualType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ExternaldrivelettersType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FoffType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ForbiddenwordsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ForgottoputptroncleanupstackType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FriendType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FunctionalityType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.GotoType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.HighType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.IfassignmentsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.IfpreprocessorType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.InheritanceorderType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.IntleavesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.JmpType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.KeywordType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.LFunctionCantLeaveType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.LeaveNoErrorType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.LeaveType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.LeavingoperatorsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.LegalType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.LocalisationType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.LonglinesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.LowType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MagicnumbersType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MclassdestructorType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MediumType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MemberlcType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MembervariablecallldType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MissingcancelType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MissingcclassType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MmpsourcepathType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MultilangrscType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MultipledeclarationsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MultipleinheritanceType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MydocsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NamespaceType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NewlreferencesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NoleavetrapType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NonconsthbufcType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NonconsttdescType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NonleavenewType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NonunicodeskinsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NullType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.OpenType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.OtherType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PanicType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PerformanceType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PointertoarraysType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PragmadisableType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PragmamessageType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PragmaotherType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PrivateinheritanceType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PushaddrvarType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PushmemberType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ReadresourceType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ResourcenotoncleanupstackType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ResourcesonheapType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ReturndescriptoroutofscopeType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.RfsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.RssnamesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeveritiesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SourcesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.StringliteralsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.StringsinresourcefilesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.StructType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.TcclassesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.TclassdestructorType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.TodocommentsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.TrapcleanupType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.TrapeleaveType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.TraprunlType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.TrspassingType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.UidsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.UncompressedaifType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.UncompressedbmpType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.UnicodesourceType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.UserWaitForRequestType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.UserafterType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.UserfreeType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.VariablenamesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.VoidparameterType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.WorryingcommentsType;
 import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.*;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -73,7 +202,9 @@
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getConstnames <em>Constnames</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getConsttdescptr <em>Consttdescptr</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getControlornull <em>Controlornull</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getCrepository <em>Crepository</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getCtltargettype <em>Ctltargettype</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getCustomizableicons <em>Customizableicons</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getCustomrule <em>Customrule</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getCustomrules <em>Customrules</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getDebugrom <em>Debugrom</em>}</li>
@@ -93,6 +224,7 @@
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getExportpurevirtual <em>Exportpurevirtual</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getExternaldriveletters <em>Externaldriveletters</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getFiletype <em>Filetype</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getFlags <em>Flags</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getFoff <em>Foff</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getForbiddenwords <em>Forbiddenwords</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getForgottoputptroncleanupstack <em>Forgottoputptroncleanupstack</em>}</li>
@@ -100,6 +232,7 @@
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getFunctionality <em>Functionality</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getGoto <em>Goto</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getHigh <em>High</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getIconsRE <em>Icons RE</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getIfassignments <em>Ifassignments</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getIfpreprocessor <em>Ifpreprocessor</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.DocumentRootImpl#getInheritanceorder <em>Inheritanceorder</em>}</li>
@@ -266,6 +399,16 @@
 	protected static final String FILETYPE_EDEFAULT = null;
 
 	/**
+	 * The default value of the '{@link #getIconsRE() <em>Icons RE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIconsRE()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ICONS_RE_EDEFAULT = null;
+
+	/**
 	 * The default value of the '{@link #getInput() <em>Input</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1179,6 +1322,33 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public CrepositoryType getCrepository() {
+		return (CrepositoryType)getMixed().get(CSConfigPackage.eINSTANCE.getDocumentRoot_Crepository(), true);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCrepository(CrepositoryType newCrepository, NotificationChain msgs) {
+		return ((FeatureMap.Internal)getMixed()).basicAdd(CSConfigPackage.eINSTANCE.getDocumentRoot_Crepository(), newCrepository, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCrepository(CrepositoryType newCrepository) {
+		((FeatureMap.Internal)getMixed()).set(CSConfigPackage.eINSTANCE.getDocumentRoot_Crepository(), newCrepository);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public CtltargettypeType getCtltargettype() {
 		return (CtltargettypeType)getMixed().get(CSConfigPackage.eINSTANCE.getDocumentRoot_Ctltargettype(), true);
 	}
@@ -1206,6 +1376,33 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public CustomizableiconsType getCustomizableicons() {
+		return (CustomizableiconsType)getMixed().get(CSConfigPackage.eINSTANCE.getDocumentRoot_Customizableicons(), true);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCustomizableicons(CustomizableiconsType newCustomizableicons, NotificationChain msgs) {
+		return ((FeatureMap.Internal)getMixed()).basicAdd(CSConfigPackage.eINSTANCE.getDocumentRoot_Customizableicons(), newCustomizableicons, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCustomizableicons(CustomizableiconsType newCustomizableicons) {
+		((FeatureMap.Internal)getMixed()).set(CSConfigPackage.eINSTANCE.getDocumentRoot_Customizableicons(), newCustomizableicons);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public CustomruleType getCustomrule() {
 		return (CustomruleType)getMixed().get(CSConfigPackage.eINSTANCE.getDocumentRoot_Customrule(), true);
 	}
@@ -1692,6 +1889,33 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public FlagsType getFlags() {
+		return (FlagsType)getMixed().get(CSConfigPackage.eINSTANCE.getDocumentRoot_Flags(), true);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetFlags(FlagsType newFlags, NotificationChain msgs) {
+		return ((FeatureMap.Internal)getMixed()).basicAdd(CSConfigPackage.eINSTANCE.getDocumentRoot_Flags(), newFlags, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFlags(FlagsType newFlags) {
+		((FeatureMap.Internal)getMixed()).set(CSConfigPackage.eINSTANCE.getDocumentRoot_Flags(), newFlags);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public FoffType getFoff() {
 		return (FoffType)getMixed().get(CSConfigPackage.eINSTANCE.getDocumentRoot_Foff(), true);
 	}
@@ -1881,6 +2105,24 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getIconsRE() {
+		return (String)getMixed().get(CSConfigPackage.eINSTANCE.getDocumentRoot_IconsRE(), true);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setIconsRE(String newIconsRE) {
+		((FeatureMap.Internal)getMixed()).set(CSConfigPackage.eINSTANCE.getDocumentRoot_IconsRE(), newIconsRE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public IfassignmentsType getIfassignments() {
 		return (IfassignmentsType)getMixed().get(CSConfigPackage.eINSTANCE.getDocumentRoot_Ifassignments(), true);
 	}
@@ -4262,8 +4504,12 @@
 				return basicSetConsttdescptr(null, msgs);
 			case CSConfigPackage.DOCUMENT_ROOT__CONTROLORNULL:
 				return basicSetControlornull(null, msgs);
+			case CSConfigPackage.DOCUMENT_ROOT__CREPOSITORY:
+				return basicSetCrepository(null, msgs);
 			case CSConfigPackage.DOCUMENT_ROOT__CTLTARGETTYPE:
 				return basicSetCtltargettype(null, msgs);
+			case CSConfigPackage.DOCUMENT_ROOT__CUSTOMIZABLEICONS:
+				return basicSetCustomizableicons(null, msgs);
 			case CSConfigPackage.DOCUMENT_ROOT__CUSTOMRULE:
 				return basicSetCustomrule(null, msgs);
 			case CSConfigPackage.DOCUMENT_ROOT__CUSTOMRULES:
@@ -4296,6 +4542,8 @@
 				return basicSetExportpurevirtual(null, msgs);
 			case CSConfigPackage.DOCUMENT_ROOT__EXTERNALDRIVELETTERS:
 				return basicSetExternaldriveletters(null, msgs);
+			case CSConfigPackage.DOCUMENT_ROOT__FLAGS:
+				return basicSetFlags(null, msgs);
 			case CSConfigPackage.DOCUMENT_ROOT__FOFF:
 				return basicSetFoff(null, msgs);
 			case CSConfigPackage.DOCUMENT_ROOT__FORBIDDENWORDS:
@@ -4529,8 +4777,12 @@
 				return getConsttdescptr();
 			case CSConfigPackage.DOCUMENT_ROOT__CONTROLORNULL:
 				return getControlornull();
+			case CSConfigPackage.DOCUMENT_ROOT__CREPOSITORY:
+				return getCrepository();
 			case CSConfigPackage.DOCUMENT_ROOT__CTLTARGETTYPE:
 				return getCtltargettype();
+			case CSConfigPackage.DOCUMENT_ROOT__CUSTOMIZABLEICONS:
+				return getCustomizableicons();
 			case CSConfigPackage.DOCUMENT_ROOT__CUSTOMRULE:
 				return getCustomrule();
 			case CSConfigPackage.DOCUMENT_ROOT__CUSTOMRULES:
@@ -4569,6 +4821,8 @@
 				return getExternaldriveletters();
 			case CSConfigPackage.DOCUMENT_ROOT__FILETYPE:
 				return getFiletype();
+			case CSConfigPackage.DOCUMENT_ROOT__FLAGS:
+				return getFlags();
 			case CSConfigPackage.DOCUMENT_ROOT__FOFF:
 				return getFoff();
 			case CSConfigPackage.DOCUMENT_ROOT__FORBIDDENWORDS:
@@ -4583,6 +4837,8 @@
 				return getGoto();
 			case CSConfigPackage.DOCUMENT_ROOT__HIGH:
 				return getHigh();
+			case CSConfigPackage.DOCUMENT_ROOT__ICONS_RE:
+				return getIconsRE();
 			case CSConfigPackage.DOCUMENT_ROOT__IFASSIGNMENTS:
 				return getIfassignments();
 			case CSConfigPackage.DOCUMENT_ROOT__IFPREPROCESSOR:
@@ -4857,9 +5113,15 @@
 			case CSConfigPackage.DOCUMENT_ROOT__CONTROLORNULL:
 				setControlornull((ControlornullType)newValue);
 				return;
+			case CSConfigPackage.DOCUMENT_ROOT__CREPOSITORY:
+				setCrepository((CrepositoryType)newValue);
+				return;
 			case CSConfigPackage.DOCUMENT_ROOT__CTLTARGETTYPE:
 				setCtltargettype((CtltargettypeType)newValue);
 				return;
+			case CSConfigPackage.DOCUMENT_ROOT__CUSTOMIZABLEICONS:
+				setCustomizableicons((CustomizableiconsType)newValue);
+				return;
 			case CSConfigPackage.DOCUMENT_ROOT__CUSTOMRULE:
 				setCustomrule((CustomruleType)newValue);
 				return;
@@ -4917,6 +5179,9 @@
 			case CSConfigPackage.DOCUMENT_ROOT__FILETYPE:
 				setFiletype((String)newValue);
 				return;
+			case CSConfigPackage.DOCUMENT_ROOT__FLAGS:
+				setFlags((FlagsType)newValue);
+				return;
 			case CSConfigPackage.DOCUMENT_ROOT__FOFF:
 				setFoff((FoffType)newValue);
 				return;
@@ -4938,6 +5203,9 @@
 			case CSConfigPackage.DOCUMENT_ROOT__HIGH:
 				setHigh((HighType)newValue);
 				return;
+			case CSConfigPackage.DOCUMENT_ROOT__ICONS_RE:
+				setIconsRE((String)newValue);
+				return;
 			case CSConfigPackage.DOCUMENT_ROOT__IFASSIGNMENTS:
 				setIfassignments((IfassignmentsType)newValue);
 				return;
@@ -5301,9 +5569,15 @@
 			case CSConfigPackage.DOCUMENT_ROOT__CONTROLORNULL:
 				setControlornull((ControlornullType)null);
 				return;
+			case CSConfigPackage.DOCUMENT_ROOT__CREPOSITORY:
+				setCrepository((CrepositoryType)null);
+				return;
 			case CSConfigPackage.DOCUMENT_ROOT__CTLTARGETTYPE:
 				setCtltargettype((CtltargettypeType)null);
 				return;
+			case CSConfigPackage.DOCUMENT_ROOT__CUSTOMIZABLEICONS:
+				setCustomizableicons((CustomizableiconsType)null);
+				return;
 			case CSConfigPackage.DOCUMENT_ROOT__CUSTOMRULE:
 				setCustomrule((CustomruleType)null);
 				return;
@@ -5361,6 +5635,9 @@
 			case CSConfigPackage.DOCUMENT_ROOT__FILETYPE:
 				setFiletype(FILETYPE_EDEFAULT);
 				return;
+			case CSConfigPackage.DOCUMENT_ROOT__FLAGS:
+				setFlags((FlagsType)null);
+				return;
 			case CSConfigPackage.DOCUMENT_ROOT__FOFF:
 				setFoff((FoffType)null);
 				return;
@@ -5382,6 +5659,9 @@
 			case CSConfigPackage.DOCUMENT_ROOT__HIGH:
 				setHigh((HighType)null);
 				return;
+			case CSConfigPackage.DOCUMENT_ROOT__ICONS_RE:
+				setIconsRE(ICONS_RE_EDEFAULT);
+				return;
 			case CSConfigPackage.DOCUMENT_ROOT__IFASSIGNMENTS:
 				setIfassignments((IfassignmentsType)null);
 				return;
@@ -5717,8 +5997,12 @@
 				return getConsttdescptr() != null;
 			case CSConfigPackage.DOCUMENT_ROOT__CONTROLORNULL:
 				return getControlornull() != null;
+			case CSConfigPackage.DOCUMENT_ROOT__CREPOSITORY:
+				return getCrepository() != null;
 			case CSConfigPackage.DOCUMENT_ROOT__CTLTARGETTYPE:
 				return getCtltargettype() != null;
+			case CSConfigPackage.DOCUMENT_ROOT__CUSTOMIZABLEICONS:
+				return getCustomizableicons() != null;
 			case CSConfigPackage.DOCUMENT_ROOT__CUSTOMRULE:
 				return getCustomrule() != null;
 			case CSConfigPackage.DOCUMENT_ROOT__CUSTOMRULES:
@@ -5757,6 +6041,8 @@
 				return getExternaldriveletters() != null;
 			case CSConfigPackage.DOCUMENT_ROOT__FILETYPE:
 				return FILETYPE_EDEFAULT == null ? getFiletype() != null : !FILETYPE_EDEFAULT.equals(getFiletype());
+			case CSConfigPackage.DOCUMENT_ROOT__FLAGS:
+				return getFlags() != null;
 			case CSConfigPackage.DOCUMENT_ROOT__FOFF:
 				return getFoff() != null;
 			case CSConfigPackage.DOCUMENT_ROOT__FORBIDDENWORDS:
@@ -5771,6 +6057,8 @@
 				return getGoto() != null;
 			case CSConfigPackage.DOCUMENT_ROOT__HIGH:
 				return getHigh() != null;
+			case CSConfigPackage.DOCUMENT_ROOT__ICONS_RE:
+				return ICONS_RE_EDEFAULT == null ? getIconsRE() != null : !ICONS_RE_EDEFAULT.equals(getIconsRE());
 			case CSConfigPackage.DOCUMENT_ROOT__IFASSIGNMENTS:
 				return getIfassignments() != null;
 			case CSConfigPackage.DOCUMENT_ROOT__IFPREPROCESSOR:
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/FlagsTypeImpl.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/FlagsTypeImpl.java	Mon Apr 06 15:46:51 2009 -0500
@@ -0,0 +1,390 @@
+/*
+* 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.carbide.cpp.internal.codescanner.gen.CSConfig.impl;
+
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CategoryType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.SeverityType;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Flags Type</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.FlagsTypeImpl#getCategory <em>Category</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.FlagsTypeImpl#isEnable <em>Enable</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.FlagsTypeImpl#getSeverity <em>Severity</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class FlagsTypeImpl extends EObjectImpl implements FlagsType {
+	/**
+	 * The default value of the '{@link #getCategory() <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCategory()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final CategoryType CATEGORY_EDEFAULT = CategoryType.CANPANIC;
+
+	/**
+	 * The cached value of the '{@link #getCategory() <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCategory()
+	 * @generated
+	 * @ordered
+	 */
+	protected CategoryType category = CATEGORY_EDEFAULT;
+
+	/**
+	 * This is true if the Category attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean categoryESet;
+
+	/**
+	 * The default value of the '{@link #isEnable() <em>Enable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isEnable()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean ENABLE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isEnable() <em>Enable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isEnable()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean enable = ENABLE_EDEFAULT;
+
+	/**
+	 * This is true if the Enable attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean enableESet;
+
+	/**
+	 * The default value of the '{@link #getSeverity() <em>Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSeverity()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final SeverityType SEVERITY_EDEFAULT = SeverityType.HIGH;
+
+	/**
+	 * The cached value of the '{@link #getSeverity() <em>Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSeverity()
+	 * @generated
+	 * @ordered
+	 */
+	protected SeverityType severity = SEVERITY_EDEFAULT;
+
+	/**
+	 * This is true if the Severity attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean severityESet;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FlagsTypeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CSConfigPackage.eINSTANCE.getFlagsType();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CategoryType getCategory() {
+		return category;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCategory(CategoryType newCategory) {
+		CategoryType oldCategory = category;
+		category = newCategory == null ? CATEGORY_EDEFAULT : newCategory;
+		boolean oldCategoryESet = categoryESet;
+		categoryESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CSConfigPackage.FLAGS_TYPE__CATEGORY, oldCategory, category, !oldCategoryESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetCategory() {
+		CategoryType oldCategory = category;
+		boolean oldCategoryESet = categoryESet;
+		category = CATEGORY_EDEFAULT;
+		categoryESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, CSConfigPackage.FLAGS_TYPE__CATEGORY, oldCategory, CATEGORY_EDEFAULT, oldCategoryESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetCategory() {
+		return categoryESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isEnable() {
+		return enable;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setEnable(boolean newEnable) {
+		boolean oldEnable = enable;
+		enable = newEnable;
+		boolean oldEnableESet = enableESet;
+		enableESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CSConfigPackage.FLAGS_TYPE__ENABLE, oldEnable, enable, !oldEnableESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetEnable() {
+		boolean oldEnable = enable;
+		boolean oldEnableESet = enableESet;
+		enable = ENABLE_EDEFAULT;
+		enableESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, CSConfigPackage.FLAGS_TYPE__ENABLE, oldEnable, ENABLE_EDEFAULT, oldEnableESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetEnable() {
+		return enableESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SeverityType getSeverity() {
+		return severity;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSeverity(SeverityType newSeverity) {
+		SeverityType oldSeverity = severity;
+		severity = newSeverity == null ? SEVERITY_EDEFAULT : newSeverity;
+		boolean oldSeverityESet = severityESet;
+		severityESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CSConfigPackage.FLAGS_TYPE__SEVERITY, oldSeverity, severity, !oldSeverityESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetSeverity() {
+		SeverityType oldSeverity = severity;
+		boolean oldSeverityESet = severityESet;
+		severity = SEVERITY_EDEFAULT;
+		severityESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, CSConfigPackage.FLAGS_TYPE__SEVERITY, oldSeverity, SEVERITY_EDEFAULT, oldSeverityESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetSeverity() {
+		return severityESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CSConfigPackage.FLAGS_TYPE__CATEGORY:
+				return getCategory();
+			case CSConfigPackage.FLAGS_TYPE__ENABLE:
+				return isEnable() ? Boolean.TRUE : Boolean.FALSE;
+			case CSConfigPackage.FLAGS_TYPE__SEVERITY:
+				return getSeverity();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CSConfigPackage.FLAGS_TYPE__CATEGORY:
+				setCategory((CategoryType)newValue);
+				return;
+			case CSConfigPackage.FLAGS_TYPE__ENABLE:
+				setEnable(((Boolean)newValue).booleanValue());
+				return;
+			case CSConfigPackage.FLAGS_TYPE__SEVERITY:
+				setSeverity((SeverityType)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CSConfigPackage.FLAGS_TYPE__CATEGORY:
+				unsetCategory();
+				return;
+			case CSConfigPackage.FLAGS_TYPE__ENABLE:
+				unsetEnable();
+				return;
+			case CSConfigPackage.FLAGS_TYPE__SEVERITY:
+				unsetSeverity();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CSConfigPackage.FLAGS_TYPE__CATEGORY:
+				return isSetCategory();
+			case CSConfigPackage.FLAGS_TYPE__ENABLE:
+				return isSetEnable();
+			case CSConfigPackage.FLAGS_TYPE__SEVERITY:
+				return isSetSeverity();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (category: ");
+		if (categoryESet) result.append(category); else result.append("<unset>");
+		result.append(", enable: ");
+		if (enableESet) result.append(enable); else result.append("<unset>");
+		result.append(", severity: ");
+		if (severityESet) result.append(severity); else result.append("<unset>");
+		result.append(')');
+		return result.toString();
+	}
+
+} //FlagsTypeImpl
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/ScriptsTypeImpl.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/ScriptsTypeImpl.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/impl/ScriptsTypeImpl.java	Mon Apr 06 15:46:51 2009 -0500
@@ -17,6 +17,111 @@
 
 package com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl;
 
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.AccessArrayElementWithoutCheck2Type;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.AccessArrayElementWithoutCheckType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ActivestartType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ActivestopType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ArraypassingType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ArrayptrcleanupType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.AssertdebuginvariantType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.BaddefinesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.BaseconstructType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CSConfigPackage;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CallActiveObjectWithoutCheckingOrStoppingType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ChangenotificationType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CleanupType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CommentcodeType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ConnectAndDontCloseMemberVariableType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ConnectType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ConstnamesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ConsttdescptrType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ControlornullType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CtltargettypeType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DebugromType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DeclarenameType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DeleteMemberVariableType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DestructorType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DoubleSemiColonType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.DrivelettersType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.EikbuttonsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.EikonenvstaticType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.EnummembersType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.EnumnamesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ExportinlineType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ExportpurevirtualType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ExternaldrivelettersType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FoffType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ForbiddenwordsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ForgottoputptroncleanupstackType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FriendType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.GotoType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.IfassignmentsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.IfpreprocessorType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.InheritanceorderType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.IntleavesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.JmpType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.LFunctionCantLeaveType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.LeaveNoErrorType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.LeaveType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.LeavingoperatorsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.LonglinesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MagicnumbersType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MclassdestructorType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MemberlcType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MembervariablecallldType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MissingcancelType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MissingcclassType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MmpsourcepathType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MultilangrscType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MultipledeclarationsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MultipleinheritanceType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.MydocsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NamespaceType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NewlreferencesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NoleavetrapType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NonconsthbufcType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NonconsttdescType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NonleavenewType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NonunicodeskinsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.NullType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.OpenType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PointertoarraysType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PragmadisableType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PragmamessageType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PragmaotherType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PrivateinheritanceType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PushaddrvarType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.PushmemberType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ReadresourceType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ResourcenotoncleanupstackType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ResourcesonheapType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ReturndescriptoroutofscopeType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.RfsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.RssnamesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.ScriptsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.StringliteralsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.StringsinresourcefilesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.StructType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.TcclassesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.TclassdestructorType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.TodocommentsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.TrapcleanupType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.TrapeleaveType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.TraprunlType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.TrspassingType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.UidsType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.UncompressedaifType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.UncompressedbmpType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.UnicodesourceType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.UserWaitForRequestType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.UserafterType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.UserfreeType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.VariablenamesType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.VoidparameterType;
+import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.WorryingcommentsType;
 import com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.*;
 
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -56,7 +161,9 @@
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getConstnames <em>Constnames</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getConsttdescptr <em>Consttdescptr</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getControlornull <em>Controlornull</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getCrepository <em>Crepository</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getCtltargettype <em>Ctltargettype</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getCustomizableicons <em>Customizableicons</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getDebugrom <em>Debugrom</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getDeclarename <em>Declarename</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getDeleteMemberVariable <em>Delete Member Variable</em>}</li>
@@ -70,6 +177,7 @@
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getExportinline <em>Exportinline</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getExportpurevirtual <em>Exportpurevirtual</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getExternaldriveletters <em>Externaldriveletters</em>}</li>
+ *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getFlags <em>Flags</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getFoff <em>Foff</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getForbiddenwords <em>Forbiddenwords</em>}</li>
  *   <li>{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.impl.ScriptsTypeImpl#getForgottoputptroncleanupstack <em>Forgottoputptroncleanupstack</em>}</li>
@@ -676,6 +784,33 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public CrepositoryType getCrepository() {
+		return (CrepositoryType)getMixed().get(CSConfigPackage.eINSTANCE.getScriptsType_Crepository(), true);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCrepository(CrepositoryType newCrepository, NotificationChain msgs) {
+		return ((FeatureMap.Internal)getMixed()).basicAdd(CSConfigPackage.eINSTANCE.getScriptsType_Crepository(), newCrepository, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCrepository(CrepositoryType newCrepository) {
+		((FeatureMap.Internal)getMixed()).set(CSConfigPackage.eINSTANCE.getScriptsType_Crepository(), newCrepository);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public CtltargettypeType getCtltargettype() {
 		return (CtltargettypeType)getMixed().get(CSConfigPackage.eINSTANCE.getScriptsType_Ctltargettype(), true);
 	}
@@ -703,6 +838,33 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public CustomizableiconsType getCustomizableicons() {
+		return (CustomizableiconsType)getMixed().get(CSConfigPackage.eINSTANCE.getScriptsType_Customizableicons(), true);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCustomizableicons(CustomizableiconsType newCustomizableicons, NotificationChain msgs) {
+		return ((FeatureMap.Internal)getMixed()).basicAdd(CSConfigPackage.eINSTANCE.getScriptsType_Customizableicons(), newCustomizableicons, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCustomizableicons(CustomizableiconsType newCustomizableicons) {
+		((FeatureMap.Internal)getMixed()).set(CSConfigPackage.eINSTANCE.getScriptsType_Customizableicons(), newCustomizableicons);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public DebugromType getDebugrom() {
 		return (DebugromType)getMixed().get(CSConfigPackage.eINSTANCE.getScriptsType_Debugrom(), true);
 	}
@@ -1054,6 +1216,33 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public FlagsType getFlags() {
+		return (FlagsType)getMixed().get(CSConfigPackage.eINSTANCE.getScriptsType_Flags(), true);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetFlags(FlagsType newFlags, NotificationChain msgs) {
+		return ((FeatureMap.Internal)getMixed()).basicAdd(CSConfigPackage.eINSTANCE.getScriptsType_Flags(), newFlags, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFlags(FlagsType newFlags) {
+		((FeatureMap.Internal)getMixed()).set(CSConfigPackage.eINSTANCE.getScriptsType_Flags(), newFlags);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public FoffType getFoff() {
 		return (FoffType)getMixed().get(CSConfigPackage.eINSTANCE.getScriptsType_Foff(), true);
 	}
@@ -2931,8 +3120,12 @@
 				return basicSetConsttdescptr(null, msgs);
 			case CSConfigPackage.SCRIPTS_TYPE__CONTROLORNULL:
 				return basicSetControlornull(null, msgs);
+			case CSConfigPackage.SCRIPTS_TYPE__CREPOSITORY:
+				return basicSetCrepository(null, msgs);
 			case CSConfigPackage.SCRIPTS_TYPE__CTLTARGETTYPE:
 				return basicSetCtltargettype(null, msgs);
+			case CSConfigPackage.SCRIPTS_TYPE__CUSTOMIZABLEICONS:
+				return basicSetCustomizableicons(null, msgs);
 			case CSConfigPackage.SCRIPTS_TYPE__DEBUGROM:
 				return basicSetDebugrom(null, msgs);
 			case CSConfigPackage.SCRIPTS_TYPE__DECLARENAME:
@@ -2959,6 +3152,8 @@
 				return basicSetExportpurevirtual(null, msgs);
 			case CSConfigPackage.SCRIPTS_TYPE__EXTERNALDRIVELETTERS:
 				return basicSetExternaldriveletters(null, msgs);
+			case CSConfigPackage.SCRIPTS_TYPE__FLAGS:
+				return basicSetFlags(null, msgs);
 			case CSConfigPackage.SCRIPTS_TYPE__FOFF:
 				return basicSetFoff(null, msgs);
 			case CSConfigPackage.SCRIPTS_TYPE__FORBIDDENWORDS:
@@ -3146,8 +3341,12 @@
 				return getConsttdescptr();
 			case CSConfigPackage.SCRIPTS_TYPE__CONTROLORNULL:
 				return getControlornull();
+			case CSConfigPackage.SCRIPTS_TYPE__CREPOSITORY:
+				return getCrepository();
 			case CSConfigPackage.SCRIPTS_TYPE__CTLTARGETTYPE:
 				return getCtltargettype();
+			case CSConfigPackage.SCRIPTS_TYPE__CUSTOMIZABLEICONS:
+				return getCustomizableicons();
 			case CSConfigPackage.SCRIPTS_TYPE__DEBUGROM:
 				return getDebugrom();
 			case CSConfigPackage.SCRIPTS_TYPE__DECLARENAME:
@@ -3174,6 +3373,8 @@
 				return getExportpurevirtual();
 			case CSConfigPackage.SCRIPTS_TYPE__EXTERNALDRIVELETTERS:
 				return getExternaldriveletters();
+			case CSConfigPackage.SCRIPTS_TYPE__FLAGS:
+				return getFlags();
 			case CSConfigPackage.SCRIPTS_TYPE__FOFF:
 				return getFoff();
 			case CSConfigPackage.SCRIPTS_TYPE__FORBIDDENWORDS:
@@ -3379,9 +3580,15 @@
 			case CSConfigPackage.SCRIPTS_TYPE__CONTROLORNULL:
 				setControlornull((ControlornullType)newValue);
 				return;
+			case CSConfigPackage.SCRIPTS_TYPE__CREPOSITORY:
+				setCrepository((CrepositoryType)newValue);
+				return;
 			case CSConfigPackage.SCRIPTS_TYPE__CTLTARGETTYPE:
 				setCtltargettype((CtltargettypeType)newValue);
 				return;
+			case CSConfigPackage.SCRIPTS_TYPE__CUSTOMIZABLEICONS:
+				setCustomizableicons((CustomizableiconsType)newValue);
+				return;
 			case CSConfigPackage.SCRIPTS_TYPE__DEBUGROM:
 				setDebugrom((DebugromType)newValue);
 				return;
@@ -3421,6 +3628,9 @@
 			case CSConfigPackage.SCRIPTS_TYPE__EXTERNALDRIVELETTERS:
 				setExternaldriveletters((ExternaldrivelettersType)newValue);
 				return;
+			case CSConfigPackage.SCRIPTS_TYPE__FLAGS:
+				setFlags((FlagsType)newValue);
+				return;
 			case CSConfigPackage.SCRIPTS_TYPE__FOFF:
 				setFoff((FoffType)newValue);
 				return;
@@ -3694,9 +3904,15 @@
 			case CSConfigPackage.SCRIPTS_TYPE__CONTROLORNULL:
 				setControlornull((ControlornullType)null);
 				return;
+			case CSConfigPackage.SCRIPTS_TYPE__CREPOSITORY:
+				setCrepository((CrepositoryType)null);
+				return;
 			case CSConfigPackage.SCRIPTS_TYPE__CTLTARGETTYPE:
 				setCtltargettype((CtltargettypeType)null);
 				return;
+			case CSConfigPackage.SCRIPTS_TYPE__CUSTOMIZABLEICONS:
+				setCustomizableicons((CustomizableiconsType)null);
+				return;
 			case CSConfigPackage.SCRIPTS_TYPE__DEBUGROM:
 				setDebugrom((DebugromType)null);
 				return;
@@ -3736,6 +3952,9 @@
 			case CSConfigPackage.SCRIPTS_TYPE__EXTERNALDRIVELETTERS:
 				setExternaldriveletters((ExternaldrivelettersType)null);
 				return;
+			case CSConfigPackage.SCRIPTS_TYPE__FLAGS:
+				setFlags((FlagsType)null);
+				return;
 			case CSConfigPackage.SCRIPTS_TYPE__FOFF:
 				setFoff((FoffType)null);
 				return;
@@ -3990,8 +4209,12 @@
 				return getConsttdescptr() != null;
 			case CSConfigPackage.SCRIPTS_TYPE__CONTROLORNULL:
 				return getControlornull() != null;
+			case CSConfigPackage.SCRIPTS_TYPE__CREPOSITORY:
+				return getCrepository() != null;
 			case CSConfigPackage.SCRIPTS_TYPE__CTLTARGETTYPE:
 				return getCtltargettype() != null;
+			case CSConfigPackage.SCRIPTS_TYPE__CUSTOMIZABLEICONS:
+				return getCustomizableicons() != null;
 			case CSConfigPackage.SCRIPTS_TYPE__DEBUGROM:
 				return getDebugrom() != null;
 			case CSConfigPackage.SCRIPTS_TYPE__DECLARENAME:
@@ -4018,6 +4241,8 @@
 				return getExportpurevirtual() != null;
 			case CSConfigPackage.SCRIPTS_TYPE__EXTERNALDRIVELETTERS:
 				return getExternaldriveletters() != null;
+			case CSConfigPackage.SCRIPTS_TYPE__FLAGS:
+				return getFlags() != null;
 			case CSConfigPackage.SCRIPTS_TYPE__FOFF:
 				return getFoff() != null;
 			case CSConfigPackage.SCRIPTS_TYPE__FORBIDDENWORDS:
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/util/CSConfigAdapterFactory.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/util/CSConfigAdapterFactory.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/util/CSConfigAdapterFactory.java	Mon Apr 06 15:46:51 2009 -0500
@@ -179,10 +179,18 @@
 				return createControlornullTypeAdapter();
 			}
 			@Override
+			public Adapter caseCrepositoryType(CrepositoryType object) {
+				return createCrepositoryTypeAdapter();
+			}
+			@Override
 			public Adapter caseCtltargettypeType(CtltargettypeType object) {
 				return createCtltargettypeTypeAdapter();
 			}
 			@Override
+			public Adapter caseCustomizableiconsType(CustomizableiconsType object) {
+				return createCustomizableiconsTypeAdapter();
+			}
+			@Override
 			public Adapter caseCustomrulesType(CustomrulesType object) {
 				return createCustomrulesTypeAdapter();
 			}
@@ -251,6 +259,10 @@
 				return createExternaldrivelettersTypeAdapter();
 			}
 			@Override
+			public Adapter caseFlagsType(FlagsType object) {
+				return createFlagsTypeAdapter();
+			}
+			@Override
 			public Adapter caseFoffType(FoffType object) {
 				return createFoffTypeAdapter();
 			}
@@ -931,6 +943,20 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType <em>Crepository Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CrepositoryType
+	 * @generated
+	 */
+	public Adapter createCrepositoryTypeAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CtltargettypeType <em>Ctltargettype Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
@@ -945,6 +971,20 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType <em>Customizableicons Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomizableiconsType
+	 * @generated
+	 */
+	public Adapter createCustomizableiconsTypeAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.CustomrulesType <em>Customrules Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
@@ -1183,6 +1223,20 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType <em>Flags Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FlagsType
+	 * @generated
+	 */
+	public Adapter createFlagsTypeAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link com.nokia.carbide.cpp.internal.codescanner.gen.CSConfig.FoffType <em>Foff Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/util/CSConfigSwitch.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/util/CSConfigSwitch.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/gen/CSConfig/util/CSConfigSwitch.java	Mon Apr 06 15:46:51 2009 -0500
@@ -242,12 +242,24 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case CSConfigPackage.CREPOSITORY_TYPE: {
+				CrepositoryType crepositoryType = (CrepositoryType)theEObject;
+				T result = caseCrepositoryType(crepositoryType);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case CSConfigPackage.CTLTARGETTYPE_TYPE: {
 				CtltargettypeType ctltargettypeType = (CtltargettypeType)theEObject;
 				T result = caseCtltargettypeType(ctltargettypeType);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case CSConfigPackage.CUSTOMIZABLEICONS_TYPE: {
+				CustomizableiconsType customizableiconsType = (CustomizableiconsType)theEObject;
+				T result = caseCustomizableiconsType(customizableiconsType);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case CSConfigPackage.CUSTOMRULES_TYPE: {
 				CustomrulesType customrulesType = (CustomrulesType)theEObject;
 				T result = caseCustomrulesType(customrulesType);
@@ -350,6 +362,12 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case CSConfigPackage.FLAGS_TYPE: {
+				FlagsType flagsType = (FlagsType)theEObject;
+				T result = caseFlagsType(flagsType);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case CSConfigPackage.FOFF_TYPE: {
 				FoffType foffType = (FoffType)theEObject;
 				T result = caseFoffType(foffType);
@@ -1201,6 +1219,21 @@
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Crepository Type</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Crepository Type</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCrepositoryType(CrepositoryType object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Ctltargettype Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
@@ -1216,6 +1249,21 @@
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Customizableicons Type</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Customizableicons Type</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCustomizableiconsType(CustomizableiconsType object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Customrules Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
@@ -1471,6 +1519,21 @@
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Flags Type</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Flags Type</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFlagsType(FlagsType object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Foff Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/messages.properties
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/messages.properties	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/messages.properties	Mon Apr 06 15:46:51 2009 -0500
@@ -72,6 +72,7 @@
 RulesTabPage.RulesTableCategoriesLabel=Categories
 RulesTabPage.RulesTableSeveritiesLabel=Severities
 RulesTabPage.EditForbiddenWordsLabel=Forbidden words :
+RulesTabPage.EditIconsLabel=Icons:
 RulesTabPage.EditLFunctionCantLeaveLabel=LFunction ignore :
 RulesTabPage.EditLongLinesLabel=Long lines length :
 RulesTabPage.EditMissingCClassLabel=C Class ignore :
@@ -102,7 +103,9 @@
 CSRule.Constnames=A badly-named constant will make the source code harder to maintain and make defects more likely.
 CSRule.Consttdescptr=Using const descriptor pointer as an argument. For example: use 'const TDesC&' instead of 'const TDesC*'.
 CSRule.Controlornull=You should always check the return value of ControlOrNull() for NULL before attempting to access it.
+CSRule.Crepository=Independent application cannot assume that the Central Repository is set up fully. This means the return value of CRepository::get() cannot be ignored.
 CSRule.Ctltargettype=The ctl targettype should not be used. Instead, use DLL and explicitly refer to the Control Panel\u2019s DEF file.
+CSRule.Customizableicons=Due to device customization requirements, independent application must not remove any customization done by the variant team. This means customizable icons cannot be used.
 CSRule.Debugrom=Debug versions of components in the ROM mean that ROM space is being taken up with debugging information or that logging is still being output. Only release versions should be in the ROM.
 CSRule.Declarename=The __DECLARE_NAME macro is historical and serves no purpose anymore and should be removed.
 CSRule.DeleteMemberVariable=The Member variable was deleted incorrectly by not assigning it to NULL or another value to prevent accidental access of the deleted object.
@@ -115,7 +118,7 @@
 CSRule.Enumnames=Badly-named enums make the code harder to maintain and may cause defects.
 CSRule.Exportinline=Exporting inline functions can cause those that link to the DLL to fail to build. Exporting functions limits future changes due to considerations of binary-compatibility.
 CSRule.Exportpurevirtual=The exporting of pure virtual functions is not recommended by Symbian.
-#CSRule.Externaldriveletters=External drive letters should not be hard-coded as the external drive may change between platforms and releases. This ownership confusion can lead to classes being deleted erroneously and leaks occurring.
+CSRule.Flags=Independent application must not use R&D flags nor feature flags via preprocessor statements in the source code. This means bld*.hrh and productvariant.hrh should not be used.
 CSRule.Foff=_FOFF allows access to data in classes that were not intended for public access. This may cause problems, especially when the location of the data changes.
 CSRule.Forbiddenwords=Use of forbidden words in header files, especially those destined for external release. Some words may be forbidden for legal reasons or for platform consistency. Where they exist, alternative allowed words should be used.
 CSRule.Forgottoputptroncleanupstack=A memory leak can occur if a variable is not put on the cleanup stack and a leaving function or ELeave is called.
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/ui/CSPreferenceConstants.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/ui/CSPreferenceConstants.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/ui/CSPreferenceConstants.java	Mon Apr 06 15:46:51 2009 -0500
@@ -41,6 +41,7 @@
 	public final static String RULES_ENABLED		= "CodeScannerRulesEnabled";
 	public final static String CCLASSIGNORE			= "CodeScannerCClassIgnore";
 	public final static String FORBIDEENWORDS		= "CodeScannerForbiddenWords";
+	public final static String ICONS				= "CodeScannerIcons";
 	public final static String LFUNCTIONIGNORE		= "CodeScannerLFunctionIgnore";
 	public final static String LONGLINES_LENGTH		= "CodeScannerLongLinesLength";
 	public final static String OPENIGNORE			= "CodeScannerOpenIgnore";
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/ui/CSRulesTabPage.java
--- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/ui/CSRulesTabPage.java	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/ui/CSRulesTabPage.java	Mon Apr 06 15:46:51 2009 -0500
@@ -92,11 +92,12 @@
 	private Button enableAllButton = null;
 	private Button disableAllButton = null;
 	private String cclassIgnore = "";
+	private String icons = "";
 	private String lfunctionIgnore = "";
+	private int longLinesLength = 0;
 	private String forbiddenWords = "";
 	private String openIgnore = "";
 	private String worryingComments = "";
-	private int longLinesLength = 0;
 	private CSConfigSettings defaultConfigSettings = null;
 	private List<CSRule> rules = null;
 	private CSRulesSorter rulesSorter = null;
@@ -282,6 +283,10 @@
 		rulesTableViewer.setInput(rules.toArray());
 		setCheckedElements();
 		cclassIgnore = defaultConfigSettings.getScriptCClassIgnore();
+		icons = defaultConfigSettings.getScriptIcons();
+		if (icons == null) {
+			icons = "";
+		}
 		longLinesLength = defaultConfigSettings.getScriptLongLinesLength();
 		forbiddenWords = defaultConfigSettings.getScriptForbiddenWords();
 		openIgnore = defaultConfigSettings.getScriptOpenIgnore();
@@ -341,6 +346,7 @@
 		// retrieve other stored values
 		cclassIgnore = store.getString(CSPreferenceConstants.CCLASSIGNORE);
 		forbiddenWords = store.getString(CSPreferenceConstants.FORBIDEENWORDS);
+		icons = store.getString(CSPreferenceConstants.ICONS);
 		lfunctionIgnore = store.getString(CSPreferenceConstants.LFUNCTIONIGNORE);
 		longLinesLength = store.getInt(CSPreferenceConstants.LONGLINES_LENGTH);
 		openIgnore = store.getString(CSPreferenceConstants.OPENIGNORE);
@@ -398,6 +404,7 @@
 		// retrieve other stored values
 		cclassIgnore = pageSettings.get(CSPreferenceConstants.CCLASSIGNORE);
 		forbiddenWords = pageSettings.get(CSPreferenceConstants.FORBIDEENWORDS);
+		icons = pageSettings.get(CSPreferenceConstants.ICONS);
 		lfunctionIgnore = pageSettings.get(CSPreferenceConstants.LFUNCTIONIGNORE);
 		longLinesLength = pageSettings.getInt(CSPreferenceConstants.LONGLINES_LENGTH);
 		openIgnore = pageSettings.get(CSPreferenceConstants.OPENIGNORE);
@@ -438,6 +445,7 @@
 		// store other values
 		store.setValue(CSPreferenceConstants.CCLASSIGNORE, cclassIgnore);
 		store.setValue(CSPreferenceConstants.FORBIDEENWORDS, forbiddenWords);
+		store.setValue(CSPreferenceConstants.ICONS, icons);
 		store.setValue(CSPreferenceConstants.LFUNCTIONIGNORE, lfunctionIgnore);
 		store.setValue(CSPreferenceConstants.LONGLINES_LENGTH, longLinesLength);
 		store.setValue(CSPreferenceConstants.OPENIGNORE, openIgnore);
@@ -478,6 +486,7 @@
 		// store other values
 		pageSettings.put(CSPreferenceConstants.CCLASSIGNORE, cclassIgnore);
 		pageSettings.put(CSPreferenceConstants.FORBIDEENWORDS, forbiddenWords);
+		pageSettings.put(CSPreferenceConstants.ICONS, icons);
 		pageSettings.put(CSPreferenceConstants.LFUNCTIONIGNORE, lfunctionIgnore);
 		pageSettings.put(CSPreferenceConstants.LONGLINES_LENGTH, longLinesLength);
 		pageSettings.put(CSPreferenceConstants.OPENIGNORE, openIgnore);
@@ -516,6 +525,11 @@
 		store.setDefault(CSPreferenceConstants.RULES_ENABLED, enabledString);
 		store.setDefault(CSPreferenceConstants.CCLASSIGNORE, configSettings.getScriptCClassIgnore());
 		store.setDefault(CSPreferenceConstants.FORBIDEENWORDS, configSettings.getScriptForbiddenWords());
+		String icons = configSettings.getScriptIcons();
+		if (icons == null) {
+			icons = "";
+		}
+		store.setDefault(CSPreferenceConstants.ICONS, icons);
 		store.setDefault(CSPreferenceConstants.LFUNCTIONIGNORE, configSettings.getScriptLFunctionIgnore());
 		store.setDefault(CSPreferenceConstants.LONGLINES_LENGTH, configSettings.getScriptLongLinesLength());
 		store.setDefault(CSPreferenceConstants.OPENIGNORE, configSettings.getScriptOpenIgnore());
@@ -552,6 +566,11 @@
 		pageSettings.put(CSPreferenceConstants.RULES_ENABLED, enabledString);
 		pageSettings.put(CSPreferenceConstants.CCLASSIGNORE, configSettings.getScriptCClassIgnore());
 		pageSettings.put(CSPreferenceConstants.FORBIDEENWORDS, configSettings.getScriptForbiddenWords());
+		String icons = configSettings.getScriptIcons();
+		if (icons == null) {
+			icons = "";
+		}
+		pageSettings.put(CSPreferenceConstants.ICONS, icons);
 		pageSettings.put(CSPreferenceConstants.LFUNCTIONIGNORE, configSettings.getScriptLFunctionIgnore());
 		pageSettings.put(CSPreferenceConstants.LONGLINES_LENGTH, configSettings.getScriptLongLinesLength());
 		pageSettings.put(CSPreferenceConstants.OPENIGNORE, configSettings.getScriptOpenIgnore());
@@ -574,10 +593,12 @@
 					String extraAttr = "";
 
 					CSScript script = rule.getScript();
-					if (script.equals(CSScript.script_longlines)) {
+					if (script.equals(CSScript.script_customizableicons)) {
 						hasExtra = true;
-						extraAttrTitle = Messages.getString("RulesTabPage.EditLongLinesLabel");
-						extraAttr = longLinesLength + "";
+						extraAttrTitle = Messages.getString("RulesTabPage.EditIconsLabel");
+						if (icons != null) {
+							extraAttr = icons;
+						}
 					}
 					else
 					if (script.equals(CSScript.script_forbiddenwords)) {
@@ -596,6 +617,12 @@
 						}
 					}
 					else
+					if (script.equals(CSScript.script_longlines)) {
+						hasExtra = true;
+						extraAttrTitle = Messages.getString("RulesTabPage.EditLongLinesLabel");
+						extraAttr = longLinesLength + "";
+					}
+					else
 					if (script.equals(CSScript.script_missingcclass)) {
 						hasExtra = true;
 						extraAttrTitle = Messages.getString("RulesTabPage.EditMissingCClassLabel");
@@ -637,6 +664,10 @@
 						}
 						String newExtraAttr = dialog.getExtra();
 						if (dialog.hasExtra() && !newExtraAttr.equals(extraAttr)) {
+							if (script.equals(CSScript.script_customizableicons)) {
+								icons = newExtraAttr;
+							}
+							else
 							if (script.equals(CSScript.script_forbiddenwords)) {
 								forbiddenWords = newExtraAttr;
 							}
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Mon Apr 06 15:46:51 2009 -0500
@@ -16,7 +16,7 @@
 <h2>Carbide.c++ bugs fixed </h2>
 <p>This is a comprehensive list of bugs fixed by release: </p>
 <ul>
-  
+  <li><a href="#bugs204">Bugs Fixed in 2.0.4</a></li>
   <li><a href="#bugs210">Bugs Fixed in 2.1.0</a></li>
   <li><a href="#bugs204">2.0.4</a>, <a href="#bugs203">2.0.3</a>, <a href="#bugs202"> 2.0.2</a>, <a href="#bugs200">2.0.0</a></li>
   <li><a href="#bugs131">1.3.1</a>, <a href="#bugs130">1.3.0</a> , <a href="#bugs122">1.2.2</a>, <a href="#bugs121">1.2.1</a></li>
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Mon Apr 06 15:44:39 2009 -0500
+++ b/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Mon Apr 06 15:46:51 2009 -0500
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Carbide.c++
 Bundle-SymbolicName: com.nokia.carbide.cpp; singleton:=true
-Bundle-Version: 2.0.3.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: com.nokia.carbide.cpp.ProductPlugin
 Bundle-Vendor: Nokia
 Bundle-Localization: plugin
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp/html/welcome_note.htm
diff -r 15fe054c0872 -r 05c4630a6d73 core/com.nokia.carbide.cpp/plugin.xml