Merge from default.
--- a/.branch.txt Wed Jul 21 11:37:56 2010 -0500
+++ b/.branch.txt Wed Jul 21 12:11:48 2010 -0500
@@ -1,1 +1,1 @@
-Mon May 24 15:37:50 CDT 2010
+Mon May 24 15:38:04 CDT 2010
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.input.txt Wed Jul 21 11:37:56 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.input.txt Wed Jul 21 12:11:48 2010 -0500
@@ -8,6 +8,14 @@
<info>Regression for bug 9091. Don't report info lines with SBSv2 error checker</info>
<info>Could not write toolcheck cache: [Errno 2] No such file or directory: u'R:\\\\epoc32\\build\\toolcheck_cache__armv5_udeb.tmp'</info>
+<error>tool 'SBS_JAVATC' from config 'none' did not return version 'version \"1\.[5-9]' as required.
+Command 'D:/sources/trk/tcf/tcftrk/group/[undefined] -version' returned:
+(this line excised to avoid false positive)
+
+Check your environment and configuration.
+
+</error>
+
<info>Executing 'make -r -f "J:/epoc32/build/Cone/makefile.default" -j 4
DESCRAMBLE="C:/Symbian/SITK/sbs/bin/sbs_descramble.exe sbs2631027042"'</info>
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.regression.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/sbsv2.errors.regression.xml Wed Jul 21 12:11:48 2010 -0500
@@ -1,6 +1,8 @@
<root>
<!--Error Marker at index 0-->
+<marker_info external_path_string="^EMPTY^" file="^EMPTY^" line_number="-1" message="tool 'SBS_JAVATC' from config 'none' did not return version 'version \"1\.[5-9]' as required." severity="3" variable_name="^EMPTY^"/>
+<!--Error Marker at index 1-->
<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-->
+<!--Error Marker at index 2-->
<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
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java Wed Jul 21 11:37:56 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java Wed Jul 21 12:11:48 2010 -0500
@@ -217,14 +217,28 @@
BldInfViewPathHelper helper = new BldInfViewPathHelper(data, context);
for (IExtension extension : data.getExtensions()) {
IPath extensionMakefileBase = helper.convertExtensionTemplateToFilesystem(extension.getTemplatePath());
- normalFiles.add(extensionMakefileBase.addFileExtension("mk")); //$NON-NLS-1$
+ IPath makefile = getControllingFile(extensionMakefileBase);
+ normalFiles.add(makefile);
}
for (IExtension extension : data.getTestExtensions()) {
IPath extensionMakefileBase = helper.convertExtensionTemplateToFilesystem(extension.getTemplatePath());
- testFiles.add(extensionMakefileBase.addFileExtension("mk")); //$NON-NLS-1$
+ IPath makefile = getControllingFile(extensionMakefileBase);
+ testFiles.add(makefile);
}
return null;
}
+
+ private IPath getControllingFile(
+ IPath extensionMakefileBase) {
+ IPath candidate = extensionMakefileBase.addFileExtension("mk"); //$NON-NLS-1$
+ if (candidate.toFile().exists())
+ return candidate;
+ if ("export".equals(extensionMakefileBase.getFileExtension())) //$NON-NLS-1$
+ candidate = extensionMakefileBase.removeFileExtension().addFileExtension("flm"); //$NON-NLS-1$
+ else
+ candidate = extensionMakefileBase.addFileExtension("flm"); //$NON-NLS-1$
+ return candidate;
+ }
});
monitor.worked(1);
@@ -1128,7 +1142,7 @@
// get the bitmaps
List<IMMPBitmap> bmps = mmpData.getBitmaps();
for (IMMPBitmap bmp : bmps) {
- IPath mbmPath = bmp.getTargetFilePath().makeRelative();
+ IPath mbmPath = bmp.getTargetFilePath().makeAbsolute();
// if there's no target path then use the main target path
if (mbmPath.segmentCount() == 1) {
mbmPath = targetPath.append(mbmPath);
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildManagerUtils.java Wed Jul 21 11:37:56 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildManagerUtils.java Wed Jul 21 12:11:48 2010 -0500
@@ -1,10 +1,14 @@
package com.nokia.carbide.cdt.internal.builder;
+import java.text.MessageFormat;
+
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.ILaunchManager;
+import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
+
public class CarbideBuildManagerUtils {
/**
@@ -34,4 +38,9 @@
}
}
+ public static String getBuildLabel(ICarbideBuildConfiguration buildConfig, String componentName) {
+ return MessageFormat.format("Building {0}: {1}",
+ buildConfig.getCarbideProject().getProject().getName(),
+ componentName != null ? componentName : buildConfig.getDisplayString());
+ }
}
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Wed Jul 21 11:37:56 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Wed Jul 21 12:11:48 2010 -0500
@@ -179,7 +179,7 @@
if (areWeManagingTheMakeFiles || buildConfig.getCarbideProject().isConcurrentBuildingEnabled()) {
SubMonitor progress = SubMonitor.convert(monitor, 7);
- progress.setTaskName("Building " + componentName);
+ progress.setTaskName(CarbideBuildManagerUtils.getBuildLabel(buildConfig, componentName));
// run abld export or test export
List<String> args = new ArrayList<String>();
@@ -310,7 +310,7 @@
} else {
SubMonitor progress = SubMonitor.convert(monitor, 1);
- progress.setTaskName("Building " + componentName);
+ progress.setTaskName(CarbideBuildManagerUtils.getBuildLabel(buildConfig, componentName));
List<String> argsList = new ArrayList<String>();
if (isTest) {
@@ -838,7 +838,7 @@
// because the dependency info is in the makefiles.
SubMonitor progress = SubMonitor.convert(monitor, 3);
- progress.setTaskName("Building " + buildConfig.getDisplayString());
+ progress.setTaskName(CarbideBuildManagerUtils.getBuildLabel(buildConfig, null));
if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
return false;
@@ -912,7 +912,7 @@
}
SubMonitor progress = SubMonitor.convert(monitor, unitsOfWork);
- progress.setTaskName("Building " + buildConfig.getDisplayString());
+ progress.setTaskName(CarbideBuildManagerUtils.getBuildLabel(buildConfig, null));
if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
return false;
@@ -1154,7 +1154,7 @@
// because the dependency info is in the makefiles.
SubMonitor progress = SubMonitor.convert(monitor, 1 + normalMakMakePaths.size() + testMakMakePaths.size());
- progress.setTaskName("Building " + buildConfig.getDisplayString());
+ progress.setTaskName(CarbideBuildManagerUtils.getBuildLabel(buildConfig, null));
if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
return false;
@@ -1247,7 +1247,7 @@
}
SubMonitor progress = SubMonitor.convert(monitor, 4 + (normalMakMakePaths.size()*4) + (testMakMakePaths.size()*4));
- progress.setTaskName("Building " + buildConfig.getDisplayString());
+ progress.setTaskName(CarbideBuildManagerUtils.getBuildLabel(buildConfig, null));
if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
return false;
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java Wed Jul 21 11:37:56 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java Wed Jul 21 12:11:48 2010 -0500
@@ -47,7 +47,7 @@
public boolean buildAllComponents(ICarbideBuildConfiguration buildConfig, List<IPath> normalMakMakePaths, List<IPath> testMakMakePaths, CarbideCommandLauncher launcher, IProgressMonitor monitor) {
SubMonitor progress = SubMonitor.convert(monitor, 3);
- progress.setTaskName("Building " + buildConfig.getDisplayString());
+ progress.setTaskName(CarbideBuildManagerUtils.getBuildLabel(buildConfig, null));
if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
return false;
@@ -113,7 +113,7 @@
}
SubMonitor progress = SubMonitor.convert(monitor, 1);
- progress.setTaskName("Building " + componentName);
+ progress.setTaskName(CarbideBuildManagerUtils.getBuildLabel(buildConfig, componentName));
List<String> argsList = new ArrayList<String>();
argsList.add(COMPONENT_ARG);
@@ -136,7 +136,7 @@
public boolean buildComponentSubset(ICarbideBuildConfiguration buildConfig, List<IPath> normalMakMakePaths, List<IPath> testMakMakePaths, CarbideCommandLauncher launcher, IProgressMonitor monitor) {
SubMonitor progress = SubMonitor.convert(monitor, 1 + normalMakMakePaths.size() + testMakMakePaths.size());
- progress.setTaskName("Building " + buildConfig.getDisplayString());
+ progress.setTaskName(CarbideBuildManagerUtils.getBuildLabel(buildConfig, null));
if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
return false;
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/SBSv2ErrorParser.java Wed Jul 21 11:37:56 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/SBSv2ErrorParser.java Wed Jul 21 12:11:48 2010 -0500
@@ -21,12 +21,11 @@
import org.eclipse.cdt.core.ErrorParserManager;
import org.eclipse.cdt.core.IMarkerGenerator;
+import org.eclipse.core.runtime.Path;
public class SBSv2ErrorParser extends CarbideBaseErrorParser {
- private static final Pattern warningPattern = Pattern.compile("<warning>(.*)</warning>"); //$NON-NLS-1$
- private static final Pattern errorPattern = Pattern.compile("<error>(.*)</error>"); //$NON-NLS-1$
- private static final Pattern infoPattern = Pattern.compile("<info>(.*)</info>"); //$NON-NLS-1$
+ private final Pattern msgPattern = Pattern.compile("(.*):(\\d*):(\\d*):(.*)"); //$NON-NLS-1$
public SBSv2ErrorParser() {
}
@@ -35,51 +34,50 @@
initialise();
- Matcher matcher = infoPattern.matcher(line);
- if (matcher.matches()) {
+ if (line.startsWith("<info>"))
return true; // just ignore info messages
- }
- matcher = warningPattern.matcher(line);
- if (matcher.matches()) {
+
+ // full message detected
+ if (findMessage(errorParserManager, line, "<error>", "</error>", IMarkerGenerator.SEVERITY_ERROR_BUILD))
+ return true;
+ if (findMessage(errorParserManager, line, "<warning>", "</warning>", IMarkerGenerator.SEVERITY_WARNING))
+ return true;
+
+ // some messages are split across multiple lines, so for now, at least show the first line (where <error>, etc. are)
+ if (findMessage(errorParserManager, line, "<error>", "", IMarkerGenerator.SEVERITY_ERROR_BUILD))
+ return true;
+ if (findMessage(errorParserManager, line, "<warning>", "", IMarkerGenerator.SEVERITY_WARNING))
+ return true;
+
+ return false;
+ }
+
+ protected boolean findMessage(ErrorParserManager errorParserManager, String line,
+ String startStrip, String endStrip, int severity) {
+ int idx = line.indexOf(startStrip);
+ int endIdx = line.indexOf(endStrip);
+ if (idx >= 0 && endIdx >= 0) {
// strip the tags
- String text = line.substring("<warning>".length(), line.length() - "</warning>".length()); //$NON-NLS-1$ //$NON-NLS-2$
+ int descStart = idx + startStrip.length();
+ int descEnd = line.length() - endStrip.length();
+
+ String text = line.substring(descStart, descEnd);
if (setFirstColon(text)) {
- if (setFileNameAndLineNumber(text)) {
+ if (setFileNameAndLineNumber(text) || setSBSv2FileNameAndLineNumber(text)) {
setFile(errorParserManager);
setDescription(text);
- errorParserManager.generateExternalMarker(msgIFile, msgLineNumber, msgDescription, IMarkerGenerator.SEVERITY_WARNING, null, externalFilePath);
+ errorParserManager.generateExternalMarker(msgIFile, msgLineNumber, msgDescription, severity, null, externalFilePath);
return true;
}
}
msgFileName = ""; //$NON-NLS-1$
- msgDescription = matcher.group(1);
+ msgDescription = text;
setFile(errorParserManager);
- errorParserManager.generateExternalMarker(msgIFile, msgLineNumber, msgDescription, IMarkerGenerator.SEVERITY_WARNING, null, externalFilePath);
+ errorParserManager.generateExternalMarker(msgIFile, msgLineNumber, msgDescription, severity, null, externalFilePath);
return true;
}
-
- matcher = errorPattern.matcher(line);
- if (matcher.matches()) {
- // strip the tags
- String text = line.substring("<error>".length(), line.length() - "</error>".length()); //$NON-NLS-1$ //$NON-NLS-2$
- if (setFirstColon(text)) {
- if (setFileNameAndLineNumber(text)) {
- setFile(errorParserManager);
- setDescription(text);
- errorParserManager.generateExternalMarker(msgIFile, msgLineNumber, msgDescription, IMarkerGenerator.SEVERITY_ERROR_BUILD, null, externalFilePath);
- return true;
- }
- }
- msgFileName = ""; //$NON-NLS-1$
- msgDescription = matcher.group(1);
- setFile(errorParserManager);
- errorParserManager.generateExternalMarker(msgIFile, msgLineNumber, msgDescription, IMarkerGenerator.SEVERITY_ERROR_BUILD, null, externalFilePath);
- return true;
- }
-
return false;
}
-
public void setDescription(String line) {
// Get the iDescription
msgDescription = line.substring(msgFirstColon + 1).trim();
@@ -88,4 +86,21 @@
}
}
+ protected boolean setSBSv2FileNameAndLineNumber(String line) {
+ // Get the first Substring, which must be in the form of
+ // "fileName:line number:postion"
+ String firstSubstr = line.substring(msgFirstColon + 1).trim();
+ if (firstSubstr != null) {
+ Matcher matcher = msgPattern.matcher(firstSubstr);
+ if (matcher.matches()) {
+ msgFileName = matcher.group(1);
+ if (!Path.EMPTY.isValidPath(msgFileName)) {
+ return false;
+ }
+ msgLineNumber = Integer.parseInt(matcher.group(2));
+ return true;
+ }
+ }
+ return false;
+ }
}
--- a/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/agent/PCCSDiscoveryAgent.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/agent/PCCSDiscoveryAgent.java Wed Jul 21 12:11:48 2010 -0500
@@ -353,4 +353,12 @@
}
return loadStatus;
}
+
+ public boolean isRunning() {
+ return pccsConnection != null && pccsConnection.isOpen();
+ }
+
+ public String getId() {
+ return getClass().getName();
+ }
}
--- a/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/messages.properties Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/messages.properties Wed Jul 21 12:11:48 2010 -0500
@@ -1,4 +1,4 @@
-Activator_Agent_Name=PC Suite Device Discovery Agent
+Activator_Agent_Name=PC Suite Device Discovery
Activator_PCCS_Location=http://www2.connecting.nokia.com/nmp/swp/pcsuite.nsf/document/ES336ZAHVY?OpenDocument
Activator_PCSuite_Location=https://tools.ext.nokia.com/PCsuite
ConnAPILibrary_PCCS_Not_Found_Error=Carbide could not find the PC Connectivity Solution (PCCS) installation. For more information go to:
--- a/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/pccsnative/PCCSConnection.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.discovery.pccs/src/com/nokia/carbide/remoteconnections/discovery/pccs/pccsnative/PCCSConnection.java Wed Jul 21 12:11:48 2010 -0500
@@ -1300,4 +1300,11 @@
throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, PCCS_WRONG_VERSION, msg, null));
}
}
+
+ /**
+ * @return whether we have a valid handle
+ */
+ public boolean isOpen() {
+ return dmHandle != APIHANDLE.INVALID_HANDLE_VALUE;
+ }
}
--- a/connectivity/com.nokia.carbide.remoteConnections.tests/plugin.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.tests/plugin.xml Wed Jul 21 12:11:48 2010 -0500
@@ -26,26 +26,6 @@
</service>
</extension>
<extension
- point="org.eclipse.ui.actionSets">
- <actionSet
- id="com.nokia.carbide.remoteconnections.tests.extensions.actionSet"
- label="Service Dialogs"
- visible="true">
- <action
- class="com.nokia.carbide.remoteconnections.tests.extensions.RandomCycleServiceDialogAction"
- id="com.nokia.carbide.remoteconnections.tests.randomCycle.action"
- label="Random Cycle Service Dialog..."
- menubarPath="help/TestServiceDialogs">
- </action>
- <action
- class="com.nokia.carbide.remoteconnections.tests.extensions.UnknownStatusServiceDialogAction"
- id="com.nokia.carbide.remoteconnections.tests.unknownStatus.action"
- label="Unknown Status Service Dialog..."
- menubarPath="help/TestServiceDialogs">
- </action>
- </actionSet>
- </extension>
- <extension
point="com.nokia.carbide.remoteConnections.extensionFilter">
<extensionFilter
class="com.nokia.carbide.remoteconnections.tests.extensions.TestFilter">
--- a/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/discovery/RandomDiscoveryAgent.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/discovery/RandomDiscoveryAgent.java Wed Jul 21 12:11:48 2010 -0500
@@ -101,7 +101,7 @@
}
}
- private DiscoveryThread thread = new DiscoveryThread();
+ private DiscoveryThread thread;
public URL getInformation() {
return null;
@@ -131,20 +131,33 @@
}
public void start() throws CoreException {
- if (TestFilter.isTest)
+ if (TestFilter.isTest) {
+ thread = new DiscoveryThread();
thread.start();
+ }
}
public void stop() throws CoreException {
- thread.stopRunning();
+ if (TestFilter.isTest) {
+ thread.stopRunning();
+ thread = null;
+ }
}
public String getDisplayName() {
- return "Random Test Discovery Agent";
+ return "Random Test Discovery";
}
public IPrerequisiteStatus getPrerequisiteStatus() {
return (new RandomPrerequisiteStatus());
}
+ public boolean isRunning() {
+ return thread != null;
+ }
+
+ public String getId() {
+ return getClass().getName();
+ }
+
}
--- a/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/extensions/RandomCycleConnectedService.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/extensions/RandomCycleConnectedService.java Wed Jul 21 12:11:48 2010 -0500
@@ -35,9 +35,9 @@
import org.osgi.framework.Version;
import com.nokia.carbide.remoteconnections.interfaces.IConnectedService;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
import com.nokia.carbide.remoteconnections.interfaces.IConnection;
import com.nokia.carbide.remoteconnections.interfaces.IService;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
import com.nokia.cpp.internal.api.utils.core.ListenerList;
public class RandomCycleConnectedService implements IConnectedService {
--- a/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/extensions/TestInstallerProvider.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/extensions/TestInstallerProvider.java Wed Jul 21 12:11:48 2010 -0500
@@ -39,9 +39,9 @@
*/
public class TestInstallerProvider implements IRemoteAgentInstallerProvider {
- private static final Version S60_32 = new Version("3.2");
- private static final Version S60_50 = new Version("5.0");
- private static final Version UIQ_30 = new Version("3.0");
+ private static final String S60_32 = "3.2";
+ private static final String S60_50 = "5.0";
+ private static final String UIQ_30 = "3.0";
private static final String S60 = "S60";
private static final String UIQ = "UIQ";
private static final String INSTALLER_CONTENTS = "This is a mock installer package.";
@@ -55,9 +55,9 @@
private static class TestInstaller implements IRemoteAgentInstaller {
private final String family;
- private final Version version;
+ private final String version;
- public TestInstaller(String family, Version version) {
+ public TestInstaller(String family, String version) {
this.family = family;
this.version = version;
}
@@ -66,7 +66,7 @@
return family;
}
- public Version getVersion() {
+ public String getVersion() {
return version;
}
@@ -143,18 +143,18 @@
return new ArrayList<String>(Arrays.asList(familyNames));
}
- public List<Version> getVersions(String familyName) {
+ public List<String> getVersions(String familyName) {
if (familyName.equals(S60)) {
- Version[] versions = { S60_32, S60_50 };
- return new ArrayList<Version>(Arrays.asList(versions));
+ String[] versions = { S60_32, S60_50 };
+ return new ArrayList<String>(Arrays.asList(versions));
}
else if (familyName.equals(UIQ))
return Collections.singletonList(UIQ_30);
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
- public List<IRemoteAgentInstaller> getRemoteAgentInstallers(String familyName, Version version) {
+ public List<IRemoteAgentInstaller> getRemoteAgentInstallers(String familyName, String version) {
if (familyName.equals(S60)) {
if (version.equals(S60_32))
return Collections.singletonList(installers[0]);
@@ -164,7 +164,7 @@
else if (familyName.equals(UIQ) && version.equals(UIQ_30))
return Collections.singletonList(installers[2]);
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
private static void getMockData(IProgressMonitor monitor) throws InterruptedException {
--- a/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/extensions/UnknownStatusService.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/extensions/UnknownStatusService.java Wed Jul 21 12:11:48 2010 -0500
@@ -18,16 +18,22 @@
package com.nokia.carbide.remoteconnections.tests.extensions;
-import com.nokia.carbide.remoteconnections.interfaces.*;
-import com.nokia.carbide.trk.support.connection.TCPIPConnectionFactory;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.swt.graphics.Image;
import org.osgi.framework.Version;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.*;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectedService;
+import com.nokia.carbide.remoteconnections.interfaces.IConnection;
+import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider;
+import com.nokia.carbide.remoteconnections.interfaces.IService;
+import com.nokia.carbide.remoteconnections.interfaces.IService2;
+import com.nokia.carbide.trk.support.connection.TCPIPConnectionFactory;
@SuppressWarnings("restriction")
public class UnknownStatusService implements IService2 {
@@ -111,15 +117,15 @@
return Collections.singletonList(S60);
}
- public List<Version> getVersions(String familyName) {
+ public List<String> getVersions(String familyName) {
if (familyName.equals(S60))
- return Collections.singletonList(new Version(_5_0));
+ return Collections.singletonList(_5_0);
return null;
}
- public List<IRemoteAgentInstaller> getRemoteAgentInstallers(String familyName, Version version) {
- if (familyName.equals(S60) && version.equals(new Version(_5_0))) {
+ public List<IRemoteAgentInstaller> getRemoteAgentInstallers(String familyName, String version) {
+ if (familyName.equals(S60) && version.equals(_5_0)) {
IRemoteAgentInstaller installer = new IRemoteAgentInstaller() {
public boolean fileSupportsInstall() {
@@ -183,6 +189,7 @@
return false;
}
+ @SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) {
return null;
}
--- a/connectivity/com.nokia.carbide.remoteConnections/plugin.properties Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/plugin.properties Wed Jul 21 12:11:48 2010 -0500
@@ -5,4 +5,4 @@
providerName = www.example.org
OnDevice.label=On-Device Connections...
Import.desc=Import previously exported remote connections into this workspace
-Export.desc=Export remote connections from this workspace to the local file system
\ No newline at end of file
+Export.desc=Export remote connections from this workspace to the local file system
--- a/connectivity/com.nokia.carbide.remoteConnections/plugin.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/plugin.xml Wed Jul 21 12:11:48 2010 -0500
@@ -62,20 +62,6 @@
</description>
</wizard>
</extension>
- <extension
- point="org.eclipse.ui.actionSets">
- <actionSet
- id="com.nokia.carbide.remoteConnections.OnDevice.actionSet"
- label="On-Device Connections"
- visible="true">
- <action
- class="com.nokia.carbide.remoteconnections.settings.ui.OnDeviceConnectionAction"
- id="com.nokia.carbide.remoteConnections.OnDevice.action"
- label="%OnDevice.label"
- menubarPath="help/onDeviceGroup">
- </action>
- </actionSet>
- </extension>
<!-- We use an Eclipse toolbar command to show the ToolItem icon for the
current connection status. This is required to get the same kind of
@@ -120,4 +106,16 @@
</toolbar>
</menuContribution>
</extension>
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <package
+ uri="platform:/resource/com.nokia.carbide.remoteConnections/schema/InstallPackages.xsd"
+ class="com.nokia.carbide.installpackages.gen.InstallPackages.InstallPackagesPackage"
+ genModel="schema/InstallPackages.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.extension_parser">
+ <parser
+ type="installpackages"
+ class="com.nokia.carbide.installpackages.gen.InstallPackages.util.InstallPackagesResourceFactoryImpl"/>
+ </extension>
</plugin>
--- a/connectivity/com.nokia.carbide.remoteConnections/schema/InstallPackages.ecore Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/schema/InstallPackages.ecore Wed Jul 21 12:11:48 2010 -0500
@@ -50,6 +50,22 @@
<details key="name" value="Packages_._type"/>
<details key="kind" value="elementOnly"/>
</eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sDKFamily" eType="#//SDKFamilyType"
+ containment="true" resolveProxies="false">
+ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+ <details key="kind" value="element"/>
+ <details key="name" value="SDKFamily"/>
+ <details key="namespace" value="##targetNamespace"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sDKVersion" eType="#//SDKVersionType"
+ containment="true" resolveProxies="false">
+ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+ <details key="kind" value="element"/>
+ <details key="name" value="SDKVersion"/>
+ <details key="namespace" value="##targetNamespace"/>
+ </eAnnotations>
+ </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="package" upperBound="-1"
eType="#//PackageType" containment="true" resolveProxies="false">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -112,4 +128,30 @@
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SDKFamilyType">
+ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+ <details key="name" value="SDKFamily_._type"/>
+ <details key="kind" value="empty"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="order" 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="attribute"/>
+ <details key="name" value="order"/>
+ <details key="namespace" value="##targetNamespace"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SDKVersionType">
+ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+ <details key="name" value="SDKVersion_._type"/>
+ <details key="kind" value="empty"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="order" 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="attribute"/>
+ <details key="name" value="order"/>
+ <details key="namespace" value="##targetNamespace"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
</ecore:EPackage>
--- a/connectivity/com.nokia.carbide.remoteConnections/schema/InstallPackages.genmodel Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/schema/InstallPackages.genmodel Wed Jul 21 12:11:48 2010 -0500
@@ -14,6 +14,8 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference InstallPackages.ecore#//DocumentRoot/packages"/>
</genClasses>
<genClasses ecoreClass="InstallPackages.ecore#//PackagesType">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference InstallPackages.ecore#//PackagesType/sDKFamily"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference InstallPackages.ecore#//PackagesType/sDKVersion"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference InstallPackages.ecore#//PackagesType/package"/>
</genClasses>
<genClasses ecoreClass="InstallPackages.ecore#//PackageType">
@@ -24,5 +26,11 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute InstallPackages.ecore#//PackageType/sdkFamily"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute InstallPackages.ecore#//PackageType/sdkVersion"/>
</genClasses>
+ <genClasses ecoreClass="InstallPackages.ecore#//SDKFamilyType">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InstallPackages.ecore#//SDKFamilyType/order"/>
+ </genClasses>
+ <genClasses ecoreClass="InstallPackages.ecore#//SDKVersionType">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InstallPackages.ecore#//SDKVersionType/order"/>
+ </genClasses>
</genPackages>
</genmodel:GenModel>
--- a/connectivity/com.nokia.carbide.remoteConnections/schema/InstallPackages.xsd Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/schema/InstallPackages.xsd Wed Jul 21 12:11:48 2010 -0500
@@ -3,6 +3,16 @@
<xsd:element name="Packages">
<xsd:complexType>
<xsd:sequence>
+ <xsd:element maxOccurs="1" minOccurs="0" name="SDKFamily">
+ <xsd:complexType>
+ <xsd:attribute name="order" type="xsd:string" use="required"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element maxOccurs="1" minOccurs="0" name="SDKVersion">
+ <xsd:complexType>
+ <xsd:attribute name="order" type="xsd:string" use="required"/>
+ </xsd:complexType>
+ </xsd:element>
<xsd:element maxOccurs="unbounded" minOccurs="0" name="Package">
<xsd:complexType>
<xsd:sequence>
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/InstallPackages.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/InstallPackages.java Wed Jul 21 12:11:48 2010 -0500
@@ -1,36 +1,50 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the 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:
-*
-*/
-
+ * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the 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.installpackages;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Properties;
-import com.nokia.carbide.installpackages.gen.InstallPackages.*;
-import com.nokia.carbide.installpackages.gen.InstallPackages.util.InstallPackagesResourceFactoryImpl;
-import com.nokia.carbide.remoteconnections.Messages;
-import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
-import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider;
-import com.nokia.cpp.internal.api.utils.core.*;
-
-import org.apache.commons.httpclient.*;
+import org.apache.commons.httpclient.ConnectTimeoutException;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.methods.GetMethod;
import org.eclipse.core.net.proxy.IProxyData;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
@@ -38,48 +52,68 @@
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.osgi.service.datalocation.Location;
-import org.osgi.framework.Version;
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
+import com.nokia.carbide.installpackages.gen.InstallPackages.DocumentRoot;
+import com.nokia.carbide.installpackages.gen.InstallPackages.PackageType;
+import com.nokia.carbide.installpackages.gen.InstallPackages.PackagesType;
+import com.nokia.carbide.installpackages.gen.InstallPackages.SDKFamilyType;
+import com.nokia.carbide.installpackages.gen.InstallPackages.SDKVersionType;
+import com.nokia.carbide.installpackages.gen.InstallPackages.util.InstallPackagesResourceFactoryImpl;
+import com.nokia.carbide.remoteconnections.Messages;
+import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
+import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider;
+import com.nokia.carbide.remoteconnections.interfaces.IService;
+import com.nokia.cpp.internal.api.utils.core.Check;
+import com.nokia.cpp.internal.api.utils.core.FileUtils;
+import com.nokia.cpp.internal.api.utils.core.ProxyUtils;
/**
*
*/
public class InstallPackages {
-
+
+ private static final String ORDER_DELIM = ";"; //$NON-NLS-1$
+
+ /**
+ * @deprecated server data completely taken from
+ * configuration/server.properties
+ */
public interface IServerData {
-
+
/**
* The file name of the master xml file
+ *
* @return String
*/
String getMasterFileName();
-
+
/**
* Return the IRemoteAgentInstallerProvider for this server data
+ *
* @return IRemoteAgentInstallerProvider
*/
IRemoteAgentInstallerProvider getRemoteAgentInstallerProvider();
}
- private final IServerData serverData;
+ private final IService service;
private List<PackageType> packageList;
private String serverPath;
-
- public InstallPackages(IServerData serverData, IRunnableContext runnableContext) {
- Check.checkArg(serverData);
- this.serverData = serverData;
+ private List<String> sdkFamilyOrder;
+ private List<String> sdkVersionOrder;
+
+ public InstallPackages(IService service, IRunnableContext runnableContext) {
+ Check.checkArg(service);
+ this.service = service;
if (runnableContext == null)
getPackageList();
else {
try {
runnableContext.run(true, false, new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- monitor.beginTask(Messages.getString("InstallPackages.GettingPackagesJobLabel"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$
+ public void run(IProgressMonitor monitor)
+ throws InvocationTargetException,
+ InterruptedException {
+ monitor.beginTask(
+ Messages.getString("InstallPackages.GettingPackagesJobLabel"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$
getPackageList();
}
});
@@ -88,7 +122,7 @@
}
}
}
-
+
private void getPackageList() {
try {
PackagesType packages = getAvailablePackagesFromServer();
@@ -97,22 +131,74 @@
packageList = new ArrayList<PackageType>(elist);
Collections.sort(packageList, new Comparator<PackageType>() {
public int compare(PackageType o1, PackageType o2) {
- return o1.getDisplayName().compareToIgnoreCase(o2.getDisplayName());
+ return o1.getDisplayName().compareToIgnoreCase(
+ o2.getDisplayName());
}
});
+ getSDKFamilyOrder(packages);
+ getSDKVersionOrder(packages);
}
} catch (Exception e) {
RemoteConnectionsActivator.logError(e);
if (e.getCause() instanceof ConnectTimeoutException)
- RemoteConnectionsActivator.logMessage(Messages.getString("InstallPackages.TimeoutMissingProxyMessage"), IStatus.INFO); //$NON-NLS-1$
+ RemoteConnectionsActivator
+ .logMessage(
+ Messages.getString("InstallPackages.TimeoutMissingProxyMessage"), IStatus.INFO); //$NON-NLS-1$
}
}
-
+
+ private void getSDKFamilyOrder(PackagesType packages) {
+ SDKFamilyType sdkFamily = packages.getSDKFamily();
+ if (sdkFamily != null) {
+ String order = sdkFamily.getOrder();
+ sdkFamilyOrder = Arrays.asList(order.split(ORDER_DELIM));
+ } else
+ sdkFamilyOrder = Collections.emptyList();
+ }
+
+ private void getSDKVersionOrder(PackagesType packages) {
+ SDKVersionType sdkVersion = packages.getSDKVersion();
+ if (sdkVersion != null) {
+ String order = sdkVersion.getOrder();
+ sdkVersionOrder = Arrays.asList(order.split(ORDER_DELIM));
+ } else
+ sdkVersionOrder = Collections.emptyList();
+ }
+
+ public Comparator<String> getSDKFamilyComparator() {
+ return getOrderListStringComparator(sdkFamilyOrder);
+ }
+
+ public Comparator<String> getSDKVersionComparator() {
+ if (sdkVersionOrder.isEmpty())
+ return Collections.reverseOrder(); // for backward compatibility
+ return getOrderListStringComparator(sdkVersionOrder);
+ }
+
+ private static Comparator<String> getOrderListStringComparator(
+ final List<String> orderList) {
+ return new Comparator<String>() {
+ public int compare(String o1, String o2) {
+ if (o1.equals(o2))
+ return 0;
+
+ for (String orderString : orderList) {
+ if (o1.equals(orderString))
+ return -1;
+ else if (o2.equals(orderString))
+ return 1;
+ }
+
+ return o1.compareTo(o2);
+ }
+ };
+ }
+
public List<PackageType> getAvailablePackageList() {
return packageList;
}
-
- private static PackagesType loadPackages(URL url) throws Exception {
+
+ private static PackagesType loadPackages(URL url) throws Exception {
if (url == null)
return null;
@@ -123,7 +209,7 @@
r.load(null);
EList<EObject> contents = r.getContents();
-
+
DocumentRoot root = (DocumentRoot) contents.get(0);
PackagesType packages = root.getPackages();
@@ -131,12 +217,13 @@
}
private PackagesType getAvailablePackagesFromServer() throws Exception {
- GetMethod getMethod = new GetMethod(getRelativePath(serverData.getMasterFileName()));
+ GetMethod getMethod = new GetMethod(getMasterFilePath());
HttpClient client = new HttpClient();
setProxyData(client, getMethod);
- client.getHttpConnectionManager().getParams().setConnectionTimeout(8000);
- int serverStatus = 0;
- byte[] responseBody;
+ client.getHttpConnectionManager().getParams()
+ .setConnectionTimeout(8000);
+ int serverStatus = 0;
+ byte[] responseBody;
try {
serverStatus = client.executeMethod(getMethod);
responseBody = getMethod.getResponseBody();
@@ -146,42 +233,42 @@
} finally {
getMethod.releaseConnection();
}
-
- // HTTP status codes: 2xx = Success
- if (serverStatus >= 200 && serverStatus < 300) {
- File tempDir = FileUtils.getTemporaryDirectory();
- IPath path = new Path(tempDir.getAbsolutePath());
- IPath masterFilePath = path.append(serverData.getMasterFileName());
- File masterFile = masterFilePath.toFile();
- if (masterFile.exists())
- masterFile.delete();
- FileOutputStream fos = new FileOutputStream(masterFile);
- BufferedOutputStream out = new BufferedOutputStream(fos);
- ByteArrayInputStream in = new ByteArrayInputStream(responseBody);
- boolean foundOpenBrace = false;
- int c;
- while ((c = in.read()) != -1) {
- if (c == '<')
- foundOpenBrace = true;
- if (foundOpenBrace)
- out.write(c);
- }
- out.close();
- in.close();
- URL url = masterFile.toURI().toURL();
- return loadPackages(url);
- }
-
- return null;
+
+ // HTTP status codes: 2xx = Success
+ if (serverStatus >= 200 && serverStatus < 300) {
+ File tempDir = FileUtils.getTemporaryDirectory();
+ IPath path = new Path(tempDir.getAbsolutePath());
+ IPath masterFilePath = path.append(getMasterFileName());
+ File masterFile = masterFilePath.toFile();
+ if (masterFile.exists())
+ masterFile.delete();
+ FileOutputStream fos = new FileOutputStream(masterFile);
+ BufferedOutputStream out = new BufferedOutputStream(fos);
+ ByteArrayInputStream in = new ByteArrayInputStream(responseBody);
+ boolean foundOpenBrace = false;
+ int c;
+ while ((c = in.read()) != -1) {
+ if (c == '<')
+ foundOpenBrace = true;
+ if (foundOpenBrace)
+ out.write(c);
+ }
+ out.close();
+ in.close();
+ URL url = masterFile.toURI().toURL();
+ return loadPackages(url);
+ }
+
+ return null;
}
-
+
private static java.net.URI getURI(GetMethod getMethod) {
try {
return new java.net.URI(getMethod.getURI().toString());
} catch (Exception e) {
RemoteConnectionsActivator.logError(e);
}
-
+
return null;
}
@@ -198,32 +285,31 @@
if (proxyData.isRequiresAuthentication()) {
String userId = proxyData.getUserId();
String password = proxyData.getPassword();
- UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(userId, password);
+ UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(
+ userId, password);
AuthScope authScope = new AuthScope(host, port);
client.getState().setCredentials(authScope, credentials);
getMethod.setDoAuthentication(true);
}
}
-
+
public String getInstallUrlString(String installFilePath) {
URL url;
try {
url = new URL(installFilePath);
} catch (MalformedURLException e) {
- return getRelativePath(installFilePath);
+ StringBuilder sb = new StringBuilder();
+ sb.append(getMasterFileParentPath());
+ sb.append('/');
+ sb.append(installFilePath);
+ return sb.toString();
}
return url.toString();
}
- private String getRelativePath(String installFilePath) {
- String path = getServerPath();
- return path + "/" + installFilePath; //$NON-NLS-1$
- }
-
- private String getServerPath() {
+ private String getMasterFilePath() {
if (serverPath != null)
return serverPath;
- // see if there's an alternate server, otherwise use IServerData
Location installLocation = Platform.getInstallLocation();
URL url = installLocation.getURL();
IPath path = new Path(url.getPath());
@@ -234,7 +320,7 @@
Properties properties = new Properties();
properties.load(is);
is.close();
- String key = serverData.getRemoteAgentInstallerProvider().getService().getIdentifier();
+ String key = service.getIdentifier();
String pathStr = (String) properties.get(key);
if (pathStr != null)
return serverPath = pathStr;
@@ -243,14 +329,16 @@
}
return ""; //$NON-NLS-1$
}
-
- public static String formatSDKVersion(Version v) {
- if (v.getMicro() != 0)
- return v.toString();
- StringBuffer sb = new StringBuffer();
- sb.append(v.getMajor());
- sb.append('.');
- sb.append(v.getMinor());
- return sb.toString();
+
+ private String getMasterFileParentPath() {
+ String path = getMasterFilePath();
+ int fileNameLoc = path.lastIndexOf('/');
+ return path.substring(0, fileNameLoc);
+ }
+
+ private String getMasterFileName() {
+ String path = getMasterFilePath();
+ int fileNameLoc = path.lastIndexOf('/');
+ return path.substring(fileNameLoc + 1);
}
}
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/InstallPackagesFactory.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/InstallPackagesFactory.java Wed Jul 21 12:11:48 2010 -0500
@@ -52,6 +52,24 @@
PackageType createPackageType();
/**
+ * Returns a new object of class '<em>SDK Family Type</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>SDK Family Type</em>'.
+ * @generated
+ */
+ SDKFamilyType createSDKFamilyType();
+
+ /**
+ * Returns a new object of class '<em>SDK Version Type</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>SDK Version Type</em>'.
+ * @generated
+ */
+ SDKVersionType createSDKVersionType();
+
+ /**
* Returns the package supported by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/InstallPackagesPackage.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/InstallPackagesPackage.java Wed Jul 21 12:11:48 2010 -0500
@@ -125,13 +125,31 @@
int PACKAGES_TYPE = 1;
/**
+ * The feature id for the '<em><b>SDK Family</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int PACKAGES_TYPE__SDK_FAMILY = 0;
+
+ /**
+ * The feature id for the '<em><b>SDK Version</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int PACKAGES_TYPE__SDK_VERSION = 1;
+
+ /**
* The feature id for the '<em><b>Package</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int PACKAGES_TYPE__PACKAGE = 0;
+ int PACKAGES_TYPE__PACKAGE = 2;
/**
* The number of structural features of the '<em>Packages Type</em>' class.
@@ -140,7 +158,7 @@
* @generated
* @ordered
*/
- int PACKAGES_TYPE_FEATURE_COUNT = 1;
+ int PACKAGES_TYPE_FEATURE_COUNT = 3;
/**
* The meta object id for the '{@link com.nokia.carbide.installpackages.gen.InstallPackages.impl.PackageTypeImpl <em>Package Type</em>}' class.
@@ -217,6 +235,63 @@
/**
+ * The meta object id for the '{@link com.nokia.carbide.installpackages.gen.InstallPackages.impl.SDKFamilyTypeImpl <em>SDK Family Type</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.impl.SDKFamilyTypeImpl
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.impl.InstallPackagesPackageImpl#getSDKFamilyType()
+ * @generated
+ */
+ int SDK_FAMILY_TYPE = 3;
+
+ /**
+ * The feature id for the '<em><b>Order</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int SDK_FAMILY_TYPE__ORDER = 0;
+
+ /**
+ * The number of structural features of the '<em>SDK Family Type</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int SDK_FAMILY_TYPE_FEATURE_COUNT = 1;
+
+ /**
+ * The meta object id for the '{@link com.nokia.carbide.installpackages.gen.InstallPackages.impl.SDKVersionTypeImpl <em>SDK Version Type</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.impl.SDKVersionTypeImpl
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.impl.InstallPackagesPackageImpl#getSDKVersionType()
+ * @generated
+ */
+ int SDK_VERSION_TYPE = 4;
+
+ /**
+ * The feature id for the '<em><b>Order</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int SDK_VERSION_TYPE__ORDER = 0;
+
+ /**
+ * The number of structural features of the '<em>SDK Version Type</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int SDK_VERSION_TYPE_FEATURE_COUNT = 1;
+
+
+ /**
* Returns the meta object for class '{@link com.nokia.carbide.installpackages.gen.InstallPackages.DocumentRoot <em>Document Root</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -281,6 +356,28 @@
EClass getPackagesType();
/**
+ * Returns the meta object for the containment reference '{@link com.nokia.carbide.installpackages.gen.InstallPackages.PackagesType#getSDKFamily <em>SDK Family</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference '<em>SDK Family</em>'.
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.PackagesType#getSDKFamily()
+ * @see #getPackagesType()
+ * @generated
+ */
+ EReference getPackagesType_SDKFamily();
+
+ /**
+ * Returns the meta object for the containment reference '{@link com.nokia.carbide.installpackages.gen.InstallPackages.PackagesType#getSDKVersion <em>SDK Version</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference '<em>SDK Version</em>'.
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.PackagesType#getSDKVersion()
+ * @see #getPackagesType()
+ * @generated
+ */
+ EReference getPackagesType_SDKVersion();
+
+ /**
* Returns the meta object for the containment reference list '{@link com.nokia.carbide.installpackages.gen.InstallPackages.PackagesType#getPackage <em>Package</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -368,6 +465,48 @@
EAttribute getPackageType_SdkVersion();
/**
+ * Returns the meta object for class '{@link com.nokia.carbide.installpackages.gen.InstallPackages.SDKFamilyType <em>SDK Family Type</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>SDK Family Type</em>'.
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.SDKFamilyType
+ * @generated
+ */
+ EClass getSDKFamilyType();
+
+ /**
+ * Returns the meta object for the attribute '{@link com.nokia.carbide.installpackages.gen.InstallPackages.SDKFamilyType#getOrder <em>Order</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Order</em>'.
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.SDKFamilyType#getOrder()
+ * @see #getSDKFamilyType()
+ * @generated
+ */
+ EAttribute getSDKFamilyType_Order();
+
+ /**
+ * Returns the meta object for class '{@link com.nokia.carbide.installpackages.gen.InstallPackages.SDKVersionType <em>SDK Version Type</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>SDK Version Type</em>'.
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.SDKVersionType
+ * @generated
+ */
+ EClass getSDKVersionType();
+
+ /**
+ * Returns the meta object for the attribute '{@link com.nokia.carbide.installpackages.gen.InstallPackages.SDKVersionType#getOrder <em>Order</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Order</em>'.
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.SDKVersionType#getOrder()
+ * @see #getSDKVersionType()
+ * @generated
+ */
+ EAttribute getSDKVersionType_Order();
+
+ /**
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -442,6 +581,22 @@
EClass PACKAGES_TYPE = eINSTANCE.getPackagesType();
/**
+ * The meta object literal for the '<em><b>SDK Family</b></em>' containment reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference PACKAGES_TYPE__SDK_FAMILY = eINSTANCE.getPackagesType_SDKFamily();
+
+ /**
+ * The meta object literal for the '<em><b>SDK Version</b></em>' containment reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference PACKAGES_TYPE__SDK_VERSION = eINSTANCE.getPackagesType_SDKVersion();
+
+ /**
* The meta object literal for the '<em><b>Package</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -507,6 +662,42 @@
*/
EAttribute PACKAGE_TYPE__SDK_VERSION = eINSTANCE.getPackageType_SdkVersion();
+ /**
+ * The meta object literal for the '{@link com.nokia.carbide.installpackages.gen.InstallPackages.impl.SDKFamilyTypeImpl <em>SDK Family Type</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.impl.SDKFamilyTypeImpl
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.impl.InstallPackagesPackageImpl#getSDKFamilyType()
+ * @generated
+ */
+ EClass SDK_FAMILY_TYPE = eINSTANCE.getSDKFamilyType();
+
+ /**
+ * The meta object literal for the '<em><b>Order</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute SDK_FAMILY_TYPE__ORDER = eINSTANCE.getSDKFamilyType_Order();
+
+ /**
+ * The meta object literal for the '{@link com.nokia.carbide.installpackages.gen.InstallPackages.impl.SDKVersionTypeImpl <em>SDK Version Type</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.impl.SDKVersionTypeImpl
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.impl.InstallPackagesPackageImpl#getSDKVersionType()
+ * @generated
+ */
+ EClass SDK_VERSION_TYPE = eINSTANCE.getSDKVersionType();
+
+ /**
+ * The meta object literal for the '<em><b>Order</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute SDK_VERSION_TYPE__ORDER = eINSTANCE.getSDKVersionType_Order();
+
}
} //InstallPackagesPackage
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/PackagesType.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/PackagesType.java Wed Jul 21 12:11:48 2010 -0500
@@ -17,6 +17,8 @@
* <p>
* The following features are supported:
* <ul>
+ * <li>{@link com.nokia.carbide.installpackages.gen.InstallPackages.PackagesType#getSDKFamily <em>SDK Family</em>}</li>
+ * <li>{@link com.nokia.carbide.installpackages.gen.InstallPackages.PackagesType#getSDKVersion <em>SDK Version</em>}</li>
* <li>{@link com.nokia.carbide.installpackages.gen.InstallPackages.PackagesType#getPackage <em>Package</em>}</li>
* </ul>
* </p>
@@ -27,6 +29,60 @@
*/
public interface PackagesType extends EObject {
/**
+ * Returns the value of the '<em><b>SDK Family</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>SDK Family</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>SDK Family</em>' containment reference.
+ * @see #setSDKFamily(SDKFamilyType)
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.InstallPackagesPackage#getPackagesType_SDKFamily()
+ * @model containment="true"
+ * extendedMetaData="kind='element' name='SDKFamily' namespace='##targetNamespace'"
+ * @generated
+ */
+ SDKFamilyType getSDKFamily();
+
+ /**
+ * Sets the value of the '{@link com.nokia.carbide.installpackages.gen.InstallPackages.PackagesType#getSDKFamily <em>SDK Family</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>SDK Family</em>' containment reference.
+ * @see #getSDKFamily()
+ * @generated
+ */
+ void setSDKFamily(SDKFamilyType value);
+
+ /**
+ * Returns the value of the '<em><b>SDK Version</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>SDK Version</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>SDK Version</em>' containment reference.
+ * @see #setSDKVersion(SDKVersionType)
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.InstallPackagesPackage#getPackagesType_SDKVersion()
+ * @model containment="true"
+ * extendedMetaData="kind='element' name='SDKVersion' namespace='##targetNamespace'"
+ * @generated
+ */
+ SDKVersionType getSDKVersion();
+
+ /**
+ * Sets the value of the '{@link com.nokia.carbide.installpackages.gen.InstallPackages.PackagesType#getSDKVersion <em>SDK Version</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>SDK Version</em>' containment reference.
+ * @see #getSDKVersion()
+ * @generated
+ */
+ void setSDKVersion(SDKVersionType value);
+
+ /**
* Returns the value of the '<em><b>Package</b></em>' containment reference list.
* The list contents are of type {@link com.nokia.carbide.installpackages.gen.InstallPackages.PackageType}.
* <!-- begin-user-doc -->
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/SDKFamilyType.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,55 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package com.nokia.carbide.installpackages.gen.InstallPackages;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>SDK Family Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link com.nokia.carbide.installpackages.gen.InstallPackages.SDKFamilyType#getOrder <em>Order</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.InstallPackagesPackage#getSDKFamilyType()
+ * @model extendedMetaData="name='SDKFamily_._type' kind='empty'"
+ * @generated
+ */
+public interface SDKFamilyType extends EObject {
+ /**
+ * Returns the value of the '<em><b>Order</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Order</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Order</em>' attribute.
+ * @see #setOrder(String)
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.InstallPackagesPackage#getSDKFamilyType_Order()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * extendedMetaData="kind='attribute' name='order' namespace='##targetNamespace'"
+ * @generated
+ */
+ String getOrder();
+
+ /**
+ * Sets the value of the '{@link com.nokia.carbide.installpackages.gen.InstallPackages.SDKFamilyType#getOrder <em>Order</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Order</em>' attribute.
+ * @see #getOrder()
+ * @generated
+ */
+ void setOrder(String value);
+
+} // SDKFamilyType
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/SDKVersionType.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,55 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package com.nokia.carbide.installpackages.gen.InstallPackages;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>SDK Version Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link com.nokia.carbide.installpackages.gen.InstallPackages.SDKVersionType#getOrder <em>Order</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.InstallPackagesPackage#getSDKVersionType()
+ * @model extendedMetaData="name='SDKVersion_._type' kind='empty'"
+ * @generated
+ */
+public interface SDKVersionType extends EObject {
+ /**
+ * Returns the value of the '<em><b>Order</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Order</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Order</em>' attribute.
+ * @see #setOrder(String)
+ * @see com.nokia.carbide.installpackages.gen.InstallPackages.InstallPackagesPackage#getSDKVersionType_Order()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * extendedMetaData="kind='attribute' name='order' namespace='##targetNamespace'"
+ * @generated
+ */
+ String getOrder();
+
+ /**
+ * Sets the value of the '{@link com.nokia.carbide.installpackages.gen.InstallPackages.SDKVersionType#getOrder <em>Order</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Order</em>' attribute.
+ * @see #getOrder()
+ * @generated
+ */
+ void setOrder(String value);
+
+} // SDKVersionType
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/impl/DocumentRootImpl.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/impl/DocumentRootImpl.java Wed Jul 21 12:11:48 2010 -0500
@@ -9,6 +9,8 @@
import com.nokia.carbide.installpackages.gen.InstallPackages.InstallPackagesPackage;
import com.nokia.carbide.installpackages.gen.InstallPackages.PackagesType;
+import com.nokia.carbide.installpackages.gen.InstallPackages.SDKFamilyType;
+import com.nokia.carbide.installpackages.gen.InstallPackages.SDKVersionType;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EMap;
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/impl/InstallPackagesFactoryImpl.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/impl/InstallPackagesFactoryImpl.java Wed Jul 21 12:11:48 2010 -0500
@@ -62,6 +62,8 @@
case InstallPackagesPackage.DOCUMENT_ROOT: return createDocumentRoot();
case InstallPackagesPackage.PACKAGES_TYPE: return createPackagesType();
case InstallPackagesPackage.PACKAGE_TYPE: return createPackageType();
+ case InstallPackagesPackage.SDK_FAMILY_TYPE: return createSDKFamilyType();
+ case InstallPackagesPackage.SDK_VERSION_TYPE: return createSDKVersionType();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -102,6 +104,26 @@
* <!-- end-user-doc -->
* @generated
*/
+ public SDKFamilyType createSDKFamilyType() {
+ SDKFamilyTypeImpl sdkFamilyType = new SDKFamilyTypeImpl();
+ return sdkFamilyType;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public SDKVersionType createSDKVersionType() {
+ SDKVersionTypeImpl sdkVersionType = new SDKVersionTypeImpl();
+ return sdkVersionType;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public InstallPackagesPackage getInstallPackagesPackage() {
return (InstallPackagesPackage)getEPackage();
}
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/impl/InstallPackagesPackageImpl.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/impl/InstallPackagesPackageImpl.java Wed Jul 21 12:11:48 2010 -0500
@@ -11,6 +11,8 @@
import com.nokia.carbide.installpackages.gen.InstallPackages.PackageType;
import com.nokia.carbide.installpackages.gen.InstallPackages.PackagesType;
+import com.nokia.carbide.installpackages.gen.InstallPackages.SDKFamilyType;
+import com.nokia.carbide.installpackages.gen.InstallPackages.SDKVersionType;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
@@ -49,6 +51,20 @@
private EClass packageTypeEClass = null;
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass sdkFamilyTypeEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass sdkVersionTypeEClass = null;
+
+ /**
* Creates an instance of the model <b>Package</b>, registered with
* {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
* package URI value.
@@ -75,20 +91,10 @@
private static boolean isInited = false;
/**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
+ * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+ *
+ * <p>This method is used to initialize {@link InstallPackagesPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #eNS_URI
@@ -100,7 +106,7 @@
if (isInited) return (InstallPackagesPackage)EPackage.Registry.INSTANCE.getEPackage(InstallPackagesPackage.eNS_URI);
// Obtain or create and register package
- InstallPackagesPackageImpl theInstallPackagesPackage = (InstallPackagesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof InstallPackagesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new InstallPackagesPackageImpl());
+ InstallPackagesPackageImpl theInstallPackagesPackage = (InstallPackagesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InstallPackagesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InstallPackagesPackageImpl());
isInited = true;
@@ -116,6 +122,9 @@
// Mark meta-data to indicate it can't be changed
theInstallPackagesPackage.freeze();
+
+ // Update the registry and return the package
+ EPackage.Registry.INSTANCE.put(InstallPackagesPackage.eNS_URI, theInstallPackagesPackage);
return theInstallPackagesPackage;
}
@@ -178,8 +187,26 @@
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getPackagesType_SDKFamily() {
+ return (EReference)packagesTypeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getPackagesType_SDKVersion() {
+ return (EReference)packagesTypeEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EReference getPackagesType_Package() {
- return (EReference)packagesTypeEClass.getEStructuralFeatures().get(0);
+ return (EReference)packagesTypeEClass.getEStructuralFeatures().get(2);
}
/**
@@ -250,6 +277,42 @@
* <!-- end-user-doc -->
* @generated
*/
+ public EClass getSDKFamilyType() {
+ return sdkFamilyTypeEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getSDKFamilyType_Order() {
+ return (EAttribute)sdkFamilyTypeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getSDKVersionType() {
+ return sdkVersionTypeEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getSDKVersionType_Order() {
+ return (EAttribute)sdkVersionTypeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public InstallPackagesFactory getInstallPackagesFactory() {
return (InstallPackagesFactory)getEFactoryInstance();
}
@@ -280,6 +343,8 @@
createEReference(documentRootEClass, DOCUMENT_ROOT__PACKAGES);
packagesTypeEClass = createEClass(PACKAGES_TYPE);
+ createEReference(packagesTypeEClass, PACKAGES_TYPE__SDK_FAMILY);
+ createEReference(packagesTypeEClass, PACKAGES_TYPE__SDK_VERSION);
createEReference(packagesTypeEClass, PACKAGES_TYPE__PACKAGE);
packageTypeEClass = createEClass(PACKAGE_TYPE);
@@ -289,6 +354,12 @@
createEAttribute(packageTypeEClass, PACKAGE_TYPE__PACKAGE_VERSION);
createEAttribute(packageTypeEClass, PACKAGE_TYPE__SDK_FAMILY);
createEAttribute(packageTypeEClass, PACKAGE_TYPE__SDK_VERSION);
+
+ sdkFamilyTypeEClass = createEClass(SDK_FAMILY_TYPE);
+ createEAttribute(sdkFamilyTypeEClass, SDK_FAMILY_TYPE__ORDER);
+
+ sdkVersionTypeEClass = createEClass(SDK_VERSION_TYPE);
+ createEAttribute(sdkVersionTypeEClass, SDK_VERSION_TYPE__ORDER);
}
/**
@@ -331,6 +402,8 @@
initEReference(getDocumentRoot_Packages(), this.getPackagesType(), null, "packages", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEClass(packagesTypeEClass, PackagesType.class, "PackagesType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getPackagesType_SDKFamily(), this.getSDKFamilyType(), null, "sDKFamily", null, 0, 1, PackagesType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getPackagesType_SDKVersion(), this.getSDKVersionType(), null, "sDKVersion", null, 0, 1, PackagesType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getPackagesType_Package(), this.getPackageType(), null, "package", null, 0, -1, PackagesType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(packageTypeEClass, PackageType.class, "PackageType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -341,6 +414,12 @@
initEAttribute(getPackageType_SdkFamily(), theXMLTypePackage.getString(), "sdkFamily", null, 1, 1, PackageType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getPackageType_SdkVersion(), theXMLTypePackage.getString(), "sdkVersion", null, 1, 1, PackageType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(sdkFamilyTypeEClass, SDKFamilyType.class, "SDKFamilyType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getSDKFamilyType_Order(), theXMLTypePackage.getString(), "order", null, 1, 1, SDKFamilyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(sdkVersionTypeEClass, SDKVersionType.class, "SDKVersionType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getSDKVersionType_Order(), theXMLTypePackage.getString(), "order", null, 1, 1, SDKVersionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
// Create resource
createResource(eNS_URI);
@@ -407,6 +486,22 @@
"kind", "elementOnly"
});
addAnnotation
+ (getPackagesType_SDKFamily(),
+ source,
+ new String[] {
+ "kind", "element",
+ "name", "SDKFamily",
+ "namespace", "##targetNamespace"
+ });
+ addAnnotation
+ (getPackagesType_SDKVersion(),
+ source,
+ new String[] {
+ "kind", "element",
+ "name", "SDKVersion",
+ "namespace", "##targetNamespace"
+ });
+ addAnnotation
(getPackagesType_Package(),
source,
new String[] {
@@ -468,6 +563,36 @@
"kind", "attribute",
"name", "sdkVersion",
"namespace", "##targetNamespace"
+ });
+ addAnnotation
+ (sdkFamilyTypeEClass,
+ source,
+ new String[] {
+ "name", "SDKFamily_._type",
+ "kind", "empty"
+ });
+ addAnnotation
+ (getSDKFamilyType_Order(),
+ source,
+ new String[] {
+ "kind", "attribute",
+ "name", "order",
+ "namespace", "##targetNamespace"
+ });
+ addAnnotation
+ (sdkVersionTypeEClass,
+ source,
+ new String[] {
+ "name", "SDKVersion_._type",
+ "kind", "empty"
+ });
+ addAnnotation
+ (getSDKVersionType_Order(),
+ source,
+ new String[] {
+ "kind", "attribute",
+ "name", "order",
+ "namespace", "##targetNamespace"
});
}
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/impl/PackagesTypeImpl.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/impl/PackagesTypeImpl.java Wed Jul 21 12:11:48 2010 -0500
@@ -9,8 +9,11 @@
import com.nokia.carbide.installpackages.gen.InstallPackages.PackageType;
import com.nokia.carbide.installpackages.gen.InstallPackages.PackagesType;
+import com.nokia.carbide.installpackages.gen.InstallPackages.SDKFamilyType;
+import com.nokia.carbide.installpackages.gen.InstallPackages.SDKVersionType;
import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -18,6 +21,7 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
@@ -30,6 +34,8 @@
* <p>
* The following features are implemented:
* <ul>
+ * <li>{@link com.nokia.carbide.installpackages.gen.InstallPackages.impl.PackagesTypeImpl#getSDKFamily <em>SDK Family</em>}</li>
+ * <li>{@link com.nokia.carbide.installpackages.gen.InstallPackages.impl.PackagesTypeImpl#getSDKVersion <em>SDK Version</em>}</li>
* <li>{@link com.nokia.carbide.installpackages.gen.InstallPackages.impl.PackagesTypeImpl#getPackage <em>Package</em>}</li>
* </ul>
* </p>
@@ -38,6 +44,24 @@
*/
public class PackagesTypeImpl extends EObjectImpl implements PackagesType {
/**
+ * The cached value of the '{@link #getSDKFamily() <em>SDK Family</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSDKFamily()
+ * @generated
+ * @ordered
+ */
+ protected SDKFamilyType sDKFamily;
+ /**
+ * The cached value of the '{@link #getSDKVersion() <em>SDK Version</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSDKVersion()
+ * @generated
+ * @ordered
+ */
+ protected SDKVersionType sDKVersion;
+ /**
* The cached value of the '{@link #getPackage() <em>Package</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -71,6 +95,92 @@
* <!-- end-user-doc -->
* @generated
*/
+ public SDKFamilyType getSDKFamily() {
+ return sDKFamily;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetSDKFamily(SDKFamilyType newSDKFamily, NotificationChain msgs) {
+ SDKFamilyType oldSDKFamily = sDKFamily;
+ sDKFamily = newSDKFamily;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstallPackagesPackage.PACKAGES_TYPE__SDK_FAMILY, oldSDKFamily, newSDKFamily);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setSDKFamily(SDKFamilyType newSDKFamily) {
+ if (newSDKFamily != sDKFamily) {
+ NotificationChain msgs = null;
+ if (sDKFamily != null)
+ msgs = ((InternalEObject)sDKFamily).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstallPackagesPackage.PACKAGES_TYPE__SDK_FAMILY, null, msgs);
+ if (newSDKFamily != null)
+ msgs = ((InternalEObject)newSDKFamily).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstallPackagesPackage.PACKAGES_TYPE__SDK_FAMILY, null, msgs);
+ msgs = basicSetSDKFamily(newSDKFamily, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, InstallPackagesPackage.PACKAGES_TYPE__SDK_FAMILY, newSDKFamily, newSDKFamily));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public SDKVersionType getSDKVersion() {
+ return sDKVersion;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetSDKVersion(SDKVersionType newSDKVersion, NotificationChain msgs) {
+ SDKVersionType oldSDKVersion = sDKVersion;
+ sDKVersion = newSDKVersion;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstallPackagesPackage.PACKAGES_TYPE__SDK_VERSION, oldSDKVersion, newSDKVersion);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setSDKVersion(SDKVersionType newSDKVersion) {
+ if (newSDKVersion != sDKVersion) {
+ NotificationChain msgs = null;
+ if (sDKVersion != null)
+ msgs = ((InternalEObject)sDKVersion).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstallPackagesPackage.PACKAGES_TYPE__SDK_VERSION, null, msgs);
+ if (newSDKVersion != null)
+ msgs = ((InternalEObject)newSDKVersion).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstallPackagesPackage.PACKAGES_TYPE__SDK_VERSION, null, msgs);
+ msgs = basicSetSDKVersion(newSDKVersion, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, InstallPackagesPackage.PACKAGES_TYPE__SDK_VERSION, newSDKVersion, newSDKVersion));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EList<PackageType> getPackage() {
if (package_ == null) {
package_ = new EObjectContainmentEList<PackageType>(PackageType.class, this, InstallPackagesPackage.PACKAGES_TYPE__PACKAGE);
@@ -86,6 +196,10 @@
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
+ case InstallPackagesPackage.PACKAGES_TYPE__SDK_FAMILY:
+ return basicSetSDKFamily(null, msgs);
+ case InstallPackagesPackage.PACKAGES_TYPE__SDK_VERSION:
+ return basicSetSDKVersion(null, msgs);
case InstallPackagesPackage.PACKAGES_TYPE__PACKAGE:
return ((InternalEList<?>)getPackage()).basicRemove(otherEnd, msgs);
}
@@ -100,6 +214,10 @@
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
+ case InstallPackagesPackage.PACKAGES_TYPE__SDK_FAMILY:
+ return getSDKFamily();
+ case InstallPackagesPackage.PACKAGES_TYPE__SDK_VERSION:
+ return getSDKVersion();
case InstallPackagesPackage.PACKAGES_TYPE__PACKAGE:
return getPackage();
}
@@ -115,6 +233,12 @@
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
+ case InstallPackagesPackage.PACKAGES_TYPE__SDK_FAMILY:
+ setSDKFamily((SDKFamilyType)newValue);
+ return;
+ case InstallPackagesPackage.PACKAGES_TYPE__SDK_VERSION:
+ setSDKVersion((SDKVersionType)newValue);
+ return;
case InstallPackagesPackage.PACKAGES_TYPE__PACKAGE:
getPackage().clear();
getPackage().addAll((Collection<? extends PackageType>)newValue);
@@ -131,6 +255,12 @@
@Override
public void eUnset(int featureID) {
switch (featureID) {
+ case InstallPackagesPackage.PACKAGES_TYPE__SDK_FAMILY:
+ setSDKFamily((SDKFamilyType)null);
+ return;
+ case InstallPackagesPackage.PACKAGES_TYPE__SDK_VERSION:
+ setSDKVersion((SDKVersionType)null);
+ return;
case InstallPackagesPackage.PACKAGES_TYPE__PACKAGE:
getPackage().clear();
return;
@@ -146,6 +276,10 @@
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
+ case InstallPackagesPackage.PACKAGES_TYPE__SDK_FAMILY:
+ return sDKFamily != null;
+ case InstallPackagesPackage.PACKAGES_TYPE__SDK_VERSION:
+ return sDKVersion != null;
case InstallPackagesPackage.PACKAGES_TYPE__PACKAGE:
return package_ != null && !package_.isEmpty();
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/impl/SDKFamilyTypeImpl.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,167 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package com.nokia.carbide.installpackages.gen.InstallPackages.impl;
+
+import com.nokia.carbide.installpackages.gen.InstallPackages.InstallPackagesPackage;
+import com.nokia.carbide.installpackages.gen.InstallPackages.SDKFamilyType;
+
+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>SDK Family Type</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link com.nokia.carbide.installpackages.gen.InstallPackages.impl.SDKFamilyTypeImpl#getOrder <em>Order</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class SDKFamilyTypeImpl extends EObjectImpl implements SDKFamilyType {
+ /**
+ * The default value of the '{@link #getOrder() <em>Order</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getOrder()
+ * @generated
+ * @ordered
+ */
+ protected static final String ORDER_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getOrder() <em>Order</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getOrder()
+ * @generated
+ * @ordered
+ */
+ protected String order = ORDER_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected SDKFamilyTypeImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return InstallPackagesPackage.Literals.SDK_FAMILY_TYPE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getOrder() {
+ return order;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setOrder(String newOrder) {
+ String oldOrder = order;
+ order = newOrder;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, InstallPackagesPackage.SDK_FAMILY_TYPE__ORDER, oldOrder, order));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case InstallPackagesPackage.SDK_FAMILY_TYPE__ORDER:
+ return getOrder();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case InstallPackagesPackage.SDK_FAMILY_TYPE__ORDER:
+ setOrder((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case InstallPackagesPackage.SDK_FAMILY_TYPE__ORDER:
+ setOrder(ORDER_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case InstallPackagesPackage.SDK_FAMILY_TYPE__ORDER:
+ return ORDER_EDEFAULT == null ? order != null : !ORDER_EDEFAULT.equals(order);
+ }
+ 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(" (order: ");
+ result.append(order);
+ result.append(')');
+ return result.toString();
+ }
+
+} //SDKFamilyTypeImpl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/impl/SDKVersionTypeImpl.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,167 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package com.nokia.carbide.installpackages.gen.InstallPackages.impl;
+
+import com.nokia.carbide.installpackages.gen.InstallPackages.InstallPackagesPackage;
+import com.nokia.carbide.installpackages.gen.InstallPackages.SDKVersionType;
+
+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>SDK Version Type</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link com.nokia.carbide.installpackages.gen.InstallPackages.impl.SDKVersionTypeImpl#getOrder <em>Order</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class SDKVersionTypeImpl extends EObjectImpl implements SDKVersionType {
+ /**
+ * The default value of the '{@link #getOrder() <em>Order</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getOrder()
+ * @generated
+ * @ordered
+ */
+ protected static final String ORDER_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getOrder() <em>Order</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getOrder()
+ * @generated
+ * @ordered
+ */
+ protected String order = ORDER_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected SDKVersionTypeImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return InstallPackagesPackage.Literals.SDK_VERSION_TYPE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getOrder() {
+ return order;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setOrder(String newOrder) {
+ String oldOrder = order;
+ order = newOrder;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, InstallPackagesPackage.SDK_VERSION_TYPE__ORDER, oldOrder, order));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case InstallPackagesPackage.SDK_VERSION_TYPE__ORDER:
+ return getOrder();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case InstallPackagesPackage.SDK_VERSION_TYPE__ORDER:
+ setOrder((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case InstallPackagesPackage.SDK_VERSION_TYPE__ORDER:
+ setOrder(ORDER_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case InstallPackagesPackage.SDK_VERSION_TYPE__ORDER:
+ return ORDER_EDEFAULT == null ? order != null : !ORDER_EDEFAULT.equals(order);
+ }
+ 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(" (order: ");
+ result.append(order);
+ result.append(')');
+ return result.toString();
+ }
+
+} //SDKVersionTypeImpl
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/util/InstallPackagesAdapterFactory.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/util/InstallPackagesAdapterFactory.java Wed Jul 21 12:11:48 2010 -0500
@@ -83,6 +83,14 @@
return createPackageTypeAdapter();
}
@Override
+ public Adapter caseSDKFamilyType(SDKFamilyType object) {
+ return createSDKFamilyTypeAdapter();
+ }
+ @Override
+ public Adapter caseSDKVersionType(SDKVersionType object) {
+ return createSDKVersionTypeAdapter();
+ }
+ @Override
public Adapter defaultCase(EObject object) {
return createEObjectAdapter();
}
@@ -145,6 +153,34 @@
}
/**
+ * Creates a new adapter for an object of class '{@link com.nokia.carbide.installpackages.gen.InstallPackages.SDKFamilyType <em>SDK Family 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.installpackages.gen.InstallPackages.SDKFamilyType
+ * @generated
+ */
+ public Adapter createSDKFamilyTypeAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link com.nokia.carbide.installpackages.gen.InstallPackages.SDKVersionType <em>SDK Version 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.installpackages.gen.InstallPackages.SDKVersionType
+ * @generated
+ */
+ public Adapter createSDKVersionTypeAdapter() {
+ return null;
+ }
+
+ /**
* Creates a new adapter for the default case.
* <!-- begin-user-doc -->
* This default implementation returns null.
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/util/InstallPackagesSwitch.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/gen/InstallPackages/util/InstallPackagesSwitch.java Wed Jul 21 12:11:48 2010 -0500
@@ -104,6 +104,18 @@
if (result == null) result = defaultCase(theEObject);
return result;
}
+ case InstallPackagesPackage.SDK_FAMILY_TYPE: {
+ SDKFamilyType sdkFamilyType = (SDKFamilyType)theEObject;
+ T result = caseSDKFamilyType(sdkFamilyType);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case InstallPackagesPackage.SDK_VERSION_TYPE: {
+ SDKVersionType sdkVersionType = (SDKVersionType)theEObject;
+ T result = caseSDKVersionType(sdkVersionType);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
default: return defaultCase(theEObject);
}
}
@@ -154,6 +166,36 @@
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>SDK Family 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>SDK Family Type</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseSDKFamilyType(SDKFamilyType object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>SDK Version 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>SDK Version Type</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseSDKVersionType(SDKVersionType object) {
+ return null;
+ }
+
+ /**
* Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/RemoteConnectionsActivator.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/RemoteConnectionsActivator.java Wed Jul 21 12:11:48 2010 -0500
@@ -18,6 +18,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -27,6 +28,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IFilter;
import org.eclipse.swt.widgets.Control;
@@ -40,11 +42,12 @@
import com.nokia.carbide.remoteconnections.interfaces.IConnectionTypeProvider;
import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager;
import com.nokia.carbide.remoteconnections.internal.api.IDeviceDiscoveryAgent;
+import com.nokia.carbide.remoteconnections.internal.api.IDeviceDiscoveryAgent.IPrerequisiteStatus;
import com.nokia.carbide.remoteconnections.internal.api.IStatusDisplay;
-import com.nokia.carbide.remoteconnections.internal.api.IDeviceDiscoveryAgent.IPrerequisiteStatus;
import com.nokia.carbide.remoteconnections.internal.registry.Registry;
import com.nokia.carbide.remoteconnections.internal.ui.DeviceDiscoveryPrequisiteErrorDialog;
import com.nokia.carbide.remoteconnections.internal.ui.StatusDisplay;
+import com.nokia.cpp.internal.api.utils.core.ListenerList;
import com.nokia.cpp.internal.api.utils.core.Logging;
import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
@@ -85,6 +88,10 @@
runnable.run();
}
}
+
+ public interface IDiscoveryAgentsLoadedListener {
+ void agentsAreLoaded();
+ }
// The plug-in ID
public static final String PLUGIN_ID = "com.nokia.carbide.remoteConnections"; //$NON-NLS-1$
@@ -95,13 +102,16 @@
private static RemoteConnectionsActivator plugin;
private Collection<IDeviceDiscoveryAgent> discoveryAgents;
+ private ListenerList<IDiscoveryAgentsLoadedListener> listeners;
private static final String IGNORE_AGENT_LOAD_ERRORS_KEY = "ignoreAgentLoadErrors"; //$NON-NLS-1$
+ private static final String AGENT_STATE_KEY_PREFIX = "agentState."; //$NON-NLS-1$
/**
* The constructor
*/
public RemoteConnectionsActivator() {
+ listeners = new ListenerList<IDiscoveryAgentsLoadedListener>();
}
public void start(BundleContext context) throws Exception {
@@ -176,6 +186,28 @@
logError(e);
}
}
+
+ private void storeAgentRunningStates() {
+ IPreferenceStore preferenceStore = getPreferenceStore();
+ for (IDeviceDiscoveryAgent agent : discoveryAgents) {
+ String agentKey = AGENT_STATE_KEY_PREFIX + agent.getId();
+ if (!preferenceStore.contains(agentKey))
+ preferenceStore.setDefault(agentKey, true);
+ preferenceStore.setValue(agentKey, agent.isRunning());
+ }
+ try {
+ new InstanceScope().getNode(PLUGIN_ID).flush();
+ } catch (BackingStoreException e) {
+ logError(e);
+ }
+ }
+
+ private boolean getStoredAgentRunningState(IDeviceDiscoveryAgent agent) {
+ String agentKey = AGENT_STATE_KEY_PREFIX + agent.getId();
+ if (!getPreferenceStore().contains(agentKey))
+ return true;
+ return getPreferenceStore().getBoolean(agentKey);
+ }
/**
* Returns the shared instance
@@ -232,7 +264,9 @@
public boolean select(Object toTest) {
if (toTest instanceof IDeviceDiscoveryAgent) {
try {
- ((IDeviceDiscoveryAgent) toTest).start();
+ IDeviceDiscoveryAgent discoveryAgent = (IDeviceDiscoveryAgent) toTest;
+ if (getStoredAgentRunningState(discoveryAgent))
+ discoveryAgent.start();
return true;
} catch (Throwable e) {
// since we launch arbitrary code, catch any exception to prevent killing the view
@@ -242,13 +276,15 @@
return false;
}
});
-
+ fireDiscoveryAgentsLoaded();
}
private void stopDeviceDiscoveryAgents() {
+ storeAgentRunningStates();
for (IDeviceDiscoveryAgent agent : discoveryAgents) {
try {
- agent.stop();
+ if (agent.isRunning())
+ agent.stop();
} catch (CoreException e) {
logError(e);
}
@@ -287,4 +323,24 @@
public static IStatusDisplay getStatusDisplay() {
return new StatusDisplay();
}
+
+ public Collection<IDeviceDiscoveryAgent> getDiscoveryAgents() {
+ if (discoveryAgents != null)
+ return Collections.unmodifiableCollection(discoveryAgents);
+ return Collections.emptySet();
+ }
+
+ public void addDiscoveryAgentsLoadedListener(IDiscoveryAgentsLoadedListener listener) {
+ listeners.add(listener);
+ }
+
+ public void removeDiscoveryAgentsLoadedListener(IDiscoveryAgentsLoadedListener listener) {
+ listeners.remove(listener);
+ }
+
+ private void fireDiscoveryAgentsLoaded() {
+ for (IDiscoveryAgentsLoadedListener listener : listeners) {
+ listener.agentsAreLoaded();
+ }
+ }
}
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService2.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService2.java Wed Jul 21 12:11:48 2010 -0500
@@ -26,6 +26,7 @@
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Display;
+import org.osgi.framework.Version;
import com.nokia.carbide.remoteconnections.Messages;
import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
@@ -220,4 +221,8 @@
currentStatus = new Status();
currentStatus.setEStatus(status.internalGetEStatus(), status.getShortDescription(), status.getLongDescription());
}
+
+ public void setDeviceOS(String familyName, Version version) {
+ // @deprecated
+ }
}
\ No newline at end of file
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractPackageInstallerProvider.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractPackageInstallerProvider.java Wed Jul 21 12:11:48 2010 -0500
@@ -16,27 +16,36 @@
*/
package com.nokia.carbide.remoteconnections.interfaces;
-import com.nokia.carbide.installpackages.InstallPackages;
-import com.nokia.carbide.installpackages.InstallPackages.IServerData;
-import com.nokia.carbide.installpackages.gen.InstallPackages.PackageType;
-import com.nokia.carbide.remoteconnections.Messages;
-import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
-import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.GetMethod;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.osgi.framework.Version;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import com.nokia.carbide.installpackages.InstallPackages;
+import com.nokia.carbide.installpackages.InstallPackages.IServerData;
+import com.nokia.carbide.installpackages.gen.InstallPackages.PackageType;
+import com.nokia.carbide.remoteconnections.Messages;
+import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
+@SuppressWarnings("deprecation")
public abstract class AbstractPackageInstallerProvider implements IRemoteAgentInstallerProvider {
public class PackageTypeInstaller implements IRemoteAgentInstaller {
@@ -165,11 +174,14 @@
private List<PackageType> packageList;
private Map<ImageDescriptor, Image> imageCache;
+ /**
+ * @deprecated
+ */
protected abstract IServerData getServerData();
public List<String> getSDKFamilyNames(IRunnableContext runnableContext) {
if (packages == null)
- packages = new InstallPackages(getServerData(), runnableContext);
+ packages = new InstallPackages(getService(), runnableContext);
Set<String> sdkFamilyNames = new HashSet<String>();
packageList = packages.getAvailablePackageList();
if (packageList == null)
@@ -179,30 +191,28 @@
sdkFamilyNames.add(sdkFamily);
}
List<String> sdkFamilyNameList = new ArrayList<String>(sdkFamilyNames);
- Collections.sort(sdkFamilyNameList);
+ Collections.sort(sdkFamilyNameList, packages.getSDKFamilyComparator());
return sdkFamilyNameList;
}
- @SuppressWarnings("unchecked")
- public List<Version> getVersions(String familyName) {
- Set<Version> versions = new HashSet<Version>();
+ public List<String> getVersions(String familyName) {
+ Set<String> versions = new HashSet<String>();
for (PackageType packageType : packageList) {
if (packageType.getSdkFamily().equals(familyName)) {
try {
- versions.add(new Version(packageType.getSdkVersion()));
+ versions.add(packageType.getSdkVersion());
}
catch (IllegalArgumentException e) {
RemoteConnectionsActivator.logError(e);
}
}
}
- List<Version> versionList = new ArrayList<Version>(versions);
- Collections.sort(versionList);
- Collections.reverse(versionList);
+ List<String> versionList = new ArrayList<String>(versions);
+ Collections.sort(versionList, packages.getSDKVersionComparator());
return versionList;
}
- public List<IRemoteAgentInstaller> getRemoteAgentInstallers(String familyName, Version version) {
+ public List<IRemoteAgentInstaller> getRemoteAgentInstallers(String familyName, String version) {
Set<IRemoteAgentInstaller> installers = new HashSet<IRemoteAgentInstaller>();
if (packageList == null) {
getSDKFamilyNames(null);
@@ -210,7 +220,7 @@
for (PackageType packageType : packageList) {
if (packageType.getSdkFamily().equals(familyName)) {
try {
- if (version.equals(new Version(packageType.getSdkVersion()))) {
+ if (version.equals(packageType.getSdkVersion())) {
installers.add(new PackageTypeInstaller(packages, packageType));
}
}
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/IConnectedService.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/IConnectedService.java Wed Jul 21 12:11:48 2010 -0500
@@ -20,6 +20,8 @@
import org.osgi.framework.Version;
+import com.nokia.carbide.remoteconnections.internal.api.IConnectedService2;
+
/**
* An interface for a service connected to a remote agent via a connection
*/
@@ -87,6 +89,8 @@
* Set the device OS values, to potentially affect the information for the user.
* @param familyName
* @param version
+ * @deprecated
+ * @see IConnectedService2#setDeviceOS(String, String)
*/
void setDeviceOS(String familyName, Version version);
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/IConnectionsManager.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/IConnectionsManager.java Wed Jul 21 12:11:48 2010 -0500
@@ -177,11 +177,13 @@
IConnection getCurrentConnection();
/**
- * Returns the IClientServiceSiteUI2 for a service. Filters connection types to those that
- * are supported by the service. Connection list UI as well as new and edit wizards are filtered.
+ * Returns the IClientServiceSiteUI2 for selecting a connection.
* Allows selecting a "current" connection which maps to #getCurrentConnection()
- * when you use #ensureConenction().
- * @param service IService
+ * when you use #ensureConnection().
+ * <p>
+ * Optionally filters connection types to those that are supported by the
+ * service. Connection list UI as well as new and edit wizards are filtered.
+ * @param service IService or <code>null</code>
* @return IClientServiceSiteUI2
* @since 2.5
*/
@@ -189,7 +191,7 @@
/**
* Can be called by specific service implementors (e.g., debugger) to ensure some connection
- * exists and supports this service. If the connection does not exist or does not support
+ * exists and optionally supports this service. If the connection does not exist or does not support
* the service, a CoreException may be thrown after the framework attempts to allow the user
* to correct the situation by showing a connection selection dialog.
* If an ISelectedConnectionInfo is returned, {@link ISelectedConnectionInfo#getConnection()}
@@ -197,7 +199,7 @@
* and {@link ISelectedConnectionInfo#getStorableId()} is the id that can
* be stored by the caller that represents the user's selection.
* @param connectionId String
- * @param service IService
+ * @param service IService or <code>null</code>
* @return ISelectedConnectionInfo
* @throws CoreException
* @since 2.5
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/IRemoteAgentInstallerProvider.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/IRemoteAgentInstallerProvider.java Wed Jul 21 12:11:48 2010 -0500
@@ -112,7 +112,7 @@
* @param familyName String
* @return List
*/
- List<Version> getVersions(String familyName);
+ List<String> getVersions(String familyName);
/**
* Return the IRemoteAgentInstaller objects for a given sdk family + version qualifier
@@ -120,7 +120,7 @@
* @param version
* @return
*/
- List<IRemoteAgentInstaller> getRemoteAgentInstallers(String familyName, Version version);
+ List<IRemoteAgentInstaller> getRemoteAgentInstallers(String familyName, String version);
/**
* Dispose this provider
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ToggleDiscoveryAgentAction.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,59 @@
+/**
+* Copyright (c) 2010 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.remoteconnections.internal;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+
+import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
+import com.nokia.carbide.remoteconnections.internal.api.IDeviceDiscoveryAgent;
+
+public class ToggleDiscoveryAgentAction extends Action {
+
+ private final IDeviceDiscoveryAgent agent;
+
+ public ToggleDiscoveryAgentAction(IDeviceDiscoveryAgent agent) {
+ this.agent = agent;
+ setChecked(agent.isRunning());
+ }
+
+ @Override
+ public void run() {
+ try {
+ if (agent.isRunning())
+ agent.stop();
+ else
+ agent.start();
+ setChecked(agent.isRunning());
+ } catch (CoreException e) {
+ RemoteConnectionsActivator.logError(e);
+ }
+ }
+
+ @Override
+ public int getStyle() {
+ return IAction.AS_CHECK_BOX;
+ }
+
+ @Override
+ public String getText() {
+ return agent.getDisplayName();
+ }
+}
+
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/api/IConnectedService2.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/api/IConnectedService2.java Wed Jul 21 12:11:48 2010 -0500
@@ -28,6 +28,13 @@
public interface IConnectedService2 extends IConnectedService {
/**
+ * Set the device OS values, to potentially affect the information for the user.
+ * @param familyName
+ * @param version
+ */
+ void setDeviceOS(String familyName, String version);
+
+ /**
* Return the properties for this connected service
* @return Map
*/
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/api/IDeviceDiscoveryAgent.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/api/IDeviceDiscoveryAgent.java Wed Jul 21 12:11:48 2010 -0500
@@ -87,6 +87,18 @@
*/
IPrerequisiteStatus getPrerequisiteStatus();
+ /**
+ * Return whether this discovery agent is running
+ * @return boolean
+ */
+ boolean isRunning();
+
+ /**
+ * The unique id for this agent
+ * @return String
+ */
+ String getId();
+
// In addition, there may need to be an additional API to do a deeper form of discovery for
// connection mechanisms that require pairing (like BT or Wifi). In these cases, normal discovery
// will probably be for already paired devices, however, the user will want to discover all
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java Wed Jul 21 12:11:48 2010 -0500
@@ -301,7 +301,11 @@
if (listeners == null)
return;
for (IConnectionsManagerListener listener : listeners) {
- listener.connectionStoreChanged();
+ try {
+ listener.connectionStoreChanged();
+ } catch (Throwable t) {
+ RemoteConnectionsActivator.logError(t);
+ }
}
}
@@ -451,7 +455,11 @@
if (listeners == null)
return;
for (IConnectionsManagerListener listener : listeners) {
- listener.displayChanged();
+ try {
+ listener.displayChanged();
+ } catch (Throwable t) {
+ RemoteConnectionsActivator.logError(t);
+ }
}
}
@@ -494,7 +502,11 @@
if (connectionListeners == null)
return;
for (IConnectionListener listener : connectionListeners) {
- listener.connectionAdded(connection);
+ try {
+ listener.connectionAdded(connection);
+ } catch (Throwable t) {
+ RemoteConnectionsActivator.logError(t);
+ }
}
}
@@ -502,7 +514,11 @@
if (connectionListeners == null)
return;
for (IConnectionListener listener : connectionListeners) {
- listener.connectionRemoved(connection);
+ try {
+ listener.connectionRemoved(connection);
+ } catch (Throwable t) {
+ RemoteConnectionsActivator.logError(t);
+ }
}
}
@@ -510,12 +526,15 @@
if (connectionListeners == null)
return;
for (IConnectionListener listener : connectionListeners) {
- listener.currentConnectionSet(connection);
+ try {
+ listener.currentConnectionSet(connection);
+ } catch (Throwable t) {
+ RemoteConnectionsActivator.logError(t);
+ }
}
}
public ISelectedConnectionInfo ensureConnection(String id, IService service) throws CoreException {
- Check.checkArg(service);
final boolean wasCurrentConnection = CURRENT_CONNECTION_ID.equals(id);
final IConnection[] connectionHolder = { findConnection(id) };
final String[] storableIdHolder = { id };
@@ -566,7 +585,7 @@
private boolean isCompatibleConnection(IConnection connection, IService service) {
if (connection == null)
return false;
- return getCompatibleServices(connection.getConnectionType()).contains(service);
+ return service == null || getCompatibleServices(connection.getConnectionType()).contains(service);
}
public void setCurrentConnection(IConnection connection) {
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ui/ClientServiceSiteUI2.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ui/ClientServiceSiteUI2.java Wed Jul 21 12:11:48 2010 -0500
@@ -66,7 +66,6 @@
private Map<String, String> connectionNames;
public ClientServiceSiteUI2(IService service) {
- Check.checkArg(service);
this.service = service;
}
@@ -297,11 +296,15 @@
private void getCompatibleConnectionTypes() {
compatibleConnectionTypes = new HashSet<IConnectionType>();
- Collection<String> compatibleTypeIds =
- Registry.instance().getCompatibleConnectionTypeIds(service);
- for (String typeId : compatibleTypeIds) {
- compatibleConnectionTypes.add(
- Registry.instance().getConnectionType(typeId));
+ if (service != null) {
+ Collection<String> compatibleTypeIds =
+ Registry.instance().getCompatibleConnectionTypeIds(service);
+ for (String typeId : compatibleTypeIds) {
+ compatibleConnectionTypes.add(
+ Registry.instance().getConnectionType(typeId));
+ }
+ } else {
+ compatibleConnectionTypes.addAll(Registry.instance().getConnectionTypes());
}
}
@@ -317,12 +320,15 @@
public IStatus getSelectionStatus() {
String requiredConnectionTypes = getAllowedConnectionTypesString();
+ String serviceName = service != null ? service.getDisplayName()
+ : Messages.getString("ClientServiceSiteUI2.NoConnectionErrorPlaceholderForNoServiceName"); //$NON-NLS-1$
+
// no selection yet...?
if (connection == null) {
return new Status(IStatus.ERROR, RemoteConnectionsActivator.PLUGIN_ID,
MessageFormat.format(
Messages.getString("ClientServiceSiteUI2.NoConnectionError"), //$NON-NLS-1$
- service.getDisplayName(),
+ serviceName,
requiredConnectionTypes));
}
@@ -333,26 +339,28 @@
return new Status(IStatus.ERROR, RemoteConnectionsActivator.PLUGIN_ID,
MessageFormat.format(
Messages.getString("ClientServiceSiteUI2.NoCurrentConnection"), //$NON-NLS-1$
- service.getDisplayName(),
+ serviceName,
requiredConnectionTypes));
}
- // is the service supported?
- boolean found = false;
- for (IConnectedService aService : Registry.instance().getConnectedServices(actual)) {
- if (service.getIdentifier().equals(aService.getService().getIdentifier())) {
- found = true;
- break;
+ if (service != null) {
+ // is the service supported?
+ boolean found = false;
+ for (IConnectedService aService : Registry.instance().getConnectedServices(actual)) {
+ if (service.getIdentifier().equals(aService.getService().getIdentifier())) {
+ found = true;
+ break;
+ }
}
- }
- if (!found) {
- return new Status(IStatus.WARNING, RemoteConnectionsActivator.PLUGIN_ID,
- MessageFormat.format(
- Messages.getString("ClientServiceSiteUI2.IncompatibleCurrentConnectionService") //$NON-NLS-1$
- + "\n" //$NON-NLS-1$
- + Messages.getString("ClientServiceSiteUI2.IncompatibleCurrentConnectionFixupAdvice"), //$NON-NLS-1$
- actual.getDisplayName(),
- service.getDisplayName()));
+ if (!found) {
+ return new Status(IStatus.WARNING, RemoteConnectionsActivator.PLUGIN_ID,
+ MessageFormat.format(
+ Messages.getString("ClientServiceSiteUI2.IncompatibleCurrentConnectionService") //$NON-NLS-1$
+ + "\n" //$NON-NLS-1$
+ + Messages.getString("ClientServiceSiteUI2.IncompatibleCurrentConnectionFixupAdvice"), //$NON-NLS-1$
+ actual.getDisplayName(),
+ serviceName));
+ }
}
// is the hardware type supported by the service?
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ui/ConnectionStatusSelectorContribution.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ui/ConnectionStatusSelectorContribution.java Wed Jul 21 12:11:48 2010 -0500
@@ -23,6 +23,7 @@
import java.util.Comparator;
import java.util.List;
+import org.eclipse.jface.action.IContributionManager;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
@@ -518,7 +519,9 @@
*/
@Override
public void update() {
- getParent().update(true);
+ IContributionManager parent = getParent();
+ if (parent != null)
+ parent.update(true);
}
/**
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/messages.properties Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/messages.properties Wed Jul 21 12:11:48 2010 -0500
@@ -16,6 +16,7 @@
ClientServiceSiteUI2.NewButtonLabel=New...
ClientServiceSiteUI2.UseConnectionGroupLabel=Use connection
ClientServiceSiteUI2.NoConnectionError=A valid remote connection must be selected. If none exist, connect a device or create a connection one supporting {0} via {1}.
+ClientServiceSiteUI2.NoConnectionErrorPlaceholderForNoServiceName=connecting
ClientServiceSiteUI2.NoCurrentConnection=No current connection is available. Connect a device or create a connection supporting {0} via {1}.
ClientServiceSiteUI2.IncompatibleCurrentConnectionType=The current connection ''{0}'' does not support connection type: ''{1}''.
ClientServiceSiteUI2.IncompatibleCurrentConnectionService=The current connection ''{0}'' does not support the service: ''{1}''.
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionSettingsPage.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionSettingsPage.java Wed Jul 21 12:11:48 2010 -0500
@@ -83,30 +83,31 @@
import org.eclipse.ui.PlatformUI;
import org.osgi.framework.Version;
-import com.nokia.carbide.installpackages.InstallPackages;
import com.nokia.carbide.remoteconnections.Messages;
import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
import com.nokia.carbide.remoteconnections.interfaces.AbstractConnectedService2;
import com.nokia.carbide.remoteconnections.interfaces.IConnectedService;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatusChangedListener;
import com.nokia.carbide.remoteconnections.interfaces.IConnection;
import com.nokia.carbide.remoteconnections.interfaces.IConnectionFactory;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectionFactory.IValidationErrorReporter;
import com.nokia.carbide.remoteconnections.interfaces.IConnectionFactory2;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectionFactory2.ISettingsChangedListener;
import com.nokia.carbide.remoteconnections.interfaces.IConnectionType;
import com.nokia.carbide.remoteconnections.interfaces.IConnectionTypeProvider;
import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider;
+import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider.IRemoteAgentInstaller;
+import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider.IRemoteAgentInstaller.IPackageContents;
import com.nokia.carbide.remoteconnections.interfaces.IService;
import com.nokia.carbide.remoteconnections.interfaces.IService2;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatusChangedListener;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectionFactory.IValidationErrorReporter;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectionFactory2.ISettingsChangedListener;
-import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider.IRemoteAgentInstaller;
-import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider.IRemoteAgentInstaller.IPackageContents;
+import com.nokia.carbide.remoteconnections.internal.api.IConnectedService2;
import com.nokia.carbide.remoteconnections.internal.registry.Registry;
import com.nokia.cpp.internal.api.utils.core.Check;
import com.nokia.cpp.internal.api.utils.core.FileUtils;
import com.nokia.cpp.internal.api.utils.core.HostOS;
+import com.nokia.cpp.internal.api.utils.core.ObjectUtils;
import com.nokia.cpp.internal.api.utils.core.Pair;
import com.nokia.cpp.internal.api.utils.ui.BrowseDialogUtils;
@@ -307,20 +308,20 @@
@SuppressWarnings("unchecked")
public void selectionChanged(SelectionChangedEvent event) {
IStructuredSelection selection = (IStructuredSelection) deviceOSComboViewer.getSelection();
- Pair<String, Version> pair = (Pair<String, Version>) selection.getFirstElement();
+ Pair<String, String> pair = (Pair<String, String>) selection.getFirstElement();
setSelectionToInstallComposite(pair);
- if (connectedService != null)
- connectedService.setDeviceOS(pair.first, pair.second);
+ if (connectedService instanceof IConnectedService2)
+ ((IConnectedService2) connectedService).setDeviceOS(pair.first, pair.second);
}
});
deviceOSComboViewer.setContentProvider(new ArrayContentProvider());
deviceOSComboViewer.setLabelProvider(new LabelProvider() {
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public String getText(Object element) {
Check.checkState(element instanceof Pair);
Pair<String, Version> pair = (Pair) element;
- return MessageFormat.format("{0} {1}", pair.first, InstallPackages.formatSDKVersion(pair.second)); //$NON-NLS-1$
+ return MessageFormat.format("{0} {1}", pair.first, pair.second); //$NON-NLS-1$
}
});
deviceOSComboViewer.getControl().setToolTipText(Messages.getString("ConnectionSettingsPage.DeviceOSComboToolTip")); //$NON-NLS-1$
@@ -446,9 +447,6 @@
String label = ((IRemoteAgentInstaller) value).getLabel();
return label == null ? Messages.getString("ConnectionSettingsPage.UnlabeledPackageLabel") : label; //$NON-NLS-1$
}
- if (value instanceof Version)
- return InstallPackages.formatSDKVersion((Version) value);
-
return value.toString();
}
@@ -715,7 +713,7 @@
}
// update sdk combo
- List<Pair<String, Version>> deviceOSPairs = createDeviceOSPairs();
+ List<Pair<String, String>> deviceOSPairs = createDeviceOSPairs();
deviceOSComboViewer.setInput(deviceOSPairs);
if (!deviceOSPairs.isEmpty()) {
deviceOSComboViewer.getCombo().select(0);
@@ -737,7 +735,7 @@
}
- protected void setSelectionToInstallComposite(Pair<String, Version> pair) {
+ protected void setSelectionToInstallComposite(Pair<String, String> pair) {
Object input = installerTreeViewer.getInput();
if (input instanceof TreeNode[]) {
TreeNode node = findTreeNodeForPair((TreeNode[]) input, pair);
@@ -748,14 +746,14 @@
}
}
- @SuppressWarnings("unchecked")
- private TreeNode findTreeNodeForPair(TreeNode[] treeNodes, Pair<String, Version> pair) {
+ private TreeNode findTreeNodeForPair(TreeNode[] treeNodes, Pair<String, String> pair) {
for (TreeNode treeNode : treeNodes) {
Object value = treeNode.getValue();
if (value instanceof IRemoteAgentInstaller) {
TreeNode versionNode = treeNode.getParent();
TreeNode familyNode = versionNode.getParent();
- if (pair.equals(new Pair(familyNode.getValue(), versionNode.getValue())))
+ if (ObjectUtils.equals(pair.first, familyNode.getValue()) &&
+ ObjectUtils.equals(pair.second, versionNode.getValue()))
return treeNode;
}
TreeNode[] children = treeNode.getChildren();
@@ -786,9 +784,10 @@
connectedService =
Registry.instance().createConnectedService(service, connection);
IStructuredSelection selection = (IStructuredSelection) deviceOSComboViewer.getSelection();
- Pair<String, Version> pair = (Pair<String, Version>) selection.getFirstElement();
- if (pair != null)
- connectedService.setDeviceOS(pair.first, pair.second);
+ Pair<String, String> pair = (Pair<String, String>) selection.getFirstElement();
+ if (pair != null && connectedService instanceof IConnectedService2) {
+ ((IConnectedService2) connectedService).setDeviceOS(pair.first, pair.second);
+ }
connectedService.addStatusChangedListener(statusListener = new IStatusChangedListener() {
public void statusChanged(final IStatus status) {
Display.getDefault().asyncExec(new Runnable() {
@@ -899,12 +898,12 @@
private void createFamilySubNodes(TreeNode familyNode, IRemoteAgentInstallerProvider installerProvider) {
String familyName = familyNode.getValue().toString();
- List<Version> versions = installerProvider.getVersions(familyName);
+ List<String> versions = installerProvider.getVersions(familyName);
List<TreeNode> childList = new ArrayList<TreeNode>();
TreeNode[] children = familyNode.getChildren();
if (children != null)
childList.addAll(Arrays.asList(children));
- for (Version version : versions) {
+ for (String version : versions) {
TreeNode versionNode = getVersionNode(familyNode, version);
if (versionNode == null) {
versionNode = new TreeNode(version);
@@ -916,7 +915,7 @@
familyNode.setChildren((TreeNode[]) childList.toArray(new TreeNode[childList.size()]));
}
- private TreeNode getVersionNode(TreeNode familyNode, Version version) {
+ private TreeNode getVersionNode(TreeNode familyNode, String version) {
TreeNode[] children = familyNode.getChildren();
if (children != null) {
for (TreeNode node : children) {
@@ -929,7 +928,7 @@
private void createInstallerNodes(TreeNode versionNode, IRemoteAgentInstallerProvider installerProvider) {
String familyName = versionNode.getParent().getValue().toString();
- Version version = (Version) versionNode.getValue();
+ String version = versionNode.getValue().toString();
List<IRemoteAgentInstaller> installers =
installerProvider.getRemoteAgentInstallers(familyName, version);
List<TreeNode> childList = new ArrayList<TreeNode>();
@@ -944,14 +943,14 @@
versionNode.setChildren((TreeNode[]) childList.toArray(new TreeNode[childList.size()]));
}
- private synchronized List<Pair<String, Version>> createDeviceOSPairs() {
- List<Pair<String, Version>> deviceOSPairs = new ArrayList<Pair<String, Version>>();
+ private synchronized List<Pair<String, String>> createDeviceOSPairs() {
+ List<Pair<String, String>> deviceOSPairs = new ArrayList<Pair<String, String>>();
for (IRemoteAgentInstallerProvider installerProvider : installerProviders) {
List<String> familyNames = installerProvider.getSDKFamilyNames(null);
for (String familyName : familyNames) {
- List<Version> versions = installerProvider.getVersions(familyName);
- for (Version version : versions) {
- Pair<String, Version> pair = new Pair<String, Version>(familyName, version);
+ List<String> versions = installerProvider.getVersions(familyName);
+ for (String version : versions) {
+ Pair<String, String> pair = new Pair<String, String>(familyName, version);
if (!deviceOSPairs.contains(pair))
deviceOSPairs.add(pair);
}
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionTypePage.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionTypePage.java Wed Jul 21 12:11:48 2010 -0500
@@ -161,7 +161,7 @@
return getConnectionType().getDescription();
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
private int getCurrentTypeIndex() {
IConnection connectionToEdit = settingsWizard.getConnectionToEdit();
if (connectionToEdit != null) {
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java Wed Jul 21 12:11:48 2010 -0500
@@ -43,6 +43,7 @@
import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.ICellEditorListener;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -76,19 +77,22 @@
import com.nokia.carbide.remoteconnections.Messages;
import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
+import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator.IDiscoveryAgentsLoadedListener;
import com.nokia.carbide.remoteconnections.interfaces.IConnectedService;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatusChangedListener;
import com.nokia.carbide.remoteconnections.interfaces.IConnection;
import com.nokia.carbide.remoteconnections.interfaces.IConnectionType;
import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatusChangedListener;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.IConnectionListener;
import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.IConnectionsManagerListener;
+import com.nokia.carbide.remoteconnections.internal.ToggleDiscoveryAgentAction;
import com.nokia.carbide.remoteconnections.internal.api.IConnection2;
import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus;
+import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus.EConnectionStatus;
import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatusChangedListener;
-import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus.EConnectionStatus;
+import com.nokia.carbide.remoteconnections.internal.api.IDeviceDiscoveryAgent;
import com.nokia.carbide.remoteconnections.internal.registry.Registry;
import com.nokia.carbide.remoteconnections.internal.ui.ConnectionUIUtils;
import com.nokia.carbide.remoteconnections.settings.ui.SettingsWizard;
@@ -111,6 +115,7 @@
private List<Action> actions;
private List<Action> connectionSelectedActions;
private List<Action> serviceSelectedActions;
+ private List<Action> discoveryAgentActions;
private static final String UID = ".uid"; //$NON-NLS-1$
private static final ImageDescriptor CONNECTION_NEW_IMGDESC = RemoteConnectionsActivator.getImageDescriptor("icons/connectionNew.png"); //$NON-NLS-1$
@@ -131,7 +136,9 @@
// handle, do not dispose
private Font boldViewerFont;
-
+ private TextCellEditor nameEditor;
+ private boolean refreshPending;
+
private TreeNode[] loadConnections() {
if (serviceToListenerMap == null)
serviceToListenerMap = new HashMap<IConnectedService, IStatusChangedListener>();
@@ -146,7 +153,7 @@
IConnectionStatusChangedListener statusChangedListener =
new IConnectionStatusChangedListener() {
public void statusChanged(IConnectionStatus status) {
- handleStatusChanged();
+ refreshViewer();
}
};
IConnection2 connection2 = (IConnection2) connection;
@@ -163,7 +170,7 @@
final TreeNode treeNode = new TreeNode(connectedService);
IStatusChangedListener statusChangedListener = new IStatusChangedListener() {
public void statusChanged(final IStatus status) {
- handleStatusChanged();
+ refreshViewer();
}
};
connectedService.addStatusChangedListener(statusChangedListener);
@@ -181,23 +188,42 @@
return (TreeNode[]) connectionNodes.toArray(new TreeNode[connectionNodes.size()]);
}
- private void handleStatusChanged() {
+ private void refreshViewer() {
Display.getDefault().asyncExec(new Runnable() {
public void run() {
+ if (nameEditor != null && nameEditor.isActivated()) {
+ refreshPending = true;
+ return;
+ }
+
if (!isDisposed && !viewer.getControl().isDisposed()) {
viewer.refresh(true);
packColumns();
}
+ refreshPending = false;
}
});
}
private class NameEditingSupport extends EditingSupport {
- private TextCellEditor editor;
private NameEditingSupport(ColumnViewer viewer) {
super(viewer);
- editor = new TextCellEditor((Composite) viewer.getControl(), SWT.BORDER);
+ nameEditor = new TextCellEditor((Composite) viewer.getControl(), SWT.BORDER);
+ nameEditor.addListener(new ICellEditorListener() {
+ public void editorValueChanged(boolean oldValidState, boolean newValidState) {
+ }
+
+ public void cancelEditor() {
+ if (refreshPending)
+ refreshViewer();
+ }
+
+ public void applyEditorValue() {
+ if (refreshPending)
+ refreshViewer();
+ }
+ });
}
@Override
@@ -210,7 +236,7 @@
@Override
protected CellEditor getCellEditor(Object element) {
- return editor;
+ return nameEditor;
}
@Override
@@ -223,8 +249,6 @@
protected void setValue(Object element, Object value) {
IConnection connection = (IConnection) ((TreeNode) element).getValue();
connection.setDisplayName(value.toString());
- //viewer.refresh(true);
- //packColumns();
Registry.instance().updateDisplays();
Registry.instance().storeConnections();
}
@@ -544,12 +568,7 @@
}
public void displayChanged() {
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- viewer.refresh(true);
- packColumns();
- }
- });
+ refreshViewer();
}
};
Registry.instance().addConnectionStoreChangedListener(connectionStoreChangedListener);
@@ -557,12 +576,7 @@
connectionListener = new IConnectionListener() {
public void currentConnectionSet(IConnection connection) {
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- viewer.refresh(true);
- packColumns();
- }
- });
+ refreshViewer();
}
public void connectionRemoved(IConnection connection) {
@@ -624,8 +638,30 @@
fillLocalToolBar(bars.getToolBarManager());
}
- private void fillLocalPullDown(IMenuManager manager) {
- // nothing for now
+ private void fillLocalPullDown(final IMenuManager manager) {
+ if (discoveryAgentActions.isEmpty()) {
+ IDiscoveryAgentsLoadedListener listener = new IDiscoveryAgentsLoadedListener() {
+ public void agentsAreLoaded() {
+ makeToggleDiscoveryAgentActions();
+ addDiscoveryAgentActions(manager);
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ manager.update(true);
+ }
+ });
+ }
+ };
+ RemoteConnectionsActivator.getDefault().addDiscoveryAgentsLoadedListener(listener);
+ }
+ else {
+ addDiscoveryAgentActions(manager);
+ }
+ }
+
+ private void addDiscoveryAgentActions(IMenuManager manager) {
+ for (Action action : discoveryAgentActions) {
+ manager.add(action);
+ }
}
private void fillContextMenu(IMenuManager manager) {
@@ -827,8 +863,19 @@
enableConnectionSelectedActions(false);
enableServiceSelectedActions(false);
+
+ makeToggleDiscoveryAgentActions();
}
+ private void makeToggleDiscoveryAgentActions() {
+ discoveryAgentActions = new ArrayList<Action>();
+ Collection<IDeviceDiscoveryAgent> discoveryAgents = RemoteConnectionsActivator.getDefault().getDiscoveryAgents();
+ for (IDeviceDiscoveryAgent agent : discoveryAgents) {
+ discoveryAgentActions.add(new ToggleDiscoveryAgentAction(agent));
+ }
+
+ }
+
private void enableConnectionSelectedActions(boolean enable) {
for (Action action : connectionSelectedActions) {
action.setEnabled(enable);
--- a/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/InputStream.h Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/InputStream.h Wed Jul 21 12:11:48 2010 -0500
@@ -103,7 +103,7 @@
void SetClientId(long id);
BOOL Open(DWORD dwSize, CHAR *filePath);
BOOL Init();
- Close();
+ void Close();
long m_ClientID;
HANDLE m_hFile; // handle from CreateFile
--- a/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/TCConstants.h Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/TCConstants.h Wed Jul 21 12:11:48 2010 -0500
@@ -19,23 +19,29 @@
#include <stdio.h>
+#ifdef _MSC_VER
+#define LL(x) x##i64
+#else
+#define LL(x) x##LL
+#endif
+
// com.nokia.tcf.api.ITCConnection.java
-#define DEFAULT_COMM_ERROR_RETRY_INTERVAL 1i64
-#define DEFAULT_COMM_ERROR_RETRY_TIMEOUT 300i64
+#define DEFAULT_COMM_ERROR_RETRY_INTERVAL LL(1)
+#define DEFAULT_COMM_ERROR_RETRY_TIMEOUT LL(300)
// com.nokia.tcf.api.ITCMessageOptions.java
-#define DESTINATION_INPUTSTREAM 0i64
-#define DESTINATION_CLIENTFILE 1i64
-#define DEFAULT_DESTINATION 0i64
-#define DEFAULT_INPUTSTREAM_OVERFLOW 1i64
-#define UNWRAP_LEAVE_HEADERS 0i64
-#define UNWRAP_DELETE_HEADERS 1i64
-#define DEFAULT_UNWRAP_OPTION 0i64
-#define ENCODE_NO_FORMAT 0i64
-#define ENCODE_FORMAT 1i64
-#define ENCODE_TRK_FORMAT 2i64
-#define DEFAULT_ENCODE_FORMAT 0i64
+#define DESTINATION_INPUTSTREAM LL(0)
+#define DESTINATION_CLIENTFILE LL(1)
+#define DEFAULT_DESTINATION LL(0)
+#define DEFAULT_INPUTSTREAM_OVERFLOW LL(1)
+#define UNWRAP_LEAVE_HEADERS LL(0)
+#define UNWRAP_DELETE_HEADERS LL(1)
+#define DEFAULT_UNWRAP_OPTION LL(0)
+#define ENCODE_NO_FORMAT LL(0)
+#define ENCODE_FORMAT LL(1)
+#define ENCODE_TRK_FORMAT LL(2)
+#define DEFAULT_ENCODE_FORMAT LL(0)
#define DEFAULT_OST_VERSION 1L
#endif //__TCCONSTANTS_H__
--- a/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/TCErrorConstants.h Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/TCErrorConstants.h Wed Jul 21 12:11:48 2010 -0500
@@ -44,7 +44,7 @@
#define TCAPI_ERR_MEDIA_IS_BUSY 20 // used for Trace bpx when someone else is connected
#define TCAPI_ERR_PROTOCOL_NOT_SUPPORTED_BY_MEDIA 21 // TraceBox does not support protocol
#define TCAPI_ERR_FEATURE_NOT_IMPLEMENTED 22 // API feature not implemented yet
- #define TCAPI_ERR_COMM_ERROR 23 // error while polling/reading COMM port
+ #define TCAPI_ERR_COMM_ERROR 23 // error while writing/polling/reading COMM port (h/w)
#define TCAPI_ERR_COMM_TIMEOUT 24 // comm error retry timeout
#define TCAPI_ERR_COMM_MULTIPLE_OPEN 25 // there are multiple connections open - cannot attach
#define TCAPI_ERR_NO_COMM_OPEN 26 // there are no connections open - cannot attach
@@ -82,5 +82,6 @@
#define TCAPI_INFO_TRACEBOX_MEMORY_IS_NORMAL 58 // TRACEBOX buffer overflowed and is now closed
#define TCAPI_ERR_TRACEBOX_DATA_CORRUPTED 59 // TRACEBOX received corrupted trace data from phone
#define TCAPI_ERR_TRACEBOX_PROTOCOL_MEMORY_OVERFLOW 60 // TRACEBOX protocol processing buffer overflowed - fatal
+ #define TCAPI_ERR_COMM_ERROR_DEVICE_NOT_READING 61 // target device not reading output from TCF (USB)
#endif //__TCERRORCONSTANTS_H__
--- a/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/mutex.h Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/mutex.h Wed Jul 21 12:11:48 2010 -0500
@@ -38,4 +38,4 @@
DWORD m_waitTimeout;
BOOL m_mutexOpen;
};
-#endif __MUTEX_H__
+#endif //__MUTEX_H__
--- a/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/shareddata.h Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/shareddata.h Wed Jul 21 12:11:48 2010 -0500
@@ -25,7 +25,7 @@
BOOL Open(DWORD dwSize, CHAR *sharedName);
BOOL Open(HANDLE hFile, DWORD dwSize, CHAR *sharedName);
- Close();
+ void Close();
virtual BOOL Init();
LPVOID GetDataPtr();
BOOL IsCreator();
--- a/connectivity/com.nokia.tcf/native/TCFNative/Common/Source/InputStream.cpp Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/Common/Source/InputStream.cpp Wed Jul 21 12:11:48 2010 -0500
@@ -982,7 +982,7 @@
return fOk;
}
-CInputStreamFile::Close()
+void CInputStreamFile::Close()
{
// close all mapping handles
CSharedData::Close();
--- a/connectivity/com.nokia.tcf/native/TCFNative/Common/Source/shareddata.cpp Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/Common/Source/shareddata.cpp Wed Jul 21 12:11:48 2010 -0500
@@ -107,7 +107,7 @@
}
return fOK;
}
-CSharedData::Close()
+void CSharedData::Close()
{
BOOL fIgnore = FALSE;
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/ClientManager.cpp Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/ClientManager.cpp Wed Jul 21 12:11:48 2010 -0500
@@ -23,6 +23,9 @@
#include "TCErrorConstants.h"
#include "resource.h"
#include <stdio.h>
+#ifdef _PSAPI_PRESENT
+ #include <psapi.h>
+#endif
#ifdef _DEBUG
extern BOOL gDoLogging;
@@ -201,6 +204,99 @@
m_DebugLog = NULL;
}
}
+
+#ifdef _PSAPI_PRESENT
+void
+CClientManager::FindOrCreateRunningServer()
+{
+ TCDEBUGOPEN();
+ TCDEBUGLOGS("CClientManager::FindOrCreateRunningServer: searching for existing TCFServer.exe\n");
+
+ // Directory where TCFServer.exe lives
+ char exeDirectory[MAX_DLLPATHNAME] = {0};
+
+ BOOL foundRunningServer = FALSE;
+
+ // Get the list of process identifiers.
+
+ DWORD aProcesses[1024], cbNeeded, cProcesses;
+ unsigned int i;
+
+ if ( EnumProcesses( aProcesses, sizeof(aProcesses), &cbNeeded ) )
+ {
+ // Calculate how many process identifiers were returned.
+
+ cProcesses = cbNeeded / sizeof(DWORD);
+
+ // Find existing TCFServer
+ for ( i = 0; i < cProcesses; i++ )
+ {
+ if( aProcesses[i] != 0 )
+ {
+ TCHAR szProcessName[MAX_PATH] = TEXT("<unknown>");
+
+ // Get a handle to the process.
+ HANDLE hProcess = OpenProcess( PROCESS_QUERY_INFORMATION |
+ PROCESS_VM_READ,
+ FALSE, aProcesses[i] );
+
+ // Get the process name.
+ if (NULL != hProcess )
+ {
+ HMODULE hMod;
+ DWORD cbNeeded;
+
+ if ( EnumProcessModules( hProcess, &hMod, sizeof(hMod),
+ &cbNeeded) )
+ {
+ if (GetModuleBaseNameA( hProcess, hMod, szProcessName,
+ sizeof(szProcessName)/sizeof(char) ))
+ {
+ if (strcmp(SERVER_PROCESS_NAME, szProcessName) == 0)
+ {
+ // get the full path
+ GetModuleFileNameExA(hProcess, hMod, exeDirectory,
+ sizeof(exeDirectory)/sizeof(char) );
+
+ TCDEBUGLOGA1("Found TCFServer at %s\n", exeDirectory);
+ CloseHandle( hProcess );
+ foundRunningServer = TRUE;
+ break;
+ }
+ }
+ }
+ }
+
+ CloseHandle( hProcess );
+ }
+ }
+ }
+
+ if (!foundRunningServer)
+ {
+ // start the one next to the DLL
+ strncpy(exeDirectory, m_DllLocation, strlen(m_DllLocation) + 1);
+ size_t len = strlen(exeDirectory);
+ // remove file
+ for (int i = len-1; i > 0; i--)
+ {
+ if (exeDirectory[i] == PATH_DELIMITER)
+ break;
+ }
+ exeDirectory[i] = NULL;
+ }
+
+ m_ServerExeFile = new char[MAX_DLLPATHNAME];
+ sprintf(m_ServerExeFile, "\"%s%c%s\"", exeDirectory, PATH_DELIMITER, SERVER_PROCESS_NAME);
+
+ m_ServerLockFile = new char[MAX_DLLPATHNAME];
+ sprintf(m_ServerLockFile, "%s%c%s", exeDirectory, PATH_DELIMITER, SERVER_LOCKFILE_NAME);
+
+ TCDEBUGCLOSE();
+
+}
+#endif
+
CErrorMonitor*
CClientManager::FindErrorMonitor(long inClientId)
{
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/ClientManager.h Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/ClientManager.h Wed Jul 21 12:11:48 2010 -0500
@@ -59,6 +59,9 @@
virtual ~CClientManager();
// starting/stopping server
+#ifdef _PSAPI_PRESENT
+ void FindOrCreateRunningServer();
+#endif
BOOL StartServer(pServerProcessData pData);
BOOL StopServer(pServerProcessData pData);
long StartServer();
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCAPIConnectionJni.cpp Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCAPIConnectionJni.cpp Wed Jul 21 12:11:48 2010 -0500
@@ -1326,11 +1326,11 @@
TCDEBUGLOGA3("nativeSendMessage return ret=%d, osError=%d : %s\n", ret, osError, GetErrorText(osError));
TCDEBUGCLOSE();
- if (ret == TCAPI_ERR_COMM_ERROR && osError > 0)
- {
- jclass clazz = env->FindClass("Ljava/lang/Exception;");
- env->ThrowNew(clazz, GetErrorText(osError));
- }
+// if (ret == TCAPI_ERR_COMM_ERROR && osError > 0)
+// {
+// jclass clazz = env->FindClass("Ljava/lang/Exception;");
+// env->ThrowNew(clazz, GetErrorText(osError));
+// }
return ret;
}
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCFClient.plg Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCFClient.plg Wed Jul 21 12:11:48 2010 -0500
@@ -3,36 +3,134 @@
<pre>
<h1>Build Log</h1>
<h3>
---------------------Configuration: TCFCommSerial - Win32 Release--------------------
+--------------------Configuration: TCFClient - Win32 Debug--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP60C.tmp" with contents
+Creating command line "rc.exe /l 0x409 /fo"Debug/resource.res" /d "_DEBUG" "C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\resource.rc""
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC7C.tmp" with contents
+[
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\Common\Headers" /I ".\jdk1.5.0_10\include" /I ".\jdk1.5.0_10\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCLIENT_EXPORTS" /FR"Debug/" /Fp"Debug/TCFClient.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\ClientManager.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\ErrorMonitorData.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\InputStream.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\mutex.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\ServerClient.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\shareddata.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\TCAPIConnectionJni.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\TCDebugLog.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\TCFClient.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\TCFCppApi.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC7C.tmp"
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC7D.tmp" with contents
+[
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\Common\Headers" /I ".\jdk1.5.0_10\include" /I ".\jdk1.5.0_10\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCLIENT_EXPORTS" /FR"Debug/" /Fp"Debug/TCFClient.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\StdAfx.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC7D.tmp"
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC7E.tmp" with contents
[
-/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMSERIAL_EXPORTS" /Fp"Release/TCFCommSerial.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib shlwapi.lib /nologo /dll /incremental:yes /pdb:"Debug/TCFClient.pdb" /map:"Debug/TCFClient.map" /debug /machine:I386 /out:"Debug/TCFClient.dll" /implib:"Debug/TCFClient.lib" /pdbtype:sept
+.\Debug\ClientManager.obj
+.\Debug\ErrorMonitorData.obj
+.\Debug\InputStream.obj
+.\Debug\mutex.obj
+.\Debug\ServerClient.obj
+.\Debug\shareddata.obj
+.\Debug\StdAfx.obj
+.\Debug\TCAPIConnectionJni.obj
+.\Debug\TCDebugLog.obj
+.\Debug\TCFClient.obj
+.\Debug\TCFCppApi.obj
+.\Debug\resource.res
+]
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC7E.tmp"
+<h3>Output Window</h3>
+Compiling resources...
+Compiling...
+StdAfx.cpp
+Compiling...
+ClientManager.cpp
+ErrorMonitorData.cpp
+InputStream.cpp
+mutex.cpp
+ServerClient.cpp
+shareddata.cpp
+TCAPIConnectionJni.cpp
+TCDebugLog.cpp
+TCFClient.cpp
+TCFCppApi.cpp
+Generating Code...
+Linking...
+ Creating library Debug/TCFClient.lib and object Debug/TCFClient.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC82.tmp" with contents
+[
+/nologo /o"Debug/TCFClient.bsc"
+.\Debug\StdAfx.sbr
+.\Debug\ClientManager.sbr
+.\Debug\ErrorMonitorData.sbr
+.\Debug\InputStream.sbr
+.\Debug\mutex.sbr
+.\Debug\ServerClient.sbr
+.\Debug\shareddata.sbr
+.\Debug\TCAPIConnectionJni.sbr
+.\Debug\TCDebugLog.sbr
+.\Debug\TCFClient.sbr
+.\Debug\TCFCppApi.sbr]
+Creating command line "bscmake.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC82.tmp"
+Creating browse info file...
+<h3>Output Window</h3>
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC83.bat" with contents
+[
+@echo off
+copybinaries Debug
+]
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC83.bat"
+copy libs
+Copy binaries to ..\..\..\os\win32\x86
+The system cannot find the path specified.
+ 0 file(s) copied.
+The system cannot find the path specified.
+ 0 file(s) copied.
+The system cannot find the path specified.
+ 0 file(s) copied.
+Error executing c:\winnt\system32\cmd.exe.
+
+
+
+<h3>Results</h3>
+TCFClient.dll - 1 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: TCFCommSerial - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC84.tmp" with contents
+[
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMSERIAL_EXPORTS" /Fp"Debug/TCFCommSerial.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\BaseCom.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\mutex.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommSerial\RealSerialComm.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\TCDebugLog.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommSerial\TCFCommSerial.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP60C.tmp"
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP60D.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC84.tmp"
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC85.tmp" with contents
[
-/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMSERIAL_EXPORTS" /Fp"Release/TCFCommSerial.pch" /Yc"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMSERIAL_EXPORTS" /Fp"Debug/TCFCommSerial.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommSerial\StdAfx.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP60D.tmp"
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP60E.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC85.tmp"
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC86.tmp" with contents
[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"Release/TCFCommSerial.pdb" /map:"Release/TCFCommSerial.map" /machine:I386 /out:"Release/TCFCommSerial.dll" /implib:"Release/TCFCommSerial.lib"
-.\Release\BaseCom.obj
-.\Release\mutex.obj
-.\Release\RealSerialComm.obj
-.\Release\StdAfx.obj
-.\Release\TCDebugLog.obj
-.\Release\TCFCommSerial.obj
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"Debug/TCFCommSerial.pdb" /map:"Debug/TCFCommSerial.map" /debug /machine:I386 /out:"Debug/TCFCommSerial.dll" /implib:"Debug/TCFCommSerial.lib" /pdbtype:sept
+.\Debug\BaseCom.obj
+.\Debug\mutex.obj
+.\Debug\RealSerialComm.obj
+.\Debug\StdAfx.obj
+.\Debug\TCDebugLog.obj
+.\Debug\TCFCommSerial.obj
]
-Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP60E.tmp"
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC86.tmp"
<h3>Output Window</h3>
Compiling...
StdAfx.cpp
@@ -44,13 +142,13 @@
TCFCommSerial.cpp
Generating Code...
Linking...
- Creating library Release/TCFCommSerial.lib and object Release/TCFCommSerial.exp
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP612.bat" with contents
+ Creating library Debug/TCFCommSerial.lib and object Debug/TCFCommSerial.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8A.bat" with contents
[
@echo off
-copyBinaries Release
+copyBinaries Debug
]
-Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP612.bat"
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8A.bat"
copy libs
Copy binaries to ..\..\..\os\win32\x86
The system cannot find the path specified.
@@ -66,36 +164,36 @@
<h3>Results</h3>
TCFCommSerial.dll - 1 error(s), 0 warning(s)
<h3>
---------------------Configuration: TCFCommTCP - Win32 Release--------------------
+--------------------Configuration: TCFCommTCP - Win32 Debug--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP613.tmp" with contents
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8B.tmp" with contents
[
-/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMTCP_EXPORTS" /Fp"Release/TCFCommTCP.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMTCP_EXPORTS" /FR"Debug/" /Fp"Debug/TCFCommTCP.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\BaseCom.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\mutex.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\TCDebugLog.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommTCP\TCFCommTCP.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommTCP\TcpComm.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP613.tmp"
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP614.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8B.tmp"
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8C.tmp" with contents
[
-/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMTCP_EXPORTS" /Fp"Release/TCFCommTCP.pch" /Yc"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMTCP_EXPORTS" /FR"Debug/" /Fp"Debug/TCFCommTCP.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommTCP\StdAfx.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP614.tmp"
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP615.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8C.tmp"
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8D.tmp" with contents
[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib shlwapi.lib /nologo /dll /incremental:no /pdb:"Release/TCFCommTCP.pdb" /map:"Release/TCFCommTCP.map" /machine:I386 /out:"Release/TCFCommTCP.dll" /implib:"Release/TCFCommTCP.lib"
-.\Release\BaseCom.obj
-.\Release\mutex.obj
-.\Release\StdAfx.obj
-.\Release\TCDebugLog.obj
-.\Release\TCFCommTCP.obj
-.\Release\TcpComm.obj
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib shlwapi.lib /nologo /dll /incremental:yes /pdb:"Debug/TCFCommTCP.pdb" /map:"Debug/TCFCommTCP.map" /debug /machine:I386 /out:"Debug/TCFCommTCP.dll" /implib:"Debug/TCFCommTCP.lib" /pdbtype:sept
+.\Debug\BaseCom.obj
+.\Debug\mutex.obj
+.\Debug\StdAfx.obj
+.\Debug\TCDebugLog.obj
+.\Debug\TCFCommTCP.obj
+.\Debug\TcpComm.obj
]
-Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP615.tmp"
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8D.tmp"
<h3>Output Window</h3>
Compiling...
StdAfx.cpp
@@ -107,13 +205,13 @@
TcpComm.cpp
Generating Code...
Linking...
- Creating library Release/TCFCommTCP.lib and object Release/TCFCommTCP.exp
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP619.bat" with contents
+ Creating library Debug/TCFCommTCP.lib and object Debug/TCFCommTCP.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC91.bat" with contents
[
@echo off
-copybinaries Release
+copybinaries Debug
]
-Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP619.bat"
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC91.bat"
copy libs
Copy binaries to ..\..\..\os\win32\x86
The system cannot find the path specified.
@@ -129,12 +227,12 @@
<h3>Results</h3>
TCFCommTCP.dll - 1 error(s), 0 warning(s)
<h3>
---------------------Configuration: TCFCommVirtualSerial - Win32 Release--------------------
+--------------------Configuration: TCFCommVirtualSerial - Win32 Debug--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP61A.tmp" with contents
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC92.tmp" with contents
[
-/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFCommSerial" /I "..\Common\Headers" /I "..\TCFServer" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMVIRTUALSERIAL_EXPORTS" /Fp"Release/TCFCommVirtualSerial.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFCommSerial" /I "..\Common\Headers" /I "..\TCFServer" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMVIRTUALSERIAL_EXPORTS" /Fp"Debug/TCFCommVirtualSerial.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\BaseCom.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\mutex.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommSerial\RealSerialComm.cpp"
@@ -142,25 +240,25 @@
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommVirtualSerial\TCFCommVirtualSerial.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommVirtualSerial\VirtualSerialComm.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP61A.tmp"
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP61B.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC92.tmp"
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC93.tmp" with contents
[
-/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFCommSerial" /I "..\Common\Headers" /I "..\TCFServer" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMVIRTUALSERIAL_EXPORTS" /Fp"Release/TCFCommVirtualSerial.pch" /Yc"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFCommSerial" /I "..\Common\Headers" /I "..\TCFServer" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMVIRTUALSERIAL_EXPORTS" /Fp"Debug/TCFCommVirtualSerial.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommVirtualSerial\StdAfx.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP61B.tmp"
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP61C.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC93.tmp"
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC94.tmp" with contents
[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"Release/TCFCommVirtualSerial.pdb" /map:"Release/TCFCommVirtualSerial.map" /machine:I386 /out:"Release/TCFCommVirtualSerial.dll" /implib:"Release/TCFCommVirtualSerial.lib"
-.\Release\BaseCom.obj
-.\Release\mutex.obj
-.\Release\RealSerialComm.obj
-.\Release\StdAfx.obj
-.\Release\TCDebugLog.obj
-.\Release\TCFCommVirtualSerial.obj
-.\Release\VirtualSerialComm.obj
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"Debug/TCFCommVirtualSerial.pdb" /map:"Debug/TCFCommVirtualSerial.map" /debug /machine:I386 /out:"Debug/TCFCommVirtualSerial.dll" /implib:"Debug/TCFCommVirtualSerial.lib" /pdbtype:sept
+.\Debug\BaseCom.obj
+.\Debug\mutex.obj
+.\Debug\RealSerialComm.obj
+.\Debug\StdAfx.obj
+.\Debug\TCDebugLog.obj
+.\Debug\TCFCommVirtualSerial.obj
+.\Debug\VirtualSerialComm.obj
]
-Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP61C.tmp"
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC94.tmp"
<h3>Output Window</h3>
Compiling...
StdAfx.cpp
@@ -173,13 +271,13 @@
VirtualSerialComm.cpp
Generating Code...
Linking...
- Creating library Release/TCFCommVirtualSerial.lib and object Release/TCFCommVirtualSerial.exp
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP620.bat" with contents
+ Creating library Debug/TCFCommVirtualSerial.lib and object Debug/TCFCommVirtualSerial.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC98.bat" with contents
[
@echo off
-copyBinaries Release
+copyBinaries Debug
]
-Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP620.bat"
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC98.bat"
copy libs
Copy binaries to ..\..\..\os\win32\x86
The system cannot find the path specified.
@@ -195,32 +293,32 @@
<h3>Results</h3>
TCFCommVirtualSerial.dll - 1 error(s), 0 warning(s)
<h3>
---------------------Configuration: TCFProtOST - Win32 Release--------------------
+--------------------Configuration: TCFProtOST - Win32 Debug--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP621.tmp" with contents
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC99.tmp" with contents
[
-/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFServer" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFPROTOST_EXPORTS" /Fp"Release/TCFProtOST.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFPROTOST_EXPORTS" /Fp"Debug/TCFProtOST.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\BaseProtocol.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFProtOST\OSTProtocol.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFProtOST\TCFProtOST.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP621.tmp"
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP622.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC99.tmp"
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC9A.tmp" with contents
[
-/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFServer" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFPROTOST_EXPORTS" /Fp"Release/TCFProtOST.pch" /Yc"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFPROTOST_EXPORTS" /Fp"Debug/TCFProtOST.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFProtOST\StdAfx.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP622.tmp"
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP623.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC9A.tmp"
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC9B.tmp" with contents
[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"Release/TCFProtOST.pdb" /map:"Release/TCFProtOST.map" /machine:I386 /out:"Release/TCFProtOST.dll" /implib:"Release/TCFProtOST.lib"
-.\Release\BaseProtocol.obj
-.\Release\OSTProtocol.obj
-.\Release\StdAfx.obj
-.\Release\TCFProtOST.obj
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"Debug/TCFProtOST.pdb" /map:"Debug/TCFProtOST.map" /debug /machine:I386 /out:"Debug/TCFProtOST.dll" /implib:"Debug/TCFProtOST.lib" /pdbtype:sept
+.\Debug\BaseProtocol.obj
+.\Debug\OSTProtocol.obj
+.\Debug\StdAfx.obj
+.\Debug\TCFProtOST.obj
]
-Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP623.tmp"
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC9B.tmp"
<h3>Output Window</h3>
Compiling...
StdAfx.cpp
@@ -230,13 +328,13 @@
TCFProtOST.cpp
Generating Code...
Linking...
- Creating library Release/TCFProtOST.lib and object Release/TCFProtOST.exp
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP627.bat" with contents
+ Creating library Debug/TCFProtOST.lib and object Debug/TCFProtOST.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC9F.bat" with contents
[
@echo off
-copyBinaries Release
+copyBinaries Debug
]
-Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP627.bat"
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC9F.bat"
copy libs
Copy binaries to ..\..\..\os\win32\x86
The system cannot find the path specified.
@@ -252,13 +350,13 @@
<h3>Results</h3>
TCFProtOST.dll - 1 error(s), 0 warning(s)
<h3>
---------------------Configuration: TCFServer - Win32 Release--------------------
+--------------------Configuration: TCFServer - Win32 Debug--------------------
</h3>
<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x409 /fo"Release/resource.res" /d "NDEBUG" "C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\resource.rc""
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP628.tmp" with contents
+Creating command line "rc.exe /l 0x409 /fo"Debug/resource.res" /d "_DEBUG" "C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\resource.rc""
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA0.tmp" with contents
[
-/nologo /Zp2 /MT /W3 /GX /O2 /I "..\Common\Headers" /I "..\Common\Source" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"Release/TCFServer.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\Common\Headers" /I "..\Common\Source" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"Debug/" /Fp"Debug/TCFServer.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\Client.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\CommRegistryItem.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\Connection.cpp"
@@ -276,36 +374,36 @@
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\TCDebugLog.cpp"
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\TCFServer.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP628.tmp"
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP629.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA0.tmp"
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA1.tmp" with contents
[
-/nologo /Zp2 /MT /W3 /GX /O2 /I "..\Common\Headers" /I "..\Common\Source" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"Release/TCFServer.pch" /Yc"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\Common\Headers" /I "..\Common\Source" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"Debug/" /Fp"Debug/TCFServer.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\StdAfx.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP629.tmp"
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP62A.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA1.tmp"
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA2.tmp" with contents
[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib shlwapi.lib /nologo /subsystem:console /incremental:no /pdb:"Release/TCFServer.pdb" /machine:I386 /out:"Release/TCFServer.exe"
-.\Release\Client.obj
-.\Release\CommRegistryItem.obj
-.\Release\Connection.obj
-.\Release\ConnectionImpl.obj
-.\Release\ErrorMonitorData.obj
-.\Release\InputStream.obj
-.\Release\MessageFile.obj
-.\Release\mutex.obj
-.\Release\ProtocolRegistryItem.obj
-.\Release\Registry.obj
-.\Release\RegistryImpl.obj
-.\Release\ServerClient.obj
-.\Release\ServerManager.obj
-.\Release\shareddata.obj
-.\Release\StdAfx.obj
-.\Release\TCDebugLog.obj
-.\Release\TCFServer.obj
-.\Release\resource.res
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib shlwapi.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/TCFServer.pdb" /debug /machine:I386 /out:"Debug/TCFServer.exe" /pdbtype:sept
+.\Debug\Client.obj
+.\Debug\CommRegistryItem.obj
+.\Debug\Connection.obj
+.\Debug\ConnectionImpl.obj
+.\Debug\ErrorMonitorData.obj
+.\Debug\InputStream.obj
+.\Debug\MessageFile.obj
+.\Debug\mutex.obj
+.\Debug\ProtocolRegistryItem.obj
+.\Debug\Registry.obj
+.\Debug\RegistryImpl.obj
+.\Debug\ServerClient.obj
+.\Debug\ServerManager.obj
+.\Debug\shareddata.obj
+.\Debug\StdAfx.obj
+.\Debug\TCDebugLog.obj
+.\Debug\TCFServer.obj
+.\Debug\resource.res
]
-Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP62A.tmp"
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA2.tmp"
<h3>Output Window</h3>
Compiling resources...
Compiling...
@@ -329,12 +427,35 @@
TCFServer.cpp
Generating Code...
Linking...
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP62C.bat" with contents
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA4.tmp" with contents
+[
+/nologo /o"Debug/TCFServer.bsc"
+.\Debug\StdAfx.sbr
+.\Debug\Client.sbr
+.\Debug\CommRegistryItem.sbr
+.\Debug\Connection.sbr
+.\Debug\ConnectionImpl.sbr
+.\Debug\ErrorMonitorData.sbr
+.\Debug\InputStream.sbr
+.\Debug\MessageFile.sbr
+.\Debug\mutex.sbr
+.\Debug\ProtocolRegistryItem.sbr
+.\Debug\Registry.sbr
+.\Debug\RegistryImpl.sbr
+.\Debug\ServerClient.sbr
+.\Debug\ServerManager.sbr
+.\Debug\shareddata.sbr
+.\Debug\TCDebugLog.sbr
+.\Debug\TCFServer.sbr]
+Creating command line "bscmake.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA4.tmp"
+Creating browse info file...
+<h3>Output Window</h3>
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA5.bat" with contents
[
@echo off
-copybinaries Release
+copybinaries Debug
]
-Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP62C.bat"
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA5.bat"
copy binary
Copy binaries to ..\..\..\os\win32\x86
The system cannot find the path specified.
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/RealSerialComm.cpp Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/RealSerialComm.cpp Wed Jul 21 12:11:48 2010 -0500
@@ -366,7 +366,7 @@
long CRealSerialComm::ClosePort()
{
COMMLOGOPEN();
- COMMLOGS("CRealSerialComm::ClosePort\n");
+ COMMLOGA1("CRealSerialComm::ClosePort connected=%d\n", IsConnected());
long err = TCAPI_ERR_NONE;
@@ -443,8 +443,9 @@
// and there was some kind of error
if (lclNumBytes != inSize)
{
+ m_lastCommError = 0;
COMMLOGOPEN();
- COMMLOGA3("CRealSerialComm::SendDataToPort WriteFile not all bytes sent: lclNumBytes=%d inSize=%d err=%d\n", lclNumBytes, inSize, GetLastError());
+ COMMLOGA3("CRealSerialComm::SendDataToPort WriteFile not all bytes sent: lclNumBytes=%d inSize=%d err=%d\n", lclNumBytes, inSize, m_lastCommError);
COMMLOGCLOSE();
COMSTAT lclComStat;
@@ -465,19 +466,27 @@
if (lclErrorFlags)
{
// there really was an error
- m_lastCommError = lclErrorFlags;
err = TCAPI_ERR_COMM_ERROR;
COMMLOGOPEN();
- COMMLOGA1("CRealSerialComm::SendDataToPort ClearCommError succeeded lclErrorFlags=%d\n", m_lastCommError);
+ COMMLOGA1("CRealSerialComm::SendDataToPort ClearCommError succeeded lclErrorFlags=%d\n", lclErrorFlags);
COMMLOGCLOSE();
}
else
{
// No OS error returned, but WriteFile failed to write out all bytes
// therefore, since we are not doing overlapped I/O, this is an error.
- err = TCAPI_ERR_COMM_ERROR;
+// DUMPCOMSTAT(&lclComStat);
+ BOOL flush = FlushFileBuffers(m_hSerial); // flush transmit buffer
+// ClearCommError(m_hSerial, &lclErrorFlags, &lclComStat);
+// if (WriteFile(m_hSerial, inData, inSize, &lclNumBytes, NULL))
+// {
+// COMMLOGOPEN();
+// COMMLOGA1("CRealSerialComm::SendDataToPort WriteFile#2 succeeded lclNumBytes=%d\n", lclNumBytes);
+// COMMLOGCLOSE();
+// }
+ err = TCAPI_ERR_COMM_ERROR_DEVICE_NOT_READING;
COMMLOGOPEN();
- COMMLOGS("CRealSerialComm::SendDataToPort ClearCommError succeeded lclErrorFlags=0\n");
+ COMMLOGA2("CRealSerialComm::SendDataToPort ClearCommError succeeded lclErrorFlags=0 err=%d flush=%d\n", m_lastCommError, flush);
COMMLOGCLOSE();
// DUMPCOMSTAT(&lclComStat);
}
@@ -492,7 +501,7 @@
COMMLOGS("CRealSerialComm::SendDataToPort WriteFile successful\n");
BYTE* ptr = (BYTE*)inData;
long numBytes = (inSize > 80) ? 80 : inSize;
- char msg[200];
+ char msg[300];
sprintf(msg, "CRealSerialComm::SendDataToPort = ");
for (int i = 0; i < numBytes; i++)
{
@@ -524,12 +533,16 @@
COMSTAT lclComStat;
DWORD lclErrorFlags=0;
- if (!IsConnected())
+ if (!IsConnected() || m_hSerial == INVALID_HANDLE_VALUE)
return TCAPI_ERR_MEDIA_NOT_OPEN;
+
// Sleep(1);
if (!ClearCommError( m_hSerial, &lclErrorFlags, &lclComStat ))
{
+ if (!IsConnected() || m_hSerial == INVALID_HANDLE_VALUE)
+ return TCAPI_ERR_MEDIA_NOT_OPEN;
+
m_lastCommError = GetLastError();
err = TCAPI_ERR_COMM_ERROR;
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommVirtualSerial/TCFCommVirtualSerial.plg Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommVirtualSerial/TCFCommVirtualSerial.plg Wed Jul 21 12:11:48 2010 -0500
@@ -3,57 +3,38 @@
<pre>
<h1>Build Log</h1>
<h3>
---------------------Configuration: TCFCommVirtualSerial - Win32 Debug--------------------
+--------------------Configuration: TCFCommVirtualSerial - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPAFA.tmp" with contents
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPE38.tmp" with contents
[
-/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFCommSerial" /I "..\Common\Headers" /I "..\TCFServer" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMVIRTUALSERIAL_EXPORTS" /Fp"Debug/TCFCommVirtualSerial.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
-"C:\dev22clone\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\BaseCom.cpp"
-"C:\dev22clone\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\mutex.cpp"
-"C:\dev22clone\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommSerial\RealSerialComm.cpp"
-"C:\dev22clone\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\TCDebugLog.cpp"
-"C:\dev22clone\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommVirtualSerial\TCFCommVirtualSerial.cpp"
-"C:\dev22clone\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommVirtualSerial\VirtualSerialComm.cpp"
+/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFCommSerial" /I "..\Common\Headers" /I "..\TCFServer" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMVIRTUALSERIAL_EXPORTS" /Fp"Release/TCFCommVirtualSerial.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommSerial\RealSerialComm.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPAFA.tmp"
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPAFB.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPE38.tmp"
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPE39.tmp" with contents
[
-/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFCommSerial" /I "..\Common\Headers" /I "..\TCFServer" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMVIRTUALSERIAL_EXPORTS" /Fp"Debug/TCFCommVirtualSerial.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
-"C:\dev22clone\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommVirtualSerial\StdAfx.cpp"
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"Release/TCFCommVirtualSerial.pdb" /map:"Release/TCFCommVirtualSerial.map" /machine:I386 /out:"Release/TCFCommVirtualSerial.dll" /implib:"Release/TCFCommVirtualSerial.lib"
+.\Release\BaseCom.obj
+.\Release\mutex.obj
+.\Release\RealSerialComm.obj
+.\Release\StdAfx.obj
+.\Release\TCDebugLog.obj
+.\Release\TCFCommVirtualSerial.obj
+.\Release\VirtualSerialComm.obj
]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPAFB.tmp"
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPAFC.tmp" with contents
-[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"Debug/TCFCommVirtualSerial.pdb" /map:"Debug/TCFCommVirtualSerial.map" /debug /machine:I386 /out:"Debug/TCFCommVirtualSerial.dll" /implib:"Debug/TCFCommVirtualSerial.lib" /pdbtype:sept
-.\Debug\BaseCom.obj
-.\Debug\mutex.obj
-.\Debug\RealSerialComm.obj
-.\Debug\StdAfx.obj
-.\Debug\TCDebugLog.obj
-.\Debug\TCFCommVirtualSerial.obj
-.\Debug\VirtualSerialComm.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPAFC.tmp"
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPE39.tmp"
<h3>Output Window</h3>
Compiling...
-StdAfx.cpp
-Compiling...
-BaseCom.cpp
-mutex.cpp
RealSerialComm.cpp
-TCDebugLog.cpp
-TCFCommVirtualSerial.cpp
-VirtualSerialComm.cpp
-Generating Code...
Linking...
- Creating library Debug/TCFCommVirtualSerial.lib and object Debug/TCFCommVirtualSerial.exp
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB00.bat" with contents
+ Creating library Release/TCFCommVirtualSerial.lib and object Release/TCFCommVirtualSerial.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPE3D.bat" with contents
[
@echo off
-copyBinaries Debug
+copyBinaries Release
]
-Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB00.bat"
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPE3D.bat"
copy libs
Copy binaries to ..\..\..\os\win32\x86
The system cannot find the path specified.
Binary file connectivity/com.nokia.tcf/native/TCFNative/TCFNative.ncb has changed
Binary file connectivity/com.nokia.tcf/native/TCFNative/TCFNative.opt has changed
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/BaseCom.h Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/BaseCom.h Wed Jul 21 12:11:48 2010 -0500
@@ -124,4 +124,4 @@
#define COMMDLL_BASENAME "TCFComm"
-#endif __BASECOM_H__
+#endif //__BASECOM_H__
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/ConnectionImpl.cpp Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/ConnectionImpl.cpp Wed Jul 21 12:11:48 2010 -0500
@@ -27,7 +27,7 @@
extern BOOL gDoLogging;
#endif
-//#define LOG_CONNECTION
+#define LOG_CONNECTION
#if defined(LOG_CONNECTION) && defined(_DEBUG)
#define TCDEBUGOPEN() if (gDoLogging) { this->m_DebugLog->WaitForAccess(); }
#define TCDEBUGLOGS(s) if (gDoLogging) { sprintf(this->m_DebugLogMsg,"%s", s); this->m_DebugLog->log(this->m_DebugLogMsg); }
@@ -407,9 +407,10 @@
delete[] encodedMessage;
TCDEBUGLOGS("CConnectionImpl::DoSendMessage done\n");
- if (err == TCAPI_ERR_COMM_ERROR)
+ if (err != TCAPI_ERR_NONE)
{
// EnterRetryPeriod(err, true, m_BaseComm->m_lastCommError);
+ HandleFatalPortError(err, true, m_BaseComm->m_lastCommError);
m_OsError = m_BaseComm->m_lastCommError;
}
}
@@ -662,6 +663,19 @@
return m_Registry->AddClient(client, numberIds, ids);
}
+long CConnectionImpl::HandleFatalPortError(long err, bool passOsErr, DWORD osErr)
+{
+ TCDEBUGOPEN();
+ TCDEBUGLOGA3("CConnectionImpl::HandleFatalPortError err=%d passOsErr=%d osErr=%d\n", err, passOsErr, osErr);
+ TCDEBUGCLOSE();
+
+ m_BaseComm->ClosePort();
+ m_Status = eDisconnected;
+
+ NotifyClientsCommError(err);
+
+ return TCAPI_ERR_NONE;
+}
void CConnectionImpl::NotifyClientsCommError(long tcfError, bool passOsError, DWORD osError)
{
// TCDEBUGOPEN();
@@ -769,6 +783,8 @@
{
MPLOGA2("MessageProcessor err = %d osError = %d\n", err, pThis->m_BaseComm->m_lastCommError);
// pThis->EnterRetryPeriod(err, true, pThis->m_BaseComm->m_lastCommError);
+ if (err == TCAPI_ERR_COMM_ERROR)
+ pThis->HandleFatalPortError(err, true, pThis->m_BaseComm->m_lastCommError);
}
else
{
@@ -786,8 +802,11 @@
if (err == TCAPI_ERR_COMM_ERROR)
{
+ MPLOGA2("MessageProcessor err = %d osError = %d\n", err, pThis->m_BaseComm->m_lastCommError);
// for this error we have os error, but we probably caught this in PollPort already
// pThis->EnterRetryPeriod(err, true, pThis->m_BaseComm->m_lastCommError);
+ if (err == TCAPI_ERR_COMM_ERROR)
+ pThis->HandleFatalPortError(err, true, pThis->m_BaseComm->m_lastCommError);
}
else if (err != TCAPI_ERR_NONE)
{
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/ConnectionImpl.h Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/ConnectionImpl.h Wed Jul 21 12:11:48 2010 -0500
@@ -48,6 +48,7 @@
long DoSendMessage(long encodeOption, BYTE protocolVersion, BOOL useMsgId, BYTE msgId, DWORD msgLength, BYTE* msg);
long DoRetryProcessing();
long EnterRetryPeriod(long err, bool passOsErr, DWORD osErr);
+ long HandleFatalPortError(long err, bool passOsErr, DWORD osErr);
BOOL PauseProcessing(); // pause processing thread (not exit)
BOOL RestartProcessing(); // restart processing after a pause
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/TCFServer.plg Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/TCFServer.plg Wed Jul 21 12:11:48 2010 -0500
@@ -3,81 +3,14 @@
<pre>
<h1>Build Log</h1>
<h3>
---------------------Configuration: TCFServer - Win32 Debug--------------------
+--------------------Configuration: TCFServer - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPAC9.tmp" with contents
-[
-/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\Common\Headers" /I "..\Common\Source" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"Debug/" /Fp"Debug/TCFServer.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
-"C:\dev22clone\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\ServerManager.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPAC9.tmp"
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPACA.tmp" with contents
-[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib shlwapi.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/TCFServer.pdb" /debug /machine:I386 /out:"Debug/TCFServer.exe" /pdbtype:sept
-.\Debug\Client.obj
-.\Debug\CommRegistryItem.obj
-.\Debug\Connection.obj
-.\Debug\ConnectionImpl.obj
-.\Debug\ErrorMonitorData.obj
-.\Debug\InputStream.obj
-.\Debug\MessageFile.obj
-.\Debug\mutex.obj
-.\Debug\ProtocolRegistryItem.obj
-.\Debug\Registry.obj
-.\Debug\RegistryImpl.obj
-.\Debug\ServerClient.obj
-.\Debug\ServerManager.obj
-.\Debug\shareddata.obj
-.\Debug\StdAfx.obj
-.\Debug\TCDebugLog.obj
-.\Debug\TCFServer.obj
-.\Debug\resource.res
-]
-Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPACA.tmp"
-<h3>Output Window</h3>
-Compiling...
-ServerManager.cpp
-Linking...
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPACC.tmp" with contents
-[
-/nologo /o"Debug/TCFServer.bsc"
-.\Debug\StdAfx.sbr
-.\Debug\Client.sbr
-.\Debug\CommRegistryItem.sbr
-.\Debug\Connection.sbr
-.\Debug\ConnectionImpl.sbr
-.\Debug\ErrorMonitorData.sbr
-.\Debug\InputStream.sbr
-.\Debug\MessageFile.sbr
-.\Debug\mutex.sbr
-.\Debug\ProtocolRegistryItem.sbr
-.\Debug\Registry.sbr
-.\Debug\RegistryImpl.sbr
-.\Debug\ServerClient.sbr
-.\Debug\ServerManager.sbr
-.\Debug\shareddata.sbr
-.\Debug\TCDebugLog.sbr
-.\Debug\TCFServer.sbr]
-Creating command line "bscmake.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPACC.tmp"
-Creating browse info file...
-<h3>Output Window</h3>
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPACD.bat" with contents
-[
-@echo off
-copybinaries Debug
-]
-Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPACD.bat"
-copy binary
-Copy binaries to ..\..\..\os\win32\x86
-The system cannot find the path specified.
- 0 file(s) copied.
-Error executing c:\winnt\system32\cmd.exe.
<h3>Results</h3>
-TCFServer.exe - 1 error(s), 0 warning(s)
+TCFServer.exe - 0 error(s), 0 warning(s)
</pre>
</body>
</html>
--- a/connectivity/com.nokia.tcf/src/com/nokia/tcf/api/TCErrorConstants.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/src/com/nokia/tcf/api/TCErrorConstants.java Wed Jul 21 12:11:48 2010 -0500
@@ -48,7 +48,7 @@
public static final long TCAPI_ERR_MEDIA_IS_BUSY = 20; // used for Trace bpx when someone else is connected
public static final long TCAPI_ERR_PROTOCOL_NOT_SUPPORTED_BY_MEDIA = 21; // TraceBox does not support protocol
public static final long TCAPI_ERR_FEATURE_NOT_IMPLEMENTED = 22; // API feature not implemented yet
- public static final long TCAPI_ERR_COMM_ERROR = 23; // error while polling/reading COMM port
+ public static final long TCAPI_ERR_COMM_ERROR = 23; // error while writing/polling/reading COMM port (h/w error)
public static final long TCAPI_ERR_COMM_TIMEOUT = 24; // comm error retry timeout
public static final long TCAPI_ERR_COMM_MULTIPLE_OPEN = 25; // there are multiple connections open - cannot attach
public static final long TCAPI_ERR_NO_COMM_OPEN = 26; // there are no connections open - cannot attach
@@ -86,6 +86,7 @@
public static final long TCAPI_INFO_TRACEBOX_MEMORY_IS_NORMAL = 58; // TRACEBOX buffer overflowed and is now closed
public static final long TCAPI_ERR_TRACEBOX_DATA_CORRUPTED = 59; // TRACEBOX received corrupted trace data from phone
public static final long TCAPI_ERR_TRACEBOX_PROTOCOL_MEMORY_OVERFLOW = 60; // TRACEBOX protocol processing buffer overflowed - fatal
+ public static final long TCAPI_ERR_COMM_ERROR_DEVICE_NOT_READING = 61; // target device not reading output from TCF (USB)
/**
--- a/connectivity/com.nokia.tcf/src/com/nokia/tcf/api/messages.properties Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/src/com/nokia/tcf/api/messages.properties Wed Jul 21 12:11:48 2010 -0500
@@ -1,61 +1,62 @@
-TCErrorConstants.1=TCFError: Error opening communication port. OS Error: %d
-TCErrorConstants.2=TCFError: This connection is already open.
-TCErrorConstants.3=TCFError: Invalid client.
-TCErrorConstants.4=TCFError: Timeout occurred on attempting to open connection.
-TCErrorConstants.5=TCFError: Message file is open. This operation is not allowed.
-TCErrorConstants.8=TCFError: Message processing is stopped. This operation is not allowed.
-TCErrorConstants.9=TCFError: Message processing is in progress. This operation is not allowed.
-TCErrorConstants.10=TCFError: Error writing to message file.
-TCErrorConstants.11=TCFError: No message IDs have been specified in ITCMessageOptions.
-TCErrorConstants.12=TCFError: Connection is not open.
-TCErrorConstants.13=TCFError: This connection is not supported.
-TCErrorConstants.14=TCFError: This is an unknown connection type.
-TCErrorConstants.15=TCFError: Connection type is supported, but is missing some settings.
-TCErrorConstants.16=TCFError: Connection type is supported, but has some invalid settings.
-TCErrorConstants.17=TCFError: Connection type is supported, but there was an error in connecting.
-TCErrorConstants.18=TCFError: Could not locate the TCF Server.
-TCErrorConstants.19=TCFError: Could not create the TCF Server process.
-TCErrorConstants.20=TCFError: Connection is in use by another process.
-TCErrorConstants.21=TCFError: Protocol not supported by connection type.
-TCErrorConstants.22=TCFError: Feature not yet supported.
-TCErrorConstants.23=TCFError: Error occurred while accessing communication port.
-TCErrorConstants.24=TCFError: Timeout occurred in attempting to reconnect to communication port.
-TCErrorConstants.25=TCFError: Multiple connections are open. Attaching cannot proceed.
-TCErrorConstants.26=TCFError: No connections are open. Attaching cannot proceed.
-TCErrorConstants.27=TCFError: Client already connected.
-TCErrorConstants.28=TCFError: Invalid protocol decode format specified. Refer to ITCConnection.
-TCErrorConstants.29=TCFError: Invalid retry interval or retry timeout specified.
-TCErrorConstants.30=TCFError: Invalid input stream overflow option specified. Refer to ITCMessageOptions.
-TCErrorConstants.31=TCFError: Invalid output message encode format specified. Refer to ITCMessageOptions.
-TCErrorConstants.32=TCFError: Invalid protocol unwrapping option specified. Refer to ITCMessageOptions.
-TCErrorConstants.33=TCFError: Input stream size must be > 0.
-TCErrorConstants.34=TCFError: ITCMessageOptions missing.
-TCErrorConstants.35=TCFError: ITCConnection missing.
-TCErrorConstants.36=TCFError: ITCMessage missing.
-TCErrorConstants.37=TCFError: ITCMessage options conflict with ITCMessageOptions encoding options.
-TCErrorConstants.38=TCFError: Message IDs specified exceeded maximum (> 256)
-TCErrorConstants.39=TCFError: Error creating input stream overflow file
-TCErrorConstants.40=TCFError: Operation not allowed. Input stream is closed.
-TCErrorConstants.41=TCFError: Platform configuration location not found.
-TCErrorConstants.42=TCFError: Invalid Error Listener.
-TCErrorConstants.43=TCFError: Error occurred while accessing communication port. Retry in progress.
-TCErrorConstants.44=TCFInfo: Connection to communication port has been re-established.
-TCErrorConstants.45=TCFError: Invalid baud rate specified. Refer to ITCRealSerialConnection.
-TCErrorConstants.46=TCFError: Invalid data bits specified. Refer to ITCRealSerialConnection.
-TCErrorConstants.47=TCFError: Invalid parity checking specified. Refer to ITCRealSerialConnection.
-TCErrorConstants.48=TCFError: Invalid stop bits specified. Refer to ITCRealSerialConnection.
-TCErrorConstants.49=TCFError: Invalid flow control specified. Refer to ITCRealSerialConnection.
-TCErrorConstants.50=TCFError: TCFServer did not respond.
-TCErrorConstants.51=TCFError: Input stream buffer overflowed. Messages have been lost.
-TCErrorConstants.52=TCFInfo: Input stream buffer overflowed to file.
-TCErrorConstants.53=TCFError: Input stream file overflowed. Messages have been lost.
-TCErrorConstants.54=TCFError: Message file not specified.
-TCErrorConstants.55=TCFError: Message file could not be created.
-TCErrorConstants.56=TCFInfo: Trace box memory is close to overflowing.
-TCErrorConstants.57=TCFError: Trace box memory has overflowed and is now closed.
-TCErrorConstants.58=TCFInfo: Trace box memory was overflowed and is now available.
-TCErrorConstants.59=TCFError: Trace box received corrupted trace data from the device.
-TCErrorConstants.60=TCFError: Trace box protocol memory has overflowed. You must disconnect and reset the Trace box.
+TCErrorConstants.1=Error opening communication port. OS Error: %d
+TCErrorConstants.2=This connection is already open.
+TCErrorConstants.3=Invalid client.
+TCErrorConstants.4=Timeout occurred on attempting to open connection.
+TCErrorConstants.5=Message file is open. This operation is not allowed.
+TCErrorConstants.8=Message processing is stopped. This operation is not allowed.
+TCErrorConstants.9=Message processing is in progress. This operation is not allowed.
+TCErrorConstants.10=Error writing to message file.
+TCErrorConstants.11=No message IDs have been specified in ITCMessageOptions.
+TCErrorConstants.12=Connection is not open.
+TCErrorConstants.13=This connection is not supported.
+TCErrorConstants.14=This is an unknown connection type.
+TCErrorConstants.15=Connection type is supported, but is missing some settings.
+TCErrorConstants.16=Connection type is supported, but has some invalid settings.
+TCErrorConstants.17=The communication port could not be opened. Either it is in use by another application or it does not exist on the system.
+TCErrorConstants.18=Could not locate the TCF Server.
+TCErrorConstants.19=Could not create the TCF Server process.
+TCErrorConstants.20=Connection is in use by another process.
+TCErrorConstants.21=Protocol not supported by connection type.
+TCErrorConstants.22=Feature not yet supported.
+TCErrorConstants.23=An error occurred while reading from or writing to the opened communication port. It is possible the connected device is not listening to this port.
+TCErrorConstants.24=Timeout occurred in attempting to reconnect to communication port.
+TCErrorConstants.25=Multiple connections are open. Attaching cannot proceed.
+TCErrorConstants.26=No connections are open. Attaching cannot proceed.
+TCErrorConstants.27=Client already connected.
+TCErrorConstants.28=Invalid protocol decode format specified. Refer to ITCConnection.
+TCErrorConstants.29=Invalid retry interval or retry timeout specified.
+TCErrorConstants.30=Invalid input stream overflow option specified. Refer to ITCMessageOptions.
+TCErrorConstants.31=Invalid output message encode format specified. Refer to ITCMessageOptions.
+TCErrorConstants.32=Invalid protocol unwrapping option specified. Refer to ITCMessageOptions.
+TCErrorConstants.33=Input stream size must be > 0.
+TCErrorConstants.34=ITCMessageOptions missing.
+TCErrorConstants.35=ITCConnection missing.
+TCErrorConstants.36=ITCMessage missing.
+TCErrorConstants.37=ITCMessage options conflict with ITCMessageOptions encoding options.
+TCErrorConstants.38=Message IDs specified exceeded maximum (> 256)
+TCErrorConstants.39=Error creating input stream overflow file
+TCErrorConstants.40=Operation not allowed. Input stream is closed.
+TCErrorConstants.41=Platform configuration location not found.
+TCErrorConstants.42=Invalid Error Listener.
+TCErrorConstants.43=Error occurred while accessing communication port. Retry in progress.
+TCErrorConstants.44=Connection to communication port has been re-established.
+TCErrorConstants.45=Invalid baud rate specified. Refer to ITCRealSerialConnection.
+TCErrorConstants.46=Invalid data bits specified. Refer to ITCRealSerialConnection.
+TCErrorConstants.47=Invalid parity checking specified. Refer to ITCRealSerialConnection.
+TCErrorConstants.48=Invalid stop bits specified. Refer to ITCRealSerialConnection.
+TCErrorConstants.49=Invalid flow control specified. Refer to ITCRealSerialConnection.
+TCErrorConstants.50=TCFServer did not respond.
+TCErrorConstants.51=Input stream buffer overflowed. Messages have been lost.
+TCErrorConstants.52=Input stream buffer overflowed to file.
+TCErrorConstants.53=Input stream file overflowed. Messages have been lost.
+TCErrorConstants.54=Message file not specified.
+TCErrorConstants.55=Message file could not be created.
+TCErrorConstants.56=Trace box memory is close to overflowing.
+TCErrorConstants.57=Trace box memory has overflowed and is now closed.
+TCErrorConstants.58=Trace box memory was overflowed and is now available.
+TCErrorConstants.59=Trace box received corrupted trace data from the device.
+TCErrorConstants.60=Trace box protocol memory has overflowed. You must disconnect and reset the Trace box.
+TCErrorConstants.61=Data was sent to the open communication port, but the device is not listening to this port.
ITCRealSerialConnection.15=none
ITCRealSerialConnection.16=even
ITCRealSerialConnection.17=odd
--- a/connectivity/com.nokia.tcf/src/com/nokia/tcf/impl/TCAPIConnection.java Wed Jul 21 11:37:56 2010 -0500
+++ b/connectivity/com.nokia.tcf/src/com/nokia/tcf/impl/TCAPIConnection.java Wed Jul 21 12:11:48 2010 -0500
@@ -501,9 +501,13 @@
settings = new String[1];
} else {
// Add other connections here
+ return new Status(Status.ERROR, Activator.PLUGIN_ID, (int)TCErrorConstants.TCAPI_ERR_MEDIA_NOT_SUPPORTED,
+ "Unknown connection type: " + type, null);
}
+ return finishConnect(type, settings, inConnection, inMessageOptions, inMessageIds);
+ } else {
+ return status;
}
- return finishConnect(type, settings, inConnection, inMessageOptions, inMessageIds);
}
protected void ensureWritableFile(String filePath) throws IOException {
// ensure file path points to a writable regular file
--- a/core/carbide_releases/configuration/server.properties Wed Jul 21 11:37:56 2010 -0500
+++ b/core/carbide_releases/configuration/server.properties Wed Jul 21 12:11:48 2010 -0500
@@ -8,6 +8,7 @@
#
###############################################################################
com.nokia.carbide.cpp.news.reader.feed.listing.file=http://tools.ext.nokia.com/carbide_news_reader/feedListing.xml
-com.nokia.carbide.trk.support.service.TRKService=http://tools.ext.nokia.com/trk
-com.nokia.carbide.trk.support.service.TracingService=http://tools.ext.nokia.com/trk
+com.nokia.carbide.trk.support.service.TRKService=http://tools.ext.nokia.com/trk/TRKPackages.xml
com.nokia.carbide.discovery.directory=http://tools.ext.nokia.com/carbide/updates/3.0/discovery/directory.xml
+com.nokia.carbide.internal.discovery.ui.view.SupportPage=https://xdabug001.ext.nokia.com/bugzilla
+com.nokia.carbide.internal.discovery.ui.view.HomePage=http://www.forum.nokia.com/Library/Tools_and_downloads/Other/Carbide.c++/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.XULRunnerInitializer/.classpath Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.XULRunnerInitializer/.project Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>com.nokia.carbide.XULRunnerInitializer</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.XULRunnerInitializer/.settings/org.eclipse.jdt.core.prefs Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,8 @@
+#Mon Jul 19 10:13:13 CDT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.XULRunnerInitializer/META-INF/MANIFEST.MF Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: XULRunnerInitializer
+Bundle-SymbolicName: com.nokia.carbide.XULRunnerInitializer
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: NOKIA
+Fragment-Host: org.eclipse.swt;bundle-version="3.6.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.osgi.services;bundle-version="3.2.100"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.XULRunnerInitializer/build.properties Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.XULRunnerInitializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,32 @@
+package org.eclipse.swt.browser;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
+import org.osgi.framework.Bundle;
+
+public class XULRunnerInitializer {
+ static {
+ Bundle bundle = Platform.getBundle("org.mozilla.xulrunner.win32.win32.x86"); //$NON-NLS-1$
+ if (bundle != null) {
+ URL resourceUrl = bundle.getResource("xulrunner"); //$NON-NLS-1$
+ if (resourceUrl != null) {
+ try {
+ URL fileUrl = FileLocator.toFileURL(resourceUrl);
+ File file = new File(fileUrl.toURI());
+ System.setProperty("org.eclipse.swt.browser.XULRunnerPath", file.getAbsolutePath()); //$NON-NLS-1$
+
+ } catch (IOException e) {
+ // log the exception
+ } catch (URISyntaxException e) {
+ // log the exception
+ }
+ }
+ }
+ }
+
+}
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/book.css Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/book.css Wed Jul 21 12:11:48 2010 -0500
@@ -1,34 +1,33 @@
/*
- Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2010 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: Verdana, Helvetica, sans-serif;
- font-size: 13px;
+/* 20091007 added verdana and ariel to list to match SFO website fonts choices */
+body, p, table, li {
+ font-family: Verdana, Ariel, Helvetica, sans-serif;
+ font-size: 1.0em;
font-weight: normal;
}
-/* Use sans-serif fonts for all title styles */
h1, h2, h3, h4, h5, h6, strong, em {
- font-family: Verdana, Helvetica, sans-serif;
+ font-family: Verdana, Ariel, 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 }
+/* 20091007 - changed sizes to use em versus px */
+h1 { font-size: 1.3em }
+h2 { font-size: 1.2em }
+h3 { font-size: 1.1em }
+h4 { font-size: 1.0em }
+h5 { font-size: 0.9em }
+h6 { font-size: 0.8em }
/* For headlines at the top of a view, add space */
/* 20090224-changed green fade to gold header image */
@@ -38,6 +37,10 @@
padding:10px 0px 10px 12px;
}
+/* 20091007 SFO styling added */
+h1.NavTitle { font-size: 1.2em }
+h3 .NavListTitle { font-size: 1.1em }
+
li {
margin-bottom:8px;
margin-top:8px;
@@ -48,27 +51,28 @@
padding-top:10px;
margin-top:20px;
border-top:1px solid #999;
- font-family: Verdana, Helvetica, sans-serif;
- font-size: 11px;
- color:#333;
+ font-family: Verdana, Ariel, Helvetica, sans-serif;
+ font-size: 0.8em;
+ color: #333333;
}
.listing {
+ background-color: #FFFFCC;
font-family: "Courier New", Courier, mono;
+ font-size: 1.1em;
color: #000000;
- background-color: #FFFFCC;
margin: 5px 0px;
}
.code, pre {
font-family: "Courier New", Courier, mono;
- font-size: 13px;
+ font-size: 1.1em;
color: #000000;
}
.step {
/* background-color: #EEE; */
- /* margin: 10px 0px; */
+ /* margin: 10px 0px; */
/* color: #111; */
/* border-bottom:2px solid #EEE; */
}
@@ -88,7 +92,6 @@
table {
border: solid #999 1px;
table-layout: auto;
- font-size: 13px;
}
td, th {
@@ -97,11 +100,8 @@
vertical-align:top;
}
-/* 20070522-replaced gray with green background to match gradiant color for title */
th {
- background-color:#FFC550; /* background-color:#acd79b;
- background-color:#999;
- color:#FFF; */
+ background-color: #CCDC00;
}
div.ol.p {
@@ -118,11 +118,9 @@
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:#FDCB2F;
- /* background-color: #EEE; */
+ background-color: #D3DAD4;
font-weight:bold;
color: #000000;
}
@@ -130,8 +128,6 @@
/* 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;
@@ -143,11 +139,12 @@
/* Figure/Listing/Table titles are centered and gray */
p.figure {
- color: #333;
+ color: #026690;
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 {
@@ -163,14 +160,14 @@
}
.titleSmall {
- font-family: Helvetica, sans-serif;
- font-size: 11px;
+ font-family: Verdana, Ariel, Helvetica, sans-serif;
+ font-size: 0.8em;
}
.plain {
- font-family: Helvetica, sans-serif;
- font-size: 12px;
+ font-family: Verdana, Ariel, Helvetica, sans-serif;
+ font-size: 0.9em;
font-style: normal;
line-height: normal;
font-weight: normal;
@@ -179,6 +176,6 @@
text-decoration: none;
}
-a:link { color: #0033CC }
+a:link { color: #026690 }
a:visited { color: #555555 }
-a:hover { color: #0033CC }
+a:hover { color: #FFD62C }
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_arguments.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_arguments.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,16 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Arguments to main()</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Arguments to main()</h3>
-<p> The <span class="code">main()</span> function can accept two or more arguments (ISO C, §5.1.2.2.1) of the form:</p>
-<p class="listing">int main(int argc, char *argv[]) { /*...*/ }</p>
-<p>The values stored in the <span class="code">argc</span> and <span class="code">argv</span> arguments depend on Carbide C’s target platform. </p>
-<div id="footer">Copyright © 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></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Arguments to main()</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Arguments to main()</h3>
+<p> The <span class="code">main()</span> function can accept two or more arguments (ISO C, §5.1.2.2.1) of the form:</p>
+<p class="listing">int main(int argc, char *argv[]) { /*...*/ }</p>
+<p>The values stored in the <span class="code">argc</span> and <span class="code">argv</span> arguments depend on Carbide C’s target platform. </p>
+<div id="footer">Copyright © 2010 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></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_char_sets.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_char_sets.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,16 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Character Sets</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Character Sets</h3>
-<p> Carbide generally supports the 8-bit character set of the host OS.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Character Sets</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Character Sets</h3>
+<p> Carbide generally supports the 8-bit character set of the host OS.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_devices.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_devices.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,17 +1,17 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Arguments to main()</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Interactive Device</h3>
-<p> An interactive device is that part of a computer that accepts input from and provides output to a human operator (ISO C, §5.1.2.3). Traditionally, the conventional interactive devices are consoles, keyboards, and character display terminals. </p>
-<p>For embedded systems that do not have a keyboard or display, Carbide provides console interaction through a serial or Ethernet connection between the target and host computers.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Arguments to main()</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Interactive Device</h3>
+<p> An interactive device is that part of a computer that accepts input from and provides output to a human operator (ISO C, §5.1.2.3). Traditionally, the conventional interactive devices are consoles, keyboards, and character display terminals. </p>
+<p>For embedded systems that do not have a keyboard or display, Carbide provides console interaction through a serial or Ethernet connection between the target and host computers.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_diag_msgs.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_diag_msgs.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>How to Identify Diagnostic Messages</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>How to Identify Diagnostic Messages</h3>
-<p> Diagnostics are error and warning messages the C compiler issues when it encounters improper program syntax (ISO C, §5.1.1.3).</p>
-<p>Within the Carbide IDE, the Carbide C compiler issues diagnostic messages in the Console view. </p>
-<p>From the command line, Carbide C issues diagnostic messages to the standard error file.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>How to Identify Diagnostic Messages</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>How to Identify Diagnostic Messages</h3>
+<p> Diagnostics are error and warning messages the C compiler issues when it encounters improper program syntax (ISO C, §5.1.1.3).</p>
+<p>Within the Carbide IDE, the Carbide C compiler issues diagnostic messages in the Console view. </p>
+<p>From the command line, Carbide C issues diagnostic messages to the standard error file.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_enums.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_enums.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,16 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Enumerations</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Enumerations</h3>
-<p> See <a href="../c_compiler/c_enum_types.htm">Enumerated Types</a>.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Enumerations</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Enumerations</h3>
+<p> See <a href="../c_compiler/c_enum_types.htm">Enumerated Types</a>.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_identifiers.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_identifiers.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,16 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Character Sets</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Identifiers</h3>
-<p> (ISO C, §6.2.4.1) Carbide C recognizes the first 255 characters of identifiers, whether or not the identifiers have external linkage. In identifiers with external linkage, uppercase and lowercase characters are distinct.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Character Sets</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Identifiers</h3>
+<p> (ISO C, §6.2.4.1) Carbide C recognizes the first 255 characters of identifiers, whether or not the identifiers have external linkage. In identifiers with external linkage, uppercase and lowercase characters are distinct.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_implementation.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_implementation.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,174 +1,174 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Implementation Quantities</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Implementation Quantities</h3>
-<p> The C/C++ compiler has the implementation quantities listed in Table 1, based on the ISO C++ Standard. Although the values in the right-side column are the recommended minimums for each quantity, they do not determine the compliance of the quantity.</p>
-<p class="note"><strong>NOTE</strong> The right-side column value “unlimited” means unlimited only up to and including memory and time limitations.</p>
-<h5>Table 1. Implementation Quantities for the C/C++ Compiler</h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="74%" scope="col">Quantity</th>
- <th width="26%" scope="col">Minimum</th>
- </tr>
- <tr>
- <td>Nesting levels of compound statements, iteration control structures, and selection control structures [256]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Nesting levels of conditional inclusion [256]</td>
- <td>32</td>
- </tr>
- <tr>
- <td>Pointer, array, and function declarators (in any combination) modifying an arithmetic, structure, union, or incomplete type in a declaration [256]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Nesting levels of parenthesized expressions within a full expression [256]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Number of initial characters in an internal identifier or macro name [1024]</td>
- <td>Unlimited<br />
- (255 significant in identifiers)</td>
- </tr>
- <tr>
- <td>Number of initial characters in an external identifier [1024]</td>
- <td>Unlimited<br />
- (255 significant in identifiers)</td>
- </tr>
- <tr>
- <td>External identifiers in one translation unit [65536]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Identifiers with block scope declared in one block [1024]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Macro identifiers simultaneously defined in one translation unit [65536]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Parameters in one function definition [256]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Arguments in one function call [256]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Parameters in one macro definition [256]</td>
- <td>128</td>
- </tr>
- <tr>
- <td>Arguments in one macro invocation [256]</td>
- <td>128</td>
- </tr>
- <tr>
- <td>Characters in one logical source line [65536] </td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Characters in a character string literal or wide string literal (after concatenation) [65536]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Size of an object [262144]</td>
- <td>2 GB</td>
- </tr>
- <tr>
- <td>Nesting levels for #include files [256]</td>
- <td>32</td>
- </tr>
- <tr>
- <td>Case labels for a switch statement (excluding those for any nested switch statements) [16384]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Data members in a single class, structure, or union [16384]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Enumeration constants in a single enumeration [4096]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Levels of nested class, structure, or union definitions in a single struct-declaration-list [256]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Functions registered by atexit()[32]</td>
- <td>64</td>
- </tr>
- <tr>
- <td>Direct and indirect base classes [16384]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Direct base classes for a single class [1024]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Members declared in a single class [4096]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Final overriding virtual functions in a class, accessible or not [16384]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Direct and indirect virtual bases of a class [1024]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Static members of a class [1024]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Friend declarations in a class [4096]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Access control declarations in a class [4096]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Member initializers in a constructor definition [6144] </td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Scope qualifications of one identifier [256]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Nested external specifications [1024]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Template arguments in a template declaration [1024] </td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Recursively nested template instantiations [17]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Handlers per try block [256]</td>
- <td>Unlimited</td>
- </tr>
- <tr>
- <td>Throw specifications on a single function declaration [256]</td>
- <td>Unlimited</td>
- </tr>
-</table>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Implementation Quantities</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Implementation Quantities</h3>
+<p> The C/C++ compiler has the implementation quantities listed in Table 1, based on the ISO C++ Standard. Although the values in the right-side column are the recommended minimums for each quantity, they do not determine the compliance of the quantity.</p>
+<p class="note"><strong>NOTE</strong> The right-side column value “unlimited” means unlimited only up to and including memory and time limitations.</p>
+<h5>Table 1. Implementation Quantities for the C/C++ Compiler</h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="74%" scope="col">Quantity</th>
+ <th width="26%" scope="col">Minimum</th>
+ </tr>
+ <tr>
+ <td>Nesting levels of compound statements, iteration control structures, and selection control structures [256]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Nesting levels of conditional inclusion [256]</td>
+ <td>32</td>
+ </tr>
+ <tr>
+ <td>Pointer, array, and function declarators (in any combination) modifying an arithmetic, structure, union, or incomplete type in a declaration [256]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Nesting levels of parenthesized expressions within a full expression [256]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Number of initial characters in an internal identifier or macro name [1024]</td>
+ <td>Unlimited<br />
+ (255 significant in identifiers)</td>
+ </tr>
+ <tr>
+ <td>Number of initial characters in an external identifier [1024]</td>
+ <td>Unlimited<br />
+ (255 significant in identifiers)</td>
+ </tr>
+ <tr>
+ <td>External identifiers in one translation unit [65536]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Identifiers with block scope declared in one block [1024]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Macro identifiers simultaneously defined in one translation unit [65536]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Parameters in one function definition [256]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Arguments in one function call [256]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Parameters in one macro definition [256]</td>
+ <td>128</td>
+ </tr>
+ <tr>
+ <td>Arguments in one macro invocation [256]</td>
+ <td>128</td>
+ </tr>
+ <tr>
+ <td>Characters in one logical source line [65536] </td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Characters in a character string literal or wide string literal (after concatenation) [65536]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Size of an object [262144]</td>
+ <td>2 GB</td>
+ </tr>
+ <tr>
+ <td>Nesting levels for #include files [256]</td>
+ <td>32</td>
+ </tr>
+ <tr>
+ <td>Case labels for a switch statement (excluding those for any nested switch statements) [16384]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Data members in a single class, structure, or union [16384]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Enumeration constants in a single enumeration [4096]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Levels of nested class, structure, or union definitions in a single struct-declaration-list [256]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Functions registered by atexit()[32]</td>
+ <td>64</td>
+ </tr>
+ <tr>
+ <td>Direct and indirect base classes [16384]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Direct base classes for a single class [1024]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Members declared in a single class [4096]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Final overriding virtual functions in a class, accessible or not [16384]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Direct and indirect virtual bases of a class [1024]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Static members of a class [1024]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Friend declarations in a class [4096]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Access control declarations in a class [4096]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Member initializers in a constructor definition [6144] </td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Scope qualifications of one identifier [256]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Nested external specifications [1024]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Template arguments in a template declaration [1024] </td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Recursively nested template instantiations [17]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Handlers per try block [256]</td>
+ <td>Unlimited</td>
+ </tr>
+ <tr>
+ <td>Throw specifications on a single function declaration [256]</td>
+ <td>Unlimited</td>
+ </tr>
+</table>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_libraries.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_be_libraries.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,16 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Library Behaviors</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Library Behaviors</h3>
-<p>This reference does not cover implementation-defined behaviors in the Metrowerks Standard Library for C (MSL C).</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Library Behaviors</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Library Behaviors</h3>
+<p>This reference does not cover implementation-defined behaviors in the Metrowerks Standard Library for C (MSL C).</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_behavior.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_behavior/c_behavior.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>C Implementation-Defined Behavior</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>C Implementation-Defined Behavior</h2>
-<p> The ISO standard for C leaves many details about the form and translation of C programs up to the implementation of the C compiler. Section J.3 of the ISO C Standard lists the unique implementation-defined behaviors. Numbers in parentheses that begin with “§” indicate the ISO C standard section to which an implementation-defined behavior refers.</p>
-<p> This section refers to implementation-defined behaviors of the compiler itself. Topics include: </p>
-<ul>
- <li><a href="c_be_diag_msgs.htm">How to Identify Diagnostic Messages</a></li>
- <li><a href="c_be_arguments.htm">Arguments to main()</a></li>
- <li><a href="c_be_devices.htm"> Interactive Devices</a></li>
- <li><a href="c_be_identifiers.htm">Identifiers</a></li>
- <li><a href="c_be_char_sets.htm">Character Sets</a></li>
- <li> <a href="c_be_enums.htm">Enumerations</a></li>
- <li><a href="c_be_implementation.htm">Implementation Quantities</a></li>
- <li><a href="c_be_libraries.htm">Library Behaviors</a></li>
-</ul>
-<p>For information on implementation-defined behaviors of the Standard C Library, consult the <strong>MSL C Library Reference</strong>.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>C Implementation-Defined Behavior</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>C Implementation-Defined Behavior</h2>
+<p> The ISO standard for C leaves many details about the form and translation of C programs up to the implementation of the C compiler. Section J.3 of the ISO C Standard lists the unique implementation-defined behaviors. Numbers in parentheses that begin with “§” indicate the ISO C standard section to which an implementation-defined behavior refers.</p>
+<p> This section refers to implementation-defined behaviors of the compiler itself. Topics include: </p>
+<ul>
+ <li><a href="c_be_diag_msgs.htm">How to Identify Diagnostic Messages</a></li>
+ <li><a href="c_be_arguments.htm">Arguments to main()</a></li>
+ <li><a href="c_be_devices.htm"> Interactive Devices</a></li>
+ <li><a href="c_be_identifiers.htm">Identifiers</a></li>
+ <li><a href="c_be_char_sets.htm">Character Sets</a></li>
+ <li> <a href="c_be_enums.htm">Enumerations</a></li>
+ <li><a href="c_be_implementation.htm">Implementation Quantities</a></li>
+ <li><a href="c_be_libraries.htm">Library Behaviors</a></li>
+</ul>
+<p>For information on implementation-defined behaviors of the Standard C Library, consult the <strong>MSL C Library Reference</strong>.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_ansi_keywords.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_ansi_keywords.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>ANSI Keywords Only</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>ANSI Keywords Only</h3>
-<p>(ISO C, §6.4.1) The Carbide compiler can recognize several additional reserved keywords. If you enable this setting, the compiler generates an error if it encounters any of the additional keywords that it recognizes. If you must write source code that strictly adheres to the ISO standard, enable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting.</p>
-<p>If you disable this setting, the compiler recognizes the following non-standard keywords:</p>
-<ul>
- <li><span class="code">far</span>—Specifies how the compiler generates addressing modes and operations. It is not available for every target platform.</li>
- <li><span class="code">inline</span>—Lets you declare a C function to be inline. For more information, see <a href="c_inlining.htm">Inlining</a>.</li>
- <li><span class="code">pascal</span>—No longer used.</li>
-</ul>
-<p>The ANSI Keywords Only setting corresponds to the pragma only_std_keywords. To check this setting, use <span class="code">__option (only_std_keywords)</span>. By default, this setting is disabled.</p>
-<p>See also “only_std_keywords” and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>ANSI Keywords Only</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>ANSI Keywords Only</h3>
+<p>(ISO C, §6.4.1) The Carbide compiler can recognize several additional reserved keywords. If you enable this setting, the compiler generates an error if it encounters any of the additional keywords that it recognizes. If you must write source code that strictly adheres to the ISO standard, enable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting.</p>
+<p>If you disable this setting, the compiler recognizes the following non-standard keywords:</p>
+<ul>
+ <li><span class="code">far</span>—Specifies how the compiler generates addressing modes and operations. It is not available for every target platform.</li>
+ <li><span class="code">inline</span>—Lets you declare a C function to be inline. For more information, see <a href="c_inlining.htm">Inlining</a>.</li>
+ <li><span class="code">pascal</span>—No longer used.</li>
+</ul>
+<p>The ANSI Keywords Only setting corresponds to the pragma only_std_keywords. To check this setting, use <span class="code">__option (only_std_keywords)</span>. By default, this setting is disabled.</p>
+<p>See also “only_std_keywords” and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_bit_rotation.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_bit_rotation.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Intrinsic Functions for Bit Rotation</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Intrinsic Functions for Bit Rotation</h3>
-<p>The Carbide C language has functions</p>
-<p class="listing">__rol(op, n)<br />
- __ror(op, n)</p>
-<p>that do left- or right-bit rotation, respectively.</p>
-<p>The <span class="code">op</span> argument represents the item with the rotated bits. The <span class="code">n</span> argument represents the number of times to rotate the op bits.</p>
-<p>The <span class="code">op</span> argument is not promoted to a larger data type and can be of type <span class="code">char</span>, <span class="code">short</span>, <span class="code">int</span>, <span class="code">long</span>, or <span class="code">long long</span>.</p>
-<p>These functions are intrinsic (“built-in”). That is, you do not have to provide function prototypes or link with special libraries to use these functions.</p>
-<p class="note"><strong>NOTE</strong> Currently, these functions are limited to the Motorola 68K and Intel x86 versions of the Carbide C/C++ compiler.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Intrinsic Functions for Bit Rotation</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Intrinsic Functions for Bit Rotation</h3>
+<p>The Carbide C language has functions</p>
+<p class="listing">__rol(op, n)<br />
+ __ror(op, n)</p>
+<p>that do left- or right-bit rotation, respectively.</p>
+<p>The <span class="code">op</span> argument represents the item with the rotated bits. The <span class="code">n</span> argument represents the number of times to rotate the op bits.</p>
+<p>The <span class="code">op</span> argument is not promoted to a larger data type and can be of type <span class="code">char</span>, <span class="code">short</span>, <span class="code">int</span>, <span class="code">long</span>, or <span class="code">long long</span>.</p>
+<p>These functions are intrinsic (“built-in”). That is, you do not have to provide function prototypes or link with special libraries to use these functions.</p>
+<p class="note"><strong>NOTE</strong> Currently, these functions are limited to the Motorola 68K and Intel x86 versions of the Carbide C/C++ compiler.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_char_const_as_int.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_char_const_as_int.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,46 +1,46 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Character Constants as Integer Values</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Character Constants as Integer Values</h3>
-<p>(ISO C, §6.4.4.4) The C compiler lets you use string literals containing 2 to 8 characters to denote 32-bit or 64-bit integer values. Table 2.2 shows examples.</p>
-<p>Table 2.2 Integer Values as Character String Constants</p>
-<table width="73%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="33%" scope="col">Character constant</th>
- <th width="67%" scope="col">Equivalent hexadecimal integer value</th>
- </tr>
- <tr>
- <td class="code">'ABCDEFGH'</td>
- <td><span class="code">0x4142434445464748</span> (64-bit value)</td>
- </tr>
- <tr>
- <td class="code">'ABCDE'</td>
- <td><span class="code">0x0000000041424344</span> (64-bit value)</td>
- </tr>
- <tr>
- <td class="code">'ABCD'</td>
- <td><span class="code">0x41424344</span> (32-bit value)</td>
- </tr>
- <tr>
- <td class="code">'ABC'</td>
- <td><span class="code">0x00414243</span> (32-bit value)</td>
- </tr>
- <tr>
- <td class="code">'AB'</td>
- <td><span class="code">0x00004142</span> (32-bit value)</td>
- </tr>
-</table>
-<p>You cannot disable this extension, and it has no corresponding pragma or setting in any panel.</p>
-<p class="note"><strong>NOTE</strong> This feature differs from using multibyte character sets, where a single character requires a data type larger than 1 byte. See <a href="c_multibyte_support.htm">Multibyte and Unicode Support</a> for information on using character sets with more than 256 characters (such as Kanji).<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Character Constants as Integer Values</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Character Constants as Integer Values</h3>
+<p>(ISO C, §6.4.4.4) The C compiler lets you use string literals containing 2 to 8 characters to denote 32-bit or 64-bit integer values. Table 2.2 shows examples.</p>
+<p>Table 2.2 Integer Values as Character String Constants</p>
+<table width="73%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="33%" scope="col">Character constant</th>
+ <th width="67%" scope="col">Equivalent hexadecimal integer value</th>
+ </tr>
+ <tr>
+ <td class="code">'ABCDEFGH'</td>
+ <td><span class="code">0x4142434445464748</span> (64-bit value)</td>
+ </tr>
+ <tr>
+ <td class="code">'ABCDE'</td>
+ <td><span class="code">0x0000000041424344</span> (64-bit value)</td>
+ </tr>
+ <tr>
+ <td class="code">'ABCD'</td>
+ <td><span class="code">0x41424344</span> (32-bit value)</td>
+ </tr>
+ <tr>
+ <td class="code">'ABC'</td>
+ <td><span class="code">0x00414243</span> (32-bit value)</td>
+ </tr>
+ <tr>
+ <td class="code">'AB'</td>
+ <td><span class="code">0x00004142</span> (32-bit value)</td>
+ </tr>
+</table>
+<p>You cannot disable this extension, and it has no corresponding pragma or setting in any panel.</p>
+<p class="note"><strong>NOTE</strong> This feature differs from using multibyte character sets, where a single character requires a data type larger than 1 byte. See <a href="c_multibyte_support.htm">Multibyte and Unicode Support</a> for information on using character sets with more than 256 characters (such as Kanji).<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_compiler.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_compiler.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>C Compiler</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>C Compiler</h2>
-<p>This section covers the following topics:</p>
-<ul>
- <li><a href="c_implementation.htm"> The Carbide Implementation of C</a></li>
- <li><a href="c_iso_extensions.htm"> Extensions to ISO C</a></li>
-</ul>
-<p>The information in this section applies to all target platforms for which the Carbide C compiler generates object code. </p>
-<p>This section does not cover C++ features. For more information on the Carbide.c++ language, see <a href="../cpp_compiler/cpp_compiler.htm">C++ Compiler</a>.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>C Compiler</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>C Compiler</h2>
+<p>This section covers the following topics:</p>
+<ul>
+ <li><a href="c_implementation.htm"> The Carbide Implementation of C</a></li>
+ <li><a href="c_iso_extensions.htm"> Extensions to ISO C</a></li>
+</ul>
+<p>The information in this section applies to all target platforms for which the Carbide C compiler generates object code. </p>
+<p>This section does not cover C++ features. For more information on the Carbide.c++ language, see <a href="../cpp_compiler/cpp_compiler.htm">C++ Compiler</a>.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_convert_ptrs.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_convert_ptrs.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Converting Pointers to Types of the Same Size</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Converting Pointers to Types of the Same Size</h3>
-<p>The C compiler allows the conversion of pointer types to integral data types of the same size in global initializations. Since this type of conversion does not conform to the ANSI C standard, it is only available if the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting is disabled. </p>
-<div class="listing">
- <h5>Converting a Pointer to a Same-sized Integral Type</h5>
- <p>char c;<br />
- long arr = (long)&c; // accepted (not ISO C)</p>
-</div>
-<p>See <a href="c_std_conformity.htm">Checking for Standard C and Standard C++ Conformity</a> for more information on this setting. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Converting Pointers to Types of the Same Size</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Converting Pointers to Types of the Same Size</h3>
+<p>The C compiler allows the conversion of pointer types to integral data types of the same size in global initializations. Since this type of conversion does not conform to the ANSI C standard, it is only available if the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting is disabled. </p>
+<div class="listing">
+ <h5>Converting a Pointer to a Same-sized Integral Type</h5>
+ <p>char c;<br />
+ long arr = (long)&c; // accepted (not ISO C)</p>
+</div>
+<p>See <a href="c_std_conformity.htm">Checking for Standard C and Standard C++ Conformity</a> for more information on this setting. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_cpp_comments.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_cpp_comments.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>C++ Comments</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>C++ Comments</h3>
-<p>(ISO C, §6.4.9) The C compiler can accept C++ comments (<span class="code">//</span>) in source code. C++ comments consist of anything that follows <span class="code">//</span> on a line.</p>
-<p class="listing"> a = b; // This is a C++ comment</p>
-<p>To use this feature, disable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting.</p>
-<p>See also <a href="c_std_conformity.htm">Checking for Standard C and Standard C++ Conformity</a>.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>C++ Comments</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>C++ Comments</h3>
+<p>(ISO C, §6.4.9) The C compiler can accept C++ comments (<span class="code">//</span>) in source code. C++ comments consist of anything that follows <span class="code">//</span> on a line.</p>
+<p class="listing"> a = b; // This is a C++ comment</p>
+<p>To use this feature, disable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting.</p>
+<p>See also <a href="c_std_conformity.htm">Checking for Standard C and Standard C++ Conformity</a>.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_d_constant_suffix.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_d_constant_suffix.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,19 +1,19 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>The “D” Constant Suffix</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>The “D” Constant Suffix</h3>
-<p>When the compiler finds a “D” immediately after a floating point constant value, it treats that value as data of type double.</p>
-<p>When the pragma <span class="code">float_constants</span> is enabled, floating point constants should end with a “D” so that the compiler does not treat them as values of type float.</p>
-<p>For related information, see “float_constants”.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>The “D” Constant Suffix</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>The “D” Constant Suffix</h3>
+<p>When the compiler finds a “D” immediately after a floating point constant value, it treats that value as data of type double.</p>
+<p>When the pragma <span class="code">float_constants</span> is enabled, floating point constants should end with a “D” so that the compiler does not treat them as values of type float.</p>
+<p>For related information, see “float_constants”.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_declare_var_addr.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_declare_var_addr.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,19 +1,19 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Declaring Variables by Address</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Declaring Variables by Address</h3>
-<p>(ISO C, §6.7.8) The C compiler lets you explicitly specify the address that contains the value of a variable. For example, this definition states that the variable <span class="code">MemErr</span> contains the contents of the address <span class="code">0x220</span>:</p>
-<p class="listing">short MemErr:0x220;</p>
-<p> You cannot disable this extension, and it has no corresponding pragma or setting in a panel.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Declaring Variables by Address</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Declaring Variables by Address</h3>
+<p>(ISO C, §6.7.8) The C compiler lets you explicitly specify the address that contains the value of a variable. For example, this definition states that the variable <span class="code">MemErr</span> contains the contents of the address <span class="code">0x220</span>:</p>
+<p class="listing">short MemErr:0x220;</p>
+<p> You cannot disable this extension, and it has no corresponding pragma or setting in a panel.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_decspec_decl.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_decspec_decl.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>The __declspec Declarator</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>The __declspec Declarator</h3>
-<p>The <span class="code">__declspec(arg)</span> declarator is a convention adopted from Win32 compilers to extend the type system. All Carbide compilers recognize this declarator.</p>
-<p>The <span class="code">__declspec</span> declarator must appear before the name of the object as shown below:</p>
-<p class="listing"> __declspec(arg) int foo();<br />
- class __declspec(arg) bar { ... };</p>
-<p>The list of valid arguments are grouped by targets:</p>
-<ul>
- <li>All Targets</li>
- <li>Non-Win32 Targets Only</li>
- <li>Win32 Targets Only </li>
-</ul>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>The __declspec Declarator</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>The __declspec Declarator</h3>
+<p>The <span class="code">__declspec(arg)</span> declarator is a convention adopted from Win32 compilers to extend the type system. All Carbide compilers recognize this declarator.</p>
+<p>The <span class="code">__declspec</span> declarator must appear before the name of the object as shown below:</p>
+<p class="listing"> __declspec(arg) int foo();<br />
+ class __declspec(arg) bar { ... };</p>
+<p>The list of valid arguments are grouped by targets:</p>
+<ul>
+ <li>All Targets</li>
+ <li>Non-Win32 Targets Only</li>
+ <li>Win32 Targets Only </li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_endif_identifier.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_endif_identifier.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,34 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Using an Identifier After #endif</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Using an Identifier After #endif</h3>
-<p>(ISO C, §6.10.1) The C compiler can accept identifier tokens after <span class="code">#endif</span> and <span class="code">#else</span>. This extension helps you match an <span class="code">#endif</span> statement with its corresponding <span class="code">#if</span>, <span class="code">#ifdef</span>, or <span class="code">#ifndef</span> statement, as shown here:</p>
-<p class="listing">#ifdef __MWERKS__<br />
- # ifndef __cplusplus<br />
- /*<br />
- * . . . <br />
- */<br />
- # endif __cplusplus<br />
-#endif __MWERKS__</p>
-<p>To use this feature, disable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting.</p>
-<p class="note"><strong>TIP</strong> If you enable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting (thereby disabling this extension), you can still match your <span class="code">#ifdef</span> and <span class="code">#endif</span> directives. Simply put the identifiers into comments, as sown in following example:<br />
- <br />
- <span class="code">#ifdef __MWERKS__<br />
- # ifndef __cplusplus<br />
- /*<br />
- * . . . <br />
- */<br />
- # endif /* __cplusplus */<br />
-#endif /* __MWERKS__ */</span></p>
-<p>See also <a href="c_std_conformity.htm">Checking for Standard C and Standard C++ Conformity</a>.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Using an Identifier After #endif</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Using an Identifier After #endif</h3>
+<p>(ISO C, §6.10.1) The C compiler can accept identifier tokens after <span class="code">#endif</span> and <span class="code">#else</span>. This extension helps you match an <span class="code">#endif</span> statement with its corresponding <span class="code">#if</span>, <span class="code">#ifdef</span>, or <span class="code">#ifndef</span> statement, as shown here:</p>
+<p class="listing">#ifdef __MWERKS__<br />
+ # ifndef __cplusplus<br />
+ /*<br />
+ * . . . <br />
+ */<br />
+ # endif __cplusplus<br />
+#endif __MWERKS__</p>
+<p>To use this feature, disable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting.</p>
+<p class="note"><strong>TIP</strong> If you enable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting (thereby disabling this extension), you can still match your <span class="code">#ifdef</span> and <span class="code">#endif</span> directives. Simply put the identifiers into comments, as sown in following example:<br />
+ <br />
+ <span class="code">#ifdef __MWERKS__<br />
+ # ifndef __cplusplus<br />
+ /*<br />
+ * . . . <br />
+ */<br />
+ # endif /* __cplusplus */<br />
+#endif /* __MWERKS__ */</span></p>
+<p>See also <a href="c_std_conformity.htm">Checking for Standard C and Standard C++ Conformity</a>.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_enum_types.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_enum_types.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,63 +1,63 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Enumerated Types</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Enumerated Types</h3>
-<p>(ISO C, §6.2.5) The Carbide C compiler uses the Enums Always Int and <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> settings to choose which underlying integer type to use for an enumerated type.</p>
-<p>If you enable the Enums Always Int setting, the underlying type for enumerated data types is set to signed int. Enumerators cannot be larger than a signed int. If an enumerated constant is larger than an int, the compiler generates an error.</p>
-<p>If you disable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting, enumerators that can be represented as an unsigned int are implicitly converted to signed int.</p>
-<div class="listing">
- <h5>Listing 2.2 Example of Enumerations as Signed Integers</h5>
- <p>#pragma enumsalwaysint on<br />
- #pragma ANSI_strict on<br />
- enum foo { a=0xFFFFFFFF }; // ERROR. a is 4,294,967,295:<br />
- // too big for a signed int<br />
- #pragma ANSI_strict off<br />
- enum bar { b=0xFFFFFFFF }; // OK: b can be represented as an<br />
- // unsigned int, but is implicitly<br />
- // converted to a signed int (-1).</p>
-</div>
-<p>If you disable the Enums Always Int setting, the compiler chooses the integral data type that supports the largest enumerated constant. The type can be as small as a char or as large as a long int. It can even be a 64-bit long long value.</p>
-<p>If all enumerators are positive, the compiler chooses the smallest unsigned integral base type that is large enough to represent all enumerators. If at least one enumerator is negative, the compiler chooses the smallest signed integral base type large enough to represent all enumerators.</p>
-<div class="listing">
- <h5>Listing 2.3 Example of Enumeration Base Types</h5>
- <p> #pragma enumsalwaysint off<br />
- enum { a=0,b=1 }; // base type: unsigned char<br />
- enum { c=0,d=-1 }; // base type: signed char<br />
- enum { e=0,f=128,g=-1 }; // base type: signed short</p>
-</div>
-<p>The compiler uses long long data types only if you disable Enums Always Int and enable the longlong_enums pragma. (None of the settings corresponds to the longlong_enums pragma.)</p>
-<div class="listing">
- <h5>Listing 2.4 Example of Enumerations with Type long long</h5>
- <p> #pragma enumsalwaysint off<br />
- #pragma longlong_enums off<br />
- enum { a=0x7FFFFFFFFFFFFFFF }; // ERROR: a is too large<br />
- #pragma longlong_enums on<br />
- enum { b=0x7FFFFFFFFFFFFFFF }; // OK: base type: signed long long<br />
- enum { c=0x8000000000000000 }; // OK: base type: unsigned long long<br />
- enum {þd=-1,e=0x80000000 }; // OK: base type: signed long long</p>
-</div>
-<p>When you disable the longlong_enums pragma and enable ANSI Strict, you cannot mix unsigned 32-bit enumerators greater than 0x7FFFFFFF and negative enumerators. If you disable both the longlong_enums pragma and the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting, large unsigned 32-bit enumerators are implicitly converted to signed 32-bit types.</p>
-<div class="listing">
- <h5>Listing 2.5 Example of Enumerations with Type long</h5>
- <p>#pragma enumsalwaysint off<br />
- #pragma longlong_enums off<br />
- #pragma ANSI_strict on<br />
- enum { a=-1,b=0xFFFFFFFF }; // error<br />
- #pragma ANSI_strict off<br />
- enum { c=-1,d=0xFFFFFFFF }; // base type: signed int (b==-1)</p>
-</div>
-<p>The Enums Always Int setting corresponds to the pragma enumsalwaysint. To check this setting, use <span class="code">__option (enumsalwaysint)</span>.</p>
-<p>By default, this setting is disabled.</p>
-<p>See also “enumsalwaysint”, “longlong_enums”, and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Enumerated Types</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Enumerated Types</h3>
+<p>(ISO C, §6.2.5) The Carbide C compiler uses the Enums Always Int and <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> settings to choose which underlying integer type to use for an enumerated type.</p>
+<p>If you enable the Enums Always Int setting, the underlying type for enumerated data types is set to signed int. Enumerators cannot be larger than a signed int. If an enumerated constant is larger than an int, the compiler generates an error.</p>
+<p>If you disable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting, enumerators that can be represented as an unsigned int are implicitly converted to signed int.</p>
+<div class="listing">
+ <h5>Listing 2.2 Example of Enumerations as Signed Integers</h5>
+ <p>#pragma enumsalwaysint on<br />
+ #pragma ANSI_strict on<br />
+ enum foo { a=0xFFFFFFFF }; // ERROR. a is 4,294,967,295:<br />
+ // too big for a signed int<br />
+ #pragma ANSI_strict off<br />
+ enum bar { b=0xFFFFFFFF }; // OK: b can be represented as an<br />
+ // unsigned int, but is implicitly<br />
+ // converted to a signed int (-1).</p>
+</div>
+<p>If you disable the Enums Always Int setting, the compiler chooses the integral data type that supports the largest enumerated constant. The type can be as small as a char or as large as a long int. It can even be a 64-bit long long value.</p>
+<p>If all enumerators are positive, the compiler chooses the smallest unsigned integral base type that is large enough to represent all enumerators. If at least one enumerator is negative, the compiler chooses the smallest signed integral base type large enough to represent all enumerators.</p>
+<div class="listing">
+ <h5>Listing 2.3 Example of Enumeration Base Types</h5>
+ <p> #pragma enumsalwaysint off<br />
+ enum { a=0,b=1 }; // base type: unsigned char<br />
+ enum { c=0,d=-1 }; // base type: signed char<br />
+ enum { e=0,f=128,g=-1 }; // base type: signed short</p>
+</div>
+<p>The compiler uses long long data types only if you disable Enums Always Int and enable the longlong_enums pragma. (None of the settings corresponds to the longlong_enums pragma.)</p>
+<div class="listing">
+ <h5>Listing 2.4 Example of Enumerations with Type long long</h5>
+ <p> #pragma enumsalwaysint off<br />
+ #pragma longlong_enums off<br />
+ enum { a=0x7FFFFFFFFFFFFFFF }; // ERROR: a is too large<br />
+ #pragma longlong_enums on<br />
+ enum { b=0x7FFFFFFFFFFFFFFF }; // OK: base type: signed long long<br />
+ enum { c=0x8000000000000000 }; // OK: base type: unsigned long long<br />
+ enum {þd=-1,e=0x80000000 }; // OK: base type: signed long long</p>
+</div>
+<p>When you disable the longlong_enums pragma and enable ANSI Strict, you cannot mix unsigned 32-bit enumerators greater than 0x7FFFFFFF and negative enumerators. If you disable both the longlong_enums pragma and the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting, large unsigned 32-bit enumerators are implicitly converted to signed 32-bit types.</p>
+<div class="listing">
+ <h5>Listing 2.5 Example of Enumerations with Type long</h5>
+ <p>#pragma enumsalwaysint off<br />
+ #pragma longlong_enums off<br />
+ #pragma ANSI_strict on<br />
+ enum { a=-1,b=0xFFFFFFFF }; // error<br />
+ #pragma ANSI_strict off<br />
+ enum { c=-1,d=0xFFFFFFFF }; // base type: signed int (b==-1)</p>
+</div>
+<p>The Enums Always Int setting corresponds to the pragma enumsalwaysint. To check this setting, use <span class="code">__option (enumsalwaysint)</span>.</p>
+<p>By default, this setting is disabled.</p>
+<p>See also “enumsalwaysint”, “longlong_enums”, and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_expand_trigraphs.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_expand_trigraphs.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Expand Trigraphs</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Expand Trigraphs</h3>
-<p>(ISO C, §5.2.1.1) The C compiler normally ignores trigraph characters. Many common character constants look like trigraph sequences, and this extension lets you use them without including escape characters.</p>
-<p>If you must write source code that strictly adheres to the ISO standard, enable the <a href="../pragmas/p_trigraphs.htm">Expand Trigraphs</a> setting. When you enable this setting, be careful when initializing strings or multi-character constants that contain question marks.</p>
-<p class="listing">char c = '????'; // ERROR: Trigraph sequence expands to '??^<br />
- char d = '\?\?\?\?'; // OK</p>
-<p>The <a href="../pragmas/p_trigraphs.htm">Expand Trigraphs</a> setting corresponds to the pragma trigraphs, To check this setting, use <span class="code">__option (trigraphs)</span>. By default, this setting is disabled.</p>
-<p>See also “trigraphs” and <a href="../symbols/sym_settings.htm">Checking Settings</a>.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Expand Trigraphs</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Expand Trigraphs</h3>
+<p>(ISO C, §5.2.1.1) The C compiler normally ignores trigraph characters. Many common character constants look like trigraph sequences, and this extension lets you use them without including escape characters.</p>
+<p>If you must write source code that strictly adheres to the ISO standard, enable the <a href="../pragmas/p_trigraphs.htm">Expand Trigraphs</a> setting. When you enable this setting, be careful when initializing strings or multi-character constants that contain question marks.</p>
+<p class="listing">char c = '????'; // ERROR: Trigraph sequence expands to '??^<br />
+ char d = '\?\?\?\?'; // OK</p>
+<p>The <a href="../pragmas/p_trigraphs.htm">Expand Trigraphs</a> setting corresponds to the pragma trigraphs, To check this setting, use <span class="code">__option (trigraphs)</span>. By default, this setting is disabled.</p>
+<p>See also “trigraphs” and <a href="../symbols/sym_settings.htm">Checking Settings</a>.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_function_identifier.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_function_identifier.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,17 +1,17 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>The __FUNCTION__ Predefined Identifier</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>The __FUNCTION__ Predefined Identifier</h3>
-<p>The <span class="code">__FUNCTION__</span> predefined identifier contains the name of the function currently being compiled. For related information, see “Predefined Symbols”.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>The __FUNCTION__ Predefined Identifier</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>The __FUNCTION__ Predefined Identifier</h3>
+<p>The <span class="code">__FUNCTION__</span> predefined identifier contains the name of the function currently being compiled. For related information, see “Predefined Symbols”.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_gcc_ext_support.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_gcc_ext_support.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,137 +1,137 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>GCC Extension Support</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>GCC Extension Support</h3>
-<p>Use the <a href="../pragmas/p_gcc_extensions.htm">GCC Extensions</a> setting to enable the compiler to accept some GCC syntax and conventions. This option is the same as the previously-supported <span class="code">#pragma gcc_extensions</span>. </p>
-<p>The following GCC compatibility enhancements have been added:</p>
-<ul>
- <li>Statements in expressions are allowed</li>
-</ul>
-<blockquote>
- <p class="listing"> ({int a; a=myfunc(); a; })</p>
-</blockquote>
-<ul>
- <li> GCC-style inline assembly supported on some targets only</li>
-</ul>
-<blockquote>
- <p class="listing"> int count_leading_zero(int value) <br />
- {<br />
- asm ( "cntlzw %0, %1" : "=r" (bits) : "r" (value) ); <br />
- return bits;<br />
- }</p>
-</blockquote>
-<ul>
- <li> GCC-style macro varargs supported</li>
-</ul>
-<blockquote>
- <p class="listing">#define DEBUG(fmt,args...) printf(fmt, ## args)<br />
- DEBUG("test");<br />
- DEBUG("saw %d copies\n", n_copies);<br />
-• The abbreviated “?:” operator is allowed<br />
- x = y ?: z; // --> x = y ? y : z;</p>
-</blockquote>
-<ul>
- <li>Allow incomplete structs in array declarations</li>
-</ul>
-<blockquote>
- <p class="listing">struct Incomplete arr[10];</p>
-</blockquote>
-<ul>
- <li> Allow <span class="code">Class::Member</span> in a class declaration</li>
-</ul>
-<blockquote>
- <p class="listing">class MyClass {<br />
- ...<br />
- int MyClass::getval(); <br />
- ...<br />
- };</p>
-</blockquote>
-<ul>
- <li> Allow empty structs</li>
-</ul>
-<blockquote>
- <p class="listing">struct empty { } x;</p>
-</blockquote>
-<ul>
- <li>Allow empty struct initialization</li>
-</ul>
-<blockquote>
- <p class="listing">struct empty { } x = {};</p>
-</blockquote>
-<ul>
- <li>Struct initializer typecast support</li>
-</ul>
-<blockquote>
- <p class="listing">typedef struct { int x, y, z; float q; } mystruct;<br />
- void foo(mystruct s);<br />
- foo( (mystruct) { 1,2,3,6e3 } );</p>
-</blockquote>
-<ul>
- <li>Limited support for “<span class="code">void *</span>” and function pointer arithmetic</li>
-</ul>
-<blockquote>
- <p class="listing">void *p;<br />
- p = &data + 10; // point 10 bytes into "p"<br />
- void foo();<br />
- p = foo + 10; // point 10 bytes into "foo"<br />
- At this time, the increment and decrement operators “++” don’t work with void/function pointers.</p>
-</blockquote>
-<ul>
- <li><span class="code">sizeof(function)</span> and <span class="code">sizeof(void)</span> is 1</li>
- <li> Function pointers may be compared to “<span class="code">void *</span>”</li>
- <li> Allow null statement (no trailing semicolon) in “switch”</li>
-</ul>
-<blockquote>
- <p class="listing">switch(x) {<br />
- label:<br />
- }</p>
-</blockquote>
-<ul>
- <li>Macro redefinitions with different values allowed </li>
-</ul>
-<blockquote>
- <p class="listing">#define MAC 3<br />
- #define MAC (3)</p>
-</blockquote>
-<ul>
- <li>“<span class="code"><?</span>”, “<span class="code">>?</span>” <span class="code">MIN</span>/<span class="code">MAX</span> operators supported for some targets</li>
- <li>Arrays may be assigned</li>
-</ul>
-<blockquote>
- <p class="listing">int a[10], b[10];<br />
- a = b;</p>
-</blockquote>
-<ul>
- <li>Allow trailing comma in enumerations without warning</li>
-</ul>
-<blockquote>
- <p class="listing"> enum { A, B, C, };</p>
-</blockquote>
-<ul>
- <li>Allow empty array as final member of struct</li>
-</ul>
-<blockquote>
- <p class="listing">typedef struct {<br />
- int type;<br />
- char data[];<br />
- } Node;</p>
-</blockquote>
-<ul>
- <li>Designated initializer support</li>
-</ul>
-<blockquote>
- <p class="listing">struct { int x, y, z; float q; } x = { q: 3.0, <br />
- y:1, z:-4, x:-6 };</p>
-</blockquote>
-<p>For related information, see the #pragma gcc_extensions. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>GCC Extension Support</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>GCC Extension Support</h3>
+<p>Use the <a href="../pragmas/p_gcc_extensions.htm">GCC Extensions</a> setting to enable the compiler to accept some GCC syntax and conventions. This option is the same as the previously-supported <span class="code">#pragma gcc_extensions</span>. </p>
+<p>The following GCC compatibility enhancements have been added:</p>
+<ul>
+ <li>Statements in expressions are allowed</li>
+</ul>
+<blockquote>
+ <p class="listing"> ({int a; a=myfunc(); a; })</p>
+</blockquote>
+<ul>
+ <li> GCC-style inline assembly supported on some targets only</li>
+</ul>
+<blockquote>
+ <p class="listing"> int count_leading_zero(int value) <br />
+ {<br />
+ asm ( "cntlzw %0, %1" : "=r" (bits) : "r" (value) ); <br />
+ return bits;<br />
+ }</p>
+</blockquote>
+<ul>
+ <li> GCC-style macro varargs supported</li>
+</ul>
+<blockquote>
+ <p class="listing">#define DEBUG(fmt,args...) printf(fmt, ## args)<br />
+ DEBUG("test");<br />
+ DEBUG("saw %d copies\n", n_copies);<br />
+• The abbreviated “?:” operator is allowed<br />
+ x = y ?: z; // --> x = y ? y : z;</p>
+</blockquote>
+<ul>
+ <li>Allow incomplete structs in array declarations</li>
+</ul>
+<blockquote>
+ <p class="listing">struct Incomplete arr[10];</p>
+</blockquote>
+<ul>
+ <li> Allow <span class="code">Class::Member</span> in a class declaration</li>
+</ul>
+<blockquote>
+ <p class="listing">class MyClass {<br />
+ ...<br />
+ int MyClass::getval(); <br />
+ ...<br />
+ };</p>
+</blockquote>
+<ul>
+ <li> Allow empty structs</li>
+</ul>
+<blockquote>
+ <p class="listing">struct empty { } x;</p>
+</blockquote>
+<ul>
+ <li>Allow empty struct initialization</li>
+</ul>
+<blockquote>
+ <p class="listing">struct empty { } x = {};</p>
+</blockquote>
+<ul>
+ <li>Struct initializer typecast support</li>
+</ul>
+<blockquote>
+ <p class="listing">typedef struct { int x, y, z; float q; } mystruct;<br />
+ void foo(mystruct s);<br />
+ foo( (mystruct) { 1,2,3,6e3 } );</p>
+</blockquote>
+<ul>
+ <li>Limited support for “<span class="code">void *</span>” and function pointer arithmetic</li>
+</ul>
+<blockquote>
+ <p class="listing">void *p;<br />
+ p = &data + 10; // point 10 bytes into "p"<br />
+ void foo();<br />
+ p = foo + 10; // point 10 bytes into "foo"<br />
+ At this time, the increment and decrement operators “++” don’t work with void/function pointers.</p>
+</blockquote>
+<ul>
+ <li><span class="code">sizeof(function)</span> and <span class="code">sizeof(void)</span> is 1</li>
+ <li> Function pointers may be compared to “<span class="code">void *</span>”</li>
+ <li> Allow null statement (no trailing semicolon) in “switch”</li>
+</ul>
+<blockquote>
+ <p class="listing">switch(x) {<br />
+ label:<br />
+ }</p>
+</blockquote>
+<ul>
+ <li>Macro redefinitions with different values allowed </li>
+</ul>
+<blockquote>
+ <p class="listing">#define MAC 3<br />
+ #define MAC (3)</p>
+</blockquote>
+<ul>
+ <li>“<span class="code"><?</span>”, “<span class="code">>?</span>” <span class="code">MIN</span>/<span class="code">MAX</span> operators supported for some targets</li>
+ <li>Arrays may be assigned</li>
+</ul>
+<blockquote>
+ <p class="listing">int a[10], b[10];<br />
+ a = b;</p>
+</blockquote>
+<ul>
+ <li>Allow trailing comma in enumerations without warning</li>
+</ul>
+<blockquote>
+ <p class="listing"> enum { A, B, C, };</p>
+</blockquote>
+<ul>
+ <li>Allow empty array as final member of struct</li>
+</ul>
+<blockquote>
+ <p class="listing">typedef struct {<br />
+ int type;<br />
+ char data[];<br />
+ } Node;</p>
+</blockquote>
+<ul>
+ <li>Designated initializer support</li>
+</ul>
+<blockquote>
+ <p class="listing">struct { int x, y, z; float q; } x = { q: 3.0, <br />
+ y:1, z:-4, x:-6 };</p>
+</blockquote>
+<p>For related information, see the #pragma gcc_extensions. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_get_alignment_info.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_get_alignment_info.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,21 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Getting Alignment and Type Information at Compile Time</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Getting Alignment and Type Information at Compile Time</h3>
-<p>The C compiler has two built-in functions that return information about a data type’s byte alignment and its data type.</p>
-<ul>
- <li>The function call <span class="code">__builtin_align(typeID)</span> returns the byte alignment used for the data type <span class="code">typeID</span>. This value depends on the target platform for which the compiler is generating object code.</li>
- <li> The function <span class="code">call __builtin_type(typeID)</span> returns an integral value that describes the data type <span class="code">typeID</span>. This value depends on the target platform for which the compiler is generating object code.<br />
- </li>
-</ul>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Getting Alignment and Type Information at Compile Time</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Getting Alignment and Type Information at Compile Time</h3>
+<p>The C compiler has two built-in functions that return information about a data type’s byte alignment and its data type.</p>
+<ul>
+ <li>The function call <span class="code">__builtin_align(typeID)</span> returns the byte alignment used for the data type <span class="code">typeID</span>. This value depends on the target platform for which the compiler is generating object code.</li>
+ <li> The function <span class="code">call __builtin_type(typeID)</span> returns an integral value that describes the data type <span class="code">typeID</span>. This value depends on the target platform for which the compiler is generating object code.<br />
+ </li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_header_files.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_header_files.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,36 +1,36 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Precompiled Header Files</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Header Files</h3>
-<p>(ISO C, §6.10.2) The Carbide C preprocessor lets you nest up to 256 levels of <span class="code">#include</span> directives.</p>
-<p>You can use full path names in <span class="code">#include</span> directives:</p>
-
-<table width="72%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="22%" scope="col">System</th>
- <th width="78%" scope="col">Directive</th>
- </tr>
- <tr>
- <td>Windows</td>
- <td class="code">#include "c:\HD\Tools\my headers\macros.h"</td>
- </tr>
- <tr>
- <td>UNIX</td>
- <td class="code">#include "/HD/Tools/my headers/macros.h"</td>
- </tr>
-</table>
-<p>The Carbide IDE lets you specify where the compiler looks for <span class="code">#include</span> files through the Access Paths and Source Tree settings panels.</p>
-<p>See also <a href="c_prefix_files.htm">Prefix Files</a>.</p>
-<p class="note"><strong>TIP</strong> If you are running the Carbide C compiler from the command line, you can specify where to find <span class="code">#include</span> files with a command-line setting. For more information, see “Command-Line Tools”.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Precompiled Header Files</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Header Files</h3>
+<p>(ISO C, §6.10.2) The Carbide C preprocessor lets you nest up to 256 levels of <span class="code">#include</span> directives.</p>
+<p>You can use full path names in <span class="code">#include</span> directives:</p>
+
+<table width="72%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="22%" scope="col">System</th>
+ <th width="78%" scope="col">Directive</th>
+ </tr>
+ <tr>
+ <td>Windows</td>
+ <td class="code">#include "c:\HD\Tools\my headers\macros.h"</td>
+ </tr>
+ <tr>
+ <td>UNIX</td>
+ <td class="code">#include "/HD/Tools/my headers/macros.h"</td>
+ </tr>
+</table>
+<p>The Carbide IDE lets you specify where the compiler looks for <span class="code">#include</span> files through the Access Paths and Source Tree settings panels.</p>
+<p>See also <a href="c_prefix_files.htm">Prefix Files</a>.</p>
+<p class="note"><strong>TIP</strong> If you are running the Carbide C compiler from the command line, you can specify where to find <span class="code">#include</span> files with a command-line setting. For more information, see “Command-Line Tools”.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_implementation.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_implementation.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>C Compiler</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>The Carbide Implementation of C</h2>
-<p>This section describes how the Carbide C compiler implements the C programming language:</p>
-<ul>
- <li><a href="c_indentifiers.htm">Identifiers</a> </li>
- <li><a href="c_header_files.htm">Header Files</a></li>
- <li><a href="c_pre_header_files.htm">Precompiled Header Files</a></li>
- <li><a href="c_prefix_files.htm">Prefix Files</a></li>
- <li><a href="c_sizeof_type.htm">Sizeof() Operator Data Type</a></li>
- <li><a href="c_volatile_var.htm">Volatile Variables</a></li>
- <li><a href="c_enum_types.htm">Enumerated Types</a> </li>
-</ul>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>C Compiler</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>The Carbide Implementation of C</h2>
+<p>This section describes how the Carbide C compiler implements the C programming language:</p>
+<ul>
+ <li><a href="c_indentifiers.htm">Identifiers</a> </li>
+ <li><a href="c_header_files.htm">Header Files</a></li>
+ <li><a href="c_pre_header_files.htm">Precompiled Header Files</a></li>
+ <li><a href="c_prefix_files.htm">Prefix Files</a></li>
+ <li><a href="c_sizeof_type.htm">Sizeof() Operator Data Type</a></li>
+ <li><a href="c_volatile_var.htm">Volatile Variables</a></li>
+ <li><a href="c_enum_types.htm">Enumerated Types</a> </li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_indentifiers.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_indentifiers.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,16 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Identifiers</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Identifiers</h3>
-<p>(ISO C, §6.4.2) The Carbide C language allows identifiers to have unlimited length. However, only the first 255 characters are significant for internal and external linkage.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Identifiers</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Identifiers</h3>
+<p>(ISO C, §6.4.2) The Carbide C language allows identifiers to have unlimited length. However, only the first 255 characters are significant for internal and external linkage.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_init_local_arrays.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_init_local_arrays.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Initialization of Local Arrays and Structures</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3> Initialization of Local Arrays and Structures</h3>
-<p>If you enable the pragma gcc_extensions, the compiler allows the initialization of local arrays and structs with non-constant values.<br />
-</p>
-<div class="listing">
- <h5>GNU C Extension for Initializing Arrays and Structures</h5>
- <p>void myFunc( int i, double x )<br />
- {<br />
- int arr[2] = { i, i + 1 };<br />
- struct myStruct = { i, x }; <br />
- } </p>
-</div>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Initialization of Local Arrays and Structures</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3> Initialization of Local Arrays and Structures</h3>
+<p>If you enable the pragma gcc_extensions, the compiler allows the initialization of local arrays and structs with non-constant values.<br />
+</p>
+<div class="listing">
+ <h5>GNU C Extension for Initializing Arrays and Structures</h5>
+ <p>void myFunc( int i, double x )<br />
+ {<br />
+ int arr[2] = { i, i + 1 };<br />
+ struct myStruct = { i, x }; <br />
+ } </p>
+</div>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_inlining.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_inlining.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,62 +1,62 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Inlining</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Inlining</h3>
-<p>Carbide supports inlining C/C++ functions that you define with the <span class="code">inline</span>, <span class="code">__inline__</span>, or <span class="code">__inline</span> specifier keywords.</p>
-<p>The following functions are never inlined:</p>
-<ul>
- <li>Functions that return class objects that need destruction.</li>
- <li>Functions with class arguments that need destruction.</li>
- <li>Functions with variable argument lists.</li>
-</ul>
-<p>The compiler determines whether to inline a function based on the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a>, <a href="../pragmas/p_inline_depth.htm">Inline Depth</a>, <a href="../pragmas/p_auto_inline.htm">Auto-inline</a>, and <a href="../pragmas/p_defer_codegen.htm">Deferred Inlining</a> settings.</p>
-<p class="note"><strong>TIP</strong> When you call an inlined function, the compiler inserts the actual instructions of that function rather than a call to that function. Inlining functions makes your programs faster because you execute the function code immediately without the overhead of a function call and return. However, it can also make your program larger because the compiler may have to repeat the function code multiple times throughout your program.</p>
-<p>If you disable the ANSI Keywords Only setting, you can declare C functions to be inline.</p>
-<h5>Table 1: Settings for the Inline Depth</h5>
-<table width="76%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="25%" scope="col">This setting</th>
- <th width="75%" scope="col">Does this…</th>
- </tr>
- <tr>
- <td>Don’t Inline</td>
- <td>Inlines no functions, not even C or C++ functions declared inline.</td>
- </tr>
- <tr>
- <td>Smart</td>
- <td>Inlines small functions to a depth of 2 to 4 inline functions deep.</td>
- </tr>
- <tr>
- <td>1 to 8</td>
- <td>Inlines to the depth specified by the numerical selection.</td>
- </tr>
-</table>
-<p>The Smart and 1 to 8 items in the Inline Depth dropdown menu correspond to the pragma <a href="../pragmas/p_inline_depth.htm">inline_depth</a> (inline_depth). To check this setting, use <span class="code">__option(inline_depth)</span>, described at <a href="../symbols/sym_settings.htm">Checking Settings</a>.</p>
-<p>The Don’t Inline item corresponds to the pragma <a href="../pragmas/p_dont_inline.htm">dont_inline</a>. To check this setting, use <span class="code">__option (dont_inline)</span>. By default, this setting is disabled. </p>
-<p>The Auto-Inline setting lets the compiler choose which functions to inline. Also inlines C++ functions declared inline and member functions defined within a class declaration. This setting corresponds to the pragma <a href="../pragmas/p_auto_inline.htm">auto_inline</a>. To check this setting, use <span class="code">__option (auto_inline)</span>. By default, this setting is disabled.</p>
-<p>The Deferred Inlining setting tells the compiler to inline functions that are not yet defined. This setting corresponds to the pragma <a href="../pragmas/p_defer_codegen.htm">defer_codegen</a>. To check this setting, use<span class="code"> <span class="code">__option (defer_codegen)</span></span>. </p>
-<p>The Bottom-up Inlining settings tells the compiler to inline functions starting at the last function to the first function in a chain of function calls. This setting corresponds to the pragma <a href="../pragmas/p_inline_bottom_up.htm">inline_bottom_up</a>. To check this setting, use <span class="code">__option (inline_bottom_up)</span>.</p>
-<p>You can also disable automatic inlining of specific functions within a source file using the <span class="code">__attribute__((never_inline))</span>. </p>
-<div class="listing">
- <h5>Example __attribute__(never_inline)</h5>
- <p>inline int f() __attribute__((never_inline))<br />
- {<br />
- return 10;<br />
- }</p>
- <p>int main()<br />
- {<br />
- return f(); // f() is never inlined<br />
- }</p>
-</div>
-<p class="note"><strong>NOTE</strong> For Intel x86 targets, the <span class="code">__decspec(noinline)</span> is a compatible synonym. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Inlining</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Inlining</h3>
+<p>Carbide supports inlining C/C++ functions that you define with the <span class="code">inline</span>, <span class="code">__inline__</span>, or <span class="code">__inline</span> specifier keywords.</p>
+<p>The following functions are never inlined:</p>
+<ul>
+ <li>Functions that return class objects that need destruction.</li>
+ <li>Functions with class arguments that need destruction.</li>
+ <li>Functions with variable argument lists.</li>
+</ul>
+<p>The compiler determines whether to inline a function based on the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a>, <a href="../pragmas/p_inline_depth.htm">Inline Depth</a>, <a href="../pragmas/p_auto_inline.htm">Auto-inline</a>, and <a href="../pragmas/p_defer_codegen.htm">Deferred Inlining</a> settings.</p>
+<p class="note"><strong>TIP</strong> When you call an inlined function, the compiler inserts the actual instructions of that function rather than a call to that function. Inlining functions makes your programs faster because you execute the function code immediately without the overhead of a function call and return. However, it can also make your program larger because the compiler may have to repeat the function code multiple times throughout your program.</p>
+<p>If you disable the ANSI Keywords Only setting, you can declare C functions to be inline.</p>
+<h5>Table 1: Settings for the Inline Depth</h5>
+<table width="76%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="25%" scope="col">This setting</th>
+ <th width="75%" scope="col">Does this…</th>
+ </tr>
+ <tr>
+ <td>Don’t Inline</td>
+ <td>Inlines no functions, not even C or C++ functions declared inline.</td>
+ </tr>
+ <tr>
+ <td>Smart</td>
+ <td>Inlines small functions to a depth of 2 to 4 inline functions deep.</td>
+ </tr>
+ <tr>
+ <td>1 to 8</td>
+ <td>Inlines to the depth specified by the numerical selection.</td>
+ </tr>
+</table>
+<p>The Smart and 1 to 8 items in the Inline Depth dropdown menu correspond to the pragma <a href="../pragmas/p_inline_depth.htm">inline_depth</a> (inline_depth). To check this setting, use <span class="code">__option(inline_depth)</span>, described at <a href="../symbols/sym_settings.htm">Checking Settings</a>.</p>
+<p>The Don’t Inline item corresponds to the pragma <a href="../pragmas/p_dont_inline.htm">dont_inline</a>. To check this setting, use <span class="code">__option (dont_inline)</span>. By default, this setting is disabled. </p>
+<p>The Auto-Inline setting lets the compiler choose which functions to inline. Also inlines C++ functions declared inline and member functions defined within a class declaration. This setting corresponds to the pragma <a href="../pragmas/p_auto_inline.htm">auto_inline</a>. To check this setting, use <span class="code">__option (auto_inline)</span>. By default, this setting is disabled.</p>
+<p>The Deferred Inlining setting tells the compiler to inline functions that are not yet defined. This setting corresponds to the pragma <a href="../pragmas/p_defer_codegen.htm">defer_codegen</a>. To check this setting, use<span class="code"> <span class="code">__option (defer_codegen)</span></span>. </p>
+<p>The Bottom-up Inlining settings tells the compiler to inline functions starting at the last function to the first function in a chain of function calls. This setting corresponds to the pragma <a href="../pragmas/p_inline_bottom_up.htm">inline_bottom_up</a>. To check this setting, use <span class="code">__option (inline_bottom_up)</span>.</p>
+<p>You can also disable automatic inlining of specific functions within a source file using the <span class="code">__attribute__((never_inline))</span>. </p>
+<div class="listing">
+ <h5>Example __attribute__(never_inline)</h5>
+ <p>inline int f() __attribute__((never_inline))<br />
+ {<br />
+ return 10;<br />
+ }</p>
+ <p>int main()<br />
+ {<br />
+ return f(); // f() is never inlined<br />
+ }</p>
+</div>
+<p class="note"><strong>NOTE</strong> For Intel x86 targets, the <span class="code">__decspec(noinline)</span> is a compatible synonym. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_iso_extensions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_iso_extensions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,49 +1,49 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Extensions to ISO C</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Extensions to ISO C</h2>
-<p>The Carbide C language optionally extends ISO C. In most cases, you can control these extensions using specific pragmas.</p>
-<ul>
- <li><a href="c_std_conformity.htm">Checking for Standard C and Standard C++ Conformity</a></li>
- <li><a href="c_cpp_comments.htm">C++ Comments</a></li>
- <li><a href="c_unnamed_args.htm">Unnamed Arguments in Function Definitions</a></li>
- <li><a href="c_macro_args.htm">A # Not Followed by a Macro Argument</a></li>
- <li><a href="c_endif_identifier.htm">Using an Identifier After #endif</a></li>
- <li><a href="c_typecast_ptrs.htm">Using Typecasted Pointers as lvalues</a></li>
- <li><a href="c_declare_var_addr.htm">Declaring Variables by Addres</a>s</li>
- <li><a href="c_ansi_keywords.htm">ANSI Keywords Only</a></li>
- <li><a href="c_expand_trigraphs.htm">Expand Trigraphs</a></li>
- <li><a href="c_char_const_as_int.htm">Character Constants as Integer Values</a></li>
- <li><a href="c_inlining.htm">Inlining</a></li>
- <li><a href="c_reuse_strings.htm">Reusing Strings</a></li>
- <li><a href="c_require_prototypes.htm">Require Function Prototypes</a></li>
- <li><a href="c_map_newlines.htm">Map Newlines to CR</a></li>
- <li><a href="c_relaxed_ptrs.htm">Relaxed Pointer Type Rules</a></li>
- <li><a href="c_unsigned_chars.htm">Use Unsigned Chars</a></li>
- <li><a href="c_use_longlong.htm">Using long long Integers</a></li>
- <li><a href="c_convert_ptrs.htm">Converting Pointers to Types of the Same Size</a></li>
- <li><a href="c_get_alignment_info.htm">Getting Alignment and Type Information at Compile Time</a></li>
- <li><a href="c_zero_length_arrays.htm">Arrays of Zero Length in Structures</a></li>
- <li><a href="c_bit_rotation.htm">Intrinsic Functions for Bit Rotation</a></li>
- <li><a href="c_d_constant_suffix.htm">The “D” Constant Suffix</a></li>
- <li><a href="c_short_dbl_type.htm">The short double Data Type</a></li>
- <li><a href="c_typeof_operator.htm">The __typeof__() and typeof() operators</a></li>
- <li><a href="c_init_local_arrays.htm">Initialization of Local Arrays and Structures</a></li>
- <li><a href="c_ranged_cases.htm">Ranges in case statements</a></li>
- <li><a href="c_function_identifier.htm">The __FUNCTION__ Predefined Identifier</a></li>
- <li><a href="c_gcc_ext_support.htm">GCC Extension Support</a></li>
- <li><a href="c_multibyte_support.htm">Multibyte and Unicode Support</a></li>
- <li><a href="c_decspec_decl.htm">The __declspec Declarator</a></li>
-</ul>
-<p>For information on target-specific extensions, refer to the Targeting manual for your particular target. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Extensions to ISO C</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Extensions to ISO C</h2>
+<p>The Carbide C language optionally extends ISO C. In most cases, you can control these extensions using specific pragmas.</p>
+<ul>
+ <li><a href="c_std_conformity.htm">Checking for Standard C and Standard C++ Conformity</a></li>
+ <li><a href="c_cpp_comments.htm">C++ Comments</a></li>
+ <li><a href="c_unnamed_args.htm">Unnamed Arguments in Function Definitions</a></li>
+ <li><a href="c_macro_args.htm">A # Not Followed by a Macro Argument</a></li>
+ <li><a href="c_endif_identifier.htm">Using an Identifier After #endif</a></li>
+ <li><a href="c_typecast_ptrs.htm">Using Typecasted Pointers as lvalues</a></li>
+ <li><a href="c_declare_var_addr.htm">Declaring Variables by Addres</a>s</li>
+ <li><a href="c_ansi_keywords.htm">ANSI Keywords Only</a></li>
+ <li><a href="c_expand_trigraphs.htm">Expand Trigraphs</a></li>
+ <li><a href="c_char_const_as_int.htm">Character Constants as Integer Values</a></li>
+ <li><a href="c_inlining.htm">Inlining</a></li>
+ <li><a href="c_reuse_strings.htm">Reusing Strings</a></li>
+ <li><a href="c_require_prototypes.htm">Require Function Prototypes</a></li>
+ <li><a href="c_map_newlines.htm">Map Newlines to CR</a></li>
+ <li><a href="c_relaxed_ptrs.htm">Relaxed Pointer Type Rules</a></li>
+ <li><a href="c_unsigned_chars.htm">Use Unsigned Chars</a></li>
+ <li><a href="c_use_longlong.htm">Using long long Integers</a></li>
+ <li><a href="c_convert_ptrs.htm">Converting Pointers to Types of the Same Size</a></li>
+ <li><a href="c_get_alignment_info.htm">Getting Alignment and Type Information at Compile Time</a></li>
+ <li><a href="c_zero_length_arrays.htm">Arrays of Zero Length in Structures</a></li>
+ <li><a href="c_bit_rotation.htm">Intrinsic Functions for Bit Rotation</a></li>
+ <li><a href="c_d_constant_suffix.htm">The “D” Constant Suffix</a></li>
+ <li><a href="c_short_dbl_type.htm">The short double Data Type</a></li>
+ <li><a href="c_typeof_operator.htm">The __typeof__() and typeof() operators</a></li>
+ <li><a href="c_init_local_arrays.htm">Initialization of Local Arrays and Structures</a></li>
+ <li><a href="c_ranged_cases.htm">Ranges in case statements</a></li>
+ <li><a href="c_function_identifier.htm">The __FUNCTION__ Predefined Identifier</a></li>
+ <li><a href="c_gcc_ext_support.htm">GCC Extension Support</a></li>
+ <li><a href="c_multibyte_support.htm">Multibyte and Unicode Support</a></li>
+ <li><a href="c_decspec_decl.htm">The __declspec Declarator</a></li>
+</ul>
+<p>For information on target-specific extensions, refer to the Targeting manual for your particular target. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_macro_args.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_macro_args.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>A # Not Followed by a Macro Argument</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>A # Not Followed by a Macro Argument</h3>
-<p>(ISO C, §6.10.3) The C compiler can accept <span class="code">#</span> tokens that do not appear before arguments in macro definitions.</p>
-<div class="listing">
- <h5>Listing 1. Preprocessor Macros Using # Without an Argument</h5>
- <p>#define add1(x) #x #1 // OK, but probably not what you wanted:<br />
- // add1(abc) creates "abc"#1<br />
- #define add2(x) #x "2" // OK: add2(abc) creates "abc2"</p>
-</div>
-<p>To use this feature, disable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting.</p>
-<p>See also “Checking for Standard C and Standard C++ Conformity”.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>A # Not Followed by a Macro Argument</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>A # Not Followed by a Macro Argument</h3>
+<p>(ISO C, §6.10.3) The C compiler can accept <span class="code">#</span> tokens that do not appear before arguments in macro definitions.</p>
+<div class="listing">
+ <h5>Listing 1. Preprocessor Macros Using # Without an Argument</h5>
+ <p>#define add1(x) #x #1 // OK, but probably not what you wanted:<br />
+ // add1(abc) creates "abc"#1<br />
+ #define add2(x) #x "2" // OK: add2(abc) creates "abc2"</p>
+</div>
+<p>To use this feature, disable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting.</p>
+<p>See also “Checking for Standard C and Standard C++ Conformity”.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_map_newlines.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_map_newlines.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Map Newlines to CR</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Map Newlines to CR</h3>
-<p> Use the <span class="code">#pragma mpwc_newline</span> to set how the C compiler interprets the newline ('<span class="code">\n</span>') and return ('<span class="code">\r</span>') characters.</p>
-<p>Most compilers, including the Carbide C/C++ compilers, translate '<span class="code">\r</span>' to <span class="code">0x0D</span>, the standard value for carriage return, and '<span class="code">\n</span>' to <span class="code">0x0A</span>, the standard value for linefeed.</p>
-<p>However, a few C compilers translate '<span class="code">\r</span>' to <span class="code">0x0A</span> and '<span class="code">\n</span>' to <span class="code">0x0D</span>—the opposite of the typical behavior.</p>
-<p>If you enable this setting, the compiler uses these non-standard conventions for the '<span class="code">\n</span>' and '<span class="code">\r</span>' characters. Otherwise, the compiler uses the Carbide C/C++ language’s conventions for these characters.</p>
-<p>Also if you enable this setting, use ISO C/C++ libraries that were compiled when this setting was enabled. Otherwise, you cannot read and write '<span class="code">\n</span>' and '<span class="code">\r</span>' properly. For example, printing '<span class="code">\n</span>' takes you to the beginning of the current line instead of inserting a new line.</p>
-<p>This setting corresponds to the pragma mpwc_newline. To check this setting, use <span class="code">__option (mpwc_newline)</span>. By default, this setting is disabled.</p>
-<p>See also “mpwc_newline”, and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Map Newlines to CR</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Map Newlines to CR</h3>
+<p> Use the <span class="code">#pragma mpwc_newline</span> to set how the C compiler interprets the newline ('<span class="code">\n</span>') and return ('<span class="code">\r</span>') characters.</p>
+<p>Most compilers, including the Carbide C/C++ compilers, translate '<span class="code">\r</span>' to <span class="code">0x0D</span>, the standard value for carriage return, and '<span class="code">\n</span>' to <span class="code">0x0A</span>, the standard value for linefeed.</p>
+<p>However, a few C compilers translate '<span class="code">\r</span>' to <span class="code">0x0A</span> and '<span class="code">\n</span>' to <span class="code">0x0D</span>—the opposite of the typical behavior.</p>
+<p>If you enable this setting, the compiler uses these non-standard conventions for the '<span class="code">\n</span>' and '<span class="code">\r</span>' characters. Otherwise, the compiler uses the Carbide C/C++ language’s conventions for these characters.</p>
+<p>Also if you enable this setting, use ISO C/C++ libraries that were compiled when this setting was enabled. Otherwise, you cannot read and write '<span class="code">\n</span>' and '<span class="code">\r</span>' properly. For example, printing '<span class="code">\n</span>' takes you to the beginning of the current line instead of inserting a new line.</p>
+<p>This setting corresponds to the pragma mpwc_newline. To check this setting, use <span class="code">__option (mpwc_newline)</span>. By default, this setting is disabled.</p>
+<p>See also “mpwc_newline”, and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_multibyte_support.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_multibyte_support.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,73 +1,73 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Multibyte and Unicode Support</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Multibyte and Unicode Support</h3>
-<p> The Carbide preprocessor fully supports the use of multibyte and Unicode-formatted source files.</p>
-<p>Source and header files may be encoded in any text encoding the operating system recognizes. (Unicode text decoding support is implemented using native OS services in Win32 and <span class="code">conv()</span> on UNIX systems.)</p>
-<p>As per ISO C++98 and C99, universal characters may be used in any string or character literal, identifiers (macros, variables, functions, methods, etc.), and comments. These characters are derived either from multibyte sequences in the source text, by virtue of the source file being encoded in UCS-2 or UCS-4, or by use of the <span class="code">\uXXXX</span> or <span class="code">\UXXXXXXXX</span> escape sequences.</p>
-<h4>Wide String Literals</h4>
-<p> Wide string literals in the form L"xxx" and wide characters in the form L’xxx’ are interpreted in the context of the source text encoding.</p>
-<p class="listing">const wchar_t *str = L"Meine Katze ißt Mäuse nachts.";</p>
-<p>Multibyte character sequences that appear in strings are internally converted to their Unicode equivalents until the C/C++ token for the string is generated. At that time, if the string literal is a narrow string (i.e. using char), the original multibyte character sequence are emitted. If the string is a wide string (using <span class="code">wchar_t</span>), the Unicode characters translated from the multibyte sequence are emitted. If <span class="code">wchar_t</span> is 16 bits and a character is truncated to 16 bits, a warning is reported. (See ISO C99, §6.4.5.5 for the specification of this behavior.)</p>
-<p>In the event that you want translated – and usually truncated – Unicode characters in narrow string literals, enable <span class="code">#pragma multibyteaware_preserve_ literals off</span>.</p>
-<h4>Source Encoding</h4>
-<p>The compiler uses the <a href="../pragmas/p_text_encoding.htm">Source encoding</a> option in to control how it detects the source file encoding. The compiler recognizes the following source encoding options:</p>
-<ul>
- <li>ASCII–no detection is done, the high-ASCII characters are not interpreted, and wide character strings are merely zero-extensions of the individual bytes in the string. </li>
- <li>Autodetect–the compiler attempts to tell whether byte-encoded source is encoded in UTF-8, Shift-JIS, EUC-JP, ISO-2022-JP, or whichever encoding format the operating system considers the default. This option degrades compile speeds slightly due to the extra scanning. </li>
- <li>System–the compiler uses the system locale without scanning the source.</li>
- <li>UTF-8, Shift-JIS, EUC-JP, ISO-2022-JP– self-explanatory. </li>
-</ul>
-<p class="note"><strong>NOTE</strong> Currently, the compiler ignores the mapping in some Japanese character sets of <span class="code">0x5c</span> (ASCII ‘<span class="code">\</span>’) to Yen (<span class="code">\u00A5</span>) because the C++98 and C99 standards say that the ASCII character set must be mapped one-to-one with any multibyte encoding. <span class="code">0x5C</span> is always interpreted as ‘<span class="code">\</span>’ (except inside multibyte character sequences).</p>
-<p class="note"><strong>NOTE</strong> The ISO-2022-JP and EUC-JP encoding currently only recognize characters defined by JIS X 0208-1990 (i.e., the escapes ESC $ @, ESC $ B for ISO-2022-JP and two-byte sequences in EUC-JP). The additional characters in JIS X 0212-1990 are not yet recognized. </p>
-<p>No matter what the Source encoding setting, the compiler always detects <span class="code">UTF-16{BE,LE}</span> or <span class="code">UCS-4{BE,LE}</span> source through a statistical character scan for NULs. </p>
-<p class="note"><strong>NOTE</strong> Currently, only the command-line tools, not the IDE, can properly handle sources in Unicode format (UTF-16, UCS-2, UCS-4).</p>
-<p>Alternately, individual source files can identify which source text encoding is present using #pragma text_encoding. The format is:<br />
- #pragma text_encoding("name" | unknown | reset [, global])</p>
-<p>Where name is an IANA or MIME encoding name or an OS-specific string. </p>
-<p>The compiler recognizes these names and maps them to its internal decoders:</p>
-<p class="listing">system US-ASCII ASCII ANSI_X3.4-1968 ANSI_X3.4-1968<br />
- ANSI_X3.4 UTF-8 UTF8 ISO-2022-JP CSISO2022JP ISO2022JP<br />
- CSSHIFTJIS SHIFT-JIS SJIS EUC-JP EUCJP <br />
- UCS-2 UCS-2BE UCS-2LE UCS2 UCS2BE UCS2LE UTF-16 U<br />
- TF-16BE UTF-16LE UTF16 UTF16BE UTF16LE UCS-4 UCS-4BE <br />
- UCS-4LE UCS4 UCS4BE UCS4LE 10646-1:1993 ISO-10646-1 <br />
- ISO-10646 unicode</p>
-<p class="note"><strong>NOTE</strong> UCS-2 is always interpreted as UTF-16; i.e. surrogate character pairs are used to select characters through plane 16.</p>
-<p>This #pragma may be used several times in one file (probably unlikely usage). The compiler expects the pragma to be encoded in the “current” text encoding, through the end of line. </p>
-<p>By default, #pragma text_encoding is only effective through the end of file. To affect the default text encoding assumed for the current and all subsequent files, supply the “global” modifier.<br />
-</p>
-<h4>Other Support</h4>
-<p>In addition, note the following:</p>
-<ul>
- <li>Specify Universal character names (i.e. Unicode code points) with the<span class="code"> \uXXXX</span> or <span class="code">\UXXXXXXXX</span> escape sequences:</li>
-</ul>
-<blockquote>
- <p class="listing">wchar_t florette = L’\u273f’;<br />
- int \u30AD\u30B3\u30DE\u30A6 = soy_sauce();</p>
-</blockquote>
-<ul>
- <li>You can use \uXXXX or \UXXXXXXXX regardless of the actual size of <span class="code">wchar_t</span> (use of the escape does not impose a character width on the literal).</li>
- <li>Preprocessed text is always emitted in ASCII. Wide characters are emitted in the <span class="code">\uXXXX</span> or <span class="code">\UXXXXXXXX</span> format.</li>
-</ul>
-<blockquote>
- <p class="listing"> extern string *Wörter[]; <br />
- --><br />
- extern string *W\u00F6rter[];</p>
-</blockquote>
-<ul>
- <li>Identifiers using characters not representable in ASCII are emitted in object code with the <span class="code">\uXXXX</span> or <span class="code">\UXXXXXXXX</span> escape sequences. If an object format does not support the ‘<span class="code">\\</span>’ character, the encoding may be modified on a target-specific basis.</li>
-</ul>
-<p>Also see “Character Constants as Integer Values” for information on creating a character constant consisting of more than one character (not to be confused with this topic). </p>
-<p>For more information on Unicode, see <a href="http://www.unicode.org">www.unicode.org</a>. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Multibyte and Unicode Support</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Multibyte and Unicode Support</h3>
+<p> The Carbide preprocessor fully supports the use of multibyte and Unicode-formatted source files.</p>
+<p>Source and header files may be encoded in any text encoding the operating system recognizes. (Unicode text decoding support is implemented using native OS services in Win32 and <span class="code">conv()</span> on UNIX systems.)</p>
+<p>As per ISO C++98 and C99, universal characters may be used in any string or character literal, identifiers (macros, variables, functions, methods, etc.), and comments. These characters are derived either from multibyte sequences in the source text, by virtue of the source file being encoded in UCS-2 or UCS-4, or by use of the <span class="code">\uXXXX</span> or <span class="code">\UXXXXXXXX</span> escape sequences.</p>
+<h4>Wide String Literals</h4>
+<p> Wide string literals in the form L"xxx" and wide characters in the form L’xxx’ are interpreted in the context of the source text encoding.</p>
+<p class="listing">const wchar_t *str = L"Meine Katze ißt Mäuse nachts.";</p>
+<p>Multibyte character sequences that appear in strings are internally converted to their Unicode equivalents until the C/C++ token for the string is generated. At that time, if the string literal is a narrow string (i.e. using char), the original multibyte character sequence are emitted. If the string is a wide string (using <span class="code">wchar_t</span>), the Unicode characters translated from the multibyte sequence are emitted. If <span class="code">wchar_t</span> is 16 bits and a character is truncated to 16 bits, a warning is reported. (See ISO C99, §6.4.5.5 for the specification of this behavior.)</p>
+<p>In the event that you want translated – and usually truncated – Unicode characters in narrow string literals, enable <span class="code">#pragma multibyteaware_preserve_ literals off</span>.</p>
+<h4>Source Encoding</h4>
+<p>The compiler uses the <a href="../pragmas/p_text_encoding.htm">Source encoding</a> option in to control how it detects the source file encoding. The compiler recognizes the following source encoding options:</p>
+<ul>
+ <li>ASCII–no detection is done, the high-ASCII characters are not interpreted, and wide character strings are merely zero-extensions of the individual bytes in the string. </li>
+ <li>Autodetect–the compiler attempts to tell whether byte-encoded source is encoded in UTF-8, Shift-JIS, EUC-JP, ISO-2022-JP, or whichever encoding format the operating system considers the default. This option degrades compile speeds slightly due to the extra scanning. </li>
+ <li>System–the compiler uses the system locale without scanning the source.</li>
+ <li>UTF-8, Shift-JIS, EUC-JP, ISO-2022-JP– self-explanatory. </li>
+</ul>
+<p class="note"><strong>NOTE</strong> Currently, the compiler ignores the mapping in some Japanese character sets of <span class="code">0x5c</span> (ASCII ‘<span class="code">\</span>’) to Yen (<span class="code">\u00A5</span>) because the C++98 and C99 standards say that the ASCII character set must be mapped one-to-one with any multibyte encoding. <span class="code">0x5C</span> is always interpreted as ‘<span class="code">\</span>’ (except inside multibyte character sequences).</p>
+<p class="note"><strong>NOTE</strong> The ISO-2022-JP and EUC-JP encoding currently only recognize characters defined by JIS X 0208-1990 (i.e., the escapes ESC $ @, ESC $ B for ISO-2022-JP and two-byte sequences in EUC-JP). The additional characters in JIS X 0212-1990 are not yet recognized. </p>
+<p>No matter what the Source encoding setting, the compiler always detects <span class="code">UTF-16{BE,LE}</span> or <span class="code">UCS-4{BE,LE}</span> source through a statistical character scan for NULs. </p>
+<p class="note"><strong>NOTE</strong> Currently, only the command-line tools, not the IDE, can properly handle sources in Unicode format (UTF-16, UCS-2, UCS-4).</p>
+<p>Alternately, individual source files can identify which source text encoding is present using #pragma text_encoding. The format is:<br />
+ #pragma text_encoding("name" | unknown | reset [, global])</p>
+<p>Where name is an IANA or MIME encoding name or an OS-specific string. </p>
+<p>The compiler recognizes these names and maps them to its internal decoders:</p>
+<p class="listing">system US-ASCII ASCII ANSI_X3.4-1968 ANSI_X3.4-1968<br />
+ ANSI_X3.4 UTF-8 UTF8 ISO-2022-JP CSISO2022JP ISO2022JP<br />
+ CSSHIFTJIS SHIFT-JIS SJIS EUC-JP EUCJP <br />
+ UCS-2 UCS-2BE UCS-2LE UCS2 UCS2BE UCS2LE UTF-16 U<br />
+ TF-16BE UTF-16LE UTF16 UTF16BE UTF16LE UCS-4 UCS-4BE <br />
+ UCS-4LE UCS4 UCS4BE UCS4LE 10646-1:1993 ISO-10646-1 <br />
+ ISO-10646 unicode</p>
+<p class="note"><strong>NOTE</strong> UCS-2 is always interpreted as UTF-16; i.e. surrogate character pairs are used to select characters through plane 16.</p>
+<p>This #pragma may be used several times in one file (probably unlikely usage). The compiler expects the pragma to be encoded in the “current” text encoding, through the end of line. </p>
+<p>By default, #pragma text_encoding is only effective through the end of file. To affect the default text encoding assumed for the current and all subsequent files, supply the “global” modifier.<br />
+</p>
+<h4>Other Support</h4>
+<p>In addition, note the following:</p>
+<ul>
+ <li>Specify Universal character names (i.e. Unicode code points) with the<span class="code"> \uXXXX</span> or <span class="code">\UXXXXXXXX</span> escape sequences:</li>
+</ul>
+<blockquote>
+ <p class="listing">wchar_t florette = L’\u273f’;<br />
+ int \u30AD\u30B3\u30DE\u30A6 = soy_sauce();</p>
+</blockquote>
+<ul>
+ <li>You can use \uXXXX or \UXXXXXXXX regardless of the actual size of <span class="code">wchar_t</span> (use of the escape does not impose a character width on the literal).</li>
+ <li>Preprocessed text is always emitted in ASCII. Wide characters are emitted in the <span class="code">\uXXXX</span> or <span class="code">\UXXXXXXXX</span> format.</li>
+</ul>
+<blockquote>
+ <p class="listing"> extern string *Wörter[]; <br />
+ --><br />
+ extern string *W\u00F6rter[];</p>
+</blockquote>
+<ul>
+ <li>Identifiers using characters not representable in ASCII are emitted in object code with the <span class="code">\uXXXX</span> or <span class="code">\UXXXXXXXX</span> escape sequences. If an object format does not support the ‘<span class="code">\\</span>’ character, the encoding may be modified on a target-specific basis.</li>
+</ul>
+<p>Also see “Character Constants as Integer Values” for information on creating a character constant consisting of more than one character (not to be confused with this topic). </p>
+<p>For more information on Unicode, see <a href="http://www.unicode.org">www.unicode.org</a>. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_pool_strings.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_pool_strings.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Pool Strings</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Pool Strings</h3>
-<p>The <a href="../pragmas/p_pool_strings.htm">Pool Strings</a> setting controls how the compiler stores string constants.</p>
-<p class="note"><strong>NOTE</strong> In principle, this setting works for all targets. However, it is useful only for a Table of Contents based linking mechanism such as that used for MacOS Classic on the PowerPC processor.</p>
-<p>If you enable this setting, the compiler collects all string constants into a single data object so that your program needs only one TOC entry for all of them. While this decreases the number of TOC entries in your program, it also increases your program size because it uses a less efficient method to store the address of the string.</p>
-<p>If you disable this setting, the compiler creates a unique data object and TOC entry for each string constant.</p>
-<p class="note"><strong>TIP</strong> You can change the size of the TOC with the Store Static Data in TOC setting in the PPC Processor panel.</p>
-<p class="note"><strong>NOTE</strong> This option can be overridden in PPC targets by using the Linker Pool Strings or Linker Merges String Constants options.</p>
-<p>Enable this setting if your program is large and has many string constants.</p>
-<p class="note"><strong>NOTE</strong> If you enable the Pool Strings setting, the compiler ignores the PC-Relative Strings setting. This is a 68K-only feature.</p>
-<p>The Pool Strings setting corresponds to the <span class="code">pragma pool_strings</span>. To check this setting, use <span class="code">__option (pool_strings)</span>. By default, this setting is disabled.</p>
-<p>See also “pool_strings” and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Pool Strings</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Pool Strings</h3>
+<p>The <a href="../pragmas/p_pool_strings.htm">Pool Strings</a> setting controls how the compiler stores string constants.</p>
+<p class="note"><strong>NOTE</strong> In principle, this setting works for all targets. However, it is useful only for a Table of Contents based linking mechanism such as that used for MacOS Classic on the PowerPC processor.</p>
+<p>If you enable this setting, the compiler collects all string constants into a single data object so that your program needs only one TOC entry for all of them. While this decreases the number of TOC entries in your program, it also increases your program size because it uses a less efficient method to store the address of the string.</p>
+<p>If you disable this setting, the compiler creates a unique data object and TOC entry for each string constant.</p>
+<p class="note"><strong>TIP</strong> You can change the size of the TOC with the Store Static Data in TOC setting in the PPC Processor panel.</p>
+<p class="note"><strong>NOTE</strong> This option can be overridden in PPC targets by using the Linker Pool Strings or Linker Merges String Constants options.</p>
+<p>Enable this setting if your program is large and has many string constants.</p>
+<p class="note"><strong>NOTE</strong> If you enable the Pool Strings setting, the compiler ignores the PC-Relative Strings setting. This is a 68K-only feature.</p>
+<p>The Pool Strings setting corresponds to the <span class="code">pragma pool_strings</span>. To check this setting, use <span class="code">__option (pool_strings)</span>. By default, this setting is disabled.</p>
+<p>See also “pool_strings” and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_pre_header_files.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_pre_header_files.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Precompiled Header Files</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Precompiled Header Files</h3>
-<p>A precompiled header is an image of the compiler’s symbol table. Create a precompiled header file for commonly included files. You can also use a precompiled header file to temporarily change header files that do not normally change otherwise (for example, OS ABI headers or standard ANSI library header files). Then replace the original header files with the precompiled header file to significantly improve compile time.</p>
-<p>A precompiled header cannot do any of the following:</p>
-<ul>
- <li>Define non-inline functions</li>
- <li>Define global data</li>
- <li> Instantiate template data</li>
- <li>Instantiate non-inline functions</li>
-</ul>
-<p>You must include precompiled headers before defining or declaring other objects. You can only use one precompiled header file in a translation unit.</p>
-<p>See also “precompile_target”.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Precompiled Header Files</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Precompiled Header Files</h3>
+<p>A precompiled header is an image of the compiler’s symbol table. Create a precompiled header file for commonly included files. You can also use a precompiled header file to temporarily change header files that do not normally change otherwise (for example, OS ABI headers or standard ANSI library header files). Then replace the original header files with the precompiled header file to significantly improve compile time.</p>
+<p>A precompiled header cannot do any of the following:</p>
+<ul>
+ <li>Define non-inline functions</li>
+ <li>Define global data</li>
+ <li> Instantiate template data</li>
+ <li>Instantiate non-inline functions</li>
+</ul>
+<p>You must include precompiled headers before defining or declaring other objects. You can only use one precompiled header file in a translation unit.</p>
+<p>See also “precompile_target”.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_prefix_files.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_prefix_files.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Prefix Files</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Prefix Files</h3>
-<p>In previous Carbide compilers, the prefix file was a distinct setting that told the compiler to include a source code file at the beginning of each source code file in a project’s build target, or include a precompiled header file into the project.</p>
-<p>With this compiler release, the concept of prefixing files, <span class="code">#defines</span>, and <span class="code">#pragmas</span> has been extended.</p>
-<p>To specify a prefix file, add an <span class="code">#include</span> directive to this field, for example:</p>
-<p class="listing">#include "Win32Headers.h"</p>
-<p>To specify <span class="code">#defines</span> or <span class="code">#pragmas</span>, enter them here as you would in source code:</p>
-<p class="listing">#define DEBUG_BUILD 1<br />
- #pragma warn_illtokenpasting off</p>
-<p>When building precompiled headers, note the Include prefix text in precompiled headers setting. When enabled, the contents of the Prefix Text are used to generate the precompiled header. If your project generates a precompiled header in the same target that uses it, follow the form:</p>
-<p class="listing">#if !<span class="code">__option(precompile)</span><br />
- #include "MyHeaders.mch"<br />
- #endif</p>
-<p>to exclude the <span class="code">*.mch</span> file when generating it.</p>
-<p class="note"><strong>NOTE</strong> <span class="code">#pragmas</span> may affect aspects of parsing and type declaration while building a precompiled header, but these settings are not retained in the body of the precompiled header. Thus the prefix text is used for every file in the target. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Prefix Files</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Prefix Files</h3>
+<p>In previous Carbide compilers, the prefix file was a distinct setting that told the compiler to include a source code file at the beginning of each source code file in a project’s build target, or include a precompiled header file into the project.</p>
+<p>With this compiler release, the concept of prefixing files, <span class="code">#defines</span>, and <span class="code">#pragmas</span> has been extended.</p>
+<p>To specify a prefix file, add an <span class="code">#include</span> directive to this field, for example:</p>
+<p class="listing">#include "Win32Headers.h"</p>
+<p>To specify <span class="code">#defines</span> or <span class="code">#pragmas</span>, enter them here as you would in source code:</p>
+<p class="listing">#define DEBUG_BUILD 1<br />
+ #pragma warn_illtokenpasting off</p>
+<p>When building precompiled headers, note the Include prefix text in precompiled headers setting. When enabled, the contents of the Prefix Text are used to generate the precompiled header. If your project generates a precompiled header in the same target that uses it, follow the form:</p>
+<p class="listing">#if !<span class="code">__option(precompile)</span><br />
+ #include "MyHeaders.mch"<br />
+ #endif</p>
+<p>to exclude the <span class="code">*.mch</span> file when generating it.</p>
+<p class="note"><strong>NOTE</strong> <span class="code">#pragmas</span> may affect aspects of parsing and type declaration while building a precompiled header, but these settings are not retained in the body of the precompiled header. Thus the prefix text is used for every file in the target. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_ranged_cases.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_ranged_cases.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Ranges in case statements</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Ranges in case statements</h3>
-<p>If you disable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting, the compiler allows ranges of values in a switch statement by using a special form of <span class="code">case</span> statement. A <span class="code">case</span> statement that uses a range is a shorter way of specifying consecutive case statements that span a range of values.</p>
-<p>The range form of a case statement is</p>
-<p class="listing">case <em>low</em> ... <em>high</em> : // note spaces around ellipsis character </p>
-<p>where low is a valid case expression that is less than high, which is also a valid case expression. A case statement that uses a range is applied when the expression of a switch statement is both greater than or equal to the low expression and less than or equal to the high expression.</p>
-<p class="note"><strong>NOTE</strong> Make sure to separate the ellipsis (<span class="code">...</span>) from the low and high expressions with spaces.</p>
-<div class="listing">
- <h5>Listing 1. Ranges in case Statements</h5>
- <p>switch (i)<br />
- {<br />
- case 0 ... 2: /* Equivalent to case 0: case 1: case 2: */<br />
- j = i * 2;<br />
- break;<br />
- case 3:<br />
- j = i;<br />
- break;<br />
- default:<br />
- j = 0;<br />
- break;<br />
- } </p>
-</div>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Ranges in case statements</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Ranges in case statements</h3>
+<p>If you disable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting, the compiler allows ranges of values in a switch statement by using a special form of <span class="code">case</span> statement. A <span class="code">case</span> statement that uses a range is a shorter way of specifying consecutive case statements that span a range of values.</p>
+<p>The range form of a case statement is</p>
+<p class="listing">case <em>low</em> ... <em>high</em> : // note spaces around ellipsis character </p>
+<p>where low is a valid case expression that is less than high, which is also a valid case expression. A case statement that uses a range is applied when the expression of a switch statement is both greater than or equal to the low expression and less than or equal to the high expression.</p>
+<p class="note"><strong>NOTE</strong> Make sure to separate the ellipsis (<span class="code">...</span>) from the low and high expressions with spaces.</p>
+<div class="listing">
+ <h5>Listing 1. Ranges in case Statements</h5>
+ <p>switch (i)<br />
+ {<br />
+ case 0 ... 2: /* Equivalent to case 0: case 1: case 2: */<br />
+ j = i * 2;<br />
+ break;<br />
+ case 3:<br />
+ j = i;<br />
+ break;<br />
+ default:<br />
+ j = 0;<br />
+ break;<br />
+ } </p>
+</div>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_relaxed_ptrs.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_relaxed_ptrs.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Relaxed Pointer Type Rules</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Relaxed Pointer Type Rules</h3>
-<p>Use the <span class="code">#pragma mpwc_relax</span> to tell the compiler to treat all pointer types as the same type. While the compiler verifies the parameters of function prototypes for compatible pointer types, it allows direct pointer assignments.</p>
-<p>Use this setting if you are using code written before the ISO C standard. Old source code frequently uses these types interchangeably.</p>
-<p>This setting has no effect on C++. When compiling C++ source code, the compiler differentiates <span class="code">char*</span> and <span class="code">unsigned char*</span> data types even if the relaxed pointer setting is enabled.</p>
-<p> See also “mpwc_relax”, and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Relaxed Pointer Type Rules</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Relaxed Pointer Type Rules</h3>
+<p>Use the <span class="code">#pragma mpwc_relax</span> to tell the compiler to treat all pointer types as the same type. While the compiler verifies the parameters of function prototypes for compatible pointer types, it allows direct pointer assignments.</p>
+<p>Use this setting if you are using code written before the ISO C standard. Old source code frequently uses these types interchangeably.</p>
+<p>This setting has no effect on C++. When compiling C++ source code, the compiler differentiates <span class="code">char*</span> and <span class="code">unsigned char*</span> data types even if the relaxed pointer setting is enabled.</p>
+<p> See also “mpwc_relax”, and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_require_prototypes.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_require_prototypes.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,54 +1,54 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Require Function Prototypes</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Require Function Prototypes</h3>
-<p>(ISO C, §6.7.5.3, §6.9.1) The C compiler lets you choose how to enforce function prototypes. The <a href="../pragmas/p_require_prototypes.htm">Require Function Prototypes</a> setting controls this behavior.</p>
-<p>If you enable the Require Function Prototypes setting, the compiler generates an error if you define a previously referenced function that does not have a prototype. If you define the function before it is referenced but do not give it a prototype, then enabling the Require Function Prototypes setting causes the compiler to issue a warning.</p>
-<p>This setting helps you prevent errors that happen when you call a function before you declare or define it. For example, without a function prototype, you might pass data of the wrong type. As a result, your code might not work as you expect even though it compiles without error.</p>
-<p>In Listing 1, <span class="code">PrintNum()</span> is called with an integer argument but later defined to take a floating-point argument. </p>
-<div class="listing">
- <h5>Listing 1. Unnoticed Type-mismatch</h5>
- <p>#include <stdio.h><br />
- void main(void)<br />
- {<br />
- PrintNum(1); // PrintNum() tries to interpret the <br />
- integer as a float. Prints 0.000000.<br />
- }</p>
- <p>void PrintNum(float x)<br />
- {<br />
- printf("%f\n", x);<br />
- }</p>
-</div>
-<p>When you run this program, you could get this result:</p>
-<p class="listing">0.000000</p>
-<p>Although the compiler does not complain about the type mismatch, the function does not work as you want. Since PrintNum() does not have a prototype, the compiler does not know to convert the integer to a floating-point number before calling the function. Instead, the function interprets the bits it received as a floating-point number and prints nonsense. </p>
-<p>If you prototype <span class="code">PrintNum()</span> first, as in Listing 2, the compiler converts its argument to a floating-point number, and the function prints what you wanted.</p>
-<div class="listing">
- <h5>Listing 2. Using a Prototype to Avoid Type-mismatch</h5>
- <p>#include <stdio.h><br />
- void PrintNum(float x); // Function prototype.</p>
- <p>void main(void)<br />
- {<br />
- PrintNum(1); // Compiler converts int to float.<br />
- } // Prints 1.000000.</p>
- <p>void PrintNum(float x)<br />
- {<br />
- printf("%f\n", x);<br />
- }</p>
-</div>
-<p>In the above example, the compiler automatically typecasts the passed value. In other situations where automatic typecasting is not available, the compiler generates an error if an argument does not match the data type required by a function prototype. Such a mismatched data type error is easy to locate at compile time. If you do not use prototypes, you do not get a compiler error.</p>
-<p>However, at runtime the code might produce an unexpected result whose cause can be extremely difficult to find.</p>
-<p>The Require Function Prototypes setting corresponds to the pragma require_prototypes. To check this setting, use <span class="code">__option (require_prototypes)</span>. By default, this setting is enabled.</p>
-<p>See also “require_prototypes”, and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Require Function Prototypes</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Require Function Prototypes</h3>
+<p>(ISO C, §6.7.5.3, §6.9.1) The C compiler lets you choose how to enforce function prototypes. The <a href="../pragmas/p_require_prototypes.htm">Require Function Prototypes</a> setting controls this behavior.</p>
+<p>If you enable the Require Function Prototypes setting, the compiler generates an error if you define a previously referenced function that does not have a prototype. If you define the function before it is referenced but do not give it a prototype, then enabling the Require Function Prototypes setting causes the compiler to issue a warning.</p>
+<p>This setting helps you prevent errors that happen when you call a function before you declare or define it. For example, without a function prototype, you might pass data of the wrong type. As a result, your code might not work as you expect even though it compiles without error.</p>
+<p>In Listing 1, <span class="code">PrintNum()</span> is called with an integer argument but later defined to take a floating-point argument. </p>
+<div class="listing">
+ <h5>Listing 1. Unnoticed Type-mismatch</h5>
+ <p>#include <stdio.h><br />
+ void main(void)<br />
+ {<br />
+ PrintNum(1); // PrintNum() tries to interpret the <br />
+ integer as a float. Prints 0.000000.<br />
+ }</p>
+ <p>void PrintNum(float x)<br />
+ {<br />
+ printf("%f\n", x);<br />
+ }</p>
+</div>
+<p>When you run this program, you could get this result:</p>
+<p class="listing">0.000000</p>
+<p>Although the compiler does not complain about the type mismatch, the function does not work as you want. Since PrintNum() does not have a prototype, the compiler does not know to convert the integer to a floating-point number before calling the function. Instead, the function interprets the bits it received as a floating-point number and prints nonsense. </p>
+<p>If you prototype <span class="code">PrintNum()</span> first, as in Listing 2, the compiler converts its argument to a floating-point number, and the function prints what you wanted.</p>
+<div class="listing">
+ <h5>Listing 2. Using a Prototype to Avoid Type-mismatch</h5>
+ <p>#include <stdio.h><br />
+ void PrintNum(float x); // Function prototype.</p>
+ <p>void main(void)<br />
+ {<br />
+ PrintNum(1); // Compiler converts int to float.<br />
+ } // Prints 1.000000.</p>
+ <p>void PrintNum(float x)<br />
+ {<br />
+ printf("%f\n", x);<br />
+ }</p>
+</div>
+<p>In the above example, the compiler automatically typecasts the passed value. In other situations where automatic typecasting is not available, the compiler generates an error if an argument does not match the data type required by a function prototype. Such a mismatched data type error is easy to locate at compile time. If you do not use prototypes, you do not get a compiler error.</p>
+<p>However, at runtime the code might produce an unexpected result whose cause can be extremely difficult to find.</p>
+<p>The Require Function Prototypes setting corresponds to the pragma require_prototypes. To check this setting, use <span class="code">__option (require_prototypes)</span>. By default, this setting is enabled.</p>
+<p>See also “require_prototypes”, and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_reuse_strings.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_reuse_strings.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Reusing Strings</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Reusing Strings</h3>
-<p>The Reuse Strings setting controls how the compiler stores string literals.</p>
-<p>If you enable this setting, the compiler stores each string literal separately. Otherwise, the compiler stores only one copy of identical string literals. This means if you change one of the strings, you change them all. For example, take this code snippet:</p>
-<p class="listing">char *str1="Hello";<br />
- char *str2="Hello"; // two identical strings<br />
- *str2 = 'Y';</p>
-<p>This setting helps you save memory if your program contains identical string literals which you do not modify.</p>
-<p>If you enable the Reuse Strings setting, the strings are stored separately. After changing the first character, <span class="code">str1</span> is still "<span class="code">Hello</span>", but <span class="code">str2</span> is "<span class="code">Yello</span>".</p>
-<p>If you disable the Reuse Strings setting, the two strings are stored in one memory location because they are identical. After changing the first character, both <span class="code">str1</span> and <span class="code">str2</span> are "<span class="code">Yello</span>", which is counterintuitive and can create bugs that are difficult to locate.</p>
-<p>The Reuse Strings setting corresponds to the pragma dont_reuse_strings. To check this setting, use <span class="code">__option (dont_reuse_strings)</span>. By default, this setting is enabled, so strings are not reused.</p>
-<p>See also <a href="../pragmas/p_dont_reuse_strings.htm">dont_reuse_strings</a>. and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Reusing Strings</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Reusing Strings</h3>
+<p>The Reuse Strings setting controls how the compiler stores string literals.</p>
+<p>If you enable this setting, the compiler stores each string literal separately. Otherwise, the compiler stores only one copy of identical string literals. This means if you change one of the strings, you change them all. For example, take this code snippet:</p>
+<p class="listing">char *str1="Hello";<br />
+ char *str2="Hello"; // two identical strings<br />
+ *str2 = 'Y';</p>
+<p>This setting helps you save memory if your program contains identical string literals which you do not modify.</p>
+<p>If you enable the Reuse Strings setting, the strings are stored separately. After changing the first character, <span class="code">str1</span> is still "<span class="code">Hello</span>", but <span class="code">str2</span> is "<span class="code">Yello</span>".</p>
+<p>If you disable the Reuse Strings setting, the two strings are stored in one memory location because they are identical. After changing the first character, both <span class="code">str1</span> and <span class="code">str2</span> are "<span class="code">Yello</span>", which is counterintuitive and can create bugs that are difficult to locate.</p>
+<p>The Reuse Strings setting corresponds to the pragma dont_reuse_strings. To check this setting, use <span class="code">__option (dont_reuse_strings)</span>. By default, this setting is enabled, so strings are not reused.</p>
+<p>See also <a href="../pragmas/p_dont_reuse_strings.htm">dont_reuse_strings</a>. and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_short_dbl_type.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_short_dbl_type.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,17 +1,17 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>The short double Data Type</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>The short double Data Type</h3>
-<p>The <span class="code">short double</span> data type is no longer supported for most targets.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>The short double Data Type</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>The short double Data Type</h3>
+<p>The <span class="code">short double</span> data type is no longer supported for most targets.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_sizeof_type.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_sizeof_type.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,19 +1,19 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Sizeof() Operator Data Type</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Sizeof() Operator Data Type</h3>
-<p>The <span class="code">sizeof()</span> operator returns the size of a variable or type in bytes. The data type of this size is <span class="code">size_t</span>, which the compiler declares in the file <span class="code">stddef.h</span>. If your source code assumes that <span class="code">sizeof()</span> returns a number of type <span class="code">int</span>, it might not work correctly.</p>
-<p class="note"><strong>NOTE</strong> The compiler evaluates the value returned by <span class="code">sizeof()</span> only at compile time, not runtime.</p>
-<p class="note"><strong>NOTE</strong> The <span class="code">sizeof()</span> operator is not intended to work in preprocessor <span class="code">#if/#elif</span> directives.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Sizeof() Operator Data Type</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Sizeof() Operator Data Type</h3>
+<p>The <span class="code">sizeof()</span> operator returns the size of a variable or type in bytes. The data type of this size is <span class="code">size_t</span>, which the compiler declares in the file <span class="code">stddef.h</span>. If your source code assumes that <span class="code">sizeof()</span> returns a number of type <span class="code">int</span>, it might not work correctly.</p>
+<p class="note"><strong>NOTE</strong> The compiler evaluates the value returned by <span class="code">sizeof()</span> only at compile time, not runtime.</p>
+<p class="note"><strong>NOTE</strong> The <span class="code">sizeof()</span> operator is not intended to work in preprocessor <span class="code">#if/#elif</span> directives.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_std_conformity.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_std_conformity.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Checking for Standard C and Standard C++ Conformity</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Checking for Standard C and Standard C++ Conformity</h3>
-<p>The <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting affects several C language extensions made by the Carbide C compiler:</p>
-<ul>
- <li><a href="c_cpp_comments.htm">C++ Comments</a></li>
- <li><a href="c_unnamed_args.htm">Unnamed Arguments in Function Definitions</a></li>
- <li><a href="c_macro_args.htm">A # Not Followed by a Macro Argument</a></li>
- <li><a href="c_endif_identifier.htm">Using an Identifier After #endif</a></li>
- <li><a href="c_typecast_ptrs.htm">Using Typecasted Pointers as lvalues</a></li>
- <li><a href="c_convert_ptrs.htm">Converting Pointers to Types of the Same Size</a></li>
- <li><a href="c_zero_length_arrays.htm">Arrays of Zero Length in Structures</a></li>
- <li><a href="c_d_constant_suffix.htm">The “D” Constant Suffix</a></li>
-</ul>
-<p>If you enable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting, the compiler disables all of the above ANSI C language extensions. You cannot enable individual extensions that are controlled by the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting.</p>
-<p>This setting might affect how the compiler handles enumerated constants. See <a href="c_enum_types.htm">Enumerated Types</a> for more information. It might also affect the declaration of the <span class="code">main()</span> function for C++ programs. See “Implicit Return Statement for main()”.</p>
-<p>The <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting corresponds to the pragma ANSI_strict. To check this setting, use <span class="code">__option (ANSI_strict)</span>. See also “ANSI_strict” and <a href="../symbols/sym_settings.htm">Checking Settings</a>.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Checking for Standard C and Standard C++ Conformity</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Checking for Standard C and Standard C++ Conformity</h3>
+<p>The <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting affects several C language extensions made by the Carbide C compiler:</p>
+<ul>
+ <li><a href="c_cpp_comments.htm">C++ Comments</a></li>
+ <li><a href="c_unnamed_args.htm">Unnamed Arguments in Function Definitions</a></li>
+ <li><a href="c_macro_args.htm">A # Not Followed by a Macro Argument</a></li>
+ <li><a href="c_endif_identifier.htm">Using an Identifier After #endif</a></li>
+ <li><a href="c_typecast_ptrs.htm">Using Typecasted Pointers as lvalues</a></li>
+ <li><a href="c_convert_ptrs.htm">Converting Pointers to Types of the Same Size</a></li>
+ <li><a href="c_zero_length_arrays.htm">Arrays of Zero Length in Structures</a></li>
+ <li><a href="c_d_constant_suffix.htm">The “D” Constant Suffix</a></li>
+</ul>
+<p>If you enable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting, the compiler disables all of the above ANSI C language extensions. You cannot enable individual extensions that are controlled by the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting.</p>
+<p>This setting might affect how the compiler handles enumerated constants. See <a href="c_enum_types.htm">Enumerated Types</a> for more information. It might also affect the declaration of the <span class="code">main()</span> function for C++ programs. See “Implicit Return Statement for main()”.</p>
+<p>The <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting corresponds to the pragma ANSI_strict. To check this setting, use <span class="code">__option (ANSI_strict)</span>. See also “ANSI_strict” and <a href="../symbols/sym_settings.htm">Checking Settings</a>.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_typecast_ptrs.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_typecast_ptrs.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Using Typecasted Pointers as lvalues</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Using Typecasted Pointers as lvalues</h3>
-<p>The C compiler can accept pointers that are typecasted to other pointer types as <span class="code">lvalues</span>.</p>
-<div class="listing">
- <h4>Listing 1. Example of a Typecasted Pointer as an lvalue</h4>
- <p>char *cp;<br />
- ((long *) cp)++; /* OK if ANSI Strict is disabled. */</p>
-</div>
-<p>See also “Checking for Standard C and Standard C++ Conformity”.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Using Typecasted Pointers as lvalues</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Using Typecasted Pointers as lvalues</h3>
+<p>The C compiler can accept pointers that are typecasted to other pointer types as <span class="code">lvalues</span>.</p>
+<div class="listing">
+ <h4>Listing 1. Example of a Typecasted Pointer as an lvalue</h4>
+ <p>char *cp;<br />
+ ((long *) cp)++; /* OK if ANSI Strict is disabled. */</p>
+</div>
+<p>See also “Checking for Standard C and Standard C++ Conformity”.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_typeof_operator.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_typeof_operator.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>The __typeof__() and typeof() operators</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3> The __typeof__() and typeof() operators</h3>
-<p> With the <span class="code">__typeof__()</span> operator, the compiler lets you specify the data type of an expression. Listing 1 shows an example.</p>
-<p class="listing">__typeof__(<em>expression</em>)</p>
-<p>where expression is any valid C expression or data type. Because the compiler translates a <span class="code">__typeof__()</span> expression into a data type, you can use this expression wherever a normal type would be specified.</p>
-<p>Like the <span class="code">sizeof()</span> operator, <span class="code">__typeof__()</span> is only evaluated at compile time, not at runtime. For related information, see “Sizeof() Operator Data Type”.</p>
-<p>If you enable the gcc_extensions pragma, the <span class="code">typeof()</span> operator is equivalent to the <span class="code">__typeof__()</span> operator.</p>
-<div class="listing">
- <h4>Listing 1. Example of __typeof__() and typeof() Operators</h4>
- <p>char *cp;<br />
- int *ip;<br />
- long *lp;</p>
- <p>__typeof__(*ip) i; /* equivalent to "int i;" */<br />
- __typeof__(*lp) l; /* equivalent to "long l;" */</p>
- <p>#pragma gcc_extensions on<br />
- typeof(*cp) c; /* equivalent to "char c;" */<br />
- </p>
-</div>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>The __typeof__() and typeof() operators</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3> The __typeof__() and typeof() operators</h3>
+<p> With the <span class="code">__typeof__()</span> operator, the compiler lets you specify the data type of an expression. Listing 1 shows an example.</p>
+<p class="listing">__typeof__(<em>expression</em>)</p>
+<p>where expression is any valid C expression or data type. Because the compiler translates a <span class="code">__typeof__()</span> expression into a data type, you can use this expression wherever a normal type would be specified.</p>
+<p>Like the <span class="code">sizeof()</span> operator, <span class="code">__typeof__()</span> is only evaluated at compile time, not at runtime. For related information, see “Sizeof() Operator Data Type”.</p>
+<p>If you enable the gcc_extensions pragma, the <span class="code">typeof()</span> operator is equivalent to the <span class="code">__typeof__()</span> operator.</p>
+<div class="listing">
+ <h4>Listing 1. Example of __typeof__() and typeof() Operators</h4>
+ <p>char *cp;<br />
+ int *ip;<br />
+ long *lp;</p>
+ <p>__typeof__(*ip) i; /* equivalent to "int i;" */<br />
+ __typeof__(*lp) l; /* equivalent to "long l;" */</p>
+ <p>#pragma gcc_extensions on<br />
+ typeof(*cp) c; /* equivalent to "char c;" */<br />
+ </p>
+</div>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_unnamed_args.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_unnamed_args.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Unnamed Arguments in Function Definitions</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Unnamed Arguments in Function Definitions</h3>
-<p>(ISO C, §6.9.1) The C compiler can accept unnamed arguments in a function definition.</p>
-<div class="listing">
- <h4>Listing 1. Unnamed Function Arguments</h4>
- <p>void f(int ) {} /* OK if ANSI Strict is disabled */<br />
- void f(int i) {} /* ALWAYS OK */</p>
-</div>
-<p>See also: <a href="c_std_conformity.htm">Checking for Standard C and Standard C++ Conformity</a>.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Unnamed Arguments in Function Definitions</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Unnamed Arguments in Function Definitions</h3>
+<p>(ISO C, §6.9.1) The C compiler can accept unnamed arguments in a function definition.</p>
+<div class="listing">
+ <h4>Listing 1. Unnamed Function Arguments</h4>
+ <p>void f(int ) {} /* OK if ANSI Strict is disabled */<br />
+ void f(int i) {} /* ALWAYS OK */</p>
+</div>
+<p>See also: <a href="c_std_conformity.htm">Checking for Standard C and Standard C++ Conformity</a>.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_unsigned_chars.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_unsigned_chars.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,19 +1,19 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Use Unsigned Chars</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Use Unsigned Chars</h3>
-<p>The C compiler treats a <span class="code">char</span> declaration as an <span class="code">unsigned char</span> declaration. </p>
-<p>The Use Unsigned Chars setting corresponds to the pragma unsigned_char. To check this setting, use <span class="code">__option (unsigned_char)</span>. By default, this setting is disabled.</p>
-<p>See also “unsigned_char” and <a href="../symbols/sym_settings.htm">Checking Settings</a>.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Use Unsigned Chars</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Use Unsigned Chars</h3>
+<p>The C compiler treats a <span class="code">char</span> declaration as an <span class="code">unsigned char</span> declaration. </p>
+<p>The Use Unsigned Chars setting corresponds to the pragma unsigned_char. To check this setting, use <span class="code">__option (unsigned_char)</span>. By default, this setting is disabled.</p>
+<p>See also “unsigned_char” and <a href="../symbols/sym_settings.htm">Checking Settings</a>.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_use_longlong.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_use_longlong.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Using long long Integers</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Using long long Integers</h3>
-<p>The C compiler allows the type specifier long long. The <span class="code">longlong</span> pragma controls this behavior and has no corresponding item .</p>
-<p>If this setting is <span class="code">off</span>, using long long causes a syntax error. </p>
-<p>In an enumerated type, you can use an enumerator large enough for a long long. For more information, see <a href="c_enum_types.htm">Enumerated Types</a>.</p>
-<p>However, long long bitfields are not supported.</p>
-<p>You control the long long type with <span class="code">#pragma longlong</span>. To check this setting, use <span class="code">__option (longlong)</span>. By default, this pragma is <span class="code">on</span>.</p>
-<p>See also <a href="../pragmas/p_longlong.htm" class="code">longlong</a> and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Using long long Integers</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Using long long Integers</h3>
+<p>The C compiler allows the type specifier long long. The <span class="code">longlong</span> pragma controls this behavior and has no corresponding item .</p>
+<p>If this setting is <span class="code">off</span>, using long long causes a syntax error. </p>
+<p>In an enumerated type, you can use an enumerator large enough for a long long. For more information, see <a href="c_enum_types.htm">Enumerated Types</a>.</p>
+<p>However, long long bitfields are not supported.</p>
+<p>You control the long long type with <span class="code">#pragma longlong</span>. To check this setting, use <span class="code">__option (longlong)</span>. By default, this pragma is <span class="code">on</span>.</p>
+<p>See also <a href="../pragmas/p_longlong.htm" class="code">longlong</a> and <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_volatile_var.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_volatile_var.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Volatile Variables</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Volatile Variables</h3>
-<p>(ISO C, §6.7.3) When you declare a volatile variable, the Carbide C compiler takes the following precautions to respect the value of the variable:</p>
-<ul>
- <li>The compiler stores commonly used variables in processor registers to produce faster object code. However, the compiler never stores the value of a volatile variable in a processor register.</li>
- <li>The compiler uses its common sub-expression optimization to compute the addresses of commonly used variables and the results of often-used expressions once at the beginning of a function to produce faster object code. However, every time an expression uses a volatile variable, the compiler computes both the address of the volatile variable and the results of the expression that uses it.</li>
-</ul>
-<p>Listing 1 shows an example of volatile variables.</p>
-<div class="listing">
- <h5>Listing 1. Volatile Variables</h5>
- <p>void main(void)<br />
- {<br />
- int i[100];<br />
- volatile int a, b; /* a and b are not cached in registers. */</p>
- <p> a = 5;<br />
- b = 20;</p>
- <p> i[a + b] = 15; /* compiler calculates a + b */<br />
- i[a + b] = 30; /* compiler recalculates a + b */<br />
- }</p>
-</div>
-<p>The compiler does not place the value of a, b, or a+b in registers. But it does recalculate a+b in both assignment statements. <br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Volatile Variables</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Volatile Variables</h3>
+<p>(ISO C, §6.7.3) When you declare a volatile variable, the Carbide C compiler takes the following precautions to respect the value of the variable:</p>
+<ul>
+ <li>The compiler stores commonly used variables in processor registers to produce faster object code. However, the compiler never stores the value of a volatile variable in a processor register.</li>
+ <li>The compiler uses its common sub-expression optimization to compute the addresses of commonly used variables and the results of often-used expressions once at the beginning of a function to produce faster object code. However, every time an expression uses a volatile variable, the compiler computes both the address of the volatile variable and the results of the expression that uses it.</li>
+</ul>
+<p>Listing 1 shows an example of volatile variables.</p>
+<div class="listing">
+ <h5>Listing 1. Volatile Variables</h5>
+ <p>void main(void)<br />
+ {<br />
+ int i[100];<br />
+ volatile int a, b; /* a and b are not cached in registers. */</p>
+ <p> a = 5;<br />
+ b = 20;</p>
+ <p> i[a + b] = 15; /* compiler calculates a + b */<br />
+ i[a + b] = 30; /* compiler recalculates a + b */<br />
+ }</p>
+</div>
+<p>The compiler does not place the value of a, b, or a+b in registers. But it does recalculate a+b in both assignment statements. <br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_zero_length_arrays.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/c_compiler/c_zero_length_arrays.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Arrays of Zero Length in Structures</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Arrays of Zero Length in Structures</h3>
-<p> If you disable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting , the compiler lets you specify an array of no length as the last item in a structure. Listing 1 shows an example. You can define arrays with zero as the index value or with no index value.</p>
-<div class="listing">
- <h5>Listing 1. Using Zero-length Arrays</h5>
- <p>struct listOfLongs {<br />
- long listCount;<br />
- long list[0]; // OK if ANSI Strict is disabled, [] is OK, too.<br />
- }<br />
- </p>
-</div>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Arrays of Zero Length in Structures</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Arrays of Zero Length in Structures</h3>
+<p> If you disable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting , the compiler lets you specify an array of no length as the last item in a structure. Listing 1 shows an example. You can define arrays with zero as the index value or with no index value.</p>
+<div class="listing">
+ <h5>Listing 1. Using Zero-length Arrays</h5>
+ <p>struct listOfLongs {<br />
+ long listCount;<br />
+ long list[0]; // OK if ANSI Strict is disabled, [] is OK, too.<br />
+ }<br />
+ </p>
+</div>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cmd_line/cmd_admin_options.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cmd_line/cmd_admin_options.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Help and Administrative Options</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Help and Administrative Options</h3>
-<p> This section provides examples of how to retrieve general and help information from the command-line tools.</p>
-<p>For example, to obtain help information from a tool that has some compatibility options with Visual C++, type the following command:</p>
-<p class="listing">mwccsym2 -?</p>
-<p>To get more specific information from the same tool, type the following command:</p>
-<p class="listing">mwccsym2 -help [argument,...]</p>
-<p>where <span class="code">argument</span> is a valid keyword such as <span class="code">usage</span>, <span class="code">all</span>, or <span class="code">this</span>. For example, with the Windows® x86 C/C++ compiler, typing:</p>
-<p class="listing">mwccsym2 -help usage</p>
-<p>or</p>
-<p class="listing">mwccsym2 -help opt=help</p>
-<p>provides information about the help options available with the <span class="code">mwccsym2</span> x86 tool.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Help and Administrative Options</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Help and Administrative Options</h3>
+<p> This section provides examples of how to retrieve general and help information from the command-line tools.</p>
+<p>For example, to obtain help information from a tool that has some compatibility options with Visual C++, type the following command:</p>
+<p class="listing">mwccsym2 -?</p>
+<p>To get more specific information from the same tool, type the following command:</p>
+<p class="listing">mwccsym2 -help [argument,...]</p>
+<p>where <span class="code">argument</span> is a valid keyword such as <span class="code">usage</span>, <span class="code">all</span>, or <span class="code">this</span>. For example, with the Windows® x86 C/C++ compiler, typing:</p>
+<p class="listing">mwccsym2 -help usage</p>
+<p>or</p>
+<p class="listing">mwccsym2 -help opt=help</p>
+<p>provides information about the help options available with the <span class="code">mwccsym2</span> x86 tool.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cmd_line/cmd_conventions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cmd_line/cmd_conventions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Command-Line Settings Conventions</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Command-Line Settings Conventions</h3>
-<p> In all cases, text in brackets (<span class="code">[]</span>) is optional, although the brackets themselves never appear in the actual command. For example, the command <span class="code">-str[ings]</span> pool can mean either:</p>
-<p class="code">-strings pool</p>
-<p>or </p>
-<p class="code">-str pool</p>
-<p>Where an option has several possible permutations, the possibilities are separated by the pipe (<span class="code">|</span>) character. For example:</p>
-<p class="listing">-sym on|off|full|fullpath</p>
-<p>means the <span class="code">-sym</span> command can be followed by one or more of the following options: on, off, full, or fullpath. If you have more than one option, separate each option with a comma. So you might have<span class="code"> -sym on</span>, <span class="code">-sym off</span>, <span class="code">-sym full</span>, or <span class="code">-sym on, fullpath</span>.</p>
-<p>The plus sign (<span class="code">+</span>) means that the parameter to an option must not be separated from the option name by a space. For example, </p>
-<p class="listing">-D+name[=value]</p>
-<p>means that you can have <span class="code">-DVAR</span> or <span class="code">-DVAR=3</span>, but not <span class="code">-D VAR</span>.</p>
-<p>In cases where you provide a variable parameter such as a file name, that item is in italic text. For example,<span class="code"> -precompile filename</span> means you must provide a file name. The help text that corresponds to the compiler option explains what you must provide.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Command-Line Settings Conventions</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Command-Line Settings Conventions</h3>
+<p> In all cases, text in brackets (<span class="code">[]</span>) is optional, although the brackets themselves never appear in the actual command. For example, the command <span class="code">-str[ings]</span> pool can mean either:</p>
+<p class="code">-strings pool</p>
+<p>or </p>
+<p class="code">-str pool</p>
+<p>Where an option has several possible permutations, the possibilities are separated by the pipe (<span class="code">|</span>) character. For example:</p>
+<p class="listing">-sym on|off|full|fullpath</p>
+<p>means the <span class="code">-sym</span> command can be followed by one or more of the following options: on, off, full, or fullpath. If you have more than one option, separate each option with a comma. So you might have<span class="code"> -sym on</span>, <span class="code">-sym off</span>, <span class="code">-sym full</span>, or <span class="code">-sym on, fullpath</span>.</p>
+<p>The plus sign (<span class="code">+</span>) means that the parameter to an option must not be separated from the option name by a space. For example, </p>
+<p class="listing">-D+name[=value]</p>
+<p>means that you can have <span class="code">-DVAR</span> or <span class="code">-DVAR=3</span>, but not <span class="code">-D VAR</span>.</p>
+<p>In cases where you provide a variable parameter such as a file name, that item is in italic text. For example,<span class="code"> -precompile filename</span> means you must provide a file name. The help text that corresponds to the compiler option explains what you must provide.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cmd_line/cmd_env_vars.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cmd_line/cmd_env_vars.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,38 +1,38 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Working with Environment Variables</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Working with Environment Variables</h3>
-<p> To use the command-line tools, you must change several environment variables. If you are using Carbide command-line tools with Microsoft® Windows®, you can assign environment variables through the Environment tab under the System control panel in Windows XP/2000/NT.</p>
-<h4>CWFolder Environment Variable</h4>
-<p>Use the following syntax when defining variables in batch files or on the command line:</p>
-<p class="listing">set CWFolder=C:\Program Files\Carbide</p>
-<p>In this example, <span class="code">CWFolder</span> refers to the path where you installed Carbide. It is not necessary to include quotation marks when defining environment variables that include spaces. Because Windows does not strip out the quotes, this leads to unknown directory warnings.</p>
-<h4>Setting the PATH Environment Variable</h4>
-<p>The <span class="code">PATH</span> variable should include the paths for the tools, as shown below. For other tools, the paths can vary. An example of setting <span class="code">PATH</span>:</p>
-<p class="listing">%CWFolder%\Carbide<br />
- %CWFolder%\Carbide\Carbide.c++</p>
-<p>The first path contains the FlexLM license manager DLL, and the second path contains the tools. To run FlexLM, copy the following file into the directory containing the command-line tools:</p>
-<p class="listing">..\Carbide\license.dat</p>
-<p>Or, you can define the variable <span class="code">LM_LICENSE_FILE</span> as:</p>
-<p class="listing">%CWFolder%\license.dat</p>
-<p>which points to the license information. It might point to alternate versions of this file, as needed.</p>
-<h4>Getting Environmental Variables</h4>
-<p>Use the predefined <span class="code">macro __env_var()</span> to return host-specific environmental variables. An example of getting an environmental variable:</p>
-<p class="listing">// returns "username" environmental variable <br />
- // (host-specific)<br />
- char* username = __env_var(username);</p>
-<h4>Search Path Environment Variables</h4>
-<p>Several environment variables are used at runtime to search for system include paths and libraries that can shorten command lines for many tasks. All of the variables mentioned here are lists that are separated by semicolons (;) in Windows and colons (:) in Solaris.</p>
-<p>For the linker, unless you specify <span class="code">-nodefaults</span> or <span class="code">-disassembl</span>e, the linker searches the environment for a list of system access paths and library files to be added to the end of the search and link orders. For example, with Embedded PowerPC, the linkers searches for files, libraries, and command files, using the system library paths found within the variables <span class="code">MWEABIPPCLibraries</span> and <span class="code">MWLibraries</span>. Associated with these lists are <span class="code">MWEABIPPCLibraryFiles</span> and <span class="code">MWLibraryFiles</span>, which contain lists of libraries (or object files or command files) to add to the end of the link order. These files can be located in any of the cumulative access paths at runtime.</p>
-<p>If you are only building for one target, you can use <span class="code">MWCIncludes</span>, <span class="code">MWAsmIncludes</span>, <span class="code">MWLibraries</span>, and <span class="code">MWLibraryFiles</span>. Because the target-specific versions of these variables override the generic variables, they are useful when working with multiple targets. If the target-specific variable exists, then the generic variable is not used because you cannot combine the contents of the two variables.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Working with Environment Variables</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Working with Environment Variables</h3>
+<p> To use the command-line tools, you must change several environment variables. If you are using Carbide command-line tools with Microsoft® Windows®, you can assign environment variables through the Environment tab under the System control panel in Windows XP/2000/NT.</p>
+<h4>CWFolder Environment Variable</h4>
+<p>Use the following syntax when defining variables in batch files or on the command line:</p>
+<p class="listing">set CWFolder=C:\Program Files\Carbide</p>
+<p>In this example, <span class="code">CWFolder</span> refers to the path where you installed Carbide. It is not necessary to include quotation marks when defining environment variables that include spaces. Because Windows does not strip out the quotes, this leads to unknown directory warnings.</p>
+<h4>Setting the PATH Environment Variable</h4>
+<p>The <span class="code">PATH</span> variable should include the paths for the tools, as shown below. For other tools, the paths can vary. An example of setting <span class="code">PATH</span>:</p>
+<p class="listing">%CWFolder%\Carbide<br />
+ %CWFolder%\Carbide\Carbide.c++</p>
+<p>The first path contains the FlexLM license manager DLL, and the second path contains the tools. To run FlexLM, copy the following file into the directory containing the command-line tools:</p>
+<p class="listing">..\Carbide\license.dat</p>
+<p>Or, you can define the variable <span class="code">LM_LICENSE_FILE</span> as:</p>
+<p class="listing">%CWFolder%\license.dat</p>
+<p>which points to the license information. It might point to alternate versions of this file, as needed.</p>
+<h4>Getting Environmental Variables</h4>
+<p>Use the predefined <span class="code">macro __env_var()</span> to return host-specific environmental variables. An example of getting an environmental variable:</p>
+<p class="listing">// returns "username" environmental variable <br />
+ // (host-specific)<br />
+ char* username = __env_var(username);</p>
+<h4>Search Path Environment Variables</h4>
+<p>Several environment variables are used at runtime to search for system include paths and libraries that can shorten command lines for many tasks. All of the variables mentioned here are lists that are separated by semicolons (;) in Windows and colons (:) in Solaris.</p>
+<p>For the linker, unless you specify <span class="code">-nodefaults</span> or <span class="code">-disassembl</span>e, the linker searches the environment for a list of system access paths and library files to be added to the end of the search and link orders. For example, with Embedded PowerPC, the linkers searches for files, libraries, and command files, using the system library paths found within the variables <span class="code">MWEABIPPCLibraries</span> and <span class="code">MWLibraries</span>. Associated with these lists are <span class="code">MWEABIPPCLibraryFiles</span> and <span class="code">MWLibraryFiles</span>, which contain lists of libraries (or object files or command files) to add to the end of the link order. These files can be located in any of the cumulative access paths at runtime.</p>
+<p>If you are only building for one target, you can use <span class="code">MWCIncludes</span>, <span class="code">MWAsmIncludes</span>, <span class="code">MWLibraries</span>, and <span class="code">MWLibraryFiles</span>. Because the target-specific versions of these variables override the generic variables, they are useful when working with multiple targets. If the target-specific variable exists, then the generic variable is not used because you cannot combine the contents of the two variables.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cmd_line/cmd_extensions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cmd_line/cmd_extensions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,17 +1,17 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Invoking Command-Line Tools</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>File Extensions</h3>
-<p> Files specified on the command line are identified by contents and file extension, as in the Carbide IDE. </p>
-<p>Although the command-line version of the Carbide C/C++ compiler accepts non-standard file extensions as source, it also emit a warning when this happens. By default, the compiler assumes that a file with any extensions other than .c, .h, or .pch is a C++ source file. The linker must be able to identify all files as object code, libraries, or command files. It ignores all other files.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Invoking Command-Line Tools</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>File Extensions</h3>
+<p> Files specified on the command line are identified by contents and file extension, as in the Carbide IDE. </p>
+<p>Although the command-line version of the Carbide C/C++ compiler accepts non-standard file extensions as source, it also emit a warning when this happens. By default, the compiler assumes that a file with any extensions other than .c, .h, or .pch is a C++ source file. The linker must be able to identify all files as object code, libraries, or command files. It ignores all other files.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cmd_line/cmd_invoking.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cmd_line/cmd_invoking.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Tool Naming Conventions</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Invoking Command-Line Tools</h3>
-<p> To compile, assemble, link, or perform some other programming task with the Carbide command-line tools, type a command at the command-line prompt. This command specifies what tool to run, what options to use while the tool runs, and on what files the tool should operate.</p>
-<p>The tool performs the operation on the files you specify. If the tool successfully finishes its operation, a new prompt appears on the command line. Otherwise, it reports any problems as text messages on the command line before a new prompt appears. The tools include:</p>
-<ul>
- <li><span class="code">mwccsym2</span> — x86 C/C++ compiler</li>
- <li><span class="code">mwldsym2</span> — x86 linker</li>
- <li><span class="code">mwc++filt</span> — x86 filter</li>
-</ul>
-<p>All of them can be found in <span class="code">\Nokia\Carbide.c++ <version>\x86Build\Symbian_Tools\Command_Line_Tools.</span></p>
-<p>You can also write scripts that automate the process to build your software. Scripts contain a list of command-line tools to invoke, one after another. For example, the <span class="code">make</span> tool, a common software development tool, uses scripts to manage dependencies among source code files and invoke command-line compilers, assemblers, and linkers as needed, much like the Carbider IDE’s project manager.</p>
-<p>Commands follow this convention:</p>
-<blockquote>
- <p class="code">tool [options] [files] </p>
-</blockquote>
-<p>where tool is the name of the Carbide command-line tool to invoke, options is a list of zero or more options that tell the tool what operation it should perform and how to perform it, and files is a list of zero or more files on which the tool should operate. Which options and files you use depends on what operation you want the tool to perform.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Tool Naming Conventions</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Invoking Command-Line Tools</h3>
+<p> To compile, assemble, link, or perform some other programming task with the Carbide command-line tools, type a command at the command-line prompt. This command specifies what tool to run, what options to use while the tool runs, and on what files the tool should operate.</p>
+<p>The tool performs the operation on the files you specify. If the tool successfully finishes its operation, a new prompt appears on the command line. Otherwise, it reports any problems as text messages on the command line before a new prompt appears. The tools include:</p>
+<ul>
+ <li><span class="code">mwccsym2</span> — x86 C/C++ compiler</li>
+ <li><span class="code">mwldsym2</span> — x86 linker</li>
+ <li><span class="code">mwc++filt</span> — x86 filter</li>
+</ul>
+<p>All of them can be found in <span class="code">\Nokia\Carbide.c++ <version>\x86Build\Symbian_Tools\Command_Line_Tools.</span></p>
+<p>You can also write scripts that automate the process to build your software. Scripts contain a list of command-line tools to invoke, one after another. For example, the <span class="code">make</span> tool, a common software development tool, uses scripts to manage dependencies among source code files and invoke command-line compilers, assemblers, and linkers as needed, much like the Carbider IDE’s project manager.</p>
+<p>Commands follow this convention:</p>
+<blockquote>
+ <p class="code">tool [options] [files] </p>
+</blockquote>
+<p>where tool is the name of the Carbide command-line tool to invoke, options is a list of zero or more options that tell the tool what operation it should perform and how to perform it, and files is a list of zero or more files on which the tool should operate. Which options and files you use depends on what operation you want the tool to perform.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cmd_line/cmd_line.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cmd_line/cmd_line.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Command-Line Tools</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Command-Line Tools</h2>
-<p> The Carbide IDE uses compilers and linkers to generate object code for x86 platforms. The IDE also provides command-line versions of these tools that also generate and combine object code files to produce executable files such as applications, dynamic link libraries (DLLs), code resources, or static libraries.</p>
-<p class="note"><b>NOTE</b> The Carbide.c++ compiler is stored in <span class="code">\Nokia\Carbide.c++ <version>\x86Build\Symbian_Tools\Command_Line_Tools</span>.</p>
-<p>You configure each command-line tool by specifying various options when you invoke the tool.</p>
-<p>This topic contains the following sections:</p>
-<ul>
- <li><a href="cmd_naming.htm">Tool Naming Conventions</a></li>
- <li><a href="cmd_env_vars.htm">Working with Environment Variables</a></li>
- <li><a href="cmd_invoking.htm">Invoking Command-Line Tools</a></li>
- <li><a href="cmd_extensions.htm">File Extensions</a></li>
- <li><a href="cmd_admin_options.htm">Help and Administrative Options</a></li>
- <li><a href="cmd_conventions.htm">Command-Line Settings Conventions</a></li>
-</ul>
-<p class="note"> <strong>TIP</strong> A command-line user interface interacts with you through a text-based console instead of GUI items such as windows, menus, and buttons.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Command-Line Tools</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Command-Line Tools</h2>
+<p> The Carbide IDE uses compilers and linkers to generate object code for x86 platforms. The IDE also provides command-line versions of these tools that also generate and combine object code files to produce executable files such as applications, dynamic link libraries (DLLs), code resources, or static libraries.</p>
+<p class="note"><b>NOTE</b> The Carbide.c++ compiler is stored in <span class="code">\Nokia\Carbide.c++ <version>\x86Build\Symbian_Tools\Command_Line_Tools</span>.</p>
+<p>You configure each command-line tool by specifying various options when you invoke the tool.</p>
+<p>This topic contains the following sections:</p>
+<ul>
+ <li><a href="cmd_naming.htm">Tool Naming Conventions</a></li>
+ <li><a href="cmd_env_vars.htm">Working with Environment Variables</a></li>
+ <li><a href="cmd_invoking.htm">Invoking Command-Line Tools</a></li>
+ <li><a href="cmd_extensions.htm">File Extensions</a></li>
+ <li><a href="cmd_admin_options.htm">Help and Administrative Options</a></li>
+ <li><a href="cmd_conventions.htm">Command-Line Settings Conventions</a></li>
+</ul>
+<p class="note"> <strong>TIP</strong> A command-line user interface interacts with you through a text-based console instead of GUI items such as windows, menus, and buttons.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cmd_line/cmd_naming.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cmd_line/cmd_naming.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Tool Naming Conventions</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Tool Naming Conventions</h3>
-<p> The names of the Carbide command-line tools follow this convention:</p>
-<p class="listing">mw<tool><type></p>
-<p>where:</p>
-<ul>
- <li> <span class="code"><tool></span> is <span class="code">cc/c++</span> for the C/C++ compiler, and <span class="code">ld</span> for the linker</li>
- <li><span class="code"><type></span> is <span class="code">sym2</span> for the Symbian EKA2 compiler/linker, and <span class="code">filt</span> for the filter</li>
-</ul>
-<p> Tools include:</p>
-<ul>
- <li><span class="code">mwccsym2</span> — x86 C/C++ compiler</li>
- <li><span class="code">mwldsym2</span> — x86 linker</li>
- <li><span class="code">mwc++filt</span> — x86 filter</li>
-</ul>
-<p class="note"><strong>NOTE</strong> The prefix "mw" is an artifact of the pre-Carbide days when Metrowerks owned the x86 compiler technology used by Carbide.c++. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Tool Naming Conventions</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Tool Naming Conventions</h3>
+<p> The names of the Carbide command-line tools follow this convention:</p>
+<p class="listing">mw<tool><type></p>
+<p>where:</p>
+<ul>
+ <li> <span class="code"><tool></span> is <span class="code">cc/c++</span> for the C/C++ compiler, and <span class="code">ld</span> for the linker</li>
+ <li><span class="code"><type></span> is <span class="code">sym2</span> for the Symbian EKA2 compiler/linker, and <span class="code">filt</span> for the filter</li>
+</ul>
+<p> Tools include:</p>
+<ul>
+ <li><span class="code">mwccsym2</span> — x86 C/C++ compiler</li>
+ <li><span class="code">mwldsym2</span> — x86 linker</li>
+ <li><span class="code">mwc++filt</span> — x86 filter</li>
+</ul>
+<p class="note"><strong>NOTE</strong> The prefix "mw" is an artifact of the pre-Carbide days when Metrowerks owned the x86 compiler technology used by Carbide.c++. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/compiler.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/compiler.htm Wed Jul 21 12:11:48 2010 -0500
@@ -7,6 +7,9 @@
<link href="../book.css" rel="stylesheet" type="text/css">
<style>
table, td, th { border: 0px none #FFF; }
+ .style1 {
+ font-size: large
+}
</style>
</head>
@@ -18,14 +21,13 @@
<td width="294" valign="bottom"><p align="right"><b><img src="images/brandmark_cpp.gif" width="106" height="52"></b></p>
<p> </p>
<p> </p>
- <p> </p>
- <p class="titleSmall">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
+ <p class="titleSmall">Copyright © 2010 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">x86 C/C++ Compiler Reference</h1>
- <p align="center" class="titleSmall">x86 Compiler 3.2.5 (Build 480); July, 2009</p></td>
+ <td colspan="2"><h5 align="center" class="style1">x86 C/C++ Compiler Reference</h5>
+ <p align="center" class="titleSmall">x86 Compiler 3.2.5 (Build 489); Feb, 2010</p></td>
</tr>
</table>
<p align="center"> </p>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_behavior/cpp_be_chars.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_behavior/cpp_be_chars.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Character Literals</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Character Literals</h3>
-<p> (ISO C++, §2.13.2) The standard specifies that a multicharacter literal, two or more characters surrounded by single quotes, has an implementation-defined value. See <a href="../c_compiler/c_char_const_as_int.htm">Character Constants as Integer Values</a> for information on how Carbide.c++ translates such values.</p>
-<p>A character literal that begins with the letter “L” (without the quotes) is a wide-character literal. Each target translates wide-character literals in its own way; most targets use either two or four-byte wide characters. An escape sequence that uses an octal or hexadecimal value outside the range of <span class="code">char</span> or <span class="code">wchar_t</span> results in an error.</p>
-<p>See your target documentation for more information on how your target handles wide-character literals.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Character Literals</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Character Literals</h3>
+<p> (ISO C++, §2.13.2) The standard specifies that a multicharacter literal, two or more characters surrounded by single quotes, has an implementation-defined value. See <a href="../c_compiler/c_char_const_as_int.htm">Character Constants as Integer Values</a> for information on how Carbide.c++ translates such values.</p>
+<p>A character literal that begins with the letter “L” (without the quotes) is a wide-character literal. Each target translates wide-character literals in its own way; most targets use either two or four-byte wide characters. An escape sequence that uses an octal or hexadecimal value outside the range of <span class="code">char</span> or <span class="code">wchar_t</span> results in an error.</p>
+<p>See your target documentation for more information on how your target handles wide-character literals.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_behavior/cpp_be_devices.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_behavior/cpp_be_devices.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,17 +1,17 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Interactive Devices</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Interactive Devices</h3>
-<p> (ISO C++, §1.9) The standard specifies that an interactive device, the part of a computer that accepts input from and provides output to a human operator, is implementation-defined. The most common instance of an interactive device is a console; a keyboard and character display terminal.</p>
-<p>Some versions of Carbide.c++, typically for desktop platforms, provide libraries to emulate a character display device in a graphical window. For example, on Microsoft Windows Carbide.c++ uses the Command Prompt window. For embedded systems that do not have a keyboard or display, Carbide provides console interaction through a serial or Ethernet connection between the target and host computers.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Interactive Devices</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Interactive Devices</h3>
+<p> (ISO C++, §1.9) The standard specifies that an interactive device, the part of a computer that accepts input from and provides output to a human operator, is implementation-defined. The most common instance of an interactive device is a console; a keyboard and character display terminal.</p>
+<p>Some versions of Carbide.c++, typically for desktop platforms, provide libraries to emulate a character display device in a graphical window. For example, on Microsoft Windows Carbide.c++ uses the Command Prompt window. For embedded systems that do not have a keyboard or display, Carbide provides console interaction through a serial or Ethernet connection between the target and host computers.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_behavior/cpp_be_hdr_access.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_behavior/cpp_be_hdr_access.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Header File Access</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Header File Access</h3>
-<p> (ISO C++, §2.8) The standard requires implementations to specify how header names are mapped to actual files. </p>
-<p> The Carbide IDE manages the correspondence of header names to header files.</p>
-<p> If you use Carbide.c++ on the command line, see <a href="../cmd_line/cmd_line.htm">Command-Line Tools</a> for information on specifying how Carbide.c++ should search for header files.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Header File Access</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Header File Access</h3>
+<p> (ISO C++, §2.8) The standard requires implementations to specify how header names are mapped to actual files. </p>
+<p> The Carbide IDE manages the correspondence of header names to header files.</p>
+<p> If you use Carbide.c++ on the command line, see <a href="../cmd_line/cmd_line.htm">Command-Line Tools</a> for information on specifying how Carbide.c++ should search for header files.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_behavior/cpp_be_size_of_bytes.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_behavior/cpp_be_size_of_bytes.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,16 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Size of BytesBehavior</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Size of Bytes</h3>
-<p> (ISO C++, §1.7) The standard specifies that the size of a byte is implementation-defined.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Size of BytesBehavior</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Size of Bytes</h3>
+<p> (ISO C++, §1.7) The standard specifies that the size of a byte is implementation-defined.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_behavior/cpp_be_src_handling.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_behavior/cpp_be_src_handling.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,19 +1,19 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Source File Handling</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Source File Handling</h3>
-<p> (ISO C++, §2.1) The standard specifies how source files are prepared for translation.</p>
-<p>If trigraph expansion is turned on, Carbide.c++ converts trigraph sequences with their single-character representations. Trigraph expansion is controlled by the <span class="code">#pragma <a href="../pragmas/p_trigraphs.htm">trigraphs</a></span>.</p>
-<p>At preprocessing-time, a sequence of two or more white-space characters, except new-line characters, is converted to a single space. <br />
- New-line characters are left untouched, unless preceded by a backslash (“\”), in which case the proceeding line is appended.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Source File Handling</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Source File Handling</h3>
+<p> (ISO C++, §2.1) The standard specifies how source files are prepared for translation.</p>
+<p>If trigraph expansion is turned on, Carbide.c++ converts trigraph sequences with their single-character representations. Trigraph expansion is controlled by the <span class="code">#pragma <a href="../pragmas/p_trigraphs.htm">trigraphs</a></span>.</p>
+<p>At preprocessing-time, a sequence of two or more white-space characters, except new-line characters, is converted to a single space. <br />
+ New-line characters are left untouched, unless preceded by a backslash (“\”), in which case the proceeding line is appended.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_behavior/cpp_behavior.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_behavior/cpp_behavior.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>C++ Implementation-Defined Behavior</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>C++ Implementation-Defined Behavior</h2>
-<p> The ISO standard for C++ leaves many details about the form and translation of C++ programs up to the implementation of the C++ compiler. This section lists the parts of the of the C++ standard that are left to the implementation to define and how Carbide.c++ behaves in these situations. Numbers in parentheses that begin with “§” denote the section of the ISO C++ standard that an implementation-defined behavior refers to.</p>
-<p> This section refers to implementation-defined behaviors of the compiler itself. Topics include:</p>
-<ul>
- <li><a href="cpp_be_size_of_bytes.htm">Size of Bytes</a></li>
- <li><a href="cpp_be_devices.htm">Interactive Devices</a></li>
- <li><a href="cpp_be_src_handling.htm">Source File Handling</a></li>
- <li><a href="cpp_be_hdr_access.htm">Header File Access</a></li>
- <li><a href="cpp_be_chars.htm">Character Literals</a> </li>
-</ul>
-<p>For information of implementation-defined behaviors of the Standard C++ Library, consult the MSL C++ Library Reference.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>C++ Implementation-Defined Behavior</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>C++ Implementation-Defined Behavior</h2>
+<p> The ISO standard for C++ leaves many details about the form and translation of C++ programs up to the implementation of the C++ compiler. This section lists the parts of the of the C++ standard that are left to the implementation to define and how Carbide.c++ behaves in these situations. Numbers in parentheses that begin with “§” denote the section of the ISO C++ standard that an implementation-defined behavior refers to.</p>
+<p> This section refers to implementation-defined behaviors of the compiler itself. Topics include:</p>
+<ul>
+ <li><a href="cpp_be_size_of_bytes.htm">Size of Bytes</a></li>
+ <li><a href="cpp_be_devices.htm">Interactive Devices</a></li>
+ <li><a href="cpp_be_src_handling.htm">Source File Handling</a></li>
+ <li><a href="cpp_be_hdr_access.htm">Header File Access</a></li>
+ <li><a href="cpp_be_chars.htm">Character Literals</a> </li>
+</ul>
+<p>For information of implementation-defined behaviors of the Standard C++ Library, consult the MSL C++ Library Reference.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_compiler.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_compiler.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>C++ Compiler</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>C++ Compiler</h2>
-<p>This section discusses the Carbide.c++ compiler as it applies to all Carbide targets. Most information in this chapter applies to any operating system or processor.</p>
-<p>Other sections in this manual discuss other compiler features that apply to specific operating systems and processors. For a complete picture, you need to consider all the information relating to your particular target.</p>
-<p>The C compiler is also an integral part of the Carbide.c++ compiler. As a result, everything about the C compiler applies equally to C++. This discussion of the C++ compiler does not repeat information on the C compiler. See <a href="../c_compiler/c_compiler.htm">C Compiler</a> for information on the C compiler.</p>
-<p>This section contains the following topics:</p>
-<ul>
- <li><a href="cpp_implementation.htm">Carbide Implementation of C++</a> </li>
- <li><a href="cpp_impl_forward_decl.htm">Forward Declarations of Arrays of Incomplete Type</a></li>
- <li><a href="cpp_impl_vendor_abi.htm">Vendor Independent C++ ABI</a></li>
- <li><a href="cpp_exceptions_working.htm">Working with C++ Exceptions</a> </li>
- <li><a href="cpp_rtti_working.htm">Working with RTTI</a></li>
- <li><a href="cpp_templates_working.htm">Working with Templates </a></li>
-</ul>
-<p>For information on using Embedded C++ (EC++) and for strategies on developing smaller C++ programs, see <a href="../emb_systems/emb_systems.htm">Overview</a>.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>C++ Compiler</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>C++ Compiler</h2>
+<p>This section discusses the Carbide.c++ compiler as it applies to all Carbide targets. Most information in this chapter applies to any operating system or processor.</p>
+<p>Other sections in this manual discuss other compiler features that apply to specific operating systems and processors. For a complete picture, you need to consider all the information relating to your particular target.</p>
+<p>The C compiler is also an integral part of the Carbide.c++ compiler. As a result, everything about the C compiler applies equally to C++. This discussion of the C++ compiler does not repeat information on the C compiler. See <a href="../c_compiler/c_compiler.htm">C Compiler</a> for information on the C compiler.</p>
+<p>This section contains the following topics:</p>
+<ul>
+ <li><a href="cpp_implementation.htm">Carbide Implementation of C++</a> </li>
+ <li><a href="cpp_impl_forward_decl.htm">Forward Declarations of Arrays of Incomplete Type</a></li>
+ <li><a href="cpp_impl_vendor_abi.htm">Vendor Independent C++ ABI</a></li>
+ <li><a href="cpp_exceptions_working.htm">Working with C++ Exceptions</a> </li>
+ <li><a href="cpp_rtti_working.htm">Working with RTTI</a></li>
+ <li><a href="cpp_templates_working.htm">Working with Templates </a></li>
+</ul>
+<p>For information on using Embedded C++ (EC++) and for strategies on developing smaller C++ programs, see <a href="../emb_systems/emb_systems.htm">Overview</a>.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_controlling.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_controlling.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Controlling the C++ Compiler</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Controlling the C++ Compiler</h2>
-<p>This section describes how to control compiler behavior by selecting settings .</p>
-<p>This section contains the following topics:</p>
-<ul>
- <li><a href="cpp_ctrl_always.htm">Using the C++ Compiler Always</a></li>
- <li><a href="cpp_ctrl_var_scope.htm">Controlling Variable Scope in for Statements</a></li>
- <li><a href="cpp_ctrl_exceptions.htm">Controlling Exception Handling</a></li>
- <li><a href="cpp_ctrl_rtti.htm">Controlling RTTI</a></li>
- <li><a href="cpp_ctrl_bool_type.htm">Using the bool Type</a></li>
- <li><a href="cpp_ctrl_extensions.htm">Controlling C++ Extensions</a><br />
-</li>
-</ul>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Controlling the C++ Compiler</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Controlling the C++ Compiler</h2>
+<p>This section describes how to control compiler behavior by selecting settings .</p>
+<p>This section contains the following topics:</p>
+<ul>
+ <li><a href="cpp_ctrl_always.htm">Using the C++ Compiler Always</a></li>
+ <li><a href="cpp_ctrl_var_scope.htm">Controlling Variable Scope in for Statements</a></li>
+ <li><a href="cpp_ctrl_exceptions.htm">Controlling Exception Handling</a></li>
+ <li><a href="cpp_ctrl_rtti.htm">Controlling RTTI</a></li>
+ <li><a href="cpp_ctrl_bool_type.htm">Using the bool Type</a></li>
+ <li><a href="cpp_ctrl_extensions.htm">Controlling C++ Extensions</a><br />
+</li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_ctrl_always.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_ctrl_always.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Using the C++ Compiler Always</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Using the C++ Compiler Always</h3>
-<p>If you enable the <a href="../pragmas/p_cplusplus.htm">Force C++ Compilation</a> setting, the compiler translates all C source files in your project as C++ code. Otherwise, the Carbide IDE uses the suffix of the file name to determine whether to use the C or C++ compiler. The entries in the Carbide IDE’s File Mappings panel describes the suffixes that the compiler seeks.</p>
-<p>This setting corresponds to the pragma <a href="../pragmas/p_cplusplus.htm">cplusplus</a>. To check this setting, use <span class="code">__option (cplusplus)</span>. By default, this setting is disabled.</p>
-<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Using the C++ Compiler Always</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Using the C++ Compiler Always</h3>
+<p>If you enable the <a href="../pragmas/p_cplusplus.htm">Force C++ Compilation</a> setting, the compiler translates all C source files in your project as C++ code. Otherwise, the Carbide IDE uses the suffix of the file name to determine whether to use the C or C++ compiler. The entries in the Carbide IDE’s File Mappings panel describes the suffixes that the compiler seeks.</p>
+<p>This setting corresponds to the pragma <a href="../pragmas/p_cplusplus.htm">cplusplus</a>. To check this setting, use <span class="code">__option (cplusplus)</span>. By default, this setting is disabled.</p>
+<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_ctrl_bool_type.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_ctrl_bool_type.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,21 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Using the bool Type</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Using the bool Type</h3>
-<p>Enable the Enable bool Support setting to use the standard C++ <span class="code">bool</span> type to represent <span class="code">true</span> and <span class="code">false</span>. Disable this setting if recognizing <span class="code">bool</span>, <span class="code">true</span>, or <span class="code">false</span> as keywords causes problems in your program.</p>
-<p>Enabling the bool data type and its true and false values is not equivalent to defining them using typedef and <span class="code">#define</span>. The C++ bool type is a distinct type defined by the ISO C++ Standard. Source code that does not treat it as a distinct type might not compile properly.</p>
-<p>For example, some compilers equate the <span class="code">bool</span> type with the <span class="code">unsigned char</span> data type. If you disable the Enable bool Support setting, the Carbide.c++ compiler equates the <span class="code">bool</span> type with the <span class="code">unsigned char</span> data type. Otherwise, using the Carbide C/C++ compiler on source code that involves this behavior might result in errors.</p>
-<p>This setting corresponds to the pragma <a href="../pragmas/p_bool.htm">bool</a>. To check this setting, use <span class="code">__option (bool)</span>. By default, this setting is disabled.</p>
-<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive. <br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Using the bool Type</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Using the bool Type</h3>
+<p>Enable the Enable bool Support setting to use the standard C++ <span class="code">bool</span> type to represent <span class="code">true</span> and <span class="code">false</span>. Disable this setting if recognizing <span class="code">bool</span>, <span class="code">true</span>, or <span class="code">false</span> as keywords causes problems in your program.</p>
+<p>Enabling the bool data type and its true and false values is not equivalent to defining them using typedef and <span class="code">#define</span>. The C++ bool type is a distinct type defined by the ISO C++ Standard. Source code that does not treat it as a distinct type might not compile properly.</p>
+<p>For example, some compilers equate the <span class="code">bool</span> type with the <span class="code">unsigned char</span> data type. If you disable the Enable bool Support setting, the Carbide.c++ compiler equates the <span class="code">bool</span> type with the <span class="code">unsigned char</span> data type. Otherwise, using the Carbide C/C++ compiler on source code that involves this behavior might result in errors.</p>
+<p>This setting corresponds to the pragma <a href="../pragmas/p_bool.htm">bool</a>. To check this setting, use <span class="code">__option (bool)</span>. By default, this setting is disabled.</p>
+<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive. <br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_ctrl_exceptions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_ctrl_exceptions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Controlling Exception Handling</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Controlling Exception Handling</h3>
-<p>Enable the Enable C++ Exceptions setting if you use the ISO-standard try and catch statements. Otherwise, disable this setting to generate smaller and faster code.</p>
-<p>For more information on how Carbide implements the ISO C++ exception handling mechanism, see <a href="cpp_exceptions_working.htm">Working with C++ Exceptions</a>.</p>
-<p>This setting corresponds to the pragma <a href="../pragmas/p_exceptions.htm">exceptions</a>. To check this setting, use <span class="code">__option (exceptions)</span>. By default, this setting is disabled.</p>
-<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive. <br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Controlling Exception Handling</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Controlling Exception Handling</h3>
+<p>Enable the Enable C++ Exceptions setting if you use the ISO-standard try and catch statements. Otherwise, disable this setting to generate smaller and faster code.</p>
+<p>For more information on how Carbide implements the ISO C++ exception handling mechanism, see <a href="cpp_exceptions_working.htm">Working with C++ Exceptions</a>.</p>
+<p>This setting corresponds to the pragma <a href="../pragmas/p_exceptions.htm">exceptions</a>. To check this setting, use <span class="code">__option (exceptions)</span>. By default, this setting is disabled.</p>
+<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive. <br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_ctrl_extensions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_ctrl_extensions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,57 +1,57 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Controlling C++ Extensions</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Controlling C++ Extensions</h3>
-<p>The C++ compiler has additional extensions that you can activate using the pragma <a href="../pragmas/p_cpp_extensions.htm">cpp_extensions</a>. </p>
-<p>If you enable this pragma, the compiler lets you use the following extensions to the ISO C++ standard:</p>
-<ul>
- <li>Anonymous struct objects (ISO C++, §9)</li>
-</ul>
-<blockquote>
- <p class="listing"> #pragma cpp_extensions on<br />
- void foo()<br />
- {<br />
- union {<br />
- long hilo;<br />
- struct { short hi, lo; }; <br />
- // anonymous struct<br />
- };<br />
- hi=0x1234; <br />
- lo=0x5678;<br />
- // hilo==0x12345678<br />
- }</p>
-</blockquote>
-<ul>
- <li>Unqualified pointer to a member function (ISO C++, §8.1)</li>
-</ul>
-<blockquote>
- <p class="listing"> #pragma cpp_extensions on<br />
- struct Foo { void f(); }<br />
- void Foo::f()<br />
- {<br />
- void (Foo::*ptmf1)() = &Foo::f;<br />
- // ALWAYS OK<br />
- <br />
- void (Foo::*ptmf2)() = f;<br />
- // OK if you enabled cpp_extensions. <br />
- }</p>
-</blockquote>
-<p> To check this setting, use the <span class="code">__option (cpp_extensions)</span>. By default, this setting is off.</p>
-<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive. <br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-<p><br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Controlling C++ Extensions</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Controlling C++ Extensions</h3>
+<p>The C++ compiler has additional extensions that you can activate using the pragma <a href="../pragmas/p_cpp_extensions.htm">cpp_extensions</a>. </p>
+<p>If you enable this pragma, the compiler lets you use the following extensions to the ISO C++ standard:</p>
+<ul>
+ <li>Anonymous struct objects (ISO C++, §9)</li>
+</ul>
+<blockquote>
+ <p class="listing"> #pragma cpp_extensions on<br />
+ void foo()<br />
+ {<br />
+ union {<br />
+ long hilo;<br />
+ struct { short hi, lo; }; <br />
+ // anonymous struct<br />
+ };<br />
+ hi=0x1234; <br />
+ lo=0x5678;<br />
+ // hilo==0x12345678<br />
+ }</p>
+</blockquote>
+<ul>
+ <li>Unqualified pointer to a member function (ISO C++, §8.1)</li>
+</ul>
+<blockquote>
+ <p class="listing"> #pragma cpp_extensions on<br />
+ struct Foo { void f(); }<br />
+ void Foo::f()<br />
+ {<br />
+ void (Foo::*ptmf1)() = &Foo::f;<br />
+ // ALWAYS OK<br />
+ <br />
+ void (Foo::*ptmf2)() = f;<br />
+ // OK if you enabled cpp_extensions. <br />
+ }</p>
+</blockquote>
+<p> To check this setting, use the <span class="code">__option (cpp_extensions)</span>. By default, this setting is off.</p>
+<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive. <br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+<p><br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_ctrl_rtti.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_ctrl_rtti.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,17 +1,17 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Controlling RTTI</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Controlling RTTI</h3>
-<p>The Carbide.c++ language supports runtime type information (RTTI), including the <span class="code">dynamic_cast</span> and <span class="code">typeid</span> operators. To use these operators, enable the Enable RTTI setting .</p>
-<p>For more information on how to use these two operators, see <a href="cpp_rtti_working.htm">Working with RTTI</a>.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Controlling RTTI</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Controlling RTTI</h3>
+<p>The Carbide.c++ language supports runtime type information (RTTI), including the <span class="code">dynamic_cast</span> and <span class="code">typeid</span> operators. To use these operators, enable the Enable RTTI setting .</p>
+<p>For more information on how to use these two operators, see <a href="cpp_rtti_working.htm">Working with RTTI</a>.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_ctrl_var_scope.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_ctrl_var_scope.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Controlling Variable Scope in for Statements</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Controlling Variable Scope in for Statements</h3>
-<p>If you enable the Legacy for-scoping setting , the compiler generates an error when it encounters a variable scope issue that the ISO C++ standard disallows, but is allowed in the C++ language specified in <strong>The Annotated C++ Reference Manual</strong>.</p>
-<p>With this option off, the compiler allows variables defined in a for statement to have scope outside the for statement.</p>
-<div class="listing">
- <h4>Listing 1. Example of a Local Variable Outside a for Statement</h4>
- <p>for(int i=1; i<1000; i++) { /* ... */ }<br />
- return i; // OK in ARM, Error in Carbide.c++</p>
-</div>
-<p>This setting corresponds to the pragma <a href="../pragmas/p_arm_conform.htm">ARM_conform</a>. To check this setting, use <span class="code">__option (ARM_conform)</span>. By default, this setting is <span class="code">off</span>.</p>
-<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive. <br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Controlling Variable Scope in for Statements</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Controlling Variable Scope in for Statements</h3>
+<p>If you enable the Legacy for-scoping setting , the compiler generates an error when it encounters a variable scope issue that the ISO C++ standard disallows, but is allowed in the C++ language specified in <strong>The Annotated C++ Reference Manual</strong>.</p>
+<p>With this option off, the compiler allows variables defined in a for statement to have scope outside the for statement.</p>
+<div class="listing">
+ <h4>Listing 1. Example of a Local Variable Outside a for Statement</h4>
+ <p>for(int i=1; i<1000; i++) { /* ... */ }<br />
+ return i; // OK in ARM, Error in Carbide.c++</p>
+</div>
+<p>This setting corresponds to the pragma <a href="../pragmas/p_arm_conform.htm">ARM_conform</a>. To check this setting, use <span class="code">__option (ARM_conform)</span>. By default, this setting is <span class="code">off</span>.</p>
+<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive. <br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_exceptions_working.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_exceptions_working.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Working with C++ Exceptions</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Working with C++ Exceptions</h2>
-<p>If you enable the Enable C++ Exceptions setting , you can use the try and catch statements to perform exception handling. For more information on activating support for C++ exception handling, see “Controlling Exception Handling”.</p>
-<p>Enabling exceptions lets you throw them across any code compiled by the Carbide C/C++ compiler. However, you cannot throw exceptions across the following:</p>
-<ul>
- <li>Libraries compiled with exception support disabled</li>
- <li>Libraries compiled with versions of the Carbide C/C++ compiler earlier than v3.4</li>
-</ul>
-<p>If you throw an exception across one of these, the code calls <span class="code">terminate()</span> and exits.</p>
-<p>If you throw an exception while allocating a class object or an array of class objects, the code automatically destructs the partially constructed objects and de-allocates the memory for them. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Working with C++ Exceptions</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Working with C++ Exceptions</h2>
+<p>If you enable the Enable C++ Exceptions setting , you can use the try and catch statements to perform exception handling. For more information on activating support for C++ exception handling, see “Controlling Exception Handling”.</p>
+<p>Enabling exceptions lets you throw them across any code compiled by the Carbide C/C++ compiler. However, you cannot throw exceptions across the following:</p>
+<ul>
+ <li>Libraries compiled with exception support disabled</li>
+ <li>Libraries compiled with versions of the Carbide C/C++ compiler earlier than v3.4</li>
+</ul>
+<p>If you throw an exception across one of these, the code calls <span class="code">terminate()</span> and exits.</p>
+<p>If you throw an exception while allocating a class object or an array of class objects, the code automatically destructs the partially constructed objects and de-allocates the memory for them. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_extensions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_extensions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide Implementation of C++</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Extensions to ISO Standard C++</h2>
-<p>This section describes Carbide extensions to the C standard that apply to all targets. In most cases, you turn the extension on or off with a setting . See C/C++ Language Panel for information about this panel.</p>
-<h4>The __PRETTY_FUNCTION__ Predefined Identifier</h4>
-<p>The __PRETTY_FUNCTION__ predefined identifier represents the qualified (unmangled) C++ name of the function being compiled.</p>
-<p>For related information, see <a href="../symbols/symbols.htm">Predefined Symbols</a>.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Carbide Implementation of C++</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Extensions to ISO Standard C++</h2>
+<p>This section describes Carbide extensions to the C standard that apply to all targets. In most cases, you turn the extension on or off with a setting . See C/C++ Language Panel for information about this panel.</p>
+<h4>The __PRETTY_FUNCTION__ Predefined Identifier</h4>
+<p>The __PRETTY_FUNCTION__ predefined identifier represents the qualified (unmangled) C++ name of the function being compiled.</p>
+<p>For related information, see <a href="../symbols/symbols.htm">Predefined Symbols</a>.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_additional_keywords.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_additional_keywords.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,16 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Additional Keywords</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Additional Keywords</h3>
-<p>(ISO C++, §2.8, §2.11) The Carbide.c++ language reserves symbols from these two sections as keywords.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Additional Keywords</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Additional Keywords</h3>
+<p>(ISO C++, §2.8, §2.11) The Carbide.c++ language reserves symbols from these two sections as keywords.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_default_args.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_default_args.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Default Arguments in Member Functions</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Default Arguments in Member Functions</h3>
-<p>(ISO C++, §8.3.6) The compiler does not bind default arguments in a member function at the end of the class declaration. Before the default argument appears, you must declare any value that you use in the default argument expression. An example using default arguments in member functions:</p>
-<p class="listing">class foo {<br />
- enum A { AA };<br />
- int f(A a = AA); // OK<br />
- int f(B b = BB); // ERROR: BB is not declared yet<br />
- enum B { BB };<br />
- }; </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Default Arguments in Member Functions</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Default Arguments in Member Functions</h3>
+<p>(ISO C++, §8.3.6) The compiler does not bind default arguments in a member function at the end of the class declaration. Before the default argument appears, you must declare any value that you use in the default argument expression. An example using default arguments in member functions:</p>
+<p class="listing">class foo {<br />
+ enum A { AA };<br />
+ int f(A a = AA); // OK<br />
+ int f(B b = BB); // ERROR: BB is not declared yet<br />
+ enum B { BB };<br />
+ }; </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_forward_decl.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_forward_decl.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Forward Declarations of Arrays of Incomplete Type</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Forward Declarations of Arrays of Incomplete Type</h3>
-<p>The Carbide.c++ compiler allows the forward declaration of arrays of incomplete type. An example of forward declaration of array of incomplete type:</p>
-<div class="listing">
- <p> extern struct incomplete arr[10];</p>
- <p>struct incomplete {<br />
- int a, b, c;<br />
- };</p>
- <p>struct incomplete arr[10];
- </p>
-</div>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Forward Declarations of Arrays of Incomplete Type</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Forward Declarations of Arrays of Incomplete Type</h3>
+<p>The Carbide.c++ compiler allows the forward declaration of arrays of incomplete type. An example of forward declaration of array of incomplete type:</p>
+<div class="listing">
+ <p> extern struct incomplete arr[10];</p>
+ <p>struct incomplete {<br />
+ int a, b, c;<br />
+ };</p>
+ <p>struct incomplete arr[10];
+ </p>
+</div>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_implicit_return.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_implicit_return.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Implicit Return Statement for main()</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Implicit Return Statement for main()</h3>
-<p>In C++, the compiler adds a</p>
-<p class="listing">return 0; </p>
-<p>statement to the <span class="code">main()</span> function of a program if the function returns an <span class="code">int</span> result and does not end with a user <span class="code">return</span> statement.</p>
-<p>Examples:</p>
-<p class="listing">int main() { } // equivalent to: <br />
- // int main() { return 0; }<br />
- <br />
- main() { } // equivalent to: <br />
- // int main() { return 0; }</p>
-<p>If you enable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting , the compiler enforces an external <span class="code">int main()</span> function. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Implicit Return Statement for main()</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Implicit Return Statement for main()</h3>
+<p>In C++, the compiler adds a</p>
+<p class="listing">return 0; </p>
+<p>statement to the <span class="code">main()</span> function of a program if the function returns an <span class="code">int</span> result and does not end with a user <span class="code">return</span> statement.</p>
+<p>Examples:</p>
+<p class="listing">int main() { } // equivalent to: <br />
+ // int main() { return 0; }<br />
+ <br />
+ main() { } // equivalent to: <br />
+ // int main() { return 0; }</p>
+<p>If you enable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting , the compiler enforces an external <span class="code">int main()</span> function. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_inherited_members.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_inherited_members.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,47 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Calling an Inherited Member Function</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Calling an Inherited Member Function</h3>
-<p>(ISO C++, §10.3) You can call an inherited virtual member function rather than its local override in two ways. The first method is recommended for referring to member functions defined in a base class or any other parent class. The second method, while more convenient, is not recommended if you are using your source code with other compilers.</p>
-<h4>The standard method of calling inherited member functions</h4>
-<p>This method adheres to the ISO C++ Standard and simply qualifies the member function with its base class.</p>
-<p>Assume you have two classes, <span class="code">MyBaseClass</span> and <span class="code">MySubClass</span>, each implementing a function named <span class="code">MyFunc()</span>.</p>
-<p>From within a function of <span class="code">MySubClass</span>, you can call the base class version of <span class="code">MyFunc()</span> this way:</p>
-<p class="listing">MyBaseClass::MyFunc();</p>
-<p>However, if you change the class hierarchy, this call might break. Assume you introduce an intermediate class, and your hierarchy is now <span class="code">MyBaseClass</span>, <span class="code">MyMiddleClass</span>, and <span class="code">MySubClass</span>. Each has a version of <span class="code">MyFunc()</span>. The code above still calls the original version of <span class="code">MyFunc()</span> in the <span class="code">MyBaseClass</span>, bypassing the additional behavior you implemented in <span class="code">MyMiddleClass</span>. This kind of subtlety in the code can lead to unexpected results or bugs that are difficult to locate.</p>
-<h4>Using inheritance to call inherited member functions</h4>
-<p>The <span class="code">def_inherited</span> pragma defines an implicit inherited member for a base class. Use this directive before using the inherited symbol:</p>
-<p class="listing">#pragma def_inherited on</p>
-<p class="note"><strong>WARNING</strong>! The ISO C++ standard does not support the use of inherited. </p>
-<p>You can call the inherited version of <span class="code">MyFunc()</span> this way:</p>
-<p class="listing">inherited::MyFunc();</p>
-<p>With the inherited symbol, the compiler identifies the base class at compile time. This line of code calls the immediate base class in both cases: where the base class is <span class="code">MyBaseClass</span>, and where the immediate base class is <span class="code">MyMiddleClass</span>.</p>
-<p>If your class hierarchy changes at a later date and your subclass inherits from a different base class, the immediate base class is still called, despite the change in hierarchy.</p>
-<p>The syntax is as follows:</p>
-<p class="listing">inherited::func-name(param-list);</p>
-<p>The statement calls the <span class="code">func-name</span> in the class’s immediate base class. If the class has more than one immediate base class (because of multiple inheritance) and the compiler cannot decide which <span class="code">func-name</span> to call, the compiler generates an error.</p>
-<p>This example creates a Q class that draws its objects by adding behavior to the O class.</p>
-<div class="listing">
- <h5>Listing 1. Using inherited to Call an Inherited Member Function</h5>
- <p>#pragma def_inherited on<br />
- struct O { virtual void draw(int,int); };<br />
- struct Q : O { void draw(int,int); };</p>
- <p>void Q::draw (int x,int y)<br />
- {<br />
- inherited::draw(x,y); // Perform behavior of base class<br />
- ... // Perform added behavior<br />
- }</p>
-</div>
-<p>For related information on this pragma see “def_inherited”.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Calling an Inherited Member Function</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Calling an Inherited Member Function</h3>
+<p>(ISO C++, §10.3) You can call an inherited virtual member function rather than its local override in two ways. The first method is recommended for referring to member functions defined in a base class or any other parent class. The second method, while more convenient, is not recommended if you are using your source code with other compilers.</p>
+<h4>The standard method of calling inherited member functions</h4>
+<p>This method adheres to the ISO C++ Standard and simply qualifies the member function with its base class.</p>
+<p>Assume you have two classes, <span class="code">MyBaseClass</span> and <span class="code">MySubClass</span>, each implementing a function named <span class="code">MyFunc()</span>.</p>
+<p>From within a function of <span class="code">MySubClass</span>, you can call the base class version of <span class="code">MyFunc()</span> this way:</p>
+<p class="listing">MyBaseClass::MyFunc();</p>
+<p>However, if you change the class hierarchy, this call might break. Assume you introduce an intermediate class, and your hierarchy is now <span class="code">MyBaseClass</span>, <span class="code">MyMiddleClass</span>, and <span class="code">MySubClass</span>. Each has a version of <span class="code">MyFunc()</span>. The code above still calls the original version of <span class="code">MyFunc()</span> in the <span class="code">MyBaseClass</span>, bypassing the additional behavior you implemented in <span class="code">MyMiddleClass</span>. This kind of subtlety in the code can lead to unexpected results or bugs that are difficult to locate.</p>
+<h4>Using inheritance to call inherited member functions</h4>
+<p>The <span class="code">def_inherited</span> pragma defines an implicit inherited member for a base class. Use this directive before using the inherited symbol:</p>
+<p class="listing">#pragma def_inherited on</p>
+<p class="note"><strong>WARNING</strong>! The ISO C++ standard does not support the use of inherited. </p>
+<p>You can call the inherited version of <span class="code">MyFunc()</span> this way:</p>
+<p class="listing">inherited::MyFunc();</p>
+<p>With the inherited symbol, the compiler identifies the base class at compile time. This line of code calls the immediate base class in both cases: where the base class is <span class="code">MyBaseClass</span>, and where the immediate base class is <span class="code">MyMiddleClass</span>.</p>
+<p>If your class hierarchy changes at a later date and your subclass inherits from a different base class, the immediate base class is still called, despite the change in hierarchy.</p>
+<p>The syntax is as follows:</p>
+<p class="listing">inherited::func-name(param-list);</p>
+<p>The statement calls the <span class="code">func-name</span> in the class’s immediate base class. If the class has more than one immediate base class (because of multiple inheritance) and the compiler cannot decide which <span class="code">func-name</span> to call, the compiler generates an error.</p>
+<p>This example creates a Q class that draws its objects by adding behavior to the O class.</p>
+<div class="listing">
+ <h5>Listing 1. Using inherited to Call an Inherited Member Function</h5>
+ <p>#pragma def_inherited on<br />
+ struct O { virtual void draw(int,int); };<br />
+ struct Q : O { void draw(int,int); };</p>
+ <p>void Q::draw (int x,int y)<br />
+ {<br />
+ inherited::draw(x,y); // Perform behavior of base class<br />
+ ... // Perform added behavior<br />
+ }</p>
+</div>
+<p>For related information on this pragma see “def_inherited”.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_keyword_ordering.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_keyword_ordering.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Keyword Ordering</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Keyword Ordering</h3>
-<p>(ISO C++, §7.1.2, §11.4) If you use the <span class="code">friend</span> keyword in a declaration, it must be the first word in the declaration. The virtual keyword does not have to be the first word in a declaration. An example using the <span class="code">virtual</span> or <span class="code">friend</span> Keywords:</p>
-<p class="listing">class foo {<br />
- virtual int f0(); // OK<br />
- int virtual f1(); // OK<br />
- friend int f2(); // OK<br />
- int friend f3(); // ERROR<br />
- }; </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Keyword Ordering</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Keyword Ordering</h3>
+<p>(ISO C++, §7.1.2, §11.4) If you use the <span class="code">friend</span> keyword in a declaration, it must be the first word in the declaration. The virtual keyword does not have to be the first word in a declaration. An example using the <span class="code">virtual</span> or <span class="code">friend</span> Keywords:</p>
+<p class="listing">class foo {<br />
+ virtual int f0(); // OK<br />
+ int virtual f1(); // OK<br />
+ friend int f2(); // OK<br />
+ int friend f3(); // ERROR<br />
+ }; </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_namespaces.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_namespaces.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,34 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Namespaces</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Namespaces</h3>
-<p>Carbide supports <span class="code">namespaces</span>, which provide the scope for identifiers. Listing 3.1 provides an example of how you define items in a namespace.</p>
-<p class="listing">namespace NS<br />
- {<br />
- int foo();<br />
- void bar();<br />
- }</p>
-<p>The above example defines an int variable named <span class="code">NS::foo</span> and a function named <span class="code">NS::bar</span>.</p>
-<p>You can nest namespaces. For example, you can define an identifier as <span class="code">A::B::C::D::E</span> where <span class="code">A</span>, <span class="code">B</span>, and <span class="code">C</span> are nested namespaces and D is either another namespace or a class. You cannot use namespaces within class definitions.</p>
-<p>You can rename namespaces for a module. For example:</p>
-<p class="listing">namespace ENA = ExampleNamespaceAlpha;</p>
-<p>creates a namespace alias called <span class="code">ENA</span> for the original namespace <span class="code">ExampleNamespaceAlpha</span>.</p>
-<p>You can import items from a namespace. For example:</p>
-<p class="listing">using namespace NS;</p>
-<p>makes anything in NS visible in the current namespace without a qualifier. To limit the scope of an import, specify a single identifier. For example:</p>
-<p class="listing">using NS::bar;</p>
-<p>only exposes <span class="code">NS::bar</span> as <span class="code">bar</span> in the current space. This form of using is considered a declaration. So, the following statements:</p>
-<p class="listing">using NS::foo;<br />
- int foo;</p>
-<p>are not allowed because <span class="code">foo</span> is being redeclared in the current namespace, thereby masking the <span class="code">foo</span> imported from <span class="code">NS</span>. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Namespaces</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Namespaces</h3>
+<p>Carbide supports <span class="code">namespaces</span>, which provide the scope for identifiers. Listing 3.1 provides an example of how you define items in a namespace.</p>
+<p class="listing">namespace NS<br />
+ {<br />
+ int foo();<br />
+ void bar();<br />
+ }</p>
+<p>The above example defines an int variable named <span class="code">NS::foo</span> and a function named <span class="code">NS::bar</span>.</p>
+<p>You can nest namespaces. For example, you can define an identifier as <span class="code">A::B::C::D::E</span> where <span class="code">A</span>, <span class="code">B</span>, and <span class="code">C</span> are nested namespaces and D is either another namespace or a class. You cannot use namespaces within class definitions.</p>
+<p>You can rename namespaces for a module. For example:</p>
+<p class="listing">namespace ENA = ExampleNamespaceAlpha;</p>
+<p>creates a namespace alias called <span class="code">ENA</span> for the original namespace <span class="code">ExampleNamespaceAlpha</span>.</p>
+<p>You can import items from a namespace. For example:</p>
+<p class="listing">using namespace NS;</p>
+<p>makes anything in NS visible in the current namespace without a qualifier. To limit the scope of an import, specify a single identifier. For example:</p>
+<p class="listing">using NS::bar;</p>
+<p>only exposes <span class="code">NS::bar</span> as <span class="code">bar</span> in the current space. This form of using is considered a declaration. So, the following statements:</p>
+<p class="listing">using NS::foo;<br />
+ int foo;</p>
+<p>are not allowed because <span class="code">foo</span> is being redeclared in the current namespace, thereby masking the <span class="code">foo</span> imported from <span class="code">NS</span>. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_vendor_abi.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_impl_vendor_abi.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,32 +1,32 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Vendor Independent C++ ABI</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Vendor Independent C++ ABI</h3>
-<p>The Carbide.c++ compiler currently supports these parts of the vendor independent C++ application binary interface (ABI):</p>
-<ul>
- <li>name mangling</li>
- <li>class and vtable layout</li>
- <li>constructor/destructor ABI</li>
- <li>virtual and non-virtual member function calls</li>
- <li>array construction/deconstruction ABI</li>
- <li>one-time construction ABI</li>
- <li>RTTI</li>
- <li>pointer to members</li>
-</ul>
-<p>The following features work but do not conform to the ABI specification:</p>
-<ul>
- <li>exception handling</li>
-</ul>
-<p class="note"><strong>NOTE</strong> This ABI only works with some compiler targets.</p>
-<p>For more information, see <a href="http://www.codesourcery.com/cxx-abi">www.codesourcery.com/cxx-abi</a>. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Vendor Independent C++ ABI</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Vendor Independent C++ ABI</h3>
+<p>The Carbide.c++ compiler currently supports these parts of the vendor independent C++ application binary interface (ABI):</p>
+<ul>
+ <li>name mangling</li>
+ <li>class and vtable layout</li>
+ <li>constructor/destructor ABI</li>
+ <li>virtual and non-virtual member function calls</li>
+ <li>array construction/deconstruction ABI</li>
+ <li>one-time construction ABI</li>
+ <li>RTTI</li>
+ <li>pointer to members</li>
+</ul>
+<p>The following features work but do not conform to the ABI specification:</p>
+<ul>
+ <li>exception handling</li>
+</ul>
+<p class="note"><strong>NOTE</strong> This ABI only works with some compiler targets.</p>
+<p>For more information, see <a href="http://www.codesourcery.com/cxx-abi">www.codesourcery.com/cxx-abi</a>. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_implementation.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_implementation.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide Implementation of C++</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Carbide Implementation of C++</h2>
-<p>This section describes how the Carbide.c++ compiler implements certain parts of the C++ standard, as described in The Annotated C++ Reference Manual (Addison-Wesley) by Ellis and Stroustrup. The topics discussed in this section are:</p>
-<ul>
- <li><a href="cpp_impl_namespaces.htm">Namespaces</a></li>
- <li><a href="cpp_impl_implicit_return.htm">Implicit Return Statement for main()</a></li>
- <li><a href="cpp_impl_keyword_ordering.htm">Keyword Ordering</a></li>
- <li><a href="cpp_impl_additional_keywords.htm">Additional Keywords</a></li>
- <li><a href="cpp_impl_default_args.htm">Default Arguments in Member Functions</a></li>
- <li><a href="cpp_impl_inherited_members.htm">Calling an Inherited Member Function</a></li>
- <li><a href="cpp_impl_forward_decl.htm">Forward Declarations of Arrays of Incomplete Type</a></li>
- <li><a href="cpp_impl_vendor_abi.htm">Vendor Independent C++ ABI</a></li>
-</ul>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Carbide Implementation of C++</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Carbide Implementation of C++</h2>
+<p>This section describes how the Carbide.c++ compiler implements certain parts of the C++ standard, as described in The Annotated C++ Reference Manual (Addison-Wesley) by Ellis and Stroustrup. The topics discussed in this section are:</p>
+<ul>
+ <li><a href="cpp_impl_namespaces.htm">Namespaces</a></li>
+ <li><a href="cpp_impl_implicit_return.htm">Implicit Return Statement for main()</a></li>
+ <li><a href="cpp_impl_keyword_ordering.htm">Keyword Ordering</a></li>
+ <li><a href="cpp_impl_additional_keywords.htm">Additional Keywords</a></li>
+ <li><a href="cpp_impl_default_args.htm">Default Arguments in Member Functions</a></li>
+ <li><a href="cpp_impl_inherited_members.htm">Calling an Inherited Member Function</a></li>
+ <li><a href="cpp_impl_forward_decl.htm">Forward Declarations of Arrays of Incomplete Type</a></li>
+ <li><a href="cpp_impl_vendor_abi.htm">Vendor Independent C++ ABI</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_rtti_dynamic_cast.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_rtti_dynamic_cast.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,47 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Using the dynamic_cast Operator</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Using the dynamic_cast Operator</h3>
-<p> The <span class="code">dynamic_cast</span> operator lets you safely convert a pointer of one type to a pointer of another type. Unlike an ordinary cast, <span class="code">dynamic_cast</span> returns 0 if the conversion is not possible. An ordinary cast returns an unpredictable value that might crash your program if the conversion is not possible.</p>
-<p>The syntax for the <span class="code">dynamic_cast</span> operator is as follows:</p>
-<p class="listing">dynamic_cast<Type*>(expr)</p>
-<p>The Type must be either <span class="code">void</span> or a class with at least one virtual member function. If the object to which <span class="code">expr</span> points <span class="code">(*expr</span>) is of type <span class="code">Type</span> or derived from type <span class="code">Type</span>, this expression converts <span class="code">expr</span> to a pointer of type <span class="code">Type*</span> and returns it. Otherwise, it returns 0, the null pointer.</p>
-<p>For example, take these classes:</p>
-<p class="listing">class Person { virtual void func(void) { ; } };<br />
- class Athlete : public Person { /* . . . */ };<br />
-class Superman : public Athlete { /* . . . */ };</p>
-<p>And these pointers:</p>
-<p class="listing">Person *lois = new Person;<br />
- Person *arnold = new Athlete;<br />
- Person *clark = new Superman;<br />
-Athlete *a;</p>
-<p>This is how <span class="code">dynamic_cast</span> works with each pointer:</p>
-<p class="listing">a = dynamic_cast<Athlete*>(arnold);<br />
- // a is arnold, since arnold is an Athlete.<br />
- a = dynamic_cast<Athlete*>(lois);<br />
- // a is 0, since lois is not an Athelete.<br />
- a = dynamic_cast<Athlete*>(clark);<br />
-// a is clark, since clark is both a Superman and an Athlete.</p>
-<p>You can also use the <span class="code">dynamic_cast</span> operator with reference types. However, since there is no equivalent to the null pointer for references, <span class="code">dynamic_cast</span> throws an exception of type <span class="code">std::bad_cast</span> if it cannot perform the conversion. </p>
-<p>This is an example of using <span class="code">dynamic_cast</span> with a reference:</p>
-<p class="listing">#include <exception><br />
- using namespace std;<br />
- Person &superref = *clark;<br />
- try {<br />
- Person &ref = dynamic_cast<Person&>(superref);<br />
- }<br />
- catch(bad_cast) {<br />
- cout << "oops!" << endl;<br />
- }
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Using the dynamic_cast Operator</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Using the dynamic_cast Operator</h3>
+<p> The <span class="code">dynamic_cast</span> operator lets you safely convert a pointer of one type to a pointer of another type. Unlike an ordinary cast, <span class="code">dynamic_cast</span> returns 0 if the conversion is not possible. An ordinary cast returns an unpredictable value that might crash your program if the conversion is not possible.</p>
+<p>The syntax for the <span class="code">dynamic_cast</span> operator is as follows:</p>
+<p class="listing">dynamic_cast<Type*>(expr)</p>
+<p>The Type must be either <span class="code">void</span> or a class with at least one virtual member function. If the object to which <span class="code">expr</span> points <span class="code">(*expr</span>) is of type <span class="code">Type</span> or derived from type <span class="code">Type</span>, this expression converts <span class="code">expr</span> to a pointer of type <span class="code">Type*</span> and returns it. Otherwise, it returns 0, the null pointer.</p>
+<p>For example, take these classes:</p>
+<p class="listing">class Person { virtual void func(void) { ; } };<br />
+ class Athlete : public Person { /* . . . */ };<br />
+class Superman : public Athlete { /* . . . */ };</p>
+<p>And these pointers:</p>
+<p class="listing">Person *lois = new Person;<br />
+ Person *arnold = new Athlete;<br />
+ Person *clark = new Superman;<br />
+Athlete *a;</p>
+<p>This is how <span class="code">dynamic_cast</span> works with each pointer:</p>
+<p class="listing">a = dynamic_cast<Athlete*>(arnold);<br />
+ // a is arnold, since arnold is an Athlete.<br />
+ a = dynamic_cast<Athlete*>(lois);<br />
+ // a is 0, since lois is not an Athelete.<br />
+ a = dynamic_cast<Athlete*>(clark);<br />
+// a is clark, since clark is both a Superman and an Athlete.</p>
+<p>You can also use the <span class="code">dynamic_cast</span> operator with reference types. However, since there is no equivalent to the null pointer for references, <span class="code">dynamic_cast</span> throws an exception of type <span class="code">std::bad_cast</span> if it cannot perform the conversion. </p>
+<p>This is an example of using <span class="code">dynamic_cast</span> with a reference:</p>
+<p class="listing">#include <exception><br />
+ using namespace std;<br />
+ Person &superref = *clark;<br />
+ try {<br />
+ Person &ref = dynamic_cast<Person&>(superref);<br />
+ }<br />
+ catch(bad_cast) {<br />
+ cout << "oops!" << endl;<br />
+ }
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_rtti_typeid_operator.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_rtti_typeid_operator.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,50 +1,50 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Using the typeid Operator</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Using the typeid Operator</h3>
-<p> The <span class="code">typeid</span> operator lets you determine the type of an object. Like the <span class="code">sizeof</span> operator, it takes two kinds of arguments:</p>
-<ul>
- <li>the name of a class</li>
- <li>an expression that evaluates to an object</li>
-</ul>
-<p class="note"><strong>NOTE</strong> Whenever you use <span class="code">typeid</span> operator, you must <span class="code">#include</span> the <span class="code">typeinfo</span> header file.</p>
-<p>The <span class="code">typeid</span> operator returns a reference to a <span class="code">std::type_info</span> object that you can compare with the <span class="code">==</span> and <span class="code">!=</span> operators. For example, if you have these classes and objects: </p>
-<div class="listing">
- <p>class Person { /* . . . */ };<br />
- class Athlete : public Person { /* . . . */ };</p>
- <p>using namespace std;</p>
- <p>Person *lois = new Person;<br />
- Athlete *arnold = new Athlete;<br />
- Athlete *louganis = new Athlete;</p>
-</div>
-<p>All these expressions are true:</p>
-<p class="listing">#include <typeinfo><br />
- // . . .<br />
- if (typeid(Athlete) == typeid(*arnold))<br />
- // arnold is an Athlete, result is true<br />
- if (typeid(*arnold) == typeid(*louganis))<br />
- // arnold and louganis are both Athletes, result is true<br />
- if (typeid(*lois) == typeid(*arnold)) // ...<br />
- // lois and arnold are not the same type, result is false</p>
-<p>You can access the name of a type with the <span class="code">name()</span> member function in the <span class="code">std::type_info</span> class. For example, these statements:</p>
-<p class="listing">#include <typeinfo><br />
- // . . .<br />
- cout << "Lois is a(n) " <br />
-<< typeid(*lois).name() << endl;<br />
-cout << "Arnold is a(n) " <br />
-<< typeid(*arnold).name() << endl;</p>
-<p>Print this:</p>
-<p class="code">Lois is a(n) Person<br />
- Arnold is a(n) Athlete<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Using the typeid Operator</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Using the typeid Operator</h3>
+<p> The <span class="code">typeid</span> operator lets you determine the type of an object. Like the <span class="code">sizeof</span> operator, it takes two kinds of arguments:</p>
+<ul>
+ <li>the name of a class</li>
+ <li>an expression that evaluates to an object</li>
+</ul>
+<p class="note"><strong>NOTE</strong> Whenever you use <span class="code">typeid</span> operator, you must <span class="code">#include</span> the <span class="code">typeinfo</span> header file.</p>
+<p>The <span class="code">typeid</span> operator returns a reference to a <span class="code">std::type_info</span> object that you can compare with the <span class="code">==</span> and <span class="code">!=</span> operators. For example, if you have these classes and objects: </p>
+<div class="listing">
+ <p>class Person { /* . . . */ };<br />
+ class Athlete : public Person { /* . . . */ };</p>
+ <p>using namespace std;</p>
+ <p>Person *lois = new Person;<br />
+ Athlete *arnold = new Athlete;<br />
+ Athlete *louganis = new Athlete;</p>
+</div>
+<p>All these expressions are true:</p>
+<p class="listing">#include <typeinfo><br />
+ // . . .<br />
+ if (typeid(Athlete) == typeid(*arnold))<br />
+ // arnold is an Athlete, result is true<br />
+ if (typeid(*arnold) == typeid(*louganis))<br />
+ // arnold and louganis are both Athletes, result is true<br />
+ if (typeid(*lois) == typeid(*arnold)) // ...<br />
+ // lois and arnold are not the same type, result is false</p>
+<p>You can access the name of a type with the <span class="code">name()</span> member function in the <span class="code">std::type_info</span> class. For example, these statements:</p>
+<p class="listing">#include <typeinfo><br />
+ // . . .<br />
+ cout << "Lois is a(n) " <br />
+<< typeid(*lois).name() << endl;<br />
+cout << "Arnold is a(n) " <br />
+<< typeid(*arnold).name() << endl;</p>
+<p>Print this:</p>
+<p class="code">Lois is a(n) Person<br />
+ Arnold is a(n) Athlete<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_rtti_working.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_rtti_working.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,21 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Working with RTTI</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Working with RTTI</h2>
-<p>This section describes how to work with runtime type information features of C++ supported by the Carbide.c++ compiler. RTTI lets you cast an object of one type as another type, get information about objects, and compare their types at runtime.</p>
-<p>The topics in this section are:</p>
-<ul>
- <li> <a href="cpp_rtti_dynamic_cast.htm">Using the dynamic_cast Operator</a></li>
- <li><a href="cpp_rtti_typeid_operator.htm">Using the typeid Operator </a></li>
-</ul>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Working with RTTI</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Working with RTTI</h2>
+<p>This section describes how to work with runtime type information features of C++ supported by the Carbide.c++ compiler. RTTI lets you cast an object of one type as another type, get information about objects, and compare their types at runtime.</p>
+<p>The topics in this section are:</p>
+<ul>
+ <li> <a href="cpp_rtti_dynamic_cast.htm">Using the dynamic_cast Operator</a></li>
+ <li><a href="cpp_rtti_typeid_operator.htm">Using the typeid Operator </a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_templates_conformance.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_templates_conformance.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,99 +1,99 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Better Template Conformance</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3> Better Template Conformance</h3>
-<p>Versions 2.5 and later of Carbide.c++ enforces the ISO C++ standard more closely when translating templates than previous versions of Carbide.c++. By default this new template translation is off. To ensure that template source code follows the ISO C++ standard more closely, turn on the ISO C++ Template Parser option .</p>
-<p>The compiler provides pragmas to help update your source code to the more conformant template features. The <a href="../pragmas/p_parse_func_templ.htm">parse_func_templ</a> pragma controls the new template features. The <a href="../pragmas/p_parse_mfunc_templ.htm">parse_mfunc_templ</a> pragma controls the new template features for class member functions only. The pragma <a href="../pragmas/p_warn_no_typename.htm">warn_no_typename</a> warns for the missing use of the typename keyword required by the ISO C++ standard.</p>
-<p>When using the new template parsing features, the compiler enforces more careful use of the typename and template keywords, and follows different rules for resolving names during declaration and instantiation than before.</p>
-<p>A qualified name that refers to a type and that depends on a template parameter must begin with typename (ISO C++, §14.6). An example using the typename Keyword:</p>
-<p class="listing">template <typename T> void f()<br />
- {<br />
- T::name *ptr; // ERROR: an attempt to multiply T::name by ptr<br />
- typename T::name *ptr; // OK<br />
- }</p>
-<p>The compiler requires the template keyword at the end of “.” and “->” operators, and for qualified identifiers that depend on a template parameter. An example using the template Keyword:</p>
-<p class="listing">template <typename T> void f(T* ptr)<br />
- {<br />
- ptr->f<int>(); // ERROR: f is less than int<br />
- ptr->template f<int>(); // OK<br />
- }</p>
-<p>Names referred to inside a template declaration that are not dependent on the template declaration (that do not rely on template arguments) must be declared before the template’s declaration. These names are bound to the template declaration at the point where the template is defined. Bindings are not affected by definitions that are in scope at the point of instantiation. Listing 1 shows an example.</p>
-<div class="listing">
- <h4>Listing 1. Binding Non-dependent Identifiers</h4>
- <p>void f(char);</p>
- <p>template <typename T> void tmpl_func()<br />
- {<br />
- f(1); // Uses f(char); f(int) is not defined yet.<br />
- g(); // ERROR: g() is not defined yet.<br />
- }<br />
- void g();<br />
- void f(int);</p>
-</div>
-<p>Names of template arguments that are dependent in base classes must be explicitly qualified (ISO C++, §14.6.2). See Listing 2.</p>
-<div class="listing">
- <h4>Listing 2. Qualifying Template Arguments in Base Classes</h4>
- <p>template <typename T> struct Base<br />
- {<br />
- void f();<br />
- }<br />
- template <typename T> struct Derive: Base<T><br />
- {<br />
- void g()<br />
- {<br />
- f(); // ERROR: Base<T>::f() is not visible.<br />
- Base<T>::f(); // OK<br />
- }<br />
- }</p>
-</div>
-<p>When a template contains a function call in which at least one of the function’s arguments is type-dependent, the compiler uses the name of the function in the context of the template definition (ISO C++, §14.6.2.2) and the context of its instantiation (ISO C++, §14.6.4.2). Listing 3 shows an example.</p>
-<div class="listing">
- <h4>Listing 3. Function Call with Type-dependent Argument</h4>
- <p>void f(char);</p>
- <p>template <typename T> void type_dep_func()<br />
- {<br />
- f(1); // Uses f(char), above; f(int) is not declared yet.<br />
- f(T()); // f() called with a type-dependent argument.<br />
- }</p>
- <p>void f(int);<br />
- struct A{};<br />
- void f(A);</p>
- <p>int main()<br />
- {<br />
- type_dep_func<int>(); // Calls f(char) twice.<br />
- type_dep_func<A>(); // Calls f(char) and f(A);<br />
- return 0;<br />
- }</p>
-</div>
-<p>The compiler only uses external names to look up type-dependent arguments in function calls. </p>
-<p class="listing">static void f(int); // f() is internal.<br />
- template <typename T> void type_dep_fun_ext()<br />
- {<br />
- f(T()); // f() called with a type-dependent argument.<br />
-}<br />
-<br />
-int main()<br />
- {<br />
- type_dep_fun_ext<int>(); // ERROR: f(int) must be external.<br />
-}</p>
-<p>The compiler does not allow expressions in inline assembly statements that depend on template parameters.</p>
-<p class="listing">template <typename T> void asm_tmpl()<br />
- {<br />
- asm { move #sizeof(T), D0 ); // ERROR: Not yet supported.<br />
- }</p>
-<p>The compiler also supports the address of template-id rules.</p>
-<p class="listing">template <typename T> void foo(T) {}<br />
- template <typename T> void bar(T) {}<br />
- ...<br />
- foo{ &bar<int> ); // now accepted<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Better Template Conformance</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3> Better Template Conformance</h3>
+<p>Versions 2.5 and later of Carbide.c++ enforces the ISO C++ standard more closely when translating templates than previous versions of Carbide.c++. By default this new template translation is off. To ensure that template source code follows the ISO C++ standard more closely, turn on the ISO C++ Template Parser option .</p>
+<p>The compiler provides pragmas to help update your source code to the more conformant template features. The <a href="../pragmas/p_parse_func_templ.htm">parse_func_templ</a> pragma controls the new template features. The <a href="../pragmas/p_parse_mfunc_templ.htm">parse_mfunc_templ</a> pragma controls the new template features for class member functions only. The pragma <a href="../pragmas/p_warn_no_typename.htm">warn_no_typename</a> warns for the missing use of the typename keyword required by the ISO C++ standard.</p>
+<p>When using the new template parsing features, the compiler enforces more careful use of the typename and template keywords, and follows different rules for resolving names during declaration and instantiation than before.</p>
+<p>A qualified name that refers to a type and that depends on a template parameter must begin with typename (ISO C++, §14.6). An example using the typename Keyword:</p>
+<p class="listing">template <typename T> void f()<br />
+ {<br />
+ T::name *ptr; // ERROR: an attempt to multiply T::name by ptr<br />
+ typename T::name *ptr; // OK<br />
+ }</p>
+<p>The compiler requires the template keyword at the end of “.” and “->” operators, and for qualified identifiers that depend on a template parameter. An example using the template Keyword:</p>
+<p class="listing">template <typename T> void f(T* ptr)<br />
+ {<br />
+ ptr->f<int>(); // ERROR: f is less than int<br />
+ ptr->template f<int>(); // OK<br />
+ }</p>
+<p>Names referred to inside a template declaration that are not dependent on the template declaration (that do not rely on template arguments) must be declared before the template’s declaration. These names are bound to the template declaration at the point where the template is defined. Bindings are not affected by definitions that are in scope at the point of instantiation. Listing 1 shows an example.</p>
+<div class="listing">
+ <h4>Listing 1. Binding Non-dependent Identifiers</h4>
+ <p>void f(char);</p>
+ <p>template <typename T> void tmpl_func()<br />
+ {<br />
+ f(1); // Uses f(char); f(int) is not defined yet.<br />
+ g(); // ERROR: g() is not defined yet.<br />
+ }<br />
+ void g();<br />
+ void f(int);</p>
+</div>
+<p>Names of template arguments that are dependent in base classes must be explicitly qualified (ISO C++, §14.6.2). See Listing 2.</p>
+<div class="listing">
+ <h4>Listing 2. Qualifying Template Arguments in Base Classes</h4>
+ <p>template <typename T> struct Base<br />
+ {<br />
+ void f();<br />
+ }<br />
+ template <typename T> struct Derive: Base<T><br />
+ {<br />
+ void g()<br />
+ {<br />
+ f(); // ERROR: Base<T>::f() is not visible.<br />
+ Base<T>::f(); // OK<br />
+ }<br />
+ }</p>
+</div>
+<p>When a template contains a function call in which at least one of the function’s arguments is type-dependent, the compiler uses the name of the function in the context of the template definition (ISO C++, §14.6.2.2) and the context of its instantiation (ISO C++, §14.6.4.2). Listing 3 shows an example.</p>
+<div class="listing">
+ <h4>Listing 3. Function Call with Type-dependent Argument</h4>
+ <p>void f(char);</p>
+ <p>template <typename T> void type_dep_func()<br />
+ {<br />
+ f(1); // Uses f(char), above; f(int) is not declared yet.<br />
+ f(T()); // f() called with a type-dependent argument.<br />
+ }</p>
+ <p>void f(int);<br />
+ struct A{};<br />
+ void f(A);</p>
+ <p>int main()<br />
+ {<br />
+ type_dep_func<int>(); // Calls f(char) twice.<br />
+ type_dep_func<A>(); // Calls f(char) and f(A);<br />
+ return 0;<br />
+ }</p>
+</div>
+<p>The compiler only uses external names to look up type-dependent arguments in function calls. </p>
+<p class="listing">static void f(int); // f() is internal.<br />
+ template <typename T> void type_dep_fun_ext()<br />
+ {<br />
+ f(T()); // f() called with a type-dependent argument.<br />
+}<br />
+<br />
+int main()<br />
+ {<br />
+ type_dep_fun_ext<int>(); // ERROR: f(int) must be external.<br />
+}</p>
+<p>The compiler does not allow expressions in inline assembly statements that depend on template parameters.</p>
+<p class="listing">template <typename T> void asm_tmpl()<br />
+ {<br />
+ asm { move #sizeof(T), D0 ); // ERROR: Not yet supported.<br />
+ }</p>
+<p>The compiler also supports the address of template-id rules.</p>
+<p class="listing">template <typename T> void foo(T) {}<br />
+ template <typename T> void bar(T) {}<br />
+ ...<br />
+ foo{ &bar<int> ); // now accepted<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_templates_declaring.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_templates_declaring.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,54 +1,54 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Providing declarations when declaring the template</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Providing declarations when declaring the template</h3>
-<p>Carbide.c++ processes any declarations in a template when the template is declared, not when it is instantiated.</p>
-<p>Although the C++ compiler currently accepts declarations in templates that are not available when the template is declared, future versions of the compiler will not. Listing 1 shows some examples.</p>
-<div class="listing">
- <h5>Listing 1. Declarations in Template Declarations</h5>
- <p>// You must define names in a class template declaration</p>
- <p>struct bar;<br />
- template<typename T> struct foo {<br />
- bar *member; // OK<br />
- };<br />
- struct bar { };<br />
- foo<int> fi; </p>
- <p>// Names in template argument dependent base classes:</p>
- <p>template<typename T> struct foo {<br />
- typedef T *tptr;<br />
- };</p>
- <p>template<typename T> struct foo {<br />
- typedef T *tptr;<br />
- };<br />
- template<typename T> struct bar : foo<T> {<br />
- typename foo<T>::tptr member; // OK<br />
- };</p>
- <p>// The correct usage of typename in template argument <br />
- // dependent qualified names in some contexts:</p>
- <p>template<class T> struct X {<br />
- typedef X *xptr;<br />
- xptr f();<br />
- };<br />
- template<class T> X<T>::xptr X<T>::f() // 'typename' missing<br />
- {<br />
- return 0;<br />
- }</p>
- <p>// Workaround: Use 'typename':</p>
- <p>template<class T> typename X<T>::xptr X<T>::f() // OK<br />
- {<br />
- return 0;<br />
- } <br />
-
- </p>
-</div>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Providing declarations when declaring the template</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Providing declarations when declaring the template</h3>
+<p>Carbide.c++ processes any declarations in a template when the template is declared, not when it is instantiated.</p>
+<p>Although the C++ compiler currently accepts declarations in templates that are not available when the template is declared, future versions of the compiler will not. Listing 1 shows some examples.</p>
+<div class="listing">
+ <h5>Listing 1. Declarations in Template Declarations</h5>
+ <p>// You must define names in a class template declaration</p>
+ <p>struct bar;<br />
+ template<typename T> struct foo {<br />
+ bar *member; // OK<br />
+ };<br />
+ struct bar { };<br />
+ foo<int> fi; </p>
+ <p>// Names in template argument dependent base classes:</p>
+ <p>template<typename T> struct foo {<br />
+ typedef T *tptr;<br />
+ };</p>
+ <p>template<typename T> struct foo {<br />
+ typedef T *tptr;<br />
+ };<br />
+ template<typename T> struct bar : foo<T> {<br />
+ typename foo<T>::tptr member; // OK<br />
+ };</p>
+ <p>// The correct usage of typename in template argument <br />
+ // dependent qualified names in some contexts:</p>
+ <p>template<class T> struct X {<br />
+ typedef X *xptr;<br />
+ xptr f();<br />
+ };<br />
+ template<class T> X<T>::xptr X<T>::f() // 'typename' missing<br />
+ {<br />
+ return 0;<br />
+ }</p>
+ <p>// Workaround: Use 'typename':</p>
+ <p>template<class T> typename X<T>::xptr X<T>::f() // OK<br />
+ {<br />
+ return 0;<br />
+ } <br />
+
+ </p>
+</div>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_templates_defining.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_templates_defining.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,89 +1,89 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Declaring and Defining Templates</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Declaring and Defining Templates</h3>
-<p>In a header file, declare your class functions and function templates, as shown in Listing 3.9. </p>
-<div class="listing">
- <h4>Listing 1. templ.h: A Template Declaration File</h4>
- <p>template <class T> <br />
- class Templ {<br />
- T member;<br />
- public:<br />
- Templ(T x) { member=x; }<br />
- T Get();<br />
- };<br />
- <br />
- template <class T> <br />
- T Max(T,T);</p>
-</div>
-<p>In a source file, include the header file, then define the function templates and the member functions of the class templates. Listing 3.10 shows you an example.</p>
-<p>This source file is a template definition file, which you include in any file that uses your templates. You do not need to add the template definition file to your project. Although this is technically a source file, you work with it as if it were a header file.</p>
-<p>The template definition file does not generate code. The compiler cannot generate code for a template until you specify what values it should substitute for the template arguments. Specifying these values is called instantiating the template. See <a href="cpp_templates_instantiating.htm">Instantiating a Template</a>.</p>
-<div class="listing">
- <h4>Listing 2. templ.cp: A Template Definition File</h4>
- <p>#include "templ.h"<br />
- <br />
- template <class T> <br />
- T Templ<T>::Get() <br />
- { <br />
- return member; <br />
- }<br />
- <br />
- template <class T> <br />
- T Max(T x, T y) <br />
- { <br />
- return ((x>y)?x:y); <br />
- }</p>
-</div>
-<p class="note"><strong>WARNING</strong>! Do not include the original template declaration file, which ends in .h, in your source file. Otherwise, the compiler generates an error saying that the function or class is undefined.</p>
-<h4>Providing declarations when declaring the template</h4>
-<p>Carbide.c++ processes any declarations in a template when the template is declared, not when it is instantiated.</p>
-<p>Although the C++ compiler currently accepts declarations in templates that are not available when the template is declared, future versions of the compiler will not. Listing 3.11 shows some examples.</p>
-<div class="listing">
- <h5>Listing 3.11 Declarations in Template Declarations</h5>
- <p>// You must define names in a class template declaration</p>
- <p>struct bar;<br />
- template<typename T> struct foo {<br />
- bar *member; // OK<br />
- };<br />
- struct bar { };<br />
- foo<int> fi; </p>
- <p>// Names in template argument dependent base classes:</p>
- <p>template<typename T> struct foo {<br />
- typedef T *tptr;<br />
- };</p>
- <p>template<typename T> struct foo {<br />
- typedef T *tptr;<br />
- };<br />
- template<typename T> struct bar : foo<T> {<br />
- typename foo<T>::tptr member; // OK<br />
- };</p>
- <p>// The correct usage of typename in template argument <br />
- // dependent qualified names in some contexts:</p>
- <p>template<class T> struct X {<br />
- typedef X *xptr;<br />
- xptr f();<br />
- };<br />
- template<class T> X<T>::xptr X<T>::f() // 'typename' missing<br />
- {<br />
- return 0;<br />
- }</p>
- <p>// Workaround: Use 'typename':</p>
- <p>template<class T> typename X<T>::xptr X<T>::f() // OK<br />
- {<br />
- return 0;<br />
- } <br />
-
- </p>
-</div>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Declaring and Defining Templates</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Declaring and Defining Templates</h3>
+<p>In a header file, declare your class functions and function templates, as shown in Listing 3.9. </p>
+<div class="listing">
+ <h4>Listing 1. templ.h: A Template Declaration File</h4>
+ <p>template <class T> <br />
+ class Templ {<br />
+ T member;<br />
+ public:<br />
+ Templ(T x) { member=x; }<br />
+ T Get();<br />
+ };<br />
+ <br />
+ template <class T> <br />
+ T Max(T,T);</p>
+</div>
+<p>In a source file, include the header file, then define the function templates and the member functions of the class templates. Listing 3.10 shows you an example.</p>
+<p>This source file is a template definition file, which you include in any file that uses your templates. You do not need to add the template definition file to your project. Although this is technically a source file, you work with it as if it were a header file.</p>
+<p>The template definition file does not generate code. The compiler cannot generate code for a template until you specify what values it should substitute for the template arguments. Specifying these values is called instantiating the template. See <a href="cpp_templates_instantiating.htm">Instantiating a Template</a>.</p>
+<div class="listing">
+ <h4>Listing 2. templ.cp: A Template Definition File</h4>
+ <p>#include "templ.h"<br />
+ <br />
+ template <class T> <br />
+ T Templ<T>::Get() <br />
+ { <br />
+ return member; <br />
+ }<br />
+ <br />
+ template <class T> <br />
+ T Max(T x, T y) <br />
+ { <br />
+ return ((x>y)?x:y); <br />
+ }</p>
+</div>
+<p class="note"><strong>WARNING</strong>! Do not include the original template declaration file, which ends in .h, in your source file. Otherwise, the compiler generates an error saying that the function or class is undefined.</p>
+<h4>Providing declarations when declaring the template</h4>
+<p>Carbide.c++ processes any declarations in a template when the template is declared, not when it is instantiated.</p>
+<p>Although the C++ compiler currently accepts declarations in templates that are not available when the template is declared, future versions of the compiler will not. Listing 3.11 shows some examples.</p>
+<div class="listing">
+ <h5>Listing 3.11 Declarations in Template Declarations</h5>
+ <p>// You must define names in a class template declaration</p>
+ <p>struct bar;<br />
+ template<typename T> struct foo {<br />
+ bar *member; // OK<br />
+ };<br />
+ struct bar { };<br />
+ foo<int> fi; </p>
+ <p>// Names in template argument dependent base classes:</p>
+ <p>template<typename T> struct foo {<br />
+ typedef T *tptr;<br />
+ };</p>
+ <p>template<typename T> struct foo {<br />
+ typedef T *tptr;<br />
+ };<br />
+ template<typename T> struct bar : foo<T> {<br />
+ typename foo<T>::tptr member; // OK<br />
+ };</p>
+ <p>// The correct usage of typename in template argument <br />
+ // dependent qualified names in some contexts:</p>
+ <p>template<class T> struct X {<br />
+ typedef X *xptr;<br />
+ xptr f();<br />
+ };<br />
+ template<class T> X<T>::xptr X<T>::f() // 'typename' missing<br />
+ {<br />
+ return 0;<br />
+ }</p>
+ <p>// Workaround: Use 'typename':</p>
+ <p>template<class T> typename X<T>::xptr X<T>::f() // OK<br />
+ {<br />
+ return 0;<br />
+ } <br />
+
+ </p>
+</div>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_templates_instant_auto.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_templates_instant_auto.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Instantiating a Template: Automatic</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3> Automatic instantiation</h3>
-<p>To instantiate templates automatically, include the template definition file in all source files that use the template, then use the template members like any other type or function. The compiler automatically generates code for a template instantiation whenever it sees a new one. Listing 1 shows how to automatically instantiate the templates for <span class="code">class Templ</span> and <span class="code">class Max</span>.</p>
-<div class="listing">
- <h4>Listing 1. myprog.cp: A Source File that Uses Templates</h4>
- <p>#include <iostreams.h><br />
- #include "templ.cp" // includes templ.h as well</p>
- <p>void main(void) {<br />
- Templ<long> a = 1, b = 2;<br />
- // The compiler instantiates Templ<long> here.<br />
- cout << Max(a.Get(), b.Get());<br />
- // The compiler instantiates Max<long>() here.<br />
- };</p>
-</div>
-<p>If you use automatic instantiation, the compiler might take longer to translate your program because the compiler has to determine on its own which instantiations you need. It also scatters the object code for the template instantiations throughout your program.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Instantiating a Template: Automatic</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3> Automatic instantiation</h3>
+<p>To instantiate templates automatically, include the template definition file in all source files that use the template, then use the template members like any other type or function. The compiler automatically generates code for a template instantiation whenever it sees a new one. Listing 1 shows how to automatically instantiate the templates for <span class="code">class Templ</span> and <span class="code">class Max</span>.</p>
+<div class="listing">
+ <h4>Listing 1. myprog.cp: A Source File that Uses Templates</h4>
+ <p>#include <iostreams.h><br />
+ #include "templ.cp" // includes templ.h as well</p>
+ <p>void main(void) {<br />
+ Templ<long> a = 1, b = 2;<br />
+ // The compiler instantiates Templ<long> here.<br />
+ cout << Max(a.Get(), b.Get());<br />
+ // The compiler instantiates Max<long>() here.<br />
+ };</p>
+</div>
+<p>If you use automatic instantiation, the compiler might take longer to translate your program because the compiler has to determine on its own which instantiations you need. It also scatters the object code for the template instantiations throughout your program.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_templates_instant_explicit.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_templates_instant_explicit.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,42 +1,42 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Instantiating a Template: Implicit</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3> Explicit instantiation</h3>
-<p>To instantiate templates explicitly, include the template definition file in a source file, and write a template instantiation statement for every instantiation. The syntax for a class template instantiation is as follows:</p>
-<p class="listing"> template class class-name<templ-specs>;</p>
-<p>The syntax for a function template instantiation is as follows:</p>
-<p class="listing"> template return-type func-name<templ-specs>(arg-specs);</p>
-<p>Listing 1 shows how to explicitly instantiate the templates in Listing 3.9 and Listing 3.10.</p>
-<div class="listing">
- <p>Listing 1. myinst.cp: Explicitly Instantiating Templates</p>
- <p>#include "templ.cp"</p>
- <p>template class Templ<long>; // class instantiation<br />
- template long Max<long>(long,long); // function instantiation</p>
-</div>
-<p>When you explicitly instantiate a function, you do not need to include in templ-specs any arguments that the compiler can deduce from arg-specs. For example, in Listing 1 you can instantiate <span class="code">Max<long>()</span> like this:</p>
-<p class="listing">template long Max<>(long, long);<br />
- // The compiler can tell from the arguments<br />
-// that you are instantiating Max<long>()</p>
-<p>Use explicit instantiation to make your program compile faster. Because the instantiations can be in one file with no other code, you can even put them in a separate library. </p>
-<p>The compiler also supports the explicit instantiation of non-template members. Listing 2 shows an example.</p>
-<div class="listing">
- <h5>Listing 2. Explicit Instantiation of Non-Template Members</h5>
- <p>template <class T> struct X { <br />
- static T i;<br />
- };</p>
- <p>template <class T> T X<T>::i = 1;<br />
- template char X<char>::i;</p>
-</div>
-<p class="note"><strong>NOTE</strong> Explicit instantiation is not in the ARM but is part of the ISO C++ standard.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Instantiating a Template: Implicit</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3> Explicit instantiation</h3>
+<p>To instantiate templates explicitly, include the template definition file in a source file, and write a template instantiation statement for every instantiation. The syntax for a class template instantiation is as follows:</p>
+<p class="listing"> template class class-name<templ-specs>;</p>
+<p>The syntax for a function template instantiation is as follows:</p>
+<p class="listing"> template return-type func-name<templ-specs>(arg-specs);</p>
+<p>Listing 1 shows how to explicitly instantiate the templates in Listing 3.9 and Listing 3.10.</p>
+<div class="listing">
+ <p>Listing 1. myinst.cp: Explicitly Instantiating Templates</p>
+ <p>#include "templ.cp"</p>
+ <p>template class Templ<long>; // class instantiation<br />
+ template long Max<long>(long,long); // function instantiation</p>
+</div>
+<p>When you explicitly instantiate a function, you do not need to include in templ-specs any arguments that the compiler can deduce from arg-specs. For example, in Listing 1 you can instantiate <span class="code">Max<long>()</span> like this:</p>
+<p class="listing">template long Max<>(long, long);<br />
+ // The compiler can tell from the arguments<br />
+// that you are instantiating Max<long>()</p>
+<p>Use explicit instantiation to make your program compile faster. Because the instantiations can be in one file with no other code, you can even put them in a separate library. </p>
+<p>The compiler also supports the explicit instantiation of non-template members. Listing 2 shows an example.</p>
+<div class="listing">
+ <h5>Listing 2. Explicit Instantiation of Non-Template Members</h5>
+ <p>template <class T> struct X { <br />
+ static T i;<br />
+ };</p>
+ <p>template <class T> T X<T>::i = 1;<br />
+ template char X<char>::i;</p>
+</div>
+<p class="note"><strong>NOTE</strong> Explicit instantiation is not in the ARM but is part of the ISO C++ standard.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_templates_instantiating.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_templates_instantiating.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Instantiating a Template</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3> Instantiating a Template</h3>
-<p>The compiler cannot generate code for a template until you:</p>
-<ul>
- <li>declare the template class</li>
- <li>provide a template definition</li>
- <li>specify the data type(s) for the template</li>
-</ul>
-<p>For information on the first two requirements, see <a href="cpp_templates_defining.htm">Declaring and Defining Templates</a>. </p>
-<p>Specifying the data type(s) and other arguments for a template is called instantiating the template. Carbide.c++ gives you two ways to instantiate a template. You can let the compiler instantiate it <a href="cpp_templates_instant_auto.htm">automatically</a> when you first use it, or you can <a href="cpp_templates_instant_explicit.htm">explicitly</a> create all the instantiations you expect to use.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Instantiating a Template</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3> Instantiating a Template</h3>
+<p>The compiler cannot generate code for a template until you:</p>
+<ul>
+ <li>declare the template class</li>
+ <li>provide a template definition</li>
+ <li>specify the data type(s) for the template</li>
+</ul>
+<p>For information on the first two requirements, see <a href="cpp_templates_defining.htm">Declaring and Defining Templates</a>. </p>
+<p>Specifying the data type(s) and other arguments for a template is called instantiating the template. Carbide.c++ gives you two ways to instantiate a template. You can let the compiler instantiate it <a href="cpp_templates_instant_auto.htm">automatically</a> when you first use it, or you can <a href="cpp_templates_instant_explicit.htm">explicitly</a> create all the instantiations you expect to use.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_templates_working.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/cpp_compiler/cpp_templates_working.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Working with Templates</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Working with Templates</h2>
-<p>(ISO C++, §14) This section describes how to organize your template declarations and definitions in files. It also describes how to explicitly instantiate templates using a syntax that is not in the ARM but is part of the ISO C++ standard.</p>
-<p>This section includes the following topics:</p>
-<ul>
- <li><a href="cpp_templates_defining.htm">Declaring and Defining Templates</a>
- <ul>
- <li><a href="cpp_templates_declaring.htm">Providing declarations when declaring the template</a></li>
- </ul>
- </li>
- <li><a href="cpp_templates_instantiating.htm">Instantiating a Template</a></li>
- <li><a href="cpp_templates_conformance.htm">Better Template Conformance</a></li>
-</ul>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Working with Templates</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Working with Templates</h2>
+<p>(ISO C++, §14) This section describes how to organize your template declarations and definitions in files. It also describes how to explicitly instantiate templates using a syntax that is not in the ARM but is part of the ISO C++ standard.</p>
+<p>This section includes the following topics:</p>
+<ul>
+ <li><a href="cpp_templates_defining.htm">Declaring and Defining Templates</a>
+ <ul>
+ <li><a href="cpp_templates_declaring.htm">Providing declarations when declaring the template</a></li>
+ </ul>
+ </li>
+ <li><a href="cpp_templates_instantiating.htm">Instantiating a Template</a></li>
+ <li><a href="cpp_templates_conformance.htm">Better Template Conformance</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_activating.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_activating.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>C++ and Embedded Systems</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Activating EC++</h3>
-<p>To compile EC++ source code, enable the EC++ Compatibility Mode setting .</p>
-<p>To test for EC++ compatibility mode at compile time, use the <span class="code">__embedded_cplusplus</span> predefined symbol. For more information, see “Predefined Symbols”.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>C++ and Embedded Systems</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Activating EC++</h3>
+<p>To compile EC++ source code, enable the EC++ Compatibility Mode setting .</p>
+<p>To test for EC++ compatibility mode at compile time, use the <span class="code">__embedded_cplusplus</span> predefined symbol. For more information, see “Predefined Symbols”.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_code_compiler.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_code_compiler.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Compiler-related strategies</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Compiler-related Strategies</h3>
-<p>Compiler-related strategies rely on compiler features to reduce object code size.</p>
-<ul>
- <li>Size Optimizations—use the compiler size optimization settings</li>
- <li>Inlining—control and limit effectiveness of inline directive</li>
-</ul>
-<h4>Size Optimizations</h4>
-<p>Carbide compilers include optimization settings for size or speed and various levels of optimization. Choose size as your desired outcome and the level of optimization to apply.</p>
-<p>Optimization settings for your target are controlled by settings in the Processor panel.</p>
-<p>When debugging, compile your code without any optimizations. Some optimizations disrupt the relationship between the source and object code required by the debugger. Optimize your code after you have finished debugging.</p>
-<p>See also C/C++ Language Panel.</p>
-<h4>Inlining</h4>
-<p>With Carbide, you can disable inlining, allow normal inlining, auto-inline, or set the maximum depth of inlining.</p>
-<p>Inlining can reduce or increase code size. There is no definite answer for this question. Inlining small functions can make a program smaller, especially if you have a class library with a lot of getter/setter member functions.</p>
-<p>However, MSL C++ defines many functions as inline, which is not good if you want minimal code size. For optimal code size when using MSL C++, disable inlining when building the library. If you are not using MSL C++, normal inlining and a common-sense use of the keyword inline might improve your code size.</p>
-<p>In Carbide, you control inlining as a language setting .</p>
-<p>When debugging your code, disable inlining to maintain a clear correspondence between source and object code. After debugging, set the inlining level that has the best effect on your object code.</p>
-<p>See also <a href="../c_compiler/c_inlining.htm">Inlining</a>.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Compiler-related strategies</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Compiler-related Strategies</h3>
+<p>Compiler-related strategies rely on compiler features to reduce object code size.</p>
+<ul>
+ <li>Size Optimizations—use the compiler size optimization settings</li>
+ <li>Inlining—control and limit effectiveness of inline directive</li>
+</ul>
+<h4>Size Optimizations</h4>
+<p>Carbide compilers include optimization settings for size or speed and various levels of optimization. Choose size as your desired outcome and the level of optimization to apply.</p>
+<p>Optimization settings for your target are controlled by settings in the Processor panel.</p>
+<p>When debugging, compile your code without any optimizations. Some optimizations disrupt the relationship between the source and object code required by the debugger. Optimize your code after you have finished debugging.</p>
+<p>See also C/C++ Language Panel.</p>
+<h4>Inlining</h4>
+<p>With Carbide, you can disable inlining, allow normal inlining, auto-inline, or set the maximum depth of inlining.</p>
+<p>Inlining can reduce or increase code size. There is no definite answer for this question. Inlining small functions can make a program smaller, especially if you have a class library with a lot of getter/setter member functions.</p>
+<p>However, MSL C++ defines many functions as inline, which is not good if you want minimal code size. For optimal code size when using MSL C++, disable inlining when building the library. If you are not using MSL C++, normal inlining and a common-sense use of the keyword inline might improve your code size.</p>
+<p>In Carbide, you control inlining as a language setting .</p>
+<p>When debugging your code, disable inlining to maintain a clear correspondence between source and object code. After debugging, set the inlining level that has the best effect on your object code.</p>
+<p>See also <a href="../c_compiler/c_inlining.htm">Inlining</a>.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_code_language.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_code_language.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,40 +1,40 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Language-related strategies</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Language-related Strategies</h3>
-<p> Language-related strategies limit or avoid the use of ISO C++ features. While these features can make software design and maintenance easier, they can also increase code size.</p>
-<ul>
- <li>Virtual Functions—Not using virtual functions reduces code size.</li>
- <li>Runtime Type Identification—Extra data is not generated if program does not use Runtime Type Identification (RTTI).</li>
- <li>Exception Handling—While the Carbide.c++ compiler provides zero-overhead exception handling to provide optimum execution speed, it still generates extra object code for exception support.</li>
- <li>Operator New—Do not throw an exception within the new operator.</li>
- <li>Multiple and Virtual Inheritance</li>
-</ul>
-<h4>Virtual Functions</h4>
-<p>For optimal code size, do not use virtual functions unless absolutely necessary. A virtual function is never dead-stripped, even if it is never called.</p>
-<h4>Runtime Type Identification</h4>
-<p>If code size is an issue, do not use RTTI because it generates a data table for every class. Disabling RTTI decreases the size of the data section.</p>
-<p>The EC++ proposal does not allow runtime type identification.</p>
-<p>See also “Controlling RTTI”.</p>
-<h4>Exception Handling</h4>
-<p>If you must handle exceptions, be careful when using C++ exception handling routines. Carbide has a zero runtime overhead error handling mechanism. However, using exceptions does increase code size, particularly the exception tables data.</p>
-<p>The EC++ proposal does not allow exception handling.</p>
-<p class="note"><strong>NOTE</strong> The proposed ISO standard libraries and the use of the new operator require exception handling.</p>
-<h4>Operator New</h4>
-<p>The C++ new operator might throw an exception, depending on how the runtime library implements the new operator. To make the new operator throw exceptions, set __throws_bad_alloc to 1 in the prefix file for your target and rebuild your library. To prevent the new operator from throwing exceptions, set __throws_bad_alloc to 0 in the prefix file for your target and rebuild your library.</p>
-<p>See your release notes or Targeting manual for more information.</p>
-<h4>Multiple and Virtual Inheritance</h4>
-<p>Implementing multiple inheritance requires a modest amount of code and data overhead. The EC++ proposal does not allow multiple inheritance.</p>
-<p>For optimal code size, do not use virtual inheritance. Virtual base classes are often complex and add a lot of code to the constructor and destructor functions.</p>
-<p>The EC++ proposal does not allow virtual inheritance.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Language-related strategies</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Language-related Strategies</h3>
+<p> Language-related strategies limit or avoid the use of ISO C++ features. While these features can make software design and maintenance easier, they can also increase code size.</p>
+<ul>
+ <li>Virtual Functions—Not using virtual functions reduces code size.</li>
+ <li>Runtime Type Identification—Extra data is not generated if program does not use Runtime Type Identification (RTTI).</li>
+ <li>Exception Handling—While the Carbide.c++ compiler provides zero-overhead exception handling to provide optimum execution speed, it still generates extra object code for exception support.</li>
+ <li>Operator New—Do not throw an exception within the new operator.</li>
+ <li>Multiple and Virtual Inheritance</li>
+</ul>
+<h4>Virtual Functions</h4>
+<p>For optimal code size, do not use virtual functions unless absolutely necessary. A virtual function is never dead-stripped, even if it is never called.</p>
+<h4>Runtime Type Identification</h4>
+<p>If code size is an issue, do not use RTTI because it generates a data table for every class. Disabling RTTI decreases the size of the data section.</p>
+<p>The EC++ proposal does not allow runtime type identification.</p>
+<p>See also “Controlling RTTI”.</p>
+<h4>Exception Handling</h4>
+<p>If you must handle exceptions, be careful when using C++ exception handling routines. Carbide has a zero runtime overhead error handling mechanism. However, using exceptions does increase code size, particularly the exception tables data.</p>
+<p>The EC++ proposal does not allow exception handling.</p>
+<p class="note"><strong>NOTE</strong> The proposed ISO standard libraries and the use of the new operator require exception handling.</p>
+<h4>Operator New</h4>
+<p>The C++ new operator might throw an exception, depending on how the runtime library implements the new operator. To make the new operator throw exceptions, set __throws_bad_alloc to 1 in the prefix file for your target and rebuild your library. To prevent the new operator from throwing exceptions, set __throws_bad_alloc to 0 in the prefix file for your target and rebuild your library.</p>
+<p>See your release notes or Targeting manual for more information.</p>
+<h4>Multiple and Virtual Inheritance</h4>
+<p>Implementing multiple inheritance requires a modest amount of code and data overhead. The EC++ proposal does not allow multiple inheritance.</p>
+<p>For optimal code size, do not use virtual inheritance. Virtual base classes are often complex and add a lot of code to the constructor and destructor functions.</p>
+<p>The EC++ proposal does not allow virtual inheritance.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_code_library.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_code_library.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Library-related strategies</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Library-related strategies</h3>
-<p>Library related strategies include:</p>
-<ul>
- <li>Stream-Based Classes—MSL classes comprise a lot of object code.</li>
- <li>Alternative Class Libraries—Non-standard class libraries can provide a subset of the standard library’s functionality with less overhead.</li>
-</ul>
-<h4>Stream-Based Classes</h4>
-<p>MSL C++ stream-based classes initialize several instances of direct and indirect objects. When code size is critical, do not use stream-based classes, which include standard input (<span class="code">cin</span>), standard output (<span class="code">cout</span>), and standard error (<span class="code">cerr</span>). There are also wide-character equivalents for the normal input and output routines. Use only standard C input and output functions unless stream-based classes are absolutely necessary.</p>
-<p>In addition to the standard C++ stream classes, avoid using string streams for in-core formatting because they generate heavy overhead. If size is critical, use C’s <span class="code">sprintf</span> or <span class="code">sscanf</span> functions instead.</p>
-<p>The EC++ proposal does not support templatized classes or functions. MSL adheres to the ISO proposed standards that are template-based.</p>
-<h4>Alternative Class Libraries</h4>
-<p>MSL C++ is based on the ISO proposed C++ standard, which is implemented using templates that have a large initial overhead for specialization.</p>
-<p>To avoid this overhead, consider devising your own commonly-used vector, string, or utility classes. You can also use other class libraries, such as the NIH's (National Institute of Health) Class Library. If you do use an alternative library, beware of potential problems with virtual inheritance, RTTI, or other causes of larger code size as described above.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Library-related strategies</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Library-related strategies</h3>
+<p>Library related strategies include:</p>
+<ul>
+ <li>Stream-Based Classes—MSL classes comprise a lot of object code.</li>
+ <li>Alternative Class Libraries—Non-standard class libraries can provide a subset of the standard library’s functionality with less overhead.</li>
+</ul>
+<h4>Stream-Based Classes</h4>
+<p>MSL C++ stream-based classes initialize several instances of direct and indirect objects. When code size is critical, do not use stream-based classes, which include standard input (<span class="code">cin</span>), standard output (<span class="code">cout</span>), and standard error (<span class="code">cerr</span>). There are also wide-character equivalents for the normal input and output routines. Use only standard C input and output functions unless stream-based classes are absolutely necessary.</p>
+<p>In addition to the standard C++ stream classes, avoid using string streams for in-core formatting because they generate heavy overhead. If size is critical, use C’s <span class="code">sprintf</span> or <span class="code">sscanf</span> functions instead.</p>
+<p>The EC++ proposal does not support templatized classes or functions. MSL adheres to the ISO proposed standards that are template-based.</p>
+<h4>Alternative Class Libraries</h4>
+<p>MSL C++ is based on the ISO proposed C++ standard, which is implemented using templates that have a large initial overhead for specialization.</p>
+<p>To avoid this overhead, consider devising your own commonly-used vector, string, or utility classes. You can also use other class libraries, such as the NIH's (National Institute of Health) Class Library. If you do use an alternative library, beware of potential problems with virtual inheritance, RTTI, or other causes of larger code size as described above.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_differences.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_differences.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Differences Between ISO C++ and EC++</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Differences Between ISO C++ and EC++</h3>
-<p>The EC++ proposal does not support the following ISO C++ (ANSI C++) features.</p>
-<h4>Templates</h4>
-<p>ANSI C++ supports templates. The EC++ proposal does not include template support for class or functions.</p>
-<h4>Libraries </h4>
-<p>The EC++ proposal supports the <span class="code"><string></span>, <span class="code"><complex></span>, <span class="code"><ios></span>, <span class="code"><streambuf></span>, <span class="code"><istream></span>, and <span class="code"><ostream></span> classes, but only in a non-template form. The EC++ specifications do not support any other ANSI C++ libraries, including the STL-type algorithm libraries.</p>
-<h4>File Operations</h4>
-<p>The EC++ proposal does not support any file operations except simple console input and output file types. </p>
-<h4>Localization</h4>
-<p>The EC++ proposal does not contain localization libraries because of the excessive memory requirements.</p>
-<h4>Exception Handling</h4>
-<p>The EC++ proposal does not support exception handling.</p>
-<h4>Unsupported Language Features</h4>
-<p>The EC++ proposal does not support the following language features:</p>
-<ul>
- <li>mutable specified</li>
- <li>RTTI </li>
- <li>namespace </li>
- <li>multiple inheritance</li>
- <li>virtual inheritance </li>
-</ul>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Differences Between ISO C++ and EC++</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Differences Between ISO C++ and EC++</h3>
+<p>The EC++ proposal does not support the following ISO C++ (ANSI C++) features.</p>
+<h4>Templates</h4>
+<p>ANSI C++ supports templates. The EC++ proposal does not include template support for class or functions.</p>
+<h4>Libraries </h4>
+<p>The EC++ proposal supports the <span class="code"><string></span>, <span class="code"><complex></span>, <span class="code"><ios></span>, <span class="code"><streambuf></span>, <span class="code"><istream></span>, and <span class="code"><ostream></span> classes, but only in a non-template form. The EC++ specifications do not support any other ANSI C++ libraries, including the STL-type algorithm libraries.</p>
+<h4>File Operations</h4>
+<p>The EC++ proposal does not support any file operations except simple console input and output file types. </p>
+<h4>Localization</h4>
+<p>The EC++ proposal does not contain localization libraries because of the excessive memory requirements.</p>
+<h4>Exception Handling</h4>
+<p>The EC++ proposal does not support exception handling.</p>
+<h4>Unsupported Language Features</h4>
+<p>The EC++ proposal does not support the following language features:</p>
+<ul>
+ <li>mutable specified</li>
+ <li>RTTI </li>
+ <li>namespace </li>
+ <li>multiple inheritance</li>
+ <li>virtual inheritance </li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_smaller_code.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_smaller_code.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Obtaining Smaller Code Size in C++</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Obtaining Smaller Code Size in C++</h3>
-<p>Consider the following C++ programming strategies to ensure optimal code size:</p>
-<ul>
- <li>Compiler-related strategies</li>
- <li>Language-related strategies</li>
- <li>Library-related strategies</li>
-</ul>
-<p class="note"><strong>NOTE</strong> In all strategies, reducing object code size can affect program performance.</p>
-<p>The EC++ proposal uses some of these strategies as part of its specification. Other strategies apply to C++ programming in general. Any C++ program can use these strategies, regardless of whether it follows the EC++ proposal or not.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Obtaining Smaller Code Size in C++</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Obtaining Smaller Code Size in C++</h3>
+<p>Consider the following C++ programming strategies to ensure optimal code size:</p>
+<ul>
+ <li>Compiler-related strategies</li>
+ <li>Language-related strategies</li>
+ <li>Library-related strategies</li>
+</ul>
+<p class="note"><strong>NOTE</strong> In all strategies, reducing object code size can affect program performance.</p>
+<p>The EC++ proposal uses some of these strategies as part of its specification. Other strategies apply to C++ programming in general. Any C++ program can use these strategies, regardless of whether it follows the EC++ proposal or not.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_specifications.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_specifications.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>EC++ Specifications</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>EC++ Specifications</h3>
-<p>This section describes how to design software that adhere to the EC++ proposal.</p>
-<h4> Language Related Issues </h4>
-<p>To make sure your source code complies with both ISO C++ and EC++ standards, follow these guidelines:</p>
-<ul>
- <li>Do not use RTTI (Run Time Type Identification).</li>
- <li>Do not use exception handling, namespaces, or other unsupported features.</li>
- <li>Do not use multiple or virtual inheritance.</li>
-</ul>
-<p>You can disable certain C++ features, such as RTTI and exceptions, using the compiler settings in the C++ Language panel, described in C/C++ Language Panel</p>
-<h4>Library-Related Issues</h4>
-<p>Do not refer to routines, data structures, and classes in the Metrowerks Standard Library (MSL) for C++.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>EC++ Specifications</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>EC++ Specifications</h3>
+<p>This section describes how to design software that adhere to the EC++ proposal.</p>
+<h4> Language Related Issues </h4>
+<p>To make sure your source code complies with both ISO C++ and EC++ standards, follow these guidelines:</p>
+<ul>
+ <li>Do not use RTTI (Run Time Type Identification).</li>
+ <li>Do not use exception handling, namespaces, or other unsupported features.</li>
+ <li>Do not use multiple or virtual inheritance.</li>
+</ul>
+<p>You can disable certain C++ features, such as RTTI and exceptions, using the compiler settings in the C++ Language panel, described in C/C++ Language Panel</p>
+<h4>Library-Related Issues</h4>
+<p>Do not refer to routines, data structures, and classes in the Metrowerks Standard Library (MSL) for C++.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_systems.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/emb_systems/emb_systems.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>C++ and Embedded Systems</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>C++ and Embedded Systems</h2>
-<p>This section describes how to develop software for embedded systems using Carbide.c++ compilers. Embedded systems topics include:</p>
-<ul>
- <li><a href="emb_activating.htm">Activating EC++</a></li>
- <li><a href="emb_differences.htm">Differences Between ISO C++ and EC++</a></li>
- <li><a href="emb_specifications.htm">EC++ Specifications</a></li>
- <li><a href="emb_smaller_code.htm">Obtaining Smaller Code Size in C++</a></li>
-</ul>
-<p class="note"><strong>NOTE</strong> This chapter discusses program design strategies for embedded systems and is not meant to be a definitive solution. Currently, you can use the Carbide.c++ compiler to develop embedded systems that are compatible with Embedded C++ (EC++). </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>C++ and Embedded Systems</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>C++ and Embedded Systems</h2>
+<p>This section describes how to develop software for embedded systems using Carbide.c++ compilers. Embedded systems topics include:</p>
+<ul>
+ <li><a href="emb_activating.htm">Activating EC++</a></li>
+ <li><a href="emb_differences.htm">Differences Between ISO C++ and EC++</a></li>
+ <li><a href="emb_specifications.htm">EC++ Specifications</a></li>
+ <li><a href="emb_smaller_code.htm">Obtaining Smaller Code Size in C++</a></li>
+</ul>
+<p class="note"><strong>NOTE</strong> This chapter discusses program design strategies for embedded systems and is not meant to be a definitive solution. Currently, you can use the Carbide.c++ compiler to develop embedded systems that are compatible with Embedded C++ (EC++). </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_as_warnings.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_as_warnings.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,19 +1,19 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Warnings as Errors</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Warnings as Errors</h3>
-<p> If you enable the <b>Treat All Warnings as Errors</b> setting, the compiler treats all warnings as though they were errors. It does not compile a file successfully until you resolve all warnings.</p>
-<p>The Treat All Warnings as Errors setting corresponds to the pragma <a href="../pragmas/p_warning_errors.htm">warning_errors</a>. To check this setting, use <span class="code">__option (warning_errors)</span>.</p>
-<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Warnings as Errors</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Warnings as Errors</h3>
+<p> If you enable the <b>Treat All Warnings as Errors</b> setting, the compiler treats all warnings as though they were errors. It does not compile a file successfully until you resolve all warnings.</p>
+<p>The Treat All Warnings as Errors setting corresponds to the pragma <a href="../pragmas/p_warning_errors.htm">warning_errors</a>. To check this setting, use <span class="code">__option (warning_errors)</span>.</p>
+<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_bad_conversions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_bad_conversions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Bad Conversions of Pointer Values</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Bad Conversions of Pointer Values</h3>
-<p> Use either of the following pragmas to detect bad pointer value conversions:</p>
-<ul>
- <li>Enable the pragma <span class="code"><a href="../pragmas/p_warn_ptr_int_conv.htm">warn_ptr_int_conv</a></span> to have the compiler issue a warning when an expression converts a pointer value to an integral value that is not large enough to hold a pointer value.</li>
- <li>Enable the pragma <span class="code"><a href="../pragmas/p_warn_any_ptr_int_conv.htm">warn_any_ptr_int_conv</a></span> to have the compiler issue a warning when an expression converts a pointer value to an integral value that is not large enough to hold a pointer value or vice versa.</li>
-</ul>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Bad Conversions of Pointer Values</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Bad Conversions of Pointer Values</h3>
+<p> Use either of the following pragmas to detect bad pointer value conversions:</p>
+<ul>
+ <li>Enable the pragma <span class="code"><a href="../pragmas/p_warn_ptr_int_conv.htm">warn_ptr_int_conv</a></span> to have the compiler issue a warning when an expression converts a pointer value to an integral value that is not large enough to hold a pointer value.</li>
+ <li>Enable the pragma <span class="code"><a href="../pragmas/p_warn_any_ptr_int_conv.htm">warn_any_ptr_int_conv</a></span> to have the compiler issue a warning when an expression converts a pointer value to an integral value that is not large enough to hold a pointer value or vice versa.</li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_common.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_common.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,44 +1,44 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Common Errors</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Common Errors</h3>
-<p> If you enable the Possible Errors setting, the compiler generates a warning if it encounters common errors such as the following:</p>
-<ul>
- <li>An assignment in either a logical expression or the conditional portion of an if, while, or for expression. This warning is useful if you use = when you mean to use ==. An example of confusing = and == in comparisons:</li>
-</ul>
-<blockquote>
- <p class="listing"> if (a=b) f(); // WARNING: a=b is an assignment<br />
- if ((a=b)!=0) f(); // OK: (a=b)!=0 is a comparison, no warning<br />
- if (a==b) f(); // OK: (a==b) is a comparison, no warning</p>
-</blockquote>
-<ul>
- <li>An equal comparison in a statement that contains a single expression. This check is useful if you use == when you meant to use =. An example of confusing = and == operators in assignments:</li>
-</ul>
-<blockquote>
- <p class="listing"> a == 0; // WARNING: This is a comparison.<br />
- a = 0; // OK: This is an assignment, no warning</p>
-</blockquote>
-<ul>
- <li>A semicolon (;) directly after a while, if, or for statement. For example, the following statement generates a warning and is probably an unintended infinite loop:</li>
-</ul>
-<blockquote>
- <p class="listing">while (i++); // WARNING: Unintended infinite loop</p>
- <p>If you intended to create an infinite loop, put white space or a comment between the while statement and the semicolon.</p>
- <p>These statements suppress the above errors or warnings.</p>
- <p class="listing">while (i++) ; // OK: White space separation, no warning<br />
- while (i++) /*: Comment separation, no warning */ ;</p>
-</blockquote>
-<p>The Possible Errors setting corresponds to the pragma <a href="../pragmas/p_warn_possunwant.htm">warn_possunwant</a>. To check this setting, use <span class="code">__option (warn_possunwant)</span>.</p>
-<p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Common Errors</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Common Errors</h3>
+<p> If you enable the Possible Errors setting, the compiler generates a warning if it encounters common errors such as the following:</p>
+<ul>
+ <li>An assignment in either a logical expression or the conditional portion of an if, while, or for expression. This warning is useful if you use = when you mean to use ==. An example of confusing = and == in comparisons:</li>
+</ul>
+<blockquote>
+ <p class="listing"> if (a=b) f(); // WARNING: a=b is an assignment<br />
+ if ((a=b)!=0) f(); // OK: (a=b)!=0 is a comparison, no warning<br />
+ if (a==b) f(); // OK: (a==b) is a comparison, no warning</p>
+</blockquote>
+<ul>
+ <li>An equal comparison in a statement that contains a single expression. This check is useful if you use == when you meant to use =. An example of confusing = and == operators in assignments:</li>
+</ul>
+<blockquote>
+ <p class="listing"> a == 0; // WARNING: This is a comparison.<br />
+ a = 0; // OK: This is an assignment, no warning</p>
+</blockquote>
+<ul>
+ <li>A semicolon (;) directly after a while, if, or for statement. For example, the following statement generates a warning and is probably an unintended infinite loop:</li>
+</ul>
+<blockquote>
+ <p class="listing">while (i++); // WARNING: Unintended infinite loop</p>
+ <p>If you intended to create an infinite loop, put white space or a comment between the while statement and the semicolon.</p>
+ <p>These statements suppress the above errors or warnings.</p>
+ <p class="listing">while (i++) ; // OK: White space separation, no warning<br />
+ while (i++) /*: Comment separation, no warning */ ;</p>
+</blockquote>
+<p>The Possible Errors setting corresponds to the pragma <a href="../pragmas/p_warn_possunwant.htm">warn_possunwant</a>. To check this setting, use <span class="code">__option (warn_possunwant)</span>.</p>
+<p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_empty_decl.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_empty_decl.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Empty Declarations</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Empty Declarations</h3>
-<p> If you enable the Empty Declarations setting, the compiler issues a warning when it encounters a declaration with no variable name. <br />
-For example:</p>
-<p class="listing"> int ; // WARNING<br />
- int i; // OK</p>
-<p> The Empty Declarations setting corresponds to the pragma <a href="../pragmas/p_warn_emptydecl.htm">warn_emptydecl</a>. To check this setting, use <span class="code">__option (warn_emptydecl)</span>.</p>
-<p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Empty Declarations</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Empty Declarations</h3>
+<p> If you enable the Empty Declarations setting, the compiler issues a warning when it encounters a declaration with no variable name. <br />
+For example:</p>
+<p class="listing"> int ; // WARNING<br />
+ int i; // OK</p>
+<p> The Empty Declarations setting corresponds to the pragma <a href="../pragmas/p_warn_emptydecl.htm">warn_emptydecl</a>. To check this setting, use <span class="code">__option (warn_emptydecl)</span>.</p>
+<p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_extra_commas.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_extra_commas.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Extra Commas</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Extra Commas</h3>
-<p> If you enable the Extra Commas setting, the compiler generates a warning when it encounters an extra comma. For example, this statement is legal in C but generates a warning when you enable this setting:</p>
-<p class="listing"> int a[] = { 1, 2, 3, 4, }; // ^ WARNING: Extra comma after 4</p>
-<p> The Extra Commas setting corresponds to the pragma <a href="../pragmas/p_warn_extracomma.htm">warn_extracomma</a>. To check this setting, use <span class="code">__option (warn_extracomma)</span>.</p>
-<p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Extra Commas</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Extra Commas</h3>
+<p> If you enable the Extra Commas setting, the compiler generates a warning when it encounters an extra comma. For example, this statement is legal in C but generates a warning when you enable this setting:</p>
+<p class="listing"> int a[] = { 1, 2, 3, 4, }; // ^ WARNING: Extra comma after 4</p>
+<p> The Extra Commas setting corresponds to the pragma <a href="../pragmas/p_warn_extracomma.htm">warn_extracomma</a>. To check this setting, use <span class="code">__option (warn_extracomma)</span>.</p>
+<p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_hidden_virtual_fn.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_hidden_virtual_fn.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Hidden Virtual Functions</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Hidden Virtual Functions</h3>
-<p> If you enable the Hidden virtual functions setting, the compiler generates a warning if you declare a non-virtual member function in a subclass that hides an inherited virtual function in a superclass. One function hides another if it has the same name but a different argument type. An example of hidden virtual functions:</p>
-<div class="listing">
- <p>class A {<br />
- public:<br />
- virtual void f(int);<br />
- virtual void g(int);<br />
- };</p>
- <p>class B: public A {<br />
- public:<br />
- void f(char); // WARNING: Hides A::f(int)<br />
- virtual void g(int); // OK: Overrides A::g(int)<br />
- }; </p>
-</div>
-<p>The Hidden virtual functions setting corresponds to the pragma <a href="../pragmas/p_warn_hidevirtual.htm">warn_hidevirtual</a>. To check this setting, use <span class="code">__option (warn_hidevirtual)</span>.</p>
-<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Hidden Virtual Functions</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Hidden Virtual Functions</h3>
+<p> If you enable the Hidden virtual functions setting, the compiler generates a warning if you declare a non-virtual member function in a subclass that hides an inherited virtual function in a superclass. One function hides another if it has the same name but a different argument type. An example of hidden virtual functions:</p>
+<div class="listing">
+ <p>class A {<br />
+ public:<br />
+ virtual void f(int);<br />
+ virtual void g(int);<br />
+ };</p>
+ <p>class B: public A {<br />
+ public:<br />
+ void f(char); // WARNING: Hides A::f(int)<br />
+ virtual void g(int); // OK: Overrides A::g(int)<br />
+ }; </p>
+</div>
+<p>The Hidden virtual functions setting corresponds to the pragma <a href="../pragmas/p_warn_hidevirtual.htm">warn_hidevirtual</a>. To check this setting, use <span class="code">__option (warn_hidevirtual)</span>.</p>
+<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_ignore_fn.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_ignore_fn.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Ignored Function Results</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3> Ignored Function Results</h3>
-<p> If you enable the pragma <a href="../pragmas/p_warn_resultnotused.htm">warn_resultnotused</a>, the compiler issues a warning when it encounters a statement that calls a function without using its result. To prevent this warning, cast the statement with (void). See Listing 6.13 for an example.</p>
-<div class="listing">
- <h5>Listing 6.13 Example of Pragma warn_resultnotused</h5>
- <p>#pragma warn_resultnotused on<br />
- void foo(int a,int b)<br />
- {<br />
- bar(); // warning: result of bar() is not used<br />
- (void)bar(); // void cast suppresses warning<br />
- }<br />
- </p>
-</div>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Ignored Function Results</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3> Ignored Function Results</h3>
+<p> If you enable the pragma <a href="../pragmas/p_warn_resultnotused.htm">warn_resultnotused</a>, the compiler issues a warning when it encounters a statement that calls a function without using its result. To prevent this warning, cast the statement with (void). See Listing 6.13 for an example.</p>
+<div class="listing">
+ <h5>Listing 6.13 Example of Pragma warn_resultnotused</h5>
+ <p>#pragma warn_resultnotused on<br />
+ void foo(int a,int b)<br />
+ {<br />
+ bar(); // warning: result of bar() is not used<br />
+ (void)bar(); // void cast suppresses warning<br />
+ }<br />
+ </p>
+</div>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_ill_pragmas.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_ill_pragmas.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Illegal Pragmas</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Illegal Pragmas</h3>
-<p> If you enable the Illegal Pragmas setting, the compiler issues a warning when it encounters a pragma it does not recognize. For example, the pragma statements below generate warnings with the Illegal Pragmas setting enabled:</p>
-<p class="listing">#pragma near_data off // WARNING: near_data is not a pragma.<br />
- #pragma far_data select // WARNING: select is not defined<br />
-#pragma far_data on // OK</p>
-<p>The Illegal Pragmas setting corresponds to the pragma warn_illpragma, described at <a href="../pragmas/p_warn_illpragma.htm">warn_illpragma</a>”. To check this setting, use <span class="code">__option (warn_illpragma)</span>.</p>
-<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Illegal Pragmas</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Illegal Pragmas</h3>
+<p> If you enable the Illegal Pragmas setting, the compiler issues a warning when it encounters a pragma it does not recognize. For example, the pragma statements below generate warnings with the Illegal Pragmas setting enabled:</p>
+<p class="listing">#pragma near_data off // WARNING: near_data is not a pragma.<br />
+ #pragma far_data select // WARNING: select is not defined<br />
+#pragma far_data on // OK</p>
+<p>The Illegal Pragmas setting corresponds to the pragma warn_illpragma, described at <a href="../pragmas/p_warn_illpragma.htm">warn_illpragma</a>”. To check this setting, use <span class="code">__option (warn_illpragma)</span>.</p>
+<p>See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_implicit_math.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_implicit_math.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,48 +1,48 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Implicit Arithmetic Conversions</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Implicit Arithmetic Conversions</h3>
-<p> The compiler converts values automatically from one type to another to perform some operations (ISO C, §3.2 and ISO C++, §4). These kinds of conversions are called “implicit conversions” because they are not explicitly stated in the source code. </p>
-<p>The rules the compiler follows for deciding when to apply implicit conversions sometimes gives results you do not expect. If you enable the Implicit Arithmetic Conversions setting, the compiler issues a warning when it applies implicit conversions: </p>
-<ul>
- <li>the destination of an operation is not large enough to hold all possible results</li>
- <li>a signed value is implicitly converted to an unsigned value</li>
- <li>an integer value is implicitly converted to a floating-point value</li>
- <li>a floating-point value is implicitly converted to an integer value</li>
-</ul>
-<p>For example, assigning the value of a variable of type long to a variable of type char results in a warning if you enable this setting.</p>
-<p>The compiler also has pragmas that control specific of implicit conversions the compiler warns about (Table 6.1).</p>
-<h5>Table 6.1 Implicit Arithmetic Conversion Pragmas</h5>
-<table width="90%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="28%" scope="col">This pragma…</th>
- <th width="72%" scope="col">Warns about this kind of conversion</th>
- </tr>
- <tr>
- <td class="code">warn_illunionmembers</td>
- <td>a floating point value to an integer value</td>
- </tr>
- <tr>
- <td class="code">warn_impl_i2f_conv</td>
- <td>an integer value to a floating-point value</td>
- </tr>
- <tr>
- <td class="code">warn_impl_s2u_conv</td>
- <td>a signed value to an unsigned value</td>
- </tr>
- <tr>
- <td class="code">warn_implicitconv</td>
- <td>all; this pragma is equivalent to the Implicit Arithmetic Conversions setting</td>
- </tr>
-</table>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Implicit Arithmetic Conversions</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Implicit Arithmetic Conversions</h3>
+<p> The compiler converts values automatically from one type to another to perform some operations (ISO C, §3.2 and ISO C++, §4). These kinds of conversions are called “implicit conversions” because they are not explicitly stated in the source code. </p>
+<p>The rules the compiler follows for deciding when to apply implicit conversions sometimes gives results you do not expect. If you enable the Implicit Arithmetic Conversions setting, the compiler issues a warning when it applies implicit conversions: </p>
+<ul>
+ <li>the destination of an operation is not large enough to hold all possible results</li>
+ <li>a signed value is implicitly converted to an unsigned value</li>
+ <li>an integer value is implicitly converted to a floating-point value</li>
+ <li>a floating-point value is implicitly converted to an integer value</li>
+</ul>
+<p>For example, assigning the value of a variable of type long to a variable of type char results in a warning if you enable this setting.</p>
+<p>The compiler also has pragmas that control specific of implicit conversions the compiler warns about (Table 6.1).</p>
+<h5>Table 6.1 Implicit Arithmetic Conversion Pragmas</h5>
+<table width="90%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="28%" scope="col">This pragma…</th>
+ <th width="72%" scope="col">Warns about this kind of conversion</th>
+ </tr>
+ <tr>
+ <td class="code">warn_illunionmembers</td>
+ <td>a floating point value to an integer value</td>
+ </tr>
+ <tr>
+ <td class="code">warn_impl_i2f_conv</td>
+ <td>an integer value to a floating-point value</td>
+ </tr>
+ <tr>
+ <td class="code">warn_impl_s2u_conv</td>
+ <td>a signed value to an unsigned value</td>
+ </tr>
+ <tr>
+ <td class="code">warn_implicitconv</td>
+ <td>all; this pragma is equivalent to the Implicit Arithmetic Conversions setting</td>
+ </tr>
+</table>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_inline_fn.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_inline_fn.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,19 +1,19 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>inline Functions That Are Not Inlined</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>inline Functions That Are Not Inlined</h3>
-<p> If you enable the Non-Inlined Functions setting, the compiler issues a warning when it cannot inline a function.</p>
-<p>This setting corresponds to pragma warn_notinlined. To check this setting, use <span class="code">__option (warn_notinlined)</span>.</p>
-<p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>inline Functions That Are Not Inlined</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>inline Functions That Are Not Inlined</h3>
+<p> If you enable the Non-Inlined Functions setting, the compiler issues a warning when it cannot inline a function.</p>
+<p>This setting corresponds to pragma warn_notinlined. To check this setting, use <span class="code">__option (warn_notinlined)</span>.</p>
+<p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_mixed_use.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_mixed_use.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Mixed Use of ‘class’ and ‘struct’ Keywords</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Mixed Use of ‘class’ and ‘struct’ Keywords</h3>
-<p> If you enable the Inconsistent ‘class’ / ‘struct’ Usage setting, the compiler issues a warning if you use the class and struct keywords in the definition and declaration of the same identifier.</p>
-<p class="listing">class X;<br />
- struct X { int a; }; // warning</p>
-<p>Use this warning when using static or dynamic libraries to link with object code produced by another C++ compiler that distinguishes between class and structure variables in its name “mangling.”</p>
-<p> This setting corresponds to pragma <a href="../pragmas/p_warn_structclass.htm">warn_structclass</a>. To check this setting, use <span class="code">__option (warn_structclass)</span>.</p>
-<p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Mixed Use of ‘class’ and ‘struct’ Keywords</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Mixed Use of ‘class’ and ‘struct’ Keywords</h3>
+<p> If you enable the Inconsistent ‘class’ / ‘struct’ Usage setting, the compiler issues a warning if you use the class and struct keywords in the definition and declaration of the same identifier.</p>
+<p class="listing">class X;<br />
+ struct X { int a; }; // warning</p>
+<p>Use this warning when using static or dynamic libraries to link with object code produced by another C++ compiler that distinguishes between class and structure variables in its name “mangling.”</p>
+<p> This setting corresponds to pragma <a href="../pragmas/p_warn_structclass.htm">warn_structclass</a>. To check this setting, use <span class="code">__option (warn_structclass)</span>.</p>
+<p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_realigned_data.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_realigned_data.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Realigned Data Structures</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Realigned Data Structures</h3>
-<p> If you enable the pragma <a href="../pragmas/p_warn_padding.htm">warn_padding</a>, the compiler warns about any bytes it adds to data structures to improve their memory alignment. Refer to the appropriate Targeting manual for more information on how the compiler pads data structures for a particular processor or operating system.</p>
-<p>This pragma reports warnings for C source code only. It does not report warnings for C++ source code.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Realigned Data Structures</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Realigned Data Structures</h3>
+<p> If you enable the pragma <a href="../pragmas/p_warn_padding.htm">warn_padding</a>, the compiler warns about any bytes it adds to data structures to improve their memory alignment. Refer to the appropriate Targeting manual for more information on how the compiler pads data structures for a particular processor or operating system.</p>
+<p>This pragma reports warnings for C source code only. It does not report warnings for C++ source code.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_redundent.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_redundent.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Redundant Statements</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Redundant Statements</h3>
-<p> If you enable the pragma <a href="../pragmas/p_warn_no_side_effect.htm">warn_no_side_effect</a>, the compiler issues a warning when it encounters a statement that produces no side effect. To prevent a statement with no side effects from signalling this warning, cast the statement with (void). See Listing 6.12 for an example.</p>
-<div class="listing">
- <h5>Listing 6.12 Example of Pragma warn_no_side_effect</h5>
- <p>#pragma warn_no_side_effect on<br />
- void foo(int a,int b)<br />
- {<br />
- a+b; // warning: expression has no side effect<br />
- (void)(a+b); // void cast suppresses warning<br />
- }<br />
- </p>
-</div>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Redundant Statements</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Redundant Statements</h3>
+<p> If you enable the pragma <a href="../pragmas/p_warn_no_side_effect.htm">warn_no_side_effect</a>, the compiler issues a warning when it encounters a statement that produces no side effect. To prevent a statement with no side effects from signalling this warning, cast the statement with (void). See Listing 6.12 for an example.</p>
+<div class="listing">
+ <h5>Listing 6.12 Example of Pragma warn_no_side_effect</h5>
+ <p>#pragma warn_no_side_effect on<br />
+ void foo(int a,int b)<br />
+ {<br />
+ a+b; // warning: expression has no side effect<br />
+ (void)(a+b); // void cast suppresses warning<br />
+ }<br />
+ </p>
+</div>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_suspicious_assgn.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_suspicious_assgn.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,64 +1,64 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Suspicious Assignments and Incorrect Function Returns</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Suspicious Assignments and Incorrect Function Returns</h3>
-<p> If you enable the Extended Error Checking setting, the C compiler generates a warning if it encounters one of the following potential problems:</p>
-<ul>
- <li>A non-void function that does not contain a return statement. For example, the source code in Listing 1 generates a warning.</li>
-</ul>
-<blockquote>
- <div class="listing">
- <p>Listing 1. Non-void Function with no return Statement</p>
- <p>main() /* assumed to return int */<br />
- {<br />
- printf ("hello world\n");<br />
- } /* WARNING: no return statement */<br />
- Listing 6.8 does not generate a warning.<br />
- Listing 6.8 Explicitly Specifying a Function’s void Return Type<br />
- void main() /* function declared to return void */<br />
- {<br />
- printf ("hello world\n");<br />
- }<br />
- </p>
- </div>
-</blockquote>
-<ul>
- <li>An integer or floating-point value assigned to an enum type. Listing 2 shows an example.
- </li>
-</ul>
-<blockquote>
- <div class="listing">
- <h5>Listing 2. Assigning to an Enumerated Type</h5>
- <p>enum Day { Sunday, Monday, Tuesday, Wednesday, <br />
- Thursday, Friday, Saturday } d;</p>
- <p>d = 5; /* WARNING */<br />
- d = Monday; /* OK */<br />
- d = (Day)3 ; /* OK */<br />
-• An empty return statement in a function that is not declared void. For example, the following code results in a warning:<br />
- int MyInit(void)<br />
- {<br />
- int err = GetMyResources();<br />
- if (err!=0) return; /* ERROR: Empty return statement */</p>
- <p> /* ... */<br />
- This is OK:<br />
- int MyInit(void)<br />
- {<br />
- int err = GetMyResources();<br />
- if (err!=0) return -1; /* OK */</p>
- <p> /* ... */</p>
- </div>
-</blockquote>
-<p> The Extended Error Checking setting corresponds to the pragma <span class="code">extended_errorcheck</span>, described at <a href="../pragmas/p_extended_errorcheck.htm">extended_errorcheck</a>. To check this setting, use <span class="code">__option (extended_errorcheck)</span>.</p>
-<p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Suspicious Assignments and Incorrect Function Returns</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Suspicious Assignments and Incorrect Function Returns</h3>
+<p> If you enable the Extended Error Checking setting, the C compiler generates a warning if it encounters one of the following potential problems:</p>
+<ul>
+ <li>A non-void function that does not contain a return statement. For example, the source code in Listing 1 generates a warning.</li>
+</ul>
+<blockquote>
+ <div class="listing">
+ <p>Listing 1. Non-void Function with no return Statement</p>
+ <p>main() /* assumed to return int */<br />
+ {<br />
+ printf ("hello world\n");<br />
+ } /* WARNING: no return statement */<br />
+ Listing 6.8 does not generate a warning.<br />
+ Listing 6.8 Explicitly Specifying a Function’s void Return Type<br />
+ void main() /* function declared to return void */<br />
+ {<br />
+ printf ("hello world\n");<br />
+ }<br />
+ </p>
+ </div>
+</blockquote>
+<ul>
+ <li>An integer or floating-point value assigned to an enum type. Listing 2 shows an example.
+ </li>
+</ul>
+<blockquote>
+ <div class="listing">
+ <h5>Listing 2. Assigning to an Enumerated Type</h5>
+ <p>enum Day { Sunday, Monday, Tuesday, Wednesday, <br />
+ Thursday, Friday, Saturday } d;</p>
+ <p>d = 5; /* WARNING */<br />
+ d = Monday; /* OK */<br />
+ d = (Day)3 ; /* OK */<br />
+• An empty return statement in a function that is not declared void. For example, the following code results in a warning:<br />
+ int MyInit(void)<br />
+ {<br />
+ int err = GetMyResources();<br />
+ if (err!=0) return; /* ERROR: Empty return statement */</p>
+ <p> /* ... */<br />
+ This is OK:<br />
+ int MyInit(void)<br />
+ {<br />
+ int err = GetMyResources();<br />
+ if (err!=0) return -1; /* OK */</p>
+ <p> /* ... */</p>
+ </div>
+</blockquote>
+<p> The Extended Error Checking setting corresponds to the pragma <span class="code">extended_errorcheck</span>, described at <a href="../pragmas/p_extended_errorcheck.htm">extended_errorcheck</a>. To check this setting, use <span class="code">__option (extended_errorcheck)</span>.</p>
+<p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_unused_args.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_unused_args.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,46 +1,46 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Unused Arguments</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Unused Arguments</h3>
-<p> If you enable the Unused Arguments setting, the compiler generates a warning when it encounters an argument you declare but do not use. This check helps you find arguments that you either misspelled or did not use in your program.</p>
-<p class="listing">void foo(int temp,int errer); // ERROR: errer is misspelled<br />
- {<br />
- error = do_something(); // WARNING: temp and error are<br />
- // unused.<br />
-} </p>
-<p>You can declare an argument that you do not use in two ways without receiving this warning:</p>
-<ul>
- <li>Use the pragma unused, as in this example:</li>
-</ul>
-<blockquote>
- <p class="listing">void foo(int temp, int error)<br />
- {<br />
- #pragma unused (temp)<br />
- /* Compiler does not warn that temp is not used */<br />
- error=do_something();<br />
- }</p>
-</blockquote>
-<ul>
- <li>Disable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting and do not give the unused argument a name. (See <a href="../c_compiler/c_unnamed_args.htm">Unnamed Arguments in Function Definitions</a>.) An example of Unused, Unnamed Arguments:</li>
-</ul>
-<blockquote>
- <p class="listing">void foo(int /* temp */, int error)<br />
- {<br />
- /* Compiler does not warn that "temp" is not used.<br />
- error=do_something(); */<br />
- }</p>
-</blockquote>
-<p>The Unused Arguments setting corresponds to the pragma warn_unusedarg, described at <a href="../pragmas/p_warn_unusedarg.htm">warn_unusedarg</a>. To check this setting, use <span class="code">__option (warn_unusedarg)</span>.</p>
-<p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Unused Arguments</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Unused Arguments</h3>
+<p> If you enable the Unused Arguments setting, the compiler generates a warning when it encounters an argument you declare but do not use. This check helps you find arguments that you either misspelled or did not use in your program.</p>
+<p class="listing">void foo(int temp,int errer); // ERROR: errer is misspelled<br />
+ {<br />
+ error = do_something(); // WARNING: temp and error are<br />
+ // unused.<br />
+} </p>
+<p>You can declare an argument that you do not use in two ways without receiving this warning:</p>
+<ul>
+ <li>Use the pragma unused, as in this example:</li>
+</ul>
+<blockquote>
+ <p class="listing">void foo(int temp, int error)<br />
+ {<br />
+ #pragma unused (temp)<br />
+ /* Compiler does not warn that temp is not used */<br />
+ error=do_something();<br />
+ }</p>
+</blockquote>
+<ul>
+ <li>Disable the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting and do not give the unused argument a name. (See <a href="../c_compiler/c_unnamed_args.htm">Unnamed Arguments in Function Definitions</a>.) An example of Unused, Unnamed Arguments:</li>
+</ul>
+<blockquote>
+ <p class="listing">void foo(int /* temp */, int error)<br />
+ {<br />
+ /* Compiler does not warn that "temp" is not used.<br />
+ error=do_something(); */<br />
+ }</p>
+</blockquote>
+<p>The Unused Arguments setting corresponds to the pragma warn_unusedarg, described at <a href="../pragmas/p_warn_unusedarg.htm">warn_unusedarg</a>. To check this setting, use <span class="code">__option (warn_unusedarg)</span>.</p>
+<p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_unused_vars.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/errors/err_unused_vars.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,44 +1,44 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Unused Variables</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Unused Variables</h3>
-<p> If you enable the Unused Variables setting, the compiler generates a warning when it encounters a local variable you declare but do not use. This check helps you find variables that you either misspelled or did not use in your program. Listing 1 shows an example.</p>
-<div class="listing">
- <h5>Listing 1. Unused Local Variables Example</h5>
- <p>int error;<br />
- void foo(void)<br />
- {<br />
- int temp, errer; // ERROR: errer is misspelled<br />
- error = do_something() <br />
- // WARNING: temp and error are unused.<br />
- }</p>
-</div>
- <p>If you want to use this warning but need to declare a variable that you do not use, include the pragma unused, as in Listing 2.</p>
- <div class="listing">
- <h5>Listing 2. Suppressing Unused Variable Warnings</h5>
- <p>void foo(void)<br />
- {<br />
- int i, temp, error;</p>
- <p> #pragma unused (i, temp) /* Do not warn that i and temp */<br />
- error=do_something(); /* are not used */<br />
- }</p>
- </div>
- <p> The Unused Variables setting corresponds to the pragma <span class="code">warn_unusedvar</span>, described at <span class="code">warn_unusedvar</span>. To check this setting, use <span class="code">__option (warn_unusedvar)</span>.</p>
- <p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive. <br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Unused Variables</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style1 {font-family: "Courier New", Courier, mono}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Unused Variables</h3>
+<p> If you enable the Unused Variables setting, the compiler generates a warning when it encounters a local variable you declare but do not use. This check helps you find variables that you either misspelled or did not use in your program. Listing 1 shows an example.</p>
+<div class="listing">
+ <h5>Listing 1. Unused Local Variables Example</h5>
+ <p>int error;<br />
+ void foo(void)<br />
+ {<br />
+ int temp, errer; // ERROR: errer is misspelled<br />
+ error = do_something() <br />
+ // WARNING: temp and error are unused.<br />
+ }</p>
+</div>
+ <p>If you want to use this warning but need to declare a variable that you do not use, include the pragma unused, as in Listing 2.</p>
+ <div class="listing">
+ <h5>Listing 2. Suppressing Unused Variable Warnings</h5>
+ <p>void foo(void)<br />
+ {<br />
+ int i, temp, error;</p>
+ <p> #pragma unused (i, temp) /* Do not warn that i and temp */<br />
+ error=do_something(); /* are not used */<br />
+ }</p>
+ </div>
+ <p> The Unused Variables setting corresponds to the pragma <span class="code">warn_unusedvar</span>, described at <span class="code">warn_unusedvar</span>. To check this setting, use <span class="code">__option (warn_unusedvar)</span>.</p>
+ <p> See <a href="../symbols/sym_settings.htm">Checking Option Settings</a> for information on how to use this directive. <br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
Binary file core/com.nokia.carbide.cpp.compiler.doc.user/html/images/about.png has changed
Binary file core/com.nokia.carbide.cpp.compiler.doc.user/html/images/about_cpp.png has changed
Binary file core/com.nokia.carbide.cpp.compiler.doc.user/html/images/gold_header.png has changed
Binary file core/com.nokia.carbide.cpp.compiler.doc.user/html/images/mwccsym2_version.png has changed
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/conventions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/conventions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,44 +1,44 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Conventions Used in This Reference</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Conventions Used in This Reference</h2>
-<p>References to a chapter or section number in The C International Standard (ISO/IEC 9899:1999) appear as (ISO C, §number).</p>
-<p>References to a chapter or section number in The C++ International Standard (ISO/IEC: 14882) appear as (ISO C++, §number).</p>
-<p>This manual also uses syntax examples that describe the format of C source code statements:</p>
-<p class="listing">#pragma parameter [return-reg] func-name [param-regs] </p>
-<p class="listing">#pragma optimize_for_size on | off | reset</p>
-<p>Table 1. describes how to interpret these statements.</p>
-<h4>Table 1. Understanding Syntax Examples</h4>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="31%" scope="col">If the text looks like…</th>
- <th width="69%" scope="col">Then…</th>
- </tr>
- <tr>
- <td class="code">literal</td>
- <td>Include the text in your statement exactly as you see it.</td>
- </tr>
- <tr>
- <td class="code">metasymbol</td>
- <td>Replace the symbol with an appropriate value. The text after the syntax example describes what the appropriate values are.</td>
- </tr>
- <tr>
- <td class="code">a | b | c</td>
- <td>Use one of the symbols in the statement: either <span class="code">a</span>, <span class="code">b</span>, or <span class="code">c</span>.</td>
- </tr>
- <tr>
- <td class="code">[a]</td>
- <td>Include the symbol, <span class="code">a</span>, only if necessary. The text after the syntax example describes when to include it.</td>
- </tr>
-</table>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Conventions Used in This Reference</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Conventions Used in This Reference</h2>
+<p>References to a chapter or section number in The C International Standard (ISO/IEC 9899:1999) appear as (ISO C, §number).</p>
+<p>References to a chapter or section number in The C++ International Standard (ISO/IEC: 14882) appear as (ISO C++, §number).</p>
+<p>This manual also uses syntax examples that describe the format of C source code statements:</p>
+<p class="listing">#pragma parameter [return-reg] func-name [param-regs] </p>
+<p class="listing">#pragma optimize_for_size on | off | reset</p>
+<p>Table 1. describes how to interpret these statements.</p>
+<h4>Table 1. Understanding Syntax Examples</h4>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="31%" scope="col">If the text looks like…</th>
+ <th width="69%" scope="col">Then…</th>
+ </tr>
+ <tr>
+ <td class="code">literal</td>
+ <td>Include the text in your statement exactly as you see it.</td>
+ </tr>
+ <tr>
+ <td class="code">metasymbol</td>
+ <td>Replace the symbol with an appropriate value. The text after the syntax example describes what the appropriate values are.</td>
+ </tr>
+ <tr>
+ <td class="code">a | b | c</td>
+ <td>Use one of the symbols in the statement: either <span class="code">a</span>, <span class="code">b</span>, or <span class="code">c</span>.</td>
+ </tr>
+ <tr>
+ <td class="code">[a]</td>
+ <td>Include the symbol, <span class="code">a</span>, only if necessary. The text after the syntax example describes when to include it.</td>
+ </tr>
+</table>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/documentation.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/documentation.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Where to Look for Related Information</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Where to Look for Related Information</h2>
-<p>Additional information on programming for the Symbian OS using Carbide.c++ and SDKs can be found at: </p>
-<ul>
- <li><a href="http://www.forum.nokia.com/main/0,6566,1_84,00.html">Carbide.c++</a></li>
- <li><a href="http://www.symbian.com">Symbian OS</a></li>
- <li><a href="http://www.forum.nokia.com/main/0,6566,033,00.html">S60 SDKs</a></li>
- <li><a href="http://developer.uiq.com/">UIQ SDKs</a></li>
-</ul>
-<p>For general information on using the Carbide IDE and debugger, see the <strong>Carbide.c++ User Guide</strong>. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Where to Look for Related Information</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Where to Look for Related Information</h2>
+<p>Additional information on programming for the Symbian OS using Carbide.c++ and SDKs can be found at: </p>
+<ul>
+ <li><a href="http://www.forum.nokia.com/Library/Tools_and_downloads/Other/Carbide.c++/">Carbide.c++</a></li>
+ <li><a href="http://dev.symbian.com">Symbian OS</a></li>
+ <li><a href="http://www.forum.nokia.com/Develop/Other_Technologies/Symbian_C++/Tools/">S60 SDKs</a></li>
+ <li><a href="http://www.forum.nokia.com/Develop/Qt/">Qt SDKs</a></li>
+</ul>
+<p>For general information on using the Carbide IDE and debugger, see the <strong>Carbide.c++ User Guide</strong>. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/intro.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/intro.htm Wed Jul 21 12:11:48 2010 -0500
@@ -26,7 +26,7 @@
<li><a href="conventions.htm">Conventions Used in this Reference</a></li>
</ul>
<p></p>
- <div id="footer">Copyright © 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></div>
+ <div id="footer">Copyright © 2010 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></div>
</body>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/new_features.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/new_features.htm Wed Jul 21 12:11:48 2010 -0500
@@ -5,11 +5,50 @@
<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
<title>New Features & Bug Fixes</title>
<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style5 {color: #FF0000}
+-->
+</style>
</head>
<body bgcolor="#FFFFFF">
<h2>New Features & Bug Fixes</h2>
-<p>A list of bug fixes for the compiler and linker can be found in the <span class="code">Symbian_x86_BuildTools_Notes.txt</span> file located in the <span class="code"><Carbide_Install_Dir>\x86Build\Release_Notes</span> directory.</p>
+<p>A list of bug fixes for the compiler and linker can be found in the <span class="code">Symbian_x86_BuildTools_Notes.txt</span> file located in the <span class="code"><Carbide_Install_Dir>\x86Build\Release_Notes</span> directory. The latest build information is always available on the Symbian Foundation Wiki under <a href="http://developer.symbian.org/wiki/index.php/Category:C/C++/WINSCW">WINSCW (build version information)</a>.</p>
<p>This reference has new and updated topics:</p>
+<h5>3.2.5 Build 489</h5>
+<ul>
+ <li>Corrected an issue that prevented compiling of files with different case handling across different OS systems.</li>
+</ul>
+<h5>3.2.5 Build 488</h5>
+<ul>
+ <li> Fixed an issue where a <span class="code">const</span> exception is thrown but it was not getting caught by a non <span class="code">const catch</span> block.</li>
+ <li>Fixed an internal compiler error in floating point code generation during optimization.</li>
+</ul>
+<h5>3.2.5 Build 487</h5>
+<ul>
+ <li><span class="style5"><b>IMPORTANT WINSCW COMPILER</b></span> change - the WINSCW compiler 3.2.5 build 487 provides new name mangling to support critical exception handling. Without this change an exception can cause a program or system crash. For more information visit the <a href="http://developer.symbian.org/wiki/index.php/Category:C/C++/WINSCW">WINSCW</a> wiki page. <br>
+ </li>
+ <li>Made "<span class="code">-def_for_structclass on</span>" the default.</li>
+</ul>
+<h5>3.2.5 Build 486</h5>
+<ul>
+ <li>Fixed a C file compile error when assigning a DLL import function name to a function pointer.</li>
+</ul>
+<h5>3.2.5 Build 485</h5>
+<ul>
+ <li>Fixed a codegen bug when a bit field object with post-decrement is used as a while loop counter.</li>
+</ul>
+<h5>3.2.5 Build 482</h5>
+<ul>
+ <li>Fixed a bad assert flagging false an internal compiler error.</li>
+</ul>
+<h5>3.2.5 Build 481</h5>
+<ul>
+ <li>Default constructor initialized to zero to comply with C++ standard §5.3.4.15.</li>
+ <li>Fixed an issue for bad relocation type in reference to the destructor of an imported class from a DLL.</li>
+ <li>Reverted bugfix on the issue around forward declaration in class/struct conflicting with definition, we added a new command line switch <span class="code">-def_for_structclass on</span>, and <span class="code">#pragma def_for_structclass</span> for the picking up the definition instead of forward declaration.</li>
+</ul>
+<h4>Previous releases</h4>
<ul>
<li>See pragma <a href="../pragmas/p_gcc_extensions.htm">gcc_extensions </a>for GCC improvements</li>
<li>See pragma <a href="../pragmas/p_c99.htm">c99</a> for C99 improvements</li>
@@ -134,7 +173,7 @@
<li>Information in this manual now uses references to the ISO C and C++ standards instead of Ellis and Stroustrup’s The Annotated C++ Reference Manual (ARM) and Kernighan and Richie’s The C Programming Language (K&R).<br />
</li>
</ul>
-<div id="footer">Copyright © 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></div>
+<div id="footer">Copyright © 2010 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></div>
</body>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/version.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/version.htm Wed Jul 21 12:11:48 2010 -0500
@@ -10,7 +10,7 @@
<h2>Verifying the Compiler Version</h2>
<p>To determine what version of the Carbide.c++ compiler you are using, follow the steps below.</p>
<p class="note"><b>NOTE</b> The Carbide.c++ compiler is stored in <span class="code"><Carbide_Install_Dir>\x86Build\Symbian_Tools\Command_Line_Tools</span>.</p>
-<p align="center"><img src="../images/mwccsym2_version.png" width="669" height="178"></p>
+<p align="center"><img src="../images/mwccsym2_version.png" width="709" height="199"></p>
<p class="figure">Figure 1. Getting compiler version using Command Prompt.</p>
<div class="step">
<h4>From the Carbide IDE</h4>
@@ -48,7 +48,7 @@
</p></ol>
</div>
<p></p>
-<div id="footer">Copyright © 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></div>
+<div id="footer">Copyright © 2010 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></div>
</body>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/legal.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/legal.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,34 +1,34 @@
-<!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>Legal</title>
- <link href="../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h3>License Information</h3>
-<h5>COPYRIGHTS</h5>
-<p>Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
-<h5>NOTICES</h5>
-<p>Portions of this product are covered by the following licenses:</p>
-<ul>
- <li>Eclipse 3.4 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
- <li>Eclipse CDT 5.0 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
- <li>Eclipse EMF 2.3 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>) </li>
- <li>Eclipse GEF 3.3 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>) </li>
- <li>Eclipse Remote System Explorer-1.0 (available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)</li>
- <li>Eclipse System Search (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
- <li>Apache Xerces-2.2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>) </li>
- <li>Apache Batick-1.6 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Apache HttpClient (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Mozilla Rhino 1.5r2 (available at <a href="http://www.mozilla.org/NPL/">http://www.mozilla.org/NPL/</a>) </li>
- <li>OmniORB-4.0.4 (available at <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>) </li>
- <li>GNU Binutils (available at <a href="http://sources.redhat.com/binutils/">http://sources.redhat.com/binutils/</a>)</li>
- <li>Python 2.5.1 (available from <a href="http://www.python.org/download/releases/2.5/license/">http://www.python.org/download/releases/2.5/license/</a>) </li>
- <li>Psyco 1.5.2 (available from <a href="http://www.opensource.org/licenses/mit-license.php">http://www.opensource.org/licenses/mit-license.php</a>) </li>
-</ul>
-<p> </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>Legal</title>
+ <link href="../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h3>License Information</h3>
+<h5>COPYRIGHTS</h5>
+<p>Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
+<h5>NOTICES</h5>
+<p>Portions of this product are covered by the following licenses:</p>
+<ul>
+ <li>Eclipse 3.6 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
+ <li>Eclipse CDT 7.0 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
+ <li>Eclipse EMF 2.3 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>) </li>
+ <li>Eclipse GEF 3.3 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>) </li>
+ <li>Eclipse Remote System Explorer-1.0 (available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)</li>
+ <li>Eclipse System Search (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
+ <li>Apache Xerces-2.2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>) </li>
+ <li>Apache Batick-1.6 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Apache HttpClient (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Mozilla Rhino 1.5r2 (available at <a href="http://www.mozilla.org/NPL/">http://www.mozilla.org/NPL/</a>) </li>
+ <li>OmniORB-4.0.4 (available at <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>) </li>
+ <li>GNU Binutils (available at <a href="http://sources.redhat.com/binutils/">http://sources.redhat.com/binutils/</a>)</li>
+ <li>Python 2.5.1 (available from <a href="http://www.python.org/download/releases/2.5/license/">http://www.python.org/download/releases/2.5/license/</a>) </li>
+ <li>Psyco 1.5.2 (available from <a href="http://www.opensource.org/licenses/mit-license.php">http://www.opensource.org/licenses/mit-license.php</a>) </li>
+ </ul>
+<p> </p>
+</body>
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_inst_manager.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_inst_manager.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,17 +1,17 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Use Instance Manager</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Use Instance Manager</h3>
-<p>The Use Instance Manager option reduces compile time by telling the compiler to generate any instance of a template (or non-inlined inline) function only once. Object code size and associated debug information size is reduced. This does not affect the output file size, though, since the compiler is effectively doing the same task as the linker in this mode.</p>
-<p>You can control where the instance database is stored using the<span class="code"> #pragma <a href="../pragmas/p_instmgr_file.htm">instmgr_file</a></span>. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Use Instance Manager</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Use Instance Manager</h3>
+<p>The Use Instance Manager option reduces compile time by telling the compiler to generate any instance of a template (or non-inlined inline) function only once. Object code size and associated debug information size is reduced. This does not affect the output file size, though, since the compiler is effectively doing the same task as the linker in this mode.</p>
+<p>You can control where the instance database is stored using the<span class="code"> #pragma <a href="../pragmas/p_instmgr_file.htm">instmgr_file</a></span>. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_pragma_scope.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_pragma_scope.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Pragma Scope in Precompiled Files</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Pragma Scope in Precompiled Files</h3>
-<p>Pragma settings inside a precompiled file affect only the source code within that file. The pragma settings for an item declared in a precompiled header file (such as data or a function) are saved then restored when the precompiled header file is included.</p>
-<p>For example, the source code in Listing 5.3 specifies that the variable xxx is a far variable.</p>
-<div class="listing">
- <h5>Listing 5.3 Pragma Settings in a Precompiled Header</h5>
- <p>// my_pch.pch<br />
- // Generate a precompiled header named pch.mch.</p>
- <p>#pragma precompile_target "my_pch.mch" </p>
- <p>#pragma far_data on<br />
- extern int xxx;</p>
-</div>
-<p>The source code in Listing 5.4 includes the precompiled version of Listing 5.3.</p>
-<div class="listing">
- <h5>Listing 5.4 Pragma Settings in an Included Precompiled File</h5>
- <p>// test.c<br />
- #pragma far_data off // far data is disabled<br />
- #include "my_pch.mch" // this precompiled file sets far_data on<br />
- // far_data is still off but xxx is still a far variable</p>
-</div>
-<p>The pragma setting in the precompiled file is active within the precompiled file, even though the source file including the precompiled file has a different setting.
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Pragma Scope in Precompiled Files</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Pragma Scope in Precompiled Files</h3>
+<p>Pragma settings inside a precompiled file affect only the source code within that file. The pragma settings for an item declared in a precompiled header file (such as data or a function) are saved then restored when the precompiled header file is included.</p>
+<p>For example, the source code in Listing 5.3 specifies that the variable xxx is a far variable.</p>
+<div class="listing">
+ <h5>Listing 5.3 Pragma Settings in a Precompiled Header</h5>
+ <p>// my_pch.pch<br />
+ // Generate a precompiled header named pch.mch.</p>
+ <p>#pragma precompile_target "my_pch.mch" </p>
+ <p>#pragma far_data on<br />
+ extern int xxx;</p>
+</div>
+<p>The source code in Listing 5.4 includes the precompiled version of Listing 5.3.</p>
+<div class="listing">
+ <h5>Listing 5.4 Pragma Settings in an Included Precompiled File</h5>
+ <p>// test.c<br />
+ #pragma far_data off // far data is disabled<br />
+ #include "my_pch.mch" // this precompiled file sets far_data on<br />
+ // far_data is still off but xxx is still a far variable</p>
+</div>
+<p>The pragma setting in the precompiled file is active within the precompiled file, even though the source file including the precompiled file has a different setting.
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_precompiled_auto.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_precompiled_auto.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Updating a Precompiled File Automatically</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Updating a Precompiled File Automatically</h3>
-<p>Use the Carbide IDE’s project manager to update a precompiled header automatically. The IDE creates a precompiled file from a source code file during a compile, update, or make operation if the source code file meets these criteria:</p>
-<ul>
- <li>The text file name ends with .pch (for C header files) or .pch++ (for C++ header files)</li>
- <li> The file is in a project’s build target</li>
- <li>The file uses the pragma precompile_target pragma</li>
- <li>The file, or files it depends on, have been modified</li>
-</ul>
-<p class="fix">See the Carbide IDE User Guide for information on how the IDE determines that a file must be updated.</p>
-<p>The IDE uses the build target’s settings to preprocess and precompile files.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Updating a Precompiled File Automatically</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Updating a Precompiled File Automatically</h3>
+<p>Use the Carbide IDE’s project manager to update a precompiled header automatically. The IDE creates a precompiled file from a source code file during a compile, update, or make operation if the source code file meets these criteria:</p>
+<ul>
+ <li>The text file name ends with .pch (for C header files) or .pch++ (for C++ header files)</li>
+ <li> The file is in a project’s build target</li>
+ <li>The file uses the pragma precompile_target pragma</li>
+ <li>The file, or files it depends on, have been modified</li>
+</ul>
+<p class="fix">See the Carbide IDE User Guide for information on how the IDE determines that a file must be updated.</p>
+<p>The IDE uses the build target’s settings to preprocess and precompile files.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_precompiled_files.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_precompiled_files.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,19 +1,19 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>When to Use Precompiled Files</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>When to Use Precompiled Files</h3>
-<p>Source code files in a project typically use many header files. Typically, the same header files are included by each source code file in a project, forcing the compiler to read these same header files repeatedly during compilation. To shorten the time spent compiling and recompiling the same header files, Carbide C/C++ can precompile a header file, allowing it to be subsequently preprocessed much faster than a regular text source code file.</p>
-<p>For example, as a convenience, programmers often create a header file that contains commonly-used preprocessor definitions and includes frequently-used header files. This header file is then included by each source code file in the project, saving the programmer some time and effort while writing source code.</p>
-<p>This convenience comes at a cost, though. While the programmer saves time typing, the compiler does extra work, preprocessing and compiling this header file each time it compiles a source code file that includes it.</p>
-<p>This header file can be precompiled so that, instead of preprocessing multiple duplications, the compiler needs to load just one precompiled header file. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>When to Use Precompiled Files</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>When to Use Precompiled Files</h3>
+<p>Source code files in a project typically use many header files. Typically, the same header files are included by each source code file in a project, forcing the compiler to read these same header files repeatedly during compilation. To shorten the time spent compiling and recompiling the same header files, Carbide C/C++ can precompile a header file, allowing it to be subsequently preprocessed much faster than a regular text source code file.</p>
+<p>For example, as a convenience, programmers often create a header file that contains commonly-used preprocessor definitions and includes frequently-used header files. This header file is then included by each source code file in the project, saving the programmer some time and effort while writing source code.</p>
+<p>This convenience comes at a cost, though. While the programmer saves time typing, the compiler does extra work, preprocessing and compiling this header file each time it compiles a source code file that includes it.</p>
+<p>This header file can be precompiled so that, instead of preprocessing multiple duplications, the compiler needs to load just one precompiled header file. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_precompiled_ide.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_precompiled_ide.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Precompiling a File in the Carbide IDE</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Precompiling a File in the Carbide IDE</h3>
-<p>To precompile a file in the Carbide IDE, use the Precompile command in the Project menu:</p>
-<div class="step">
- <ol>
- <li> Start the Carbide IDE.</li>
- <li>Open or create a project.</li>
- <li>Choose or create a build target in the project.</li>
- <p>The settings in the project’s active build target will be used when preprocessing and precompiling the file you want to precompile.</p>
- <li>Open the source code file to precompile.</li>
- <p>See “What Can be Precompiled” for information on what a precompiled file may contain.</p>
- <li>From the Project menu, choose Precompile.</li>
- <p>A save dialog box appears.</p>
- <li>Choose a location and type a name for the new precompiled file.</li>
- <p>The IDE <a href="perf_precompiled_what.htm">precompiles</a> the file and saves it.</p>
- <li>Click Save.</li>
- <p>The save dialog box closes, and the IDE precompiles the file you opened, saving it in the folder you specified, giving it the name you specified.</p>
- </ol>
-</div>
-<p>You may now include the new precompiled file in source code files. </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Precompiling a File in the Carbide IDE</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Precompiling a File in the Carbide IDE</h3>
+<p>To precompile a file in the Carbide IDE, use the Precompile command in the Project menu:</p>
+<div class="step">
+ <ol>
+ <li> Start the Carbide IDE.</li>
+ <li>Open or create a project.</li>
+ <li>Choose or create a build target in the project.</li>
+ <p>The settings in the project’s active build target will be used when preprocessing and precompiling the file you want to precompile.</p>
+ <li>Open the source code file to precompile.</li>
+ <p>See “What Can be Precompiled” for information on what a precompiled file may contain.</p>
+ <li>From the Project menu, choose Precompile.</li>
+ <p>A save dialog box appears.</p>
+ <li>Choose a location and type a name for the new precompiled file.</li>
+ <p>The IDE <a href="perf_precompiled_what.htm">precompiles</a> the file and saves it.</p>
+ <li>Click Save.</li>
+ <p>The save dialog box closes, and the IDE precompiles the file you opened, saving it in the folder you specified, giving it the name you specified.</p>
+ </ol>
+</div>
+<p>You may now include the new precompiled file in source code files. </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_precompiled_using.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_precompiled_using.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,45 +1,45 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Using a Precompiled Header File</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Using a Precompiled Header File</h3>
-<p>Although a precompiled file is not a text file, you use it like you would a regular header file. To include a precompiled header file in a source code file, use the <span class="code">#include</span> directive.</p>
-<p class="note"><strong>NOTE</strong> Unlike regular header files in text format, a source code file may include only one precompiled file.</p>
-<p class="note"><strong>TIP</strong> Instead of explicitly including a precompiled file in each source code file with the<span class="code"> #include</span> directive, put the precompiled file name in the Prefix File field of the C/C++ Language settings panel. If the Prefix File field already specifies a file name, include the precompiled file in the prefix file with the <span class="code">#include</span> directive.</p>
-<p>Listing 5.1 and Listing 5.2 show an example.</p>
-<div class="listing">
- <h5>Listing 5.1 Header File that Creates a Precompiled Header File for C</h5>
- <p>// sock_header.pch<br />
- // When compiled or precompiled, this file will generate a <br />
- // precompiled file named "sock_precomp.mch"</p>
- <p>#pragma precompile_target "sock_precomp.mch"</p>
- <p>#define SOCK_VERSION "SockSorter 2.0"<br />
- #include "sock_std.h"<br />
- #include "sock_string.h"<br />
- #include "sock_sorter.h"</p>
-</div>
-<div class="listing">
- <h5>Listing 5.2 Using a Precompiled File</h5>
- <p>// sock_main.c<br />
- // Instead of including all the files included in <br />
- // sock_header.pch, we use sock_precomp.h instead.<br />
- //<br />
- // A precompiled file must be included before anything else.</p>
- <p>#include "sock_precomp.mch"</p>
- <p>int main(void)<br />
- {<br />
- // ...<br />
- return 0;<br />
- }
- </p>
-</div>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Using a Precompiled Header File</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Using a Precompiled Header File</h3>
+<p>Although a precompiled file is not a text file, you use it like you would a regular header file. To include a precompiled header file in a source code file, use the <span class="code">#include</span> directive.</p>
+<p class="note"><strong>NOTE</strong> Unlike regular header files in text format, a source code file may include only one precompiled file.</p>
+<p class="note"><strong>TIP</strong> Instead of explicitly including a precompiled file in each source code file with the<span class="code"> #include</span> directive, put the precompiled file name in the Prefix File field of the C/C++ Language settings panel. If the Prefix File field already specifies a file name, include the precompiled file in the prefix file with the <span class="code">#include</span> directive.</p>
+<p>Listing 5.1 and Listing 5.2 show an example.</p>
+<div class="listing">
+ <h5>Listing 5.1 Header File that Creates a Precompiled Header File for C</h5>
+ <p>// sock_header.pch<br />
+ // When compiled or precompiled, this file will generate a <br />
+ // precompiled file named "sock_precomp.mch"</p>
+ <p>#pragma precompile_target "sock_precomp.mch"</p>
+ <p>#define SOCK_VERSION "SockSorter 2.0"<br />
+ #include "sock_std.h"<br />
+ #include "sock_string.h"<br />
+ #include "sock_sorter.h"</p>
+</div>
+<div class="listing">
+ <h5>Listing 5.2 Using a Precompiled File</h5>
+ <p>// sock_main.c<br />
+ // Instead of including all the files included in <br />
+ // sock_header.pch, we use sock_precomp.h instead.<br />
+ //<br />
+ // A precompiled file must be included before anything else.</p>
+ <p>#include "sock_precomp.mch"</p>
+ <p>int main(void)<br />
+ {<br />
+ // ...<br />
+ return 0;<br />
+ }
+ </p>
+</div>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_precompiled_what.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_precompiled_what.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,41 +1,41 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>What Can be Precompiled</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>What Can be Precompiled</h3>
-<p>A file to be precompiled does not have to be a header file (.h or .hpp files, for example), but it must meet these requirements:</p>
-<ul>
- <li>The file must be a C or C++ source code file in text format. </li>
-</ul>
-<p>You cannot precompile libraries or other binary files.</p>
-<ul>
- <li>A C source code file that will be automatically precompiled must have .pch file name extension.</li>
- <li>A C++ source code file that will be automatically precompiled must have a .pch++ file name extension.</li>
- <li>Precompiled files must have a .mch file name extension.</li>
- <li>The file to be precompiled does not have to be in a Carbide IDE project, although a project must be open to precompile the file.</li>
-</ul>
-<p>The Carbide IDE uses the build target settings to precompile a file.</p>
-<ul>
- <li>The file must not contain any statements that generate data or executable code. </li>
-</ul>
-<p>However, the file may define static data. C++ source code can contain inline functions and constant variable declarations (const).</p>
-<ul>
- <li>Precompiled header files for different build targets are not interchangeable. </li>
-</ul>
-<p>For example, to generate a precompiled header for use with Windows® compilers, you must use a Windows® compiler.</p>
-<ul>
- <li>C source code may not include precompiled C++ header files and C++ source code may not include precompiled C header files. </li>
- <li>A source file may include only one precompiled file.</li>
- <li>A file may not define any items before including a precompiled file.</li>
-</ul>
-<p>Typically, a source code file includes a precompiled header file before anything else (except comments). </p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>What Can be Precompiled</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>What Can be Precompiled</h3>
+<p>A file to be precompiled does not have to be a header file (.h or .hpp files, for example), but it must meet these requirements:</p>
+<ul>
+ <li>The file must be a C or C++ source code file in text format. </li>
+</ul>
+<p>You cannot precompile libraries or other binary files.</p>
+<ul>
+ <li>A C source code file that will be automatically precompiled must have .pch file name extension.</li>
+ <li>A C++ source code file that will be automatically precompiled must have a .pch++ file name extension.</li>
+ <li>Precompiled files must have a .mch file name extension.</li>
+ <li>The file to be precompiled does not have to be in a Carbide IDE project, although a project must be open to precompile the file.</li>
+</ul>
+<p>The Carbide IDE uses the build target settings to precompile a file.</p>
+<ul>
+ <li>The file must not contain any statements that generate data or executable code. </li>
+</ul>
+<p>However, the file may define static data. C++ source code can contain inline functions and constant variable declarations (const).</p>
+<ul>
+ <li>Precompiled header files for different build targets are not interchangeable. </li>
+</ul>
+<p>For example, to generate a precompiled header for use with Windows® compilers, you must use a Windows® compiler.</p>
+<ul>
+ <li>C source code may not include precompiled C++ header files and C++ source code may not include precompiled C header files. </li>
+ <li>A source file may include only one precompiled file.</li>
+ <li>A file may not define any items before including a precompiled file.</li>
+</ul>
+<p>Typically, a source code file includes a precompiled header file before anything else (except comments). </p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_preprocessing.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/perf_preprocessing.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Preprocessing and Precompiling</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Preprocessing and Precompiling</h3>
-<p> When precompiling a header file, the compiler preprocesses the file too. In other words, a precompiled file is preprocessed in the context of its precompilation, not in the context of its compilation. </p>
-<p>The preprocessor also tracks macros used to guard <span class="code">#include</span> files to reduce parsing time. Thus, if a file’s contents are surrounded with:</p>
-<p class="listing">#ifndef FOO_H<br />
- #define FOO_H<br />
- // file contents<br />
- #endif</p>
-<p>The compiler will not load the file twice, saving some small amount of time in the process.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Preprocessing and Precompiling</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Preprocessing and Precompiling</h3>
+<p> When precompiling a header file, the compiler preprocesses the file too. In other words, a precompiled file is preprocessed in the context of its precompilation, not in the context of its compilation. </p>
+<p>The preprocessor also tracks macros used to guard <span class="code">#include</span> files to reduce parsing time. Thus, if a file’s contents are surrounded with:</p>
+<p class="listing">#ifndef FOO_H<br />
+ #define FOO_H<br />
+ // file contents<br />
+ #endif</p>
+<p>The compiler will not load the file twice, saving some small amount of time in the process.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/performance.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/performance/performance.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Improving Compiler Performance</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Improving Compiler Performance</h2>
-<p>This section describes compiler features that decrease the amount of time to translate source code.</p>
-<ul>
- <li><a href="perf_precompiled_files.htm">When to Use Precompiled Files</a></li>
- <li><a href="perf_precompiled_what.htm">What Can be Precompiled</a></li>
- <li><a href="perf_precompiled_using.htm">Using a Precompiled Header File</a></li>
- <li><a href="perf_preprocessing.htm">Preprocessing and Precompiling</a></li>
- <li><a href="perf_pragma_scope.htm">Pragma Scope in Precompiled Files</a></li>
- <li><a href="perf_precompiled_ide.htm">Precompiling a File in the Carbide IDE</a></li>
- <li><a href="perf_precompiled_auto.htm">Updating a Precompiled File Automatically</a> </li>
- <li><a href="perf_inst_manager.htm">Using the Instance Manager</a> </li>
-</ul>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Improving Compiler Performance</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Improving Compiler Performance</h2>
+<p>This section describes compiler features that decrease the amount of time to translate source code.</p>
+<ul>
+ <li><a href="perf_precompiled_files.htm">When to Use Precompiled Files</a></li>
+ <li><a href="perf_precompiled_what.htm">What Can be Precompiled</a></li>
+ <li><a href="perf_precompiled_using.htm">Using a Precompiled Header File</a></li>
+ <li><a href="perf_preprocessing.htm">Preprocessing and Precompiling</a></li>
+ <li><a href="perf_pragma_scope.htm">Pragma Scope in Precompiled Files</a></li>
+ <li><a href="perf_precompiled_ide.htm">Precompiling a File in the Carbide IDE</a></li>
+ <li><a href="perf_precompiled_auto.htm">Updating a Precompiled File Automatically</a> </li>
+ <li><a href="perf_inst_manager.htm">Using the Instance Manager</a> </li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_ANSI_strict.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_ANSI_strict.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,73 +1,73 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>ANSI_strict</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>ANSI_strict</h3>
-<p> Controls the use of non-standard language features.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma ANSI_strict on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable the pragma ANSI_strict, the compiler generates an error if it encounters any of the following common ANSI extensions: </p>
- <ul>
- <li> C++-style comments</li>
- </ul>
- <blockquote>
- <div class="listing">
- <p class="code"> a = b; // This is a C++-style comment</p>
- </div>
- </blockquote>
- <ul>
- <li>Unnamed arguments in function definitions</li>
- </ul>
- <blockquote>
- <div class="listing">
- <p class="code">void f(int ) {} /* OK, if ANSI Strict is disabled */<br />
- void f(int i) {} /* ALWAYS OK */</p>
- </div>
- </blockquote>
- <ul>
- <li>A # token that does not appear before an argument in a macro definition</li>
- </ul>
- <blockquote>
- <div class="listing">
- <p class="code"> #define add1(x) #x #1<br />
- /* OK, if ANSI_strict is disabled,</p>
- </div>
- <p>but probably not what you wanted:</p>
- <div class="listing">
- <p class="code">add1(abc) creates "abc"#1 */<br />
- #define add2(x) #x "2"<br />
- /* ALWAYS OK: add2(abc) creates "abc2" */</p>
- </div>
- </blockquote>
- <ul>
- <li>An identifier after #endif</li>
- </ul>
- <blockquote>
- <div class="listing">
- <p>
- <span class="code">#ifdef __CARBIDE__<br />
- /* . . . */<br />
- #endif __CARBIDE__ /* OK, if ANSI_strict is disabled */</span></p>
- <p class="code">#ifdef __CARBIDE__<br />
- /* . . . */<br />
- #endif /*__CARBIDE__*/ /* ALWAYS OK */</p>
- </div>
- </blockquote>
- <p>This pragma corresponds to the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting . To check this setting, use <span class="code">__option (ANSI_strict)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>ANSI_strict</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>ANSI_strict</h3>
+<p> Controls the use of non-standard language features.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma ANSI_strict on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable the pragma ANSI_strict, the compiler generates an error if it encounters any of the following common ANSI extensions: </p>
+ <ul>
+ <li> C++-style comments</li>
+ </ul>
+ <blockquote>
+ <div class="listing">
+ <p class="code"> a = b; // This is a C++-style comment</p>
+ </div>
+ </blockquote>
+ <ul>
+ <li>Unnamed arguments in function definitions</li>
+ </ul>
+ <blockquote>
+ <div class="listing">
+ <p class="code">void f(int ) {} /* OK, if ANSI Strict is disabled */<br />
+ void f(int i) {} /* ALWAYS OK */</p>
+ </div>
+ </blockquote>
+ <ul>
+ <li>A # token that does not appear before an argument in a macro definition</li>
+ </ul>
+ <blockquote>
+ <div class="listing">
+ <p class="code"> #define add1(x) #x #1<br />
+ /* OK, if ANSI_strict is disabled,</p>
+ </div>
+ <p>but probably not what you wanted:</p>
+ <div class="listing">
+ <p class="code">add1(abc) creates "abc"#1 */<br />
+ #define add2(x) #x "2"<br />
+ /* ALWAYS OK: add2(abc) creates "abc2" */</p>
+ </div>
+ </blockquote>
+ <ul>
+ <li>An identifier after #endif</li>
+ </ul>
+ <blockquote>
+ <div class="listing">
+ <p>
+ <span class="code">#ifdef __CARBIDE__<br />
+ /* . . . */<br />
+ #endif __CARBIDE__ /* OK, if ANSI_strict is disabled */</span></p>
+ <p class="code">#ifdef __CARBIDE__<br />
+ /* . . . */<br />
+ #endif /*__CARBIDE__*/ /* ALWAYS OK */</p>
+ </div>
+ </blockquote>
+ <p>This pragma corresponds to the <a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting . To check this setting, use <span class="code">__option (ANSI_strict)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_access_errors.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_access_errors.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>access_errors</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>access_errors</h3>
-<p>Controls whether or not to change illegal access errors to warnings.</p>
-<h5>Syntax</h5>
-<p class="code">#pragma access_errors on | off | reset</p>
-<h5>Targets</h5>
-<p>All platforms.</p>
-<h5>Remarks</h5>
-<p>If you enable this pragma, the compiler issues an error instead of a warning when it detects illegal access to protected or private members. This has the effect of including the file once (like <span class="code">#pragma <a href="p_once.htm">once</a></span>). This is not a portable usage.</p>
-<p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (access_errors)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.</p>
-<p>The default setting is <span class="code">on</span>.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>access_errors</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>access_errors</h3>
+<p>Controls whether or not to change illegal access errors to warnings.</p>
+<h5>Syntax</h5>
+<p class="code">#pragma access_errors on | off | reset</p>
+<h5>Targets</h5>
+<p>All platforms.</p>
+<h5>Remarks</h5>
+<p>If you enable this pragma, the compiler issues an error instead of a warning when it detects illegal access to protected or private members. This has the effect of including the file once (like <span class="code">#pragma <a href="p_once.htm">once</a></span>). This is not a portable usage.</p>
+<p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (access_errors)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.</p>
+<p>The default setting is <span class="code">on</span>.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_align.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_align.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>align</h3>
-<p>See pragma <a href="p_options.htm">options</a>.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>align</h3>
+<p>See pragma <a href="p_options.htm">options</a>.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_always_inline.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_always_inline.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>always_inline</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>always_inline (deprecated) </h3>
-<p>Controls the use of inlined functions.</p>
-<h5> Syntax</h5>
-<p class="code"> #pragma always_inline on | off | reset</p>
-<h5>Targets</h5>
-<p>All platforms.</p>
-<h5>Remarks</h5>
-<p>This pragma is strongly deprecated. Use the pragma <a href="p_inline_depth.htm">inline_depth</a> instead.</p>
-<p>If you enable this pragma, the compiler ignores all inlining limits and attempts to inline all functions where it is legal to do so.</p>
-<p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (always_inline)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.</p>
-<p>The default setting is <span class="code">off</span>.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>always_inline</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>always_inline (deprecated) </h3>
+<p>Controls the use of inlined functions.</p>
+<h5> Syntax</h5>
+<p class="code"> #pragma always_inline on | off | reset</p>
+<h5>Targets</h5>
+<p>All platforms.</p>
+<h5>Remarks</h5>
+<p>This pragma is strongly deprecated. Use the pragma <a href="p_inline_depth.htm">inline_depth</a> instead.</p>
+<p>If you enable this pragma, the compiler ignores all inlining limits and attempts to inline all functions where it is legal to do so.</p>
+<p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (always_inline)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.</p>
+<p>The default setting is <span class="code">off</span>.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_arm_conform.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_arm_conform.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>ARM_conform</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>ARM_conform</h3>
-<p>This pragma is no longer available.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>ARM_conform</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>ARM_conform</h3>
+<p>This pragma is no longer available.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_arm_scoping.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_arm_scoping.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>ARM_scoping</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>ARM_scoping</h3>
-<p> Controls the scope of variables declared in the expression parts of if, while, and for statements.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma ARM_scoping on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, any variable you declare in any of the above conditional expressions remains valid until the end of the block that contains the statement. Otherwise, the variables only remains valid until the end of that statement. Listing 10.5 shows an example.</p>
- <div class="listing">
- <h4> Listing 10.5 Example of Using Variables Declared in for Statement</h4>
- <p>for( int i=1; i<1000; i++) { <br />
- /* . . . */ } <br />
- return i; // OK if ARM_conform is enabled.</p>
- </div>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code"><span class="code">__option (ARM_scoping</span>.</span> They default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>ARM_scoping</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>ARM_scoping</h3>
+<p> Controls the scope of variables declared in the expression parts of if, while, and for statements.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma ARM_scoping on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, any variable you declare in any of the above conditional expressions remains valid until the end of the block that contains the statement. Otherwise, the variables only remains valid until the end of that statement. Listing 10.5 shows an example.</p>
+ <div class="listing">
+ <h4> Listing 10.5 Example of Using Variables Declared in for Statement</h4>
+ <p>for( int i=1; i<1000; i++) { <br />
+ /* . . . */ } <br />
+ return i; // OK if ARM_conform is enabled.</p>
+ </div>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code"><span class="code">__option (ARM_scoping</span>.</span> They default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_array_new_delete.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_array_new_delete.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>array_new_delete</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>array_new_delete</h3>
-<p>Use to enable the operator <span class="code">new[]</span>/<span class="code">delete[]</span> in array allocation/deallocation operations.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma array_new_delete on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- To check this setting, use <span class="code">__option (array_new_delete)</span>. The default setting is on.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>array_new_delete</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>array_new_delete</h3>
+<p>Use to enable the operator <span class="code">new[]</span>/<span class="code">delete[]</span> in array allocation/deallocation operations.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma array_new_delete on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ To check this setting, use <span class="code">__option (array_new_delete)</span>. The default setting is on.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_asmpoundcomment.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_asmpoundcomment.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>asmpoundcomment</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>asmpoundcomment</h3>
-<p> Controls whether the “<span class="code">#</span>” symbol is treated as a comment character in inline assembly.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma asmpoundcomment on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p class="note"><strong>NOTE</strong> Some targets may have additional comment characters, and may treat these characters as comments even when <span class="code">#pragma asmpoundcomment off</span> is used.</p>
- <p class="note"> <strong>WARNING</strong>! Using this pragma may interfere with the assembly language of a specific target.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (asmpoundcomment)</span>. The default setting is on.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>asmpoundcomment</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>asmpoundcomment</h3>
+<p> Controls whether the “<span class="code">#</span>” symbol is treated as a comment character in inline assembly.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma asmpoundcomment on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p class="note"><strong>NOTE</strong> Some targets may have additional comment characters, and may treat these characters as comments even when <span class="code">#pragma asmpoundcomment off</span> is used.</p>
+ <p class="note"> <strong>WARNING</strong>! Using this pragma may interfere with the assembly language of a specific target.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (asmpoundcomment)</span>. The default setting is on.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_asmsemicolcomment.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_asmsemicolcomment.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>asmsemicolcomment</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>asmsemicolcomment</h3>
-<p> Controls whether the “;” symbol is treated as a comment character in inline assembly.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma asmsemicolcomment on | off | reset </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p class="note"><strong>NOTE</strong> Some targets may have additional comment characters, and may treat these characters as comments even when <span class="code">#pragma asmsemicolcomment off</span> is used.</p>
- <p class="note"> <strong>WARNING</strong>! Using this pragma may interfere with the assembly language of a specific target.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (asmsemicolcomment)</span>. The default setting is <span class="code">on</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>asmsemicolcomment</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>asmsemicolcomment</h3>
+<p> Controls whether the “;” symbol is treated as a comment character in inline assembly.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma asmsemicolcomment on | off | reset </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p class="note"><strong>NOTE</strong> Some targets may have additional comment characters, and may treat these characters as comments even when <span class="code">#pragma asmsemicolcomment off</span> is used.</p>
+ <p class="note"> <strong>WARNING</strong>! Using this pragma may interfere with the assembly language of a specific target.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (asmsemicolcomment)</span>. The default setting is <span class="code">on</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_auto_inline.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_auto_inline.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>auto_inline</h3>
-<p>Controls which functions to inline.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma auto_inline on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler automatically chooses functions to inline for you, in addition to functions declared “inline”.<br />
- Note that if you enable either the Don’t Inline setting (“Inlining”) or the dont_inline pragma (“dont_inline”), the compiler ignores the setting of the auto_inline pragma and does not inline any functions. </p>
- <p> This pragma corresponds to the <a href="p_auto_inline.htm">Auto-Inline</a> setting. To check this setting, use <span class="code">__option (auto_inline)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p>See also "Iinlining".</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>auto_inline</h3>
+<p>Controls which functions to inline.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma auto_inline on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler automatically chooses functions to inline for you, in addition to functions declared “inline”.<br />
+ Note that if you enable either the Don’t Inline setting (“Inlining”) or the dont_inline pragma (“dont_inline”), the compiler ignores the setting of the auto_inline pragma and does not inline any functions. </p>
+ <p> This pragma corresponds to the <a href="p_auto_inline.htm">Auto-Inline</a> setting. To check this setting, use <span class="code">__option (auto_inline)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p>See also "Iinlining".</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_bool.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_bool.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>bool</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>bool</h3>
-<p> Determines whether or not <span class="code">bool</span>, <span class="code">true</span>, and <span class="code">false</span> are treated as keywords.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma bool on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, you can use the standard C++ bool type to represent true and false. Disable this pragma if recognizing <span class="code">bool</span>, <span class="code">true</span>, or <span class="code">false</span> as keywords causes problems in your program.</p>
- <p class="note"> <strong>NOTE</strong> This only applies when C++ is enabled using either the Force C++ Compilation option or <span class="code">#pragma <a href="p_cplusplus.htm">cplusplus</a> on</span>.</p>
- <p> This pragma corresponds to the Enable bool Support setting , described in “Using the bool Type”. To check this setting, use <span class="code">__option (bool)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>bool</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>bool</h3>
+<p> Determines whether or not <span class="code">bool</span>, <span class="code">true</span>, and <span class="code">false</span> are treated as keywords.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma bool on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, you can use the standard C++ bool type to represent true and false. Disable this pragma if recognizing <span class="code">bool</span>, <span class="code">true</span>, or <span class="code">false</span> as keywords causes problems in your program.</p>
+ <p class="note"> <strong>NOTE</strong> This only applies when C++ is enabled using either the Force C++ Compilation option or <span class="code">#pragma <a href="p_cplusplus.htm">cplusplus</a> on</span>.</p>
+ <p> This pragma corresponds to the Enable bool Support setting , described in “Using the bool Type”. To check this setting, use <span class="code">__option (bool)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_c99.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_c99.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,180 +1,180 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>c99</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>c99</h3>
-<p> Controls the use of a subset of C99 language features.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma c99 on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>Set <span class="code">pragma c99 on</span> to tell the Carbide x86 compiler to use the following supported C99 language features:</p>
- <ul>
- <li> Trailing commas in enumerations</li>
- <li> GCC/C9x style compound literals</li>
- </ul>
- <blockquote>
- <div class="listing">
- <p> #pragma c99 on<br />
- struct my_struct {<br />
- int i; <br />
- char c[2];} my_var;<br />
- my_var = ((struct my_struct) {x + y, 'a', 0});</p>
- </div>
- </blockquote>
- <ul>
- <li> Designated initializers</li>
- </ul>
- <blockquote>
- <div class="listing">
- <p> #pragma c99 on</p>
- <p>struct X {<br />
- int a,b,c;<br />
- } x = { .c = 3, .a = 1, 2 };</p>
- <p>union U {<br />
- char a;<br />
- long b;<br />
- } u = { .b = 1234567 };</p>
- <p>int arr1[6] = { 1,2, [4] = 3,4 };<br />
- int arr2[6] = { 1, [1 ... 4] = 3,4 }; // GCC only, not part of C99</p>
- </div>
- </blockquote>
-<ul>
- <li class="code">__func__ predefine</li>
- <li>Implicit return 0; in <span class="code">main()</span></li>
- <li>Non-const static data initialization</li>
- <li>Variable argument macros (__VA_ARGS__)</li>
- <li><span class="code">bool / _Boo</span>l support</li>
- <li>long long support</li>
- <li>restrict support</li>
- <li>// comments</li>
- <li> inline support</li>
- <li>Digraphs</li>
- <li><span class="code">_Complex</span> and <span class="code">_Imaginary</span> (treated as keywords but not supported)</li>
- <li>Empty arrays as last struct members</li>
-</ul>
-<blockquote>
- <div class="listing">
- <p>struct {<br />
- int r;<br />
- char arr[];<br />
- } s;</p>
- </div>
-</blockquote>
-<ul>
- <li>Designated initializers</li>
- <li> Hexadecimal floating-point constants–precise representations of constants specified in hexadecimal notation to ensure an accurate constant is generated across compilers and on different hosts. The syntax is shown in Table 10.1.</li>
-</ul>
-<blockquote>
- <table width="67%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="37%" scope="col">Constant Type</th>
- <th width="63%" scope="col">Format</th>
- </tr>
- <tr>
- <td>hex-fp-constant</td>
- <td>hex-string [ ‘.’ hex-string ] hex-exp [ size ]</td>
- </tr>
- <tr>
- <td>hex-string</td>
- <td>hex-digit { hex-digit }</td>
- </tr>
- <tr>
- <td>hex-exp</td>
- <td>‘p’ decimal-string</td>
- </tr>
- <tr>
- <td>size</td>
- <td>‘f’ | ‘F’ | ‘l’ | ‘L’</td>
- </tr>
- <tr>
- <td>decimal-string</td>
- <td>decimal-digit { decimal-digit }</td>
- </tr>
- <tr>
- <td>decimal-digit</td>
- <td><any decimal digit></td>
- </tr>
- <tr>
- <td>hex-digit</td>
- <td><any hexadecimal digit></td>
- </tr>
- </table>
- <p>The compiler generates a warning when the mantissa is more precise than the host floating point format, and warnings are enabled. It generates an error if the exponent is too wide for the host float format.</p>
- <p>Examples include:</p>
- <p class="code"> 0x2f.3a2p3<br />
- 0xEp1f<br />
- 0x1.8p0L</p>
- <p>The standard library supports printing floats in this format using the “<span class="code">%a</span>” and “<span class="code">%A</span>” specifiers.</p>
-</blockquote>
-<ul>
- <li> Variable length arrays are supported within local or function prototype scope (as required by the C99 standard)</li>
-</ul>
-<blockquote>
- <div class="listing">
- <p> // good example of C99 Variable Length Array usage</p>
- <p> #pragma c99 on<br />
- void f(int n) {<br />
- int arr[n];<br />
- ...<br />
- }</p>
- </div>
- <p> While this example generates an error:</p>
- <div class="listing">
- <p> // bad example of C99 Variable Length Array usage</p>
- <p>#pragma c99 on<br />
- int n;<br />
- int arr[n]; // generates an error: variable length array<br />
- // types can only be used in local or <br />
- // function prototype scope </p>
- </div>
- <p>A variable length array cannot be used in a function template’s prototype scope or in a local template typedef, as shown below:</p>
- <div class="listing">
- <p>// bad example of C99 usage in Function Prototype</p>
- <p>#pragma c99 on<br />
- template<typename T> int f(int n, int A[n][n]);<br />
- {<br />
- } // generates an error: variable length arrays<br />
- // cannot be used in function template prototypes<br />
- // or local template variables </p>
- </div>
-</blockquote>
-<ul>
- <li> Unsuffixed decimal constant rules supported</li>
-</ul>
-<blockquote>
- <div class="listing">
- <p>// examples of C99 Unsuffixed Constants</p>
- <p> #pragma c99 on // and ULONG_MAX == 4294967295<br />
- sizeof(4294967295) == sizeof(long long)<br />
- sizeof(4294967295u) == sizeof(unsigned long)</p>
- <p>#pragma c99 off<br />
- sizeof(4294967295) == sizeof(unsigned long)<br />
- sizeof(4294967295u) == sizeof(unsigned long)</p>
- </div>
-</blockquote>
-<p>The following C99 features are not currently supported:</p>
-<ul>
- <li> long long bitfields on some targets</li>
- <li> <span class="code">++bool--</span> expressions</li>
- <li><span class="code"> (T) (int-list)</span> are handled/parsed as cast-expressions and as literals</li>
- <li><span class="code"> __STDC_HOSTED__</span> is <span class="code">0</span></li>
- <li> <span class="code"><bool> op= <expr></span> does not always work correctly</li>
-</ul>
-<p>This pragma corresponds to the Enable C99 Extensions setting . To check this setting, use <span class="code"><span class="code">__option(c</span>99)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.<br />
-</p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>c99</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>c99</h3>
+<p> Controls the use of a subset of C99 language features.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma c99 on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>Set <span class="code">pragma c99 on</span> to tell the Carbide x86 compiler to use the following supported C99 language features:</p>
+ <ul>
+ <li> Trailing commas in enumerations</li>
+ <li> GCC/C9x style compound literals</li>
+ </ul>
+ <blockquote>
+ <div class="listing">
+ <p> #pragma c99 on<br />
+ struct my_struct {<br />
+ int i; <br />
+ char c[2];} my_var;<br />
+ my_var = ((struct my_struct) {x + y, 'a', 0});</p>
+ </div>
+ </blockquote>
+ <ul>
+ <li> Designated initializers</li>
+ </ul>
+ <blockquote>
+ <div class="listing">
+ <p> #pragma c99 on</p>
+ <p>struct X {<br />
+ int a,b,c;<br />
+ } x = { .c = 3, .a = 1, 2 };</p>
+ <p>union U {<br />
+ char a;<br />
+ long b;<br />
+ } u = { .b = 1234567 };</p>
+ <p>int arr1[6] = { 1,2, [4] = 3,4 };<br />
+ int arr2[6] = { 1, [1 ... 4] = 3,4 }; // GCC only, not part of C99</p>
+ </div>
+ </blockquote>
+<ul>
+ <li class="code">__func__ predefine</li>
+ <li>Implicit return 0; in <span class="code">main()</span></li>
+ <li>Non-const static data initialization</li>
+ <li>Variable argument macros (__VA_ARGS__)</li>
+ <li><span class="code">bool / _Boo</span>l support</li>
+ <li>long long support</li>
+ <li>restrict support</li>
+ <li>// comments</li>
+ <li> inline support</li>
+ <li>Digraphs</li>
+ <li><span class="code">_Complex</span> and <span class="code">_Imaginary</span> (treated as keywords but not supported)</li>
+ <li>Empty arrays as last struct members</li>
+</ul>
+<blockquote>
+ <div class="listing">
+ <p>struct {<br />
+ int r;<br />
+ char arr[];<br />
+ } s;</p>
+ </div>
+</blockquote>
+<ul>
+ <li>Designated initializers</li>
+ <li> Hexadecimal floating-point constants–precise representations of constants specified in hexadecimal notation to ensure an accurate constant is generated across compilers and on different hosts. The syntax is shown in Table 10.1.</li>
+</ul>
+<blockquote>
+ <table width="67%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="37%" scope="col">Constant Type</th>
+ <th width="63%" scope="col">Format</th>
+ </tr>
+ <tr>
+ <td>hex-fp-constant</td>
+ <td>hex-string [ ‘.’ hex-string ] hex-exp [ size ]</td>
+ </tr>
+ <tr>
+ <td>hex-string</td>
+ <td>hex-digit { hex-digit }</td>
+ </tr>
+ <tr>
+ <td>hex-exp</td>
+ <td>‘p’ decimal-string</td>
+ </tr>
+ <tr>
+ <td>size</td>
+ <td>‘f’ | ‘F’ | ‘l’ | ‘L’</td>
+ </tr>
+ <tr>
+ <td>decimal-string</td>
+ <td>decimal-digit { decimal-digit }</td>
+ </tr>
+ <tr>
+ <td>decimal-digit</td>
+ <td><any decimal digit></td>
+ </tr>
+ <tr>
+ <td>hex-digit</td>
+ <td><any hexadecimal digit></td>
+ </tr>
+ </table>
+ <p>The compiler generates a warning when the mantissa is more precise than the host floating point format, and warnings are enabled. It generates an error if the exponent is too wide for the host float format.</p>
+ <p>Examples include:</p>
+ <p class="code"> 0x2f.3a2p3<br />
+ 0xEp1f<br />
+ 0x1.8p0L</p>
+ <p>The standard library supports printing floats in this format using the “<span class="code">%a</span>” and “<span class="code">%A</span>” specifiers.</p>
+</blockquote>
+<ul>
+ <li> Variable length arrays are supported within local or function prototype scope (as required by the C99 standard)</li>
+</ul>
+<blockquote>
+ <div class="listing">
+ <p> // good example of C99 Variable Length Array usage</p>
+ <p> #pragma c99 on<br />
+ void f(int n) {<br />
+ int arr[n];<br />
+ ...<br />
+ }</p>
+ </div>
+ <p> While this example generates an error:</p>
+ <div class="listing">
+ <p> // bad example of C99 Variable Length Array usage</p>
+ <p>#pragma c99 on<br />
+ int n;<br />
+ int arr[n]; // generates an error: variable length array<br />
+ // types can only be used in local or <br />
+ // function prototype scope </p>
+ </div>
+ <p>A variable length array cannot be used in a function template’s prototype scope or in a local template typedef, as shown below:</p>
+ <div class="listing">
+ <p>// bad example of C99 usage in Function Prototype</p>
+ <p>#pragma c99 on<br />
+ template<typename T> int f(int n, int A[n][n]);<br />
+ {<br />
+ } // generates an error: variable length arrays<br />
+ // cannot be used in function template prototypes<br />
+ // or local template variables </p>
+ </div>
+</blockquote>
+<ul>
+ <li> Unsuffixed decimal constant rules supported</li>
+</ul>
+<blockquote>
+ <div class="listing">
+ <p>// examples of C99 Unsuffixed Constants</p>
+ <p> #pragma c99 on // and ULONG_MAX == 4294967295<br />
+ sizeof(4294967295) == sizeof(long long)<br />
+ sizeof(4294967295u) == sizeof(unsigned long)</p>
+ <p>#pragma c99 off<br />
+ sizeof(4294967295) == sizeof(unsigned long)<br />
+ sizeof(4294967295u) == sizeof(unsigned long)</p>
+ </div>
+</blockquote>
+<p>The following C99 features are not currently supported:</p>
+<ul>
+ <li> long long bitfields on some targets</li>
+ <li> <span class="code">++bool--</span> expressions</li>
+ <li><span class="code"> (T) (int-list)</span> are handled/parsed as cast-expressions and as literals</li>
+ <li><span class="code"> __STDC_HOSTED__</span> is <span class="code">0</span></li>
+ <li> <span class="code"><bool> op= <expr></span> does not always work correctly</li>
+</ul>
+<p>This pragma corresponds to the Enable C99 Extensions setting . To check this setting, use <span class="code"><span class="code">__option(c</span>99)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.<br />
+</p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_check_header_flags.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_check_header_flags.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>check_header_flags</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>check_header_flags</h3>
-<p> Controls whether or not to ensure that a precompiled header’s data matches a project’s target settings.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma check_header_flags on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This pragma affects precompiled headers only.</p>
- <p>If you enable this pragma, the compiler ensures that the precompiled header’s preferences for double size (8-byte or 12-byte), int size (2-byte or 4-byte) and floating point math correspond to the build target’s settings. If they do not match, the compiler generates an error.</p>
- <p>If your precompiled header file depends on these settings, enable this pragma. Otherwise, disable it. </p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (check_header_flags)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>check_header_flags</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>check_header_flags</h3>
+<p> Controls whether or not to ensure that a precompiled header’s data matches a project’s target settings.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma check_header_flags on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This pragma affects precompiled headers only.</p>
+ <p>If you enable this pragma, the compiler ensures that the precompiled header’s preferences for double size (8-byte or 12-byte), int size (2-byte or 4-byte) and floating point math correspond to the build target’s settings. If they do not match, the compiler generates an error.</p>
+ <p>If your precompiled header file depends on these settings, enable this pragma. Otherwise, disable it. </p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (check_header_flags)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_const_strings.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_const_strings.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>const_strings</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>const_strings</h3>
-<p> Controls the <span class="code">const</span>-ness of string literals.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma const_strings [ on | off | reset ]
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the type of string literals is an array <span class="code">const char[n]</span>, or <span class="code">const wchar_t[n]</span> for wide strings, where n is the length of the string literal plus 1 for a terminating <span class="code">NUL</span> character. Otherwise, the type <span class="code">char[n]</span> or <span class="code">wchar_t[n]</span> is used.</p>
- <p> This pragma does not correspond to any setting . To check this setting, use <span class="code"><span class="code">__option (const_strings)</span></span>, this pragma is <span class="code">on</span> when compiling C++ source code; <span class="code">off</span> when compiling C source code. </p>
- <span class="code">
- <div id="footer">Copyright © 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></div>
-
-
-</span></body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>const_strings</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>const_strings</h3>
+<p> Controls the <span class="code">const</span>-ness of string literals.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma const_strings [ on | off | reset ]
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the type of string literals is an array <span class="code">const char[n]</span>, or <span class="code">const wchar_t[n]</span> for wide strings, where n is the length of the string literal plus 1 for a terminating <span class="code">NUL</span> character. Otherwise, the type <span class="code">char[n]</span> or <span class="code">wchar_t[n]</span> is used.</p>
+ <p> This pragma does not correspond to any setting . To check this setting, use <span class="code"><span class="code">__option (const_strings)</span></span>, this pragma is <span class="code">on</span> when compiling C++ source code; <span class="code">off</span> when compiling C source code. </p>
+ <span class="code">
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</span></body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_cplusplus.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_cplusplus.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>cplusplus</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>cplusplus</h3>
-<p> Controls whether or not to translate subsequent source code as C or C++ source code.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma cplusplus on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler translates the source code that follows as C++ code. Otherwise, the compiler uses the suffix of the filename to determine how to compile it. If a file name ends in .c, .h, or .pch, the compiler automatically compiles it as C code, otherwise as C++. Use this pragma only if a file contains both C and C++ code.</p>
- <p class="note"><strong>NOTE</strong> The Carbide C/C++ compilers do not distinguish between uppercase and lowercase letters in file names and file name extensions except on UNIX-based systems.</p>
- <p>This pragma corresponds to the Force C++ Compilation setting . To check this setting, use <span class="code">__option (cplusplus)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>cplusplus</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>cplusplus</h3>
+<p> Controls whether or not to translate subsequent source code as C or C++ source code.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma cplusplus on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler translates the source code that follows as C++ code. Otherwise, the compiler uses the suffix of the filename to determine how to compile it. If a file name ends in .c, .h, or .pch, the compiler automatically compiles it as C code, otherwise as C++. Use this pragma only if a file contains both C and C++ code.</p>
+ <p class="note"><strong>NOTE</strong> The Carbide C/C++ compilers do not distinguish between uppercase and lowercase letters in file names and file name extensions except on UNIX-based systems.</p>
+ <p>This pragma corresponds to the Force C++ Compilation setting . To check this setting, use <span class="code">__option (cplusplus)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_cpp_extensions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_cpp_extensions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,59 +1,59 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>cpp_extensions</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>cpp_extensions</h3>
-<p> Controls language extensions to ISO C++.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma cpp_extensions on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, you can use the following extensions to the ANSI C++ standard that would otherwise be illegal:</p>
- <ul>
- <li>Anonymous struct & union objects</li>
- </ul>
- <blockquote>
- <div class="listing"> #pragma cpp_extensions on<br />
- void foo()<br />
- {<br />
- union {<br />
- long hilo;<br />
- struct { short hi, lo; }; // anonymous struct<br />
- };<br />
- hi=0x1234; <br />
- lo=0x5678; // hilo==0x12345678 <br />
- }</div>
- </blockquote>
- <ul>
- <li>Unqualified pointer to a member function</li>
- </ul>
- <blockquote>
- <div class="listing">
- <p> #pragma cpp_extensions on<br />
- struct Foo { void f(); }<br />
- void Foo::f()<br />
- {<br />
- void (Foo::*ptmf1)() = &Foo::f; // ALWAYS OK</p>
- <p> void (Foo::*ptmf2)() = f; // OK if you enable cpp_extensions.<br />
- }</p>
- </div>
- </blockquote>
- <ul>
- <li>Inclusion of const data in precompiled headers.</li>
- </ul>
- <p>This pragma does not correspond to any setting . To check this setting, use the <span class="code">__option (cpp_extensions)</span>. This pragma is <span class="code">on</span> if generating Win32/x86-compatible object code; <span class="code">off</span> if not.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>cpp_extensions</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>cpp_extensions</h3>
+<p> Controls language extensions to ISO C++.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma cpp_extensions on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, you can use the following extensions to the ANSI C++ standard that would otherwise be illegal:</p>
+ <ul>
+ <li>Anonymous struct & union objects</li>
+ </ul>
+ <blockquote>
+ <div class="listing"> #pragma cpp_extensions on<br />
+ void foo()<br />
+ {<br />
+ union {<br />
+ long hilo;<br />
+ struct { short hi, lo; }; // anonymous struct<br />
+ };<br />
+ hi=0x1234; <br />
+ lo=0x5678; // hilo==0x12345678 <br />
+ }</div>
+ </blockquote>
+ <ul>
+ <li>Unqualified pointer to a member function</li>
+ </ul>
+ <blockquote>
+ <div class="listing">
+ <p> #pragma cpp_extensions on<br />
+ struct Foo { void f(); }<br />
+ void Foo::f()<br />
+ {<br />
+ void (Foo::*ptmf1)() = &Foo::f; // ALWAYS OK</p>
+ <p> void (Foo::*ptmf2)() = f; // OK if you enable cpp_extensions.<br />
+ }</p>
+ </div>
+ </blockquote>
+ <ul>
+ <li>Inclusion of const data in precompiled headers.</li>
+ </ul>
+ <p>This pragma does not correspond to any setting . To check this setting, use the <span class="code">__option (cpp_extensions)</span>. This pragma is <span class="code">on</span> if generating Win32/x86-compatible object code; <span class="code">off</span> if not.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_debug_inline.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_debug_inline.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>debuginline</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>debuginline</h3>
-<p> Controls whether the compiler emits debugging information for expanded inline function calls.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma debuginline on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If the compiler emits debugging information for inline function calls, then the debugger can step into the body of the inlined function. This more closely resembles the debugging experience for un-inlined code.</p>
- <p class="note"><strong>NOTE</strong> Since the actual “call” and “return” instructions are no longer present when stepping through inline code, the debugger will immediately jump to the body of an inlined function and “return” before reaching the return statement for the function. Thus, the debugging experience of inlined functions may not be as smooth as debugging un-inlined code.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (debuginline)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>debuginline</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>debuginline</h3>
+<p> Controls whether the compiler emits debugging information for expanded inline function calls.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma debuginline on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If the compiler emits debugging information for inline function calls, then the debugger can step into the body of the inlined function. This more closely resembles the debugging experience for un-inlined code.</p>
+ <p class="note"><strong>NOTE</strong> Since the actual “call” and “return” instructions are no longer present when stepping through inline code, the debugger will immediately jump to the body of an inlined function and “return” before reaching the return statement for the function. Thus, the debugging experience of inlined functions may not be as smooth as debugging un-inlined code.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (debuginline)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_def_inherited.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_def_inherited.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,32 +1,32 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>def_inherited</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>def_inherited</h3>
-<p> Controls the use of inherited.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma def_inherited on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>The use of this pragma is deprecated. It lets you use the non-standard inherited symbol in C++ programming by implicitly adding</p>
- <p class="code">typedef base inherited;</p>
- <p>as the first member in classes with a single base class.</p>
- <p class="note"><strong>NOTE</strong> The ISO C++ standard does not support the inherited symbol. Only the Carbide.c++ language implements the inherited symbol for single inheritance.</p>
- <p class="note"><strong>NOTE</strong> Pragmas may no longer correspond to their textual position in the file when this pragma is on.</p>
- <p> This pragma does not correspond to any setting . To check this setting, use the <span class="code">__option (def_inherited)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.<br />
- </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>def_inherited</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>def_inherited</h3>
+<p> Controls the use of inherited.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma def_inherited on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>The use of this pragma is deprecated. It lets you use the non-standard inherited symbol in C++ programming by implicitly adding</p>
+ <p class="code">typedef base inherited;</p>
+ <p>as the first member in classes with a single base class.</p>
+ <p class="note"><strong>NOTE</strong> The ISO C++ standard does not support the inherited symbol. Only the Carbide.c++ language implements the inherited symbol for single inheritance.</p>
+ <p class="note"><strong>NOTE</strong> Pragmas may no longer correspond to their textual position in the file when this pragma is on.</p>
+ <p> This pragma does not correspond to any setting . To check this setting, use the <span class="code">__option (def_inherited)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.<br />
+ </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_defer_codegen.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_defer_codegen.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,41 +1,41 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>defer_codegen</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>defer_codegen</h3>
-<p>Controls the inlining of functions that are not yet compiled.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma defer_codegen on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This setting lets you use inline and auto-inline functions that are called before their definition:</p>
- <div class="listing">
- <p>#pragma defer_codegen on<br />
- #pragma auto_inline on</p>
- <p>extern void f();<br />
- extern void g();</p>
- <p>main()<br />
- {<br />
- f(); // will be inlined<br />
- g(); // will be inlined<br />
- }</p>
- <p>inline void f() {}<br />
- void g() {}</p>
- </div>
-<p class="note"> <strong>NOTE</strong> The compiler requires more memory at compile time if you enable this pragma.</p>
-<p>This pragma corresponds to the Deferred Inlining setting . To check this setting, use the <span class="code">__option (defer_codegen)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>defer_codegen</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>defer_codegen</h3>
+<p>Controls the inlining of functions that are not yet compiled.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma defer_codegen on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This setting lets you use inline and auto-inline functions that are called before their definition:</p>
+ <div class="listing">
+ <p>#pragma defer_codegen on<br />
+ #pragma auto_inline on</p>
+ <p>extern void f();<br />
+ extern void g();</p>
+ <p>main()<br />
+ {<br />
+ f(); // will be inlined<br />
+ g(); // will be inlined<br />
+ }</p>
+ <p>inline void f() {}<br />
+ void g() {}</p>
+ </div>
+<p class="note"> <strong>NOTE</strong> The compiler requires more memory at compile time if you enable this pragma.</p>
+<p>This pragma corresponds to the Deferred Inlining setting . To check this setting, use the <span class="code">__option (defer_codegen)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_defer_defarg_parsing.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_defer_defarg_parsing.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,44 +1,44 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>defer_defarg_parsing</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>defer_defarg_parsing</h3>
-<p> Defers the parsing of default arguments in member functions.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma defer_defarg_parsing on | off
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>To be accepted as valid, some default expressions with template arguments will require additional parentheses. For example, the following source code generates an error:</p>
- <div class="listing">
- <p>template<typename T,typename U> struct X { T t; U u; };</p>
- <p>struct Y {<br />
- // the following line is not accepted, and generates <br />
- // an error with defer_defarg_parsing on<br />
- void f(X<int,int> = X<int,int>());<br />
- };</p>
- </div>
- <p>While this version will not:</p>
- <div class="listing">
- <p>template<typename T,typename U> struct X { T t; U u; }; </p>
- <p>struct Y {<br />
- // following line is OK, <br />
- // if default argument is parenthesized<br />
- void f(X<int,int> = (X<int,int>()) );<br />
- };</p>
- </div>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (defer_defarg_parsing)</span>. The default setting is on.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>defer_defarg_parsing</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>defer_defarg_parsing</h3>
+<p> Defers the parsing of default arguments in member functions.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma defer_defarg_parsing on | off
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>To be accepted as valid, some default expressions with template arguments will require additional parentheses. For example, the following source code generates an error:</p>
+ <div class="listing">
+ <p>template<typename T,typename U> struct X { T t; U u; };</p>
+ <p>struct Y {<br />
+ // the following line is not accepted, and generates <br />
+ // an error with defer_defarg_parsing on<br />
+ void f(X<int,int> = X<int,int>());<br />
+ };</p>
+ </div>
+ <p>While this version will not:</p>
+ <div class="listing">
+ <p>template<typename T,typename U> struct X { T t; U u; }; </p>
+ <p>struct Y {<br />
+ // following line is OK, <br />
+ // if default argument is parenthesized<br />
+ void f(X<int,int> = (X<int,int>()) );<br />
+ };</p>
+ </div>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (defer_defarg_parsing)</span>. The default setting is on.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_direct_destruction.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_direct_destruction.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>direct_destruction</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>direct_destruction (not available) </h3>
-<p> This pragma is no longer available.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>direct_destruction</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>direct_destruction (not available) </h3>
+<p> This pragma is no longer available.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_dollar_identifiers.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_dollar_identifiers.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>dollar_identifiers</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>dollar_identifiers</h3>
-<p> Controls use of dollar signs ($) in identifiers.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma dollar_identifiers on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler accepts dollar signs ($) in identifiers. Otherwise, the compiler issues an error if it encounters anything but underscores, alphabetic, numeric character, and universal characters (<span class="code">\uxxxx</span>, \<span class="code">Uxxxxxxxx</span>) in an identifier.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (dollar_identifiers)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>dollar_identifiers</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>dollar_identifiers</h3>
+<p> Controls use of dollar signs ($) in identifiers.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma dollar_identifiers on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler accepts dollar signs ($) in identifiers. Otherwise, the compiler issues an error if it encounters anything but underscores, alphabetic, numeric character, and universal characters (<span class="code">\uxxxx</span>, \<span class="code">Uxxxxxxxx</span>) in an identifier.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (dollar_identifiers)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_dont_inline.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_dont_inline.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>dont_inline</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>dont_inline</h3>
-<p> Controls the generation of inline functions.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma dont_inline on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler does not inline any function calls, even those declared with the inline keyword or within a class declaration. Also, it does not automatically inline functions, regardless of the setting of the pragma <a href="p_auto_inline.htm">auto_inline</a>, described in “auto_inline”. If you disable this pragma, the compiler expands all inline function calls, within the limits you set through other inlining-related pragmas. </p>
- <p>This pragma corresponds to the Don’t Inline setting in Inline Depth dropdown menu . To check this setting, use <span class="code">__option (dont_inline)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.<br />
- </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>dont_inline</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>dont_inline</h3>
+<p> Controls the generation of inline functions.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma dont_inline on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler does not inline any function calls, even those declared with the inline keyword or within a class declaration. Also, it does not automatically inline functions, regardless of the setting of the pragma <a href="p_auto_inline.htm">auto_inline</a>, described in “auto_inline”. If you disable this pragma, the compiler expands all inline function calls, within the limits you set through other inlining-related pragmas. </p>
+ <p>This pragma corresponds to the Don’t Inline setting in Inline Depth dropdown menu . To check this setting, use <span class="code">__option (dont_inline)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.<br />
+ </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_dont_reuse_strings.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_dont_reuse_strings.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,32 +1,32 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>dont_reuse_strings</h3>
-<p>Controls whether or not to store each string literal separately in the string pool.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma dont_reuse_strings on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler stores each string literal separately. Otherwise, the compiler stores only one copy of identical string literals. This pragma helps you save memory if your program contains a lot of identical string literals that you do not modify.</p>
- <p>For example, take this code segment:</p>
- <p class="code"> char *str1="Hello";<br />
- char *str2="Hello"<br />
- *str2 = 'Y';</p>
- <p>If you enable this pragma, str1 is "Hello", and str2 is "Yello". Otherwise, both str1 and str2 are "Yello".</p>
- <p> This pragma corresponds to the Reuse Strings setting . To check this setting, use <span class="code">__option (dont_reuse_strings)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>dont_reuse_strings</h3>
+<p>Controls whether or not to store each string literal separately in the string pool.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma dont_reuse_strings on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler stores each string literal separately. Otherwise, the compiler stores only one copy of identical string literals. This pragma helps you save memory if your program contains a lot of identical string literals that you do not modify.</p>
+ <p>For example, take this code segment:</p>
+ <p class="code"> char *str1="Hello";<br />
+ char *str2="Hello"<br />
+ *str2 = 'Y';</p>
+ <p>If you enable this pragma, str1 is "Hello", and str2 is "Yello". Otherwise, both str1 and str2 are "Yello".</p>
+ <p> This pragma corresponds to the Reuse Strings setting . To check this setting, use <span class="code">__option (dont_reuse_strings)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_ecplusplus.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_ecplusplus.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>ecplusplus</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>ecplusplus</h3>
-<p> Controls the use of embedded C++ features. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma ecplusplus on | off | reset
-</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the C++ compiler disables the non-EC++ features of ANSI C++ such as templates, multiple inheritance, and so on. See “C++ and Embedded Systems” for more information on Embedded C++ support in Carbide C/C++ compilers.</p>
- <p> This pragma corresponds to the EC++ Compatibility Mode setting . To check this setting, use <span class="code">__option (ecplusplus)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>ecplusplus</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>ecplusplus</h3>
+<p> Controls the use of embedded C++ features. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma ecplusplus on | off | reset
+</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the C++ compiler disables the non-EC++ features of ANSI C++ such as templates, multiple inheritance, and so on. See “C++ and Embedded Systems” for more information on Embedded C++ support in Carbide C/C++ compilers.</p>
+ <p> This pragma corresponds to the EC++ Compatibility Mode setting . To check this setting, use <span class="code">__option (ecplusplus)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_enumsalwaysint.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_enumsalwaysint.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,39 +1,39 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>enumsalwaysint</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>enumsalwaysint</h3>
-<p> Specifies the size of enumerated types.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma enumsalwaysint on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
-<p>If you enable this pragma, the C/C++ compiler makes an enumerated type the same size as an int. If an enumerated constant is larger than int, the compiler generates an error. If this pragma is not enabled, the compiler makes an enumerated type the size of any integral type. It chooses the integral type with the size that most closely matches the size of the largest enumerated constant.</p>
- <p>The type could be as small as a char or as large as a long long. Listing 10.15 shows an example.</p>
- <div class="listing">
- <h4>Listing 10.15 Example of Enumerations the Same as Size as int</h4>
- <p>enum SmallNumber { One = 1, Two = 2 };<br />
- /* If you enable enumsalwaysint, this type is the same size as an int.<br />
- Otherwise, this type is the same size as a char. */</p>
- <p>enum BigNumber <br />
- { ThreeThousandMillion = 3000000000 };<br />
- /* If you enable enumsalwaysint, the compiler might generate an error. <br />
- Otherwise, this type is the same size as a long long. */</p>
- </div>
- <p>For more information on how the compiler handles enumerated types, see <a href="../c_compiler/c_enum_types.htm">Enumerated Types</a>.</p>
-<p>This pragma corresponds to the Enums Always Int setting . To check this setting, use <span class="code">__option (enumsalwaysint)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>enumsalwaysint</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>enumsalwaysint</h3>
+<p> Specifies the size of enumerated types.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma enumsalwaysint on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+<p>If you enable this pragma, the C/C++ compiler makes an enumerated type the same size as an int. If an enumerated constant is larger than int, the compiler generates an error. If this pragma is not enabled, the compiler makes an enumerated type the size of any integral type. It chooses the integral type with the size that most closely matches the size of the largest enumerated constant.</p>
+ <p>The type could be as small as a char or as large as a long long. Listing 10.15 shows an example.</p>
+ <div class="listing">
+ <h4>Listing 10.15 Example of Enumerations the Same as Size as int</h4>
+ <p>enum SmallNumber { One = 1, Two = 2 };<br />
+ /* If you enable enumsalwaysint, this type is the same size as an int.<br />
+ Otherwise, this type is the same size as a char. */</p>
+ <p>enum BigNumber <br />
+ { ThreeThousandMillion = 3000000000 };<br />
+ /* If you enable enumsalwaysint, the compiler might generate an error. <br />
+ Otherwise, this type is the same size as a long long. */</p>
+ </div>
+ <p>For more information on how the compiler handles enumerated types, see <a href="../c_compiler/c_enum_types.htm">Enumerated Types</a>.</p>
+<p>This pragma corresponds to the Enums Always Int setting . To check this setting, use <span class="code">__option (enumsalwaysint)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_errno_name.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_errno_name.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>errno_name</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>errno_name</h3>
-<p> Tells the optimizer how to find the <span class="code">errno</span> identifier. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma errno_name id | ...
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>When this pragma is used, the optimizer can use the identifier <span class="code">errno</span> (either a macro or a function call) to optimize standard C library functions better. If not used, the optimizer makes worst-case assumptions about the effects of calls to the standard C library.</p>
- <p class="note"><strong>NOTE</strong> The MSL C library already includes a use of this pragma, so you would only need to use it for third-party C libraries.</p>
- <p class="code">If errno resolves to a variable name, specify it like this:</p>
- <p class="listing"> #pragma errno_name _Errno</p>
- <p>If errno is a function call accessing ordinarily inaccessible globals, use this form:</p>
- <p class="listing"> #pragma errno_name ...</p>
- <p> Otherwise, do not use this pragma as it can result in incorrect optimizations in your code.</p>
- <p> This pragma does not correspond to any panel setting. By default, this pragma is unspecified (worst case assumption). </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>errno_name</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>errno_name</h3>
+<p> Tells the optimizer how to find the <span class="code">errno</span> identifier. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma errno_name id | ...
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>When this pragma is used, the optimizer can use the identifier <span class="code">errno</span> (either a macro or a function call) to optimize standard C library functions better. If not used, the optimizer makes worst-case assumptions about the effects of calls to the standard C library.</p>
+ <p class="note"><strong>NOTE</strong> The MSL C library already includes a use of this pragma, so you would only need to use it for third-party C libraries.</p>
+ <p class="code">If errno resolves to a variable name, specify it like this:</p>
+ <p class="listing"> #pragma errno_name _Errno</p>
+ <p>If errno is a function call accessing ordinarily inaccessible globals, use this form:</p>
+ <p class="listing"> #pragma errno_name ...</p>
+ <p> Otherwise, do not use this pragma as it can result in incorrect optimizations in your code.</p>
+ <p> This pragma does not correspond to any panel setting. By default, this pragma is unspecified (worst case assumption). </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_exceptions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_exceptions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>exceptions</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>exceptions</h3>
-<p> Controls the support of C++ exception handling.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma exceptions on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, you can use the try and catch statements in C++ to perform exception handling. If your program does not use exception handling, disable this setting to make your program smaller.</p>
- <p> You can throw exceptions across any code compiled by the Carbide C/C++ compiler with <span class="code">#pragma exceptions on</span>. You cannot throw exceptions across libraries compiled with <span class="code">#pragma exceptions off</span>. If you throw an exception across one of these, the code calls <span class="code">terminate()</span> and exits.</p>
- <p> This pragma corresponds to the Enable C++ Exceptions setting . To check this setting, use <span class="code">__option (exceptions)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>exceptions</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>exceptions</h3>
+<p> Controls the support of C++ exception handling.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma exceptions on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, you can use the try and catch statements in C++ to perform exception handling. If your program does not use exception handling, disable this setting to make your program smaller.</p>
+ <p> You can throw exceptions across any code compiled by the Carbide C/C++ compiler with <span class="code">#pragma exceptions on</span>. You cannot throw exceptions across libraries compiled with <span class="code">#pragma exceptions off</span>. If you throw an exception across one of these, the code calls <span class="code">terminate()</span> and exits.</p>
+ <p> This pragma corresponds to the Enable C++ Exceptions setting . To check this setting, use <span class="code">__option (exceptions)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_explicit_zero_data.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_explicit_zero_data.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>explicit_zero_data</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>explicit_zero_data</h3>
-<p>Controls the placement of zero-initialized data.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma explicit_zero_data on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>Places zero-initialized data into the initialized data section instead of the BSS section when on.</p>
- <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (explicit_zero_data)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is off. </p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>explicit_zero_data</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>explicit_zero_data</h3>
+<p>Controls the placement of zero-initialized data.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma explicit_zero_data on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>Places zero-initialized data into the initialized data section instead of the BSS section when on.</p>
+ <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (explicit_zero_data)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is off. </p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_export.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_export.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>export</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>export</h3>
-<p> Controls the exporting of data or functions.</p>
-<h5>Syntax</h5>
- <p><span class="code">#pragma export on | off | reset<br />
- </span><span class="code"> #pragma export list name1 [, name2 ]*</span></p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>When using the #pragma export on format, all functions are automatically exported.</p>
- <p>When using the #pragma export list format, use it to tag data or functions for exporting. It applies to all names if it is used on an overloaded function. You cannot use this pragma for C++ member functions or static class members. An example of an lxported list:</p>
- <p class="listing">extern int f(),g;<br />
-#pragma export list f,g</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (export)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>export</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>export</h3>
+<p> Controls the exporting of data or functions.</p>
+<h5>Syntax</h5>
+ <p><span class="code">#pragma export on | off | reset<br />
+ </span><span class="code"> #pragma export list name1 [, name2 ]*</span></p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>When using the #pragma export on format, all functions are automatically exported.</p>
+ <p>When using the #pragma export list format, use it to tag data or functions for exporting. It applies to all names if it is used on an overloaded function. You cannot use this pragma for C++ member functions or static class members. An example of an lxported list:</p>
+ <p class="listing">extern int f(),g;<br />
+#pragma export list f,g</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (export)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_extended_errorcheck.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_extended_errorcheck.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>extended_errorcheck</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>extended_errorcheck</h3>
-<p> Controls the issuing of warnings for possible unintended logical errors. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma extended_errorcheck on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the C compiler generates a warning (not an error) if it encounters some common programming errors. See “Suspicious Assignments and Incorrect Function Returns” for descriptions of the errors that result in this warning.</p>
- <p>This pragma corresponds to the Extended Error Checking setting . To check this setting, use <span class="code">__option (extended_errorcheck)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>extended_errorcheck</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>extended_errorcheck</h3>
+<p> Controls the issuing of warnings for possible unintended logical errors. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma extended_errorcheck on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the C compiler generates a warning (not an error) if it encounters some common programming errors. See “Suspicious Assignments and Incorrect Function Returns” for descriptions of the errors that result in this warning.</p>
+ <p>This pragma corresponds to the Extended Error Checking setting . To check this setting, use <span class="code">__option (extended_errorcheck)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_faster_pch_gen.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_faster_pch_gen.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>faster_pch_gen</h3>
-<p>Controls the performance of precompiled header generation. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma faster_pch_gen on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, generating a precompiled header can be much faster, depending on the header structure. However, it can also be slightly larger.</p>
- <p> This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (faster_pch_gen)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>faster_pch_gen</h3>
+<p>Controls the performance of precompiled header generation. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma faster_pch_gen on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, generating a precompiled header can be much faster, depending on the header structure. However, it can also be slightly larger.</p>
+ <p> This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (faster_pch_gen)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_flat_include.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_flat_include.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>flat_include</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>flat_include</h3>
-<p> Searches an #include using a relative path using only the base filename. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma flat_include on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>When on, searches are performed where, for example “<span class="code">#include <sys/stat.h></span>” is treated the same as “<span class="code">#include <stat.h></span>”.<br />
- This pragma is useful when porting code form a different operating system, or when a project’s access paths cannot reach a given file.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (flat_include)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>flat_include</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>flat_include</h3>
+<p> Searches an #include using a relative path using only the base filename. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma flat_include on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>When on, searches are performed where, for example “<span class="code">#include <sys/stat.h></span>” is treated the same as “<span class="code">#include <stat.h></span>”.<br />
+ This pragma is useful when porting code form a different operating system, or when a project’s access paths cannot reach a given file.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (flat_include)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_float_constants.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_float_constants.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>float_constants</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>float_constants</h3>
-<p> Controls how floating pointing constants are treated.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma float_constants on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler assumes that all unqualified floating point constant values are of type float, not double. This pragma is useful when porting source code for programs optimized for the “float” rather than the “double” type.</p>
- <p>When you enable this pragma, you can still explicitly declare a constant value as double by appending a “D” suffix. For related information, see “The “D” Constant Suffix”.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (float_constants)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>float_constants</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>float_constants</h3>
+<p> Controls how floating pointing constants are treated.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma float_constants on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler assumes that all unqualified floating point constant values are of type float, not double. This pragma is useful when porting source code for programs optimized for the “float” rather than the “double” type.</p>
+ <p>When you enable this pragma, you can still explicitly declare a constant value as double by appending a “D” suffix. For related information, see “The “D” Constant Suffix”.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (float_constants)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_force_active.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_force_active.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>force_active</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>force_active</h3>
-<p> Controls how “dead” functions are linked.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma force_active on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the linker leaves functions within the scope of the pragma in the finished application, even if the functions are never called in the program.</p>
- <p> This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (force_active)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>force_active</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>force_active</h3>
+<p> Controls how “dead” functions are linked.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma force_active on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the linker leaves functions within the scope of the pragma in the finished application, even if the functions are never called in the program.</p>
+ <p> This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (force_active)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_fullpath_file.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_fullpath_file.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>fullpath_file</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>fullpath_file</h3>
-<p> Controls if the <span class="code">__FILE__</span> macro returns a full path or the base filename. The default is off.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma fullpath_file on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>When on, the <span class="code">__FILE__</span> macro returns a full path to the current file, otherwise it returns the base filename.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (fullpath_file)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>fullpath_file</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>fullpath_file</h3>
+<p> Controls if the <span class="code">__FILE__</span> macro returns a full path or the base filename. The default is off.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma fullpath_file on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>When on, the <span class="code">__FILE__</span> macro returns a full path to the current file, otherwise it returns the base filename.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (fullpath_file)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_fullpath_prepdump.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_fullpath_prepdump.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>fullpath_prepdump</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>fullpath_prepdump</h3>
-<p> Shows the full path of included files in preprocessor output.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma fullpath_prepdump on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler shows the full paths of files specified by the <span class="code">#include</span> directive as comments in the preprocessor output. Otherwise, only the file name portion of the path appears.</p>
- <p>This pragma corresponds to the Show full paths option . To check this setting, use the <span class="code">__option (fullpath_prepdump)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. See also “line_prepdump”. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>fullpath_prepdump</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>fullpath_prepdump</h3>
+<p> Shows the full path of included files in preprocessor output.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma fullpath_prepdump on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler shows the full paths of files specified by the <span class="code">#include</span> directive as comments in the preprocessor output. Otherwise, only the file name portion of the path appears.</p>
+ <p>This pragma corresponds to the Show full paths option . To check this setting, use the <span class="code">__option (fullpath_prepdump)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. See also “line_prepdump”. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_gcc_extensions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_gcc_extensions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,77 +1,77 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>gcc_extensions</h3>
-<p>Controls the acceptance of GNU C language extensions. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma gcc_extensions on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler accepts GNU C extensions in C source code. This includes the following non-ANSI C extensions:</p>
- <ul>
- <li>Initialization of automatic struct or array variables with non-const values</li>
- </ul>
- <blockquote>
- <p class="listing"> int foo(int arg)<br />
- {<br />
- int arr[2] = { arg, arg+1 };<br />
- }</p>
- </blockquote>
- <ul>
- <li class="code">sizeof( void ) == 1</li>
- <li class="code">sizeof( function-type ) == 1</li>
- <li>Limited support for GCC statements and declarations within expressions</li>
- </ul>
- <blockquote>
- <p class="listing">pragma gcc_extensions on<br />
- #define POW2(n) ({ int i,r; for(r=1,i=n; i>0; --i) r<<=1; r;})</p>
- <p>This feature only works for expressions in function bodies and does not support code that requires any form of C++ exception handling (for example, throwing or catching exceptions or creating local or temporary class objects that require a destructor call).</p>
- <p class="listing">int main()<br />
- {<br />
- return POW2(4);<br />
- }</p>
- </blockquote>
- <ul>
- <li>Macro redefinitions without a previous #undef.</li>
- <li>The GCC keyword <span class="code">typeof</span>. See “The __typeof__() and typeof() operators”, “Initialization of Local Arrays and Structures” for a description of these extensions.</li>
- <li>Function pointer arithmetic supported</li>
- <li><span class="code">void*</span> arithmetic supported</li>
- <li><span class="code">__builtin_constant_p (<expr>)</span> supported</li>
- <li>Forward declarations of arrays of incomplete type supported</li>
- <li>Pre-C99 designated initializer syntax (deprecated) supported</li>
- </ul>
- <blockquote>
- <p class="listing">#pragma gcc_extensions on<br />
- struct S { int a, b, b; } s = { c:3, b:2, a:1 };</p>
- </blockquote>
- <ul>
- <li>Conditionals with omitted Operands supported</li>
- </ul>
- <blockquote>
- <p class="listing"> #pragma gcc_extensions on<br />
- int x, y, z;<br />
- x = y ?: z;<br />
- Outputs:<br />
- x = y ? y ? z;</p>
- </blockquote>
- <ul>
- <li><span class="code">long __builtin_expect (long exp, long c)</span> now accepted</li>
- </ul>
- <p>This pragma corresponds to the Enable <a href="../pragmas/p_gcc_extensions.htm">GCC Extensions</a> setting . To check the global optimizer, use <span class="code">__option (gcc_extensions)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.<br />
- </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>gcc_extensions</h3>
+<p>Controls the acceptance of GNU C language extensions. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma gcc_extensions on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler accepts GNU C extensions in C source code. This includes the following non-ANSI C extensions:</p>
+ <ul>
+ <li>Initialization of automatic struct or array variables with non-const values</li>
+ </ul>
+ <blockquote>
+ <p class="listing"> int foo(int arg)<br />
+ {<br />
+ int arr[2] = { arg, arg+1 };<br />
+ }</p>
+ </blockquote>
+ <ul>
+ <li class="code">sizeof( void ) == 1</li>
+ <li class="code">sizeof( function-type ) == 1</li>
+ <li>Limited support for GCC statements and declarations within expressions</li>
+ </ul>
+ <blockquote>
+ <p class="listing">pragma gcc_extensions on<br />
+ #define POW2(n) ({ int i,r; for(r=1,i=n; i>0; --i) r<<=1; r;})</p>
+ <p>This feature only works for expressions in function bodies and does not support code that requires any form of C++ exception handling (for example, throwing or catching exceptions or creating local or temporary class objects that require a destructor call).</p>
+ <p class="listing">int main()<br />
+ {<br />
+ return POW2(4);<br />
+ }</p>
+ </blockquote>
+ <ul>
+ <li>Macro redefinitions without a previous #undef.</li>
+ <li>The GCC keyword <span class="code">typeof</span>. See “The __typeof__() and typeof() operators”, “Initialization of Local Arrays and Structures” for a description of these extensions.</li>
+ <li>Function pointer arithmetic supported</li>
+ <li><span class="code">void*</span> arithmetic supported</li>
+ <li><span class="code">__builtin_constant_p (<expr>)</span> supported</li>
+ <li>Forward declarations of arrays of incomplete type supported</li>
+ <li>Pre-C99 designated initializer syntax (deprecated) supported</li>
+ </ul>
+ <blockquote>
+ <p class="listing">#pragma gcc_extensions on<br />
+ struct S { int a, b, b; } s = { c:3, b:2, a:1 };</p>
+ </blockquote>
+ <ul>
+ <li>Conditionals with omitted Operands supported</li>
+ </ul>
+ <blockquote>
+ <p class="listing"> #pragma gcc_extensions on<br />
+ int x, y, z;<br />
+ x = y ?: z;<br />
+ Outputs:<br />
+ x = y ? y ? z;</p>
+ </blockquote>
+ <ul>
+ <li><span class="code">long __builtin_expect (long exp, long c)</span> now accepted</li>
+ </ul>
+ <p>This pragma corresponds to the Enable <a href="../pragmas/p_gcc_extensions.htm">GCC Extensions</a> setting . To check the global optimizer, use <span class="code">__option (gcc_extensions)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.<br />
+ </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_global_optimizer.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_global_optimizer.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>global_optimizer</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>global_optimizer</h3>
-<p> Controls whether the Global Optimizer is invoked by the compiler. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma global_optimizer on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>In most compilers, this pragma determines whether the Global Optimizer is invoked in the Global Optimizations panel. If disabled, only simple optimizations and back-end optimizations are performed.</p>
- <p class="note"> <strong>NOTE</strong> This is not the same as<span class="code"> #pragma <a href="p_optimization_level.htm">optimization_level</a></span>. The Global Optimizer is invoked even at <span class="code">optimization_level 0</span> if <span class="code">#pragma global_optimizer</span> is enabled.</p>
- <p>This pragma corresponds to the settings in the Global Optimizations panel. To check this setting, use <span class="code">__option (global_optimizer)</span><span class="code"></span> described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>global_optimizer</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>global_optimizer</h3>
+<p> Controls whether the Global Optimizer is invoked by the compiler. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma global_optimizer on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>In most compilers, this pragma determines whether the Global Optimizer is invoked in the Global Optimizations panel. If disabled, only simple optimizations and back-end optimizations are performed.</p>
+ <p class="note"> <strong>NOTE</strong> This is not the same as<span class="code"> #pragma <a href="p_optimization_level.htm">optimization_level</a></span>. The Global Optimizer is invoked even at <span class="code">optimization_level 0</span> if <span class="code">#pragma global_optimizer</span> is enabled.</p>
+ <p>This pragma corresponds to the settings in the Global Optimizations panel. To check this setting, use <span class="code">__option (global_optimizer)</span><span class="code"></span> described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_ignore_oldstyle.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_ignore_oldstyle.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,42 +1,42 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>ignore_oldstyle</h3>
-<p> Controls the recognition of function declarations that follow the conventions in place before ANSI/ISO C (i.e., “K&R” style).</p>
-<h5>Syntax</h5>
-
-<p class="code">#pragma ignore_oldstyle on | off | reset
-</p>
-<h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
-<p>If you enable this pragma, the compiler ignores old-style function declarations and lets you prototype a function any way you want. In old-style declarations, you do not specify the types of the arguments in the argument list but on separate lines. </p>
- <p>For example, the code in Listing 10.21 defines a prototype for a function with an old-style declaration.</p>
- <div class="listing">
- <h4>Listing 10.21 Mixing Old-style and Prototype Function Declarations</h4>
- <p>int f(char x, short y, float z);</p>
- <p> #pragma ignore_oldstyle on</p>
- <p>f(x, y, z)<br />
- char x;<br />
- short y;<br />
- float z;<br />
- {<br />
- return (int)x+y+z;<br />
- }</p>
- <p>#pragma ignore_oldstyle reset</p>
- </div>
-<p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (ignore_oldstyle)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>ignore_oldstyle</h3>
+<p> Controls the recognition of function declarations that follow the conventions in place before ANSI/ISO C (i.e., “K&R” style).</p>
+<h5>Syntax</h5>
+
+<p class="code">#pragma ignore_oldstyle on | off | reset
+</p>
+<h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+<p>If you enable this pragma, the compiler ignores old-style function declarations and lets you prototype a function any way you want. In old-style declarations, you do not specify the types of the arguments in the argument list but on separate lines. </p>
+ <p>For example, the code in Listing 10.21 defines a prototype for a function with an old-style declaration.</p>
+ <div class="listing">
+ <h4>Listing 10.21 Mixing Old-style and Prototype Function Declarations</h4>
+ <p>int f(char x, short y, float z);</p>
+ <p> #pragma ignore_oldstyle on</p>
+ <p>f(x, y, z)<br />
+ char x;<br />
+ short y;<br />
+ float z;<br />
+ {<br />
+ return (int)x+y+z;<br />
+ }</p>
+ <p>#pragma ignore_oldstyle reset</p>
+ </div>
+<p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (ignore_oldstyle)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_import.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_import.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>import</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>import</h3>
-<p> Controls the importing of data or functions. </p>
-<h5>Syntax</h5>
- <span class="code">#pragma import on | off | reset<br />
- #pragma import list name1 [, name2 ]*</span><br />
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>When using the <span class="code">#pragma import</span> on format, all functions are automatically imported.</p>
- <p>When using the <span class="code">#pragma import</span> list format, use to tag data or functions for importing. It applies to all names if it is used on an overloaded function. You cannot use this pragma for C++ member functions or static class members. An example of an imported list:</p>
- <p class="listing">extern int f(),g;<br />
- #pragma import list f,g</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (import)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>import</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>import</h3>
+<p> Controls the importing of data or functions. </p>
+<h5>Syntax</h5>
+ <span class="code">#pragma import on | off | reset<br />
+ #pragma import list name1 [, name2 ]*</span><br />
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>When using the <span class="code">#pragma import</span> on format, all functions are automatically imported.</p>
+ <p>When using the <span class="code">#pragma import</span> list format, use to tag data or functions for importing. It applies to all names if it is used on an overloaded function. You cannot use this pragma for C++ member functions or static class members. An example of an imported list:</p>
+ <p class="listing">extern int f(),g;<br />
+ #pragma import list f,g</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (import)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_inline_bottom_up.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_inline_bottom_up.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,40 +1,40 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>inline_bottom_up</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>inline_bottom_up</h3>
-<p> Controls the bottom-up function inlining method. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma inline_bottom_up on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>Bottom-up function inlining tries to expand up to eight levels of inline leaf functions. The maximum size of an expanded inline function and the caller of an inline function can be controlled by the pragmas shown in Listing 10.23 and Listing 10.24.</p>
- <div class="listing">
- <h4>Listing 10.23 Maximum Complexity of an Inlined Function</h4>
- <p>// maximum complexity of an inlined function<br />
- #pragma inline_max_size( max ) // default max == 256</p>
- </div>
- <div class="listing">
- <h4>Listing 10.24 Maximum Complexity of a Function that Calls Inlined Functions</h4>
- <p>// maximum complexity of a function that calls inlined functions<br />
- #pragma inline_max_total_size( max ) // default max == 10000</p>
- </div>
- <p>where <span class="code">max</span> loosely corresponds to the number of instructions in a function.</p>
- <p>If you enable this pragma, the compiler calculates inline depth from the last function in the call chain up to the first function that starts the call chain. The number of functions the compiler inlines from the bottom depends on the values of <span class="code">inline_depth</span>, <span class="code">inline_max_size</span>, and <span class="code">inline_max_total_size</span>. This method generates faster and smaller source code for some (but not all) programs with many nested inline function calls.</p>
- <p>If you disable this pragma, top-down inlining is selected, and the inline_depth setting determines the limits for top-down inlining.</p>
- <p>The pragmas <a href="p_inline_max_size.htm">inline_max_size</a> and <a href="p_inline_max_total_size.htm">inline_max_total_size</a> do not affect the compiler in top-down mode.</p>
- <p>This pragma corresponds to the Bottom-up Inline setting . To check this setting, use <span class="code">__option (inline_bottom_up)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>inline_bottom_up</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>inline_bottom_up</h3>
+<p> Controls the bottom-up function inlining method. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma inline_bottom_up on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>Bottom-up function inlining tries to expand up to eight levels of inline leaf functions. The maximum size of an expanded inline function and the caller of an inline function can be controlled by the pragmas shown in Listing 10.23 and Listing 10.24.</p>
+ <div class="listing">
+ <h4>Listing 10.23 Maximum Complexity of an Inlined Function</h4>
+ <p>// maximum complexity of an inlined function<br />
+ #pragma inline_max_size( max ) // default max == 256</p>
+ </div>
+ <div class="listing">
+ <h4>Listing 10.24 Maximum Complexity of a Function that Calls Inlined Functions</h4>
+ <p>// maximum complexity of a function that calls inlined functions<br />
+ #pragma inline_max_total_size( max ) // default max == 10000</p>
+ </div>
+ <p>where <span class="code">max</span> loosely corresponds to the number of instructions in a function.</p>
+ <p>If you enable this pragma, the compiler calculates inline depth from the last function in the call chain up to the first function that starts the call chain. The number of functions the compiler inlines from the bottom depends on the values of <span class="code">inline_depth</span>, <span class="code">inline_max_size</span>, and <span class="code">inline_max_total_size</span>. This method generates faster and smaller source code for some (but not all) programs with many nested inline function calls.</p>
+ <p>If you disable this pragma, top-down inlining is selected, and the inline_depth setting determines the limits for top-down inlining.</p>
+ <p>The pragmas <a href="p_inline_max_size.htm">inline_max_size</a> and <a href="p_inline_max_total_size.htm">inline_max_total_size</a> do not affect the compiler in top-down mode.</p>
+ <p>This pragma corresponds to the Bottom-up Inline setting . To check this setting, use <span class="code">__option (inline_bottom_up)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_inline_bottom_up_once.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_inline_bottom_up_once.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>inline_bottom_up_once</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>inline_bottom_up_once</h3>
-<p> Performs a single bottom-up function inlining operation. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma inline_bottom_up_once on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (inline_bottom_up_once)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is on.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>inline_bottom_up_once</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>inline_bottom_up_once</h3>
+<p> Performs a single bottom-up function inlining operation. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma inline_bottom_up_once on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (inline_bottom_up_once)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is on.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_inline_depth.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_inline_depth.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,39 +1,39 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>inline_depth</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>inline_depth</h3>
-<p> Controls how many passes are used to expand inline function calls. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma inline_depth(n)<br />
- #pragma inline_depth(smart)</p>
- <h5>Parameters</h5>
- <p class="code">n</p>
- <blockquote>
- <p> Sets the number of passes used to expand inline function calls. The number n is an integer from 0 to 1024 or the smart specifier. It also represents the distance allowed in the call chain from the last function up. For example, if d is the total depth of a call chain, then functions below (d-n) are inlined if they do not exceed the following size settings:</p>
- <p class="code">#pragma inline_max_size(n)<br />
- #pragma inline_max_total_size(n)</p>
- <p>The first pragma sets the maximum function size to be considered for inlining; the second sets the maximum size to which a function is allowed to grow after the functions it calls are inlined. Here, n is the number of statements, operands, and operators in the function, which turns out to be roughly twice the number of instructions generated by the function. However, this number can vary from function to function. For the inline_max_size pragma, the default value of n is 256; for the pragma <a href="p_inline_max_total_size.htm">inline_max_total_size</a>, the default value of n is 10000.</p>
- </blockquote>
- <p class="code">smart</p>
- <blockquote>
- <p>The smart specifier is the default mode, with four passes where the passes 2-4 are limited to small inline functions. All inlineable functions are expanded if inline_depth is set to 1-1024.<br />
- </p>
- </blockquote>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- The pragmas <a href="p_dont_inline.htm">dont_inline</a> and <a href="p_always_inline.htm">always_inline</a> override this pragma. This pragma corresponds to the Inline Depth setting . The default setting is <span class="code">off</span>.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>inline_depth</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>inline_depth</h3>
+<p> Controls how many passes are used to expand inline function calls. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma inline_depth(n)<br />
+ #pragma inline_depth(smart)</p>
+ <h5>Parameters</h5>
+ <p class="code">n</p>
+ <blockquote>
+ <p> Sets the number of passes used to expand inline function calls. The number n is an integer from 0 to 1024 or the smart specifier. It also represents the distance allowed in the call chain from the last function up. For example, if d is the total depth of a call chain, then functions below (d-n) are inlined if they do not exceed the following size settings:</p>
+ <p class="code">#pragma inline_max_size(n)<br />
+ #pragma inline_max_total_size(n)</p>
+ <p>The first pragma sets the maximum function size to be considered for inlining; the second sets the maximum size to which a function is allowed to grow after the functions it calls are inlined. Here, n is the number of statements, operands, and operators in the function, which turns out to be roughly twice the number of instructions generated by the function. However, this number can vary from function to function. For the inline_max_size pragma, the default value of n is 256; for the pragma <a href="p_inline_max_total_size.htm">inline_max_total_size</a>, the default value of n is 10000.</p>
+ </blockquote>
+ <p class="code">smart</p>
+ <blockquote>
+ <p>The smart specifier is the default mode, with four passes where the passes 2-4 are limited to small inline functions. All inlineable functions are expanded if inline_depth is set to 1-1024.<br />
+ </p>
+ </blockquote>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ The pragmas <a href="p_dont_inline.htm">dont_inline</a> and <a href="p_always_inline.htm">always_inline</a> override this pragma. This pragma corresponds to the Inline Depth setting . The default setting is <span class="code">off</span>.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_inline_max_auto_size.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_inline_max_auto_size.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>inline_max_auto_size</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>inline_max_auto_size</h3>
-<p> Determines the maximum complexity for an auto-inlined function. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma inline_max_auto_size ( complex )</p>
- <h5>Parameters</h5>
- <p class="code">complex</p>
- <blockquote>
- <p>The complex value is an approximation of the number of statements in a function, the current default is 15. Selecting a higher value will inline more functions, but can lead to excessive code bloat.</p>
- </blockquote>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (inline_max_auto_size)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>inline_max_auto_size</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>inline_max_auto_size</h3>
+<p> Determines the maximum complexity for an auto-inlined function. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma inline_max_auto_size ( complex )</p>
+ <h5>Parameters</h5>
+ <p class="code">complex</p>
+ <blockquote>
+ <p>The complex value is an approximation of the number of statements in a function, the current default is 15. Selecting a higher value will inline more functions, but can lead to excessive code bloat.</p>
+ </blockquote>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (inline_max_auto_size)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_inline_max_size.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_inline_max_size.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>inline_max_size</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>inline_max_size</h3>
-<p> Sets the maximum number of statements, operands, and operators used to consider the function for inlining. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma inline_max_size ( size )</p>
- <h5>Parameters</h5>
- <p class="code">size</p>
- <blockquote>
- <p>The maximum number of statements, operands, and operators in the function to consider it for inlining, up to a maximum of 256.</p>
- </blockquote>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (inline_max_size)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default is 256.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>inline_max_size</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>inline_max_size</h3>
+<p> Sets the maximum number of statements, operands, and operators used to consider the function for inlining. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma inline_max_size ( size )</p>
+ <h5>Parameters</h5>
+ <p class="code">size</p>
+ <blockquote>
+ <p>The maximum number of statements, operands, and operators in the function to consider it for inlining, up to a maximum of 256.</p>
+ </blockquote>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (inline_max_size)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default is 256.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_inline_max_total_size.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_inline_max_total_size.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>inline_max_total_size</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>inline_max_total_size</h3>
-<p> Sets the maximum total size a function can grow to when the function it calls is inlined. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma inline_max_total_size ( max_size )</p>
- <h5> Parameters</h5>
- <p class="code"> max_size</p>
- <blockquote>
- <p> The maximum number of statements, operands, and operators the inlined function calls that are also inlined, up to a maximum of 10000.</p>
- </blockquote>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (inline_max_total_size)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default is 10000.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>inline_max_total_size</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>inline_max_total_size</h3>
+<p> Sets the maximum total size a function can grow to when the function it calls is inlined. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma inline_max_total_size ( max_size )</p>
+ <h5> Parameters</h5>
+ <p class="code"> max_size</p>
+ <blockquote>
+ <p> The maximum number of statements, operands, and operators the inlined function calls that are also inlined, up to a maximum of 10000.</p>
+ </blockquote>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (inline_max_total_size)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default is 10000.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_instmgr_file.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_instmgr_file.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>instmgr_file</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>instmgr_file</h3>
-<p> Controls where the instance manager database is written, to the target data directory or to a separate file. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma instmgr_file "name"
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>When the Use Instance Manager option is on, the IDE writes the instance manager database to the project’s data directory. If the <span class="code">#pragma instmgr_file</span> is used, the database is written to a separate file. </p>
- <p>Also, a separate instance file is always written when the command-line tools are used.</p>
- <p class="note"><strong>NOTE</strong> Should you need to report a bug, use this option to create a separate instance manager database, which can then be sent to technical support with your bug report.</p>
- <p>This pragma corresponds to the Use Instance Manager setting . The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>instmgr_file</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>instmgr_file</h3>
+<p> Controls where the instance manager database is written, to the target data directory or to a separate file. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma instmgr_file "name"
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>When the Use Instance Manager option is on, the IDE writes the instance manager database to the project’s data directory. If the <span class="code">#pragma instmgr_file</span> is used, the database is written to a separate file. </p>
+ <p>Also, a separate instance file is always written when the command-line tools are used.</p>
+ <p class="note"><strong>NOTE</strong> Should you need to report a bug, use this option to create a separate instance manager database, which can then be sent to technical support with your bug report.</p>
+ <p>This pragma corresponds to the Use Instance Manager setting . The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_internal.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_internal.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>internal</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>internal</h3>
-<p> Controls the internalization of data or functions. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma internal on | off | reset<br />
- #pragma internal list name1 [, name2 ]*</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>When using the <span class="code">#pragma internal on</span> format, all data and functions are automatically internalized.</p>
- <p>Use the <span class="code">#pragma internal list</span> format to tag specific data or functions for internalization. It applies to all names if it is used on an overloaded function. You cannot use this pragma for C++ member functions or static class members. An example of an internalized list:</p>
- <p class="listing"> extern int f(),g;<br />
- #pragma internal list f,g</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (internal)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>internal</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>internal</h3>
+<p> Controls the internalization of data or functions. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma internal on | off | reset<br />
+ #pragma internal list name1 [, name2 ]*</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>When using the <span class="code">#pragma internal on</span> format, all data and functions are automatically internalized.</p>
+ <p>Use the <span class="code">#pragma internal list</span> format to tag specific data or functions for internalization. It applies to all names if it is used on an overloaded function. You cannot use this pragma for C++ member functions or static class members. An example of an internalized list:</p>
+ <p class="listing"> extern int f(),g;<br />
+ #pragma internal list f,g</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (internal)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_keepcomments.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_keepcomments.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>keepcomments</h3>
-<p> Controls whether comments are emitted in the preprocessor output.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma keepcomments on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- This pragma corresponds to the Keep comments option . The default setting is <span class="code">off</span>.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>keepcomments</h3>
+<p> Controls whether comments are emitted in the preprocessor output.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma keepcomments on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ This pragma corresponds to the Keep comments option . The default setting is <span class="code">off</span>.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_lib_export.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_lib_export.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>lib_export</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>lib_export</h3>
-<p> Controls the exporting of data or functions. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma lib_export on | off | reset<br />
- #pragma lib_export list name1 [, name2 ]*<br />
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>When using the <span class="code">#pragma lib_export on</span> format, all data and functions are automatically exported.</p>
- <p>Use the <span class="code">#pragma lib_export list</span> format to tag specific data or functions for exporting. It applies to all names if it is used on an overloaded function. You cannot use this pragma for C++ member functions or static class members. An example of a lib_export list:</p>
- <p class="listing"> extern int f(),g;<br />
- #pragma lib_export list f,g</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (lib_export)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>lib_export</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>lib_export</h3>
+<p> Controls the exporting of data or functions. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma lib_export on | off | reset<br />
+ #pragma lib_export list name1 [, name2 ]*<br />
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>When using the <span class="code">#pragma lib_export on</span> format, all data and functions are automatically exported.</p>
+ <p>Use the <span class="code">#pragma lib_export list</span> format to tag specific data or functions for exporting. It applies to all names if it is used on an overloaded function. You cannot use this pragma for C++ member functions or static class members. An example of a lib_export list:</p>
+ <p class="listing"> extern int f(),g;<br />
+ #pragma lib_export list f,g</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (lib_export)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_line_prepdump.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_line_prepdump.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>line_prepdump</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>line_prepdump</h3>
-<p> Shows #line directives in preprocessor output. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma line_prepdump on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, <span class="code">#line</span> directives appear in preprocessor output, and line spacing is preserved through the insertion of empty lines.</p>
- <p> Use this pragma with the command-line compiler’s <span class="code">-E</span> option to make sure that #line directives are inserted in the compiler’s output.</p>
- <p> This pragma corresponds to the Use #line option . To check this setting, use the <span class="code">__option (line_prepdump)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. See also “fullpath_prepdump”. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>line_prepdump</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>line_prepdump</h3>
+<p> Shows #line directives in preprocessor output. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma line_prepdump on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, <span class="code">#line</span> directives appear in preprocessor output, and line spacing is preserved through the insertion of empty lines.</p>
+ <p> Use this pragma with the command-line compiler’s <span class="code">-E</span> option to make sure that #line directives are inserted in the compiler’s output.</p>
+ <p> This pragma corresponds to the Use #line option . To check this setting, use the <span class="code">__option (line_prepdump)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. See also “fullpath_prepdump”. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_longlong.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_longlong.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>longlong</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>longlong</h3>
-<p> Controls the availability of the long long type.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma longlong on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>When the longlong pragma is enabled, the C or C++ compiler lets you define a 64-bit integer with the type specifier long long. This type is twice as large as a long int, which is a 32-bit integer. A variable of type long long can hold values from -9,223,372,036,854,775,808 to 9,223,372,036,854,775,807.</p>
- <p>An unsigned long long can hold values from <span class="code">0</span> to <span class="code">18,446,744,073,709,551,615</span>.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (longlong)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. </p>
- <p>This pragma is on in compiles that support the long long type by default. It is off in compiles that do not support, or cannot turn on, the long long type.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>longlong</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>longlong</h3>
+<p> Controls the availability of the long long type.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma longlong on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>When the longlong pragma is enabled, the C or C++ compiler lets you define a 64-bit integer with the type specifier long long. This type is twice as large as a long int, which is a 32-bit integer. A variable of type long long can hold values from -9,223,372,036,854,775,808 to 9,223,372,036,854,775,807.</p>
+ <p>An unsigned long long can hold values from <span class="code">0</span> to <span class="code">18,446,744,073,709,551,615</span>.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (longlong)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. </p>
+ <p>This pragma is on in compiles that support the long long type by default. It is off in compiles that do not support, or cannot turn on, the long long type.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_longlong_enums.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_longlong_enums.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>longlong_enums</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>longlong_enums</h3>
-<p> Controls whether or not enumerated types may have the size of the long long type. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma longlong_enums on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This pragma lets you use enumerators that are large enough to be long long integers. It is ignored if you enable the pragma <a href="p_enumsalwaysint.htm">enumsalwaysint</a> (described in “enumsalwaysint”).</p>
- <p> For more information on how the compiler handles enumerated types, see <a href="../c_compiler/c_enum_types.htm">Enumerated Types</a>.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (longlong_enums)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>longlong_enums</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>longlong_enums</h3>
+<p> Controls whether or not enumerated types may have the size of the long long type. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma longlong_enums on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This pragma lets you use enumerators that are large enough to be long long integers. It is ignored if you enable the pragma <a href="p_enumsalwaysint.htm">enumsalwaysint</a> (described in “enumsalwaysint”).</p>
+ <p> For more information on how the compiler handles enumerated types, see <a href="../c_compiler/c_enum_types.htm">Enumerated Types</a>.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (longlong_enums)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_longlong_prepeval.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_longlong_prepeval.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>longlong_prepeval</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>longlong_prepeval</h3>
-<p> Controls whether or not the preprocessor treats integral constant expressions as long long. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma longlong_prepeval on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the C/C++ preprocessor treats integral constant expressions in #if, #elif as type long long.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (longlong_prepeval)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>longlong_prepeval</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>longlong_prepeval</h3>
+<p> Controls whether or not the preprocessor treats integral constant expressions as long long. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma longlong_prepeval on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the C/C++ preprocessor treats integral constant expressions in #if, #elif as type long long.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (longlong_prepeval)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_macro_prepdump.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_macro_prepdump.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>macro_prepdump</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>macro_prepdump</h3>
-<p> Controls whether macro <span class="code">#defines</span> and <span class="code">#undefs</span> are emitted in the output when parsed. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma macro_prepdump on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p class="note"><strong>TIP</strong> Use this pragma to help unravel confusing problems like macros that are aliasing indentifiers or where headers are redefining macros unexpectedly.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (macro_prepdump)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>macro_prepdump</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>macro_prepdump</h3>
+<p> Controls whether macro <span class="code">#defines</span> and <span class="code">#undefs</span> are emitted in the output when parsed. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma macro_prepdump on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p class="note"><strong>TIP</strong> Use this pragma to help unravel confusing problems like macros that are aliasing indentifiers or where headers are redefining macros unexpectedly.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (macro_prepdump)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_mark.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_mark.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>mark</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>mark</h3>
-<p> Adds an item to the Function pop-up menu in the IDE editor. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma mark itemName </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This pragma adds <span class="code">itemName</span> to the source file’s Function pop-up menu. If you open the file in the Carbide Editor and select the item from the Function pop-up menu, the editor brings you to the pragma. Note that if the pragma is inside a function definition, the item does not appear in the Function pop-up menu.</p>
- <p> If <span class="code">itemName</span> begins with “<span class="code">--</span>”, a menu separator appears in the IDE’s Function pop-up menu:</p>
- <p class="code">#pragma mark --</p>
- <p>This pragma does not correspond to any panel setting. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>mark</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>mark</h3>
+<p> Adds an item to the Function pop-up menu in the IDE editor. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma mark itemName </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This pragma adds <span class="code">itemName</span> to the source file’s Function pop-up menu. If you open the file in the Carbide Editor and select the item from the Function pop-up menu, the editor brings you to the pragma. Note that if the pragma is inside a function definition, the item does not appear in the Function pop-up menu.</p>
+ <p> If <span class="code">itemName</span> begins with “<span class="code">--</span>”, a menu separator appears in the IDE’s Function pop-up menu:</p>
+ <p class="code">#pragma mark --</p>
+ <p>This pragma does not correspond to any panel setting. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_maxerrorcount.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_maxerrorcount.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>maxerrorcount</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>maxerrorcount</h3>
-<p> Limits the number of errors emitted while compiling a single file.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma maxerrorcount( <num> | off )</p>
- <h5> Parameters</h5>
- <p class="code">num</p>
- <blockquote>
- <p>Specifies the maximum number of error messages issued per source file.</p>
- </blockquote>
- <p class="code">off</p>
- <blockquote>
- <p>Effectively unbounds the number of issued error messages.</p>
- </blockquote>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>The total number of error messages emitted may include one final message "Too many errors emitted."</p>
- <p>This pragma does not correspond to any panel setting. By default, this pragma is off.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>maxerrorcount</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>maxerrorcount</h3>
+<p> Limits the number of errors emitted while compiling a single file.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma maxerrorcount( <num> | off )</p>
+ <h5> Parameters</h5>
+ <p class="code">num</p>
+ <blockquote>
+ <p>Specifies the maximum number of error messages issued per source file.</p>
+ </blockquote>
+ <p class="code">off</p>
+ <blockquote>
+ <p>Effectively unbounds the number of issued error messages.</p>
+ </blockquote>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>The total number of error messages emitted may include one final message "Too many errors emitted."</p>
+ <p>This pragma does not correspond to any panel setting. By default, this pragma is off.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_message.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_message.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>message</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>message</h3>
-<p> Tells the compiler to issue a text message to the user. The message appears in the Errors & Warnings window. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma message( msg )</p>
- <h5>Parameter</h5>
- <p class="code">msg</p>
- <blockquote>
- <p>Actual message to issue. Does not have to be a string literal.</p>
- </blockquote>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- This pragma does not correspond to any panel setting.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>message</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>message</h3>
+<p> Tells the compiler to issue a text message to the user. The message appears in the Errors & Warnings window. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma message( msg )</p>
+ <h5>Parameter</h5>
+ <p class="code">msg</p>
+ <blockquote>
+ <p>Actual message to issue. Does not have to be a string literal.</p>
+ </blockquote>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ This pragma does not correspond to any panel setting.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_mpwc_newline.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_mpwc_newline.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>mpwc_newline</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>mpwc_newline</h3>
-<p> Controls the newline character convention. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma mpwc_newline on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler uses the MPW conventions for the '\n' and '\r' characters. Otherwise, the compiler uses the ANSI C/C++ conventions for these characters.</p>
- <p>In MPW, '\n' is a Carriage Return (0x0D) and '\r' is a Line Feed (0x0A). In ANSI C/C++, they are reversed: '\n' is a Line Feed and '\r' is a Carriage Return.</p>
- <p>If you enable this pragma, use ANSI C/C++ libraries that were compiled when this pragma was enabled. The file names of the 68K versions of these libraries include the letters NL (for example, MSL C.68K (NL_2i).Lib). The PowerPC versions of these libraries are marked with NL; for example, MSL C.PPC (NL).Lib.</p>
- <p>If you enable this pragma and use the standard ANSI C/C++ libraries, you cannot read and write '\n' and '\r' properly. For example, printing '\n' brings you to the beginning of the current line instead of inserting a newline.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (mpwc_newline)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>mpwc_newline</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>mpwc_newline</h3>
+<p> Controls the newline character convention. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma mpwc_newline on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler uses the MPW conventions for the '\n' and '\r' characters. Otherwise, the compiler uses the ANSI C/C++ conventions for these characters.</p>
+ <p>In MPW, '\n' is a Carriage Return (0x0D) and '\r' is a Line Feed (0x0A). In ANSI C/C++, they are reversed: '\n' is a Line Feed and '\r' is a Carriage Return.</p>
+ <p>If you enable this pragma, use ANSI C/C++ libraries that were compiled when this pragma was enabled. The file names of the 68K versions of these libraries include the letters NL (for example, MSL C.68K (NL_2i).Lib). The PowerPC versions of these libraries are marked with NL; for example, MSL C.PPC (NL).Lib.</p>
+ <p>If you enable this pragma and use the standard ANSI C/C++ libraries, you cannot read and write '\n' and '\r' properly. For example, printing '\n' brings you to the beginning of the current line instead of inserting a newline.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (mpwc_newline)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_mpwc_relax.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_mpwc_relax.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>mpwc_relax</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>mpwc_relax</h3>
-<p> Controls the compatibility of the <span class="code">char*</span> and <span class="code">unsigned char*</span> types. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma mpwc_relax on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler treats <span class="code">char*</span> and <span class="code">unsigned char*</span> as the same type. This setting is especially useful if you are using code written before the ANSI C standard. This old source code frequently used these types interchangeably.</p>
- <p>This setting has no effect on C++ source code.</p>
- <p>You can use this pragma to relax function pointer checking:</p>
- <p class="listing">#pragma mpwc_relax on<br />
- extern void f(char *);<br />
- extern void(*fp1)(void *) = &f; // error but allowed<br />
- extern void(*fp2)(unsigned char *) = &f; // error but allowed</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, <span class="code">__option (mpwc_relax)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>mpwc_relax</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>mpwc_relax</h3>
+<p> Controls the compatibility of the <span class="code">char*</span> and <span class="code">unsigned char*</span> types. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma mpwc_relax on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler treats <span class="code">char*</span> and <span class="code">unsigned char*</span> as the same type. This setting is especially useful if you are using code written before the ANSI C standard. This old source code frequently used these types interchangeably.</p>
+ <p>This setting has no effect on C++ source code.</p>
+ <p>You can use this pragma to relax function pointer checking:</p>
+ <p class="listing">#pragma mpwc_relax on<br />
+ extern void f(char *);<br />
+ extern void(*fp1)(void *) = &f; // error but allowed<br />
+ extern void(*fp2)(unsigned char *) = &f; // error but allowed</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, <span class="code">__option (mpwc_relax)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_msg_show_lineref.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_msg_show_lineref.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>msg_show_lineref</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>msg_show_lineref</h3>
-<p> Controls diagnostic output by showing errors in source pointed to by <span class="code">#line</span>. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma msg_show_lineref on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (msg_show_lineref)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is on.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>msg_show_lineref</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>msg_show_lineref</h3>
+<p> Controls diagnostic output by showing errors in source pointed to by <span class="code">#line</span>. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma msg_show_lineref on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (msg_show_lineref)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is on.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_msg_show_realref.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_msg_show_realref.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>msg_show_realref</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>msg_show_realref</h3>
-<p> Controls diagnostic output showing errors in actual source where <span class="code">#line</span> reference exists. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma msg_show_realref on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (msg_show_realref)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is on.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>msg_show_realref</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>msg_show_realref</h3>
+<p> Controls diagnostic output showing errors in actual source where <span class="code">#line</span> reference exists. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma msg_show_realref on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (msg_show_realref)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is on.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_multibyteaware.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_multibyteaware.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>multibyteaware</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>multibyteaware</h3>
-<p> Controls how the Source encoding option is treated </p>
-<h5>Syntax</h5>
- <p class="code">#pragma multibyteaware on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This pragma has been deprecated. See the section “Multibyte and Unicode Support” and the <span class="code">#pragma <a href="p_text_encoding.htm">text_encoding</a></span> for more details.</p>
- <p>When on, this pragma treats the Source encoding of “ASCII” like “Autodetect”. When off, this pragma treats a Source encoding of “Autodetect” like “ASCII” setting. </p>
- <p class="note"><strong>NOTE</strong> Previously, this pragma told the compiler to “look twice” at the “\” character to avoid misinterpreting the character in a multibyte character sequence.</p>
- <p>This pragma does not correspond to any panel setting, but the replacement option Source encoding appears . To check this setting, use <span class="code">__option (multibyteaware)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is off.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>multibyteaware</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>multibyteaware</h3>
+<p> Controls how the Source encoding option is treated </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma multibyteaware on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This pragma has been deprecated. See the section “Multibyte and Unicode Support” and the <span class="code">#pragma <a href="p_text_encoding.htm">text_encoding</a></span> for more details.</p>
+ <p>When on, this pragma treats the Source encoding of “ASCII” like “Autodetect”. When off, this pragma treats a Source encoding of “Autodetect” like “ASCII” setting. </p>
+ <p class="note"><strong>NOTE</strong> Previously, this pragma told the compiler to “look twice” at the “\” character to avoid misinterpreting the character in a multibyte character sequence.</p>
+ <p>This pragma does not correspond to any panel setting, but the replacement option Source encoding appears . To check this setting, use <span class="code">__option (multibyteaware)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is off.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_new_mangler.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_new_mangler.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>new_mangler</h3>
-<p> Controls the inclusion or exclusion of a template instance’s function return type to the mangled name of the instance.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma new_mangler on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>The C++ standard requires that the function return type of a template instance to be included in the mangled name, which can cause incompatibilities. Enabling this pragma within a prefix file resolves those incompatibilities.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (new_mangler)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is on.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>new_mangler</h3>
+<p> Controls the inclusion or exclusion of a template instance’s function return type to the mangled name of the instance.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma new_mangler on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>The C++ standard requires that the function return type of a template instance to be included in the mangled name, which can cause incompatibilities. Enabling this pragma within a prefix file resolves those incompatibilities.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (new_mangler)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is on.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_no_conststringconv.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_no_conststringconv.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,34 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>no_conststringconv</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>no_conststringconv</h3>
-<p> Disables the deprecated implicit const string literal conversion (ISO C++, §4.2). </p>
-<h5>Syntax</h5>
- <p class="code">#pragma no_conststringconv on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>When enabled, the compiler generates an error when it encounters an implicit const string conversion. See example in Listing 10.27.</p>
- <div class="listing">
- <h4>Listing 10.27 Example of const string conversion</h4>
- <p>#pragma no_conststringconv on<br />
- char *cp = "Hello World"; // generates error: illegal<br />
- // implicit conversion from <br />
- // ’const char[12]’ to ’char *’</p>
- </div>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (no_conststringconv)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is off.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>no_conststringconv</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>no_conststringconv</h3>
+<p> Disables the deprecated implicit const string literal conversion (ISO C++, §4.2). </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma no_conststringconv on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>When enabled, the compiler generates an error when it encounters an implicit const string conversion. See example in Listing 10.27.</p>
+ <div class="listing">
+ <h4>Listing 10.27 Example of const string conversion</h4>
+ <p>#pragma no_conststringconv on<br />
+ char *cp = "Hello World"; // generates error: illegal<br />
+ // implicit conversion from <br />
+ // ’const char[12]’ to ’char *’</p>
+ </div>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (no_conststringconv)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is off.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_no_static_dtors.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_no_static_dtors.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>no_static_dtors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>no_static_dtors</h3>
-<p> Controls the generation of static destructors in C++. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma no_static_dtors on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler does not generate destructor calls for static data objects. Use this pragma for smaller object code for C++ programs that never exit.</p>
- <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (no_static_dtors)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>no_static_dtors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>no_static_dtors</h3>
+<p> Controls the generation of static destructors in C++. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma no_static_dtors on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler does not generate destructor calls for static data objects. Use this pragma for smaller object code for C++ programs that never exit.</p>
+ <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (no_static_dtors)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_nosyminline.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_nosyminline.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>nosyminline</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>nosyminline</h3>
-<p> Controls whether debug information is gathered for inline/template functions. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma nosyminline on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>When on, debug information is not gathered for inline/template functions.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (nosyminline)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>nosyminline</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>nosyminline</h3>
+<p> Controls whether debug information is gathered for inline/template functions. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma nosyminline on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>When on, debug information is not gathered for inline/template functions.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (nosyminline)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_notonce.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_notonce.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>notonce</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>notonce</h3>
-<p> Controls whether or not the compiler lets included files be repeatedly included, even with <span class="code">#pragma once on</span>. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma notonce</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, files can be repeatedly <span class="code">#included</span>, even if you have enabled <span class="code">#pragma once on</span>. For more information, see “once”.</p>
- <p> This pragma does not correspond to any panel setting. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>notonce</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>notonce</h3>
+<p> Controls whether or not the compiler lets included files be repeatedly included, even with <span class="code">#pragma once on</span>. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma notonce</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, files can be repeatedly <span class="code">#included</span>, even if you have enabled <span class="code">#pragma once on</span>. For more information, see “once”.</p>
+ <p> This pragma does not correspond to any panel setting. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_objective_c.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_objective_c.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,61 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>objective_c</h3>
-<p> Controls the use of Objective-C keywords.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma objective_c on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler lets you use the following additional objective C keywords:</p>
-<table width="76%" border="0" cellpadding="2" cellspacing="0">
- <tr class="code">
- <td>@class</td>
- <td>@def</td>
- <td>@encode</td>
- </tr>
- <tr class="code">
- <td>@end</td>
- <td>@implementation</td>
- <td>@interface</td>
- </tr>
- <tr class="code">
- <td>@private</td>
- <td>@protocol</td>
- <td>@protected</td>
- </tr>
- <tr class="code">
- <td>@public</td>
- <td>@selector</td>
- <td>bycopy</td>
- </tr>
- <tr class="code">
- <td>byref</td>
- <td>in</td>
- <td>inout</td>
- </tr>
- <tr class="code">
- <td>oneway</td>
- <td>out</td>
- <td> </td>
- </tr>
-</table>
-<p>The <span class="code">@protocol</span> forward declarations are supported</p>
-<p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (objective_c)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. </p>
-<p>By default, this setting is automatically enabled when a file’s extension is “.m” or “.pchm”. This setting and <span class="code">#pragma <a href="p_cplusplus.htm">cplusplus</a></span> on are automatically enabled when a file's extension is “.mm”, “.M”, or “.pchmm”.</p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>objective_c</h3>
+<p> Controls the use of Objective-C keywords.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma objective_c on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler lets you use the following additional objective C keywords:</p>
+<table width="76%" border="0" cellpadding="2" cellspacing="0">
+ <tr class="code">
+ <td>@class</td>
+ <td>@def</td>
+ <td>@encode</td>
+ </tr>
+ <tr class="code">
+ <td>@end</td>
+ <td>@implementation</td>
+ <td>@interface</td>
+ </tr>
+ <tr class="code">
+ <td>@private</td>
+ <td>@protocol</td>
+ <td>@protected</td>
+ </tr>
+ <tr class="code">
+ <td>@public</td>
+ <td>@selector</td>
+ <td>bycopy</td>
+ </tr>
+ <tr class="code">
+ <td>byref</td>
+ <td>in</td>
+ <td>inout</td>
+ </tr>
+ <tr class="code">
+ <td>oneway</td>
+ <td>out</td>
+ <td> </td>
+ </tr>
+</table>
+<p>The <span class="code">@protocol</span> forward declarations are supported</p>
+<p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (objective_c)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. </p>
+<p>By default, this setting is automatically enabled when a file’s extension is “.m” or “.pchm”. This setting and <span class="code">#pragma <a href="p_cplusplus.htm">cplusplus</a></span> on are automatically enabled when a file's extension is “.mm”, “.M”, or “.pchmm”.</p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_old_pragma_once.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_old_pragma_once.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>old_pragma_once</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>old_pragma_once (not available) </h3>
-<p> This pragma is no longer available.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>old_pragma_once</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>old_pragma_once (not available) </h3>
+<p> This pragma is no longer available.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_old_vtable.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_old_vtable.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>old_vtable</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>old_vtable (not available) </h3>
-<p> This pragma is no longer available.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>old_vtable</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>old_vtable (not available) </h3>
+<p> This pragma is no longer available.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_once.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_once.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>once</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>once</h3>
-<p> Controls whether or not a header file can be included more than once in the same compilation unit. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma once [ on ]
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>Use this pragma to ensure that the compiler includes header files only once in a source file. This pragma is especially useful in precompiled header files.</p>
- <p> There are two versions of this pragma: <span class="code">#pragma once</span> and <span class="code">#pragma once on</span>. Use<span class="code"> #pragma once</span> in a header file to ensure that the header file is included only once in a source file. Use <span class="code">#pragma once on</span> in a header file or source file to insure that any file is included only once in a source file.</p>
- <p>Be aware that when using <span class="code">#pragma once on</span>, precompiled headers might not necessarily transfer from machine to machine and provide the same results. This is because the full paths of included files are stored to distinguish between two distinct files that have identical filenames but different paths. Use the warn_pch_portability pragma to issue a warning when <span class="code">#pragma once</span> on is used in a precompiled header. For more information, see <span class="code">pragma <a href="p_warn_pch_portability.htm">warn_pch_portability</a></span>.</p>
- <p>This pragma does not correspond to any panel setting. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>once</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>once</h3>
+<p> Controls whether or not a header file can be included more than once in the same compilation unit. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma once [ on ]
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>Use this pragma to ensure that the compiler includes header files only once in a source file. This pragma is especially useful in precompiled header files.</p>
+ <p> There are two versions of this pragma: <span class="code">#pragma once</span> and <span class="code">#pragma once on</span>. Use<span class="code"> #pragma once</span> in a header file to ensure that the header file is included only once in a source file. Use <span class="code">#pragma once on</span> in a header file or source file to insure that any file is included only once in a source file.</p>
+ <p>Be aware that when using <span class="code">#pragma once on</span>, precompiled headers might not necessarily transfer from machine to machine and provide the same results. This is because the full paths of included files are stored to distinguish between two distinct files that have identical filenames but different paths. Use the warn_pch_portability pragma to issue a warning when <span class="code">#pragma once</span> on is used in a precompiled header. For more information, see <span class="code">pragma <a href="p_warn_pch_portability.htm">warn_pch_portability</a></span>.</p>
+ <p>This pragma does not correspond to any panel setting. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_only_std_keywords.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_only_std_keywords.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>only_std_keywords</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>only_std_keywords</h3>
-<p> Controls the use of ISO keywords. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma only_std_keywords on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>The C/C++ compiler recognizes additional reserved keywords. If you are writing code that must follow the ANSI standard strictly, enable the pragma only_std_keywords. For more information, see “ANSI Keywords Only”.</p>
- <p>This pragma corresponds to the ANSI Keywords Only setting . To check this setting, use <span class="code">__option (only_std_keywords)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>only_std_keywords</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>only_std_keywords</h3>
+<p> Controls the use of ISO keywords. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma only_std_keywords on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>The C/C++ compiler recognizes additional reserved keywords. If you are writing code that must follow the ANSI standard strictly, enable the pragma only_std_keywords. For more information, see “ANSI Keywords Only”.</p>
+ <p>This pragma corresponds to the ANSI Keywords Only setting . To check this setting, use <span class="code">__option (only_std_keywords)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_classresults.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_classresults.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,39 +1,39 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>opt_classresults</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>opt_classresults</h3>
-<p> Controls the omission of the copy constructor call for class return types if all return statements in a function return the same local class object. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma opt_classresults on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>Example of using <span class="code">#pragma opt_classresults</span>:</p>
- <div class="listing">
- <p>#pragma opt_classresults on</p>
- <p>struct X {<br />
- X();<br />
- X(const X&);<br />
- // ...<br />
- };</p>
- <p>X f() {<br />
- X x; // directly constructed in function result buffer<br />
- // ...<br />
- return x; // no copy-ctor call<br />
- }</p>
- </div>
- <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_classresults)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is on.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>opt_classresults</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>opt_classresults</h3>
+<p> Controls the omission of the copy constructor call for class return types if all return statements in a function return the same local class object. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma opt_classresults on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>Example of using <span class="code">#pragma opt_classresults</span>:</p>
+ <div class="listing">
+ <p>#pragma opt_classresults on</p>
+ <p>struct X {<br />
+ X();<br />
+ X(const X&);<br />
+ // ...<br />
+ };</p>
+ <p>X f() {<br />
+ X x; // directly constructed in function result buffer<br />
+ // ...<br />
+ return x; // no copy-ctor call<br />
+ }</p>
+ </div>
+ <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_classresults)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is on.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_common_subs.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_common_subs.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>opt_common_subs</h3>
-<p> Controls the use of common subexpression optimization. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma opt_common_subs on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler replaces similar redundant expressions with a single expression. For example, if two statements in a function both use the expression</p>
- <p class="code">a * b * c + 10</p>
- <p>the compiler generates object code that computes the expression only once and applies the resulting value to both statements.</p>
- <p>The compiler applies this optimization to its own internal representation of the object code it produces. </p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_common_subs)</span>, this settings is related to the “global_optimizer” level.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>opt_common_subs</h3>
+<p> Controls the use of common subexpression optimization. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma opt_common_subs on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler replaces similar redundant expressions with a single expression. For example, if two statements in a function both use the expression</p>
+ <p class="code">a * b * c + 10</p>
+ <p>the compiler generates object code that computes the expression only once and applies the resulting value to both statements.</p>
+ <p>The compiler applies this optimization to its own internal representation of the object code it produces. </p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_common_subs)</span>, this settings is related to the “global_optimizer” level.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_dead_assignments.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_dead_assignments.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>opt_dead_assignments</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>opt_dead_assignments</h3>
-<p> Controls the use of dead store optimization. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma opt_dead_assignments on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler removes assignments to unused variables before reassigning them.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_dead_assignments)</span>, this settings is related to the “global_optimizer” level.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>opt_dead_assignments</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>opt_dead_assignments</h3>
+<p> Controls the use of dead store optimization. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma opt_dead_assignments on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler removes assignments to unused variables before reassigning them.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_dead_assignments)</span>, this settings is related to the “global_optimizer” level.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_dead_code.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_dead_code.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>opt_dead_code</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>opt_dead_code</h3>
-<p> Controls the use of dead code optimization. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma opt_dead_code on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler removes a statement that other statements never execute or call.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_dead_code)</span>, this settings is related to the “global_optimizer” level.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>opt_dead_code</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>opt_dead_code</h3>
+<p> Controls the use of dead code optimization. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma opt_dead_code on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler removes a statement that other statements never execute or call.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_dead_code)</span>, this settings is related to the “global_optimizer” level.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_lifetimes.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_lifetimes.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>opt_lifetimes</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>opt_lifetimes</h3>
-<p> Controls the use of lifetime analysis optimization. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma opt_lifetimes on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler uses the same processor register for different variables that exist in the same routine but not in the same statement.</p>
- <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_lifetimes)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. This settings is related to the “global_optimizer” level.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>opt_lifetimes</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>opt_lifetimes</h3>
+<p> Controls the use of lifetime analysis optimization. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma opt_lifetimes on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler uses the same processor register for different variables that exist in the same routine but not in the same statement.</p>
+ <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_lifetimes)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. This settings is related to the “global_optimizer” level.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_loop_invariants.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_loop_invariants.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>opt_loop_invariants</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>opt_loop_invariants</h3>
-<p> Controls the use of loop invariant optimization. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma opt_loop_invariants on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler moves all computations that do not change inside a loop outside the loop, which then runs faster.</p>
- <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_loop_invariants)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. This settings is related to the “global_optimizer” level.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>opt_loop_invariants</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>opt_loop_invariants</h3>
+<p> Controls the use of loop invariant optimization. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma opt_loop_invariants on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler moves all computations that do not change inside a loop outside the loop, which then runs faster.</p>
+ <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_loop_invariants)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. This settings is related to the “global_optimizer” level.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_propagation.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_propagation.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>opt_propagation</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>opt_propagation</h3>
-<p> Controls the use of copy and constant propagation optimization. </p>
-<h5>Syntax</h5>
- <span class="code">#pragma opt_propagation on | off | reset</span><br />
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler replaces multiple occurrences of one variable with a single occurrence.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_propagation)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. This settings is related to the “global_optimizer” level.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>opt_propagation</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>opt_propagation</h3>
+<p> Controls the use of copy and constant propagation optimization. </p>
+<h5>Syntax</h5>
+ <span class="code">#pragma opt_propagation on | off | reset</span><br />
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler replaces multiple occurrences of one variable with a single occurrence.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_propagation)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. This settings is related to the “global_optimizer” level.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_strength_reduction.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_strength_reduction.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>opt_strength_reduction</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>opt_strength_reduction</h3>
-<p> Controls the use of strength reduction optimization. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma opt_strength_reduction on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler replaces array element arithmetic instructions with pointer arithmetic instructions to make loops faster.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_strength_reduction)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. This settings is related to the “global_optimizer” level.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>opt_strength_reduction</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>opt_strength_reduction</h3>
+<p> Controls the use of strength reduction optimization. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma opt_strength_reduction on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler replaces array element arithmetic instructions with pointer arithmetic instructions to make loops faster.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_strength_reduction)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. This settings is related to the “global_optimizer” level.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_strength_reduction_strict.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_strength_reduction_strict.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>opt_strength_reduction_strict</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>opt_strength_reduction_strict</h3>
-<p> Uses a safer variation of strength reduction optimization. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma opt_strength_reduction_strict on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>Like the pragma <a href="p_opt_strength_reduction.htm">opt_strength_reduction</a>, this setting replaces multiplication instructions that are inside loops with addition instructions to speed up the loops. However, unlike the regular strength reduction optimization, this variation ensures that the optimization is only applied when the array element arithmetic is not of an unsigned type that is smaller than a pointer type.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_strength_reduction_strict)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default varies according to the compiler.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>opt_strength_reduction_strict</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>opt_strength_reduction_strict</h3>
+<p> Uses a safer variation of strength reduction optimization. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma opt_strength_reduction_strict on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>Like the pragma <a href="p_opt_strength_reduction.htm">opt_strength_reduction</a>, this setting replaces multiplication instructions that are inside loops with addition instructions to speed up the loops. However, unlike the regular strength reduction optimization, this variation ensures that the optimization is only applied when the array element arithmetic is not of an unsigned type that is smaller than a pointer type.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_strength_reduction_strict)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default varies according to the compiler.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_unroll_loops.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_unroll_loops.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>opt_unroll_loops</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>opt_unroll_loops</h3>
-<p> Controls the use of loop unrolling optimization. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma opt_unroll_loops on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler places multiple copies of a loop’s statements inside a loop to improve its speed.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_unroll_loops)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. This settings is related to the “global_optimizer” level.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>opt_unroll_loops</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>opt_unroll_loops</h3>
+<p> Controls the use of loop unrolling optimization. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma opt_unroll_loops on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler places multiple copies of a loop’s statements inside a loop to improve its speed.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (opt_unroll_loops)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. This settings is related to the “global_optimizer” level.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_vectorize_loops.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_opt_vectorize_loops.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>opt_vectorize_loops</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>opt_vectorize_loops</h3>
-<p> Controls the use of loop vectorizing optimization. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma opt_vectorize_loops on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler improves loop performance on compilers that support loop vectorization, like the x86 compiler.</p>
- <p class="note"><strong>NOTE</strong> Do not confuse loop vectorizing with the vector instructions supported by some chips, like MMX/SSE on x86. For x86, processor-specific instructions and vector instruction sets must be enabled as well. </p>
- <p>Only the x86 CodeGen settings panel has the Autovectorize loops option, it is not available as an option setting in any other panel.</p>
- <p>To check this setting, use <span class="code">__option (opt_vectorize_loops)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is off.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>opt_vectorize_loops</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>opt_vectorize_loops</h3>
+<p> Controls the use of loop vectorizing optimization. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma opt_vectorize_loops on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler improves loop performance on compilers that support loop vectorization, like the x86 compiler.</p>
+ <p class="note"><strong>NOTE</strong> Do not confuse loop vectorizing with the vector instructions supported by some chips, like MMX/SSE on x86. For x86, processor-specific instructions and vector instruction sets must be enabled as well. </p>
+ <p>Only the x86 CodeGen settings panel has the Autovectorize loops option, it is not available as an option setting in any other panel.</p>
+ <p>To check this setting, use <span class="code">__option (opt_vectorize_loops)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is off.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_optimization_level.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_optimization_level.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>optimization_level</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>optimization_level</h3>
-<p> Controls global optimization. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma optimization_level 0 | 1 | 2 | 3 | 4
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This pragma specifies the degree of optimization that the global optimizer performs.</p>
- <p>To select optimizations, use the pragma optimization_level with an argument from 0 to 4. The higher the argument, the more optimizations performed by the global optimizer.</p>
- <p>For more information on the optimization the compiler performs for each optimization level, refer to the Targeting manual for your target platform. </p>
- <p>These pragmas correspond to the settings in the Global Optimizations panel. By default, the settings corresponds to the level set in the Global Optimizations panel.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>optimization_level</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>optimization_level</h3>
+<p> Controls global optimization. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma optimization_level 0 | 1 | 2 | 3 | 4
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This pragma specifies the degree of optimization that the global optimizer performs.</p>
+ <p>To select optimizations, use the pragma optimization_level with an argument from 0 to 4. The higher the argument, the more optimizations performed by the global optimizer.</p>
+ <p>For more information on the optimization the compiler performs for each optimization level, refer to the Targeting manual for your target platform. </p>
+ <p>These pragmas correspond to the settings in the Global Optimizations panel. By default, the settings corresponds to the level set in the Global Optimizations panel.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_optimize_for_size.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_optimize_for_size.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>optimize_for_size</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>optimize_for_size</h3>
-<p> Controls optimization to reduce the size of object code. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma optimize_for_size on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This setting lets you choose what the compiler does when it must decide between creating small code or fast code. If you enable this pragma, the compiler creates smaller object code at the expense of speed. It also ignores the inline directive and generates function calls to call any function declared inline. If you disable this pragma, the compiler creates faster object code at the expense of size.</p>
- <p>The pragma corresponds to the Optimize for Size setting in the Global Optimizations panel. To check this setting, use <span class="code">__option (optimize_for_size)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>optimize_for_size</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>optimize_for_size</h3>
+<p> Controls optimization to reduce the size of object code. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma optimize_for_size on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This setting lets you choose what the compiler does when it must decide between creating small code or fast code. If you enable this pragma, the compiler creates smaller object code at the expense of speed. It also ignores the inline directive and generates function calls to call any function declared inline. If you disable this pragma, the compiler creates faster object code at the expense of size.</p>
+ <p>The pragma corresponds to the Optimize for Size setting in the Global Optimizations panel. To check this setting, use <span class="code">__option (optimize_for_size)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_optimizewithasm.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_optimizewithasm.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>optimizewithasm</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>optimizewithasm</h3>
-<p> Controls optimization of assembly language. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma optimizewithasm on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This #pragma controls whether the optimizer queries the backend compiler for the effects of inline assembly instructions so it can safely perform code motion, dead code removal, and constant propagation that may affect assembly code. This #pragma should usually remain on.</p>
- <p>Use <span class="code">#pragma optimizewithasm on</span> to tell the optimizer it is safe to optimize assembly language statements in C/C++ source code. This is available in the x86 compiler.</p>
- <p>Use <span class="code">#pragma optimizewithasm off</span> to tell the optimizer to explicitly disable several optimizations in functions containing inline assembly to avoid removing or reordering code that might change the bahavior of the inline assembly.</p>
- <p class="note"><strong>NOTE</strong> The backend compiler may have additional options or directives to control optimization of the actual inline assembly code.</p>
- <p>This pragma corresponds to the Inline Assembly settings in the CodeGen panel. To check this setting, use <span class="code">__option (optimizewithasm)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>optimizewithasm</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>optimizewithasm</h3>
+<p> Controls optimization of assembly language. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma optimizewithasm on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This #pragma controls whether the optimizer queries the backend compiler for the effects of inline assembly instructions so it can safely perform code motion, dead code removal, and constant propagation that may affect assembly code. This #pragma should usually remain on.</p>
+ <p>Use <span class="code">#pragma optimizewithasm on</span> to tell the optimizer it is safe to optimize assembly language statements in C/C++ source code. This is available in the x86 compiler.</p>
+ <p>Use <span class="code">#pragma optimizewithasm off</span> to tell the optimizer to explicitly disable several optimizations in functions containing inline assembly to avoid removing or reordering code that might change the bahavior of the inline assembly.</p>
+ <p class="note"><strong>NOTE</strong> The backend compiler may have additional options or directives to control optimization of the actual inline assembly code.</p>
+ <p>This pragma corresponds to the Inline Assembly settings in the CodeGen panel. To check this setting, use <span class="code">__option (optimizewithasm)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_options.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_options.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,62 +1,62 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>options</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>options</h3>
-<p> Specifies how to align struct and class data.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma options align= alignment</p>
- <h5>Parameter</h5>
- <p class="code">alignment</p>
- <blockquote>
- <p>Specifies the boundary on which struct and class data is aligned in memory. Values for alignment range from 1 to 16, or use one of the following preset values:</p>
- <table width="75%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="25%" scope="col">If alignment is …</th>
- <th width="75%" scope="col">The compiler …</th>
- </tr>
- <tr>
- <td class="code">mac68k</td>
- <td>Aligns every field on a 2-byte boundaries, unless a field is only 1 byte long. This is the standard alignment for 68K Macintoshes.</td>
- </tr>
- <tr>
- <td class="code">mac68k4byte</td>
- <td>Aligns every field on 4-byte boundaries.</td>
- </tr>
- <tr>
- <td class="code">power</td>
- <td>Aligns every field on its natural boundary. This is the standard alignment for Power Macintoshes. For example, it aligns a character on a 1-byte boundary and a 16-bit integer on a 2-byte boundary. The compiler applies this alignment recursively to structured data and arrays containing structured data. So, for example, it aligns an array of structured types containing an 4-byte floating point member on an 4-byte boundary.</td>
- </tr>
- <tr>
- <td class="code">native</td>
- <td>Aligns every field using the standard alignment. It is equivalent to using mac68k for 68K Macintoshes and power for Power Macintoshes.</td>
- </tr>
- <tr>
- <td class="code">packed</td>
- <td>Aligns every field on a 1-byte boundary. It is not available in any panel. This alignment causes your code to crash or run slowly on many platforms. Use it with caution.</td>
- </tr>
- <tr>
- <td class="code">reset</td>
- <td>Resets to the value in the previous <span class="code">#pragma options align</span> statement.
- <p class="note"><strong>NOTE</strong> There is a space between <span class="code">options</span> and <span class="code">align</span></p>
- </td>
- </tr>
- </table>
- </blockquote>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- This pragma corresponds to the Struct Alignment setting in the <Target> Processor or <Target> CodeGen panel.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>options</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>options</h3>
+<p> Specifies how to align struct and class data.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma options align= alignment</p>
+ <h5>Parameter</h5>
+ <p class="code">alignment</p>
+ <blockquote>
+ <p>Specifies the boundary on which struct and class data is aligned in memory. Values for alignment range from 1 to 16, or use one of the following preset values:</p>
+ <table width="75%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="25%" scope="col">If alignment is …</th>
+ <th width="75%" scope="col">The compiler …</th>
+ </tr>
+ <tr>
+ <td class="code">mac68k</td>
+ <td>Aligns every field on a 2-byte boundaries, unless a field is only 1 byte long. This is the standard alignment for 68K Macintoshes.</td>
+ </tr>
+ <tr>
+ <td class="code">mac68k4byte</td>
+ <td>Aligns every field on 4-byte boundaries.</td>
+ </tr>
+ <tr>
+ <td class="code">power</td>
+ <td>Aligns every field on its natural boundary. This is the standard alignment for Power Macintoshes. For example, it aligns a character on a 1-byte boundary and a 16-bit integer on a 2-byte boundary. The compiler applies this alignment recursively to structured data and arrays containing structured data. So, for example, it aligns an array of structured types containing an 4-byte floating point member on an 4-byte boundary.</td>
+ </tr>
+ <tr>
+ <td class="code">native</td>
+ <td>Aligns every field using the standard alignment. It is equivalent to using mac68k for 68K Macintoshes and power for Power Macintoshes.</td>
+ </tr>
+ <tr>
+ <td class="code">packed</td>
+ <td>Aligns every field on a 1-byte boundary. It is not available in any panel. This alignment causes your code to crash or run slowly on many platforms. Use it with caution.</td>
+ </tr>
+ <tr>
+ <td class="code">reset</td>
+ <td>Resets to the value in the previous <span class="code">#pragma options align</span> statement.
+ <p class="note"><strong>NOTE</strong> There is a space between <span class="code">options</span> and <span class="code">align</span></p>
+ </td>
+ </tr>
+ </table>
+ </blockquote>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ This pragma corresponds to the Struct Alignment setting in the <Target> Processor or <Target> CodeGen panel.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_parse_func_templ.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_parse_func_templ.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>parse_func_templ</h3>
-<p> Controls strict versus relaxed parser setttings supported by the Carbide.c++ compiler. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma parse_func_templ on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, your C++ source code is compiled using the strict version of the language parser.</p>
- <p>This option actually corresponds to the ISO C++ Template Parser setting . To check this setting, use <span class="code">__option (parse_func_templ)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>parse_func_templ</h3>
+<p> Controls strict versus relaxed parser setttings supported by the Carbide.c++ compiler. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma parse_func_templ on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, your C++ source code is compiled using the strict version of the language parser.</p>
+ <p>This option actually corresponds to the ISO C++ Template Parser setting . To check this setting, use <span class="code">__option (parse_func_templ)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_parse_mfunc_templ.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_parse_mfunc_templ.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>parse_mfunc_templ</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>parse_mfunc_templ</h3>
-<p> Controls strict versus relaxed parser setttings for member function bodies.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma parse_mfunc_templ on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, member function bodies within your C++ source code are compiled using the strict version of the language parser.</p>
- <p>This option actually corresponds to the ISO C++ Template Parser setting . To check this setting, use <span class="code">__option (parse_mfunc_templ)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>parse_mfunc_templ</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>parse_mfunc_templ</h3>
+<p> Controls strict versus relaxed parser setttings for member function bodies.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma parse_mfunc_templ on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, member function bodies within your C++ source code are compiled using the strict version of the language parser.</p>
+ <p>This option actually corresponds to the ISO C++ Template Parser setting . To check this setting, use <span class="code">__option (parse_mfunc_templ)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_pool_strings.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_pool_strings.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>pool_strings</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>pool_strings</h3>
-<p> Controls how string literals are stored. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma pool_strings on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler collects all string constants into a single data object so your program needs one data section for all of them. If you disable this pragma, the compiler creates a unique data object and TOC entry for each string constant. While this decreases the number of data sections in your program, on some processors, like the PowerPC, it also makes your program bigger because it uses a less efficient method to store the address of the string. </p>
- <p>This pragma is especially useful if your program is large and has many string constants or uses the Metrowerks Profiler.</p>
- <p class="note"><strong>NOTE</strong> If you enable this pragma, the compiler ignores the setting of the pragma pcrelstrings.</p>
- <p>This pragma corresponds to the Pool Strings setting .</p>
- <p class="note"><strong>NOTE</strong> A compiler may override this panel setting in a processor-specific code generation panel.</p>
- <p>To check this setting, use <span class="code">__option (pool_strings)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>pool_strings</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>pool_strings</h3>
+<p> Controls how string literals are stored. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma pool_strings on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler collects all string constants into a single data object so your program needs one data section for all of them. If you disable this pragma, the compiler creates a unique data object and TOC entry for each string constant. While this decreases the number of data sections in your program, on some processors, like the PowerPC, it also makes your program bigger because it uses a less efficient method to store the address of the string. </p>
+ <p>This pragma is especially useful if your program is large and has many string constants or uses the Metrowerks Profiler.</p>
+ <p class="note"><strong>NOTE</strong> If you enable this pragma, the compiler ignores the setting of the pragma pcrelstrings.</p>
+ <p>This pragma corresponds to the Pool Strings setting .</p>
+ <p class="note"><strong>NOTE</strong> A compiler may override this panel setting in a processor-specific code generation panel.</p>
+ <p>To check this setting, use <span class="code">__option (pool_strings)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_pop_push.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_pop_push.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,39 +1,39 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>pop, push</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>pop, push</h3>
-<p> Save and restore pragma settings. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma push<br />
- #pragma pop</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>The pragma push saves all the current pragma settings. The pragma pop restores all the pragma settings that resulted from the last push pragma. For example, see Listing 10.29.</p>
- <div class="listing">
- <h4>Listing 10.29 push and pop Example</h4>
- <p>#pragma far_data on<br />
- #pragma pointers_in_A0<br />
- #pragma push // push all compiler settings<br />
- #pragma far_data off<br />
- #pragma pointers_in_D0<br />
- // pop restores "far_data" and "pointers_in_A0"<br />
- #pragma pop</p>
- </div>
- <p class="note"><strong>NOTE</strong> This example uses some platform-specific pragmas for illustrative purposes only. See the Targeting manual for your platform to determine which pragmas are supported.</p>
- <p>This pragma does not correspond to any panel setting.</p>
- <p class="note"><strong>TIP</strong> Pragmas that allow on | off | reset already form a stack of previous option values. It is not necessary to use <span class="code">#pragma pop/push</span> with such pragmas.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>pop, push</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>pop, push</h3>
+<p> Save and restore pragma settings. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma push<br />
+ #pragma pop</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>The pragma push saves all the current pragma settings. The pragma pop restores all the pragma settings that resulted from the last push pragma. For example, see Listing 10.29.</p>
+ <div class="listing">
+ <h4>Listing 10.29 push and pop Example</h4>
+ <p>#pragma far_data on<br />
+ #pragma pointers_in_A0<br />
+ #pragma push // push all compiler settings<br />
+ #pragma far_data off<br />
+ #pragma pointers_in_D0<br />
+ // pop restores "far_data" and "pointers_in_A0"<br />
+ #pragma pop</p>
+ </div>
+ <p class="note"><strong>NOTE</strong> This example uses some platform-specific pragmas for illustrative purposes only. See the Targeting manual for your platform to determine which pragmas are supported.</p>
+ <p>This pragma does not correspond to any panel setting.</p>
+ <p class="note"><strong>TIP</strong> Pragmas that allow on | off | reset already form a stack of previous option values. It is not necessary to use <span class="code">#pragma pop/push</span> with such pragmas.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_pragma_prepdump.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_pragma_prepdump.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>pragma_prepdump</h3>
-<p> Controls whether pragmas encountered in the source text appear in the preprocessor output. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma pragma_prepdump on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This pragma corresponds to the Emit #pragmas option . The default setting is <span class="code">off</span>.</p>
- <p class="note"><strong>TIP</strong> When submitting bug reports with a preprocessor dump, be sure this option is enabled.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>pragma_prepdump</h3>
+<p> Controls whether pragmas encountered in the source text appear in the preprocessor output. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma pragma_prepdump on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This pragma corresponds to the Emit #pragmas option . The default setting is <span class="code">off</span>.</p>
+ <p class="note"><strong>TIP</strong> When submitting bug reports with a preprocessor dump, be sure this option is enabled.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_precompile_target.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_precompile_target.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>precompile_target</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>precompile_target</h3>
-<p> Specifies the file name for a precompiled header file. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma precompile_target filename</p>
- <h5> Parameters</h5>
- <p class="code"> filename</p>
- <blockquote>
- <p>Filename can be a simple filename or an absolute pathname. If filename is a simple filename, the compiler saves the file in the same folder as the source file. If filename is a path name, the compiler saves the file in the specified folder.</p>
- </blockquote>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This pragma specifies the filename for a precompiled header file. If you do not specify the filename, the compiler gives the precompiled header file the same base name as its source file minus any extension and prepended with the “<span class="code">#</span>” character. For example, <span class="code">this_file</span> becomes <span class="code">#this_file</span>.</p>
- <p>This pragma does not correspond to any panel setting.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>precompile_target</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>precompile_target</h3>
+<p> Specifies the file name for a precompiled header file. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma precompile_target filename</p>
+ <h5> Parameters</h5>
+ <p class="code"> filename</p>
+ <blockquote>
+ <p>Filename can be a simple filename or an absolute pathname. If filename is a simple filename, the compiler saves the file in the same folder as the source file. If filename is a path name, the compiler saves the file in the specified folder.</p>
+ </blockquote>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This pragma specifies the filename for a precompiled header file. If you do not specify the filename, the compiler gives the precompiled header file the same base name as its source file minus any extension and prepended with the “<span class="code">#</span>” character. For example, <span class="code">this_file</span> becomes <span class="code">#this_file</span>.</p>
+ <p>This pragma does not correspond to any panel setting.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_readonly_strings.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_readonly_strings.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>readonly_strings</h3>
-<p> Controls whether string objects are placed in a read-write or a read-only data section. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma readonly_strings on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, C strings used in your source code (for example, "hello") are output to the read-only data section instead of the global data section. In effect, these strings act like <span class="code">const char *</span>, even though their type is really <span class="code">char *</span>.</p>
- <p>This pragma corresponds to the Make strings read-only setting in the processor x86 CodeGen panel and the Make string constants read-only setting in the processor ARM CodeGen panel. To check this setting, use <span class="code">__option (readonly_strings)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>readonly_strings</h3>
+<p> Controls whether string objects are placed in a read-write or a read-only data section. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma readonly_strings on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, C strings used in your source code (for example, "hello") are output to the read-only data section instead of the global data section. In effect, these strings act like <span class="code">const char *</span>, even though their type is really <span class="code">char *</span>.</p>
+ <p>This pragma corresponds to the Make strings read-only setting in the processor x86 CodeGen panel and the Make string constants read-only setting in the processor ARM CodeGen panel. To check this setting, use <span class="code">__option (readonly_strings)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_require_prototypes.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_require_prototypes.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>require_prototypes</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>require_prototypes</h3>
-<p> Controls whether or not the compiler should expect function prototypes. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma require_prototypes on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This pragma only affects non-static functions.</p>
- <p> If you enable this pragma, the compiler generates an error if you use a function that does not have a prototype. This pragma helps you prevent errors that happen when you use a function before you define it or refer to it. </p>
- <p>This pragma corresponds to the Require Function Prototypes setting . To check this setting, use <span class="code">__option (require_prototypes)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is processor-specific.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>require_prototypes</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>require_prototypes</h3>
+<p> Controls whether or not the compiler should expect function prototypes. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma require_prototypes on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This pragma only affects non-static functions.</p>
+ <p> If you enable this pragma, the compiler generates an error if you use a function that does not have a prototype. This pragma helps you prevent errors that happen when you use a function before you define it or refer to it. </p>
+ <p>This pragma corresponds to the Require Function Prototypes setting . To check this setting, use <span class="code">__option (require_prototypes)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is processor-specific.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_reverse_bitfields.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_reverse_bitfields.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>reverse_bitfields</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>reverse_bitfields</h3>
-<p> Controls whether or not the compiler reverses the bitfield allocation. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma reverse_bitfields on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This pragma reverses the bitfield allocation, so that bitfields are arranged from the opposite side of the storage unit from that ordinarily used on the target. The compiler still orders the bits within a single bitfield such that the lowest-valued bit is in the rightmost position.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (reverse_bitfields)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>reverse_bitfields</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>reverse_bitfields</h3>
+<p> Controls whether or not the compiler reverses the bitfield allocation. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma reverse_bitfields on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This pragma reverses the bitfield allocation, so that bitfields are arranged from the opposite side of the storage unit from that ordinarily used on the target. The compiler still orders the bits within a single bitfield such that the lowest-valued bit is in the rightmost position.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (reverse_bitfields)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_rtti.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_rtti.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>RTTI</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>RTTI</h3>
-<p> Controls the availability of runtime type information. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma RTTI on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, you can use runtime type information (or RTTI) features such as dynamic_cast and typeid. The other RTTI expressions are available even if you disable the Enable RTTI setting. Note that *type_info::before(const type_info&) is not yet implemented.</p>
- <p>This pragma corresponds to the Enable RTTI setting . To check this setting, use <span class="code">__option (RTTI)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>RTTI</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>RTTI</h3>
+<p> Controls the availability of runtime type information. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma RTTI on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, you can use runtime type information (or RTTI) features such as dynamic_cast and typeid. The other RTTI expressions are available even if you disable the Enable RTTI setting. Note that *type_info::before(const type_info&) is not yet implemented.</p>
+ <p>This pragma corresponds to the Enable RTTI setting . To check this setting, use <span class="code">__option (RTTI)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_show_error_filestack.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_show_error_filestack.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>show_error_filestack</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>show_error_filestack</h3>
-<p>Controls the appearance of the current #includes file stack within error messages occuring inside deeply-included files.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma show_error_filestack on | off | reset</p>
- <h5>Targets</h5>
- All targets.<br />
- <h5>Remarks</h5>
- This pragma does not correspond to any panel setting. The default setting is <span class="code">on</span>.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>show_error_filestack</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>show_error_filestack</h3>
+<p>Controls the appearance of the current #includes file stack within error messages occuring inside deeply-included files.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma show_error_filestack on | off | reset</p>
+ <h5>Targets</h5>
+ All targets.<br />
+ <h5>Remarks</h5>
+ This pragma does not correspond to any panel setting. The default setting is <span class="code">on</span>.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_showmessagenumber.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_showmessagenumber.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>showmessagenumber</h3>
-<p>Controls the appearance of warning or error numbers in displayed messages.
-</p><h5>Syntax</h5>
-
-<p class="code">#pragma showmessagenumber on | off | reset</p>
-<h5>Targets</h5>
- All targets.<br />
- <h5>Remarks</h5>
- <p>When enabled, this pragma causes messages to appear with their numbers visible. You can then use the <a href="p_warning.htm">warning</a> pragma with a warning number to suppress the appearance of specific warning messages.</p>
- <p>This pragma does not correspond to any panel setting. To check this pragma use <span class="code">__option (showmessagenumber)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>showmessagenumber</h3>
+<p>Controls the appearance of warning or error numbers in displayed messages.
+</p><h5>Syntax</h5>
+
+<p class="code">#pragma showmessagenumber on | off | reset</p>
+<h5>Targets</h5>
+ All targets.<br />
+ <h5>Remarks</h5>
+ <p>When enabled, this pragma causes messages to appear with their numbers visible. You can then use the <a href="p_warning.htm">warning</a> pragma with a warning number to suppress the appearance of specific warning messages.</p>
+ <p>This pragma does not correspond to any panel setting. To check this pragma use <span class="code">__option (showmessagenumber)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_simple_prepdump.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_simple_prepdump.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>simple_prepdump</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>simple_prepdump</h3>
-<p>Controls the suppression of comments in preprocessor dumps.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma simple_prepdump on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>By default, the preprocessor adds comments about the current include file being processed in its output. Enabling this pragma disables these comments.</p>
- <p>This pragma corresponds to the Emit file changes option . To check this setting, use <span class="code">__option (simple_prepdump)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>simple_prepdump</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>simple_prepdump</h3>
+<p>Controls the suppression of comments in preprocessor dumps.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma simple_prepdump on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>By default, the preprocessor adds comments about the current include file being processed in its output. Enabling this pragma disables these comments.</p>
+ <p>This pragma corresponds to the Emit file changes option . To check this setting, use <span class="code">__option (simple_prepdump)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_space_prepdump.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_space_prepdump.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>space_prepdump</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>space_prepdump</h3>
-<p>Controls whether whitespace is stripped out or copied into the output.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma space_prepdump on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This pragma is useful for keeping the starting column aligned with the original source, though the compiler attempts to preserve space within the line. This doesn’t apply when macros are expanded.</p>
- <p>This pragma corresponds to the Keep whitespace option . The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>space_prepdump</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>space_prepdump</h3>
+<p>Controls whether whitespace is stripped out or copied into the output.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma space_prepdump on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This pragma is useful for keeping the starting column aligned with the original source, though the compiler attempts to preserve space within the line. This doesn’t apply when macros are expanded.</p>
+ <p>This pragma corresponds to the Keep whitespace option . The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_srcrelincludes.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_srcrelincludes.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>srcrelincludes</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>srcrelincludes</h3>
-<p>Controls the lookup of <span class="code">#include</span> files.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma srcrelincludes on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>When on, this IDE looks for <span class="code">#include</span> files relative to the previously<span class="code"> #include</span> file (not just the source file). This is useful when multiple files use the same filename and are intended to be picked up by another header in that directory. This is a common occurrence in UNIX.</p>
- <p>This pragma corresponds to the Source relative includes option in the Access Paths panel. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>srcrelincludes</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>srcrelincludes</h3>
+<p>Controls the lookup of <span class="code">#include</span> files.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma srcrelincludes on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>When on, this IDE looks for <span class="code">#include</span> files relative to the previously<span class="code"> #include</span> file (not just the source file). This is useful when multiple files use the same filename and are intended to be picked up by another header in that directory. This is a common occurrence in UNIX.</p>
+ <p>This pragma corresponds to the Source relative includes option in the Access Paths panel. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_store_object_files.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_store_object_files.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>store_object_files</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>store_object_files</h3>
-<p>Controls the storage location of object data, either in the target data driectory or as a separate file.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma store_object_files on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>By default, the IDE writes object data to the project’s target data directory. When this pragma is on, the object data is written to a separate object file. </p>
- <p class="note"><strong>NOTE</strong> For some targets, the object file emitted may not be recognized as actual object data.</p>
- <p>This pragma does not correspond to any panel setting. The default setting is <span class="code">off</span>.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>store_object_files</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>store_object_files</h3>
+<p>Controls the storage location of object data, either in the target data driectory or as a separate file.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma store_object_files on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>By default, the IDE writes object data to the project’s target data directory. When this pragma is on, the object data is written to a separate object file. </p>
+ <p class="note"><strong>NOTE</strong> For some targets, the object file emitted may not be recognized as actual object data.</p>
+ <p>This pragma does not correspond to any panel setting. The default setting is <span class="code">off</span>.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_strictheaderchecking.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_strictheaderchecking.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>strictheaderchecking</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>strictheaderchecking</h3>
-<p>Controls how strictly the compiler checks headers for standard C library functions.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma strictheaderchecking on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>The 3.2 version compiler recognizes standard C library functions. If the correct prototype is used, and, in C++, if the function appears in the “std” or root namespace, the compiler recognizes the function, and is able to optimize calls to it based on its documented effects.</p>
- <p>When this pragma is on, in addition to having the correct prototype, the declaration must also appear in the proper standard header file (and not in a user header or source file).</p>
- <p>This pragma does not correspond to any panel setting. The default setting is <span class="code">on</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>strictheaderchecking</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>strictheaderchecking</h3>
+<p>Controls how strictly the compiler checks headers for standard C library functions.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma strictheaderchecking on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>The 3.2 version compiler recognizes standard C library functions. If the correct prototype is used, and, in C++, if the function appears in the “std” or root namespace, the compiler recognizes the function, and is able to optimize calls to it based on its documented effects.</p>
+ <p>When this pragma is on, in addition to having the correct prototype, the declaration must also appear in the proper standard header file (and not in a user header or source file).</p>
+ <p>This pragma does not correspond to any panel setting. The default setting is <span class="code">on</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_suppress_init_code.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_suppress_init_code.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>suppress_init_code</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>suppress_init_code</h3>
-<p>Controls the suppression of static initialization object code.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma suppress_init_code on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler does not generate any code for static data initialization such as C++ constructors.</p>
- <p class="note"><strong>WARNING</strong>! Beware when using this pragma because it can produce erratic or unpredictable behavior in your program.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (suppress_init_code)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>suppress_init_code</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>suppress_init_code</h3>
+<p>Controls the suppression of static initialization object code.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma suppress_init_code on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler does not generate any code for static data initialization such as C++ constructors.</p>
+ <p class="note"><strong>WARNING</strong>! Beware when using this pragma because it can produce erratic or unpredictable behavior in your program.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (suppress_init_code)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_suppress_warnings.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_suppress_warnings.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>suppress_warnings</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>suppress_warnings</h3>
-<p>Controls the issuing of warnings.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma suppress_warnings on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler does not generate warnings, including those that are enabled.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (suppress_warnings)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>suppress_warnings</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>suppress_warnings</h3>
+<p>Controls the issuing of warnings.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma suppress_warnings on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler does not generate warnings, including those that are enabled.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (suppress_warnings)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_sym.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_sym.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>sym</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>sym</h3>
-<p>Controls the generation of debugger symbol information.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma sym on | off | reset | [no]scope </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>The compiler pays attention to this pragma only if you enable the debug marker for a file in the IDE project window. If you disable this pragma, the compiler does not put debugging information into the source file debugger symbol file (SYM or DWARF) for the functions that follow. Enables the emit local scopes feature by default. Use <span class="code">-sym noscopes</span> to disable.</p>
- <p>The compiler always generates a debugger symbol file for a source file that has a debug diamond next to it in the project window. This pragma changes only which functions have information in that symbol file.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (sym)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>sym</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>sym</h3>
+<p>Controls the generation of debugger symbol information.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma sym on | off | reset | [no]scope </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>The compiler pays attention to this pragma only if you enable the debug marker for a file in the IDE project window. If you disable this pragma, the compiler does not put debugging information into the source file debugger symbol file (SYM or DWARF) for the functions that follow. Enables the emit local scopes feature by default. Use <span class="code">-sym noscopes</span> to disable.</p>
+ <p>The compiler always generates a debugger symbol file for a source file that has a debug diamond next to it in the project window. This pragma changes only which functions have information in that symbol file.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (sym)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_syspath_once.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_syspath_once.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>syspath_once</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>syspath_once</h3>
-<p>Controls how include files are treated when <span class="code">#pragma once</span> is enabled.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma syspath_once on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, files called in <span class="code">#include <></span> and <span class="code">#include ""</span> directives are treated as distinct, even if they refer to the same file.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (syspath_once)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>syspath_once</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>syspath_once</h3>
+<p>Controls how include files are treated when <span class="code">#pragma once</span> is enabled.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma syspath_once on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, files called in <span class="code">#include <></span> and <span class="code">#include ""</span> directives are treated as distinct, even if they refer to the same file.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (syspath_once)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_template_depth.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_template_depth.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>template_depth</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>template_depth</h3>
-<p> Controls how many nested or recursive class templates you can instantiate.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma template_depth(n)</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This pragma lets you increase the number of nested or recursive class template instantiations allowed. By default, n equals 64; it can be set from 1 to 30000. You should always use the default value unless you receive the error message template too complex or recursive. </p>
- <p>This pragma does not correspond to any panel setting. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>template_depth</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>template_depth</h3>
+<p> Controls how many nested or recursive class templates you can instantiate.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma template_depth(n)</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This pragma lets you increase the number of nested or recursive class template instantiations allowed. By default, n equals 64; it can be set from 1 to 30000. You should always use the default value unless you receive the error message template too complex or recursive. </p>
+ <p>This pragma does not correspond to any panel setting. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_text_encoding.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_text_encoding.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,43 +1,43 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>text_encoding</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>text_encoding</h3>
-<p> Identifies the files source text encoding format to the compiler.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma text_encoding ( "name" | unknown | reset [, global] )</p>
- <h5>Parameters</h5>
- <p class="code">name</p>
- <blockquote>
- <p>The IANA or MIME encoding name or an OS-specific string that identifies the text encoding. The compiler recognizes these names and maps them to its internal decoders:</p>
- <p class="code">system US-ASCII ASCII ANSI_X3.4-1968 <br />
- ANSI_X3.4 UTF-8 UTF8 ISO-2022-JP<br />
- CSISO2022JP ISO2022JP CSSHIFTJIS SHIFT-JIS<br />
- SHIFT_JIS SJIS EUC-JP EUCJP UCS-2 UCS-2BE <br />
- UCS-2LE UCS2 UCS2BE UCS2LE UTF-16 UTF-16BE <br />
- UTF-16LE UTF16 UTF16BE UTF16LE UCS-4 UCS-4BE <br />
- UCS-4LE UCS4 UCS4BE UCS4LE 10646-1:1993 <br />
- ISO-10646-1 ISO-10646 unicode</p>
- </blockquote>
- <p class="code">global</p>
- <blockquote>
- <p>Tells the compiler that the current and all subsequent files use the same text encoding. By default, text encoding is effective only to the end of the file.</p>
- </blockquote>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>By default, <span class="code">#pragma text_encoding</span> is only effective through the end of the file. To affect the default text encoding assumed for the current and all subsequent files, supply the “global” modifier.</p>
- <p>This pragma corresponds to the Source Encoding option . The default setting is ASCII.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>text_encoding</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>text_encoding</h3>
+<p> Identifies the files source text encoding format to the compiler.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma text_encoding ( "name" | unknown | reset [, global] )</p>
+ <h5>Parameters</h5>
+ <p class="code">name</p>
+ <blockquote>
+ <p>The IANA or MIME encoding name or an OS-specific string that identifies the text encoding. The compiler recognizes these names and maps them to its internal decoders:</p>
+ <p class="code">system US-ASCII ASCII ANSI_X3.4-1968 <br />
+ ANSI_X3.4 UTF-8 UTF8 ISO-2022-JP<br />
+ CSISO2022JP ISO2022JP CSSHIFTJIS SHIFT-JIS<br />
+ SHIFT_JIS SJIS EUC-JP EUCJP UCS-2 UCS-2BE <br />
+ UCS-2LE UCS2 UCS2BE UCS2LE UTF-16 UTF-16BE <br />
+ UTF-16LE UTF16 UTF16BE UTF16LE UCS-4 UCS-4BE <br />
+ UCS-4LE UCS4 UCS4BE UCS4LE 10646-1:1993 <br />
+ ISO-10646-1 ISO-10646 unicode</p>
+ </blockquote>
+ <p class="code">global</p>
+ <blockquote>
+ <p>Tells the compiler that the current and all subsequent files use the same text encoding. By default, text encoding is effective only to the end of the file.</p>
+ </blockquote>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>By default, <span class="code">#pragma text_encoding</span> is only effective through the end of the file. To affect the default text encoding assumed for the current and all subsequent files, supply the “global” modifier.</p>
+ <p>This pragma corresponds to the Source Encoding option . The default setting is ASCII.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_thread_safe_int.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_thread_safe_int.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,40 +1,40 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>thread_safe_init</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>thread_safe_init</h3>
-<p> Controls the addition of extra code in the binary to ensure that multiple threads cannot enter a static local initialization at the same time.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma thread_safe_init on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
-<p>When C++ programs use static local initializations, like this:</p>
- <p class="listing">int func() {<br />
- static int countdown = 20;<br />
- return countdown--;<br />
- }</p>
- <p>the static locals are initialized the first time the function is executed. As such, if multiple threads are running at the same time, and two of them happen to enter the function at the same time, there will be contention over which one initializes the variable.</p>
- <p>When this pragma is on, the compiler inserts a mutex around the initialization to avoid this problem as shown below:</p>
- <p class="note"><strong>NOTE</strong> This requires runtime support which may not be implemented on all platforms, due to the possible need for operating system support.</p>
- <p class="listing">#pragma thread_safe_init on<br />
- void thread_heavy_func()<br />
- {<br />
- // multiple routines cannot enter at the same time<br />
- static std::string localstring = thread_unsafe_func();<br />
-}</p>
- <p class="note"><strong>NOTE</strong> When an exception is thrown from a static local initializer, the initializer is retried by the next client that enters the scope of the local.</p>
- <p>This pragma does not correspond to any panel setting. The default setting is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>thread_safe_init</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>thread_safe_init</h3>
+<p> Controls the addition of extra code in the binary to ensure that multiple threads cannot enter a static local initialization at the same time.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma thread_safe_init on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+<p>When C++ programs use static local initializations, like this:</p>
+ <p class="listing">int func() {<br />
+ static int countdown = 20;<br />
+ return countdown--;<br />
+ }</p>
+ <p>the static locals are initialized the first time the function is executed. As such, if multiple threads are running at the same time, and two of them happen to enter the function at the same time, there will be contention over which one initializes the variable.</p>
+ <p>When this pragma is on, the compiler inserts a mutex around the initialization to avoid this problem as shown below:</p>
+ <p class="note"><strong>NOTE</strong> This requires runtime support which may not be implemented on all platforms, due to the possible need for operating system support.</p>
+ <p class="listing">#pragma thread_safe_init on<br />
+ void thread_heavy_func()<br />
+ {<br />
+ // multiple routines cannot enter at the same time<br />
+ static std::string localstring = thread_unsafe_func();<br />
+}</p>
+ <p class="note"><strong>NOTE</strong> When an exception is thrown from a static local initializer, the initializer is retried by the next client that enters the scope of the local.</p>
+ <p>This pragma does not correspond to any panel setting. The default setting is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_trigraphs.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_trigraphs.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,70 +1,70 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>trigraphs</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>trigraphs</h3>
-<p> Controls the use of ISO trigraph sequences.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma trigraphs on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you are writing code that must strictly adhere to the ANSI standard, enable this pragma. Listing 10.31 shows an example of a trigraph.</p>
- <table width="44%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th scope="col"><div align="center">Trigraph</div></th>
- <th scope="col"><div align="center">Character</div></th>
- </tr>
- <tr class="code">
- <td><div align="center">??=</div></td>
- <td><div align="center">#</div></td>
- </tr>
- <tr class="code">
- <td><div align="center">??/</div></td>
- <td><div align="center">^</div></td>
- </tr>
- <tr class="code">
- <td><div align="center">??(</div></td>
- <td><div align="center">[</div></td>
- </tr>
- <tr class="code">
- <td><div align="center">??)</div></td>
- <td><div align="center">]</div></td>
- </tr>
- <tr class="code">
- <td><div align="center">??!</div></td>
- <td><div align="center">|</div></td>
- </tr>
- <tr class="code">
- <td><div align="center">??<</div></td>
- <td><div align="center">{</div></td>
- </tr>
- <tr class="code">
- <td><div align="center">??></div></td>
- <td><div align="center">}</div></td>
- </tr>
- <tr class="code">
- <td><div align="center">??-</div></td>
- <td><div align="center">~</div></td>
- </tr>
- </table>
-<p class="note"><strong>NOTE</strong> Use of this pragma may cause a portability issue for some targets.</p>
-<div class="listing">
- <h4>Listing 10.31 Example of Pragma trigraphs</h4>
- <p>char c = '????'; // ERROR: Trigraph sequence expands to '??^<br />
- char d = '\?\?\?\?'; // OK</p>
-</div>
-<p>This pragma corresponds to the <a href="../pragmas/p_trigraphs.htm">Expand Trigraphs</a> setting . To check this setting, use <span class="code">__option (trigraphs)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>trigraphs</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>trigraphs</h3>
+<p> Controls the use of ISO trigraph sequences.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma trigraphs on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you are writing code that must strictly adhere to the ANSI standard, enable this pragma. Listing 10.31 shows an example of a trigraph.</p>
+ <table width="44%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th scope="col"><div align="center">Trigraph</div></th>
+ <th scope="col"><div align="center">Character</div></th>
+ </tr>
+ <tr class="code">
+ <td><div align="center">??=</div></td>
+ <td><div align="center">#</div></td>
+ </tr>
+ <tr class="code">
+ <td><div align="center">??/</div></td>
+ <td><div align="center">^</div></td>
+ </tr>
+ <tr class="code">
+ <td><div align="center">??(</div></td>
+ <td><div align="center">[</div></td>
+ </tr>
+ <tr class="code">
+ <td><div align="center">??)</div></td>
+ <td><div align="center">]</div></td>
+ </tr>
+ <tr class="code">
+ <td><div align="center">??!</div></td>
+ <td><div align="center">|</div></td>
+ </tr>
+ <tr class="code">
+ <td><div align="center">??<</div></td>
+ <td><div align="center">{</div></td>
+ </tr>
+ <tr class="code">
+ <td><div align="center">??></div></td>
+ <td><div align="center">}</div></td>
+ </tr>
+ <tr class="code">
+ <td><div align="center">??-</div></td>
+ <td><div align="center">~</div></td>
+ </tr>
+ </table>
+<p class="note"><strong>NOTE</strong> Use of this pragma may cause a portability issue for some targets.</p>
+<div class="listing">
+ <h4>Listing 10.31 Example of Pragma trigraphs</h4>
+ <p>char c = '????'; // ERROR: Trigraph sequence expands to '??^<br />
+ char d = '\?\?\?\?'; // OK</p>
+</div>
+<p>This pragma corresponds to the <a href="../pragmas/p_trigraphs.htm">Expand Trigraphs</a> setting . To check this setting, use <span class="code">__option (trigraphs)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_unsigned_char.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_unsigned_char.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>unsigned_char</h3>
-<p> Controls whether or not declarations of type char are treated as unsigned char.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma unsigned_char on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler treats a char declaration as if it were an unsigned char declaration. </p>
- <p class="note"><strong>NOTE</strong> If you enable this pragma, your code might not be compatible with libraries that were compiled when the pragma was disabled. In particular, your code might not work with the ANSI libraries included with Carbide.</p>
- <p>This pragma corresponds to the Use Unsigned Chars setting . To check this setting, use <span class="code">__option (unsigned_char)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is processor-specific.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>unsigned_char</h3>
+<p> Controls whether or not declarations of type char are treated as unsigned char.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma unsigned_char on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler treats a char declaration as if it were an unsigned char declaration. </p>
+ <p class="note"><strong>NOTE</strong> If you enable this pragma, your code might not be compatible with libraries that were compiled when the pragma was disabled. In particular, your code might not work with the ANSI libraries included with Carbide.</p>
+ <p>This pragma corresponds to the Use Unsigned Chars setting . To check this setting, use <span class="code">__option (unsigned_char)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is processor-specific.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_unused.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_unused.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,48 +1,48 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>unused</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>unused</h3>
-<p> Controls the suppression of warnings for variables and parameters that are not referenced in a function.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma unused ( var_name [, var_name ]... )</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>This pragma suppresses the compile time warnings for the unused variables and parameters specified in its argument list as shown in Listing 10.32 and Listing 10.33. You can use this pragma only within a function body, and the listed variables must be within the scope of the function. You cannot use this pragma with functions defined within a class definition or with template functions.</p>
- <div class="listing">
- <h4>Listing 10.32 Example of Pragma unused() in C</h4>
- <p>#pragma warn_unusedvar on<br />
- #pragma warn_unusedarg on</p>
- <p>static void ff(int a)<br />
- {<br />
- int b;<br />
- #pragma unused(a,b) // Compiler does not warn<br />
- // that a and b are unused<br />
- // . . . <br />
- }</p>
- </div>
- <div class="listing">
- <h4>Listing 10.33 Example of Pragma unused() in C++</h4>
- <p>#pragma warn_unusedvar on<br />
- #pragma warn_unusedarg on</p>
- <p>static void ff(int /* No warning */)<br />
- {<br />
- int b;<br />
- #pragma unused(b) // Compiler does not warn that b is not used.<br />
- // . . . <br />
- }</p>
- </div>
- <p>This pragma does not correspond to any panel setting.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>unused</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>unused</h3>
+<p> Controls the suppression of warnings for variables and parameters that are not referenced in a function.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma unused ( var_name [, var_name ]... )</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>This pragma suppresses the compile time warnings for the unused variables and parameters specified in its argument list as shown in Listing 10.32 and Listing 10.33. You can use this pragma only within a function body, and the listed variables must be within the scope of the function. You cannot use this pragma with functions defined within a class definition or with template functions.</p>
+ <div class="listing">
+ <h4>Listing 10.32 Example of Pragma unused() in C</h4>
+ <p>#pragma warn_unusedvar on<br />
+ #pragma warn_unusedarg on</p>
+ <p>static void ff(int a)<br />
+ {<br />
+ int b;<br />
+ #pragma unused(a,b) // Compiler does not warn<br />
+ // that a and b are unused<br />
+ // . . . <br />
+ }</p>
+ </div>
+ <div class="listing">
+ <h4>Listing 10.33 Example of Pragma unused() in C++</h4>
+ <p>#pragma warn_unusedvar on<br />
+ #pragma warn_unusedarg on</p>
+ <p>static void ff(int /* No warning */)<br />
+ {<br />
+ int b;<br />
+ #pragma unused(b) // Compiler does not warn that b is not used.<br />
+ // . . . <br />
+ }</p>
+ </div>
+ <p>This pragma does not correspond to any panel setting.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_any_ptr_int_conv.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_any_ptr_int_conv.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,42 +1,42 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_any_ptr_int_conv</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_any_ptr_int_conv</h3>
-<p> Controls if the compiler generates a warning when an integral type is explicitly converted to a pointer type or vice versa.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_any_ptr_int_conv on | off | reset
- </p>
- <h5>Targets</h5>
- All targets.<br />
- <h5>Remarks</h5>
- <p>This pragma is useful to identify potential 64-bit pointer portability issues. An example is shown in Listing 10.34.</p>
- <div class="listing">
- <h4> Listing 10.34 Example of warn_any_ptr_int_conv</h4>
- <p>#pragma warn_ptr_int_conv on</p>
- <p>short i, *ip</p>
- <p>void foo() {<br />
- i = (short)ip; // WARNING: integral type is not <br />
- // large enough to hold pointer<br />
- }</p>
- <p>#pragma warn_any_ptr_int_conv on</p>
- <p>void bar() {<br />
- i = (int)ip; // WARNING: pointer to integral conversion<br />
- ip = (short *)i; // WARNING: integral to pointer conversion<br />
- }</p>
- </div>
- <h5>Remarks</h5>
- <p>See also pragma <a href="p_warn_ptr_int_conv.htm">warn_ptr_int_conv</a>.</p>
- <p> This pragma corresponds to the Pointer/Integral Conversions setting . To check this setting, use <span class="code">__option (warn_any_ptr_int_conv)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_any_ptr_int_conv</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_any_ptr_int_conv</h3>
+<p> Controls if the compiler generates a warning when an integral type is explicitly converted to a pointer type or vice versa.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_any_ptr_int_conv on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All targets.<br />
+ <h5>Remarks</h5>
+ <p>This pragma is useful to identify potential 64-bit pointer portability issues. An example is shown in Listing 10.34.</p>
+ <div class="listing">
+ <h4> Listing 10.34 Example of warn_any_ptr_int_conv</h4>
+ <p>#pragma warn_ptr_int_conv on</p>
+ <p>short i, *ip</p>
+ <p>void foo() {<br />
+ i = (short)ip; // WARNING: integral type is not <br />
+ // large enough to hold pointer<br />
+ }</p>
+ <p>#pragma warn_any_ptr_int_conv on</p>
+ <p>void bar() {<br />
+ i = (int)ip; // WARNING: pointer to integral conversion<br />
+ ip = (short *)i; // WARNING: integral to pointer conversion<br />
+ }</p>
+ </div>
+ <h5>Remarks</h5>
+ <p>See also pragma <a href="p_warn_ptr_int_conv.htm">warn_ptr_int_conv</a>.</p>
+ <p> This pragma corresponds to the Pointer/Integral Conversions setting . To check this setting, use <span class="code">__option (warn_any_ptr_int_conv)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_emptydecl.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_emptydecl.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,38 +1,38 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_emptydecl</h3>
-<p>Controls the recognition of declarations without variables.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_emptydecl on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler displays a warning when it encounters a declaration with no variables as shown in Listing 10.35.</p>
- <div class="listing">
- <h4>Listing 10.35 Examples of Pragma warn_emptydecl</h4>
- <p>int ; // WARNING<br />
- int i; // OK<br />
- ...<br />
- long j;; // WARNING<br />
- long j; // OK<br />
- ...<br />
- extern "C" {<br />
- ...<br />
- }; // WARNING</p>
- </div>
- <p> This pragma corresponds to the Empty Declarations setting . To check this setting, use <span class="code">__option (warn_emptydecl)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_emptydecl</h3>
+<p>Controls the recognition of declarations without variables.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_emptydecl on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler displays a warning when it encounters a declaration with no variables as shown in Listing 10.35.</p>
+ <div class="listing">
+ <h4>Listing 10.35 Examples of Pragma warn_emptydecl</h4>
+ <p>int ; // WARNING<br />
+ int i; // OK<br />
+ ...<br />
+ long j;; // WARNING<br />
+ long j; // OK<br />
+ ...<br />
+ extern "C" {<br />
+ ...<br />
+ }; // WARNING</p>
+ </div>
+ <p> This pragma corresponds to the Empty Declarations setting . To check this setting, use <span class="code">__option (warn_emptydecl)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_extracomma.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_extracomma.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_extracomma</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_extracomma</h3>
-<p> Controls the recognition of superfluous commas.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_extracomma on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler issues a warning when it encounters an extra comma. For more information about this warning, see “Extra Commas”.</p>
- <p> This pragma corresponds to the Extra Commas setting . To check this setting, use <span class="code">__option (warn_extracomma)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_extracomma</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_extracomma</h3>
+<p> Controls the recognition of superfluous commas.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_extracomma on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler issues a warning when it encounters an extra comma. For more information about this warning, see “Extra Commas”.</p>
+ <p> This pragma corresponds to the Extra Commas setting . To check this setting, use <span class="code">__option (warn_extracomma)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_filenamecaps.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_filenamecaps.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_filenamecaps</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_filenamecaps</h3>
-<p>Controls the recognition of conflicts involving case-sensitive filenames within user includes.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_filenamecaps on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler issues a warning when an include directive capitalizes a filename within a user include differently from the way the filename appears on a disk. It also detects use of 8.3 DOS filenames in Windows when a long filename is available. This pragma helps avoid porting problems to operating systems with case-sensitive filenames.</p>
- <p>By default, this pragma only checks the spelling of user includes such as the following:</p>
- <p class="code">#include "file"</p>
- <p>For more information on checking system includes, see pragma <a href="p_warn_filenamecaps_system.htm">warn_filenamecaps_system</a>.</p>
- <p>This pragma corresponds to the Include File Capitalization setting . To check this setting, use <span class="code">__option (warn_filenamecaps)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.<br />
- </p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_filenamecaps</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_filenamecaps</h3>
+<p>Controls the recognition of conflicts involving case-sensitive filenames within user includes.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_filenamecaps on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler issues a warning when an include directive capitalizes a filename within a user include differently from the way the filename appears on a disk. It also detects use of 8.3 DOS filenames in Windows when a long filename is available. This pragma helps avoid porting problems to operating systems with case-sensitive filenames.</p>
+ <p>By default, this pragma only checks the spelling of user includes such as the following:</p>
+ <p class="code">#include "file"</p>
+ <p>For more information on checking system includes, see pragma <a href="p_warn_filenamecaps_system.htm">warn_filenamecaps_system</a>.</p>
+ <p>This pragma corresponds to the Include File Capitalization setting . To check this setting, use <span class="code">__option (warn_filenamecaps)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.<br />
+ </p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_filenamecaps_system.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_filenamecaps_system.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_filenamecaps_system</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_filenamecaps_system</h3>
-<p> Controls the recognition of conflicts involving case-sensitive filenames within system includes.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_filenamecaps_system on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma along with <a href="p_warn_filenamecaps.htm">warn_filenamecaps</a>, the compiler issues a warning when an include directive capitalizes a filename within a system include differently from the way the filename appears on a disk. It also detects use of 8.3 DOS filenames in Windows when a long filename is available. This pragma helps avoid porting problems to operating systems with case-sensitive filenames.</p>
- <p> To check the spelling of system includes such as the following:</p>
- <p class="code">#include <file></p>
- <p>use this pragma along with the <a href="p_warn_filenamecaps.htm">warn_filenamecaps</a> pragma.</p>
- <p>This pragma corresponds to the Check System Includes setting . To check this setting, use <span class="code">__option (warn_filenamecaps_system)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <p class="note"><strong>NOTE</strong> Some SDKs use “colorful” capitalization, so this pragma may issue a lot of unwanted messages.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_filenamecaps_system</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_filenamecaps_system</h3>
+<p> Controls the recognition of conflicts involving case-sensitive filenames within system includes.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_filenamecaps_system on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma along with <a href="p_warn_filenamecaps.htm">warn_filenamecaps</a>, the compiler issues a warning when an include directive capitalizes a filename within a system include differently from the way the filename appears on a disk. It also detects use of 8.3 DOS filenames in Windows when a long filename is available. This pragma helps avoid porting problems to operating systems with case-sensitive filenames.</p>
+ <p> To check the spelling of system includes such as the following:</p>
+ <p class="code">#include <file></p>
+ <p>use this pragma along with the <a href="p_warn_filenamecaps.htm">warn_filenamecaps</a> pragma.</p>
+ <p>This pragma corresponds to the Check System Includes setting . To check this setting, use <span class="code">__option (warn_filenamecaps_system)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <p class="note"><strong>NOTE</strong> Some SDKs use “colorful” capitalization, so this pragma may issue a lot of unwanted messages.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_hiddenlocals.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_hiddenlocals.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,37 +1,37 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_hiddenlocals</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_hiddenlocals</h3>
-<p> Controls the recognition of a local variable that hides another local variable.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_hiddenlocals on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>When on, the compiler issues a warning when it encounters a local variable that hides another local variable. An example appears in Listing 10.36.</p>
- <div class="listing">
- <h4> Listing 10.36 Example of hidden local variables warning</h4>
- <p>#pragma warn_hiddenlocals on</p>
- <p>void foo(int a)<br />
- {<br />
- {<br />
- int a;<br />
- }<br />
- } // generates a warning: object ’a’ hidden by<br />
- // local declaration</p>
- </div>
-<p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_hiddenlocals)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_hiddenlocals</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_hiddenlocals</h3>
+<p> Controls the recognition of a local variable that hides another local variable.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_hiddenlocals on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>When on, the compiler issues a warning when it encounters a local variable that hides another local variable. An example appears in Listing 10.36.</p>
+ <div class="listing">
+ <h4> Listing 10.36 Example of hidden local variables warning</h4>
+ <p>#pragma warn_hiddenlocals on</p>
+ <p>void foo(int a)<br />
+ {<br />
+ {<br />
+ int a;<br />
+ }<br />
+ } // generates a warning: object ’a’ hidden by<br />
+ // local declaration</p>
+ </div>
+<p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_hiddenlocals)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_hidevirtual.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_hidevirtual.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_hidevirtual</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_hidevirtual</h3>
-<p> Controls the recognition of a non-virtual member function that hides a virtual function in a superclass.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_hidevirtual on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler issues a warning if you declare a non-virtual member function that hides a virtual function in a superclass. For more information about this warning, see “Hidden Virtual Functions”. The ISO C++ Standard does not require this pragma.</p>
- <p class="note"><strong>NOTE</strong> A warning normally indicates that the pragma name is not recognized, but an error indicates either a syntax problem or that the pragma is not valid in the given context.</p>
- <p>This pragma corresponds to the Hidden Virtual Functions setting . To check this setting, use <span class="code">__option (warn_hidevirtual)</span>. The default settings is <span class="code">off</span>.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_hidevirtual</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_hidevirtual</h3>
+<p> Controls the recognition of a non-virtual member function that hides a virtual function in a superclass.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_hidevirtual on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler issues a warning if you declare a non-virtual member function that hides a virtual function in a superclass. For more information about this warning, see “Hidden Virtual Functions”. The ISO C++ Standard does not require this pragma.</p>
+ <p class="note"><strong>NOTE</strong> A warning normally indicates that the pragma name is not recognized, but an error indicates either a syntax problem or that the pragma is not valid in the given context.</p>
+ <p>This pragma corresponds to the Hidden Virtual Functions setting . To check this setting, use <span class="code">__option (warn_hidevirtual)</span>. The default settings is <span class="code">off</span>.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_illpragma.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_illpragma.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_illpragma</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_illpragma</h3>
-<p> Controls the recognition of illegal pragma directives.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_illpragma on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler displays a warning when it encounters a pragma it does not recognize. For more information about this warning, see “Illegal Pragmas”.</p>
- <p> This pragma corresponds to the Illegal Pragmas setting . To check this setting, use <span class="code">__option (warn_illpragma)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_illpragma</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_illpragma</h3>
+<p> Controls the recognition of illegal pragma directives.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_illpragma on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler displays a warning when it encounters a pragma it does not recognize. For more information about this warning, see “Illegal Pragmas”.</p>
+ <p> This pragma corresponds to the Illegal Pragmas setting . To check this setting, use <span class="code">__option (warn_illpragma)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_illtokenpasting.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_illtokenpasting.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_illtokenpasting</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_illtokenpasting</h3>
-<p>Controls whether a warning is issued with illegal token pasting.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_illtokenpasting on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>An example of this is shown below:</p>
- <p class="code"> #define PTR(x) x##* / PTR(foo)</p>
- <p>Token pasting is used to create a single token. In this example, foo and x cannot be combined. Often the warning indicates the macro uses “##” unnecessarilly.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_illtokenpasting)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_illtokenpasting</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_illtokenpasting</h3>
+<p>Controls whether a warning is issued with illegal token pasting.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_illtokenpasting on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>An example of this is shown below:</p>
+ <p class="code"> #define PTR(x) x##* / PTR(foo)</p>
+ <p>Token pasting is used to create a single token. In this example, foo and x cannot be combined. Often the warning indicates the macro uses “##” unnecessarilly.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_illtokenpasting)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_illunionmembers.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_illunionmembers.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_illunionmembers</h3>
-<p>Controls whether a warning is issued when illegal union members are made, such as unions with reference or non-trivial class members.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_illunionmembers on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_illunionmembers)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_illunionmembers</h3>
+<p>Controls whether a warning is issued when illegal union members are made, such as unions with reference or non-trivial class members.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_illunionmembers on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_illunionmembers)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_impl_f2i_conv.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_impl_f2i_conv.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,41 +1,41 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_impl_f2i_conv</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_impl_f2i_conv</h3>
-<p>Controls the issuing of warnings for implicit float-to-int conversions.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_impl_f2i_conv on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler issues a warning for implicitly converting floating-point values to integral values. Listing 10.37 provides an example.</p>
- <div class="listing">
- <h4> Listing 10.37 Example of Implicit float-to-int Conversion</h4>
- <p>#pragma warn_implicitconv on // required to enable warnings<br />
- #pragma warn_impl_f2i_conv on // enable conversion warning</p>
- <p>float f1, f2;<br />
- signed int si1, si2;</p>
- <p>int main()<br />
- {<br />
- si1 = f1; // WARNING<br />
- #pragma warn_impl_f2i_conv off // disable conversion warning<br />
- si2 = f2; // OK<br />
- }</p>
- </div>
-<p> This pragma corresponds to the Float to Integer setting . To check this setting, use <span class="code"><span class="code">__option (warn_impl_f</span>2i_conv)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
-<p class="note"><strong>NOTE</strong> The setting of this pragma is ignored unless warn_implicitconv is on.</p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_impl_f2i_conv</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_impl_f2i_conv</h3>
+<p>Controls the issuing of warnings for implicit float-to-int conversions.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_impl_f2i_conv on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler issues a warning for implicitly converting floating-point values to integral values. Listing 10.37 provides an example.</p>
+ <div class="listing">
+ <h4> Listing 10.37 Example of Implicit float-to-int Conversion</h4>
+ <p>#pragma warn_implicitconv on // required to enable warnings<br />
+ #pragma warn_impl_f2i_conv on // enable conversion warning</p>
+ <p>float f1, f2;<br />
+ signed int si1, si2;</p>
+ <p>int main()<br />
+ {<br />
+ si1 = f1; // WARNING<br />
+ #pragma warn_impl_f2i_conv off // disable conversion warning<br />
+ si2 = f2; // OK<br />
+ }</p>
+ </div>
+<p> This pragma corresponds to the Float to Integer setting . To check this setting, use <span class="code"><span class="code">__option (warn_impl_f</span>2i_conv)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+<p class="note"><strong>NOTE</strong> The setting of this pragma is ignored unless warn_implicitconv is on.</p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_impl_i2f_conv.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_impl_i2f_conv.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,41 +1,41 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_impl_i2f_conv</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_impl_i2f_conv</h3>
-<p>Controls the issuing of warnings for implicit int-to-float conversions.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_impl_i2f_conv on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler issues a warning for implicitly converting integral values to floating-point values. Listing 10.38 provides an example.</p>
- <div class="listing">
- <h4>Listing 10.38 Example of Implicit int-to-float Conversion</h4>
- <p>#pragma warn_implicitconv on // required to enable warnings<br />
- #pragma warn_impl_i2f_conv on // enable conversion warning </p>
- <p>float f1, f2;<br />
- signed int si1, si2;</p>
- <p>int main()<br />
- {<br />
- f1 = si1; // WARNING</p>
- <p>#pragma warn_impl_i2f_conv off // disable conversion warning<br />
- f2 = si2; // OK<br />
- }</p>
- </div>
- <p>This pragma corresponds to the Integer to Float setting . To check this setting, use <span class="code"><span class="code">__option (warn_impl_i</span>2f_conv)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
-<p class="note"><strong>NOTE</strong> The setting of this pragma is ignored unless <a href="p_warn_implicitconv.htm">warn_implicitconv</a> is on.</p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_impl_i2f_conv</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_impl_i2f_conv</h3>
+<p>Controls the issuing of warnings for implicit int-to-float conversions.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_impl_i2f_conv on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler issues a warning for implicitly converting integral values to floating-point values. Listing 10.38 provides an example.</p>
+ <div class="listing">
+ <h4>Listing 10.38 Example of Implicit int-to-float Conversion</h4>
+ <p>#pragma warn_implicitconv on // required to enable warnings<br />
+ #pragma warn_impl_i2f_conv on // enable conversion warning </p>
+ <p>float f1, f2;<br />
+ signed int si1, si2;</p>
+ <p>int main()<br />
+ {<br />
+ f1 = si1; // WARNING</p>
+ <p>#pragma warn_impl_i2f_conv off // disable conversion warning<br />
+ f2 = si2; // OK<br />
+ }</p>
+ </div>
+ <p>This pragma corresponds to the Integer to Float setting . To check this setting, use <span class="code"><span class="code">__option (warn_impl_i</span>2f_conv)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+<p class="note"><strong>NOTE</strong> The setting of this pragma is ignored unless <a href="p_warn_implicitconv.htm">warn_implicitconv</a> is on.</p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_impl_s2u_conv.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_impl_s2u_conv.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,41 +1,41 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_impl_s2u_conv</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_impl_s2u_conv</h3>
-<p>Controls the issuing of warnings for implicit conversions between the signed int and unsigned int data types.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_impl_s2u_conv on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler issues a warning for implicitly converting either from signed int to unsigned int or vice versa. Listing 10.39 provides an example.</p>
- <div class="listing">
- <h4>Listing 10.39 Example of Implicit Conversions Between Signed int and unsigned int</h4>
- <p>#pragma warn_implicitconv on // required to enable warnings<br />
- #pragma warn_impl_s2u_conv on // enable conversion warningsigned int si;<br />
- unsigned int ui; </p>
- <p>int main()<br />
- {<br />
- ui = si; // WARNING<br />
- si = ui; // WARNING</p>
- <p>#pragma warn_impl_s2u_conv off // disable conversion warning<br />
- ui = si; // OK<br />
- si = ui; // OK<br />
- }</p>
- </div>
- <p>This pragma corresponds to the Signed / Unsigned setting . To check this setting, use <span class="code"><span class="code">__option (warn_impl_s</span>2u_conv)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
-<p class="note"><strong>NOTE</strong> The setting of this pragma is ignored unless <a href="p_warn_implicitconv.htm">warn_implicitconv</a> is on.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_impl_s2u_conv</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_impl_s2u_conv</h3>
+<p>Controls the issuing of warnings for implicit conversions between the signed int and unsigned int data types.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_impl_s2u_conv on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler issues a warning for implicitly converting either from signed int to unsigned int or vice versa. Listing 10.39 provides an example.</p>
+ <div class="listing">
+ <h4>Listing 10.39 Example of Implicit Conversions Between Signed int and unsigned int</h4>
+ <p>#pragma warn_implicitconv on // required to enable warnings<br />
+ #pragma warn_impl_s2u_conv on // enable conversion warningsigned int si;<br />
+ unsigned int ui; </p>
+ <p>int main()<br />
+ {<br />
+ ui = si; // WARNING<br />
+ si = ui; // WARNING</p>
+ <p>#pragma warn_impl_s2u_conv off // disable conversion warning<br />
+ ui = si; // OK<br />
+ si = ui; // OK<br />
+ }</p>
+ </div>
+ <p>This pragma corresponds to the Signed / Unsigned setting . To check this setting, use <span class="code"><span class="code">__option (warn_impl_s</span>2u_conv)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+<p class="note"><strong>NOTE</strong> The setting of this pragma is ignored unless <a href="p_warn_implicitconv.htm">warn_implicitconv</a> is on.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_implicitconv.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_implicitconv.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,46 +1,46 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_implicitconv</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_implicitconv</h3>
-<p> Controls the issuing of warnings for all implicit arithmetic conversions.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_implicitconv on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler issues a warning for all implicit arithmetic conversions when the destination type might not represent the source value. Listing 10.40 provides an example.</p>
- <div class="listing">
- <h4>Listing 10.40 Example of Implicit Conversion</h4>
- <p>#pragma warn_implicitconv on // required to enable warnings<br />
- #pragma warn_impl_f2i_conv on // enable conversion warning<br />
- #pragma warn_impl_i2f_conv on // enable conversion warning<br />
- #pragma warn_impl_s2u_conv on // enable conversion warning </p>
- <p>float f;<br />
- signed int si;<br />
- unsigned int ui;</p>
- <p>int main()<br />
- {<br />
- f = si; // WARNING<br />
- si = f; // WARNING<br />
- ui = si; // WARNING<br />
- si = ui; // WARNING<br />
- }</p>
- </div>
- <p>For more information about this warning, see “Implicit Arithmetic Conversions”.</p>
-<p class="note"><strong>NOTE</strong> This option “opens the gate” for the checking of implicit conversions. The sub-pragmas <a href="p_warn_impl_f2i_conv.htm">warn_impl_f2i_conv</a>, <a href="p_warn_impl_i2f_conv.htm">warn_impl_i2f_conv</a>, and <a href="p_warn_impl_s2u_conv.htm">warn_impl_s2u_conv</a> control the classes of conversions checked.</p>
-<p>This pragma corresponds to the Implicit Arithmetic Conversions setting . To check this setting, use <span class="code">__option (warn_implicitconv)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_implicitconv</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_implicitconv</h3>
+<p> Controls the issuing of warnings for all implicit arithmetic conversions.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_implicitconv on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler issues a warning for all implicit arithmetic conversions when the destination type might not represent the source value. Listing 10.40 provides an example.</p>
+ <div class="listing">
+ <h4>Listing 10.40 Example of Implicit Conversion</h4>
+ <p>#pragma warn_implicitconv on // required to enable warnings<br />
+ #pragma warn_impl_f2i_conv on // enable conversion warning<br />
+ #pragma warn_impl_i2f_conv on // enable conversion warning<br />
+ #pragma warn_impl_s2u_conv on // enable conversion warning </p>
+ <p>float f;<br />
+ signed int si;<br />
+ unsigned int ui;</p>
+ <p>int main()<br />
+ {<br />
+ f = si; // WARNING<br />
+ si = f; // WARNING<br />
+ ui = si; // WARNING<br />
+ si = ui; // WARNING<br />
+ }</p>
+ </div>
+ <p>For more information about this warning, see “Implicit Arithmetic Conversions”.</p>
+<p class="note"><strong>NOTE</strong> This option “opens the gate” for the checking of implicit conversions. The sub-pragmas <a href="p_warn_impl_f2i_conv.htm">warn_impl_f2i_conv</a>, <a href="p_warn_impl_i2f_conv.htm">warn_impl_i2f_conv</a>, and <a href="p_warn_impl_s2u_conv.htm">warn_impl_s2u_conv</a> control the classes of conversions checked.</p>
+<p>This pragma corresponds to the Implicit Arithmetic Conversions setting . To check this setting, use <span class="code">__option (warn_implicitconv)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_largeargs.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_largeargs.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_largeargs</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_largeargs</h3>
-<p>Controls the issuing of warnings for passing non-“int” numeric values to unprototyped functions.</p>
-<h5>Syntax</h5>
-<p class="code">#pragma warn_largeargs on | off | reset
-</p>
-<h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler issues a warning if you attempt to pass a non-integer numeric value, such as a float or long long, to an unprototyped function when the <a href="p_require_prototypes.htm">require_prototypes</a> pragma is disabled.</p>
- <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_largeargs)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_largeargs</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_largeargs</h3>
+<p>Controls the issuing of warnings for passing non-“int” numeric values to unprototyped functions.</p>
+<h5>Syntax</h5>
+<p class="code">#pragma warn_largeargs on | off | reset
+</p>
+<h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler issues a warning if you attempt to pass a non-integer numeric value, such as a float or long long, to an unprototyped function when the <a href="p_require_prototypes.htm">require_prototypes</a> pragma is disabled.</p>
+ <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_largeargs)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_missingreturn.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_missingreturn.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,36 +1,36 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_missingreturn</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_missingreturn</h3>
-<p>Controls whether the compiler generates a warning when a function that returns a value is missing a return statement.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_missingreturn on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>An example is shown in Listing 10.41.</p>
- <div class="listing">
- <h4> Listing 10.41 Example of warn_missingreturn pragma</h4>
- <p> #pragma warn_missingreturn on </p>
- <p>int foo() <br />
- {<br />
- // no return statement in foo()<br />
- } // generates a warning: return value expected</p>
- </div>
- <p> This pragma corresponds to the Missing ‘return’ Statements option . To check this setting, use <span class="code">__option (warn_missingreturn)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.<br />
-</p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_missingreturn</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_missingreturn</h3>
+<p>Controls whether the compiler generates a warning when a function that returns a value is missing a return statement.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_missingreturn on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>An example is shown in Listing 10.41.</p>
+ <div class="listing">
+ <h4> Listing 10.41 Example of warn_missingreturn pragma</h4>
+ <p> #pragma warn_missingreturn on </p>
+ <p>int foo() <br />
+ {<br />
+ // no return statement in foo()<br />
+ } // generates a warning: return value expected</p>
+ </div>
+ <p> This pragma corresponds to the Missing ‘return’ Statements option . To check this setting, use <span class="code">__option (warn_missingreturn)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.<br />
+</p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_no_explicit_virtual.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_no_explicit_virtual.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,40 +1,40 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_no_explicit_virtual</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_no_explicit_virtual</h3>
-<p>Controls the issuing of warnings if an overriding function is not declared with a virtual keyword.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_no_explicit_virtual on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>Listing 10.42 shows an example.</p>
- <div class="listing">
- <h4>Listing 10.42 Example of warn_no_explicit_virtual pragma</h4>
- <p>#pragma warn_no_explicit_virtual on </p>
- <p>struct A {<br />
- virtual void f();<br />
- };</p>
- <p>struct B {<br />
- void f(); // WARNING: override ‘B::f()’ is declared<br />
- // without ’virtual’ keyword<br />
- }<br />
- </p>
- </div>
-<p class="note"><strong>TIP</strong> This warning is not required by the ISO C++ standard, but can help you track down unwanted overrides.</p>
-<p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_no_explicit_virtual)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_no_explicit_virtual</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_no_explicit_virtual</h3>
+<p>Controls the issuing of warnings if an overriding function is not declared with a virtual keyword.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_no_explicit_virtual on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>Listing 10.42 shows an example.</p>
+ <div class="listing">
+ <h4>Listing 10.42 Example of warn_no_explicit_virtual pragma</h4>
+ <p>#pragma warn_no_explicit_virtual on </p>
+ <p>struct A {<br />
+ virtual void f();<br />
+ };</p>
+ <p>struct B {<br />
+ void f(); // WARNING: override ‘B::f()’ is declared<br />
+ // without ’virtual’ keyword<br />
+ }<br />
+ </p>
+ </div>
+<p class="note"><strong>TIP</strong> This warning is not required by the ISO C++ standard, but can help you track down unwanted overrides.</p>
+<p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_no_explicit_virtual)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_no_side_effect.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_no_side_effect.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,37 +1,37 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_no_side_effect</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_no_side_effect</h3>
-<p> Controls the issuing of warnings for redundant statements.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_no_side_effect on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler issues a warning when it encounters a statement that produces no side effect. To suppress this warning, cast the statement with (void). Listing 10.43 provides an example</p>
- <div class="listing">
- <h4> Listing 10.43 Example of Pragma warn_no_side_effect</h4>
- <p> #pragma warn_no_side_effect on<br />
- void foo(int a,int b)<br />
- {<br />
- a+b; // WARNING: expression has no side effect<br />
- (void)(a+b); // void cast suppresses warning<br />
- }</p>
- </div>
- <p> For more information about this warning, see “Redundant Statements”.</p>
- <p>This pragma corresponds to the Expression Has No Side Effect panel setting . To check this setting, use <span class="code">__option (warn_no_side_effect)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_no_side_effect</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_no_side_effect</h3>
+<p> Controls the issuing of warnings for redundant statements.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_no_side_effect on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler issues a warning when it encounters a statement that produces no side effect. To suppress this warning, cast the statement with (void). Listing 10.43 provides an example</p>
+ <div class="listing">
+ <h4> Listing 10.43 Example of Pragma warn_no_side_effect</h4>
+ <p> #pragma warn_no_side_effect on<br />
+ void foo(int a,int b)<br />
+ {<br />
+ a+b; // WARNING: expression has no side effect<br />
+ (void)(a+b); // void cast suppresses warning<br />
+ }</p>
+ </div>
+ <p> For more information about this warning, see “Redundant Statements”.</p>
+ <p>This pragma corresponds to the Expression Has No Side Effect panel setting . To check this setting, use <span class="code">__option (warn_no_side_effect)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_no_typename.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_no_typename.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_no_typename</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_no_typename</h3>
-<p> Controls the issuing of warnings for missing typenames.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_no_typename on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>The compiler issues a warning if a typenames required by the C++ standard is missing but can still be determined by the compiler based on the context of the surrounding C++ syntax.</p>
- <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_no_typename)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. This pragma is enabled by the ISO C++ Template Parser. The default settings is <span class="code">off</span>.</p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_no_typename</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_no_typename</h3>
+<p> Controls the issuing of warnings for missing typenames.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_no_typename on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>The compiler issues a warning if a typenames required by the C++ standard is missing but can still be determined by the compiler based on the context of the surrounding C++ syntax.</p>
+ <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_no_typename)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. This pragma is enabled by the ISO C++ Template Parser. The default settings is <span class="code">off</span>.</p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_notinlined.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_notinlined.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_notinlined</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_notinlined</h3>
-<p>Controls the issuing of warnings for functions the compiler cannot inline.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_notinlined on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>An inline function is indicated by the inline keyword or is implicitly inline because it is defined, rather than just declared, within its class definition. If you enable this pragma, the compiler issues a warning for non-inlined inline function calls. For more information about this warning, see “inline Functions That Are Not Inlined”.</p>
- <p> This pragma corresponds to the Non-Inlined Functions setting . To check this setting, use <span class="code">__option (warn_notinlined)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_notinlined</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_notinlined</h3>
+<p>Controls the issuing of warnings for functions the compiler cannot inline.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_notinlined on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>An inline function is indicated by the inline keyword or is implicitly inline because it is defined, rather than just declared, within its class definition. If you enable this pragma, the compiler issues a warning for non-inlined inline function calls. For more information about this warning, see “inline Functions That Are Not Inlined”.</p>
+ <p> This pragma corresponds to the Non-Inlined Functions setting . To check this setting, use <span class="code">__option (warn_notinlined)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_padding.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_padding.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_padding</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_padding</h3>
-<p> Controls the issuing of warnings for data structure padding.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_padding on | off | reset
- </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler warns about any bytes that were implicitly added after an ANSI C struct member to improve memory alignment. Refer to the appropriate Targeting manual for more information on how the compiler pads data structures for a particular processor or operating system. For more information about this warning, see “Realigned Data Structures”.</p>
- <p> This pragma corresponds to the Pad Bytes Added setting . To check this setting, use <span class="code">__option (warn_padding)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_padding</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_padding</h3>
+<p> Controls the issuing of warnings for data structure padding.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_padding on | off | reset
+ </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler warns about any bytes that were implicitly added after an ANSI C struct member to improve memory alignment. Refer to the appropriate Targeting manual for more information on how the compiler pads data structures for a particular processor or operating system. For more information about this warning, see “Realigned Data Structures”.</p>
+ <p> This pragma corresponds to the Pad Bytes Added setting . To check this setting, use <span class="code">__option (warn_padding)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_pch_portability.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_pch_portability.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_pch_portability</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_pch_portability</h3>
-<p>Controls whether or not to issue a warning when <span class="code">#pragma <a href="p_once.htm">once</a> on</span> is used in a precompiled header.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_pch_portability on | off | reset </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler issues a warning when you use #pragma once on in a precompiled header. This helps you avoid situations in which transferring a precompiled header from machine to machine causes the precompiled header to produce different results. For more information, see pragma <a href="p_once.htm">once</a>.</p>
- <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_pch_portability)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_pch_portability</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_pch_portability</h3>
+<p>Controls whether or not to issue a warning when <span class="code">#pragma <a href="p_once.htm">once</a> on</span> is used in a precompiled header.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_pch_portability on | off | reset </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler issues a warning when you use #pragma once on in a precompiled header. This helps you avoid situations in which transferring a precompiled header from machine to machine causes the precompiled header to produce different results. For more information, see pragma <a href="p_once.htm">once</a>.</p>
+ <p> This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_pch_portability)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_possunwant.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_possunwant.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_possunwant</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_possunwant</h3>
-<p>Controls the recognition of possible unintentional logical errors.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_possunwant on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler checks for common errors that are legal C/C++ but might produce unexpected results, such as putting in unintended semicolons or confusing = and ==. For more information about this warning, see “Common Errors”.</p>
- <p> This pragma corresponds to the Possible Errors setting . To check this setting, use <span class="code">__option (warn_possunwant)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_possunwant</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_possunwant</h3>
+<p>Controls the recognition of possible unintentional logical errors.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_possunwant on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler checks for common errors that are legal C/C++ but might produce unexpected results, such as putting in unintended semicolons or confusing = and ==. For more information about this warning, see “Common Errors”.</p>
+ <p> This pragma corresponds to the Possible Errors setting . To check this setting, use <span class="code">__option (warn_possunwant)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_ptr_int_conv.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_ptr_int_conv.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,34 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_ptr_int_conv</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_ptr_int_conv</h3>
-<p>Controls the recognition of the conversion of pointer values to incorrectly-sized integral values.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_ptr_int_conv on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler issues a warning if an expression attempts to convert a pointer value to an integral type that is not large enough to hold the pointer value. </p>
- <div class="listing">
- <h4> Listing 10.44 Example for #pragma warn_ptr_int_conv</h4>
- <p>#pragma warn_ptr_int_conv on </p>
- <p>char *my_ptr;<br />
- char too_small = (char)my_ptr; // WARNING: char is too small</p>
- </div>
-<p>See also pragma <a href="p_warn_any_ptr_int_conv.htm">warn_any_ptr_int_conv</a>.</p>
-<p>For more information about this warning, see “Common Errors”.</p>
-<p>This pragma corresponds to the Pointer / Integral Conversions setting . To check this setting, use <span class="code">__option (warn_ptr_int_conv)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_ptr_int_conv</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_ptr_int_conv</h3>
+<p>Controls the recognition of the conversion of pointer values to incorrectly-sized integral values.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_ptr_int_conv on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler issues a warning if an expression attempts to convert a pointer value to an integral type that is not large enough to hold the pointer value. </p>
+ <div class="listing">
+ <h4> Listing 10.44 Example for #pragma warn_ptr_int_conv</h4>
+ <p>#pragma warn_ptr_int_conv on </p>
+ <p>char *my_ptr;<br />
+ char too_small = (char)my_ptr; // WARNING: char is too small</p>
+ </div>
+<p>See also pragma <a href="p_warn_any_ptr_int_conv.htm">warn_any_ptr_int_conv</a>.</p>
+<p>For more information about this warning, see “Common Errors”.</p>
+<p>This pragma corresponds to the Pointer / Integral Conversions setting . To check this setting, use <span class="code">__option (warn_ptr_int_conv)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_resultnotused.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_resultnotused.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,37 +1,37 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_resultnotused</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_resultnotused</h3>
-<p>Controls the issuing of warnings when function results are ignored.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_resultnotused on | off | reset </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler issues a warning when it encounters a statement that calls a function without using its result. To prevent this, cast the statement with (void). Listing 10.45 provides an example.</p>
- <div class="listing">
- <h4>Listing 10.45 Example of Function Calls with Unused Results</h4>
- <p>#pragma warn_resultnotused on </p>
- <p>extern int bar();<br />
- void foo()<br />
- {<br />
- bar(); // WARNING: result of function call is not used<br />
- (void)bar(); // ‘void’ cast suppresses warning<br />
- }</p>
- </div>
-<p> For more information about this warning, see <a href="../errors/err_ignore_fn.htm">Ignored Function Results</a>.</p>
-<p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_resultnotused)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_resultnotused</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_resultnotused</h3>
+<p>Controls the issuing of warnings when function results are ignored.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_resultnotused on | off | reset </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler issues a warning when it encounters a statement that calls a function without using its result. To prevent this, cast the statement with (void). Listing 10.45 provides an example.</p>
+ <div class="listing">
+ <h4>Listing 10.45 Example of Function Calls with Unused Results</h4>
+ <p>#pragma warn_resultnotused on </p>
+ <p>extern int bar();<br />
+ void foo()<br />
+ {<br />
+ bar(); // WARNING: result of function call is not used<br />
+ (void)bar(); // ‘void’ cast suppresses warning<br />
+ }</p>
+ </div>
+<p> For more information about this warning, see <a href="../errors/err_ignore_fn.htm">Ignored Function Results</a>.</p>
+<p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warn_resultnotused)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.</p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_structclass.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_structclass.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_structclass</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_structclass</h3>
-<p>Controls the issuing of warnings for the inconsistent use of the class and struct keywords.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_structclass on | off | reset </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler issues a warning if you use the class and struct keywords in the definition and declaration of the same identifier. For more information about this warning, see <a href="../errors/err_mixed_use.htm">Mixed Use of ‘class’ and ‘struct’ Keywords</a>.</p>
- <p> This pragma corresponds to the Inconsistent ‘class’ / ‘struct’ Usage setting . To check this setting, use <span class="code">__option (warn_structclass)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_structclass</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_structclass</h3>
+<p>Controls the issuing of warnings for the inconsistent use of the class and struct keywords.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_structclass on | off | reset </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler issues a warning if you use the class and struct keywords in the definition and declaration of the same identifier. For more information about this warning, see <a href="../errors/err_mixed_use.htm">Mixed Use of ‘class’ and ‘struct’ Keywords</a>.</p>
+ <p> This pragma corresponds to the Inconsistent ‘class’ / ‘struct’ Usage setting . To check this setting, use <span class="code">__option (warn_structclass)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_undefmacro.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_undefmacro.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_undefmacro</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_undefmacro</h3>
-<p>Controls the detection of undefined macros in <span class="code">#if/#elif</span> conditionals.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_undefmacro on | off | reset</p>
- <h5>Target</h5>
- <p>All targets.</p>
- <h5>Remarks</h5>
- <p>Listing 10.46 provides an example.</p>
- <div class="listing">
- <h4> Listing 10.46 Example of Undefined Macro</h4>
- <p>#if UNDEFINEDMACRO == 4 // WARNING: undefined macro<br />
- // ’UNDEFINEDMACRO’ used in<br />
- // #if/#elif conditional</p>
-</div>
- <p>Use this pragma to detect the use of undefined macros (especially expressions) where the default value 0 is used. To suppress this warning, check if the macro is defined before using it in a <span class="code">#if</span> or <span class="code">#elif</span> conditional.</p>
- <p class="note"><strong>NOTE</strong> A warning is only issued when a macro is evaluated. A short-circuited “&&” or “||” test or unevaluated “?:” will not produce a warning.</p>
- <p>This pragma corresponds to the Undefined Macro in #if setting . To check this setting, use <span class="code">__option (warn_undefmacro)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <p></p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_undefmacro</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_undefmacro</h3>
+<p>Controls the detection of undefined macros in <span class="code">#if/#elif</span> conditionals.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_undefmacro on | off | reset</p>
+ <h5>Target</h5>
+ <p>All targets.</p>
+ <h5>Remarks</h5>
+ <p>Listing 10.46 provides an example.</p>
+ <div class="listing">
+ <h4> Listing 10.46 Example of Undefined Macro</h4>
+ <p>#if UNDEFINEDMACRO == 4 // WARNING: undefined macro<br />
+ // ’UNDEFINEDMACRO’ used in<br />
+ // #if/#elif conditional</p>
+</div>
+ <p>Use this pragma to detect the use of undefined macros (especially expressions) where the default value 0 is used. To suppress this warning, check if the macro is defined before using it in a <span class="code">#if</span> or <span class="code">#elif</span> conditional.</p>
+ <p class="note"><strong>NOTE</strong> A warning is only issued when a macro is evaluated. A short-circuited “&&” or “||” test or unevaluated “?:” will not produce a warning.</p>
+ <p>This pragma corresponds to the Undefined Macro in #if setting . To check this setting, use <span class="code">__option (warn_undefmacro)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <p></p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_unitializedvar.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_unitializedvar.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_uninitializedvar</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_uninitializedvar</h3>
-<p> Controls the issuing of warnings whenever local variables are initialized before being used.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_uninitializedvar on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- This pragma corresponds to the Unused Variables setting . To check this setting, use <span class="code">__option (warn_uninitializedvar)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_uninitializedvar</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_uninitializedvar</h3>
+<p> Controls the issuing of warnings whenever local variables are initialized before being used.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_uninitializedvar on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ This pragma corresponds to the Unused Variables setting . To check this setting, use <span class="code">__option (warn_uninitializedvar)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_unusedarg.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warn_unusedarg.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>warn_unusedarg</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warn_unusedarg</h3>
-<p> Controls the recognition of unreferenced arguments.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_unusedarg on | off | reset</p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler issues a warning when it encounters an argument you declare but do not use. For more information about this warning, see “Unused Arguments”. To suppress this warning in C++ source code, leave an argument identifier out of the function parameter list. Listing 10.33 shows an example.</p>
- <p> This pragma corresponds to the Unused Arguments setting . To check this setting, use <span class="code">__option (warn_unusedarg)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>warn_unusedarg</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warn_unusedarg</h3>
+<p> Controls the recognition of unreferenced arguments.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_unusedarg on | off | reset</p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler issues a warning when it encounters an argument you declare but do not use. For more information about this warning, see “Unused Arguments”. To suppress this warning in C++ source code, leave an argument identifier out of the function parameter list. Listing 10.33 shows an example.</p>
+ <p> This pragma corresponds to the Unused Arguments setting . To check this setting, use <span class="code">__option (warn_unusedarg)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">off</span>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warning.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warning.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,43 +1,43 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warning</h3>
-<p> Controls which warning numbers are displayed during compiling.
-</p><h5>Syntax</h5>
- <p class="code">#pragma warning on | off | reset (num [, ...])</p>
- <p>This alternate syntax is allowed but ignored (message numbers don’t match):</p>
- <p class="code">#pragma warning(warning_type : warning_num_list)</p>
- <h5>Parameters</h5>
-
- <p class="code">num</p>
- <blockquote>
- <p>The number of the warning message to show or suppress. </p>
- </blockquote>
- <p class="code">warning_type</p>
- <blockquote>
- <p>Specifies the warning type. Included for Microsoft compatability but ignored. </p>
- </blockquote>
- <p class="code">warning_num_list</p>
- <blockquote>
- <p>The warning_num_list is a list of warning numbers separated by spaces. Included for Microsoft compatability but ignored. </p>
- </blockquote>
- <h5>Targets</h5>
- All targets.<br />
- <h5>Remarks</h5>
- <p>Use the pragma <a href="p_showmessagenumber.htm">showmessagenumber</a> to display warning messages with their warning numbers on a Windows-based system.<br />
- The alternative syntax applies to x86 programming only. Included for compatibility with Microsoft code but not implemented.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warning)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>. </p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warning</h3>
+<p> Controls which warning numbers are displayed during compiling.
+</p><h5>Syntax</h5>
+ <p class="code">#pragma warning on | off | reset (num [, ...])</p>
+ <p>This alternate syntax is allowed but ignored (message numbers don’t match):</p>
+ <p class="code">#pragma warning(warning_type : warning_num_list)</p>
+ <h5>Parameters</h5>
+
+ <p class="code">num</p>
+ <blockquote>
+ <p>The number of the warning message to show or suppress. </p>
+ </blockquote>
+ <p class="code">warning_type</p>
+ <blockquote>
+ <p>Specifies the warning type. Included for Microsoft compatability but ignored. </p>
+ </blockquote>
+ <p class="code">warning_num_list</p>
+ <blockquote>
+ <p>The warning_num_list is a list of warning numbers separated by spaces. Included for Microsoft compatability but ignored. </p>
+ </blockquote>
+ <h5>Targets</h5>
+ All targets.<br />
+ <h5>Remarks</h5>
+ <p>Use the pragma <a href="p_showmessagenumber.htm">showmessagenumber</a> to display warning messages with their warning numbers on a Windows-based system.<br />
+ The alternative syntax applies to x86 programming only. Included for compatibility with Microsoft code but not implemented.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (warning)</span><span class="code"></span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>. </p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warning_errors.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_warning_errors.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>warning_errors</h3>
-<p>Controls whether or not warnings are treated as errors.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warning_errors on | off | reset </p>
- <h5>Targets</h5>
- All platforms.<br />
- <h5>Remarks</h5>
- If you enable this pragma, the compiler treats all warnings as though they were errors and does not translate your file until you resolve them.<br />
- This pragma corresponds to the Treat All Warnings As Errors setting in the C/C++ Warnings panel. To check this setting, use <span class="code">__option (warning_errors)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>warning_errors</h3>
+<p>Controls whether or not warnings are treated as errors.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warning_errors on | off | reset </p>
+ <h5>Targets</h5>
+ All platforms.<br />
+ <h5>Remarks</h5>
+ If you enable this pragma, the compiler treats all warnings as though they were errors and does not translate your file until you resolve them.<br />
+ This pragma corresponds to the Treat All Warnings As Errors setting in the C/C++ Warnings panel. To check this setting, use <span class="code">__option (warning_errors)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_wchar_type.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/p_wchar_type.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>access_errors</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h3>wchar_type</h3>
-<p> Controls the size and format of the <span class="code">wchar_t</span> type.
-</p><h5>Syntax</h5>
-<p class="code">#pragma wchar_type on | off | reset</p>
-<h5>Targets</h5>
- All platforms.
- <h5>Remarks</h5>
-<p>If you enable this pragma, <span class="code">wchar_t</span> is treated as a built-in type.</p>
- <p> This pragma corresponds to the Enable wchar_t Support setting . To check this setting, use <span class="code"><span class="code">__option (</span>.*)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.
- </p>
- <p></p>
- <p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>access_errors</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h3>wchar_type</h3>
+<p> Controls the size and format of the <span class="code">wchar_t</span> type.
+</p><h5>Syntax</h5>
+<p class="code">#pragma wchar_type on | off | reset</p>
+<h5>Targets</h5>
+ All platforms.
+ <h5>Remarks</h5>
+<p>If you enable this pragma, <span class="code">wchar_t</span> is treated as a built-in type.</p>
+ <p> This pragma corresponds to the Enable wchar_t Support setting . To check this setting, use <span class="code"><span class="code">__option (</span>.*)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. The default setting is <span class="code">on</span>.
+ </p>
+ <p></p>
+ <p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/pragma_reference.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/pragma_reference.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,37 +1,37 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>Pragma Scope</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h2>Common Pragma Reference </h2>
-<p>The common pragmas include:</p>
-<table width="81%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="33%" scope="col">A-F</th>
- <th width="33%" scope="col">G-M</th>
- <th width="35%" scope="col">N-Z</th>
- </tr>
- <tr>
- <td><ul>
- <li><a href="p_access_errors.htm">access_errors</a></li>
- <li><a href="p_align.htm">align</a></li>
- <li><a href="p_always_inline.htm">always_inline</a></li>
- <li>ANSI_strict</li>
- <li>arg_dep_lookup</li>
- </ul></td>
- <td> </td>
- <td> </td>
- </tr>
-</table>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>Pragma Scope</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h2>Common Pragma Reference </h2>
+<p>The common pragmas include:</p>
+<table width="81%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="33%" scope="col">A-F</th>
+ <th width="33%" scope="col">G-M</th>
+ <th width="35%" scope="col">N-Z</th>
+ </tr>
+ <tr>
+ <td><ul>
+ <li><a href="p_access_errors.htm">access_errors</a></li>
+ <li><a href="p_align.htm">align</a></li>
+ <li><a href="p_always_inline.htm">always_inline</a></li>
+ <li>ANSI_strict</li>
+ <li>arg_dep_lookup</li>
+ </ul></td>
+ <td> </td>
+ <td> </td>
+ </tr>
+</table>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/pragma_scope.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/pragma_scope.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>Pragma Syntax</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h2>Pragma Scope</h2>
-<p> The scope of a pragma setting is usually limited to a single compilation unit.</p>
-<p>As discussed in <a href="pragma_syntax.htm">Pragma Syntax</a>, you should use <span class="code">on</span> or <span class="code">off</span> after the name of the pragma to change its setting to the desired condition. All code after that point is compiled with that setting until either:</p>
-<ul>
- <li>You change the setting with <span class="code">on</span>, <span class="code">off</span>, or (preferred) <span class="code">reset</span></li>
- <li>You reach the end of the compilation unit</li>
-</ul>
-<p>At the beginning of each file, the compiler reverts to the target or default settings.</p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>Pragma Syntax</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h2>Pragma Scope</h2>
+<p> The scope of a pragma setting is usually limited to a single compilation unit.</p>
+<p>As discussed in <a href="pragma_syntax.htm">Pragma Syntax</a>, you should use <span class="code">on</span> or <span class="code">off</span> after the name of the pragma to change its setting to the desired condition. All code after that point is compiled with that setting until either:</p>
+<ul>
+ <li>You change the setting with <span class="code">on</span>, <span class="code">off</span>, or (preferred) <span class="code">reset</span></li>
+ <li>You reach the end of the compilation unit</li>
+</ul>
+<p>At the beginning of each file, the compiler reverts to the target or default settings.</p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/pragma_syntax.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/pragma_syntax.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,46 +1,46 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>Pragma Syntax</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h2>Pragma Syntax </h2>
-<p>Most pragmas have this syntax:</p>
-<p class="code">#pragma setting-name on | off | reset</p>
-<h5>Parameters</h5>
-<p class="code">off</p>
-<blockquote>
- <p>Enables the pragma for any functions that follow.</p>
-</blockquote>
-<p class="code">on</p>
-<blockquote>
- <p>Disables the pragma for any functions that follow.</p>
-</blockquote>
-<p class="code">reset</p>
-<blockquote>
- <p>Restores the pragma to its original setting.</p>
-</blockquote>
-<p>An exampe of this is shown below:</p>
-<div class="listing">
- <p class="code">#pragma profile off</p>
- <p>// If the Generate Profiler Calls setting is on, turns it off for these functions.</p>
- <p>#include <smallfuncs.h></p>
- <p>#pragma profile reset</p>
- <p>// If the Generate Profiler Calls setting was originally on, turns it back on.<br />
- //
- Otherwise, the setting remains off</p>
-</div>
-<p>Suppose that you use <span class="code">#pragma profile on</span> instead of <span class="code">#pragma profile reset</span>. If you later disable Generate Profiler Calls from the Preference dialog box, that pragma turns it on. Using reset ensures that you do not inadvertently change the settings in the Project Settings dialog box.</p>
-<p class="note"><strong>TIP</strong> To catch pragmas that the Carbide x86 compiler does not recognize, use the pragma <span class="code">warn_illpragma</span>. See also <a href="../errors/err_ill_pragmas.htm">Illegal Pragmas</a>.</p>
-<p class="note"><strong>NOTE</strong> The default setting of a pragma is based on the command-line default setting. These default settings used in project stationery may differ across target devices when creating a specific project. For example, a pragma for an x86 target may default to off while the same setting for an ARM target may default to on.</p>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>Pragma Syntax</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h2>Pragma Syntax </h2>
+<p>Most pragmas have this syntax:</p>
+<p class="code">#pragma setting-name on | off | reset</p>
+<h5>Parameters</h5>
+<p class="code">off</p>
+<blockquote>
+ <p>Enables the pragma for any functions that follow.</p>
+</blockquote>
+<p class="code">on</p>
+<blockquote>
+ <p>Disables the pragma for any functions that follow.</p>
+</blockquote>
+<p class="code">reset</p>
+<blockquote>
+ <p>Restores the pragma to its original setting.</p>
+</blockquote>
+<p>An exampe of this is shown below:</p>
+<div class="listing">
+ <p class="code">#pragma profile off</p>
+ <p>// If the Generate Profiler Calls setting is on, turns it off for these functions.</p>
+ <p>#include <smallfuncs.h></p>
+ <p>#pragma profile reset</p>
+ <p>// If the Generate Profiler Calls setting was originally on, turns it back on.<br />
+ //
+ Otherwise, the setting remains off</p>
+</div>
+<p>Suppose that you use <span class="code">#pragma profile on</span> instead of <span class="code">#pragma profile reset</span>. If you later disable Generate Profiler Calls from the Preference dialog box, that pragma turns it on. Using reset ensures that you do not inadvertently change the settings in the Project Settings dialog box.</p>
+<p class="note"><strong>TIP</strong> To catch pragmas that the Carbide x86 compiler does not recognize, use the pragma <span class="code">warn_illpragma</span>. See also <a href="../errors/err_ill_pragmas.htm">Illegal Pragmas</a>.</p>
+<p class="note"><strong>NOTE</strong> The default setting of a pragma is based on the command-line default setting. These default settings used in project stationery may differ across target devices when creating a specific project. For example, a pragma for an x86 target may default to off while the same setting for an ARM target may default to on.</p>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/pragmas.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas/pragmas.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
- <title>Common Pragmas</title>
- <link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
-
-<body>
-<h2>Common Pragmas </h2>
-<p>
-You configure the compiler for a project by changing the appropriate pragmas.</p>
-<p>Many of the pragmas correspond to settings and the settings panels for processors and operating systems.</p>
-<p>Typically, you use these panels to select the settings for most of your code and use pragmas to change settings for special cases. For example, within the Global Optimizations panel, you can set code generation to a specific optimization level and then use a pragma to re-enable an optimization only for the code that benefits from the optimization. The targeting manual for the target processor or device may have details on enabling or disabling specific optimizations. When in doubt, just use the preset options.</p>
-<p>The sections includee:</p>
-<ul>
- <li><a href="pragma_syntax.htm">Pragma Syntax</a></li>
- <li><a href="pragma_scope.htm">Pragma Scope</a></li>
- <li><a href="pragma_reference.htm">Common Pragma Reference</a></li>
-</ul>
-<p class="note"><strong>TIP</strong> If you use the command-line tools, such as those for UNIX, see <a href="../cmd_line/cmd_line.htm">Command-Line Tools</a> for information on how to duplicate the effect of #pragma statements using command-line tool options.</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+ <title>Common Pragmas</title>
+ <link rel="StyleSheet" href="../../book.css" type="text/css"/>
+ </head>
+
+<body>
+<h2>Common Pragmas </h2>
+<p>
+You configure the compiler for a project by changing the appropriate pragmas.</p>
+<p>Many of the pragmas correspond to settings and the settings panels for processors and operating systems.</p>
+<p>Typically, you use these panels to select the settings for most of your code and use pragmas to change settings for special cases. For example, within the Global Optimizations panel, you can set code generation to a specific optimization level and then use a pragma to re-enable an optimization only for the code that benefits from the optimization. The targeting manual for the target processor or device may have details on enabling or disabling specific optimizations. When in doubt, just use the preset options.</p>
+<p>The sections includee:</p>
+<ul>
+ <li><a href="pragma_syntax.htm">Pragma Syntax</a></li>
+ <li><a href="pragma_scope.htm">Pragma Scope</a></li>
+ <li><a href="pragma_reference.htm">Common Pragma Reference</a></li>
+</ul>
+<p class="note"><strong>TIP</strong> If you use the command-line tools, such as those for UNIX, see <a href="../cmd_line/cmd_line.htm">Command-Line Tools</a> for information on how to duplicate the effect of #pragma statements using command-line tool options.</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_asm_fixup_dllimports.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_asm_fixup_dllimports.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>asm_fixup_dllimports</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>asm_fixup_dllimports</h3>
-<p>Instructs the compiler to correct inline assembly that incorrectly accesses global variables from a DLL.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma asm_fixup_dllimports on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>In the Win32 DLL model, variables must be addressed indirectly through the symbol <span class="code">__imp_<symbol></span> and replaced with the normal link-time symbol <span class="code">_<symbol></span>. The compiler detects references to <span class="code">_<symbol></span> and replaces them with the correct sequence of code. </p>
-<p class="note"><strong>NOTE</strong> This transformation may not always be possible and an “illegal operand” error is reported when the compiler can’t make the substitution. </p>
-<p> This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (asm_fixup_dllimports)</span>. The default setting is off.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>asm_fixup_dllimports</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>asm_fixup_dllimports</h3>
+<p>Instructs the compiler to correct inline assembly that incorrectly accesses global variables from a DLL.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma asm_fixup_dllimports on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>In the Win32 DLL model, variables must be addressed indirectly through the symbol <span class="code">__imp_<symbol></span> and replaced with the normal link-time symbol <span class="code">_<symbol></span>. The compiler detects references to <span class="code">_<symbol></span> and replaces them with the correct sequence of code. </p>
+<p class="note"><strong>NOTE</strong> This transformation may not always be possible and an “illegal operand” error is reported when the compiler can’t make the substitution. </p>
+<p> This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (asm_fixup_dllimports)</span>. The default setting is off.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_avoid_ebp.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_avoid_ebp.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>avoid_ebp</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>avoid_ebp</h3>
-<p> Disables the EBP as a temporary register to ensure that the base pointer is valid even when full optimizations are enabled.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma avoid_ebp on | off</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>Disabling the use of the EBP register with <span class="code">#pragma avoid_ebp</span> on ensures that the stack chains are coherent, even if they do not include every called function, so code that relies on the stack chain (i.e. crash recovery tools and structured exception handling) will work more consistently. Note that this can have an effect on performance (only 6 internal registers are available instead of 7) so do not use it in speed-critical code.</p>
- <p>This #pragma is recommended for programs using <span class="code">_set_se_translator()</span> under the zero-overhead exceptions model. The SEH handler chain and the zero-overhead exception stack are independent of each other, unlike the MS exceptions model where both share the same chain, so the zero-overhead exceptions model needs more help reconciling the fact that exceptions can be thrown from anywhere in the program. <br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>avoid_ebp</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>avoid_ebp</h3>
+<p> Disables the EBP as a temporary register to ensure that the base pointer is valid even when full optimizations are enabled.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma avoid_ebp on | off</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>Disabling the use of the EBP register with <span class="code">#pragma avoid_ebp</span> on ensures that the stack chains are coherent, even if they do not include every called function, so code that relies on the stack chain (i.e. crash recovery tools and structured exception handling) will work more consistently. Note that this can have an effect on performance (only 6 internal registers are available instead of 7) so do not use it in speed-critical code.</p>
+ <p>This #pragma is recommended for programs using <span class="code">_set_se_translator()</span> under the zero-overhead exceptions model. The SEH handler chain and the zero-overhead exception stack are independent of each other, unlike the MS exceptions model where both share the same chain, so the zero-overhead exceptions model needs more help reconciling the fact that exceptions can be thrown from anywhere in the program. <br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_code_seg.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_code_seg.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>code_seg</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>code_seg</h3>
-<p> Specifies the segment into which code is placed.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma code_seg(name)</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- This pragma designates the segment into which compiled code is placed. The name is a string specifying the name of the code segment. For example, the pragma
- <span class="code">#pragma code_seg(".code")</span>places all subsequent code into a segment named <span class="code">.code</span>. <br />
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>code_seg</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>code_seg</h3>
+<p> Specifies the segment into which code is placed.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma code_seg(name)</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ This pragma designates the segment into which compiled code is placed. The name is a string specifying the name of the code segment. For example, the pragma
+ <span class="code">#pragma code_seg(".code")</span>places all subsequent code into a segment named <span class="code">.code</span>. <br />
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_codeviewpro9compatible.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_codeviewpro9compatible.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>codeviewpro9compatible</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>codeviewpro9compatible</h3>
-<p> Controls the emission of CodeView 5.0 formatted debug files compatible with MSVC 6 or MSVC .NET 2003. The default is on.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma codeviewpro9compatible on | off | reset</p>
- <h5>Parameters</h5>
- <p class="code">on</p>
- <blockquote>
- <p>Format debug files for MSVC 6 and CodeWarrior Professional 9. This is the equivilent of Symbian’s command-line option -sym codeview.</p>
- </blockquote>
- <p class="code">off</p>
- <blockquote>
- <p>Format debug files for MSVC .NET 2003. This is the equivalent of Symbian’s command-line option -sym codeview_new.</p>
- <p class="note"><strong>NOTE</strong> If you normally use the command line option "<span class="code">-g</span>" to enable debug information and wish to use "<span class="code">-sym codeview_new</span>", note that "<span class="code">-g</span>" also implies "<span class="code">-sym fullpath</span>", so specify either "<span class="code">-g -sym codeview_new</span>" or "<span class="code">-sym fullpath,codeview_new</span>" to retain full paths in the debug information.</p>
- </blockquote>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p class="note"><strong>NOTE</strong> The Carbide linker can accept object files or libraries using both the old and the new Codeview formats and generates an executable using a mixture of formats. The Carbide debugger will accept such mixed-format information. MSVC 6 and .NET 2003, however, only accept one format, erroneously interpreting the non-favored format. You may need to rebuild all your libraries and DLLs if you wish to debug fully under those debuggers. <br />
- </p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>codeviewpro9compatible</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>codeviewpro9compatible</h3>
+<p> Controls the emission of CodeView 5.0 formatted debug files compatible with MSVC 6 or MSVC .NET 2003. The default is on.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma codeviewpro9compatible on | off | reset</p>
+ <h5>Parameters</h5>
+ <p class="code">on</p>
+ <blockquote>
+ <p>Format debug files for MSVC 6 and CodeWarrior Professional 9. This is the equivilent of Symbian’s command-line option -sym codeview.</p>
+ </blockquote>
+ <p class="code">off</p>
+ <blockquote>
+ <p>Format debug files for MSVC .NET 2003. This is the equivalent of Symbian’s command-line option -sym codeview_new.</p>
+ <p class="note"><strong>NOTE</strong> If you normally use the command line option "<span class="code">-g</span>" to enable debug information and wish to use "<span class="code">-sym codeview_new</span>", note that "<span class="code">-g</span>" also implies "<span class="code">-sym fullpath</span>", so specify either "<span class="code">-g -sym codeview_new</span>" or "<span class="code">-sym fullpath,codeview_new</span>" to retain full paths in the debug information.</p>
+ </blockquote>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p class="note"><strong>NOTE</strong> The Carbide linker can accept object files or libraries using both the old and the new Codeview formats and generates an executable using a mixture of formats. The Carbide debugger will accept such mixed-format information. MSVC 6 and .NET 2003, however, only accept one format, erroneously interpreting the non-favored format. You may need to rebuild all your libraries and DLLs if you wish to debug fully under those debuggers. <br />
+ </p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_comment.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_comment.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,59 +1,59 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>comment</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>comment</h3>
-<p> Embeds information into the object code for the linker.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma comment(type [ “value”])</p>
- <h5>Parameters</h5>
- <p class="code">type</p>
- <blockquote>
- <p>Set type to: lib, exestr, linker, user, or compiler.</p>
- </blockquote>
- <p class="code">value</p>
- <blockquote>
- <p> Name of file without extension to embed into the object code.</p>
- </blockquote>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
-<p>Embeds information into the object code. The linker searches for the library file using the access paths in the IDE or the MWLibraries environment variable in the command line tool and include it after any explicitly-specified files on the command line. See Table 11.1 for a list of comment usage examples.</p>
- <table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="32%" scope="col">Example</th>
- <th width="68%" scope="col">Description</th>
- </tr>
- <tr>
- <td class="code">comment(lib, “library”)</td>
- <td>Instructs the linker to automatically link against library[.lib] file when the Link with default libraries setting is enabled.</td>
- </tr>
- <tr>
- <td class="code">comment(linker, “directive”) </td>
- <td>Embed a linker directive using the Linker Command File (.cmd) syntax.</td>
- </tr>
- <tr>
- <td class="code">comment(user, “string”)</td>
- <td>Embed a comment into the object file.</td>
- </tr>
- <tr>
- <td class="code">comment(exestr, “string”)</td>
- <td>Embed a string into the executable.</td>
- </tr>
- <tr>
- <td class="code">comment(compiler)</td>
- <td>Embed compiler version into object file. Normally ignored for compatability.</td>
- </tr>
- </table>
- <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (comment)</span>.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>comment</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>comment</h3>
+<p> Embeds information into the object code for the linker.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma comment(type [ “value”])</p>
+ <h5>Parameters</h5>
+ <p class="code">type</p>
+ <blockquote>
+ <p>Set type to: lib, exestr, linker, user, or compiler.</p>
+ </blockquote>
+ <p class="code">value</p>
+ <blockquote>
+ <p> Name of file without extension to embed into the object code.</p>
+ </blockquote>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+<p>Embeds information into the object code. The linker searches for the library file using the access paths in the IDE or the MWLibraries environment variable in the command line tool and include it after any explicitly-specified files on the command line. See Table 11.1 for a list of comment usage examples.</p>
+ <table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="32%" scope="col">Example</th>
+ <th width="68%" scope="col">Description</th>
+ </tr>
+ <tr>
+ <td class="code">comment(lib, “library”)</td>
+ <td>Instructs the linker to automatically link against library[.lib] file when the Link with default libraries setting is enabled.</td>
+ </tr>
+ <tr>
+ <td class="code">comment(linker, “directive”) </td>
+ <td>Embed a linker directive using the Linker Command File (.cmd) syntax.</td>
+ </tr>
+ <tr>
+ <td class="code">comment(user, “string”)</td>
+ <td>Embed a comment into the object file.</td>
+ </tr>
+ <tr>
+ <td class="code">comment(exestr, “string”)</td>
+ <td>Embed a string into the executable.</td>
+ </tr>
+ <tr>
+ <td class="code">comment(compiler)</td>
+ <td>Embed compiler version into object file. Normally ignored for compatability.</td>
+ </tr>
+ </table>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (comment)</span>.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_disable_stackalloc.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_disable_stackalloc.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>disable_stackalloc</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>disable_stackalloc</h3>
-<p> Controls the compiler method used to grow the size of the stack.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma disable_stackalloc on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>The compiler controls how stack space is grown as follows:</p>
- <ul>
- <li>off – for each object on the stack larger than 4096 bytes, the compiler calls a runtime routine to touch each new page on the stack to tell the OS to allocate more stack space.</li>
- <li>on – the compiler only touches the last (topmost) page of the stack after allocating local space.</li>
- </ul>
- <p class="note"><strong class="note">NOTE</strong> Use of this pragma is required for Win32 code.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (disable_stackalloc)</span>. The default setting for Win32 targets is off.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>disable_stackalloc</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>disable_stackalloc</h3>
+<p> Controls the compiler method used to grow the size of the stack.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma disable_stackalloc on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>The compiler controls how stack space is grown as follows:</p>
+ <ul>
+ <li>off – for each object on the stack larger than 4096 bytes, the compiler calls a runtime routine to touch each new page on the stack to tell the OS to allocate more stack space.</li>
+ <li>on – the compiler only touches the last (topmost) page of the stack after allocating local space.</li>
+ </ul>
+ <p class="note"><strong class="note">NOTE</strong> Use of this pragma is required for Win32 code.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (disable_stackalloc)</span>. The default setting for Win32 targets is off.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_disableopts.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_disableopts.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>disableopts</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>disableopts</h3>
-<p> Use to make the debugging of optimized code easier while having no effect on non-optimized code.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma disableopts on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
-<p>To make debugging opimized code easier <span class="code">disableopts</span> on:</p>
- <ul>
- <li> forces use of a stack frame so that the call stack is always available</li>
- <li>disables local stack variable overlapping</li>
- <li>disables automatic stack alignment, which may result in the odd use of EBX, EBP, and ESP</li>
- <li>disables allocation of long long to pairs of integer registers</li>
- <li>prevents the scheduler from moving code in front of the epilog or past the prolog, preventing local variables from appearing mangled when the program counter is within this range</li>
- </ul>
- <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (disableopts)</span>. The default setting is off.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>disableopts</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>disableopts</h3>
+<p> Use to make the debugging of optimized code easier while having no effect on non-optimized code.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma disableopts on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+<p>To make debugging opimized code easier <span class="code">disableopts</span> on:</p>
+ <ul>
+ <li> forces use of a stack frame so that the call stack is always available</li>
+ <li>disables local stack variable overlapping</li>
+ <li>disables automatic stack alignment, which may result in the odd use of EBX, EBP, and ESP</li>
+ <li>disables allocation of long long to pairs of integer registers</li>
+ <li>prevents the scheduler from moving code in front of the epilog or past the prolog, preventing local variables from appearing mangled when the program counter is within this range</li>
+ </ul>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (disableopts)</span>. The default setting is off.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_emit_local_scopes.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_emit_local_scopes.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>emit_local_scopes</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>emit_local_scopes</h3>
-<p> Instructs the compiler to emit the scopes of local variables into debugger information.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma emit_local_scopes on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>This pragma enables debuggers to decide, among several variables using the same name, which one is actually used at the current program counter. This only effects debugging information generated for Codeview.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (emit_local_scopes)</span>. The default setting is <span class="code">on</span>.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>emit_local_scopes</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>emit_local_scopes</h3>
+<p> Instructs the compiler to emit the scopes of local variables into debugger information.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma emit_local_scopes on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>This pragma enables debuggers to decide, among several variables using the same name, which one is actually used at the current program counter. This only effects debugging information generated for Codeview.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (emit_local_scopes)</span>. The default setting is <span class="code">on</span>.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_exceptions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_exceptions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>exceptions</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>exceptions</h3>
-<p> Set exception handling to use Microsoft-compatible exceptions or Carbide zero-overhead exceptions (default). Implies the use of <span class="code">pragma# -cpp_exceptions on</span>.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma exc[eptions] mw | ms | sync | async</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>This pragma emulates the /EHS option of MSVC. In this model, Win32 structured exception handling (SEH) is not caught by C++ <span class="code">catch(...)</span> blocks. </p>
- <p>This pragma corresponds to the C++ exception handling setting in the Microsoft Compatability group of the x86 CodeGen panel. To check this setting, use <span class="code">__option (exceptions)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. By default, this pragma is <span class="code">on</span>.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>exceptions</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>exceptions</h3>
+<p> Set exception handling to use Microsoft-compatible exceptions or Carbide zero-overhead exceptions (default). Implies the use of <span class="code">pragma# -cpp_exceptions on</span>.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma exc[eptions] mw | ms | sync | async</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>This pragma emulates the /EHS option of MSVC. In this model, Win32 structured exception handling (SEH) is not caught by C++ <span class="code">catch(...)</span> blocks. </p>
+ <p>This pragma corresponds to the C++ exception handling setting in the Microsoft Compatability group of the x86 CodeGen panel. To check this setting, use <span class="code">__option (exceptions)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. By default, this pragma is <span class="code">on</span>.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_exceptions_synchronous.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_exceptions_synchronous.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>exceptions_synchronous</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>exceptions_synchronous</h3>
-<p> Set exception handling to use Microsoft-compatible exceptions. The default is off.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma exceptions_synchronous on | off | reset</p>
- <h5>Parameters</h5>
- <p class="code">on</p>
- <blockquote>
- <p>Ignore C++ <span class="code">catch(...)</span> blocks for Win32 exceptions when using Structured Exception Handling (SEH). For Microsoft-compatible mode only. Equivilent to <span class="code">#pragma exc sync</span>.</p>
- </blockquote>
- <p class="code">off</p>
- <blockquote>
- <p>Let C++<span class="code"> catch(...)</span> blocks trap Win32 exceptions when using SEH. For Microsoft-compatible mode only. Equivilent to <span class="code">#pragma exc async</span>. This is the default.</p>
- </blockquote>
- <h5>Targets</h5>
- <p>Intel x86</p>
- <p class="note"><strong>NOTE</strong> To translate Win32 exceptions into C++ exceptions, use the routine <span class="code">set_se_translator()</span> found in the header <span class="code"><eh.h></span>.</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>exceptions_synchronous</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>exceptions_synchronous</h3>
+<p> Set exception handling to use Microsoft-compatible exceptions. The default is off.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma exceptions_synchronous on | off | reset</p>
+ <h5>Parameters</h5>
+ <p class="code">on</p>
+ <blockquote>
+ <p>Ignore C++ <span class="code">catch(...)</span> blocks for Win32 exceptions when using Structured Exception Handling (SEH). For Microsoft-compatible mode only. Equivilent to <span class="code">#pragma exc sync</span>.</p>
+ </blockquote>
+ <p class="code">off</p>
+ <blockquote>
+ <p>Let C++<span class="code"> catch(...)</span> blocks trap Win32 exceptions when using SEH. For Microsoft-compatible mode only. Equivilent to <span class="code">#pragma exc async</span>. This is the default.</p>
+ </blockquote>
+ <h5>Targets</h5>
+ <p>Intel x86</p>
+ <p class="note"><strong>NOTE</strong> To translate Win32 exceptions into C++ exceptions, use the routine <span class="code">set_se_translator()</span> found in the header <span class="code"><eh.h></span>.</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_fill_stack.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_fill_stack.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>fill_stack</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>fill_stack</h3>
-<p> Instructs the compiler to initialize locals to a fixed bit pattern (<span class="code">0xCC</span>) upon entry to a function.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma fill_stack on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>Use of this pragma helps to diagnose program failures or crashes caused by the use of uninitialized variables. I.e., a bit pattern of <span class="code">0xCC</span> is not a normally-encountered integer or floating-point value, and <span class="code">0xCCCCCCCC</span> is almost never a valide pointer value. If the program counter does point to such a variable, it will be “executed” as an <span class="code">int3</span> breakpoint.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (fill_stack)</span>. The default setting for is off at optimization level 0.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>fill_stack</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>fill_stack</h3>
+<p> Instructs the compiler to initialize locals to a fixed bit pattern (<span class="code">0xCC</span>) upon entry to a function.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma fill_stack on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>Use of this pragma helps to diagnose program failures or crashes caused by the use of uninitialized variables. I.e., a bit pattern of <span class="code">0xCC</span> is not a normally-encountered integer or floating-point value, and <span class="code">0xCCCCCCCC</span> is almost never a valide pointer value. If the program counter does point to such a variable, it will be “executed” as an <span class="code">int3</span> breakpoint.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use the <span class="code">__option (fill_stack)</span>. The default setting for is off at optimization level 0.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_function.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_function.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>function</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>function</h3>
-<p> Ignored but included for compatibility with Microsoft compilers.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma function( funcname1, funcname2, ... )</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- Ignored. Included for compatibility with Microsoft compilers.<br />
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>function</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>function</h3>
+<p> Ignored but included for compatibility with Microsoft compilers.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma function( funcname1, funcname2, ... )</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ Ignored. Included for compatibility with Microsoft compilers.<br />
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_ieeefp.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_ieeefp.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,39 +1,39 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>ieeefp</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>ieeefp</h3>
-<p> Controls whether floating point comparisons and some other optimizations are performed as per the IEEE standard. The default is off.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma ieeefp on | off</p>
- <p> Parameters</p>
- <p class="code">on</p>
- <blockquote>
- <p> Floating-point comparisons are done using these conditions:</p>
- <ul>
- <li>checks for NANs are not performed in comparisons, floating-point conditional moves, or integer conditional moves with floating-point tests in the condition</li>
- <li>divides of all constants are changed to multiples of 1.0/constant</li>
- <li>when performing float->integer conversions, the control word is reset to the assumed default of “round to nearest” instead of the original value, saving a few read/writes as the operation is performed</li>
- </ul>
- </blockquote>
- <p class="code">off</p>
- <blockquote>
- <p>Floating-point comparisons are done using IEEE standards.</p>
- </blockquote>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>Use <span class="code">#pragma ieeefp</span> on to reduce floating-point accuracy and increase calculation speed. The same effect can be achieved in the command-line using <span class="code">-opt ieeefp</span> or<span class="code"> -fast_math off</span> commands.</p>
- <p>Use <span class="code">#pragma ieeefp off</span> to maximize floating-point accuracy and decrease calculation speed. The same effect can be achieved in the command-line using <span class="code">-opt noieeefp</span> or <span class="code">-fast_math on</span> commands.</p>
- <p>This pragma corresponds to the Relax IEEE floating point setting in the processor-specific CodeGen panel. To check this setting, use <span class="code">__option (ieeefp)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. By default, this setting is on.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>ieeefp</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>ieeefp</h3>
+<p> Controls whether floating point comparisons and some other optimizations are performed as per the IEEE standard. The default is off.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma ieeefp on | off</p>
+ <p> Parameters</p>
+ <p class="code">on</p>
+ <blockquote>
+ <p> Floating-point comparisons are done using these conditions:</p>
+ <ul>
+ <li>checks for NANs are not performed in comparisons, floating-point conditional moves, or integer conditional moves with floating-point tests in the condition</li>
+ <li>divides of all constants are changed to multiples of 1.0/constant</li>
+ <li>when performing float->integer conversions, the control word is reset to the assumed default of “round to nearest” instead of the original value, saving a few read/writes as the operation is performed</li>
+ </ul>
+ </blockquote>
+ <p class="code">off</p>
+ <blockquote>
+ <p>Floating-point comparisons are done using IEEE standards.</p>
+ </blockquote>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>Use <span class="code">#pragma ieeefp</span> on to reduce floating-point accuracy and increase calculation speed. The same effect can be achieved in the command-line using <span class="code">-opt ieeefp</span> or<span class="code"> -fast_math off</span> commands.</p>
+ <p>Use <span class="code">#pragma ieeefp off</span> to maximize floating-point accuracy and decrease calculation speed. The same effect can be achieved in the command-line using <span class="code">-opt noieeefp</span> or <span class="code">-fast_math on</span> commands.</p>
+ <p>This pragma corresponds to the Relax IEEE floating point setting in the processor-specific CodeGen panel. To check this setting, use <span class="code">__option (ieeefp)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. By default, this setting is on.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_init_seg.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_init_seg.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>init_seg</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>init_seg</h3>
-<p> Controls the order in which initialization code is executed.</p>
-<h5>Syntax</h5>
- <p class="code">pragma init_seg( compiler | lib | user | "name")</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>This pragma controls the order in which initialization code is executed. The initialization code for a C++ compiled module calls constructors for any statically declared objects. For C, no initialization code is generated. </p>
- <p>The order of initialization is:</p>
- <ul>
- <li>compiler</li>
- <li>lib</li>
- <li>user</li>
- </ul>
- <p>If you specify the name of a segment, a pointer to the initialization code is placed in the designated segment. In this case, the initialization code is not called automatically; you must call it explicitly.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>init_seg</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>init_seg</h3>
+<p> Controls the order in which initialization code is executed.</p>
+<h5>Syntax</h5>
+ <p class="code">pragma init_seg( compiler | lib | user | "name")</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>This pragma controls the order in which initialization code is executed. The initialization code for a C++ compiled module calls constructors for any statically declared objects. For C, no initialization code is generated. </p>
+ <p>The order of initialization is:</p>
+ <ul>
+ <li>compiler</li>
+ <li>lib</li>
+ <li>user</li>
+ </ul>
+ <p>If you specify the name of a segment, a pointer to the initialization code is placed in the designated segment. In this case, the initialization code is not called automatically; you must call it explicitly.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_intrinsics_regabi.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_intrinsics_regabi.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,21 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>intrinsics_regabi</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>intrinsics_regabi</h3>
-<p> Controls whether<span class="code"> __m64</span> arguments and <span class="code">__m128{i,d,f}</span> arguments are passed on the stack or via the MMX and SSE registers respectively. The default setting is <span class="code">off</span>.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma intrinsics_regabi on | off | reset</p>
- <h5>Targets</h5>
- <p>Intel x86<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>intrinsics_regabi</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>intrinsics_regabi</h3>
+<p> Controls whether<span class="code"> __m64</span> arguments and <span class="code">__m128{i,d,f}</span> arguments are passed on the stack or via the MMX and SSE registers respectively. The default setting is <span class="code">off</span>.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma intrinsics_regabi on | off | reset</p>
+ <h5>Targets</h5>
+ <p>Intel x86<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_k63d.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_k63d.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>k63d</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>k63d</h3>
-<p> Controls special code generation for AMD K6 3D extensions.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma k63d on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>This pragma tells the x86 compiler to generate code specifically for processors that have the circuitry needed to execute specialized 3D instructions, such as AMD K6 3D extensions.</p>
- <p class="note"><strong>NOTE</strong> When enabled, the autovectorize loops option (#pragma opt_vectorize_loops on) will use these instructions if possible.<br />
- This pragma corresponds to the K6 3D Favored setting in the Extended Instruction Set menu of the x86 CodeGen panel. </p>
- <p class="note"><strong>NOTE</strong> This pragma generates code that is not compatible with the Intel Pentium class of microprocessors.</p>
- <p>To check this setting, use <span class="code"><span class="code">__option (k</span>63d)</span>.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>k63d</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>k63d</h3>
+<p> Controls special code generation for AMD K6 3D extensions.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma k63d on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>This pragma tells the x86 compiler to generate code specifically for processors that have the circuitry needed to execute specialized 3D instructions, such as AMD K6 3D extensions.</p>
+ <p class="note"><strong>NOTE</strong> When enabled, the autovectorize loops option (#pragma opt_vectorize_loops on) will use these instructions if possible.<br />
+ This pragma corresponds to the K6 3D Favored setting in the Extended Instruction Set menu of the x86 CodeGen panel. </p>
+ <p class="note"><strong>NOTE</strong> This pragma generates code that is not compatible with the Intel Pentium class of microprocessors.</p>
+ <p>To check this setting, use <span class="code"><span class="code">__option (k</span>63d)</span>.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_line_trace.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_line_trace.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>line_trace</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>line_trace</h3>
-<p> Instructs the compiler to emit a call to an external function on each transition to a new source line. </p>
-<h5>Syntax</h5>
- <p class="code">#pragma line_trace on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>Use this pragma to output a log of all executed source lines to enable you to track down difficult errors or act as a statement-level profiler on a line-by-line level. </p>
- <p>To make <span class="code">line_trace</span> work you need to write an external function to output the line information. The function should have this signature:</p>
- <p class="listing">extern "C" void __stdcall _LineTrace( const char *function, int line );</p>
- <p>and must save and restore any registers it uses. For example, pushad and popad work for saving and restoring integer registers.</p>
- <p>To check this setting, use <span class="code">__option (line_trace)</span>. The default setting is <span class="code">off</span>.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>line_trace</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>line_trace</h3>
+<p> Instructs the compiler to emit a call to an external function on each transition to a new source line. </p>
+<h5>Syntax</h5>
+ <p class="code">#pragma line_trace on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>Use this pragma to output a log of all executed source lines to enable you to track down difficult errors or act as a statement-level profiler on a line-by-line level. </p>
+ <p>To make <span class="code">line_trace</span> work you need to write an external function to output the line information. The function should have this signature:</p>
+ <p class="listing">extern "C" void __stdcall _LineTrace( const char *function, int line );</p>
+ <p>and must save and restore any registers it uses. For example, pushad and popad work for saving and restoring integer registers.</p>
+ <p>To check this setting, use <span class="code">__option (line_trace)</span>. The default setting is <span class="code">off</span>.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_microsoft_exceptions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_microsoft_exceptions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>microsoft_exceptions</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>microsoft_exceptions</h3>
-<p> Controls the use of Microsoft C++ exception handling.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma microsoft_exceptions on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>This pragma tells the x86 compiler to generate exception handling code that is compatible with Microsoft C++ exception handling code.</p>
- <p>To check this setting, use <span class="code">__option (microsoft_exceptions)</span>.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>microsoft_exceptions</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>microsoft_exceptions</h3>
+<p> Controls the use of Microsoft C++ exception handling.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma microsoft_exceptions on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>This pragma tells the x86 compiler to generate exception handling code that is compatible with Microsoft C++ exception handling code.</p>
+ <p>To check this setting, use <span class="code">__option (microsoft_exceptions)</span>.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_mmcalls.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_mmcalls.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>mmcalls</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>mmcalls</h3>
-<p> Instructs the compiler to optimize arithmetic and function calling code for use of MMX registers (AMD K6 + 3DNow! instruction set) or SSE registers (Intel SSE or SSE-2 instruction sets) when the related pragmas or options are enabled.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma mmcalls on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>This pragma corresponds to the Use multimedia calling convention setting in the the x86 CodeGen panel. </p>
- <p class="note"><strong>NOTE</strong> This pragma generates code that is not compatible with the Intel Pentium class of microprocessors.</p>
- <p>To check this setting, use <span class="code">__option (mmcalls)</span>.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>mmcalls</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>mmcalls</h3>
+<p> Instructs the compiler to optimize arithmetic and function calling code for use of MMX registers (AMD K6 + 3DNow! instruction set) or SSE registers (Intel SSE or SSE-2 instruction sets) when the related pragmas or options are enabled.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma mmcalls on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>This pragma corresponds to the Use multimedia calling convention setting in the the x86 CodeGen panel. </p>
+ <p class="note"><strong>NOTE</strong> This pragma generates code that is not compatible with the Intel Pentium class of microprocessors.</p>
+ <p>To check this setting, use <span class="code">__option (mmcalls)</span>.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_mmx.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_mmx.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>mmx</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>mmx</h3>
-<p> Controls special code generation Intel MMX extensions.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma mmx on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>This pragma tells the x86 compiler to generate Intel MMX extension code that only runs on processors that have with the circuitry needed to execute the more than 50 specialized MMX instructions.</p>
- <p class="note"><strong>NOTE</strong> When enabled, the autovectorize loops option (<span class="code">#pragma opt_vectorize_loops on</span>) will use these instructions if possible.</p>
- <p>This pragma corresponds to the MMX setting in the Extended Instruction Set menu of the x86 CodeGen panel. To check this setting, use <span class="code">__option (mmx)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>mmx</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>mmx</h3>
+<p> Controls special code generation Intel MMX extensions.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma mmx on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>This pragma tells the x86 compiler to generate Intel MMX extension code that only runs on processors that have with the circuitry needed to execute the more than 50 specialized MMX instructions.</p>
+ <p class="note"><strong>NOTE</strong> When enabled, the autovectorize loops option (<span class="code">#pragma opt_vectorize_loops on</span>) will use these instructions if possible.</p>
+ <p>This pragma corresponds to the MMX setting in the Extended Instruction Set menu of the x86 CodeGen panel. To check this setting, use <span class="code">__option (mmx)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_overlap_locals.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_overlap_locals.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>overlap_locals</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>overlap_locals</h3>
-<p> Instructs the compiler to analyze the lifetimes of variables on the stack and use the same storage location for variables with non-overlapping lifetimes.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma overlap_locals on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>The compiler can analyze the lifetime of variables on the stack, either those too large for register storage or those forced on the stack by register spilling, or being marked as volatile, and use the same storage location for variables with non-overlapping lifetimes.</p>
- <p>This can dramatically reduce the stack size.</p>
- <p>The default setting is on for optimization levels 2 and above.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>overlap_locals</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>overlap_locals</h3>
+<p> Instructs the compiler to analyze the lifetimes of variables on the stack and use the same storage location for variables with non-overlapping lifetimes.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma overlap_locals on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>The compiler can analyze the lifetime of variables on the stack, either those too large for register storage or those forced on the stack by register spilling, or being marked as volatile, and use the same storage location for variables with non-overlapping lifetimes.</p>
+ <p>This can dramatically reduce the stack size.</p>
+ <p>The default setting is on for optimization levels 2 and above.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_pack.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_pack.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,46 +1,46 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>pack</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>pack</h3>
-<p> Controls the alignment of data structures.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma pack( [n | push, n | pop] )</p>
- <h5>Targets</h5>
- Intel x86, MIPS<br />
- <h5>Remarks</h5>
- <p>Sets the packing alignment for data structures. It affects all data structures declared after this pragma until you change it again with another pack pragma.</p>
- <table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="28%" scope="col">This pragma…</th>
- <th width="72%" scope="col">Does this…</th>
- </tr>
- <tr>
- <td class="code">#pragma pack(n)</td>
- <td>Sets the alignment modulus to n, where n can be 1, 2, 4, 8, or 16. For MIPS compilers, if n is 0, structure alignment is reset to the default setting.</td>
- </tr>
- <tr>
- <td class="code">#pragma pack(push, n)</td>
- <td>Pushes the current alignment modulus on a stack, then sets it to n, where n can be 1, 2, 4, 8, or 16. Use push and pop when you need a specific modulus for some declaration or set of declarations, but do not want to disturb the default setting. MIPS compilers do not support this form.</td>
- </tr>
- <tr>
- <td class="code">#pragma pack(pop)</td>
- <td>Pops a previously pushed alignment modulus from the stack. MIPS compilers do not support this form.</td>
- </tr>
- <tr>
- <td class="code">#pragma pack()</td>
- <td>For x86 compilers, resets alignment modulus to the value specified in the x86 CodeGen panel. For MIPS compilers, resets structure alignment to the default setting.</td>
- </tr>
- </table>
- <p>This pragma corresponds to the Byte Alignment setting in the x86 CodeGen panel. <br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>pack</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>pack</h3>
+<p> Controls the alignment of data structures.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma pack( [n | push, n | pop] )</p>
+ <h5>Targets</h5>
+ Intel x86, MIPS<br />
+ <h5>Remarks</h5>
+ <p>Sets the packing alignment for data structures. It affects all data structures declared after this pragma until you change it again with another pack pragma.</p>
+ <table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="28%" scope="col">This pragma…</th>
+ <th width="72%" scope="col">Does this…</th>
+ </tr>
+ <tr>
+ <td class="code">#pragma pack(n)</td>
+ <td>Sets the alignment modulus to n, where n can be 1, 2, 4, 8, or 16. For MIPS compilers, if n is 0, structure alignment is reset to the default setting.</td>
+ </tr>
+ <tr>
+ <td class="code">#pragma pack(push, n)</td>
+ <td>Pushes the current alignment modulus on a stack, then sets it to n, where n can be 1, 2, 4, 8, or 16. Use push and pop when you need a specific modulus for some declaration or set of declarations, but do not want to disturb the default setting. MIPS compilers do not support this form.</td>
+ </tr>
+ <tr>
+ <td class="code">#pragma pack(pop)</td>
+ <td>Pops a previously pushed alignment modulus from the stack. MIPS compilers do not support this form.</td>
+ </tr>
+ <tr>
+ <td class="code">#pragma pack()</td>
+ <td>For x86 compilers, resets alignment modulus to the value specified in the x86 CodeGen panel. For MIPS compilers, resets structure alignment to the default setting.</td>
+ </tr>
+ </table>
+ <p>This pragma corresponds to the Byte Alignment setting in the x86 CodeGen panel. <br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_peephole.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_peephole.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>peephole</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>peephole</h3>
-<p> Controls the use peephole optimization.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma peephole on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler performs peephole optimizations, which are small, local optimizations that eliminate some compare instructions and improve branch sequences.</p>
- <p>This pragma corresponds to the Peephole Optimizer setting in the PPC Processor panel. To check this setting, use <span class="code">__option (peephole)</span>. This settings is on at optimization level 1 and above.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>peephole</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>peephole</h3>
+<p> Controls the use peephole optimization.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma peephole on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler performs peephole optimizations, which are small, local optimizations that eliminate some compare instructions and improve branch sequences.</p>
+ <p>This pragma corresponds to the Peephole Optimizer setting in the PPC Processor panel. To check this setting, use <span class="code">__option (peephole)</span>. This settings is on at optimization level 1 and above.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_register_coloring.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_register_coloring.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>register_coloring</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>register_coloring</h3>
-<p> Controls the use of register coloring.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma register_coloring on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler uses a single register to hold the values of multiple variables that are never used in the same statement. This improves program performance.</p>
- <p class="note"><strong>TIP</strong> Disable this setting when debugging a program.</p>
- <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (register_coloring)</span>. This settings is on at optimization level 2 and above<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>register_coloring</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>register_coloring</h3>
+<p> Controls the use of register coloring.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma register_coloring on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler uses a single register to hold the values of multiple variables that are never used in the same statement. This improves program performance.</p>
+ <p class="note"><strong>TIP</strong> Disable this setting when debugging a program.</p>
+ <p>This pragma does not correspond to any panel setting. To check this setting, use <span class="code">__option (register_coloring)</span>. This settings is on at optimization level 2 and above<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_scheduling.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_scheduling.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>scheduling</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>scheduling</h3>
-<p> Specifies the use of instruction scheduling optimization.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma scheduling on | off</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>This pragma lets you choose how the compiler rearranges instructions to increase speed. Some instructions, such as a memory load, take more than one processor cycle. By moving an unrelated instruction between the load and the instruction that uses the loaded item, the compiler saves a cycle when executing the program. </p>
- <p class="note"><strong>NOTE</strong> When enabled, the relationship between the source and object code is not guaranteed to be one-to-one. This may cause the “current source line” cursor to jump around unpredictably in editor windows showing the scheduled code. The worst of this can be avoided by enabling the Disable opimizations for debug setting in the x86 CodeGen panel. </p>
- <p>This pragma correspondes to the x86 CodeGen panel setting. <br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>scheduling</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>scheduling</h3>
+<p> Specifies the use of instruction scheduling optimization.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma scheduling on | off</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>This pragma lets you choose how the compiler rearranges instructions to increase speed. Some instructions, such as a memory load, take more than one processor cycle. By moving an unrelated instruction between the load and the instruction that uses the loaded item, the compiler saves a cycle when executing the program. </p>
+ <p class="note"><strong>NOTE</strong> When enabled, the relationship between the source and object code is not guaranteed to be one-to-one. This may cause the “current source line” cursor to jump around unpredictably in editor windows showing the scheduled code. The worst of this can be avoided by enabling the Disable opimizations for debug setting in the x86 CodeGen panel. </p>
+ <p>This pragma correspondes to the x86 CodeGen panel setting. <br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_sse.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_sse.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>sse</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>sse</h3>
-<p> Controls the generation of SSE instructions for single-precision floating point operations.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma sse on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
-<p class="note"><strong>NOTE</strong> When enabled, the autovectorize loops option (<span class="code">#pragma opt_vectorize_loops on</span>) will use these instructions if possible.</p>
- <p>This pragma corresponds to the Use extended instructions setting in the x86 CodeGen panel setting or <span class="code">#pragma use_extinst o</span>n. The default settings is off.<br />
- </p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>sse</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>sse</h3>
+<p> Controls the generation of SSE instructions for single-precision floating point operations.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma sse on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+<p class="note"><strong>NOTE</strong> When enabled, the autovectorize loops option (<span class="code">#pragma opt_vectorize_loops on</span>) will use these instructions if possible.</p>
+ <p>This pragma corresponds to the Use extended instructions setting in the x86 CodeGen panel setting or <span class="code">#pragma use_extinst o</span>n. The default settings is off.<br />
+ </p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_sse2.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_sse2.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>sse2</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>sse2</h3>
-<p> Controls the generation of SSE-2 instructions for single and double-precision floating point and 16-byte integer vector operations.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma sse2 on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p class="note"><strong>NOTE</strong> When enabled, the autovectorize loops option (<span class="code">#pragma opt_vectorize_loops on</span>) will use these instructions if possible.</p>
- <p>This pragma corresponds to the Use extended instructions setting in the x86 CodeGen panel setting or <span class="code">#pragma use_extinst on</span>. The default settings is off.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>sse2</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>sse2</h3>
+<p> Controls the generation of SSE-2 instructions for single and double-precision floating point and 16-byte integer vector operations.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma sse2 on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p class="note"><strong>NOTE</strong> When enabled, the autovectorize loops option (<span class="code">#pragma opt_vectorize_loops on</span>) will use these instructions if possible.</p>
+ <p>This pragma corresponds to the Use extended instructions setting in the x86 CodeGen panel setting or <span class="code">#pragma use_extinst on</span>. The default settings is off.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_stack_alignment.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_stack_alignment.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>stack_alignment</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>stack_alignment</h3>
-<p> Recommends the minimum stack alignment size based on a power of 2.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma stack_alignment( power )</p>
- <h5>Parameters</h5>
- <p class="code">power</p>
- <blockquote>
- <p>Stack alignment value based on a power of 2.</p>
- </blockquote>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>By default, the global stack alignment is 4 as per the Win32 ABI. When doubles are accessed in a function, the alignment is bumped to 8 for that function. Spills of SSE registers (e.g. in autovectorized code or code using SSE intrinsics) bump alignment to 16 bytes.</p>
- <p>Finally, the GCC-style <span class="code">__attribute__((aligned(xxx)))</span> on a local variable declaration can be used to align specific variables, which in turn aligns the stack while use of <span class="code">#pragma disablopts off</span> turns off stack alignment.</p>
- <p>This pragma recommends a minimum alignment. When one of the above situations occurs, the actual alignment may be greater.<br />
- In some functions, in order to guarantee alignment, the EBX register is used as a surrogate local base pointer. This happens in functions which have indeterminate control flow (i.e., jump through a pointer), which are involved in exception handling, or which use <span class="code">alloca()</span>. Use of EBX to access locals is not possible if Microsoft C++ exception handling is used in the function, so alignment is disabled for such functions. You can use <span class="code">#pragma warn_stack_alignment</span> to check for such cases.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>stack_alignment</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>stack_alignment</h3>
+<p> Recommends the minimum stack alignment size based on a power of 2.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma stack_alignment( power )</p>
+ <h5>Parameters</h5>
+ <p class="code">power</p>
+ <blockquote>
+ <p>Stack alignment value based on a power of 2.</p>
+ </blockquote>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>By default, the global stack alignment is 4 as per the Win32 ABI. When doubles are accessed in a function, the alignment is bumped to 8 for that function. Spills of SSE registers (e.g. in autovectorized code or code using SSE intrinsics) bump alignment to 16 bytes.</p>
+ <p>Finally, the GCC-style <span class="code">__attribute__((aligned(xxx)))</span> on a local variable declaration can be used to align specific variables, which in turn aligns the stack while use of <span class="code">#pragma disablopts off</span> turns off stack alignment.</p>
+ <p>This pragma recommends a minimum alignment. When one of the above situations occurs, the actual alignment may be greater.<br />
+ In some functions, in order to guarantee alignment, the EBX register is used as a surrogate local base pointer. This happens in functions which have indeterminate control flow (i.e., jump through a pointer), which are involved in exception handling, or which use <span class="code">alloca()</span>. Use of EBX to access locals is not possible if Microsoft C++ exception handling is used in the function, so alignment is disabled for such functions. You can use <span class="code">#pragma warn_stack_alignment</span> to check for such cases.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_struct_reg_return.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_struct_reg_return.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>struct_reg_return</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>struct_reg_return</h3>
-<p> Controls how small structs are returned from a function.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma struct_reg_return on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>structs are returned as follows:</p>
- <ul>
- <li>on – structs of size 1, 2, 4, or 8-bytes are returned in registers AL, AX, EAX, or EDX:EAX respectively</li>
- <li>off – always returns structs on the stack in space allocated by the caller</li>
- </ul>
- <p>The default setting is on.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>struct_reg_return</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>struct_reg_return</h3>
+<p> Controls how small structs are returned from a function.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma struct_reg_return on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>structs are returned as follows:</p>
+ <ul>
+ <li>on – structs of size 1, 2, 4, or 8-bytes are returned in registers AL, AX, EAX, or EDX:EAX respectively</li>
+ <li>off – always returns structs on the stack in space allocated by the caller</li>
+ </ul>
+ <p>The default setting is on.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_symbian.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_symbian.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>symbian</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>symbian</h3>
-<p> Switch to maintain binary compatability with the 2.4.7 compiler. Implicitly enabled whenever <span class="code">mwccsym2</span> is run.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma symbian</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- This pragma restores C++ name mangling, struct layout, struct/argument alignment, and bitfield layout semantics to that of the 2.4.7 compiler.<br />
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>symbian</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>symbian</h3>
+<p> Switch to maintain binary compatability with the 2.4.7 compiler. Implicitly enabled whenever <span class="code">mwccsym2</span> is run.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma symbian</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ This pragma restores C++ name mangling, struct layout, struct/argument alignment, and bitfield layout semantics to that of the 2.4.7 compiler.<br />
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_ten_byte_long_double.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_ten_byte_long_double.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>ten_byte_long_double</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>ten_byte_long_double</h3>
-<p> Changes the size of the long double to 80-bits (10 bytes) allowing the full precision and range of extended precision or temporary real format used in x86 floating point registers.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma ten_byte_long_double on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>The range is approximately <span class="code">3.632^10-4932</span> to <span class="code">1.190^10+4932</span>.</p>
- <p>Note there is no indication in the object code about what long double size was used to create it, thus the linker cannot warn on mismatches. To ensure a match, all libraries and programs exchanging long double must be rebuilt.</p>
- <p>The default setting is off, where both long double and double are both 64-bits.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>ten_byte_long_double</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>ten_byte_long_double</h3>
+<p> Changes the size of the long double to 80-bits (10 bytes) allowing the full precision and range of extended precision or temporary real format used in x86 floating point registers.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma ten_byte_long_double on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>The range is approximately <span class="code">3.632^10-4932</span> to <span class="code">1.190^10+4932</span>.</p>
+ <p>Note there is no indication in the object code about what long double size was used to create it, thus the linker cannot warn on mismatches. To ensure a match, all libraries and programs exchanging long double must be rebuilt.</p>
+ <p>The default setting is off, where both long double and double are both 64-bits.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_use_cmov.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_use_cmov.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>use_cmov</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>use_cmov</h3>
-<p> Instructs the compiler to use the <span class="code">CMOV</span> instruction to perform conditional integer assignments.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma use_cmov on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>Use this pragma to reduce code size and improve speed in certain loops. This is only available for Pentium Pro, Athlon, and newer target processors.</p>
- <p>The default setting is off.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>use_cmov</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>use_cmov</h3>
+<p> Instructs the compiler to use the <span class="code">CMOV</span> instruction to perform conditional integer assignments.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma use_cmov on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>Use this pragma to reduce code size and improve speed in certain loops. This is only available for Pentium Pro, Athlon, and newer target processors.</p>
+ <p>The default setting is off.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_use_extinst.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_use_extinst.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,25 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>use_extinst</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>use_extinst</h3>
-<p> Controls the code generator’s use of processor-specific instructions.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma use_extinst on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>When off, all compiler generated code is targeted to run on a 486 processor with the exception of any inline assembly which may explicitly use newer instructions.</p>
- <p>When on, the compiler uses instructions corresponding to the target processor whenever possible.</p>
- <p class="note"><strong>NOTE</strong> Some instruction subsets, like AMD 3DNow!, Intel’s MMX, and Intel’s SSE and SSE-2 instruction sets are generated only when additional options are activated.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>use_extinst</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>use_extinst</h3>
+<p> Controls the code generator’s use of processor-specific instructions.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma use_extinst on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>When off, all compiler generated code is targeted to run on a 486 processor with the exception of any inline assembly which may explicitly use newer instructions.</p>
+ <p>When on, the compiler uses instructions corresponding to the target processor whenever possible.</p>
+ <p class="note"><strong>NOTE</strong> Some instruction subsets, like AMD 3DNow!, Intel’s MMX, and Intel’s SSE and SSE-2 instruction sets are generated only when additional options are activated.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_use_fcmov.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_use_fcmov.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>use_fcmov</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>use_fcmov</h3>
-<p> Instructs the compiler to use the FCMOV instruction to perform conditional float assignments.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma use_fcmov on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>Use this pragma to reduce code size and improve speed in certain loops. This is only available for Pentium Pro, Athlon, and newer target processors.</p>
- <p>The default setting is off.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>use_fcmov</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>use_fcmov</h3>
+<p> Instructs the compiler to use the FCMOV instruction to perform conditional float assignments.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma use_fcmov on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>Use this pragma to reduce code size and improve speed in certain loops. This is only available for Pentium Pro, Athlon, and newer target processors.</p>
+ <p>The default setting is off.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_use_frame.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_use_frame.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>use_frame</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>use_frame</h3>
-<p> Controls the use of the BP register for stack frames.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma use_frame on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler uses the BP register to point to the start of the stack frame.</p>
- <p>To check this setting, use <span class="code">__option (use_frame)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. <br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>use_frame</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>use_frame</h3>
+<p> Controls the use of the BP register for stack frames.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma use_frame on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler uses the BP register to point to the start of the stack frame.</p>
+ <p>To check this setting, use <span class="code">__option (use_frame)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>. <br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_volatile_asm.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_volatile_asm.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>volatile_asm</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>volatile_asm</h3>
-<p> Controls the compiler’s optimization of inline assembly</p>
-<h5>Syntax</h5>
- <p class="code">#pragma volatile_asm on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>When on, the compiler allows these optimizations to occur inside inline assembly code: peepholing, scheduling, and constant propagation.</p>
- <p>This settting is controls by the Optimize inline assembly setting in the CodeGen panel. The default setting is off.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>volatile_asm</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>volatile_asm</h3>
+<p> Controls the compiler’s optimization of inline assembly</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma volatile_asm on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>When on, the compiler allows these optimizations to occur inside inline assembly code: peepholing, scheduling, and constant propagation.</p>
+ <p>This settting is controls by the Optimize inline assembly setting in the CodeGen panel. The default setting is off.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_warn_illegal_instructions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_warn_illegal_instructions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>warn_illegal_instructions</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>warn_illegal_instructions</h3>
-<p> Controls the recognition of assembly instructions not available to an Intel x86 processor.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma warn_illegal_instructions on | off | reset</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>If you enable this pragma, the compiler displays a warning when it encounters an assembly language instruction that is not available on the Intel x86 processor for which the compiler is generating object code.</p>
- <p>To check this setting, use <span class="code">__option (warn_illegal_instructions)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
-</p>
- <div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>warn_illegal_instructions</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>warn_illegal_instructions</h3>
+<p> Controls the recognition of assembly instructions not available to an Intel x86 processor.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma warn_illegal_instructions on | off | reset</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>If you enable this pragma, the compiler displays a warning when it encounters an assembly language instruction that is not available on the Intel x86 processor for which the compiler is generating object code.</p>
+ <p>To check this setting, use <span class="code">__option (warn_illegal_instructions)</span>, described in <a href="../symbols/sym_settings.htm">Checking Settings</a>.<br />
+</p>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_x86_processor.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/p_x86_processor.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,86 +1,86 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>x86_processor</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>x86_processor</h3>
-<p> Specifies the scheduling model used for instruction scheduling optimization.</p>
-<h5>Syntax</h5>
- <p class="code">#pragma x86_processor generic | pentium | pentiumpro | pentiumII | pentiumIII | pentiumIV | k6 | k7 | athlon | athlonIV | AthlonXP</p>
- <h5>Targets</h5>
- Intel x86<br />
- <h5>Remarks</h5>
- <p>The processor options include:</p>
- <table width="73%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="27%" scope="col">This option…</th>
- <th width="19%" scope="col">Value</th>
- <th width="54%" scope="col">Does this…</th>
- </tr>
- <tr>
- <td>generic</td>
- <td><div align="center">500</div></td>
- <td>Generic x86 instructions. This is the default.</td>
- </tr>
- <tr>
- <td>pentium</td>
- <td><div align="center">500</div></td>
- <td>Use Pentium instruction set.</td>
- </tr>
- <tr>
- <td>pentiumpro</td>
- <td><div align="center">600</div></td>
- <td>Use Pentium Pro instruction set.</td>
- </tr>
- <tr>
- <td>pentiumII</td>
- <td><div align="center">650</div></td>
- <td>Use Pentium II instruction set.</td>
- </tr>
- <tr>
- <td>pentiumIII</td>
- <td><div align="center">655</div></td>
- <td>Use Pentium III instruction set.</td>
- </tr>
- <tr>
- <td>pentiumIV</td>
- <td><div align="center">660</div></td>
- <td>Use Pentium IV instruction set.</td>
- </tr>
- <tr>
- <td>k6</td>
- <td><div align="center">550</div></td>
- <td>Use AMD K6 instruction set.</td>
- </tr>
- <tr>
- <td>k7</td>
- <td><div align="center">700</div></td>
- <td>Use AMD K7 instruction set.</td>
- </tr>
- <tr>
- <td>athlon</td>
- <td><div align="center">700</div></td>
- <td>Use Athlon instruction set.</td>
- </tr>
- <tr>
- <td>athlonIV</td>
- <td><div align="center">700</div></td>
- <td> </td>
- </tr>
- <tr>
- <td>athlonXP</td>
- <td><div align="center">700</div></td>
- <td>Use Athlon XP instruction set. </td>
- </tr>
- </table>
- <p>You can test for a specific processor using the _M_IX86 macro using the values shown in Table 11.3.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>x86_processor</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>x86_processor</h3>
+<p> Specifies the scheduling model used for instruction scheduling optimization.</p>
+<h5>Syntax</h5>
+ <p class="code">#pragma x86_processor generic | pentium | pentiumpro | pentiumII | pentiumIII | pentiumIV | k6 | k7 | athlon | athlonIV | AthlonXP</p>
+ <h5>Targets</h5>
+ Intel x86<br />
+ <h5>Remarks</h5>
+ <p>The processor options include:</p>
+ <table width="73%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="27%" scope="col">This option…</th>
+ <th width="19%" scope="col">Value</th>
+ <th width="54%" scope="col">Does this…</th>
+ </tr>
+ <tr>
+ <td>generic</td>
+ <td><div align="center">500</div></td>
+ <td>Generic x86 instructions. This is the default.</td>
+ </tr>
+ <tr>
+ <td>pentium</td>
+ <td><div align="center">500</div></td>
+ <td>Use Pentium instruction set.</td>
+ </tr>
+ <tr>
+ <td>pentiumpro</td>
+ <td><div align="center">600</div></td>
+ <td>Use Pentium Pro instruction set.</td>
+ </tr>
+ <tr>
+ <td>pentiumII</td>
+ <td><div align="center">650</div></td>
+ <td>Use Pentium II instruction set.</td>
+ </tr>
+ <tr>
+ <td>pentiumIII</td>
+ <td><div align="center">655</div></td>
+ <td>Use Pentium III instruction set.</td>
+ </tr>
+ <tr>
+ <td>pentiumIV</td>
+ <td><div align="center">660</div></td>
+ <td>Use Pentium IV instruction set.</td>
+ </tr>
+ <tr>
+ <td>k6</td>
+ <td><div align="center">550</div></td>
+ <td>Use AMD K6 instruction set.</td>
+ </tr>
+ <tr>
+ <td>k7</td>
+ <td><div align="center">700</div></td>
+ <td>Use AMD K7 instruction set.</td>
+ </tr>
+ <tr>
+ <td>athlon</td>
+ <td><div align="center">700</div></td>
+ <td>Use Athlon instruction set.</td>
+ </tr>
+ <tr>
+ <td>athlonIV</td>
+ <td><div align="center">700</div></td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td>athlonXP</td>
+ <td><div align="center">700</div></td>
+ <td>Use Athlon XP instruction set. </td>
+ </tr>
+ </table>
+ <p>You can test for a specific processor using the _M_IX86 macro using the values shown in Table 11.3.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/pragmas_x86.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/pragmas_x86.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Intel x86 Pragmas</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Intel x86 Pragmas</h3>
-<p>This section provides information on Intel x86 specific pragmas. You configure the compiler for a project by changing the settings in the <Target> CodeGen panel. You can also control compiler behavior in your code by including the appropriate pragmas.
-</p>
-<p>Many of the pragmas correspond to option settings in the settings panels for processors and operating systems. Topics include:
-</p>
-<ul>
- <li><a href="../pragmas/pragma_syntax.htm">Pragma Syntax</a> </li>
- <li><a href="pragmas_x86_ref.htm">x86 Pragma Reference
- </a> </li>
-</ul>
-<p class="note"><strong>NOTE</strong> See your target documentation for information on any pragmas you use in your programs. If your target documentation covers any of the pragmas listed in this section, the information provided by your target documentation always takes precedence.<br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Intel x86 Pragmas</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Intel x86 Pragmas</h3>
+<p>This section provides information on Intel x86 specific pragmas. You configure the compiler for a project by changing the settings in the <Target> CodeGen panel. You can also control compiler behavior in your code by including the appropriate pragmas.
+</p>
+<p>Many of the pragmas correspond to option settings in the settings panels for processors and operating systems. Topics include:
+</p>
+<ul>
+ <li><a href="../pragmas/pragma_syntax.htm">Pragma Syntax</a> </li>
+ <li><a href="pragmas_x86_ref.htm">x86 Pragma Reference
+ </a> </li>
+</ul>
+<p class="note"><strong>NOTE</strong> See your target documentation for information on any pragmas you use in your programs. If your target documentation covers any of the pragmas listed in this section, the information provided by your target documentation always takes precedence.<br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/pragmas_x86_ref.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/pragmas_x86/pragmas_x86_ref.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>x86 Pragma Reference</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>x86 Pragma Reference</h3>
-<p>The following pragmas apply to the x86 compiler:</p>
-<p><br />
-</p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>x86 Pragma Reference</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>x86 Pragma Reference</h3>
+<p>The following pragmas apply to the x86 compiler:</p>
+<p><br />
+</p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/symbols/sym_ansi.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/symbols/sym_ansi.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,66 +1,66 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>ANSI Predefined Symbols</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>ANSI Predefined Symbols</h3>
-<p> Table 1 lists the symbols required by the ANSI/ISO C standard.</p>
-<h5>Table 1. ANSI Predefined Symbols</h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="24%" scope="col">This symbol…</th>
- <th width="76%" scope="col">is…</th>
- </tr>
- <tr>
- <td class="code">__DATE__</td>
- <td>The date the file is compiled; for example, "Jul 14, 1995". This symbol is a predefined macro.</td>
- </tr>
- <tr>
- <td class="code">__FILE__</td>
- <td>The name of the file being compiled; for example "prog.c". This symbol is a predefined macro.</td>
- </tr>
- <tr>
- <td class="code">__func__</td>
- <td>The name of the function currently being compiled. This predefined identifier is only available under the emerging ANSI/ISO C99 standard.</td>
- </tr>
- <tr>
- <td class="code">__LINE__</td>
- <td>The number of the line being compiled (before including any header files). This symbol is a predefined macro.</td>
- </tr>
- <tr>
- <td class="code">__TIME__</td>
- <td>The time the file is compiled in 24-hour format; for example, "13:01:45". This symbol is a predefined macro.</td>
- </tr>
- <tr>
- <td class="code">__STDC__</td>
- <td>Defined as 1 if compiling C source code; undefined when compiling C++ source code. This macro lets you know that Carbide C implements the ANSI C standard.</td>
- </tr>
-</table>
-<div class="listing">
- <h5>Listing 1 shows a small program that uses the ANSI predefined symbols.</h5>
- <p> Listing 1. Using ANSI Predefined Symbols<br />
- #include <stdio.h></p>
- <p>void main(void)<br />
- {<br />
- printf("Hello World!\n");<br />
- <br />
- printf("%s, %s\n", __DATE__, __TIME__);<br />
- printf("%s, line: %d\n", __FILE__, __LINE__);<br />
- }</p>
- <p>/* The program prints something like the following:<br />
- Hello World!<br />
- Oct 31 2005, 18:53:50<br />
- main.ANSI.c, line: 10<br />
- */<br />
- </p>
-</div>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>ANSI Predefined Symbols</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>ANSI Predefined Symbols</h3>
+<p> Table 1 lists the symbols required by the ANSI/ISO C standard.</p>
+<h5>Table 1. ANSI Predefined Symbols</h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="24%" scope="col">This symbol…</th>
+ <th width="76%" scope="col">is…</th>
+ </tr>
+ <tr>
+ <td class="code">__DATE__</td>
+ <td>The date the file is compiled; for example, "Jul 14, 1995". This symbol is a predefined macro.</td>
+ </tr>
+ <tr>
+ <td class="code">__FILE__</td>
+ <td>The name of the file being compiled; for example "prog.c". This symbol is a predefined macro.</td>
+ </tr>
+ <tr>
+ <td class="code">__func__</td>
+ <td>The name of the function currently being compiled. This predefined identifier is only available under the emerging ANSI/ISO C99 standard.</td>
+ </tr>
+ <tr>
+ <td class="code">__LINE__</td>
+ <td>The number of the line being compiled (before including any header files). This symbol is a predefined macro.</td>
+ </tr>
+ <tr>
+ <td class="code">__TIME__</td>
+ <td>The time the file is compiled in 24-hour format; for example, "13:01:45". This symbol is a predefined macro.</td>
+ </tr>
+ <tr>
+ <td class="code">__STDC__</td>
+ <td>Defined as 1 if compiling C source code; undefined when compiling C++ source code. This macro lets you know that Carbide C implements the ANSI C standard.</td>
+ </tr>
+</table>
+<div class="listing">
+ <h5>Listing 1 shows a small program that uses the ANSI predefined symbols.</h5>
+ <p> Listing 1. Using ANSI Predefined Symbols<br />
+ #include <stdio.h></p>
+ <p>void main(void)<br />
+ {<br />
+ printf("Hello World!\n");<br />
+ <br />
+ printf("%s, %s\n", __DATE__, __TIME__);<br />
+ printf("%s, line: %d\n", __FILE__, __LINE__);<br />
+ }</p>
+ <p>/* The program prints something like the following:<br />
+ Hello World!<br />
+ Oct 31 2005, 18:53:50<br />
+ main.ANSI.c, line: 10<br />
+ */<br />
+ </p>
+</div>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/symbols/sym_carbide.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/symbols/sym_carbide.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,129 +1,129 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide.c++ Predefined Symbols</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style2 {color: #FFFFFF}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Carbide.c++ Predefined Symbols</h3>
-<p> Table 1 lists additional symbols provided by Carbide C/C++ but not defined as part of the ANSI/ISO C/C++ standards.</p>
-<p class="note"><strong>NOTE</strong> The Carbide C compiler was formerly known as the Metrowerks C compiler. For Symbian development, only the x86 based features are supported. All references to other processor architectures are for historical purposes only. </p>
-<h5>Table 1. Predefined Symbols for Carbide C/C++ compilers</h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr bgcolor="#CCCCCC">
- <td width="30%" scope="col"><span class="style2">This symbol…</span></td>
- <td width="70%" scope="col"><span class="style2">is…</span></td>
- </tr>
- <tr>
- <td class="code">__A5__ </td>
- <td>Defined as 1 if data is A5-relative, 0 if data is A4-relative. This symbol is defined for 68K compilers and undefined for other target platforms.</td>
- </tr>
- <tr>
- <td class="code">__ALTIVEC__</td>
- <td>Currently defined as 100000000 when you enable PowerPC AltiVec™ features using pragma altivec_model.</td>
- </tr>
- <tr>
- <td class="code">__cplusplus</td>
- <td>Defined as 199711L if you are compiling this file as a C++ file; undefined if you are compiling this file as a C file. The value 199711L indicates conformance with the ANSI/ISO C++ specification.</td>
- </tr>
- <tr>
- <td class="code">__EMU_SYMBIAN_OS__</td>
- <td>Defined as 1 . </td>
- </tr>
- <tr>
- <td class="code">__embedded_cplusplus </td>
- <td>Defined as 1 if EC++ is activated; undefined if EC++ is not activated. </td>
- </tr>
- <tr>
- <td class="code">__embedded__</td>
- <td>Defined as 1 if you are compiling code for an embedded target.</td>
- </tr>
- <tr>
- <td class="code">__FUNCTION__</td>
- <td>Defined by the compiler as the name of the function currently being compiled. This symbol is a predefined identifier for GCC compatibility.</td>
- </tr>
- <tr>
- <td class="code">__fourbyteints__</td>
- <td>Defined as 1 if you enable the 4-byte Ints setting in the 68K Processor panel; 0 if you disable that setting. This symbol is defined for 68K compilers and undefined for other platforms.</td>
- </tr>
- <tr>
- <td class="code">__ide_target("target_name")</td>
- <td>Returns 1 if target_name is the same as the active build target in the Carbide IDE’s active project. Returns 0 otherwise.</td>
- </tr>
- <tr>
- <td class="code">__IEEEdoubles__</td>
- <td>Defined as 1 if you enable the 8-Byte Doubles setting in the 68K Processor panel; 0 if you disable that setting. This symbol is defined for 68K compilers and undefined for all other target platforms.</td>
- </tr>
- <tr>
- <td class="code">__INTEL__</td>
- <td>Defined as 1 if you are compiling this code with the x86 compiler; undefined for all other target platforms.</td>
- </tr>
- <tr>
- <td class="code">__MC68K__</td>
- <td>Defined as 1 if you are compiling this code with the 68K compiler; undefined for all other target platforms.</td>
- </tr>
- <tr>
- <td class="code">__MC68020__</td>
- <td>Defined as 1 if you enable the 68020 Codegen setting in the Processor panel; 0 if you disable it. This symbol is defined for 68K compilers and undefined for all other target platforms.</td>
- </tr>
- <tr>
- <td class="code">__MC68881__</td>
- <td>Defined as 1 if you enable the 68881 Codegen setting in the 68K Processor panel; 0 if you disable it. This symbol is defined for 68K compilers and undefined for all other target platforms.</td>
- </tr>
- <tr>
- <td class="code">__MIPS__</td>
- <td>Defined as 1 for MIPS compilers; undefined for other target platforms. </td>
- </tr>
- <tr>
- <td class="code">__MIPS_ISA2__</td>
- <td>Defined as 1 if the compiler’s target platform is MIPS and you select the ISA II checkbox in the MIPS Processor panel. Undefined if you deselect the ISA II checkbox. It is always undefined for other target platforms. </td>
- </tr>
- <tr>
- <td class="code">__MIPS_ISA3__</td>
- <td>Defined as 1 if the compiler’s target platform is MIPS and you select the ISA III checkbox in the MIPS Processor panel. Undefined if you deselect the ISA III checkbox. It is always undefined for other target platforms.</td>
- </tr>
- <tr>
- <td class="code">__MIPS_ISA4__</td>
- <td>Defined as 1 if the compiler’s target platform is MIPS and you select the ISA IV checkbox in the MIPS Processor panel. Undefined if you deselect the ISA IV checkbox. It is always undefined for other target platforms.</td>
- </tr>
- <tr>
- <td class="code">__MWBROWSER__</td>
- <td>Defined as 1 if the Carbide browser is parsing your code; 0 if not.</td>
- </tr>
- <tr>
- <td class="code">__MWERKS__</td>
- <td>Defined as the version number of the Carbide C/C++ compiler. For example, with the Carbide C/C++ compiler version 2.2, the value of <span class="code">__MWERKS__</span> is <span class="code">0x2200</span>. This macro is defined as 1 if the compiler was released in 1995 or earlier.</td>
- </tr>
- <tr>
- <td class="code">__PRETTY_FUNCTION__</td>
- <td>Defined by the compiler as the name of the qualified (“unmangled”) C++ function currently being compiled. This predefined identifier is only defined when the C++ compiler is active. See <a href="../cpp_compiler/cpp_compiler.htm">C++ Compiler</a> for related information.</td>
- </tr>
- <tr>
- <td class="code">__profile__</td>
- <td>Defined as 1 if you enable the Generate Profiler Calls setting in the Processor panel; 0 if you disable it.</td>
- </tr>
- <tr>
- <td class="code">__POWERPC__</td>
- <td>Defined as 1 if you are compiling this code with the PowerPC compiler; 0 if not.</td>
- </tr>
- <tr>
- <td class="code">__VEC__</td>
- <td>Defined as the version of Motorola’s AltiVec ™ Technology Programming Interface Manual to which the compiler conforms. This value takes the form <span class="code">vrrnn</span> which corresponds to the version number (<span class="code">v.rr.nn</span>) of the Programming Interface Manual. Otherwise, this macro is undefined.</td>
- </tr>
- <tr>
- <td class="code">macintosh</td>
- <td>Defined as 1 if you are compiling this code with the 68K or PowerPC compilers for Mac OS; 0 if not.</td>
- </tr>
-</table>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Carbide.c++ Predefined Symbols</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style2 {color: #FFFFFF}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Carbide.c++ Predefined Symbols</h3>
+<p> Table 1 lists additional symbols provided by Carbide C/C++ but not defined as part of the ANSI/ISO C/C++ standards.</p>
+<p class="note"><strong>NOTE</strong> The Carbide C compiler was formerly known as the Metrowerks C compiler. For Symbian development, only the x86 based features are supported. All references to other processor architectures are for historical purposes only. </p>
+<h5>Table 1. Predefined Symbols for Carbide C/C++ compilers</h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr bgcolor="#CCCCCC">
+ <td width="30%" scope="col"><span class="style2">This symbol…</span></td>
+ <td width="70%" scope="col"><span class="style2">is…</span></td>
+ </tr>
+ <tr>
+ <td class="code">__A5__ </td>
+ <td>Defined as 1 if data is A5-relative, 0 if data is A4-relative. This symbol is defined for 68K compilers and undefined for other target platforms.</td>
+ </tr>
+ <tr>
+ <td class="code">__ALTIVEC__</td>
+ <td>Currently defined as 100000000 when you enable PowerPC AltiVec™ features using pragma altivec_model.</td>
+ </tr>
+ <tr>
+ <td class="code">__cplusplus</td>
+ <td>Defined as 199711L if you are compiling this file as a C++ file; undefined if you are compiling this file as a C file. The value 199711L indicates conformance with the ANSI/ISO C++ specification.</td>
+ </tr>
+ <tr>
+ <td class="code">__EMU_SYMBIAN_OS__</td>
+ <td>Defined as 1 . </td>
+ </tr>
+ <tr>
+ <td class="code">__embedded_cplusplus </td>
+ <td>Defined as 1 if EC++ is activated; undefined if EC++ is not activated. </td>
+ </tr>
+ <tr>
+ <td class="code">__embedded__</td>
+ <td>Defined as 1 if you are compiling code for an embedded target.</td>
+ </tr>
+ <tr>
+ <td class="code">__FUNCTION__</td>
+ <td>Defined by the compiler as the name of the function currently being compiled. This symbol is a predefined identifier for GCC compatibility.</td>
+ </tr>
+ <tr>
+ <td class="code">__fourbyteints__</td>
+ <td>Defined as 1 if you enable the 4-byte Ints setting in the 68K Processor panel; 0 if you disable that setting. This symbol is defined for 68K compilers and undefined for other platforms.</td>
+ </tr>
+ <tr>
+ <td class="code">__ide_target("target_name")</td>
+ <td>Returns 1 if target_name is the same as the active build target in the Carbide IDE’s active project. Returns 0 otherwise.</td>
+ </tr>
+ <tr>
+ <td class="code">__IEEEdoubles__</td>
+ <td>Defined as 1 if you enable the 8-Byte Doubles setting in the 68K Processor panel; 0 if you disable that setting. This symbol is defined for 68K compilers and undefined for all other target platforms.</td>
+ </tr>
+ <tr>
+ <td class="code">__INTEL__</td>
+ <td>Defined as 1 if you are compiling this code with the x86 compiler; undefined for all other target platforms.</td>
+ </tr>
+ <tr>
+ <td class="code">__MC68K__</td>
+ <td>Defined as 1 if you are compiling this code with the 68K compiler; undefined for all other target platforms.</td>
+ </tr>
+ <tr>
+ <td class="code">__MC68020__</td>
+ <td>Defined as 1 if you enable the 68020 Codegen setting in the Processor panel; 0 if you disable it. This symbol is defined for 68K compilers and undefined for all other target platforms.</td>
+ </tr>
+ <tr>
+ <td class="code">__MC68881__</td>
+ <td>Defined as 1 if you enable the 68881 Codegen setting in the 68K Processor panel; 0 if you disable it. This symbol is defined for 68K compilers and undefined for all other target platforms.</td>
+ </tr>
+ <tr>
+ <td class="code">__MIPS__</td>
+ <td>Defined as 1 for MIPS compilers; undefined for other target platforms. </td>
+ </tr>
+ <tr>
+ <td class="code">__MIPS_ISA2__</td>
+ <td>Defined as 1 if the compiler’s target platform is MIPS and you select the ISA II checkbox in the MIPS Processor panel. Undefined if you deselect the ISA II checkbox. It is always undefined for other target platforms. </td>
+ </tr>
+ <tr>
+ <td class="code">__MIPS_ISA3__</td>
+ <td>Defined as 1 if the compiler’s target platform is MIPS and you select the ISA III checkbox in the MIPS Processor panel. Undefined if you deselect the ISA III checkbox. It is always undefined for other target platforms.</td>
+ </tr>
+ <tr>
+ <td class="code">__MIPS_ISA4__</td>
+ <td>Defined as 1 if the compiler’s target platform is MIPS and you select the ISA IV checkbox in the MIPS Processor panel. Undefined if you deselect the ISA IV checkbox. It is always undefined for other target platforms.</td>
+ </tr>
+ <tr>
+ <td class="code">__MWBROWSER__</td>
+ <td>Defined as 1 if the Carbide browser is parsing your code; 0 if not.</td>
+ </tr>
+ <tr>
+ <td class="code">__MWERKS__</td>
+ <td>Defined as the version number of the Carbide C/C++ compiler. For example, with the Carbide C/C++ compiler version 2.2, the value of <span class="code">__MWERKS__</span> is <span class="code">0x2200</span>. This macro is defined as 1 if the compiler was released in 1995 or earlier.</td>
+ </tr>
+ <tr>
+ <td class="code">__PRETTY_FUNCTION__</td>
+ <td>Defined by the compiler as the name of the qualified (“unmangled”) C++ function currently being compiled. This predefined identifier is only defined when the C++ compiler is active. See <a href="../cpp_compiler/cpp_compiler.htm">C++ Compiler</a> for related information.</td>
+ </tr>
+ <tr>
+ <td class="code">__profile__</td>
+ <td>Defined as 1 if you enable the Generate Profiler Calls setting in the Processor panel; 0 if you disable it.</td>
+ </tr>
+ <tr>
+ <td class="code">__POWERPC__</td>
+ <td>Defined as 1 if you are compiling this code with the PowerPC compiler; 0 if not.</td>
+ </tr>
+ <tr>
+ <td class="code">__VEC__</td>
+ <td>Defined as the version of Motorola’s AltiVec ™ Technology Programming Interface Manual to which the compiler conforms. This value takes the form <span class="code">vrrnn</span> which corresponds to the version number (<span class="code">v.rr.nn</span>) of the Programming Interface Manual. Otherwise, this macro is undefined.</td>
+ </tr>
+ <tr>
+ <td class="code">macintosh</td>
+ <td>Defined as 1 if you are compiling this code with the 68K or PowerPC compilers for Mac OS; 0 if not.</td>
+ </tr>
+</table>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/symbols/sym_settings.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/symbols/sym_settings.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,643 +1,643 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Checking Settings</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h3>Checking Settings</h3>
-<p>The preprocessor function <span class="code">__option() lets you check pragmas and other settings that control the C</span>/C++ compiler and code generation. You typically modify these settings using various panels in the Project Settings window.</p>
-<p>The syntax for this preprocessor function is as follows:</p>
-<p class="listing"><span class="code">__option(setting</span>-name)</p>
-<p>If the specified setting is enabled, <span class="code">__option() returns </span><span class="code">1</span>; otherwise it returns <span class="code">0</span>.</p>
-<p>To determine if a setting-name is invalid, see <a href="../errors/err_as_warnings.htm">Warnings as Errors</a>.</p>
-<p>Use this function when you want one source file to contain code that uses different settings. The example below shows how to compile one series of lines if you are compiling for machines with the MC68881 floating-point unit and another series if you are compiling for machines without it:</p>
-<p class="listing">#if <span class="code">__option (code</span>68881) // Code for 68K chip with FPU<br />
- #else<br />
- // Code for any 68K processor<br />
- #endif</p>
-<p>Table 1 lists all the setting names you can use in the preprocessor function <span class="code">__option()</span>.</p>
-<h5>Table 1. Preprocessor Setting Names for <span class="code">__option()</span></h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="33%" scope="col">This argument...</th>
- <th width="67%" class="table" scope="col">Corresponds to the…</th>
- </tr>
- <tr>
- <td class="code">a6frames</td>
- <td>Pragma a6frames.</td>
- </tr>
- <tr>
- <td class="code">align_array_members</td>
- <td>Pragma align_array_members.</td>
- </tr>
- <tr>
- <td class="code">altivec_codegen</td>
- <td>Pragma altivec_codegen.</td>
- </tr>
- <tr>
- <td class="code">altivec_model</td>
- <td>Pragma altivec_model.</td>
- </tr>
- <tr>
- <td class="code">altivec_vrsave</td>
- <td>Pragma altivec_vrsave.</td>
- </tr>
- <tr>
- <td class="code">always_inline</td>
- <td>Pragma <a href="../pragmas/p_always_inline.htm">always_inline</a>.</td>
- </tr>
- <tr>
- <td class="code">ANSI_strict</td>
- <td><a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting and pragma ANSI_strict.</td>
- </tr>
- <tr>
- <td class="code">arg_dep_lookup</td>
- <td>Pragma <a href="../pragmas/p_arg_dep_lookup.htm">arg_dep_lookup</a>.</td>
- </tr>
- <tr>
- <td class="code">ARM_conform</td>
- <td>Pragma <a href="../pragmas/p_arm_conform.htm">ARM_conform</a>.</td>
- </tr>
- <tr>
- <td class="code">array_new_delete</td>
- <td>Pragma <a href="../pragmas/p_array_new_delete.htm">array_new_delete</a></td>
- </tr>
- <tr>
- <td class="code">auto_inline</td>
- <td>Auto-Inline setting of the Inlining menu and pragma <a href="../pragmas/p_auto_inline.htm">auto_inline</a>.</td>
- </tr>
- <tr>
- <td class="code">bool</td>
- <td>Enable bool Support setting and pragma <a href="../pragmas/p_bool.htm">bool</a>.</td>
- </tr>
- <tr>
- <td class="code">check_header_flags</td>
- <td>Pragma <a href="../pragmas/p_check_header_flags.htm">check_header_flags</a>.</td>
- </tr>
- <tr>
- <td class="code">code68020</td>
- <td>Pragma code68020.</td>
- </tr>
- <tr>
- <td class="code">code68881</td>
- <td>Pragma code68881.</td>
- </tr>
- <tr>
- <td class="code">const_multiply</td>
- <td>Pragma const_multiply.</td>
- </tr>
- <tr>
- <td class="code">const_strings</td>
- <td>Pragma <a href="../pragmas/p_const_strings.htm">const_strings</a>.</td>
- </tr>
- <tr>
- <td class="code">cplusplus</td>
- <td>Force C++ Compilation setting , the pragma <a href="../pragmas/p_cplusplus.htm">cplusplus</a>, and the macro cplusplus. Indicates whether the compiler is compiling this file as a C++ file.</td>
- </tr>
- <tr>
- <td class="code">cpp_extensions</td>
- <td>Pragma <a href="../pragmas/p_cpp_extensions.htm">cpp_extensions</a>.</td>
- </tr>
- <tr>
- <td class="code">d0_pointers</td>
- <td>Pragmas pointers_in_D0 and pointers_in_A0.</td>
- </tr>
- <tr>
- <td class="code">def_inherited</td>
- <td>Pragma <a href="../pragmas/p_def_inherited.htm">def_inherited</a>.</td>
- </tr>
- <tr>
- <td class="code">defer_codegen</td>
- <td>Pragma <a href="../pragmas/p_defer_codegen.htm">defer_codegen</a>.</td>
- </tr>
- <tr>
- <td class="code">defer_defarg_parsing</td>
- <td>Pragma <a href="../pragmas/p_defer_defarg_parsing.htm">defer_defarg_parsing</a></td>
- </tr>
- <tr>
- <td class="code">direct_destruction</td>
- <td>No longer available</td>
- </tr>
- <tr>
- <td class="code">direct_to_SOM</td>
- <td>Pragma direct_to_SOM.</td>
- </tr>
- <tr>
- <td class="code">disable_registers</td>
- <td>Pragma disable_registers.</td>
- </tr>
- <tr>
- <td class="code">dollar_identifiers</td>
- <td>Pragma <a href="../pragmas/p_dollar_identifiers.htm">dollar_identifiers</a>.</td>
- </tr>
- <tr>
- <td class="code">dont_inline</td>
- <td>Don’t Inline setting and pragma <a href="../pragmas/p_dont_inline.htm">dont_inline</a>.</td>
- </tr>
- <tr>
- <td class="code">dont_reuse_strings</td>
- <td>Reuse Strings setting and pragma <a href="../pragmas/p_dont_reuse_strings.htm">dont_reuse_strings</a>.</td>
- </tr>
- <tr>
- <td class="code">ecplusplus</td>
- <td>Pragma <a href="../pragmas/p_ecplusplus.htm">ecplusplus</a>.</td>
- </tr>
- <tr>
- <td class="code">EIPC_EIPSW</td>
- <td>Pragma EIPC_EIPSW.</td>
- </tr>
- <tr>
- <td class="code">enumsalwaysint</td>
- <td>Enums Always Int setting and pragma <a href="../pragmas/p_enumsalwaysint.htm">enumsalwaysint</a>.</td>
- </tr>
- <tr>
- <td class="code">exceptions</td>
- <td>Enable C++ Exceptions setting and pragma <a href="../pragmas_x86/p_exceptions.htm">exceptions</a>.</td>
- </tr>
- <tr>
- <td class="code">export</td>
- <td>Pragma export.</td>
- </tr>
- <tr>
- <td class="code">extended_errorcheck</td>
- <td>Extended Error Checking setting and pragma <a href="../pragmas/p_extended_errorcheck.htm">extended_errorcheck</a>.</td>
- </tr>
- <tr>
- <td class="code">far_data</td>
- <td>Pragma far_data.</td>
- </tr>
- <tr>
- <td class="code">far_strings</td>
- <td>Pragma far_strings.</td>
- </tr>
- <tr>
- <td class="code">far_vtables</td>
- <td>Pragma far_vtables.</td>
- </tr>
- <tr>
- <td class="code">faster_pch_gen</td>
- <td>Pragma <a href="../pragmas/p_faster_pch_gen.htm">faster_pch_gen</a>.</td>
- </tr>
- <tr>
- <td class="code">float_constants</td>
- <td>Pragma <a href="../pragmas/p_float_constants.htm">float_constants</a>.</td>
- </tr>
- <tr>
- <td class="code">force_active</td>
- <td>Pragma <a href="../pragmas/p_force_active.htm">force_active</a>.</td>
- </tr>
- <tr>
- <td class="code">fourbyteints</td>
- <td>Pragma fourbyteints.</td>
- </tr>
- <tr>
- <td class="code">fp_contract</td>
- <td>Pragma fp_contract.</td>
- </tr>
- <tr>
- <td class="code">fullpath_prepdump</td>
- <td>Pragma <a href="../pragmas/p_fullpath_prepdump.htm">fullpath_prepdump</a>.</td>
- </tr>
- <tr>
- <td class="code">function_align</td>
- <td>Pragma function_align.</td>
- </tr>
- <tr>
- <td class="code">gcc_extensions</td>
- <td>Pragma <a href="../pragmas/p_gcc_extensions.htm">gcc_extensions</a>.</td>
- </tr>
- <tr>
- <td class="code">IEEEdoubles</td>
- <td>Pragma IEEEdoubles.</td>
- </tr>
- <tr>
- <td class="code">ignore_oldstyle</td>
- <td>Pragma <a href="../pragmas/p_ignore_oldstyle.htm">ignore_oldstyle</a>.</td>
- </tr>
- <tr>
- <td class="code">import</td>
- <td>Pragma <a href="../pragmas/p_import.htm">import</a>.</td>
- </tr>
- <tr>
- <td class="code">inline_bottom_up</td>
- <td>Pragma <a href="../pragmas/p_inline_bottom_up.htm">inline_bottom_up</a>.</td>
- </tr>
- <tr>
- <td class="code">inline_bottom_up_once</td>
- <td>Pragma <a href="../pragmas/p_inline_bottom_up_once.htm">inline_bottom_up_once</a></td>
- </tr>
- <tr>
- <td class="code">inline_intrinsics</td>
- <td>Pragma inline_intrinsics.</td>
- </tr>
- <tr>
- <td class="code">inline_max_auto_size</td>
- <td>Pragma <a href="../pragmas/p_inline_max_auto_size.htm">inline_max_auto_size</a></td>
- </tr>
- <tr>
- <td class="code">inline_max_size</td>
- <td>Pragma <a href="../pragmas/p_inline_max_size.htm">inline_max_size</a></td>
- </tr>
- <tr>
- <td class="code">inline_max_total_size</td>
- <td>Pragma <a href="../pragmas/p_inline_max_total_size.htm">inline_max_total_size</a></td>
- </tr>
- <tr>
- <td class="code">internal</td>
- <td>Pragma <a href="../pragmas/p_internal.htm">internal</a>.</td>
- </tr>
- <tr>
- <td class="code">interrupt</td>
- <td>Pragma interrupt.</td>
- </tr>
- <tr>
- <td class="code">k63d</td>
- <td>K6 3D Favored setting in the Extended Instruction Set menu of the x86 CodeGen panel and pragma <a href="../pragmas_x86/p_k63d.htm">k63d</a>.</td>
- </tr>
- <tr>
- <td class="code">k63d_calls</td>
- <td> MMX + K6 3D setting in the Extended Instruction Set menu of the x86 CodeGen panel and pragma k63d_calls.</td>
- </tr>
- <tr>
- <td class="code">lib_export</td>
- <td>Pragma <a href="../pragmas/p_lib_export.htm">lib_export</a>.</td>
- </tr>
- <tr>
- <td class="code">line_prepdump</td>
- <td>Pragma <a href="../pragmas/p_line_prepdump.htm">line_prepdump</a>.</td>
- </tr>
- <tr>
- <td class="code">little_endian</td>
- <td>No option. Defined as 1 if you are compiling for a little endian target (such as x86); 0 if you are compiling for a big endian target (such as PowerPC).</td>
- </tr>
- <tr>
- <td class="code">longlong</td>
- <td>Pragma <a href="../pragmas/p_longlong.htm">longlong</a>.</td>
- </tr>
- <tr>
- <td class="code">longlong_enums</td>
- <td>Pragma <a href="../pragmas/p_longlong_enums.htm">longlong_enums</a>.</td>
- </tr>
- <tr>
- <td class="code">longlong_prepeval</td>
- <td>Pragma <a href="../pragmas/p_longlong_prepeval.htm">longlong_prepeval</a>.</td>
- </tr>
- <tr>
- <td class="code">macsbug</td>
- <td>Pragma macsbug.</td>
- </tr>
- <tr>
- <td class="code">max_errors</td>
- <td>Pragma max_errors</td>
- </tr>
- <tr>
- <td class="code">microsoft_exceptions</td>
- <td>Pragma microsoft_exceptions.</td>
- </tr>
- <tr>
- <td class="code">microsoft_RTTI</td>
- <td>Pragma microsoft_RTTI.</td>
- </tr>
- <tr>
- <td class="code">mmx</td>
- <td>MMX setting in the Extended Instruction Set menu of the x86 CodeGen panel and pragma <a href="../pragmas_x86/p_mmx.htm">mmx</a>.</td>
- </tr>
- <tr>
- <td class="code">mmx_call</td>
- <td>Pragma mmx_call.</td>
- </tr>
- <tr>
- <td class="code">mpwc</td>
- <td>Pragma mpwc.</td>
- </tr>
- <tr>
- <td class="code">mpwc_newline</td>
- <td>Pragma <a href="../pragmas/p_mpwc_newline.htm">mpwc_newline</a>.</td>
- </tr>
- <tr>
- <td class="code">mpwc_relax</td>
- <td>Pragma <a href="../pragmas/p_mpwc_relax.htm">mpwc_relax</a>.</td>
- </tr>
- <tr>
- <td class="code">msg_show_lineref</td>
- <td>Pragma <a href="../pragmas/p_msg_show_lineref.htm">msg_show_lineref</a></td>
- </tr>
- <tr>
- <td class="code">msg_show_realref</td>
- <td>Pragma <a href="../pragmas/p_msg_show_realref.htm">msg_show_realref</a></td>
- </tr>
- <tr>
- <td class="code">multibyteaware_ preserve_literals</td>
- <td>Pragma multibyteaware_
-preserve_literals</td>
- </tr>
- <tr>
- <td class="code">no_conststringconv</td>
- <td>Pragma <a href="../pragmas/p_no_conststringconv.htm">no_conststringconv</a></td>
- </tr>
- <tr>
- <td class="code">no_register_coloring</td>
- <td>Pragma no_register_coloring.</td>
- </tr>
- <tr>
- <td class="code">no_static_dtors</td>
- <td>Pragma <a href="../pragmas/p_no_static_dtors.htm">no_static_dtors</a>.</td>
- </tr>
- <tr>
- <td class="code">no_conststringconv</td>
- <td>Pragma no_conststringconv</td>
- </tr>
- <tr>
- <td class="code">oldstyle_symbols</td>
- <td>Pragma oldstyle_symbols.</td>
- </tr>
- <tr>
- <td class="code">only_std_keywords</td>
- <td>ANSI Keywords Only setting and pragma <a href="../pragmas/p_only_std_keywords.htm">only_std_keywords</a>.</td>
- </tr>
- <tr>
- <td class="code">opt_classresults</td>
- <td>Pragma <a href="../pragmas/p_opt_classresults.htm">opt_classresults</a></td>
- </tr>
- <tr>
- <td class="code">opt_common_subs</td>
- <td>Pragma <a href="../pragmas/p_opt_common_subs.htm">opt_common_subs</a>.</td>
- </tr>
- <tr>
- <td class="code">opt_dead_assignments</td>
- <td>Pragma <a href="../pragmas/p_opt_dead_assignments.htm">opt_dead_assignments</a>.</td>
- </tr>
- <tr>
- <td class="code">opt_dead_code</td>
- <td>Pragma <a href="../pragmas/p_opt_dead_code.htm">opt_dead_code</a>.</td>
- </tr>
- <tr>
- <td class="code">opt_lifetimes</td>
- <td>Pragma <a href="../pragmas/p_opt_lifetimes.htm">opt_lifetimes</a>.</td>
- </tr>
- <tr>
- <td class="code">opt_loop_invariants</td>
- <td>Pragma <a href="../pragmas/p_opt_loop_invariants.htm">opt_loop_invariants</a>.</td>
- </tr>
- <tr>
- <td class="code">opt_propagation</td>
- <td>Pragma <a href="../pragmas/p_opt_propagation.htm">opt_propagation</a>.</td>
- </tr>
- <tr>
- <td class="code">opt_strength_reduction</td>
- <td>Pragma <a href="../pragmas/p_opt_strength_reduction.htm">opt_strength_reduction</a>.</td>
- </tr>
- <tr>
- <td class="code">opt_strength_reduction_strict</td>
- <td>Pragma <a href="../pragmas/p_opt_strength_reduction_strict.htm">opt_strength_reduction_strict</a>.</td>
- </tr>
- <tr>
- <td class="code">opt_unroll_loops</td>
- <td>Pragma <a href="../pragmas/p_opt_unroll_loops.htm">opt_unroll_loops</a>.</td>
- </tr>
- <tr>
- <td class="code">opt_vectorize_loops</td>
- <td>Pragma <a href="../pragmas/p_opt_vectorize_loops.htm">opt_vectorize_loops</a>.</td>
- </tr>
- <tr>
- <td class="code">optimize_for_size</td>
- <td>Pragma <a href="../pragmas/p_optimize_for_size.htm">optimize_for_size</a>.</td>
- </tr>
- <tr>
- <td class="code">optimizewithasm</td>
- <td>Pragma <a href="../pragmas/p_optimizewithasm.htm">optimizewithasm</a>.</td>
- </tr>
- <tr>
- <td class="code">pool_data</td>
- <td>Pragma pool_data.</td>
- </tr>
- <tr>
- <td class="code">pool_strings</td>
- <td>Pool Strings setting and pragma <a href="../pragmas/p_pool_strings.htm">pool_strings</a>.</td>
- </tr>
- <tr>
- <td class="code">ppc_unroll_speculative</td>
- <td>Pragma ppc_unroll_speculative.</td>
- </tr>
- <tr>
- <td class="code">precompile</td>
- <td>Whether or not the file is precompiled.</td>
- </tr>
- <tr>
- <td class="code">preprocess</td>
- <td>Whether or not the file is preprocessed.</td>
- </tr>
- <tr>
- <td class="code">profile</td>
- <td>Pragma profile.</td>
- </tr>
- <tr>
- <td class="code">readonly_strings</td>
- <td>Pragma <a href="../pragmas/p_readonly_strings.htm">readonly_strings</a>.</td>
- </tr>
- <tr>
- <td class="code">register_coloring</td>
- <td>Pragma <a href="../pragmas_x86/p_register_coloring.htm">register_coloring</a>.</td>
- </tr>
- <tr>
- <td class="code">require_prototypes</td>
- <td>Require Function Prototypes setting and pragma <a href="../pragmas/p_require_prototypes.htm">require_prototypes</a>.</td>
- </tr>
- <tr>
- <td class="code">RTTI</td>
- <td>Enable RTTI setting and pragma <a href="../pragmas/p_rtti.htm">RTTI</a>.</td>
- </tr>
- <tr>
- <td class="code">showmessagenumber</td>
- <td>Pragma <a href="../pragmas/p_showmessagenumber.htm">showmessagenumber</a></td>
- </tr>
- <tr>
- <td class="code">side_effects</td>
- <td>Pragma side_effects.</td>
- </tr>
- <tr>
- <td class="code">simple_prepdump</td>
- <td>Pragma <a href="../pragmas/p_simple_prepdump.htm">simple_prepdump</a>.</td>
- </tr>
- <tr>
- <td class="code">SOMCallOptimization</td>
- <td>Pragma SOMCallOptimization.</td>
- </tr>
- <tr>
- <td class="code">SOMCheckEnvironment</td>
- <td>Pragma SOMCheckEnvironment.</td>
- </tr>
- <tr>
- <td class="code">stack_cleanup</td>
- <td>Pragma stack_cleanup.</td>
- </tr>
- <tr>
- <td class="code">suppress_init_code</td>
- <td>Pragma <a href="../pragmas/p_suppress_init_code.htm">suppress_init_code</a>.</td>
- </tr>
- <tr>
- <td class="code">suppress_warnings</td>
- <td>Pragma <a href="../pragmas/p_suppress_warnings.htm">suppress_warnings</a>.</td>
- </tr>
- <tr>
- <td class="code">sym</td>
- <td>Marker in the project window debug column and pragma <a href="../pragmas/p_sym.htm">sym</a>.</td>
- </tr>
- <tr>
- <td class="code">syspath_once</td>
- <td>Pragma <a href="../pragmas/p_syspath_once.htm">syspath_once</a>.</td>
- </tr>
- <tr>
- <td class="code">text_encoding</td>
- <td>Pragma <a href="../pragmas/p_text_encoding.htm">text_encoding</a></td>
- </tr>
- <tr>
- <td class="code">toc_data</td>
- <td>Pragma toc_data.</td>
- </tr>
- <tr>
- <td class="code">traceback</td>
- <td>Pragma traceback.</td>
- </tr>
- <tr>
- <td class="code">trigraphs</td>
- <td><a href="../pragmas/p_trigraphs.htm">Expand Trigraphs</a> setting and pragma <a href="../pragmas/p_trigraphs.htm">trigraphs</a>.</td>
- </tr>
- <tr>
- <td class="code">unsigned_char</td>
- <td>Use Unsigned Chars setting and pragma <a href="../pragmas/p_unsigned_char.htm">unsigned_char</a>.</td>
- </tr>
- <tr>
- <td class="code">use_fp_instructions</td>
- <td>Pragma use_fp_instructions.</td>
- </tr>
- <tr>
- <td class="code">use_frame</td>
- <td>Pragma <a href="../pragmas_x86/p_use_frame.htm">use_frame</a>.</td>
- </tr>
- <tr>
- <td class="code">use_mask_registers</td>
- <td>Pragma use_mask_registers.</td>
- </tr>
- <tr>
- <td class="code">warning</td>
- <td>Pragma warning</td>
- </tr>
- <tr>
- <td class="code">warn_any_ptr_int_conv</td>
- <td>Pragma <a href="../pragmas/p_warn_any_ptr_int_conv.htm">warn_any_ptr_int_conv</a></td>
- </tr>
- <tr>
- <td class="code">warn_emptydecl</td>
- <td>Empty Declarations setting and pragma <a href="../pragmas/p_warn_emptydecl.htm">warn_emptydecl</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_extracomma</td>
- <td>Extra Commas setting and pragma <a href="../pragmas/p_warn_extracomma.htm">warn_extracomma</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_hiddenlocals</td>
- <td>Pragma <a href="../pragmas/p_warn_hiddenlocals.htm">warn_hiddenlocals</a></td>
- </tr>
- <tr>
- <td class="code">warn_hidevirtual</td>
- <td>Hidden virtual functions setting and pragma <a href="../pragmas/p_warn_hidevirtual.htm">warn_hidevirtual</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_illegal_instructions</td>
- <td> Pragma <a href="../pragmas_x86/p_warn_illegal_instructions.htm">warn_illegal_instructions</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_illpragma</td>
- <td>Illegal Pragmas setting and pragma <a href="../pragmas/p_warn_illpragma.htm">warn_illpragma</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_illtokenpasting</td>
- <td>Pragma <a href="../pragmas/p_warn_illtokenpasting.htm">warn_illtokenpasting</a></td>
- </tr>
- <tr>
- <td class="code">warn_illunionmembers</td>
- <td>Pragma <a href="../pragmas/p_warn_illunionmembers.htm">warn_illunionmembers</a></td>
- </tr>
- <tr>
- <td class="code">warn_impl_f2i_conv</td>
- <td>Pragma <a href="../pragmas/p_warn_impl_f2i_conv.htm">warn_impl_f2i_conv</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_impl_i2f_conv</td>
- <td>Pragma <a href="../pragmas/p_warn_impl_i2f_conv.htm">warn_impl_i2f_conv</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_impl_s2u_conv</td>
- <td>Pragma <a href="../pragmas/p_warn_impl_s2u_conv.htm">warn_impl_s2u_conv</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_implicitconv</td>
- <td>Implicit Arithmetic Conversions setting and pragma <a href="../pragmas/p_warn_implicitconv.htm">warn_implicitconv</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_missingreturn</td>
- <td>Pragma <a href="../pragmas/p_warn_missingreturn.htm">warn_missingreturn</a></td>
- </tr>
- <tr>
- <td class="code">warn_no_explicit_virtual</td>
- <td>Pragma <a href="../pragmas/p_warn_no_explicit_virtual.htm">warn_no_explicit_virtual</a></td>
- </tr>
- <tr>
- <td class="code">warn_no_side_effect</td>
- <td>pragma <a href="../pragmas/p_warn_no_side_effect.htm">warn_no_side_effect</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_notinlined</td>
- <td>Non-Inlined Functions setting and pragma <a href="../pragmas/p_warn_notinlined.htm">warn_notinlined</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_padding</td>
- <td>pragma <a href="../pragmas/p_warn_padding.htm">warn_padding</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_possunwant</td>
- <td>Possible Errors setting and pragma <a href="../pragmas/p_warn_possunwant.htm">warn_possunwant</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_ptr_int_conv</td>
- <td>pragma <a href="../pragmas/p_warn_ptr_int_conv.htm">warn_ptr_int_conv</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_resultnotused</td>
- <td>pragma <a href="../pragmas/p_warn_resultnotused.htm">warn_resultnotused</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_structclass</td>
- <td>Inconsistent ‘class’ / ‘struct’ Usage setting and pragma <a href="../pragmas/p_warn_structclass.htm">warn_structclass</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_undefmacro</td>
- <td>pragma <a href="../pragmas/p_warn_undefmacro.htm">warn_undefmacro</a></td>
- </tr>
- <tr>
- <td class="code">warn_unusedarg</td>
- <td>Unused Arguments setting and pragma <a href="../pragmas/p_warn_unusedarg.htm">warn_unusedarg</a>.</td>
- </tr>
- <tr>
- <td class="code">warn_unusedvar</td>
- <td>Unused Variables setting and pragma warn_unusedvar.</td>
- </tr>
- <tr>
- <td class="code">warning_errors</td>
- <td>Treat Warnings As Errors setting and pragma <a href="../pragmas/p_warning_errors.htm">warning_errors</a>.</td>
- </tr>
- <tr>
- <td class="code">wchar_type</td>
- <td>Enable <span class="code">wchar_t</span> Support setting and pragma <a href="../pragmas/p_wchar_type.htm">wchar_type</a>.</td>
- </tr>
-</table>
-<p></p>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Checking Settings</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h3>Checking Settings</h3>
+<p>The preprocessor function <span class="code">__option() lets you check pragmas and other settings that control the C</span>/C++ compiler and code generation. You typically modify these settings using various panels in the Project Settings window.</p>
+<p>The syntax for this preprocessor function is as follows:</p>
+<p class="listing"><span class="code">__option(setting</span>-name)</p>
+<p>If the specified setting is enabled, <span class="code">__option() returns </span><span class="code">1</span>; otherwise it returns <span class="code">0</span>.</p>
+<p>To determine if a setting-name is invalid, see <a href="../errors/err_as_warnings.htm">Warnings as Errors</a>.</p>
+<p>Use this function when you want one source file to contain code that uses different settings. The example below shows how to compile one series of lines if you are compiling for machines with the MC68881 floating-point unit and another series if you are compiling for machines without it:</p>
+<p class="listing">#if <span class="code">__option (code</span>68881) // Code for 68K chip with FPU<br />
+ #else<br />
+ // Code for any 68K processor<br />
+ #endif</p>
+<p>Table 1 lists all the setting names you can use in the preprocessor function <span class="code">__option()</span>.</p>
+<h5>Table 1. Preprocessor Setting Names for <span class="code">__option()</span></h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="33%" scope="col">This argument...</th>
+ <th width="67%" class="table" scope="col">Corresponds to the…</th>
+ </tr>
+ <tr>
+ <td class="code">a6frames</td>
+ <td>Pragma a6frames.</td>
+ </tr>
+ <tr>
+ <td class="code">align_array_members</td>
+ <td>Pragma align_array_members.</td>
+ </tr>
+ <tr>
+ <td class="code">altivec_codegen</td>
+ <td>Pragma altivec_codegen.</td>
+ </tr>
+ <tr>
+ <td class="code">altivec_model</td>
+ <td>Pragma altivec_model.</td>
+ </tr>
+ <tr>
+ <td class="code">altivec_vrsave</td>
+ <td>Pragma altivec_vrsave.</td>
+ </tr>
+ <tr>
+ <td class="code">always_inline</td>
+ <td>Pragma <a href="../pragmas/p_always_inline.htm">always_inline</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">ANSI_strict</td>
+ <td><a href="../pragmas/p_ANSI_strict.htm">ANSI Strict</a> setting and pragma ANSI_strict.</td>
+ </tr>
+ <tr>
+ <td class="code">arg_dep_lookup</td>
+ <td>Pragma <a href="../pragmas/p_arg_dep_lookup.htm">arg_dep_lookup</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">ARM_conform</td>
+ <td>Pragma <a href="../pragmas/p_arm_conform.htm">ARM_conform</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">array_new_delete</td>
+ <td>Pragma <a href="../pragmas/p_array_new_delete.htm">array_new_delete</a></td>
+ </tr>
+ <tr>
+ <td class="code">auto_inline</td>
+ <td>Auto-Inline setting of the Inlining menu and pragma <a href="../pragmas/p_auto_inline.htm">auto_inline</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">bool</td>
+ <td>Enable bool Support setting and pragma <a href="../pragmas/p_bool.htm">bool</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">check_header_flags</td>
+ <td>Pragma <a href="../pragmas/p_check_header_flags.htm">check_header_flags</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">code68020</td>
+ <td>Pragma code68020.</td>
+ </tr>
+ <tr>
+ <td class="code">code68881</td>
+ <td>Pragma code68881.</td>
+ </tr>
+ <tr>
+ <td class="code">const_multiply</td>
+ <td>Pragma const_multiply.</td>
+ </tr>
+ <tr>
+ <td class="code">const_strings</td>
+ <td>Pragma <a href="../pragmas/p_const_strings.htm">const_strings</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">cplusplus</td>
+ <td>Force C++ Compilation setting , the pragma <a href="../pragmas/p_cplusplus.htm">cplusplus</a>, and the macro cplusplus. Indicates whether the compiler is compiling this file as a C++ file.</td>
+ </tr>
+ <tr>
+ <td class="code">cpp_extensions</td>
+ <td>Pragma <a href="../pragmas/p_cpp_extensions.htm">cpp_extensions</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">d0_pointers</td>
+ <td>Pragmas pointers_in_D0 and pointers_in_A0.</td>
+ </tr>
+ <tr>
+ <td class="code">def_inherited</td>
+ <td>Pragma <a href="../pragmas/p_def_inherited.htm">def_inherited</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">defer_codegen</td>
+ <td>Pragma <a href="../pragmas/p_defer_codegen.htm">defer_codegen</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">defer_defarg_parsing</td>
+ <td>Pragma <a href="../pragmas/p_defer_defarg_parsing.htm">defer_defarg_parsing</a></td>
+ </tr>
+ <tr>
+ <td class="code">direct_destruction</td>
+ <td>No longer available</td>
+ </tr>
+ <tr>
+ <td class="code">direct_to_SOM</td>
+ <td>Pragma direct_to_SOM.</td>
+ </tr>
+ <tr>
+ <td class="code">disable_registers</td>
+ <td>Pragma disable_registers.</td>
+ </tr>
+ <tr>
+ <td class="code">dollar_identifiers</td>
+ <td>Pragma <a href="../pragmas/p_dollar_identifiers.htm">dollar_identifiers</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">dont_inline</td>
+ <td>Don’t Inline setting and pragma <a href="../pragmas/p_dont_inline.htm">dont_inline</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">dont_reuse_strings</td>
+ <td>Reuse Strings setting and pragma <a href="../pragmas/p_dont_reuse_strings.htm">dont_reuse_strings</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">ecplusplus</td>
+ <td>Pragma <a href="../pragmas/p_ecplusplus.htm">ecplusplus</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">EIPC_EIPSW</td>
+ <td>Pragma EIPC_EIPSW.</td>
+ </tr>
+ <tr>
+ <td class="code">enumsalwaysint</td>
+ <td>Enums Always Int setting and pragma <a href="../pragmas/p_enumsalwaysint.htm">enumsalwaysint</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">exceptions</td>
+ <td>Enable C++ Exceptions setting and pragma <a href="../pragmas_x86/p_exceptions.htm">exceptions</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">export</td>
+ <td>Pragma export.</td>
+ </tr>
+ <tr>
+ <td class="code">extended_errorcheck</td>
+ <td>Extended Error Checking setting and pragma <a href="../pragmas/p_extended_errorcheck.htm">extended_errorcheck</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">far_data</td>
+ <td>Pragma far_data.</td>
+ </tr>
+ <tr>
+ <td class="code">far_strings</td>
+ <td>Pragma far_strings.</td>
+ </tr>
+ <tr>
+ <td class="code">far_vtables</td>
+ <td>Pragma far_vtables.</td>
+ </tr>
+ <tr>
+ <td class="code">faster_pch_gen</td>
+ <td>Pragma <a href="../pragmas/p_faster_pch_gen.htm">faster_pch_gen</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">float_constants</td>
+ <td>Pragma <a href="../pragmas/p_float_constants.htm">float_constants</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">force_active</td>
+ <td>Pragma <a href="../pragmas/p_force_active.htm">force_active</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">fourbyteints</td>
+ <td>Pragma fourbyteints.</td>
+ </tr>
+ <tr>
+ <td class="code">fp_contract</td>
+ <td>Pragma fp_contract.</td>
+ </tr>
+ <tr>
+ <td class="code">fullpath_prepdump</td>
+ <td>Pragma <a href="../pragmas/p_fullpath_prepdump.htm">fullpath_prepdump</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">function_align</td>
+ <td>Pragma function_align.</td>
+ </tr>
+ <tr>
+ <td class="code">gcc_extensions</td>
+ <td>Pragma <a href="../pragmas/p_gcc_extensions.htm">gcc_extensions</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">IEEEdoubles</td>
+ <td>Pragma IEEEdoubles.</td>
+ </tr>
+ <tr>
+ <td class="code">ignore_oldstyle</td>
+ <td>Pragma <a href="../pragmas/p_ignore_oldstyle.htm">ignore_oldstyle</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">import</td>
+ <td>Pragma <a href="../pragmas/p_import.htm">import</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">inline_bottom_up</td>
+ <td>Pragma <a href="../pragmas/p_inline_bottom_up.htm">inline_bottom_up</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">inline_bottom_up_once</td>
+ <td>Pragma <a href="../pragmas/p_inline_bottom_up_once.htm">inline_bottom_up_once</a></td>
+ </tr>
+ <tr>
+ <td class="code">inline_intrinsics</td>
+ <td>Pragma inline_intrinsics.</td>
+ </tr>
+ <tr>
+ <td class="code">inline_max_auto_size</td>
+ <td>Pragma <a href="../pragmas/p_inline_max_auto_size.htm">inline_max_auto_size</a></td>
+ </tr>
+ <tr>
+ <td class="code">inline_max_size</td>
+ <td>Pragma <a href="../pragmas/p_inline_max_size.htm">inline_max_size</a></td>
+ </tr>
+ <tr>
+ <td class="code">inline_max_total_size</td>
+ <td>Pragma <a href="../pragmas/p_inline_max_total_size.htm">inline_max_total_size</a></td>
+ </tr>
+ <tr>
+ <td class="code">internal</td>
+ <td>Pragma <a href="../pragmas/p_internal.htm">internal</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">interrupt</td>
+ <td>Pragma interrupt.</td>
+ </tr>
+ <tr>
+ <td class="code">k63d</td>
+ <td>K6 3D Favored setting in the Extended Instruction Set menu of the x86 CodeGen panel and pragma <a href="../pragmas_x86/p_k63d.htm">k63d</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">k63d_calls</td>
+ <td> MMX + K6 3D setting in the Extended Instruction Set menu of the x86 CodeGen panel and pragma k63d_calls.</td>
+ </tr>
+ <tr>
+ <td class="code">lib_export</td>
+ <td>Pragma <a href="../pragmas/p_lib_export.htm">lib_export</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">line_prepdump</td>
+ <td>Pragma <a href="../pragmas/p_line_prepdump.htm">line_prepdump</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">little_endian</td>
+ <td>No option. Defined as 1 if you are compiling for a little endian target (such as x86); 0 if you are compiling for a big endian target (such as PowerPC).</td>
+ </tr>
+ <tr>
+ <td class="code">longlong</td>
+ <td>Pragma <a href="../pragmas/p_longlong.htm">longlong</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">longlong_enums</td>
+ <td>Pragma <a href="../pragmas/p_longlong_enums.htm">longlong_enums</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">longlong_prepeval</td>
+ <td>Pragma <a href="../pragmas/p_longlong_prepeval.htm">longlong_prepeval</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">macsbug</td>
+ <td>Pragma macsbug.</td>
+ </tr>
+ <tr>
+ <td class="code">max_errors</td>
+ <td>Pragma max_errors</td>
+ </tr>
+ <tr>
+ <td class="code">microsoft_exceptions</td>
+ <td>Pragma microsoft_exceptions.</td>
+ </tr>
+ <tr>
+ <td class="code">microsoft_RTTI</td>
+ <td>Pragma microsoft_RTTI.</td>
+ </tr>
+ <tr>
+ <td class="code">mmx</td>
+ <td>MMX setting in the Extended Instruction Set menu of the x86 CodeGen panel and pragma <a href="../pragmas_x86/p_mmx.htm">mmx</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">mmx_call</td>
+ <td>Pragma mmx_call.</td>
+ </tr>
+ <tr>
+ <td class="code">mpwc</td>
+ <td>Pragma mpwc.</td>
+ </tr>
+ <tr>
+ <td class="code">mpwc_newline</td>
+ <td>Pragma <a href="../pragmas/p_mpwc_newline.htm">mpwc_newline</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">mpwc_relax</td>
+ <td>Pragma <a href="../pragmas/p_mpwc_relax.htm">mpwc_relax</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">msg_show_lineref</td>
+ <td>Pragma <a href="../pragmas/p_msg_show_lineref.htm">msg_show_lineref</a></td>
+ </tr>
+ <tr>
+ <td class="code">msg_show_realref</td>
+ <td>Pragma <a href="../pragmas/p_msg_show_realref.htm">msg_show_realref</a></td>
+ </tr>
+ <tr>
+ <td class="code">multibyteaware_ preserve_literals</td>
+ <td>Pragma multibyteaware_
+preserve_literals</td>
+ </tr>
+ <tr>
+ <td class="code">no_conststringconv</td>
+ <td>Pragma <a href="../pragmas/p_no_conststringconv.htm">no_conststringconv</a></td>
+ </tr>
+ <tr>
+ <td class="code">no_register_coloring</td>
+ <td>Pragma no_register_coloring.</td>
+ </tr>
+ <tr>
+ <td class="code">no_static_dtors</td>
+ <td>Pragma <a href="../pragmas/p_no_static_dtors.htm">no_static_dtors</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">no_conststringconv</td>
+ <td>Pragma no_conststringconv</td>
+ </tr>
+ <tr>
+ <td class="code">oldstyle_symbols</td>
+ <td>Pragma oldstyle_symbols.</td>
+ </tr>
+ <tr>
+ <td class="code">only_std_keywords</td>
+ <td>ANSI Keywords Only setting and pragma <a href="../pragmas/p_only_std_keywords.htm">only_std_keywords</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">opt_classresults</td>
+ <td>Pragma <a href="../pragmas/p_opt_classresults.htm">opt_classresults</a></td>
+ </tr>
+ <tr>
+ <td class="code">opt_common_subs</td>
+ <td>Pragma <a href="../pragmas/p_opt_common_subs.htm">opt_common_subs</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">opt_dead_assignments</td>
+ <td>Pragma <a href="../pragmas/p_opt_dead_assignments.htm">opt_dead_assignments</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">opt_dead_code</td>
+ <td>Pragma <a href="../pragmas/p_opt_dead_code.htm">opt_dead_code</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">opt_lifetimes</td>
+ <td>Pragma <a href="../pragmas/p_opt_lifetimes.htm">opt_lifetimes</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">opt_loop_invariants</td>
+ <td>Pragma <a href="../pragmas/p_opt_loop_invariants.htm">opt_loop_invariants</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">opt_propagation</td>
+ <td>Pragma <a href="../pragmas/p_opt_propagation.htm">opt_propagation</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">opt_strength_reduction</td>
+ <td>Pragma <a href="../pragmas/p_opt_strength_reduction.htm">opt_strength_reduction</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">opt_strength_reduction_strict</td>
+ <td>Pragma <a href="../pragmas/p_opt_strength_reduction_strict.htm">opt_strength_reduction_strict</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">opt_unroll_loops</td>
+ <td>Pragma <a href="../pragmas/p_opt_unroll_loops.htm">opt_unroll_loops</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">opt_vectorize_loops</td>
+ <td>Pragma <a href="../pragmas/p_opt_vectorize_loops.htm">opt_vectorize_loops</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">optimize_for_size</td>
+ <td>Pragma <a href="../pragmas/p_optimize_for_size.htm">optimize_for_size</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">optimizewithasm</td>
+ <td>Pragma <a href="../pragmas/p_optimizewithasm.htm">optimizewithasm</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">pool_data</td>
+ <td>Pragma pool_data.</td>
+ </tr>
+ <tr>
+ <td class="code">pool_strings</td>
+ <td>Pool Strings setting and pragma <a href="../pragmas/p_pool_strings.htm">pool_strings</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">ppc_unroll_speculative</td>
+ <td>Pragma ppc_unroll_speculative.</td>
+ </tr>
+ <tr>
+ <td class="code">precompile</td>
+ <td>Whether or not the file is precompiled.</td>
+ </tr>
+ <tr>
+ <td class="code">preprocess</td>
+ <td>Whether or not the file is preprocessed.</td>
+ </tr>
+ <tr>
+ <td class="code">profile</td>
+ <td>Pragma profile.</td>
+ </tr>
+ <tr>
+ <td class="code">readonly_strings</td>
+ <td>Pragma <a href="../pragmas/p_readonly_strings.htm">readonly_strings</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">register_coloring</td>
+ <td>Pragma <a href="../pragmas_x86/p_register_coloring.htm">register_coloring</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">require_prototypes</td>
+ <td>Require Function Prototypes setting and pragma <a href="../pragmas/p_require_prototypes.htm">require_prototypes</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">RTTI</td>
+ <td>Enable RTTI setting and pragma <a href="../pragmas/p_rtti.htm">RTTI</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">showmessagenumber</td>
+ <td>Pragma <a href="../pragmas/p_showmessagenumber.htm">showmessagenumber</a></td>
+ </tr>
+ <tr>
+ <td class="code">side_effects</td>
+ <td>Pragma side_effects.</td>
+ </tr>
+ <tr>
+ <td class="code">simple_prepdump</td>
+ <td>Pragma <a href="../pragmas/p_simple_prepdump.htm">simple_prepdump</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">SOMCallOptimization</td>
+ <td>Pragma SOMCallOptimization.</td>
+ </tr>
+ <tr>
+ <td class="code">SOMCheckEnvironment</td>
+ <td>Pragma SOMCheckEnvironment.</td>
+ </tr>
+ <tr>
+ <td class="code">stack_cleanup</td>
+ <td>Pragma stack_cleanup.</td>
+ </tr>
+ <tr>
+ <td class="code">suppress_init_code</td>
+ <td>Pragma <a href="../pragmas/p_suppress_init_code.htm">suppress_init_code</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">suppress_warnings</td>
+ <td>Pragma <a href="../pragmas/p_suppress_warnings.htm">suppress_warnings</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">sym</td>
+ <td>Marker in the project window debug column and pragma <a href="../pragmas/p_sym.htm">sym</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">syspath_once</td>
+ <td>Pragma <a href="../pragmas/p_syspath_once.htm">syspath_once</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">text_encoding</td>
+ <td>Pragma <a href="../pragmas/p_text_encoding.htm">text_encoding</a></td>
+ </tr>
+ <tr>
+ <td class="code">toc_data</td>
+ <td>Pragma toc_data.</td>
+ </tr>
+ <tr>
+ <td class="code">traceback</td>
+ <td>Pragma traceback.</td>
+ </tr>
+ <tr>
+ <td class="code">trigraphs</td>
+ <td><a href="../pragmas/p_trigraphs.htm">Expand Trigraphs</a> setting and pragma <a href="../pragmas/p_trigraphs.htm">trigraphs</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">unsigned_char</td>
+ <td>Use Unsigned Chars setting and pragma <a href="../pragmas/p_unsigned_char.htm">unsigned_char</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">use_fp_instructions</td>
+ <td>Pragma use_fp_instructions.</td>
+ </tr>
+ <tr>
+ <td class="code">use_frame</td>
+ <td>Pragma <a href="../pragmas_x86/p_use_frame.htm">use_frame</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">use_mask_registers</td>
+ <td>Pragma use_mask_registers.</td>
+ </tr>
+ <tr>
+ <td class="code">warning</td>
+ <td>Pragma warning</td>
+ </tr>
+ <tr>
+ <td class="code">warn_any_ptr_int_conv</td>
+ <td>Pragma <a href="../pragmas/p_warn_any_ptr_int_conv.htm">warn_any_ptr_int_conv</a></td>
+ </tr>
+ <tr>
+ <td class="code">warn_emptydecl</td>
+ <td>Empty Declarations setting and pragma <a href="../pragmas/p_warn_emptydecl.htm">warn_emptydecl</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_extracomma</td>
+ <td>Extra Commas setting and pragma <a href="../pragmas/p_warn_extracomma.htm">warn_extracomma</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_hiddenlocals</td>
+ <td>Pragma <a href="../pragmas/p_warn_hiddenlocals.htm">warn_hiddenlocals</a></td>
+ </tr>
+ <tr>
+ <td class="code">warn_hidevirtual</td>
+ <td>Hidden virtual functions setting and pragma <a href="../pragmas/p_warn_hidevirtual.htm">warn_hidevirtual</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_illegal_instructions</td>
+ <td> Pragma <a href="../pragmas_x86/p_warn_illegal_instructions.htm">warn_illegal_instructions</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_illpragma</td>
+ <td>Illegal Pragmas setting and pragma <a href="../pragmas/p_warn_illpragma.htm">warn_illpragma</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_illtokenpasting</td>
+ <td>Pragma <a href="../pragmas/p_warn_illtokenpasting.htm">warn_illtokenpasting</a></td>
+ </tr>
+ <tr>
+ <td class="code">warn_illunionmembers</td>
+ <td>Pragma <a href="../pragmas/p_warn_illunionmembers.htm">warn_illunionmembers</a></td>
+ </tr>
+ <tr>
+ <td class="code">warn_impl_f2i_conv</td>
+ <td>Pragma <a href="../pragmas/p_warn_impl_f2i_conv.htm">warn_impl_f2i_conv</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_impl_i2f_conv</td>
+ <td>Pragma <a href="../pragmas/p_warn_impl_i2f_conv.htm">warn_impl_i2f_conv</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_impl_s2u_conv</td>
+ <td>Pragma <a href="../pragmas/p_warn_impl_s2u_conv.htm">warn_impl_s2u_conv</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_implicitconv</td>
+ <td>Implicit Arithmetic Conversions setting and pragma <a href="../pragmas/p_warn_implicitconv.htm">warn_implicitconv</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_missingreturn</td>
+ <td>Pragma <a href="../pragmas/p_warn_missingreturn.htm">warn_missingreturn</a></td>
+ </tr>
+ <tr>
+ <td class="code">warn_no_explicit_virtual</td>
+ <td>Pragma <a href="../pragmas/p_warn_no_explicit_virtual.htm">warn_no_explicit_virtual</a></td>
+ </tr>
+ <tr>
+ <td class="code">warn_no_side_effect</td>
+ <td>pragma <a href="../pragmas/p_warn_no_side_effect.htm">warn_no_side_effect</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_notinlined</td>
+ <td>Non-Inlined Functions setting and pragma <a href="../pragmas/p_warn_notinlined.htm">warn_notinlined</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_padding</td>
+ <td>pragma <a href="../pragmas/p_warn_padding.htm">warn_padding</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_possunwant</td>
+ <td>Possible Errors setting and pragma <a href="../pragmas/p_warn_possunwant.htm">warn_possunwant</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_ptr_int_conv</td>
+ <td>pragma <a href="../pragmas/p_warn_ptr_int_conv.htm">warn_ptr_int_conv</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_resultnotused</td>
+ <td>pragma <a href="../pragmas/p_warn_resultnotused.htm">warn_resultnotused</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_structclass</td>
+ <td>Inconsistent ‘class’ / ‘struct’ Usage setting and pragma <a href="../pragmas/p_warn_structclass.htm">warn_structclass</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_undefmacro</td>
+ <td>pragma <a href="../pragmas/p_warn_undefmacro.htm">warn_undefmacro</a></td>
+ </tr>
+ <tr>
+ <td class="code">warn_unusedarg</td>
+ <td>Unused Arguments setting and pragma <a href="../pragmas/p_warn_unusedarg.htm">warn_unusedarg</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">warn_unusedvar</td>
+ <td>Unused Variables setting and pragma warn_unusedvar.</td>
+ </tr>
+ <tr>
+ <td class="code">warning_errors</td>
+ <td>Treat Warnings As Errors setting and pragma <a href="../pragmas/p_warning_errors.htm">warning_errors</a>.</td>
+ </tr>
+ <tr>
+ <td class="code">wchar_type</td>
+ <td>Enable <span class="code">wchar_t</span> Support setting and pragma <a href="../pragmas/p_wchar_type.htm">wchar_type</a>.</td>
+ </tr>
+</table>
+<p></p>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/symbols/symbols.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/symbols/symbols.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,21 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Predefined Symbols</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Predefined Symbols</h2>
-<p> Carbide C/C++ compilers define several preprocessor and compiler symbols that give you information about the compile-time environment. The compiler evaluates these symbols at compile time, not runtime. The topics in this section are:</p>
-<ul>
- <li><a href="sym_ansi.htm">ANSI Predefined Symbols</a></li>
- <li><a href="sym_carbide.htm">Carbide Predefined Symbols</a></li>
- <li><a href="sym_settings.htm">Checking Option Settings </a></li>
-</ul>
-<div id="footer">Copyright © 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></div>
-
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Predefined Symbols</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Predefined Symbols</h2>
+<p> Carbide C/C++ compilers define several preprocessor and compiler symbols that give you information about the compile-time environment. The compiler evaluates these symbols at compile time, not runtime. The topics in this section are:</p>
+<ul>
+ <li><a href="sym_ansi.htm">ANSI Predefined Symbols</a></li>
+ <li><a href="sym_carbide.htm">Carbide Predefined Symbols</a></li>
+ <li><a href="sym_settings.htm">Checking Option Settings </a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/book.css Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/book.css Wed Jul 21 12:11:48 2010 -0500
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved.
License: http://www.eclipse.org/legal/epl-v10.html
*/
@@ -10,7 +10,7 @@
}
/* 20091007 added verdana and ariel to list to match SFO website fonts choices */
-body, p, table {
+body, p, table, li {
font-family: Verdana, Ariel, Helvetica, sans-serif;
font-size: 1.0em;
font-weight: normal;
@@ -101,7 +101,7 @@
}
th {
- background-color: #ffd62c;
+ background-color: #66CC66;
}
div.ol.p {
@@ -120,7 +120,7 @@
div h5, div h4 {
padding:5px 0px 5px 12px;
- background-color: #FFCC00;
+ background-color: #D3DAD4;
font-weight:bold;
color: #000000;
}
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm Wed Jul 21 12:11:48 2010 -0500
@@ -17,12 +17,25 @@
<p>This is a comprehensive list of bugs fixed by release: </p>
<ul>
<li>Bugs Fixed in <a href="#bugs300">3.0.0</a></li>
- <li>Previous releases: <a href="#bugs260">2.6.0</a></li>
+ <li>Previous releases: <a href="#bugs270">2.7.0</a>, <a href="#bugs270">2.6.0</a></li>
</ul>
<h3><a name="bugs300" id="bugs10"></a>Bugs Fixed in v3.0.0</h3>
<ul>
<li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10267">0</a> - <em>nada</em></li>
</ul>
+<h4><a name="bugs260" id="bugs2"></a>v2.7.0</h4>
+<ul>
+
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10267">11222</a> - You can now disable device discovery in the <strong>Remote Connection</strong> view to avoid conflicts between different connection protocols within Carbide. </li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11240">11240</a> - Ensured that the temporary project session property <span class="code">symbian-abld</span> is set before <span class="code">qmake</span> is called. </li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11255">11255</a> - The <strong>Run builds concurrently</strong> option now correctly passes '<span class="code">-j 1</span>' when disabled. </li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11353">11353</a> - Fixed a parsing issue where non-alphanumeric characters would halt the parsing process. </li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11381">11381</a> - Customizing a perspective should no longer generate an NPE. </li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11390">11390</a> - Fixed an issue that would sometimes cause the Symbian OS SDK list to remain blank when creating a new template project. </li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11397">11397</a> - Fixed bug where program arguments were not being passed with run configurations. </li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11416">11416</a> - Fixed an issue where the debugger might crash when it encountered breakpoints in several projects.</li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11442">11442</a> - Compiler no longer interprets the string 'instantiated from here' as an error in GCC builds. </li>
+</ul>
<h4><a name="bugs260" id="bugs"></a>v2.6.0</h4>
<ul>
<li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10267">10267</a> - Fixed an issue that prevented some executables from appearing in the Executables view. </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/AIFDefWizard.html Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>AIF File in Concepts</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <h2>AIF File</h2>
-
- <p>
- The AIF, or application information file, is a Symbian OS-specific file
- format. An AIF file contains information about captions, icons, capabilities
- and MIME priority support used by the application. The MMP editor provides support for the AIF editor in the Sources > Resources group.</p>
- <p class="note">
- <b>NOTE</b> AIF files are used only for Symbian OS versions before 9.1.
- </p>
- <p>
- The kind of information an AIF file can contain are:</p>
- <ul>
- <li>
- <p>
- <b>Icons</b>: Icons are used to represent applications and
- their associated document files in the system shell or application launcher. If
- the phone's UI supports embedding, icons may also be used to represent embedded
- documents.
- </p>
- <p>
- The source files for icons are .bmp bitmaps. These source files are
- built into a single .mbm file (Symbian OS multiple bitmap file) which is
- incorporated into the aif file as part of the build process.
- </p>
- </li>
- <li>
- <p>
- <b>Captions</b>: A caption is the text displayed beside its
- icon. Typically it is the application's name.</p>
- <p>
- Captions for multiple languages can be defined in a single aif, and
- the one corresponding to the current system language will be used. In some UIs,
- captions may be defined in a caption file, separate from the aif file.
- </p>
- </li>
- <li>
- <p>
- <b>MIME Support</b>: Multipurpose Internet Mail Extensions,
- MIMEs, define a file format for transferring non-ASCII data, such as graphics,
- audio and fax, over the Internet. The AIF file lists the MIME types that the
- application supports, and the priority of support that each type is given. When
- a file is opened, Symbian OS launches the application which has the highest
- priority of support for the type of data in the file.
- </p>
- <p>
- Given two applications with the same MIME type priority, Symbian OS
- arbitrarily launches one of them.
- </p>
- </li>
- </ul>
- <h5>Related tasks</h5>
- <ul>
- <li><a href="../tasks/AppInfoFile.html">Creating an AIF File</a></li>
- </ul>
- <h5>Related references</h5>
- <ul>
- <li><a href="../reference/AIFEditor.html">AIF Editor</a></li>
- <li><a href="../reference/MMP_Editor.html">MMP Editor</a></li>
- </ul>
-<div id="footer">Copyright © 2010 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></div>
-
- </body>
- </html>
-
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/CarbidePerspective.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/CarbidePerspective.html Wed Jul 21 12:11:48 2010 -0500
@@ -1,48 +1,43 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Carbide.c++ perspective</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <h2>Carbide.c++ perspective</h2>
-
-
- <p>
- The <img src="../images/command_link.png" width="16" height="12" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=com.nokia.carbide.cpp.CarbideCppPerspective)")'>Carbide C/C++</a> perspective is a set of tools and layout of views provided for Symbian OS development. This perspective is designed to work with Symbian OS C++ projects. The commonly used views include:</p>
- <ul>
- <li><a href="../reference/view_cpp_projects.htm">Project Explorer</a> view - display<span><span>s C/C++ projects located in the current workspace</span></span></li>
- <li><a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view - shows all files that belong to the
- current build configuration </li>
- <li><a href="../hints_tips.htm">Editor</a> view - one or more source code editor windows </li>
- <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a> view - displays an outline of a structured C/C++ file that is currently open in the editor view </li>
- <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm">Problems</a> view - displays build errors </li>
- <li><a href="../reference/view_log.htm">Console</a> view - shows the output of a process and allows you to provide keyboard input to a
-process</li>
- <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_properties_view.htm">Properties</a> view - displays property names and basic properties of a selected resource</li>
- <li><a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/reference/ref-31.htm">Tasks</a> view - <span>displays </span>tasks that you manually add</li>
- <li><b>Include Browser</b> view - visualizes the include relations among files</li>
- <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_call_hierarchy_view.htm">Call Hierarchy</a> view - explore call-graphs by means of a tree</li>
- <li><b>Type Hierarchy</b> view - presents inheritance relations and members of type</li>
- <li><a href="../reference/view_executables.htm">Executables</a> view - provides a dynamic list of executables and their related source files</li>
- </ul>
- <p class="note"><b>NOTE</b> When launching a program to debug, the <a href="../reference/perspective_debug.htm">Debug</a> perspective appears.</p>
-
- <p align="center"><img src="images/workbench.png" width="906" height="609" /></p>
- <p class="figure">Figure 1 - Carbide C/C++ perspective </p>
- <p class="note"><b>NOTE</b> Click the <img src="../images/icons/double_arrow_icon.png" width="12" height="9" align="absmiddle" /> icon to show additional options that may not be visible in the perspective view.</p>
- <p>For more information on perspectives see <b>Workbench User Guide > Concepts > <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/concepts-4.htm">Perspectives</a></b>, and for views see <b>C/C++ Development User Guide > Reference
- > <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_o_views.htm">C/C++ Views and Editors</a></b>.</p>
- <p>
- For more details on the Symbian OS Build Configurations, see
- <a href="build_configurations.htm">Active Configurations</a>. </p>
- <h5>Related references</h5>
- <ul>
- <li> <a href="../reference/perspective_debug.htm">Debug Perspective</a></li>
- <li><a href="../reference/view_cpp_projects.htm">C/C++ Projects</a> view</li>
- <li><a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view </li>
- </ul>
- <div id="footer">Copyright © 2010 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></div>
-
-
- </body>
- </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Carbide.c++ perspective</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+ <h2>Carbide.c++ perspective</h2>
+
+
+ <p>
+ The <img src="../images/command_link.png" width="16" height="12" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=com.nokia.carbide.cpp.CarbideCppPerspective)")'>Carbide C/C++</a> perspective is a set of tools and layout of views provided for Symbian OS development. This perspective is designed to work with Symbian OS C++ projects. The commonly used views include:</p>
+ <ul>
+ <li><a href="../reference/view_cpp_projects.htm">Project Explorer</a> view - display<span><span>s C/C++ projects located in the current workspace</span></span></li>
+ <li><a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view - shows all files that belong to the
+ current build configuration </li>
+ <li><a href="../hints_tips.htm">Editor</a> view - one or more source code editor windows </li>
+ <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a> view - displays an outline of a structured C/C++ file that is currently open in the editor view </li>
+ <li><a href="../reference/view_install_extensions.htm">Install Extensions</a> view - displays a list of installable plug-ins</li>
+ <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm">Problems</a> view - displays build errors </li>
+ <li><a href="../reference/view_log.htm">Console</a> view - shows the output of a process and allows you to provide keyboard input to a
+process</li>
+ <li><a href="../reference/view_executables.htm">Executables</a> view - provides a dynamic list of executables and their related source files</li>
+ <li><a href="../reference/trk/view_remote_connection.htm">Remote Connections</a> view – use to monitor, create, edit, or remove common connection settings</li>
+ </ul>
+ <p align="center"><img src="images/workbench.png" width="1028" height="789" /></p>
+ <p class="figure">Figure 1 - Carbide C/C++ perspective </p>
+ <p class="note"><b>NOTE</b> Click the <img src="../images/icons/double_arrow_icon.png" width="12" height="9" align="absmiddle" /> icon to show additional options that may not be visible in the perspective view.</p>
+ <p>For more information on perspectives see <b>Workbench User Guide > Concepts > <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/concepts-4.htm">Perspectives</a></b>, and for views see <b>C/C++ Development User Guide > Reference
+ > <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_o_views.htm">C/C++ Views and Editors</a></b>.</p>
+ <p>
+ For more details on the Symbian OS Build Configurations, see
+ <a href="build_configurations.htm">Active Configurations</a>. </p>
+ <h5>Related references</h5>
+ <ul>
+ <li> <a href="../reference/perspective_debug.htm">Debug Perspective</a></li>
+ <li><a href="../reference/view_cpp_projects.htm">Project Explorer</a> view</li>
+ <li><a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view </li>
+ </ul>
+ <div id="footer">Copyright © 2010 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></div>
+
+
+ </body>
+ </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/MBMDefWizard.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/MBMDefWizard.html Wed Jul 21 12:11:48 2010 -0500
@@ -7,7 +7,7 @@
<p>
MBM, or multi-bitmap, is a Symbian OS-specific bitmap file format. This
- file contains multiple bitmaps and it can contain both bitmaps with masks and
+ file contains multiple bitmaps and can contain bitmaps with masks and
bitmaps without masks. It optimizes the bitmap handling capability of Symbian
OS. The <a href="../reference/MMP_Editor.html">MMP Editor</a> (in <b>Sources</b> tab <b>> Resources > Bitmaps</b>) and <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view provide support for creating and editing MBM
files. In the <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view you can right-click on a scalable icon makefile (for example, <span class="code">Icons_scalable_dc.mk</span>) and select <b>Add MBM/MIF Entry...</b> to open the Edit MBM/MIF Contents window.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/Modify.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/Modify.html Wed Jul 21 12:11:48 2010 -0500
@@ -21,8 +21,7 @@
</p>
<ul>
<li><a href="MBMDefWizard.html">MBM Definition Wizard</a></li>
-<li><a href="AIFDefWizard.html">AIF Definition Wizard</a></li>
- </ul>
+</ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/SampleExampleProjectCreate.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/SampleExampleProjectCreate.html Wed Jul 21 12:11:48 2010 -0500
@@ -1,45 +1,45 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<title>Simple Example Project in Getting Started</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/></head>
-<body>
-<h2>Simple DLL Example</h2>
-
- <p>
- This example walks through the process of creating a basic
- “MyDynamicDLL” DLL project. </p>
- <p>For more information on creating new projects of all types, see<b> </b><a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>. </p>
- <div class="step">
- <h4>Creating a DLL Project</h4>
- <ol>
- <li>Click <b>File > New > Symbian OS C++ Project</b> to invoke the <b>New</b> <b>Symbian OS C++ Project</b> wizard.</li>
- <li>Select Basic dynamically linked library (DLL) project template and click Next.</li>
- <p class="figure"><img src="../images/new_simple_project_01.png" width="500" height="567" alt="" /></p>
- <p class="figure">Figure 1. Select Basic DLL template</p>
- <li>Enter a project name and specify a workspace location to store the project. </li>
- <p align="center"><img src="../images/new_simple_project_02.png" width="500" height="567"alt="" /></p>
- <p align="center" class="figure">Figure 2. Project name and location information</p>
- <li>Select the Symbian OS SDK and Build Configurations to use for this project, then click Next.</li>
- <p align="center"><img src="../images/new_simple_project_03.png" width="500" height="567" alt="" /></p>
- <p class="figure">Figure 3. SDK selection for project</p>
- <li>Enter Specify UID2 as “0x0000008d”, your name as the Author and your Copyright notice.
- For more details on UID2, see <a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>.
- <p align="center"><img src="../images/new_simple_project_04.png" width="500" height="567" alt="" /></p>
- </li>
- </ol>
- <p class="figure">Figure 4. Basic settings for DLL</p>
- <ol start="6">
- <li>Click Finish to generate the project. </li>
- <p>The simple “MyDynamicDLL” project is listed in the Project Explorer view with the set of files created for the project. </p>
- </ol>
- <p align="center" class="Image"><img src="../images/navigatorview.gif" alt="" width="342" height="387" border="0" /></p>
- <p align="center" class="figure">Figure 5. DLL example project in Project Explorer view</p>
- </div>
-<div id="footer">Copyright © 2010 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></div>
-
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<title>Simple Example Project in Getting Started</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/></head>
+<body>
+<h2>Simple DLL Example</h2>
+
+ <p>
+ This example walks through the process of creating a basic
+ “MyDynamicDLL” DLL project. </p>
+ <p>For more information on creating new projects of all types, see<b> </b><a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>. </p>
+ <div class="step">
+ <h4>Creating a DLL Project</h4>
+ <ol>
+ <li>Click <b>File > New > Symbian OS C++ Project</b> to invoke the <b>New</b> <b>Symbian OS C++ Project</b> wizard.</li>
+ <li>Select Basic dynamically linked library (DLL) project template and click Next.</li>
+ <p class="figure"><img src="../images/new_simple_project_01.png" width="409" height="503" alt="" /></p>
+ <p class="figure">Figure 1. Select Basic DLL template</p>
+ <li>Enter a project name and specify a workspace location to store the project. </li>
+ <p align="center"><img src="../images/new_simple_project_02.png" width="430" height="319"alt="" /></p>
+ <p align="center" class="figure">Figure 2. Project name and location information</p>
+ <li>Select the Symbian OS SDK and Build Configurations to use for this project, then click Next.</li>
+ <p align="center"><img src="../images/new_simple_project_03.png" width="403" height="397" alt="" /></p>
+ <p class="figure">Figure 3. SDK selection for project</p>
+ <li>Enter Specify UID2 as “0x0000008d”, your name as the Author and your Copyright notice.
+ For more details on UID2, see <a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>.
+ <p align="center"><img src="../images/new_simple_project_04.png" width="403" height="397" alt="" /></p>
+ </li>
+ </ol>
+ <p class="figure">Figure 4. Basic settings for DLL</p>
+ <ol start="6">
+ <li>Click Finish to generate the project. </li>
+ <p>The simple “MyDynamicDLL” project is listed in the Project Explorer view with the set of files created for the project. </p>
+ </ol>
+ <p align="center" class="Image"><img src="../images/navigatorview.gif" alt="" width="271" height="345" border="0" /></p>
+ <p align="center" class="figure">Figure 5. DLL example project in Project Explorer view</p>
+ </div>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/breakpoints.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/breakpoints.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,66 +1,66 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Breakpoints</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Breakpoints </h2>
-<p> A <b>breakpoint</b> is a marker set on a specific line of source code and is designed to halt program execution when encountered by the debugger. After you set a breakpoint at a key point in the program, you can halt its execution, examine its current state, and check register and variable values. You can also change values and alter the flow of normal program execution. Setting breakpoints helps you debug your program and verify its efficiency.</p>
-<p>A project can have multiple breakpoints set in the source code files. All breakpoints in a project are shown in the <a href="../reference/view_breakpoints.htm">Breakpoints</a> view. Breakpoints are enabled or disabled on the currently selected line within a source code editor by selecting the <b>Run > Toggle Breakpoint</b> menu option, right-clicking the marker bar in the editor and selecting <b>Toggle Breakpoint</b>, or by pressing <span class="code">CTRL-SHIFT-B</span>.</p>
-<p>You can set a breakpoint on any executable line of code that the debugger can resolve. Lines containing comments and other non executable code cannot be assigned a breakpoint as they are normally stripped from the compiled binary. The debugger must load the symbols for a module before it can attempt to resolve breakpoints within the module. This is most easily done using the <a href="../reference/view_executables.htm">Executables</a> view to import a binary file, especially if the binary is not in the workspace. </p>
-<p>When the debugger attempts to resolve a breakpoint it will result in:</p>
-<ul>
- <li><b>resolved</b> — the symbols for the module are loaded and the breakpoint located in the executable that’s currently being debugged, circle icon changes to flagged icon </li>
- <li><b>resolved and moved</b> —the breakpoint is not found in the executable at the specified point. Debugger moves breakpoint forward in the current function until a line is found that can be resolved. Breakpoint icon moved to source line matching new breakpoint location and changed to flagged icon.</li>
- <li><b>unresolved</b> — if the symbols for the module are not loaded or the breakpoint was not able to be set within the current function. This may indicate no executable code in the source line or a deadstripped function not present in the executable. Breakpoint icon remains in unflagged state indicating unresolved status.</li>
-</ul>
-<p>Breakpoints have enabled and disabled types as well as resolved and unresolved states. Table 1 explains the different breakpoint types and states.</p>
-<h5>Table 1 Breakpoint—type and states </h5>
-<table width="90%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="15%" scope="col">Type</th>
- <th width="14%" scope="col">State</th>
- <th width="14%" scope="col">Icon</th>
- <th width="71%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td>Enabled</td>
- <td><div align="center">Unresolved</div></td>
- <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_enabled_icon.png" width="9" height="10" /></div></td>
- <td>Indicates that the breakpoint is currently enabled but not located in the executable during a debug session. Debugger cannot halt program execution.</td>
- </tr>
- <tr>
- <td>Enabled</td>
- <td><div align="center">Resolved</div></td>
- <td><div align="center"> <img src="../images/icons/breakpoints_enabled_icon.png" width="15" height="12" /></div></td>
- <td>Indicates that the breakpoint is currently enabled and resolved for the source line. The debugger halts program execution at an enabled breakpoint. </td>
- </tr>
- <tr>
- <td>Disabled</td>
- <td><div align="center">Unresolved</div></td>
- <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_disabled_icon.png" width="12" height="11" /></div></td>
- <td>Indicates that the breakpoint is currently disabled but not located in the executable during a debug session. The debugger does not halt program execution at a disabled breakpoint.</td>
- </tr>
- <tr>
- <td>Disabled</td>
- <td><div align="center">Resolved</div></td>
- <td><div align="center"><img src="../images/icons/breakpoints_disabled_icon.png" width="15" height="12" /></div></td>
- <td>Indicates that the breakpoint is currently disabled and resolved for the source line. The debugger does not halt program execution at a disabled breakpoint.</td>
- </tr>
-</table>
-<p>Other references </p>
-<ul>
- <li><a href="../reference/view_executables.htm">Executables view</a></li>
- <li><a href="../tasks/breakpoints/pgm_bp_setting.htm">Setting Breakpoints</a></li>
- <li><a href="../tasks/breakpoints/pgm_bp_enable.htm">Enabling Breakpoints</a></li>
- <li><a href="../tasks/breakpoints/pgm_bp_disable.htm">Disabling Breakpoints</a></li>
- <li><a href="../tasks/breakpoints/pgm_bp_clearing.htm">Clearing Breakpoints</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Breakpoints Overview</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Breakpoints Overview</h2>
+<p> A <b>breakpoint</b> is a marker set on a specific line of source code and is designed to halt program execution when encountered by the debugger. After you set a breakpoint at a key point in the program, you can halt its execution, examine its current state, and check register and variable values. You can also change values and alter the flow of normal program execution. Setting breakpoints helps you debug your program and verify its efficiency.</p>
+<p>A project can have multiple breakpoints set in the source code files. All breakpoints in a project are shown in the <a href="../reference/view_breakpoints.htm">Breakpoints</a> view. Breakpoints are enabled or disabled on the currently selected line within a source code editor by selecting the <b>Run > Toggle Breakpoint</b> menu option, right-clicking the marker bar in the editor and selecting <b>Toggle Breakpoint</b>, or by pressing <span class="code">CTRL-SHIFT-B</span>.</p>
+<p>You can set a breakpoint on any executable line of code that the debugger can resolve. Lines containing comments and other non executable code cannot be assigned a breakpoint as they are normally stripped from the compiled binary. The debugger must load the symbols for a module before it can attempt to resolve breakpoints within the module. This is most easily done using the <a href="../reference/view_executables.htm">Executables</a> view to import a binary file, especially if the binary is not in the workspace. </p>
+<p>When the debugger attempts to resolve a breakpoint it will result in:</p>
+<ul>
+ <li><b>resolved</b> — the symbols for the module are loaded and the breakpoint located in the executable that’s currently being debugged, circle icon changes to flagged icon </li>
+ <li><b>resolved and moved</b> —the breakpoint is not found in the executable at the specified point. Debugger moves breakpoint forward in the current function until a line is found that can be resolved. Breakpoint icon moved to source line matching new breakpoint location and changed to flagged icon.</li>
+ <li><b>unresolved</b> — if the symbols for the module are not loaded or the breakpoint was not able to be set within the current function. This may indicate no executable code in the source line or a deadstripped function not present in the executable. Breakpoint icon remains in unflagged state indicating unresolved status.</li>
+</ul>
+<p>Breakpoints have enabled and disabled types as well as resolved and unresolved states. Table 1 explains the different breakpoint types and states.</p>
+<h5>Table 1 Breakpoint—type and states </h5>
+<table width="90%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="15%" scope="col">Type</th>
+ <th width="14%" scope="col">State</th>
+ <th width="14%" scope="col">Icon</th>
+ <th width="71%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td>Enabled</td>
+ <td><div align="center">Unresolved</div></td>
+ <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_enabled_icon.png" width="9" height="10" /></div></td>
+ <td>Indicates that the breakpoint is currently enabled but not located in the executable during a debug session. Debugger cannot halt program execution.</td>
+ </tr>
+ <tr>
+ <td>Enabled</td>
+ <td><div align="center">Resolved</div></td>
+ <td><div align="center"> <img src="../images/icons/breakpoints_enabled_icon.png" width="15" height="12" /></div></td>
+ <td>Indicates that the breakpoint is currently enabled and resolved for the source line. The debugger halts program execution at an enabled breakpoint. </td>
+ </tr>
+ <tr>
+ <td>Disabled</td>
+ <td><div align="center">Unresolved</div></td>
+ <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_disabled_icon.png" width="12" height="11" /></div></td>
+ <td>Indicates that the breakpoint is currently disabled but not located in the executable during a debug session. The debugger does not halt program execution at a disabled breakpoint.</td>
+ </tr>
+ <tr>
+ <td>Disabled</td>
+ <td><div align="center">Resolved</div></td>
+ <td><div align="center"><img src="../images/icons/breakpoints_disabled_icon.png" width="15" height="12" /></div></td>
+ <td>Indicates that the breakpoint is currently disabled and resolved for the source line. The debugger does not halt program execution at a disabled breakpoint.</td>
+ </tr>
+</table>
+<p>Other references </p>
+<ul>
+ <li><a href="../reference/view_executables.htm">Executables view</a></li>
+ <li><a href="../tasks/breakpoints/pgm_bp_setting.htm">Setting Breakpoints</a></li>
+ <li><a href="../tasks/breakpoints/pgm_bp_enable.htm">Enabling Breakpoints</a></li>
+ <li><a href="../tasks/breakpoints/pgm_bp_disable.htm">Disabling Breakpoints</a></li>
+ <li><a href="../tasks/breakpoints/pgm_bp_clearing.htm">Clearing Breakpoints</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,56 +1,56 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Active Build Configuration</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Active Build Configuration</h2>
-<p>Use the <b>Active Configuration</b> option in the <a href="../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> panel to specify the build target. Since a project can contain one or more build targets, the active configuration defines which build configuration to use when the project is run or debugged. A launch configuration consists of the following:</p>
-<ul>
- <li>a project</li>
- <li>a <a href="../projects/launch/launch_configs_overview.htm">build configuration</a> - a project level configuration that includes an SDK and any related files required to compile and build the project </li>
-</ul>
-<p>Build configurations are defined when the project is created. A project can have any number of build configurations and more can be <a href="../tasks/projects/prj_new_build_config.htm">added</a> as necessary. Each build configuration can have its own combination of tool settings to precisely control how it is defined and built. Build configurations are maintained in the project Properties window in the Carbide Build Configurations panel. To open the panel, select a project in the <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> or <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view and select <b>Project > Properties</b> or right-click and select Properties.</p>
-<p align="center"><img src="images/build_configs.png" width="795" height="679"></p>
-<p>You can select a build configuration in the <b>Active Configuration</b> dropdown list or use the <b>Project > Active Configuration</b> menu option to <a href="../tasks/projects/prj_set_build_tgt.htm">set</a> which build configuration to launch when running or debugging a program. The currently selected project can be launched by clicking the <b>Run</b> (<img src="../images/icons/btn_run.png" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) control on the tool bar to launch the project with the currently active build configuration. When no project is selected the last project debugged will be launched.</p>
-<p>If no <a href="../projects/launch/launch_configs_overview.htm">launch configuration</a> is present in the project, one is created on initial launch. Subsequent launches of the project will use either the last launch configuration or if more than one launch configuration exists, it uses the most correct one.</p>
-<p class="note"><b>NOTE</b> The Carbide <b>Run</b> and <b>Debug</b> buttons are shaded in blue to indicate their behavior differs from the standard Eclipse behavior.</p>
-<h5>Table 1 Carbide Build Configuration items </h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="20%" scope="col">Item</th>
- <th width="71%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td width="20%"><b>Active Configuration </b></td>
- <td>The <b>Active Configuration</b> drop down list allows you to <a href="../tasks/projects/prj_set_build_tgt.htm">select</a> a configuration that is currently available for the selected project. The entries in the related sub-panes will change according to the selected configuration. The Configuration name consists of a target name and an SDK identifier in brackets.</td>
- </tr>
- <tr>
- <td width="20%"><b>Manage...</b></td>
- <td>Click the <b>Manage</b>... button to <a href="../tasks/projects/prj_new_build_config.htm">add</a> a new SDK/Configuration or remove an existing configuration.</td>
- </tr>
-</table>
-<h5>Build Configuration Naming</h5>
-<p>When the Carbide.c++ IDE creates an build configuration it uses a standard naming convention to make it easy to identify. For example, <span class="code">HelloCarbide S60 5.0 Emulator Debug</span> is a typical configuration name. The default name follows the form of:</p>
-<ul>
- <li><span class="code"><Phone|Emulator> </span>The build target (Emulator, Phone, etc.)</li>
- <li><span class="code"><Debug|Release> </span>Debug (final file contains debug symbols) or Release version</li>
- <li><span class="code"><platform> </span>Platform on which you are building</li>
- <li><span class="code"><sdk ID from devices.xml> </span>The SDK and version used by the build configurations (S60, etc.)</li>
-</ul>
-<p>You can use the <a href="../reference/wnd_debug_configuration.htm">Debug</a> window to edit the default build configuration names.</p>
-<h5>Other references </h5>
-<ul>
- <li><a href="../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> </li>
- <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting an Active Configuration</a></li>
- <li><a href="../tasks/projects/prj_debug_config.htm">Creating Launch Configurations</a> </li>
- <li><a href="../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Active Build Configuration</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Active Build Configuration</h2>
+<p>Use the <b>Active Configuration</b> option in the <a href="../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> panel to specify the build target. Since a project can contain one or more build targets, the active configuration defines which build configuration to use when the project is run or debugged. A launch configuration consists of the following:</p>
+<ul>
+ <li>a project</li>
+ <li>a <a href="../projects/launch/launch_configs_overview.htm">build configuration</a> - a project level configuration that includes an SDK and any related files required to compile and build the project </li>
+</ul>
+<p>Build configurations are defined when the project is created. A project can have any number of build configurations and more can be <a href="../tasks/projects/prj_new_build_config.htm">added</a> as necessary. Each build configuration can have its own combination of tool settings to precisely control how it is defined and built. Build configurations are maintained in the project Properties window in the Carbide Build Configurations panel. To open the panel, select a project in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> or <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view and select <b>Project > Properties</b> or right-click and select Properties.</p>
+<p align="center"><img src="images/build_configs.png" width="801" height="350"></p>
+<p>You can select a build configuration in the <b>Active Configuration</b> group or use the <b>Project > Active Configuration</b> menu option to <a href="../tasks/projects/prj_set_build_tgt.htm">set</a> which build configuration to launch when running or debugging a program. The currently selected project can be launched by clicking the <b>Run</b> (<img src="../images/icons/btn_run.png" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) control on the tool bar to launch the project with the currently active build configuration. When no project is selected the last project debugged will be launched.</p>
+<p>If no <a href="../projects/launch/launch_configs_overview.htm">launch configuration</a> is present in the project, one is created on initial launch. Subsequent launches of the project will use either the last launch configuration or if more than one launch configuration exists, it uses the most correct one.</p>
+<p class="note"><b>NOTE</b> The Carbide <b>Run</b> and <b>Debug</b> buttons are shaded in blue to indicate their behavior differs from the standard Eclipse behavior.</p>
+<h5>Table 1 Build Configuration items </h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="20%" scope="col">Item</th>
+ <th width="71%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td width="20%"><b>Configuration </b></td>
+ <td>The <b> Configuration</b> drop down list allows you to <a href="../tasks/projects/prj_set_build_tgt.htm">select</a> a configuration that is currently available for the selected project. The entries in the related sub-panes will change according to the selected configuration. The Configuration name consists of a target name and an SDK identifier in brackets.</td>
+ </tr>
+ <tr>
+ <td width="20%"><b>Manage...</b></td>
+ <td>Click the <b>Manage</b>... button to <a href="../tasks/projects/prj_new_build_config.htm">add</a> a new SDK/Configuration or remove an existing configuration.</td>
+ </tr>
+</table>
+<h5>Build Configuration Naming</h5>
+<p>When the Carbide.c++ IDE creates an build configuration it uses a standard naming convention to make it easy to identify. For example, <span class="code">HelloCarbide (armv5_udeb) Emulator Debug</span> is a typical configuration name. The default name follows the form of:</p>
+<ul>
+ <li><span class="code"><Phone|Emulator> </span>The build target (Emulator, Phone, etc.)</li>
+ <li><span class="code"><Debug|Release> </span>Debug (final file contains debug symbols) or Release version</li>
+ <li><span class="code"><platform_build> </span>Platform on which you are building (<span class="code">winscw_urel</span>, <span class="code">armv5_udeb</span>)</li>
+ <li><span class="code"><sdk ID from devices.xml> </span>The SDK and version used by the build configurations (Symbian3, etc.)</li>
+</ul>
+<p>You can use the <a href="../reference/wnd_debug_configuration.htm">Debug</a> window to edit the default build configuration names.</p>
+<h5>Other references </h5>
+<ul>
+ <li><a href="../reference/build_properties/pane_build_config.htm">Build Configurations</a> </li>
+ <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting an Active Configuration</a></li>
+ <li><a href="../tasks/projects/prj_debug_config.htm">Creating Launch Configurations</a> </li>
+ <li><a href="../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,71 +1,71 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Supported Target Types</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {color: #999999}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Supported Target Types</h2>
-<p> Carbide.c++ supports a variety of build targets based upon the SDKs and which version of the Carbide tools used by the project. The table below identifies which build targets are possible for a specific SDK.</p>
-<p class="note"><b>NOTE</b> Check the <a href="../reference/SDKPreferences.html">SDK Preferences</a> page to see if an SDK you have installed and whether its build configurations are supported.</p>
-<h5>Table 1. Supported target types for all versions of Carbide.c++ </h5>
-<table width="87%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="17%" rowspan="2" valign="middle" scope="col">Target Types </th>
- <th colspan="2" scope="col">Platform Security<br />
-(S60 3.2, S60 5.0) </th>
- </tr>
- <tr>
- <th width="15%" valign="middle" scope="col"><div align="center">RAPTOR, GCCE, ARMV5, ARMV5_ABIV2</div></th>
- <th width="17%" valign="middle" scope="col"><div align="center">WINSCW <br />
- (EKA2)</div></th>
- </tr>
- <tr>
- <td>APP (DLL) </td>
- <td bgcolor="#FFFFCC"><div align="center"><span class="style2"></span></div></td>
- <td bgcolor="#FFFFCC"><div align="center"><span class="style1"><span class="style2"></span></span></div></td>
- </tr>
- <tr>
- <td>DLL</td>
- <td><div align="center">Yes</div></td>
- <td><div align="center">Yes</div></td>
- </tr>
- <tr>
- <td>EXE (console) </td>
- <td><div align="center">Yes</div></td>
- <td><div align="center">Yes</div></td>
- </tr>
- <tr>
- <td>EXE (OS 9.1 GUI) </td>
- <td bgcolor="#FFFFFF"><div align="center">Yes</div></td>
- <td><div align="center">Yes</div></td>
- </tr>
- <tr>
- <td>Polymorphic DLL </td>
- <td><div align="center">Yes</div></td>
- <td><div align="center">Yes</div></td>
- </tr>
- <tr>
- <td>STDLIB</td>
- <td><div align="center">Yes</div></td>
- <td><div align="center">Yes</div></td>
- </tr>
-</table>
-<h5>Related tasks</h5>
-<ul>
- <li><a href="../tasks/sdks/sdk_add_custkits.htm">Adding Symbian Custom Kits</a></li>
- <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting Build Configurations</a></li>
- <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Supported Target Types</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style1 {color: #999999}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Supported Target Types</h2>
+<p> Carbide.c++ supports a variety of build targets based upon the SDKs and which version of the Carbide tools used by the project. The table below identifies which build targets are possible for a specific SDK.</p>
+<p class="note"><b>NOTE</b> Check the <a href="../reference/SDKPreferences.html">SDK Preferences</a> page to see if an SDK you have installed and whether its build configurations are supported.</p>
+<h5>Table 1. Supported target types for all versions of Carbide.c++ </h5>
+<table width="87%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="17%" rowspan="2" valign="middle" scope="col">Target Types </th>
+ <th colspan="2" scope="col">Platform Security<br />
+(S60 5.0, Symbian ^3) </th>
+ </tr>
+ <tr>
+ <th width="15%" valign="middle" scope="col"><div align="center">RAPTOR, GCCE, ARMV5, ARMV5_ABIV2</div></th>
+ <th width="17%" valign="middle" scope="col"><div align="center">WINSCW <br />
+ (EKA2)</div></th>
+ </tr>
+ <tr>
+ <td>APP (DLL) </td>
+ <td bgcolor="#FFFFCC"><div align="center"><span class="style2"></span></div></td>
+ <td bgcolor="#FFFFCC"><div align="center"><span class="style1"><span class="style2"></span></span></div></td>
+ </tr>
+ <tr>
+ <td>DLL</td>
+ <td><div align="center">Yes</div></td>
+ <td><div align="center">Yes</div></td>
+ </tr>
+ <tr>
+ <td>EXE (console) </td>
+ <td><div align="center">Yes</div></td>
+ <td><div align="center">Yes</div></td>
+ </tr>
+ <tr>
+ <td>EXE (OS 9.1 GUI) </td>
+ <td bgcolor="#FFFFFF"><div align="center">Yes</div></td>
+ <td><div align="center">Yes</div></td>
+ </tr>
+ <tr>
+ <td>Polymorphic DLL </td>
+ <td><div align="center">Yes</div></td>
+ <td><div align="center">Yes</div></td>
+ </tr>
+ <tr>
+ <td>STDLIB</td>
+ <td><div align="center">Yes</div></td>
+ <td><div align="center">Yes</div></td>
+ </tr>
+</table>
+<h5>Related tasks</h5>
+<ul>
+ <li><a href="../tasks/sdks/sdk_add_custkits.htm">Adding Symbian Custom Kits</a></li>
+ <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting Build Configurations</a></li>
+ <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/concepts.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/concepts.htm Wed Jul 21 12:11:48 2010 -0500
@@ -16,7 +16,7 @@
functionality provided by Eclipse and the C/C++ Development Toolkit (CDT). </p>
<p> The plug-ins simplify Symbian OS development by removing the need to use
command line build tools, and provide a graphical interface to Symbian OS
- specific file formats, such as AIF and MBM. </p>
+ specific file formats, such as MBM. </p>
<p> The plug-ins provide a new perspective, called the <a href="CarbidePerspective.html">Carbide.c++ Perspective</a>, on
the Eclipse workbench. This perspective enhances the standard CDT C/C++
perspective by allowing you to select easily the SDKs and build target types
@@ -24,11 +24,9 @@
<p> The following topics discuss these concepts in more detail: </p>
<ul>
<li><a href="build_configurations.htm">Active Build Configuration</a></li>
- <li><a href="AIFDefWizard.html">AIF File</a></li>
<li><a href="breakpoints.htm">Breakpoints</a></li>
<li><a href="build_targets.htm">Build Targets</a></li>
<li><a href="macros_carbide.htm">Carbide Macros</a></li>
- <li><a href="cvs.htm">Concurrent Versions System (CVS)</a></li>
<li><a href="contextual_menus.htm">Context menu support</a></li>
<li><a href="dependency_tracking.htm">Dependency Tracking</a></li>
<li><a href="emulators.htm">Emulation Debugging</a></li>
@@ -41,6 +39,7 @@
<li><a href="precompiled_headers.htm">Precompiled Headers</a></li>
<li><a href="registers.htm">Registers</a></li>
<li><a href="../tasks/WorkingwithSDKs.html">SDK Support</a></li>
+ <li><a href="cvs.htm">Software Configuration Management </a></li>
<li><a href="symbols_pkg.htm">Symbols, .pkg</a></li>
<li><a href="workspaces.htm">Workspace Information</a></li>
</ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/contextual_menus.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/contextual_menus.htm Wed Jul 21 12:11:48 2010 -0500
@@ -21,7 +21,7 @@
</ul>
<p class="note"><b>TIP</b> Experiment using the context menu in various views to discover additional capabilities.</p>
<p>Figure 1 shows a sample context menu in the Breakpoints view.</p>
-<p align="center"><img src="images/breakpt_popup_menu.png" width="236" height="260" /></p>
+<p align="center"><img src="images/breakpt_popup_menu.png" width="155" height="187" /></p>
<p class="figure">Figure 1 - Example context menu in Breakpoints view </p>
<div class="step">
<h4>Using Context Menus</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/cvs.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/cvs.htm Wed Jul 21 12:11:48 2010 -0500
@@ -4,13 +4,25 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Concurrent Versions System (CVS)</title>
+<title>Software Configuration Management</title>
<link rel="StyleSheet" href="../../book.css" type="text/css"/>
</head>
<body bgcolor="#FFFFFF">
-<h2>Concurrent Versions System (CVS) </h2>
-<p>Carbide.c++ supports the Concurrent Versions System (<a href="http://www.nongnu.org/cvs/">CVS</a>) for immediate version control support. Other revision systems are also supported but require the downloading of an Eclipse plug-in to add that feature to Carbide. Visit the <a href="http://www.eclipse.org">eclipse.org</a> or <a href="http://eclipse-plugins.2y.net">eclipse-plugins.2y.net</a> sites to locate the plug-ins you need. </p>
-<p>For more informaton on using CVS within Carbide, see the <b>Workbench User Guide > Concepts > Team programming with CVS</b>.</p>
+<h2>Software Configuration Management (SCM) </h2>
+<p>The <strong>Carbide.c++</strong> tools are built on top of the <strong>Eclipse</strong> and <strong>CDT</strong> open source projects (<a href="http://www.eclipse.org">eclipse.org</a>). Carbide can use several popular <a href="http://en.wikipedia.org/wiki/Software_configuration_management">software configuration management</a> systems including:</p>
+<ul>
+ <li><a href="http://en.wikipedia.org/wiki/Apache_Subversion">Apache Subversive</a></li>
+ <li><a href="tp://www.nongnu.org/cvs/">CVS</a> (<em>plug-in included with Carbide</em>)</li>
+ <li><a href="http://en.wikipedia.org/wiki/Git_(software)">Git</a></li>
+ <li><a href="http://en.wikipedia.org/wiki/Clearcase">IBM Rational Clearcase</a></li>
+ <li><a href="http://en.wikipedia.org/wiki/Mercurial">Mercurial</a></li>
+ <li><a href="http://en.wikipedia.org/wiki/Perforce">Perforce</a></li>
+</ul>
+<p>Other revision systems are also supported but require the downloading of an Eclipse plug-in to add that capability to Carbide. Visit the <a href="http://eclipse-plugins.2y.net">eclipse-plugins.2y.net</a> sites to locate the plug-ins you need.</p>
+<h2>Using SCM in Carbide</h2>
+<p>The SCM you install normally adds its commands to the <strong>Team</strong> sub-menu in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view's context menu (Figure 1). Some SCM's install their own menu to Carbide. If this is the case, refer to the documentation included with the plug-in for details.</p>
+<p align="center"><img src="../reference/images/menu_team_commands.png" alt="Team commands" width="739" height="607"></p>
+<p class="figure">Figure 1. Team sub-menu</p>
<div class="step">
<div id="footer">Copyright © 2010 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></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/dependency_tracking.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Dependency Tracking</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Dependency Tracking</h2>
-<p> This section only applies to the SBSv1 (abld) build system. If you are using the Raptor (SBSv2) build system Carbide does not perform any build system modifications to optimize dependency tracking.</p>
-<p>Carbide has made some performance improvements over command-line builds when performing incremental builds. Once a project has been built, many users invoke 'abld build' on their project, not knowing that their makefiles are regenerated each time, taking a large performance hit. Although a command-line user can invoke 'abld target' to improve incremental build performance, Carbide invokes each build stage independently for a full incremental build (including the 'abld makefile' stage). In order to get around this performance hit from the IDE, Carbide manages the source and resource dependencies in separate <span class="style1">.d</span> (dependency) files generated under the build system. Then Carbide makes a small modification to each component's (MMP) makefile under the <span class="style1">\epoc32\build</span>\ directory by including the generated .d files as dependency includes. This performance modification makes incremental builds faster from Carbide.</p>
-<p>Normally, you do not need to know the details of dependency management unless you first build from the command-line and then try to build their project from the IDE. When this happens, Carbide will prompt you with the <b>Project rebuild notification</b> dialog when you initiate a build from the IDE.</p>
-<p align="center"><img src="images/deps_track_query.png" width="483" height="203"></p>
-<p align="left" class="figure">Figure 1 -Dependency Tracking dialog</p>
-<p>It is recommended you choose the <strong>Improve Carbide build times</strong> option if you plan to continue building in Carbide. However, be cautious of this as Carbide will remove all the object code and build everything from scratch. </p>
-<p>If you choose the option <strong>Do not update dependencies</strong>, Carbide disables the option to manage dependencies under the <b><a href="../reference/build_properties/pane_project_settings.htm">Carbide Project Settings</a></b>, <strong>SBSv1</strong> tab. </p>
-<h5>Related references <b></b></h5>
-<ul>
- <li><a href="../reference/build_properties/pane_project_settings.htm">Carbide Project Settings</a></li>
- <li><a href="../reference/wnd_build_prefs.htm">Carbide Global Build Settings</a> </li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/ext_build_support.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/ext_build_support.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,7 +9,7 @@
</head>
<body bgcolor="#FFFFFF">
<h2>External Builds Support</h2>
-<p> The IDE will perform the following tasks on external makefiles:</p>
+<p> The Carbide IDE performs the following tasks on external makefiles:</p>
<ul>
<li>Build</li>
<li>Debug</li>
@@ -17,10 +17,10 @@
<li>Source Browsing</li>
<li>Error Lookup</li>
</ul>
-<p>The IDE can build an external makefile and debug its output. A linker plugin will enable the IDE to manage a command line and targets associated with a makefile. The command line is executed when a build step is initiated. The linker plugin will also supply the executable to use for debugging.</p>
-<p>The linker plugin will provide a preference panel named External Build that is used to configure a target. The preference panel provides text fields for you to configure the command line for the target (which will enable building), specify the working directory and the output file used to launch a debugging session, and the debug platform.</p>
+<p>Carbide can build an external makefile and debug its output. A linker plugin enables Carbide to manage a command line and targets associated with a makefile. The command line is executed when a build step is initiated. The linker plugin will also supply the executable to use for debugging.</p>
+<p>The linker plugin provides a preference panel named <strong>External Build</strong> that is used to configure a target. The preference panel provides text fields for you to configure the command line for the target (which will enable building), specify the working directory and the output file used to launch a debugging session, and the debug platform.</p>
<p>The linker plugin is generic so that it can be used regardless of the target CPU and OS. The list of available debugger preference panels will be updated by the IDE when you select the debug platform.</p>
-<p>The External Build Target preference panel will collect the following information:</p>
+<p>The <strong>External Build Target</strong> preference panel collects the following information:</p>
<ul>
<li>Build command line to be executed in the build step</li>
</ul>
@@ -38,12 +38,12 @@
<p>If multiple build steps are performed on the same target, the output from each build step will be appended to the build output window. Each block of output will be separated by “----Build started----” and “----Done----” tags.</p>
<p>The build output window will allow users to navigate directly to the location of a compilation error. Double-click a line that contains an error message or press Enter when the cursor is in the line. If the IDE determines that a valid error message exists on the selected line, the source file is opened to the line on which the error occurred.</p>
<p>Click the right mouse button in the build output window to display a context menu.</p>
+ <ul>
+ <li>The <strong>Copy</strong> command copies selected text to the clipboard. If no text is selected then the line that contains the cursor is copied.</li>
+ <li>The <strong>Clear All</strong> command clears the contents of output window.</li>
+ <li>The <strong>Go To Error</strong> command navigates to the error location. This is identical to double-clicking.</li>
+ </ul>
</blockquote>
-<ul>
- <li>The Copy command will copy selected text to the clipboard. If no text is selected then the line that contains the cursor will be copied.</li>
- <li>The Clear All command will clear contents of output window.</li>
- <li>The Go To Error command will navigate to the error location. This is identical to double-clicking.</li>
-</ul>
<div id="footer">Copyright © 2010 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></div>
</body>
Binary file core/com.nokia.carbide.cpp.doc.user/html/concepts/images/build_configs.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/concepts/images/deps_track_query.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/concepts/images/wnd_workspace_launcher.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/concepts/images/workbench.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm Wed Jul 21 12:11:48 2010 -0500
@@ -17,12 +17,12 @@
<li>Install the N-Gage SDK on your PC</li>
<li>Place your game project inside the N-Gage SDK</li>
<li> In Carbide.c++, click<b> File > <a href="../tasks/ImportingProjects.html">Import</a></b></li>
- <li>Select <b>Symbian OS Bld.inf</b> importer and navigate to your bld.inf file to import it </li>
+ <li>Select <b>Symbian OS Bld.inf</b> <strong>File</strong> importer and navigate to your <span class="code">bld.inf</span> file to import it </li>
</ol>
<h4>Building the N-Gage project</h4>
<p>Once the game project has been imported, use these steps to create an N-GAGE game file:</p>
<ol>
- <li>Right-click the project and choose <b>Properties</b> to open the <b>Properties for <i>project_name</i></b> window </li>
+ <li>Right-click the project name and choose <b>Properties</b> to open the <b>Properties for <i>project_name</i></b> window </li>
<li>In the <b>Carbide.c++ > Carbide Build Configuration > <a href="../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a></b> panel, click <b>Add</b>.</li>
<li>In the <b><a href="../reference/build_properties/wnd_sis_properties.htm">SIS Properties</a></b> window:
<ol>
@@ -67,10 +67,10 @@
<h4>Debugging the Game project</h4>
<p>With your game file installed on the device, create a launch configuration for the project. In Carbide:</p>
<ol>
- <li>Open<span class="note"><b>Window > Preferences > Run/Debug ><img src="../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel </span>and disable the <b>Build (if required) before launching</b> option</li>
- <li>Right-click the project and choose <b>Debug As > Debug As</b> to open the <b><a href="../reference/wnd_debug_configuration.htm">Debug</a></b> window</li>
- <li><a href="../tasks/projects/prj_debug_config.htm">Create</a> an <b>Application TRK</b> launch configuration
- <ul>
+ <li>Open <span class="note"><b>Window > Preferences > Run/Debug ><img src="../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel </span>and disable the <b>Build (if required) before launching</b> option under the General Options group</li>
+ <li>Right-click the project and choose <b>Debug As > Debug Configuration</b> to open the <b><a href="../reference/wnd_debug_configuration.htm">Debug Cinfigurations</a></b> window</li>
+ <li><a href="../tasks/projects/prj_debug_config.htm">Create</a> an <b>Symbian OS Application TRK</b> launch configuration
+ <ul>
<li>In the <b><a href="../projects/launch/page_connection.htm">Connection</a></b> tab select the COM port used to connect to the device. </li>
<li> In the <b><a href="../projects/launch/page_installation.htm">Installation</a></b> tab, verify that the game SISX file is correct </li>
<li>In the <b><a href="../projects/launch/page_debugger.htm">Debug</a></b> tab, enable the View messges between PC and debug agent on the phone if you want to monitor communications between TRK and Carbide </li>
@@ -82,13 +82,13 @@
<p>The Debugger launches the game project in the device and halts when it encounters the breakpoint you set. </p>
<h3>For Emulator Debugging </h3>
<h4>Deploying and debugging the N-Gage project on an emulator</h4>
-<p>With your game file installed to the emulator, create a launch configuration for the project. In Carbide:</p>
+<p>With your game file installed on the emulator, create a launch configuration for the project. In Carbide:</p>
<ol>
- <li>Open <b>Window > Preferences > Run/Debug > Launching</b> and disable the <b>Build (if required) before launching</b> option</li>
- <li>Right-click the project and choose <b>Debug As > Debug As</b> to open the <b>Debug</b> window</li>
+ <li>Open <b>Window > Preferences > Run/Debug > Launching</b> and disable the <b>Build (if required) before launching</b> option under the General Options group</li>
+ <li>Right-click the project and choose <b>Debug As > Debug Configurations</b> to open the <b>Debug Configurations</b> window</li>
<li>Create an <b>Symbian OS Emulation </b> launch configuration</li>
<li>Click <b>Debug</b> to launch the emulator </li>
- <li>In the emulator, select <b>File > Open</b>, locate and select the .N-GAGE installation file and click <b>Open</b> to install the project </li>
+ <li>In the emulator, select <b>File > Open</b>, locate and select the <span class="code">.N-GAGE</span> installation file and click <b>Open</b> to install the project </li>
<li>Open the Installation folder, launch the N-Gage runtime application</li>
<li>In the N-Gage runtime launch the game </li>
<li>If any breakpoint is hit in the game project, the debugger suspends</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/templates.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/templates.htm Wed Jul 21 12:11:48 2010 -0500
@@ -29,9 +29,8 @@
<td><b>S60 </b></td>
<td><ul>
<li> GUI Application</li>
- <li> GUI Application with UI Designer</li>
- <li>Open C Console application - project template based on industry-standard POSIX and middleware C libraries for S60 </li>
- </ul></td>
+ <li> Open C Console application - project template based on industry-standard POSIX and middleware C libraries for S60 </li>
+ </ul></td>
</tr>
<tr>
<td><b>Tutorials</b></td>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html Wed Jul 21 12:11:48 2010 -0500
@@ -20,7 +20,7 @@
something like this:</p>
<div class="Figure">
- <p class="Image"><img src="images/workbench.png" width="815" height="638" /></p>
+ <p class="Image"><img src="images/workbench.png" width="1028" height="789" /></p>
</div>
@@ -37,7 +37,7 @@
<li>
<p>
Create new Symbian OS projects using the New command, which is available on the File menu, and on the
- pop-up menus of the C/C++ Projects and Navigator views.</p>
+ pop-up menus of the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> and <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> views.</p>
<p>
For more information, see <a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>.
</p>
@@ -45,19 +45,17 @@
<li>
<p>
Import existing projects from Symbian OS bld.inf files using the Import command, which is
- available on the File menu, and on the pop-up menus of the C/C++ Projects and Navigator views.</p>
+ available on the File menu, and on the pop-up menus of the Project Explorer and Symbian Project Navigator views.</p>
<p>
For more information, see <a href="../tasks/ImportingProjects.html">Importing Projects from a Bld.Inf File</a>.
</p>
</li>
<li>
<p>
- Add scalable graphics (MIF), Symbian OS bitmaps (MBM) and application information (AIF)
- resources to projects, and edit these resources. You can add these using the New command, which is available on the File menu, and on the pop-up menus of the C/C++ Projects and Navigator views. MBM, MIF and AIF editors are provided to modify
+ Add scalable graphics (MIF) and Symbian OS bitmaps (MBM) to projects, and edit these resources. You can add these using the New command, which is available on the File menu, and on the pop-up menus of the Project Explorer and Symbian Project Navigator views. MBM and MIF editors are provided to modify
the resources.</p>
<p>
- For more information, see <a href="../tasks/Multi-BitmapFile.html">Creating an MBM File</a> and <a href="../tasks/AppInfoFile.html">Creating an AIF File</a>.
- </p>
+ For more information, see <a href="../tasks/Multi-BitmapFile.html">Creating an MBM File</a>. </p>
</li>
<li>
<p>
@@ -75,8 +73,8 @@
<ul>
<li>
<p>
- Configure the SDKs that are available for use with Carbide.c++ in the SDK Preferences settings. Select Window
- > Preferences, expand the Carbide.c++ group and select SDK Preferences.</p>
+ Configure the SDKs that are available for use with Carbide.c++ in the SDK Preferences settings. Select <strong>Window
+ > Preferences</strong>, expand the Carbide.c++ group and select SDK Preferences.</p>
<p>
For more information, see <a href="../tasks/RmvngandVwngPropsosSDK.html">SDK Properties</a>.</p>
</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/watchpoints.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/watchpoints.htm Wed Jul 21 12:11:48 2010 -0500
@@ -5,7 +5,7 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
<title>Watchpoints Overview</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
</head>
<body bgcolor="#FFFFFF">
<h2>Watchpoints Overview </h2>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_data.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_data.htm Wed Jul 21 12:11:48 2010 -0500
@@ -10,8 +10,7 @@
<body bgcolor="#FFFFFF">
<h2>Working with Debugger Data</h2>
<p> This section explains how to work with data that the Carbide.c++ debugger generates. The following windows show various types of debugger data.</p>
-<ul><li><a href="../reference/view_system_browser.htm">System Browser Window</a> view —shows individual processes and tasks that the debugger can control</li>
- <li><a href="../reference/view_log.htm">Console view</a> —shows messages generated during the debugging session</li>
+<ul><li><a href="../reference/view_log.htm">Console view</a> —shows messages generated during the debugging session</li>
</ul>
<div id="footer">Copyright © 2010 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></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/workspaces.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/workspaces.htm Wed Jul 21 12:11:48 2010 -0500
@@ -18,7 +18,9 @@
<body bgcolor="#FFFFFF">
<h2>Workspace Information </h2>
<p>A workspace is the default place to store and create resources like projects, folders, and files. These are then presented to the user in a perspective which enables the presentation and manipulation of the stored resources.</p>
-<p> When Carbide is launched it asks for a workspace to open. As you can have multiple workspaces, all independent from each other, choosing the workspace containing the projects to work on is important. Projects within a workspace are shown in the Carbide workbench within the <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/cnav.htm">Project Explorer</a> and <a href="../reference/view_cpp_projects.htm">C/C++ Project</a> views. When you create a new project it is automatically added to the currently open workspace. You can import existing projects into a workspace from INF files.</p>
+<p>When Carbide is launched it asks for a workspace to open (Figure 1). As you can have multiple workspaces, all independent from each other, choosing the workspace containing the projects to work on is important. Projects within a workspace are shown in the Carbide workbench within the <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/cnav.htm">Project Explorer</a> and <a href="../reference/view_cpp_projects.htm">C/C++ Project</a> views. When you create a new project it is automatically added to the currently open workspace. You can import existing projects into a workspace from INF files.</p>
+<p align="center"><img src="images/wnd_workspace_launcher.png" alt="Workspace Launcher dialog" width="630" height="291"></p>
+<p class="figure">Figure 1. Workspace Launcher dialog</p>
<p class="note"><span class="style1">WARNING</span> Bld.inf imported projects are not copied, so do not delete the contents when deleting the project.</p>
<p>Projects in one workspace cannot refer to projects in a different workspace. Thus, large projects spanning folders outside of the workspace are not handled at all. Storing all the project files in the workspace makes managing them easier from a project management perspective. Files accessible inside the workspace, like project source and resource files, are better supported than those outside the workspace (for example, SDK headers). Local History, CVS, MMP/bld.inf editors, etc. are available for files inside the workspace but not for those outside the workspace. </p>
<p class="note"><b>NOTE</b> Carbide automatically updates MMP and INF files as changes are made within the MMP and INF editors.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml Wed Jul 21 12:11:48 2010 -0500
@@ -6,7 +6,6 @@
<!-- Includes context help references for: -->
<!-- plugin="com.nokia.carbide.cdt.builder" -->
<!-- plugin="com.nokia.carbide.cdt.rombuilder" -->
-<!-- plugin="com.nokia.carbide.cpp.leavescan" -->
<!-- plugin="com.nokia.carbide.cpp.project.ui" -->
<!-- plugin="com.nokia.carbide.cpp.sdk.ui" -->
<!-- plugin="com.nokia.carbide.remoteConnections" -->
@@ -15,6 +14,7 @@
<!-- plugin="com.nokia.carbide.cpp.builder.utils" -->
<!-- plugin="com.nokia.carbide.cpp.news.reader" -->
<!-- plugin="com.nokia.search.system" -->
+<!-- plugin="com.nokia.carbide.discovery.ui" -->
<!-- =============================================================================== -->
<contexts>
@@ -97,17 +97,6 @@
<!-- =============================================================================== -->
-<!-- PLUGIN: com.nokia.carbide.cpp.leavescan -->
-<!-- =============================================================================== -->
-
- <!-- LEAVESCAN PREF PANEL -->
- <context id="leavescan_prefs_page" >
- <description>Specify the Leavescan directory.</description>
- <topic label="Leavescan Preferences" href="html/reference/leavescan_pref.html"/>
- </context>
-
-
-<!-- =============================================================================== -->
<!-- PLUGIN: com.nokia.carbide.cpp.project.ui -->
<!-- =============================================================================== -->
@@ -360,19 +349,10 @@
<topic label="MBM/MIF Editor" href="html/reference/view_mifdef_editor.htm" />
</context>
- <!-- AIF Editor -->
- <context id="aif_editor_dialog" >
- <description>Use the AIF editor to specify the Symbian OS resource file and bitmaps that should be included in a Symbian OS application information (AIF) file.</description>
- <topic label="AIF Editor" href="html/reference/AIFEditor.html" />
- <topic label="AIF File" href="html/concepts/AIFDefWizard.html" />
- <topic label="Creating an AIF File" href="html/tasks/AppInfoFile.html" />
- </context>
-
<!-- Image Editor add images from project -->
<context id="add_project_images_dialog" >
<description>Use the add image from project dialog to search for image files in your project.</description>
<topic label="Add Images from Project" href="html/reference/add_from_project.htm" />
- <topic label="AIF Editor" href="html/reference/AIFEditor.html" />
<topic label="MBM Editor" href="html/reference/MBMEditor.html" />
<topic label="MBM/MIF Editor" href="html/reference/view_mifdef_editor.htm" />
</context>
@@ -381,7 +361,6 @@
<context id="add_filesystem_images_dialog" >
<description>Use the add image from file system dialog to search for image files on your file system.</description>
<topic label="Add Images from Filesystem" href="html/reference/add_from_filesys.htm" />
- <topic label="AIF Editor" href="html/reference/AIFEditor.html" />
<topic label="MBM Editor" href="html/reference/MBMEditor.html" />
<topic label="MBM/MIF Editor" href="html/reference/view_mifdef_editor.htm" />
</context>
@@ -615,4 +594,14 @@
<topic label="Carbide.c++ News preferences" href="html/reference/prefs_carbide_news.htm"/>
</context>
+<!-- =============================================================================== -->
+<!-- PLUGIN: com.nokia.carbide.discovery.ui -->
+<!-- =============================================================================== -->
+
+ <!-- INSTALL EXTENSIONS VIEW (added v3.0.0) -->
+ <context id="catalogviewer" >
+ <description>Locate, download, and install Carbide plug-ins.</description>
+ <topic label="Install Extensions view" href="html/reference/view_install_extensions.htm"/>
+ </context>
+
</contexts>
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml Wed Jul 21 12:11:48 2010 -0500
@@ -20,8 +20,12 @@
<!-- DEBUG VIEW -->
<context id="debug_view_context" >
<description>The Debug view shows the target debugging information in a tree hierarchy.</description>
- <topic label="Debug view" href="html/reference/view_debug.htm" />
- <topic label="Controlling debugger execution" href="html/concepts/working_with_debugger.htm" />
+ <topic label="Debug view" href="html/debugger/debug/viewing_debug.htm" />
+ <topic label="Debug Overview" href="html/debugger/debug/debug.htm" />
+ <topic label="Starting & Stopping" href="html/debugger/debug/cmds_starting.htm" />
+ <topic label="Stepping" href="html/debugger/debug/cmds_stepping.htm" />
+ <topic label="Suspending & Resuming" href="html/debugger/debug/cmds_resuming.htm" />
+ <topic label="Other Actions" href="html/debugger/debug/cmds_other.htm" />
</context>
@@ -29,9 +33,8 @@
<!-- VARIABLES VIEW -->
<context id="variable_view_context" >
<description>Use the Variables view to manipulate the variables or variable hierarchy used in source code.</description>
- <topic label="Variables view" href="html/reference/view_variables.htm" />
- <topic label="Show Variables View" href="html/tasks/variables/show_variables_view.htm" />
- <topic label="Showing Global Variables" href="html/tasks/variables/show_global_variables.htm" />
+ <topic label="Variables view" href="html/debugger/variables/viewing_variables.htm" />
+ <topic label="Adding Global Variables" href="html/debugger/variables/adding_variables.htm" />
</context>
@@ -39,8 +42,10 @@
<!-- BREAKPOINTS VIEW -->
<context id="breakpoint_view_context" >
<description>Use the Breakpoints view to examine, enable or disable the breakpoints in one or more build configurations.</description>
- <topic label="Breakpoints view" href="html/reference/view_breakpoints.htm" />
- <topic label="Breakpoints" href="html/concepts/breakpoints.htm" />
+ <topic label="Breakpoints view" href="html/debugger/breakpoints/viewing_breakpoints.htm" />
+ <topic label="Breakpoints Overview" href="html/concepts/breakpoints.htm" />
+ <topic label="Enabling, Disabling and Removing Breakpoints" href="html/debugger/breakpoints/toggling_breakpoints.htm" />
+ <topic label="Breakpoint Status Indicators " href="html/debugger/breakpoints/resolving_breakpoints.htm" />
</context>
@@ -48,10 +53,18 @@
<!-- EXPRESSIONS VIEW -->
<context id="expression_view_context" >
<description>Use the Expressions view to monitor and manipulate variables, structures, and arrays.</description>
- <topic label="Expressions view" href="html/reference/view_expressions.htm" />
- <topic label="Adding Expressions" href="html/tasks/expressions/expr_adding.htm" />
- <topic label="Editing Expressions" href="html/tasks/expressions/expr_editding.htm" />
- <topic label="Removing Expressions" href="html/tasks/expressions/expr_removing.htm" />
+ <topic label="Expressions view" href="html/debugger/variables/viewing_expressions.htm" />
+ <topic label="Adding Expressions" href="html/debugger/variables/adding_expressions.htm" />
+ <topic label="Editing Expressions" href="html/debugger/variables/editing_expressions.htm" />
+ </context>
+
+
+ <!-- ============================================================== -->
+ <!-- FIND DIALOG VAR/EXPR VIEW -->
+ <context id="find_element_dialog_context" >
+ <description>Find elements in view.</description>
+ <topic label="Expressions view" href="html/debugger/variables/viewing_expressions.htm" />
+ <topic label="Variables view" href="html/debugger/variables/viewing_variables.htm" />
</context>
@@ -280,6 +293,7 @@
<!-- ============================================================== -->
<!-- NEW WIZARD -->
<context id="new_wizard_selection_wizard_page_context" >
+ <label>Symbian OS</label>
<description>Select the project, class, or file to create.</description>
<topic label="New Symbian OS ++ Projects" href="html/tasks/CreatingNewProjects.html"/>
<topic label="New Symbian OS C++ Classes" href="html/tasks/projects/prj_adding_symbian_class.htm" />
@@ -290,11 +304,10 @@
<!-- ============================================================== -->
<!-- IMPORT WIZARD -->
<context id="import_wizard_selection_wizard_page_context" >
+ <label>Importing projects for development or debugging.</label>
<description>Select the type of file to import for debugging.</description>
<topic label="Importing Projects from a BLD.INF File" href="html/tasks/ImportingProjects.html"/>
<topic label="Importing a Symbian Executable" href="html/reference/projects/prj_import_exe.htm" />
- <topic label="Carbide.c++ Perspective" href="html/concepts/SymbianPerspective.html" />
- <topic label="C/C++ Project and File Properties" href="html/reference/ProjectPreferences.html" />
</context>
<context id="import_wizard_context">
@@ -306,8 +319,8 @@
<!-- ============================================================== -->
<!-- EXPORT WIZARD -->
<context id="export_wizard_selection_wizard_page_context" >
- <description>Use the Console view to show the output of a process and provide keyboard input to a process.</description>
- <topic label="Console view" href="html/reference/view_log.htm" />
+ <label>Exporting from Carbide.c++</label>
+ <topic label="Exporting Remote Connections" href="html/reference/trk/exporting_remote_conns.htm" />
</context>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger.htm Wed Jul 21 12:11:48 2010 -0500
@@ -11,7 +11,7 @@
font-size: 1em;
}
body {
- background-color: #CCCCCC;
+ background-color: #D4D6EA;
}
.style1 {
font-size: 2em;
@@ -27,7 +27,6 @@
<td width="215"><img src="images/about_cpp.png" width="225" height="200"></td>
<td width="294" valign="bottom"><p align="right"><b><img src="images/brandmark_cpp.gif" width="106" height="52"></b></p>
<p align="right"> </p>
- <p align="right"> </p>
<p class="titleSmall">Copyright © 2010 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>
@@ -35,7 +34,7 @@
<tr>
<td colspan="2"><div align="center" class="style1">Carbide.c++ User Guide
</div>
- <p align="center" class="titleSmall">Version 3.0.0, May, 2010</p></td>
+ <p align="center" class="titleSmall">Version 3.0.0, June, 2010</p></td>
</tr>
</table>
<p align="center"> </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm Wed Jul 21 12:11:48 2010 -0500
@@ -25,7 +25,7 @@
</ul>
<p>To launch a specific launch configuration:</p>
<ul>
- <li>Right-click the project's EXE file in the C/C++ Projects view and select <b>Debug As > <em>Project_Name</em></b> from the context menu</li>
+ <li>Right-click the project's EXE file in the Project Explorer view and select <b>Debug As > <em>Project_Name</em></b> from the context menu</li>
</ul>
<h4><a name="TERMINATE_DB" id="START_DB2"></a>Terminating a session</h4>
<p>Use the <b>Terminate</b> command (<img src="../../images/icons/btn_terminate.png" width="17" height="15" align="absmiddle" />) to stop or halt a program based on the type of debugging session underway. Terminate behavior includes: </p>
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/icon_add.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/menu_vew_expressions_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/menu_vew_expressions_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/menu_view_variables_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/menu_view_variables_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/view_expressions.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/view_variables.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/wnd_add_watch_expr.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/wnd_add_watchpoint.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/wnd_cast_to_type.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/wnd_display_as_array.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/wnd_find_expressions.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/wnd_find_variables.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/wnd_global_variables.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/wnd_set_value.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_variables.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_variables.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,24 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Adding and Removing Global Variables</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Adding and Removing Global Variables </h2>
-<p>The <a href="viewing_variables.htm">Variables</a> view can also display global variables used by the program. Right-click in the <a href="viewing_variables.htm">Variables</a> view and select the <b>Add Global Variables</b> menu option to open the <b>Global Variables</b> dialog. There you can select one or more global variables to display in the Variables view, clickiing <b>OK</b> when done. </p>
-<p align="center"><img src="../../images/views/wnd_select_global_variables.png" width="345" height="430" /></p>
-<p class="figure">Figure 1 - Global Variables selection dialog</p>
-<p> </p>
-<h4>Removing Global Variables</h4>
-<p>Right-click in the <a href="viewing_variables.htm">Variables</a> view and select the <b>Add Global Variables</b> menu option to open the <b>Global Variables</b> dialog. Locate and uncheckmark the global variable to stop displaying, then click <b>OK</b>. This removes the selected global variable from the variables list.</p>
-<h5>Other references</h5>
-<ul>
- <li><a href="variables.htm">Variables and Expressions Overview</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Adding and Removing Global Variables</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Adding and Removing Global Variables </h2>
+<p>The <a href="viewing_variables.htm">Variables</a> view can also display global variables used by the program. Right-click in the <a href="viewing_variables.htm">Variables</a> view and select the <b>Add Global Variables</b> menu option to open the <b>Global Variables</b> dialog. There you can select one or more global variables to display in the Variables view, clickiing <b>OK</b> when done. </p>
+<p align="center"><img src="../images/wnd_global_variables.png" alt="Global Variables window" width="359" height="452"></p>
+<p class="figure">Figure 1 - Global Variables selection dialog</p>
+<h4>Removing Global Variables</h4>
+<p>Right-click in the <a href="viewing_variables.htm">Variables</a> view and select the <b>Add Global Variables</b> menu option to open the <b>Global Variables</b> dialog. Locate and uncheckmark the global variable to stop displaying, then click <b>OK</b>. This removes the selected global variable from the variables list.</p>
+<h5>Other references</h5>
+<ul>
+ <li><a href="variables.htm">Variables and Expressions Overview</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_expressions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_expressions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -20,20 +20,20 @@
<li>Expressions list pane—Lists expressions and expression hierarchies. Click the hierarchical controls to expand or collapse the expression. Right-click to open the Expressions view context menu.</li>
<li>Value pane—Shows the current value of each corresponding expression. Double-click a value to change it. Right-click to set viewing options.</li>
</ul>
-<p align="center"><img src="../images/view_expressions.png" width="439" height="144"></p>
+<p align="center"><img src="../images/view_expressions.png" width="667" height="358"></p>
<p class="figure">Figure 1 - Expressions view </p>
<h3>Expressions view toolbar icons</h3>
<p>The following commands appear on the Expressions view toolbar:</p>
<table width="88%" border="0" cellpadding="2" cellspacing="0">
<tr>
- <th width="34%" scope="col">Item</th>
- <th width="14%" scope="col">Icons</th>
- <th width="52%" scope="col">Explanation</th>
+ <th width="25%" scope="col">Item</th>
+ <th width="10%" scope="col">Icons</th>
+ <th width="65%" scope="col">Explanation</th>
</tr>
<tr>
<td><b>Show Type Names </b></td>
<td><div align="center"><img src="../images/var_toggle_type_names_icon.png" width="19" height="19" /></div></td>
- <td>Toggles the display of type names in the Expressions view. </td>
+ <td>Toggles the display of type names in the <strong>Expressions</strong> view. </td>
</tr>
<tr>
<td><b>Show Logical Structure </b></td>
@@ -46,6 +46,12 @@
<td>Collapses all expanded expressions into the top level. </td>
</tr>
<tr>
+ <td><strong>Create a New Watch Expression</strong></td>
+ <td><div align="center"><img src="../images/icon_add.png" alt="Add New Watch Expression icon" width="18" height="18"></div></td>
+ <td><p>Click to open the <strong>Add New Expression </strong>dialog. Enter the expression to add, then click <strong>OK</strong>.</p>
+ <p align="center"><img src="../images/wnd_add_watch_expr.png" alt="Add Watch Expression window" width="530" height="357"></p></td>
+ </tr>
+ <tr>
<td><b>Remove Selected Expression </b></td>
<td><div align="center"><img src="../images/var_remove_selected_globals_icon.png" width="18" height="16" /></div></td>
<td>Click to remove all currently selected expressions from the expressions list. </td>
@@ -55,10 +61,16 @@
<td><div align="center"><img src="../images/var_remove_all_globals_icon.png" width="19" height="19" /></div></td>
<td>Click to remove all expressions from the expressions list. </td>
</tr>
+ <tr>
+ <td><strong>View Menu</strong></td>
+ <td><div align="center"><img src="../images/icon_menu_white.png" alt="View menu" width="12" height="12"></div></td>
+ <td><p>Click the <strong>View Menu</strong> icon to set the layout of the <strong>Expressions</strong> view.</p>
+ <p align="center"><img src="../images/menu_vew_expressions_01.png" alt="View menu" width="326" height="158"></p></td>
+ </tr>
</table>
<h3>Expressions view context menu options</h3>
<p>Right-click in the Expression's pane in the <span class="style1">Expressions</span> view to access the context menu commands shown in Figure 2.</p>
-<p align="center"><img src="../images/view_expressions_menu_cmds.png" width="226" height="223"></p>
+<p align="center"><img src="../images/menu_vew_expressions_02.png" alt="Expressions view context menu" width="429" height="408"></p>
<p class="figure">Figure 2. <span class="style1">Expressions</span> view context menu commands (Expression list pane)</p>
<p>The commands include: </p>
<table width="800" border="0" cellpadding="2" cellspacing="0">
@@ -68,33 +80,35 @@
</tr>
<tr>
<td><b>Select All</b></td>
- <td>Selects all the expressions shown in the Expressions view.</td>
+ <td>Selects all the expressions shown in the <strong>Expressions</strong> view.</td>
</tr>
<tr>
<td><b>Copy Expressions</b></td>
- <td>Copies the selected expressions to the clipboard.</td>
+ <td><p>Copies the selected expressions to the clipboard.</p>
+ <p class="note"><strong>NOTE</strong> Only the selected expressions visible in the Expressions view are copied. Expressions listed outside the boundary of the view are not in memory and can't be copied at this time.</p></td>
</tr>
<tr>
<td><b>Remove</b></td>
- <td>Remove the selected expressions from the Expressions view list.</td>
+ <td><p>Remove the selected expressions from the <strong>Expressions</strong> view list.</p>
+ </td>
</tr>
<tr>
<td><b>Remove All</b></td>
- <td>Remove all expressions from the Expressions view list.</td>
+ <td>Remove all expressions from the <strong>Expressions</strong> view list.</td>
</tr>
<tr>
<td><b>Find...</b></td>
- <td>Opens a <b>Find</b> dialog to search the Expressions view list.</td>
+ <td><p>Opens a <b>Find</b> dialog to search the <strong>Expressions</strong> view list. Enter the expression to search for and click <strong>OK</strong>.</p>
+ <p align="center"><img src="../images/wnd_find_expressions.png" alt="Find Expressions dialog" width="398" height="437"></p></td>
</tr>
<tr>
<td><b>Change Value...</b></td>
<td><p>Opens the <b>Set Value</b> dialog where you can modify the value assigned to the selected expressions. Change the value and click <b>OK</b>.</p>
- <p align="center"><img src="../images/wnd_set_value.png" width="401" height="214"></p></td>
+ <p align="center"><img src="../images/wnd_set_value.png" width="488" height="234"></p></td>
</tr>
<tr>
<td><b>Add Watch Expression...</b></td>
- <td><p>Opens the <a href="adding_expressions.htm">Add Watch Exression</a> dialog for creation of a new expression.</p>
- </td>
+ <td><p>Opens the <a href="adding_expressions.htm">Add Watch Exression</a> dialog for creation of a new expression.</p> </td>
</tr>
<tr>
<td><b>Disable</b></td>
@@ -109,8 +123,32 @@
<td>Opens the <b>Edit Watch Expression</b> dialog where you can modify the expression and enable it for automatic evaluation.</td>
</tr>
<tr>
- <td><b>Reevaluate Watch Expression</b></td>
- <td>Forces the expression to be reevaluated. Useful after the expressions has been edited or not evaluated due to being disabled.</td>
+ <td><strong>Add Watchpoint (C/C++)...</strong></td>
+ <td><p>Opens the <a href="../watchpoints/setting_watchpoints.htm">Add Watchpoint</a> dialog enabling you to define a watchpoint on the variable.</p>
+ <p align="center"><img src="../images/wnd_add_watchpoint.png" alt="Add Watchpoint window" width="238" height="253"></p></td>
+ </tr>
+ <tr>
+ <td><strong>Cast To Type...</strong></td>
+ <td><p>Opens the <b>Cast to Type</b> dialog where you can assign a new type to the expression. Enter the type and click <strong>OK</strong>. </p>
+ <p>All cast expressions are then shown using the <strong>Restore Original Type</strong> menu option making them easy to identify and restore later.</p></td>
+ </tr>
+ <tr>
+ <td><strong>Display As Array...</strong></td>
+ <td>Opens the <strong>Display as Array</strong> dialog where you can set array parameters to show the variables. Enter the <strong>Start index</strong> and <strong>Length</strong>, then click <strong>OK</strong> to update how the variables are shown in the Variables view.</td>
+ </tr>
+ <tr>
+ <td><strong>Format</strong></td>
+ <td><p>Change the selected variable's display format. The default setting is Natural, or the format assigned when the variable is defined. For example, the decimal value of 256 would appear as:</p>
+ <ul>
+ <li>Binary (<span class="code">0b100000</span>)</li>
+ <li>Natural (<span class="code">256</span>)</li>
+ <li>Decimal (<span class="code">256</span>)</li>
+ <li>Hexadecimal (<span class="code">0x100</span>)</li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td><strong>Watch</strong></td>
+ <td>Creates a watchpoint on the selected variable and displays it in the <a href="../watchpoints/watchpoints.htm">Watchpoint</a> view. </td>
</tr>
</table>
<h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_variables.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_variables.htm Wed Jul 21 12:11:48 2010 -0500
@@ -11,7 +11,7 @@
<h2>Viewing Variables </h2>
<p>The <b>Variables</b> view allows manipulation of project variables and the variable hierarchy used in the source code. For example, you can change the variable format, change a variable value, add watch expressions, or add global variables. </p>
<p>Figure 1 shows the Variables view with <b>Show Type Names</b> option enabled. The default view shows the variables list and include the Name and Value for all the variables within scope. In addition, when you select a variable its value is also shown in a different pane within the view.</p>
-<p align="center"><img src="../images/view_variables.png" width="583" height="262"></p>
+<p align="center"><img src="../images/view_variables.png" width="551" height="281"></p>
<p class="figure">Figure 1 - Variables view </p>
<h3>Variables view toolbar icons</h3>
<p>The following commands appear on the Variables view toolbar: </p>
@@ -52,15 +52,16 @@
<td>Click to remove all global variables from the variables list. </td>
</tr>
<tr>
- <td><b>Menu</b></td>
+ <td><b>View Menu</b></td>
<td><div align="center"><img src="../images/icon_menu_white.png" width="12" height="12"></div></td>
- <td><p>Enables you to modifiy the <b>Layout</b> to change the view orientation between: horizontal, vertical, or variables pane only.</p>
+ <td><p>Enables you to modifiy the <b>Layout</b> to change the view orientation between: horizontal, vertical, or variables pane only and customize the columns shown in the view.</p>
+ <p align="center"><img src="../images/menu_view_variables_01.png" alt="View menu" width="373" height="158"></p>
<p>In addition, use <b>Show All Variables</b> to toggle between showing only those variables that are in scope and live or show all local variables, even if redundant. With this option on you will see all of the variables including the multiple defined variables like “i” for your loops and ones that may no longer have accurate values.</p></td>
</tr>
</table>
<h3>Variables view context menu options</h3>
<p>Right-click in the <b>Variables</b> view to access the commands on the Variables view context menu.</p>
-<p align="center"><img src="../images/view_variables_menu_cmds.png" width="236" height="334"></p>
+<p align="center"><img src="../images/menu_view_variables_02.png" alt="Variables view context menu" width="424" height="344"></p>
<p class="figure">Figure 2. Variables view context menu commands</p>
<p>The commands include: </p>
<table width="100%" border="0" cellpadding="2" cellspacing="0">
@@ -74,7 +75,8 @@
</tr>
<tr>
<td><b>Copy Variables</b></td>
- <td>Copies the selected variables to the clipboard.</td>
+ <td><p>Copies the selected variables to the clipboard.</p>
+ <p class="note"><strong>NOTE</strong> Only the selected variables visible in the Variables view are copied. Variables listed outside the boundary of the view are not in memory and can't be copied at this time.</p></td>
</tr>
<tr>
<td><b>Enable</b></td>
@@ -85,60 +87,62 @@
<td>Disables the selected variable.</td>
</tr>
<tr>
- <td><b>Display as Array...</b></td>
- <td> </td>
+ <td><b>Cast To Type...</b></td>
+ <td><p>Opens the <b>Cast to Type</b> dialog where you can assign a new type to the variable. Enter the type and click <strong>OK</strong>. </p>
+ <p>All cast variables are then shown using the <strong>Restore Original Type</strong> menu option making them easy to identify and restore later.</p>
+ <p align="center"><img src="../images/wnd_cast_to_type.png" alt="Cast To Type window" width="488" height="197"></p>
+ </td>
</tr>
<tr>
- <td><b>Cast To Type...</b></td>
- <td>Opens the <b>Cast to Type</b> dialog where you can assign a new type to the variable.</td>
- </tr>
- <tr>
- <td><p><b>Restore Original Type</b></p> </td>
- <td>Resets the selected variable to the original type assigned by the program.</td>
+ <td><strong>Display As Array...</strong></td>
+ <td><p>Opens the <strong>Display as Array</strong> dialog where you can set array parameters to show the variables. Enter the <strong>Start index</strong> and <strong>Length</strong>, then click <strong>OK</strong> to update how the variables are shown in the Variables view.</p>
+ <p align="center"><img src="../images/wnd_display_as_array.png" alt="Display as Array" width="488" height="195"></p></td>
</tr>
<tr>
<td><b>View Memory</b></td>
- <td>Opens a <b>Memory</b> view on the selected variable so you can examine it.</td>
+ <td>Opens a <a href="../../reference/view_memory_wnd.htm">Memory</a> view on the selected variable so you can examine it.</td>
+ </tr>
+ <tr>
+ <td><b>Format</b></td>
+ <td><p>Change the selected variable's display format. The default setting is Natural, or the format assigned when the variable is defined. For example, the decimal value of 256 would appear as:</p>
+ <ul>
+ <li>Binary (<span class="code">0b100000</span>)</li>
+ <li>Natural (<span class="code">256</span>)</li>
+ <li>Decimal (<span class="code">256</span>)</li>
+ <li>Hexadecimal (<span class="code">0x100</span>)</li>
+ </ul></td>
</tr>
<tr>
<td><b>Find...</b></td>
- <td>Opens a <b>Find</b> dialog to search for variables.</td>
+ <td><p>Opens a <b>Find</b> dialog to search for variables. Enter the variable to search for and click <strong>OK</strong>.</p>
+ <p align="center"><img src="../images/wnd_find_variables.png" alt="Find window" width="398" height="437"></p></td>
</tr>
<tr>
<td><b>Change Value...</b></td>
<td><p>Opens the <b>Set Value</b> dialog where you can modify the value assigned to the selected variable. Change the value and click <b>OK</b>.</p>
- <p align="center"><img src="../images/wnd_set_value.png" width="401" height="214"></p></td>
+ <p align="center"><img src="../images/wnd_set_value.png" width="488" height="234"></p></td>
+ </tr>
+ <tr>
+ <td><b>Add Global Variables...</b></td>
+ <td>Select to open the <a href="adding_variables.htm">Global Variables</a> dialog where you can select one or more global variables to display in the Variables view. Global variables appear at the top of the variables list. </td>
+ </tr>
+ <tr>
+ <td><b>Remove Global Variables</b></td>
+ <td>Remove the selected global variables from the Variables view.</td>
+ </tr>
+ <tr>
+ <td><b>Remove All Global Variables</b></td>
+ <td>Remove all global variables from the Variables view.</td>
</tr>
<tr>
<td><b>Add Watchpoint (C/C++)...</b></td>
- <td>Opens the <a href="../watchpoints/setting_watchpoints.htm">Add Watchpoint</a> dialog enabling you to define a watchpoint on the variable.</td>
- </tr>
- <tr>
- <td><b>Add Global Variables...</b></td>
- <td>Select to open the <a href="adding_variables.htm">Global Variables</a> dialog where you can select one or more global variables to display in the Variables view. Global variables appear at the top of the variables list. </td>
- </tr>
- <tr>
- <td><b>Remove Global Variables</b></td>
- <td>Remove the selected global variables from the Variables view.</td>
+ <td><p>Opens the <a href="../watchpoints/setting_watchpoints.htm">Add Watchpoint</a> dialog enabling you to define a watchpoint on the variable.</p>
+ <p align="center"><img src="../images/wnd_add_watchpoint.png" alt="Add Watchpoint window" width="238" height="253"></p></td>
</tr>
<tr>
- <td><b>Remove All Global Variables</b></td>
- <td>Remove all global variables from the Variables view.</td>
- </tr>
- <tr>
- <td><b>Create Watch Expression</b></td>
+ <td><b> Watch</b></td>
<td>Creates a watchpoint on the selected variable and displays it in the <a href="../watchpoints/watchpoints.htm">Watchpoint</a> view. </td>
</tr>
- <tr>
- <td><b>Format</b></td>
- <td><p>Change the selected variable's display format. The default setting is Natural, or the format assigned when the variable is defined. For example, the decimal value of 256 would appear as:</p>
- <ul>
- <li>Binary (<span class="code">0b100000</span>)</li>
- <li>Natural (<span class="code">256</span>)</li>
- <li>Decimal (<span class="code">256</span>)</li>
- <li>Hexadecimal (<span class="code">0x100</span>)</li>
- </ul> </td>
- </tr>
</table>
<h5>Other references</h5>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/setting_watchpoints.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/setting_watchpoints.htm Wed Jul 21 12:11:48 2010 -0500
@@ -12,7 +12,7 @@
<p>You create a watchpoint to monitor a value in a specified memory location. The debugger halts program execution on the line of source code that triggered the watchpoint. This is different than a breakpoint, which halts program execution prior to executing the line of source code on which the breakpoint is set.</p>
<h4>Setting watchpoints</h4>
<p>Right-click in the <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view and choose the <b>Add Watchpoint (C/C++)...</b> command to open the <b>Add Watchpoint</b> window. A watchpoint suspends program execution when the memory location that you specify is accessed with a write or read operation and it's based on the access setting. Use the <b>Add Watchpoint</b> window to specify the memory location, its memory size, unit size, and define whether the watchpoint triggers on a read, write, or on both operations. Watchpoints can also be added directly in the <a href="../../reference/view_variables.htm">Variables</a>, <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a>, and the <a href="../../reference/view_memory_wnd.htm">Memory Rendering</a> views.</p>
-<p align="center"><img src="../images/wnd_add_watchpoint.png" width="220" height="261"></p>
+<p align="center"><img src="../images/wnd_add_watchpoint.png" width="238" height="253"></p>
<p align="center" class="figure">Figure 1. Add Watchpoint window </p>
<h5>Table 1. Add Watchpoint options </h5>
<table width="88%" border="0" cellpadding="2" cellspacing="0">
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/status_watchpoints.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/status_watchpoints.htm Wed Jul 21 12:11:48 2010 -0500
@@ -14,7 +14,7 @@
<ul>
<li>An <b>enabled</b> watchpoint has a non-gray icon (<img src="../images/icon_watchpoint_write_resolved.png" width="15" height="16" align="absmiddle" />) indicating that program execution halts when encountered.</li>
<li>A <b>disabled</b> watchpoint displays a gray icon (<img src="../images/icon_watchpoint_write_disabled.png" width="16" height="16" align="absmiddle" />) indicating that program execution will not stop when encountered. </li>
- <li>A <b>resolved</b> watchpoint has a small checkmark badge (<img src="../images/icon_watchpoint_rw_enabled_resolved.png" width="16" height="16" align="absmiddle" /> ) indicating that the debugger has located it in memory during program launch. When resolved, the debugger can halt program execution if the watchpoint is encountered.</li>
+ <li>A <b>resolved</b> watchpoint has a small checkmark badge (<img src="../images/icon_watchpoint_rw_enabled_resolved.png" width="16" height="16" align="absmiddle" />) indicating that the debugger has located it in memory during program launch. When resolved, the debugger can halt program execution if the watchpoint is encountered.</li>
</ul>
<p>In effect, a watchpoint that is enabled by the user and resolved by the debugger during program launch can halt program execution. The table below shows the various states that cause the debugger to halt program execution: </p>
<h5>Table 1 Watchpoint—stop execution chart </h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm Wed Jul 21 12:11:48 2010 -0500
@@ -5,16 +5,16 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
<title>Watchpoints Overview</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
</head>
<body bgcolor="#FFFFFF">
<h2>Watchpoints Overview </h2>
<p> Use <em>watchpoints</em> (sometimes referred to as access breakpoints) to halt program execution when a specific global location is accessed. After you set a watchpoint at a key point in memory, you can halt program execution whenever that point in memory is written to or read from. You can then examine the call chain, check register and variable values, and step through your code. You can also change values and alter the flow of normal program execution.</p>
<p>A watchpoint must be both enabled and resolved during a debug session in order to halt program execution. The <a href="../reference/view_breakpoints.htm">Breakpoints view</a> indicates the status of any watchpoint using a set of common icons and checkmark status badge. These include:</p>
<ul>
- <li>An <b>enabled</b> watchpoint has a non-gray icon (<img src="../tasks/watchpoints/images/icon_watchpoint_write_resolved.png" width="15" height="16" align="absmiddle" />) indicating that program execution halts when encountered.</li>
- <li>A <b>disabled</b> watchpoint displays a gray icon (<img src="../tasks/watchpoints/images/icon_watchpoint_write_disabled.png" width="16" height="16" align="absmiddle" />) indicating that program execution will not stop when encountered. </li>
- <li>A <b>resolved</b> watchpoint has a small checkmark badge (<img src="../tasks/watchpoints/images/icon_watchpoint_rw_enabled_resolved.png" width="16" height="16" align="absmiddle" /> ) indicating that the debugger has located it in memory during program launch. When resolved, the debugger can halt program execution if the watchpoint is encountered.</li>
+ <li>An <b>enabled</b> watchpoint has a non-gray icon (<img src="../images/icon_watchpoint_write_resolved.png" width="15" height="16" align="absmiddle" />) indicating that program execution halts when encountered.</li>
+ <li>A <b>disabled</b> watchpoint displays a gray icon (<img src="../images/icon_watchpoint_write_disabled.png" width="16" height="16" align="absmiddle" />) indicating that program execution will not stop when encountered. </li>
+ <li>A <b>resolved</b> watchpoint has a small checkmark badge (<img src="../images/icon_watchpoint_rw_enabled_resolved.png" alt="Read Write resolved" width="16" height="16" align="absmiddle">) indicating that the debugger has located it in memory during program launch. When resolved, the debugger can halt program execution if the watchpoint is encountered.</li>
</ul>
<p>In effect, a watchpoint that is enabled by the user and resolved by the debugger during program launch can halt program execution. The table below shows the various states that cause the debugger to halt program execution: </p>
<h5>Table 1 Watchpoint—stop execution chart </h5>
@@ -57,39 +57,39 @@
<tr>
<td rowspan="2"><b>Write</b></td>
<td>enabled</td>
- <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_write_resolved.png" width="15" height="16" /></div></td>
+ <td><div align="center"><img src="../images/icon_watchpoint_write_resolved.png" width="15" height="16" /></div></td>
<td><p>The watchpoint is activated for write access operations on the specific memory location and if resolved, will halt program execution on a write operation at the watchpoint. </p>
</td>
</tr>
<tr>
<td>disabled</td>
- <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_write_disabled.png" width="16" height="16" /></div></td>
+ <td><div align="center"><img src="../images/icon_watchpoint_write_disabled.png" width="16" height="16" /></div></td>
<td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a write operation. </p>
</td>
</tr>
<tr>
<td rowspan="2"><b>Read</b></td>
<td>enabled</td>
- <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_read_enabled.png" width="16" height="16" /></div></td>
+ <td><div align="center"><img src="../images/icon_watchpoint_read_enabled.png" width="16" height="16" /></div></td>
<td><p>The watchpoint is activated for read access operations on the specific memory location and if resolved, will halt program execution on a read operation at the watchpoint. </p>
</td>
</tr>
<tr>
<td>disabled</td>
- <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_read_disabled.png" width="16" height="16" /></div></td>
+ <td><div align="center"><img src="../images/icon_watchpoint_read_disabled.png" width="16" height="16" /></div></td>
<td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a read operation. </p>
</td>
</tr>
<tr>
<td rowspan="2"><b>Write/Read</b></td>
<td>enabled</td>
- <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_rw_enabled.png" width="16" height="16" /></div></td>
+ <td><div align="center"><img src="../images/icon_watchpoint_rw_enabled.png" width="16" height="16" /></div></td>
<td><p>The watchpoint is activated for both read and write access operations on the specific memory location and if resolved, will halt program execution on any read or write operation at the watchpoint. </p>
</td>
</tr>
<tr>
<td>disabled</td>
- <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_rw_disabled.png" width="16" height="16" /></div></td>
+ <td><div align="center"><img src="../images/icon_watchpoint_rw_disabled.png" width="16" height="16" /></div></td>
<td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a read or write operation. </p>
</td>
</tr>
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/export1.gif has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/export2.gif has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/export3.gif has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/export4.gif has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/export4a.gif has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/export4b.gif has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/export5.gif has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/export6.gif has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/import1.gif has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/import3.gif has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/import4.gif has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/import5.gif has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/views/perspective_debug.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_04.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_05.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_07.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_08.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_09.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_10.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_11.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_12.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_13.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/debugging_project_14.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/dlg_build_project_progress.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/dll_attach_to_process.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/dll_build_project.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/dll_change_debug_process.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/dll_change_remote_connection.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/dll_new_launch_config.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/dll_other_settings.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/icon_build_project.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/icon_debug.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/icon_edit_settings.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/icon_project_built.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/icon_project_error_badge.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/icon_project_warning_badge.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/icon_run.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/menu_new_proj_build_project.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_build_project_console_view.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_build_project_executables_view.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_build_project_problems_view.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_dll_project_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_dll_project_03.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_dll_project_04.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_dll_project_07.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_launch_config_03.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_launch_config_04.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_launch_config_05.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_launch_config_08.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_project_template_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_project_template_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_project_template_07.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/pref_cdt_build_console.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/run_mode_debug_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/run_mode_debug_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/run_mode_debug_05.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/run_mode_debug_06.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/run_mode_debug_07.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/filter_launch_config.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_board.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_board.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,7 +9,11 @@
<body>
<h2>Symbian OS Reference Board Launch</h2>
-<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> to create a launch configuration for a development board or reference hardware using a JTAG connection.</p>
+<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> to create a launch configuration for a development board or reference hardware using a JTAG connection. Currently there are two choices of debugger:</p>
+<ul>
+ <li><strong>Symbian OS Phone Launch</strong> — uses the Eclipse Debugger for C/C++ as the debugger engine which includes snapshots, improved variables view, and other features not available in the Classic debugger.</li>
+ <li><strong>Classic Symbian OS Reference Board Launch</strong> — uses the classic debugger engine.</li>
+</ul>
<p align="center"><img src="images/launch_board_01.png" width="350" height="350"></p>
<p class="figure">Figure 1. Debug As dialog</p>
<div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Launch Configuration Filtering</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Launch Configuration Filtering </h2>
-<p>Use the <b>Launch Configuration </b> preference panel to filter the launch configurations that appear in the configurations list in the <b>Run</b> or <b><a href="wnd_debug_configuration.htm">Debug</a></b> dialog. This allows you to manage which configuration types are shown. For example, enable the <b>Filter checked launch configuration types</b> option and check the configuration types that you do not want to appear in the <b>Run</b> and <b>Debug</b> dialogs. As shown in Figure 1, all the configurations related to TRK have been enabled and won't appear in the configurations list. </p>
-<p align="center"><img src="images/filter_launch_config.png" width="627" height="574" /></p>
-<p class="figure">Figure 1 - Launch Configurations preference panel </p>
-<h5>Related references</h5>
-<ul>
- <li><a href="wnd_debug_configuration.htm">Debug Window</a> </li>
-</ul>
-<h5>Related tasks </h5>
-<ul>
- <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
- <li><a href="../../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
- <li><a href="../../tasks/projects/prj_set_build_tgt.htm">Setting a Build Configuration </a></li>
-</ul>
-<div class="step">
- <div id="footer">Copyright © 2010 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></div>
-</div>
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Launch Configuration Filtering</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Launch Configuration Filtering </h2>
+<p>Use the <b>Launch Configurations </b> preference panel to filter the launch configurations that appear in the configurations list in the <b>Run</b> or <b><a href="wnd_debug_configuration.htm">Debug</a></b> dialog. This allows you to manage which configuration types are shown. For example, enable the <b>Filter checked launch configuration types</b> option and check the configuration types that you do not want to appear in the <b>Run</b> and <b>Debug</b> dialogs. </p>
+<p align="center"><img src="images/filter_launch_config.png" width="682" height="587" /></p>
+<p class="figure">Figure 1 - Launch Configurations preference panel </p>
+<h5>Related references</h5>
+<ul>
+ <li><a href="wnd_debug_configuration.htm">Debug Window</a> </li>
+</ul>
+<h5>Related tasks </h5>
+<ul>
+ <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+ <li><a href="../../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
+ <li><a href="../../tasks/projects/prj_set_build_tgt.htm">Setting a Build Configuration </a></li>
+</ul>
+<div class="step">
+ <div id="footer">Copyright © 2010 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></div>
+</div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_emulator.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_emulator.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,8 +9,12 @@
<body>
<h2>Symbian OS Emulator Launch</h2>
-<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> that will create a launch configuration for the project. </p>
-<p align="center"><img src="images/launch_phone_01.png" width="350" height="350"></p>
+<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> that will create a launch configuration for the project. Currently there are two choices of debugger:</p>
+<ul>
+ <li><strong>Symbian OS Phone Launch</strong> — uses the Eclipse Debugger for C/C++ as the debugger engine which includes snapshots, improved variables view, and other features not available in the Classic debugger.</li>
+ <li><strong>Classic Symbian OS Reference Board Launch</strong> — uses the classic debugger engine.</li>
+</ul>
+<p align="center"><img src="images/launch_phone_01.png" width="350" height="350" align="center"></p>
<p class="figure">Figure 1. Debug As dialog</p>
<div class="step">
<h4>Creating a Launch Configuration for Emulators</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,7 +9,11 @@
<body>
<h2>Symbian OS Phone Launch</h2>
-<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> that will create a launch configuration for the project. </p>
+<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> that will create a launch configuration for the project. Currently there are two choices of debugger:</p>
+<ul>
+ <li><strong>Symbian OS Phone Launch</strong> — uses the Eclipse Debugger for C/C++ as the debugger engine which includes snapshots, improved variables view, and other features not available in the Classic debugger.</li>
+ <li><strong>Classic Symbian OS Reference Board Launch</strong> — uses the classic debugger engine.</li>
+</ul>
<p align="center"><img src="images/launch_phone_01.png" width="350" height="350"></p>
<p class="figure">Figure 1. Debug As dialog</p>
<div class="step">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_00.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>DLL Projects Tutorial</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>DLL Projects Tutorial</h2>
+<p>In this example we show how to create a project for a DLL (Dynamic Linked Library) using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
+<ol>
+ <li><a href="new_proj_from_template_01.htm">Creating</a> a project from a project template</li>
+ <li><a href="new_proj_from_template_02.htm">Building</a> an executable based on the project sources</li>
+ <li><a href="new_proj_dll_example_03.htm">Debugging</a> the DLL using the Carbide debugger</li>
+</ol>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../../AddinganSDK.html">add</a> it to the Discovered Symbian OS SDK list.</p>
+<h4>Other references</h4>
+<ul>
+ <li><a href="new_proj_from_template_00.htm">Emulator Application Projects</a></li>
+ <li><a href="run_mode_debug_example_00.htm">Remote Target Debugging (Run-mode)</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_01.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Creating DLL Projects Tutorial</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Creating DLL Projects Tutorial</h2>
+<p>In this example we show how to create a project for a DLL (Dynamically Linked Library) using one of the built-in Carbide templates, build it, then attach to another program for debugging. The steps to do this include:</p>
+<ol>
+ <li><strong>Creating a DLL project from a project template</strong></li>
+ <li><a href="new_proj_dll_example_02.htm">Building</a> the DLL object code based on the project sources</li>
+ <li><a href="new_proj_dll_example_03.htm">Debugging</a> the DLL using the Carbide debugger</li>
+ </ol>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../../AddinganSDK.html">add</a> it to the Discovered Symbian OS SDK list.</p>
+<hr>
+<p>In this tutorial you'll create a simple DLL project using the <strong>New Symbian OS C++ Project</strong> wizard, attach it to the HelloWorld project created <a href="new_proj_from_template_00.htm">here</a>, then debug it.</p>
+<div class="step">
+ <h4><strong></strong>Creating a DLL project from a template</h4>
+ <ol>
+ <li>Click the <strong>File > New > Symbian OS C++ Project</strong> menu option.<br />
+ <p>The <strong>New Symbian OS C++ Project</strong> window appears to guide you through project creation process.</p>
+ <p><img src="../images/new_dll_project_02.png" alt="New DLL project" width="525" height="503"></p>
+ </li>
+ <li>Select a template from the available options, then click <strong>Next</strong>.<br />
+ <p>Select the template for the type of project you want to create. For this example we chose the <strong>Generic Symbian OS > Baisc dynamically linked library (DLL)</strong> template. Note that as you select a template a brief description appears below the list explaining it attributes.</p>
+ </li>
+ <li>Use the <strong>New Symbian OS C++ Project</strong> page to define the project name and build system.<br />
+ <p><img src="../images/new_dll_project_03.png" alt="New Symbian OS C++ Project page" width="525" height="503"></p>
+ <ol type="a">
+ <li>Type a name into the <strong>Project name</strong> text box.<br />
+ <p>The project name is used to define several of the pre-build source files in the prject.</p>
+ </li>
+ <li>(Optional) Change the project location.<br />
+ <p>Uncheck the <strong>Use default location</strong> option to specify a different location for the project.</p>
+ </li>
+ <li>Select the <strong>Builder</strong> type.<br />
+ <p>Based on the installed SDKs you can choose between SBSv2 (recommended) and the older SBSv1 build systems.</p>
+ </li>
+ <li>Click <strong>Next</strong>.</li>
+ </ol>
+ </li>
+ <li>In the Symbian OS SDKs page, select the SDK and build configurations for the project.<br />
+ <p>Here you can select from any SDK that is both installed and recognized by Carbide. If the SDK supports several build configurations (GCCE, RVCT, etc.) then you can pick and choose among them for your project.</p>
+ <p><img src="../images/new_dll_project_04.png" alt="Symbian OS SDKs page"></p>
+ </li>
+ <li>(Optional) Click Next to provide Basic Settings like author, copyright and other info for your project.</li>
+ <li>(Optional) Click Next to rename the Project Directories used to organize the project.</li>
+ <li>Click Finish.<br>
+ <p>Carbide uses the selected project template and your settings to create the DLL project in the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> view.</p>
+ <p><img src="../images/new_dll_project_07.png" alt="DLL project in Project Explorer view"></p>
+ </li>
+ </ol>
+</div>
+<p><strong>NEXT STEP</strong> > <a href="new_proj_from_template_02.htm">Building</a> the object code based on the project sources </p>
+<h4>Other references</h4>
+<ul>
+ <li><a href="new_proj_dll_example_00.htm">DLL Projects</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_02.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Building the DLL Project Tutorial</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Building the DLL Project Tutorial</h2>
+<p>In this example we show how to create a project for a DLL (Dynamic Linked Library) using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
+<ol>
+ <li><a href="new_proj_from_template_01.htm">Creating</a> a DLL project from a project template</li>
+ <li><strong>Building the DLL object code based on the project sources</strong></li>
+ <li><a href="new_proj_dll_example_03.htm">Debugging</a> the DLL using the Carbide debugger</li>
+ </ol>
+<hr>
+<p>Building a DLL is just like <a href="new_proj_from_template_02.htm">building</a> any other executable.</p>
+<div class="step">
+ <h4>Building the DLL project</h4>
+ <ol>
+ <li>Select the project to build in the Project Explorer view.</li>
+ <li>Build the project using one of these actions:
+ <div align="left">
+ <ul>
+ <li>Right-click the project in the Project Explorer view and choose Build Project.</li>
+ <li>Click the Run > Build Project menu option.</li>
+ <li>Click the Build (<img src="../images/icon_build_project.png" alt="Build Project icon" width="17" height="17" align="absmiddle">) icon in the toolbar to build the project. </li>
+ </ul>
+ </li>
+ <li>Verifying a successful project build <br />
+ </li>
+ </ol>
+ <blockquote>
+ <p>Once compiling is complete use the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a>, <a href="PLUGINS_ROOT//org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm">Problems</a>, <a href="../../reference/view_log.htm">Console</a>, and <a href="../../reference/view_executables.htm">Executables</a> views to locate and resolve any problems generated during the build. See Step 2 <a href="new_proj_from_template_02.htm">here</a> for more details.</p>
+ <p><img src="../images/dll_build_project.png" alt="Project Explorer showing DLL project" width="257" height="281"></p>
+ </blockquote>
+</div>
+<h4><strong>NEXT STEP</strong> > <a href="new_proj_from_template_03.htm">Defining</a> a launch configuration for running or debugging the DLL</h4>
+<h4>Other references</h4>
+<ul>
+ <li><a href="new_proj_dll_example_00.htm">DLL Projects</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_03.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debugging a DLL Project Tutorial</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debugging a DLL Project Tutorial</h2>
+<p>In this example we show how to create a project for a DLL (Dynamic Linked Library) using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
+<ol>
+ <li><a href="new_proj_from_template_01.htm">Creating</a> a DLL project from a project template</li>
+ <li><a href="new_proj_from_template_02.htm">Building</a> the DLL object code based on the project sources</li>
+ <li><strong>Debugging the DLL using the Carbide debugger</strong></li>
+</ol>
+<hr>
+<p>With the DLL compiled into object code, it's time to link it to any process running on the target device, then launch it with the debugger. Using the <strong>New Launch Configuration Wizard</strong> makes doing this quick, easy, and reliable.</p>
+<div class="step">
+ <p>Debugging a DLL project</p>
+ <ol>
+ <li>Select the project to launch in the Project Explorer view.</li>
+ <li>Launch a debug session using one of these actions:<br />
+ <ul>
+ <li>Right-click the project in the Project Explorer view and choose <strong>Debug As > Debug Symbian OS Application on Phone or Simulator</strong> menu option.</li>
+ <li>Click the Run > Debug (F11) menu option.</li>
+ <li>Click the Debug (<img src="../images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) icon in the toolbar to build the project. </li>
+ </ul>
+ <p>The first time you perform any of the following actions, the <strong>New Launch Configuration Wizard</strong> appears asking for the additional info to connect to a device.</p>
+ <p><img src="../images/dll_new_launch_config.png" alt="New Launch Configuration Wizard" width="550" height="460"></p>
+ </li>
+ <li>Provide the wizard the information it needs to complete the Configure launch configuration.<br />
+ <p>Complete all of the options below to create a launch connection for the DLL project.</p>
+ <ol type="a">
+ <li>Connect to device — click Change... to select a Current connection, create a new one, or edit the chosen remote connection settings.<br />
+ <p><img src="../images/dll_change_remote_connection.png" alt="Change connection dialog"></p>
+ </li>
+ <li>Debug process — click <strong>Change...</strong> to open the <strong>Change Debug Process</strong> dialog. Then select the <strong>Attach to process</strong> option and click <strong>OK</strong><br />
+ <p>To debug a DLL you simply need to attach it to any process running on the target device. Setting the<strong> Attach to process</strong> option will throw up a <strong>Attach to Process</strong> dialog when you start a debug session.</p>
+ <p><img src="../images/dll_change_debug_process.png" alt="Change Debug Process dialog"></p>
+ </li>
+ <li>Other Settings — click Change... to open the Other Settings dialog to set a preference for when the project is built during a launch, then click OK.<br />
+ <p><img src="../images/dll_other_settings.png" alt="Other Settings dialog"></p>
+ </li>
+ <li>(Optional) Edit advanced settings before launch — enable this option and click Edit to open the Debug Configurations dialog where you can set more launch options. Click Close to cancel the debug session launch.</li>
+ </ol>
+ <p>The <strong>Debug</strong> control enables when all the information is complete.</p>
+ </li>
+ <li>Click Debug.<br />
+ <p>The debug session is launched and the <strong>Attach to Process</strong> dialog appears. Select a process and click <strong>OK</strong> to continue.</p>
+ <p><img src="../images/dll_attach_to_process.png" alt="Attach to Process dialog"></p>
+ </li>
+ <p>The DLL is attached to the running process and control returns to the Carbide debugger. From this point you can use all of the Carbide debugger features to debug the DLL as it runs on the device.</p>
+ </ol>
+</div>
+<h4>Other references</h4>
+<ul>
+
+ <li><a href="new_proj_dll_example_00.htm">DLL Projects</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_00.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Emulator Application Projects Tutorial</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Emulator Application Projects Tutorial</h2>
+<p>In this example we show how to create a new project using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
+<ol>
+ <li><a href="new_proj_from_template_01.htm">Creating</a> a project from a project template</li>
+ <li><a href="new_proj_from_template_02.htm">Building</a> an object code based on the project sources</li>
+ <li><a href="new_proj_from_template_03.htm">Defining</a> a launch configuration for running or debugging the application</li>
+ <li><a href="new_proj_from_template_04.htm">Controlling and debugging</a> the running program using the Carbide debugger</li>
+</ol>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../../AddinganSDK.html">add</a> it to the Discovered Symbian OS SDK list.</p>
+<h4>Other references</h4>
+<ul><li><a href="new_proj_from_template_00.htm">DLL Projects</a></li>
+ <li><a href="run_mode_debug_example_00.htm">Remote Target Debugging (Run-mode)</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_01.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Creating New Projects from Templates</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Creating New Projects from Templates</h2>
+<p>In this example we show how to create a new project using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
+<ol>
+ <li><strong>Creating a project from a project template</strong></li>
+ <li><a href="new_proj_from_template_02.htm">Building</a> the object code based on the project sources</li>
+ <li><a href="new_proj_from_template_03.htm">Defining</a> a launch configuration for running or debugging the application</li>
+ <li><a href="new_proj_from_template_04.htm">Controlling and debugging</a> the running program using the Carbide debugger</li>
+</ol>
+<hr>
+<p>Everything starts with a project. So the first step is to use the <strong>New Project</strong> wizard to create a project based on a known template. Program templates are designed to make creating common project types fast and simple. They include the basic sources, resources, includes, and build files that Carbide uses to manage your project. </p>
+<div class="step">
+ <h4><strong></strong>Creating projects from a template</h4>
+ <ol>
+ <li>Click the <strong>File > New > Symbian OS C++ Project</strong> menu option.<br />
+ <p>The <strong>New Symbian OS C++ Project</strong> window appears to guide you through project creation process.</p>
+ <p><img src="../images/new_project_template_01.png" alt="New Symbian OS C++ Project window" width="525" height="503"></p>
+ </li>
+ <li>Select a template from the available options, then click <strong>Next</strong>.<br />
+ <p>Select the template for the type of project you want to create. For this example we chose the <strong>S60 > GUI Application</strong> template. Note that as you select a template a brief description appears below the list explaining it attributes.</p>
+ </li>
+ <li>Use the <strong>New Symbian OS C++ Project</strong> page to define the project name and build system.<br />
+ <p><img src="../images/new_project_template_02.png" width="525" height="503"></p>
+ <ol type="a">
+ <li>Type a name into the <strong>Project name</strong> text box.<br />
+ <p>The project name is used to define several of the pre-build source files in the prject.</p>
+ </li>
+ <li>(Optional) Change the project location.<br />
+ <p>Uncheck the <strong>Use default location</strong> option to specify a different location for the project.</p>
+ </li>
+ <li>Select the <strong>Builder</strong> type.<br />
+ <p>Based on the installed SDKs you can choose between SBSv2 (recommended) and the older SBSv1 build systems.</p>
+ </li>
+ <li>Click <strong>Next</strong>.</li>
+ </ol>
+ </li>
+ <li>In the Symbian OS SDKs page, select the SDK and build configurations for the project.<br />
+ <p>Here you can select from any SDK that is both installed and recognized by Carbide. If the SDK supports several build configurations (GCCE, RVCT, etc.) then you can pick and choose among them for your project.</p>
+ </li>
+ <li>(Optional) Click Next to provide Basic Settings like author, copyright and other info for your project.</li>
+ <li>(Optional) Click Next to rename the Project Directories used to organize the project.</li>
+ <li>Click Finish.<br>
+ <p>Carbide uses the selected project template and your settings to create a new project in the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> view.</p>
+ </li>
+ </ol>
+</div>
+<strong>NEXT STEP</strong> > <a href="new_proj_from_template_02.htm">Building</a> an executable based on the project sources
+<h4>Other references</h4>
+<ul>
+ <li><a href="new_proj_from_template_00.htm">Emulator Application Projects</a><a href="./"></a><a href="./"></a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_02.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,99 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<title>Building Projects and Components</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body >
+<h2>Building Projects and Components</h2>
+<p>In this example we show how to create a new project using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
+<ol>
+ <li><a href="new_proj_from_template_01.htm">Creating</a> a project from a project template</li>
+ <li><strong>Building the object code based on the project sources</strong></li>
+ <li><a href="new_proj_from_template_03.htm">Defining</a> a launch configuration for running or debugging the application</li>
+ <li><a href="new_proj_from_template_04.htm">Controlling and debugging</a> the running program using the Carbide debugger</li>
+</ol>
+<hr>
+<p><strong></strong>Once you have a project in hand, the next thing to do is compile or build it into object code.</p>
+<p>Building projects consists of a sbs or abld-based build system that wraps build functionality around existing SDK build tools that invoke <span class="code">makmake</span> commands (e.g. <span class="code">makmake bldfiles</span> and <span class="code">sbs build</span>).</p>
+<p> The plug-ins provide extra functionality to set up suitable build configurations for Symbian OS C++ projects. The initial selection of a build configuration is done when you create a project, as described in <a href="new_proj_from_template_01.htm">Creating New Projects from Templates</a>. You can later <a href="../../tasks/projects/prj_set_build_tgt.htm">change</a> the Active Build Configuration. The Build Configurations also provides a command (<b>Project > <a href="../../reference/menus/build_all_targets.htm">Build All Configurations</a></b>) to build all the selected build configurations in a batch.</p>
+<p> Building Symbian OS C++ projects can involve the use of Symbian OS specific tools, such as the Symbian OS resource compiler. For detailed information on such tools, see the documentation for the SDK that you are using.</p>
+<p>You build projects to process the source files that comprise a program and
+ generate object code. The compiler flags syntax errors in the source files. Use the <a href="../../reference/ProjectPreferences.html">Properties for <project_name> </a> window to control how the project is built. The following methods build a project:</p>
+<ul>
+ <li><b>Build All Configurations</b> (<span class="code">CTRL-ALT-A</span>) — builds all build configurations for a project</li>
+ <li><b>Build Working Set</b> — specify which projects to build in a working set </li>
+ <li><b>Build Project</b> — builds the entire project if it has never been built before or on subsequent builds only those files that have changed since the last build operation</li>
+</ul>
+<blockquote>
+ <p align="left"><img src="../images/menu_new_proj_build_project.png" alt="Build Project menu" width="355" height="357"></p>
+</blockquote>
+<div class="step">
+ <h4>Building a project</h4>
+ <ol>
+ <li>Select the project to build in the Project Explorer view.</li>
+ <li>Build the project using one of these actions:
+ <div align="left">
+ <ul>
+ <li>Right-click the project in the Project Explorer view and choose Build Project (see above).</li>
+ <li>Click the Run > Build Project menu option.</li>
+ <li>Click the Build (<img src="../images/icon_build_project.png" alt="Build Project icon" width="17" height="17" align="absmiddle">) icon in the toolbar to build the project.</li>
+ </ul>
+ </li>
+ </ol>
+ <blockquote>
+ <p>Choosing any of the above actions causes Carbide to build the selected project. A <strong>Build Project</strong> dialog (below) and a progress bar appear during a lengthy build operation. All build output is shown in a <a href="../../reference/view_log.htm">Console</a> view while build errors and warnings appear in the Problems view.</p>
+ <p align="left"><img src="../images/dlg_build_project_progress.png" alt="Build Project progress dialog" width="532" height="233"></p>
+ <p>Whether a full build or incremental build is requested, Carbide forwards the request to the SDK make system. The SDK make system determines if anything needs to be
+ built. Carbide always checks that makefiles are up-to-date and
+ dependencies present.</p>
+ <p>The project is also built if you make a change to it and then click <b>Debug</b>. It may be useful to automatically save modified resources before a manual build process by enabling the <b>Save automatically before build</b> option in the <b>Window > Preferences > General ></b> <img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'> Workspace</a> preference panel. </p>
+ <p class="note"><b>NOTE</b> If you want to turn off building before launching, uncheck the <b>Build (if required) before launching</b> option in the <b>Window > Preferences > Run/Debug ><img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel.</p>
+ <p>When performing a build, output is displayed in the <a href="../../reference/view_log.htm">Console</a> view. If you do not want to clear the console before each build you need to uncheck the option <b>Always clear console before building</b> in the <b> Console</b> panel. This option is enabled by default. You can access this panel by selecting <b>Window > Preferences > C/C++ > Build ><img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'> Console</a></b> preference panel (below).</p>
+ <p align="left"><img src="../images/pref_cdt_build_console.png" alt="Console preference panel" width="635" height="554"></p>
+ <p>Not clearing the console is useful when you are performing multiple builds, such as a regular project build, building a project package (.pkg) file, and building a ROM image. For example, if you do not clear the console before each build, then a subsequent build will not overwrite information from a previous build.</p>
+ </blockquote>
+ <ol start="2">
+ <li>Verifying a successful project build <br />
+ <p>Once compiling is complete use the <strong>Project Explorer</strong>, <strong>Problems</strong>, <strong>Console</strong>, and <strong>Executables</strong> views to locate and resolve any problems generated during the build.</p>
+ <ol type="a">
+ <li>Examine the project icon in the Project Explorer view<br>
+ <ul>
+ <li><img src="../images/icon_project_built.png" alt="Project built icon" width="19" height="17"> — a successfully built project icon.</li>
+ <li> <img src="../images/icon_project_warning_badge.png" alt="Warning badge" width="19" height="18"> — projects with warning messages show a yield badge.</li>
+ <li><img src="../images/icon_project_error_badge.png" alt="Error badge" width="20" height="19"> — projects with error messages show a red badge.</li>
+ </ul>
+ </li>
+
+ <li>Check the Problems view for error or warning messages<br />
+ <p>Examine the <a href="PLUGINS_ROOT//org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm">Problems</a> view to see what errors and warning messages were generated during the build. The Description column contains additional information about the problem that can help you resolve it.</p>
+ <p><img src="../images/new_build_project_problems_view.png" alt="Executables view" width="797" height="210"></p>
+ </li>
+ <li>Examine the Console view for more specific details on an error or warning message<br />
+ <p>Use the <a href="../../reference/view_log.htm">Console</a> view to see where a specific problem occured during the build.</p>
+ <p><img src="../images/new_build_project_console_view.png" alt="Executables view" width="797" height="210"></p>
+ </li>
+ <li>Examine the Executables view for missing source files<br />
+ <p>Use the <a href="../../reference/view_executables.htm">Executables</a> view to see what source files were used during the build. Sources shown in gray are those Carbide cannot find. Missing sources in an SDK not built on your machine are common, but missing sources that you created can be resolved.</p>
+ <p><img src="../images/new_build_project_executables_view.png" alt="Executables view" width="713" height="210"></p>
+ </li>
+ </ol>
+ <p>Once you're resolved all the build errors in a project, its time to link the program to a specific target. This is done with a launch configuration.</p>
+ </li>
+ </ol>
+</div>
+<h4><strong>NEXT STEP</strong> > <a href="new_proj_from_template_03.htm">Defining</a> a launch configuration for running or debugging the application</h4>
+<h4></h4>
+<h4>Other references</h4>
+<ul>
+
+
+ <li><a href="new_proj_from_template_00.htm">Emulator Application Projects</a><a href="./"></a><a href="./"></a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_03.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Defining a launch configuration</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Defining a launch configuration</h2>
+<p>In this example we show how to create a new project using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
+<ol>
+ <li><a href="new_proj_from_template_01.htm">Creating</a> a project from a project template</li>
+ <li><a href="new_proj_from_template_02.htm">Building</a> the object code based on the project sources</li>
+ <li><strong>Defining a launch configuration for running or debugging the application</strong></li>
+ <li><a href="new_proj_from_template_04.htm">Controlling and debugging</a> the running program using the Carbide debugger</li>
+</ol>
+<hr>
+<p><strong></strong>To run or debug a project you need a <a href="../../projects/launch/launch_configs_overview.htm">launch configuration</a>. A project must have at least one launch configuration, and can have as many as necessary. It is not unusual to have two or more launch configurations per target device, usually a debug version and a run version. You can use the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> to create them all.</p>
+<ul>
+ <li>On emulator targets, the <strong>New Launch Configuration</strong> <strong>Wizard</strong> usually has all the information it requires to create a launch configuration and launch the program on the emulator. If at any time it needs additional information, dialogs will ask for it, then launch the program.</li>
+ <li>On device targets, the <strong>New Launch Configuration</strong> <strong>Wizard</strong> requests all the additional information it needs like the target device, the remote connection, and more, before it creates the launch configuration. Once it has all the required data, it creates the launch configuration, then downloads the executable to the device and launches it.</li>
+</ul>
+<p>Once the emulator or device is loaded with the executable, a debug session can begin. </p>
+<p>If at any time the <strong>New Launch Configuration</strong> <strong>Wizard</strong> encounters a problem during a later launch sequence it will request settings clarification before continuing. For example, maybe the target device has changed, or a new ROM has been installed. Either of these will trigger a request for clarification.</p>
+<div class="step">
+ <h4>Defining a launch configuration (emulator example)</h4>
+ <ol>
+ <li>Select the project to run in the Project Explorer view.</li>
+ <li>To run the project without the debugger choose:<br />
+ <p>To simply run the project on the chosen target use one of the following actions. Use this option to verify a release program's execution without debugging symbols.</p>
+ <ol type="a">
+ <li>Right-click the project and click Run As > Run Symbian OS Application on Emulator.</li>
+ <li>Click the Run > Run (<span class="code">CTRL-F11</span>) menu item.</li>
+ <li>Click the Run (<img src="../images/icon_run.png" alt="Run icon" width="16" height="16" align="absmiddle">) icon in the toolbar.</li>
+ </ol>
+ </li>
+ <li>Select the Process to launch in the Executable Selection page, then click Next.<br />
+ <p><img src="../images/new_launch_config_03.png" width="671" height="433"></p>
+ </li>
+ <li>Set the Build (if required) before launching option in the Build Options Selection page, then click Next.<br />
+ <p><img src="../images/new_launch_config_04.png" width="671" height="433"></p>
+ </li>
+ <li>Verify the new launch configuration settings in the New Launch Configuration page.<br />
+ <p><img src="../images/new_launch_config_05.png" width="671" height="433"></p>
+ </li>
+ <li>(Optional) Checkmark the Advanced settings option to further customize the launch configuration.</li>
+ <li>Click Finish. <br />
+ <p>Carbide launches the emulator, transfers the HelloWorld executable to it, then launches the program (see below). You can then use the soft-keys to choose actions from the <strong>Options</strong> soft-menu. Click the <strong>Exit</strong> soft-key to close the emulator and return to Carbide.c++.</p>
+ <p align="left"><img src="../images/new_launch_config_08.png" alt="Emulator" width="235" height="450"></p>
+ </li>
+ </ol>
+ <p>With a launch configuration in place, its now possible to edit, build, and run a project in the emulator. However, since none of us can write perfect code the first time the use of a debugger is essential for further development of our project.</p>
+</div>
+<h4><strong>NEXT STEP</strong> > <a href="new_proj_from_template_04.htm">Controlling and debugging</a> the running program using the Carbide debugger</h4>
+<h4>Other references</h4>
+<ul>
+
+ <li><a href="new_proj_from_template_00.htm">Emulator Application Projects</a><a href="./"></a><a href="./"></a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_04.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<title>Launching and debugging an executable </title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2><strong>Launching and debugging an executable </strong></h2>
+<p>In this example we show how to create a new project using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
+<ol>
+ <li><a href="new_proj_from_template_01.htm">Creating</a> a project from a project template</li>
+ <li><a href="new_proj_from_template_02.htm">Building</a> the object code based on the project sources</li>
+ <li><a href="new_proj_from_template_03.htm">Defining</a> a launch configuration for running or debugging the application</li>
+ <li><strong>Launching and debugging an executable using the Carbide debugger</strong></li>
+</ol>
+<hr>
+<p class="note"><b>NOTE</b> You can only debug compiled programs. Use the <a href="../projects/prj_build.htm">Build Project</a> command to compile project sources into a binary file if you do not already have an executable in the project. A symbolics (<span class="code">.sym</span>) file is also required for debugging on a target device. Ensure that a <span class="code">.sym</span> file has been created. If you are importing an existing application, you may have to rebuild the application and create a related <span class="code">.sym</span> file. Make sure a <span class="code">.sym</span> file has been created in the output directory.</p>
+<div class="step">
+ <h4><strong></strong>Launching and debugging an executable</h4>
+ <ol>
+ <li>Select the project to debug in the Project Explorer view.<br />
+ <p>For this example you should choose the HelloWorld project created in <a href="new_proj_from_template_01.htm">Step 1</a> of this tutorial.</p>
+ </li>
+ <li>Set a breakpoint in the project.<br>
+ <p>Open the <span class="code">\src\HelloWorldAppUi.cpp</span> file and <a href="../../debugger/breakpoints/toggling_breakpoints.htm">set</a> a breakpoint in the <span class="code">HandleCommandL</span> routine on Line 103.</p>
+ <p><img src="../images/debugging_project_02.png" alt="Setting a breakpoint" width="577" height="192"></p>
+ </li>
+ <li>Launch the debug session.<br />
+ <p>To run the project on the chosen target and start a debug session use one of the following actions. Clicking Debug is the most common choice as it enables you to assume control of the executable should you encounter a problem.</p>
+ <ul>
+ <li>Right-click the project and choose Debug As > Debug Symbian OS Application on Emulator.</li>
+ <li>Click the Run > Debug (<span class="code">F11</span>) menu item.</li>
+ <li>Click the Debug (<img src="../images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) icon in the toolbar.</li>
+ </ul>
+ <p>The emulator is launched and the <a href="../../reference/perspective_debug.htm">Debug</a> perspective appears to manage the debug session.</p>
+ </li>
+ <li>Click the Options soft-menu and select any menu option to hit the breakpoint set in Step 2. <br />
+ <p><img src="../images/debugging_project_04.png" alt="Select menu option" width="360" height="397"></p>
+ <p>Which returns control to the <strong>Debug</strong> perspective in Carbide. Use the various views to examine the program as it runs. Examine variables, set more breakpoints, etc.</p>
+ <p><img src="../images/debugging_project_05.png" alt="Select menu option" width="749" height="626"></p>
+ </li>
+ <li>Use any of the step commands in the Debug view to step through the program source code.<br />
+ <ul>
+ <li>Click Step Into (<span class="code">F5</span>) to execute the current line and enter a function or method.</li>
+ <li>Click Step Over (<span class="code">F6</span>) to execute the current line.</li>
+ <li>Click Step Return (<span class="code">F7</span>) to execute lines until exiting the function or method.</li>
+ </ul>
+ </li>
+ <li>Click the Resume icon in the Debug view to return control to the program.</li>
+ <li>Click the Exit soft-key in the emulator to exit the debug session.<br />
+ <p>The HelloWorld program stops, the emulator exits, and control returns to Carbide.</p>
+ </li>
+ </ol>
+</div>
+<p>That's it. Congratulations on creating, building, and debugging a Carbide project.</p>
+<h4>Other references</h4>
+<ul>
+
+ <li><a href="new_proj_from_template_00.htm">Emulator Application Projects</a><a href="./"></a><a href="./"></a><a href="./"></a><a href="./"></a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_00.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Remote Target Debugging (Run-mode) Tutorial</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Remote Target Debugging (Run-mode) Tutorial</h2>
+<p>In this example we demonstrate how to debug applications on a remote device using the Application TRK remote debug agent. This enables you to test programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
+<ol>
+ <li><a href="run_mode_debug_example_01.htm">Connect</a> target device for PC</li>
+ <li><a href="../trk/trk_installation_instr.htm">Install </a>TRK remote agent (v3.2.7) or later on the target device</li>
+ <li><a href="run_mode_debug_example_04.htm">Configure</a> project for downloading</li>
+ <li><a href="run_mode_debug_example_05.htm">Debug</a> project on target device</li>
+</ol>
+<h4>Other references</h4>
+<ul>
+ <li><a href="new_proj_from_template_00.htm">Emulator Application Projects</a></li>
+ <li><a href="new_proj_dll_example_00.htm">DLL Projects</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_01.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Connect target device to PC Tutorial</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2><strong>Connect target device to PC</strong></h2>
+<p>In this example we demonstrate how to debug applications on a remote device using the Application TRK remote debug agent. This enables you to test programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
+<ol>
+ <li><strong>Connect target device to PC</strong></li>
+ <li><a href="../trk/trk_installation_instr.htm">Install </a>TRK remote agent (v3.2.7) or later on the target device</li>
+ <li><a href="run_mode_debug_example_04.htm">Configure</a> project for downloading</li>
+ <li><a href="run_mode_debug_example_05.htm">Debug</a> project on target device</li>
+ </ol>
+<hr>
+<p>The most reliable connection between a remote device and your PC is a cable. In this case, the USB cable that physically connects your phone to the a PC USB connection. Once connected, Carbide uses plug-and-play (PnP) to create a remote connection to the phone or remote device.</p>
+<p class="note"><strong>NOTE</strong> This tutorial assumes that Carbide is setup properly enabling you to create, build, and debug applications with an emulator.</p>
+<div class="step">
+ <h4 align="left">Connecting remote devices to PC</h4>
+ <ol>
+ <li>Connect the USB cable between the remote device and PC running Carbide.<br />
+ <p>Use the <strong>Remote Connections</strong> view to verify a successful connection or by looking at the remote connection trim display shown at the bottom of the workplace window.</p>
+ <p><img src="../images/run_mode_debug_01.png" alt="Remote Connection view"> <img src="../images/run_mode_debug_02.png" alt="Remote Connection trim indicator"></p>
+ <p>The <strong>Status</strong> column indicates whether the service you need for debugging, TRK, is <strong>Available</strong>. If it's status is <strong>Not Accessible</strong> you are probably missing the TRK remote agent on the remote device.</p>
+ </li>
+ <li>Click OK on the remote device when it asks to use PC Suite mode with USB.<br />
+ <p class="note"><strong>NOTE</strong> Debugging requires the use of PC Suite mode. If you are in another mode, like Mass storage mode, an alert appears asking you to change.</p>
+ </li>
+ </ol>
+</div>
+<p><strong>NEXT</strong>: <a href="run_mode_debug_example_02.htm">Install TRK remote agent</a></p>
+<h4>Other references</h4>
+<ul>
+ <li><a href="run_mode_debug_example_00.htm">Remote Target Debugging (Run-mode)</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_02.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Install TRK remote agent Tutorial</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
+<body bgcolor="#FFFFFF">
+<h2>Install TRK remote agent</h2>
+<p>In this example we demonstrate how to debug applications on a remote device using the Application TRK remote debug agent. This enables you to test programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
+<ol>
+ <li><a href="run_mode_debug_example_01.htm">Connect</a> target device to PC</li>
+ <li><strong>Install TRK remote agent (v3.2.7) or later on the target device</strong></li>
+ <li><a href="run_mode_debug_example_03.htm">Configure</a> project for downloading</li>
+ <li><a href="run_mode_debug_example_04.htm">Debug</a> project on target device</li>
+ </ol>
+<hr>
+<p>To debug on a remote device you need a program to communicate between the Carbide debugger and your executable running on the device. That program is the <strong>TRK</strong> (Terminal Resident Kernel) remote agent, also known as <strong>Application TRK</strong>. </p>
+<p> </p>
+<div class="step">
+ <h4>Installing or updating the TRK remote agent</h4>
+ <ol>
+ <li>Select the Connection to edit in the Remote Connections view.</li>
+ <li>Click the Edit Settings... icon (<img src="../images/icon_edit_settings.png" alt="Edit Settings icon" width="17" height="17" align="absmiddle">) in the Remote Connections toolbar.<br />
+ <p><img src="../images/run_mode_debug_05.png" alt="Click Edit Settings icon"></p>
+ </li>
+ <li>Click the Install Remote Agents tab. <br />
+ <p><img src="../images/run_mode_debug_06.png" alt="Click Install Remote Agents tab"></p>
+ </li>
+ <li>Select the latest remote agent to install.<br />
+ <p>Choose the remote agent to install. Since there are different builds for different OSes, knowing the OS installed on the device helps. </p>
+ </li>
+ <p><img src="../images/run_mode_debug_07.png" alt="Click Install Remote Agents tab"></p>
+ <p class="note"><strong>NOTE</strong> If you don't know what OS version is on the device, always choose the remote agent that supports the highest OS version available. Should that one not work, drop down to the next OS version in line and repeat.</p>
+ <li>
+ <p>Click <strong>Install</strong>.</p>
+ </li>
+ </ol>
+</div>
+<p><strong>NEXT:</strong> <a href="run_mode_debug_example_03.htm">Configure project for debugging</a></p>
+<h4>Other references</h4>
+<ul>
+ <li><a href="run_mode_debug_example_00.htm">Remote Target Debugging (Run-mode)</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_03.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Configure project for debugging Tutorial</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Configure project for debugging</h2>
+<p>In this example we demonstrate how to debug applications on a remote device using the Application TRK remote debug agent. This enables you to test programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
+<ol>
+ <li><a href="run_mode_debug_example_01.htm">Connect</a> target device to PC</li>
+ <li><a href="../trk/trk_installation_instr.htm">Install </a>TRK remote agent (v3.2.7) or later on the target device</li>
+ <li><strong>Configure project for downloading</strong></li>
+ <li><a href="run_mode_debug_example_05.htm">Debug</a> project on target device</li>
+ </ol>
+<hr>
+<p> </p>
+<div class="step">
+ <h4><strong>Configure project for downloading</strong></h4>
+ <ol>
+ <li>Select a configuration to debug the HelloWorld application on the target device.
+ <p>We choose <strong>Phone Debug (armv5_udeb)</strong> for this example using the <strong>Manage Configurations</strong> icon on the toolbar, but yours name may differ based upon the SDK selected for your project.</p>
+ <p><img src="../images/debugging_project_07.png" alt="Select device target"></p>
+ </li>
+ <li>Click the Debug icon (<img src="../images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) on the toolbar.
+ <p>This opens the <strong>New Launch Configuration Wizard</strong> dialog asking for additional information. For the first launch you must define the name of the package to install on the target device.</p>
+ <p><img src="../images/debugging_project_08.png" alt="New Launch Configuration Wizard" width="538" height="434"></p>
+ <ol type="a">
+ <li>Click the Change... button in the Debug Process section to open the Change Debug Process dialog.
+ <p><img src="../images/debugging_project_09.png" alt="New Launch Configuration Wizard" width="621" height="410"></p>
+ </li>
+ <li>Enable the 'Launch program on device' option and select the executable to launch.
+ <p>This tells the TRK remote agent which application to launch once its downloaded.</p>
+ </li>
+ <li>Click the 'Modify SIS builder settings for build configuration' to open the Properties for <em>project</em> dialog.</li>
+ <p>The <strong>Carbide.c++ > Build Configurations > SIS Builder</strong> tab is shown.</p>
+ <p><img src="../images/debugging_project_11.png" alt="SIS Builder tab" width="606" height="297"></p>
+ <li>Click Add to open the SIS Properties dialog.
+ <p><img src="../images/debugging_project_10.png" alt="SIS Properties dialog"></p>
+ </li>
+ <li>Select the project's PKG file to download to the device, then click OK.
+ <p><img src="../images/debugging_project_12.png" alt="SIS Builder tab" width="607" height="292"></p>
+ </li>
+ <li>Verify the PKG in the SIS Builder tab, then click OK.</li>
+ </ol>
+ <li>Verify the settings in the Change Debug Process, then click OK.
+ <p><img src="../images/debugging_project_13.png" alt="SIS Builder tab" width="557" height="410"></p>
+ </li>
+ <li>Review the Configure launch configuration setup, then click Debug.
+ <p><img src="../images/debugging_project_14.png" alt="SIS Builder tab" width="516" height="434"></p>
+ <p>The project is built, downloaded to the target device, and the executable launched on the device.</p>
+ </li>
+ </ol>
+ <p>On subsequent launches the project will be compiled and downloaded to the target device without any setup on your part. The only time you should need to perform these actions is if you change anything that effects to launch configuration. Of course, you can always modify the settings by using the <strong>New</strong> or <strong>Debug</strong> window to edit launch configurations.</p>
+</div>
+<p><strong>NEXT:</strong> <a href="run_mode_debug_example_04.htm">Debug project on target device</a></p>
+<h4>Other references</h4>
+<ul>
+ <li><a href="run_mode_debug_example_00.htm">Remote Target Debugging (Run-mode)</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_04.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debug project on target device Tutorial</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debug project on target device</h2>
+<p>In this example we demonstrate how to debug applications on a remote device using the Application TRK remote debug agent. This enables you to test programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
+<ol>
+ <li><a href="run_mode_debug_example_01.htm">Connect</a> target device to PC</li>
+ <li><a href="run_mode_debug_example_02.htm">Install</a> TRK remote agent (v3.2.7) or later on the target device</li>
+ <li><a href="run_mode_debug_example_03.htm">Configure</a> project for downloading</li>
+ <li><strong>Debug project on target device</strong></li>
+</ol>
+<hr>
+<p>You debug on a remote device using the exact same methods used for the emulator. Once the project is built and downloaded to the target device, the TRK remote agent then takes control. Then, using the Carbide debugger you can use all the debugger features to exercise the program on the device while monitoring its vitals in the <a href="../../reference/perspective_debug.htm">Debug</a> perspective.</p>
+<div class="step">
+ <h4>Debugging a program on a remote device</h4>
+ <ol>
+ <li>Set breakpoints in the program.
+ <p><a href="../../debugger/breakpoints/toggling_breakpoints.htm">Set breakpoints</a> at the critical points in the program where you want to stop execution.</p>
+ </li>
+ <li>Click the Debug icon (<img src="../images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) to launch the program for debugging on the target device.
+ <p>Follow the steps in <a href="run_mode_debug_example_03.htm">Configure project for downloading</a> to build and launch the program for debugging.</p>
+ </li>
+ <li>Use the Carbide debugger to examine program internals and control its execution.
+ <p>Use any of the following features to debug your program:</p>
+ <ul>
+ <li>Use the various <a href="../../debugger/debug/debug.htm">stepping</a> commands to walk through the program.</li>
+ <li>Examine and change variables and expressions in the <a href="../../debugger/variables/variables.htm">Variables</a> view.</li>
+ <li>Examine the stack in the <a href="../../debugger/debug/viewing_debug.htm">Debug</a> view</li>
+ <li>Review the assembler code in the <a href="../../reference/view_disassembly.htm">Disassembly</a> view</li>
+ <li>Examine memory usage in the <a href="../../reference/view_memory_wnd.htm">Memory</a> view</li>
+ </ul>
+ </li>
+ </ol>
+</div>
+<h4>Other references</h4>
+<ul>
+ <li><a href="run_mode_debug_example_00.htm">Remote Target Debugging (Run-mode)</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_setup.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_setup.htm Wed Jul 21 12:11:48 2010 -0500
@@ -10,9 +10,9 @@
<body bgcolor="#FFFFFF">
<h2>Qt Development Setup</h2>
<p>There are some prerequisites to using Qt projects within the Carbide environment. This includes downloading the correct SDKs, building <span class="code">qmake</span> to use the SDKs, and finally, building the libraries for your target environments. </p>
-<p>You should have the Qt SDK for Symbian that works with the S60 SDK in order to develop applications with Carbide. These steps include:</p>
+<p>You should have the <strong>Nokia Qt SDK 1.0</strong> in order to develop Qt applications with Carbide. These steps include:</p>
<ol type="a">
- <li>Download the <a href="http://qt.nokia.com/downloads/symbian-cpp">Qt SDK for Symbian</a> package</li>
+ <li>Download the <a href="http://www.forum.nokia.com/Develop/Qt/">Nokia Qt SDK 1.0</a> package</li>
<li>Install the Qt SDK using the instructions found in the <span class="code">INSTALL</span> file located in the Qt SDK for Symbian folder, including:
<ol>
<ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/AIFEditor.html Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>AIF Editor in AIF Definition File</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <h2>AIF Editor</h2>
-
- <p>
- The <b>AIF Editor</b> allows you to specify the Symbian OS
- resource file and bitmaps that should be included in a Symbian OS application
- information (AIF) file. Use of AIF files is restricted to using <span class="filename">.bmp</span> files and works for versions 2.x and later releases of the Symbian OS SDKs. For more information, see <a href="../concepts/AIFDefWizard.html">AIF File</a>.</p>
- <p>
- The AIF Editor is shown when a new AIF file is created or an existing file is edited in the Resources group of the MMP editor's Sources tab. Refer to <a href="../tasks/AppInfoFile.html">Creating an AIF File</a> for more information.</p>
-
- <p align="center" class="Image"><img src="../tasks/projects/images/AIF_editor2.png" width="700" height="575" /></p>
- <h5>Table 1. AIF Editor —Items</h5>
- <table width="94%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="32%" scope="col">Item</th>
- <th width="68%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td><b>Target File </b></td>
- <td><p>Specifies the filename of the compiled AIF file, relative to the target path. Click the untitled.aif button to set the target file based on the SDK and project name.</p></td>
- </tr>
- <tr>
- <td><b>Resource File Path </b></td>
- <td>Choose a resource file from the current project, browse the file system or enter the path. For relative paths use the Carbide project as the reference point, not the MMP file location. </td>
- </tr>
- <tr>
- <td><b>Up</b></td>
- <td>Select an image in the list and click Up to move the selection one position up in the list.</td>
- </tr>
- <tr>
- <td><b>Down</b></td>
- <td><p>Select an image in the list and click Down to move the selection one position down in the list. </p></td>
- </tr>
- <tr>
- <td><b>Pair Image and Mask </b></td>
- <td>Select two adjacent unpaired BMP image entries in the list and click this button to combine the images together into image/mask pairs.</td>
- </tr>
- <tr>
- <td><b>Split Image and Mask </b></td>
- <td>Select a paired BMP image in the list and click this button to split the image into image and mask entries. </td>
- </tr>
- <tr>
- <td><b>Swap Image and Mask </b></td>
- <td>Select a paired BMP image in the list and click this button to swap the image and mask files and format information in paired image entries. </td>
- </tr>
- <tr>
- <td><b><a href="add_from_project.htm">Add From Project</a> </b></td>
- <td>Click this button to open an Add Images from Project dialog to reference available images in the project.</td>
- </tr>
- <tr>
- <td><b><a href="add_from_filesys.htm">Add From Filesystem</a></b></td>
- <td>Click this button to open an Add Images From Filesystem dialog to locate and reference existing images in the filesystem or copy images to the project.</td>
- </tr>
- <tr>
- <td><b>Remove</b></td>
- <td>Select an image and click Remove to remove image entry from the list. This does not delete file from directory.</td>
- </tr>
- <tr>
- <td><b>Color depth </b></td>
- <td>Select the bit depth used to encode the image at build time.</td>
- </tr>
- <tr>
- <td><b>Mask depth </b></td>
- <td><p>Select the bit depth used to encode the mask at build time. Options include:</p>
- <ul>
- <li>n/a - Do not apply mask depth to images </li>
- <li>1 - A 1-bit mask treats pixels as "on/off" bits, where black is opaque and white is transparent. </li>
- <li>8 - An 8-bit mask is treated as alpha values, where black is transparent and white is opaque.</li>
- </ul></td>
- </tr>
- <tr>
- <td><b>Color format </b></td>
- <td>Select Color to encode the image(s) as color or select Grayscale to encode the image(s) as grayscale.</td>
- </tr>
- <tr>
- <td><b>Preview</b></td>
- <td>A preview of the image as it will appear at runtime. </td>
- </tr>
- </table>
- <p> </p>
- <h5>Related concepts</h5>
- <ul>
- <li><a href="../concepts/AIFDefWizard.html">AIF File</a></li>
- </ul>
- <h5>Related tasks</h5>
- <ul>
- <li><a href="../tasks/AppInfoFile.html">Creating an AIF File</a></li>
- </ul>
- <div id="footer">Copyright © 2010 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></div>
-
- </body>
-</html>
-
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/BasicSettings.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/BasicSettings.html Wed Jul 21 12:11:48 2010 -0500
@@ -1,57 +1,57 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Basic Settings in New Project Wizard</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <h2>Basic Settings</h2>
- <p>
- You can set some basic properties for the project in this page, like Application UID, Author and Copyright
- notice for the project. </p>
- <p class="note"><b>NOTE</b> Fields appearing in window vary depending upon the type of project being created. </p>
- <p align="center" class="Image"><img src="../images/step5.png" width="500" height="567" /></p>
- <table width="787"
-border="0" cellpadding="2" cellspacing="0">
- <tr valign="top"><th width="206" class="Cell">Name</th>
- <th width="765" class="Cell">Function</th>
- </tr><tr valign="top"><td class="Cell">
- <p>
- <b>Application UID</b>
- </p></td><td class="Cell">
- <p>
- Specifies a 32-bit ID to identify the project.</p></td></tr><tr valign="top"><td class="Cell">
- <p>
- <b>Vendor ID</b>
- </p></td><td class="Cell">
- <p>
- Appears for projects that require a 32-bit unique ID to identify the vendor of the
- executable. In versions of Symbian OS with platform security, a program can
- read a VID at runtime to check that a binary comes from a particular source. In
- most cases, the VID should be zero, meaning that source of the executable is
- not required for any security checks.
- </p></td></tr><tr valign="top"><td class="Cell">
- <p>
- <b>Author</b>
- </p></td><td class="Cell">
- <p>
- Specifies the name of the Author, who is creating this project.
- </p></td></tr><tr valign="top"><td class="Cell">
- <p>
- <b>Copyright Notice</b>
- </p></td><td class="Cell">
- <p>
- Specifies the copyright notice to be added to the source code of the
- project.
- </p></td></tr>
- </table>
- <p class="note"><b>NOTE</b> Tooltips are available for the various fields. Simply hover the pointer over the field title to view the tooltip. </p>
- <h5>Related tasks</h5>
- <ul>
- <li><a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>
-
- </li>
- </ul>
-<div id="footer">Copyright © 2010 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></div>
-
- </body>
- </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Basic Settings in New Project Wizard</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+ <h2>Basic Settings</h2>
+ <p>
+ You can set some basic properties for the project in this page, like Application UID, Author and Copyright
+ notice for the project. </p>
+ <p class="note"><b>NOTE</b> Fields appearing in window vary depending upon the type of project being created. </p>
+ <p align="center" class="Image"><img src="../images/step5.png" width="500" height="500" /></p>
+ <table width="787"
+border="0" cellpadding="2" cellspacing="0">
+ <tr valign="top"><th width="206" class="Cell">Name</th>
+ <th width="765" class="Cell">Function</th>
+ </tr><tr valign="top"><td class="Cell">
+ <p>
+ <b>Application UID</b>
+ </p></td><td class="Cell">
+ <p>
+ Specifies a 32-bit ID to identify the project.</p></td></tr><tr valign="top"><td class="Cell">
+ <p>
+ <b>Vendor ID</b>
+ </p></td><td class="Cell">
+ <p>
+ Appears for projects that require a 32-bit unique ID to identify the vendor of the
+ executable. In versions of Symbian OS with platform security, a program can
+ read a VID at runtime to check that a binary comes from a particular source. In
+ most cases, the VID should be zero, meaning that source of the executable is
+ not required for any security checks.
+ </p></td></tr><tr valign="top"><td class="Cell">
+ <p>
+ <b>Author</b>
+ </p></td><td class="Cell">
+ <p>
+ Specifies the name of the Author, who is creating this project.
+ </p></td></tr><tr valign="top"><td class="Cell">
+ <p>
+ <b>Copyright Notice</b>
+ </p></td><td class="Cell">
+ <p>
+ Specifies the copyright notice to be added to the source code of the
+ project.
+ </p></td></tr>
+ </table>
+ <p class="note"><b>NOTE</b> Tooltips are available for the various fields. Simply hover the pointer over the field title to view the tooltip. </p>
+ <h5>Related tasks</h5>
+ <ul>
+ <li><a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>
+
+ </li>
+ </ul>
+<div id="footer">Copyright © 2010 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></div>
+
+ </body>
+ </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html Wed Jul 21 12:11:48 2010 -0500
@@ -1,52 +1,52 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>INF Editor</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <h2>INF Editor - Overview Tab</h2>
-
- <p>
- The <b>INF Editor</b> allows you to view and modify Symbian project files and export files to be included in building your application. The settings displayed are those active for the active build configuration. However, changes made in the INF editor can be applied globally to all build configurations. Changes made in the INF editor are automatically written to the project's .INF file. You can view the .inf file by selecting the bld.inf tab located along the bottom of the INF editor.</p>
-<p>
- The INF Editor is shown when an INF file is
- opened from the <a href="view_cpp_projects.htm">Project Explorer</a> view or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view by double-clicking on the file. The INF Editor is shown in Figure 1.</p>
- <p align="center"><img src="images/inf_editor_overview.png" width="743" height="533" /></p>
- <p align="left" class="figure">Figure 1 - INF Editor</p>
- <p></p>
- <table cellpadding="2" cellspacing="0"
-border="0">
-<tr valign="top"><th width="173" class="Cell">Name</th><th width="516" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
- <p>
- <b>Components</b></p></td><td class="Cell">
- <p>
- Add components such as MMP and make files to be part of the normal build process.</p>
- <ul>
- <li>Create New MMP File - creates a new MMP file at the bottom of the Component list.</li>
- <li>Add Existing MMP File - imports a MMP file at the bottom of the Component list.</li>
- <li>Add Existing Makefile - adds a make file to the bottom of the Component list. </li>
- <li>Edit - Select a component and click Edit to apply the Tidy attribute or specify the Build as ARM option.</li>
- <li>Open - Select a component and click Open to open the component in an editor window.</li>
- <li>Up - Select a component and click Up to move the component up in the list.</li>
- <li>Down - Select a component and click Down to move the component down in the list.</li>
- <li>Remove - Select a component and click Remove to remove the component from the build process.</li>
- </ul></td></tr><tr valign="top"><td class="Cell">
- <p>
- <b>Test Components</b>
- </p></td><td class="Cell">
- <p>
- Create, import, edit, open, move, or remove MMP and make files that are part of a test build process.</p></td></tr>
- </table>
- <h5>Other references</h5>
- <ul>
- <li><a href="INF_Editor_addedit_mmp.html">INF Editor - Add/Edit MMP File</a></li>
- <li><a href="INF_Editor_addedit_make.html">INF Editor - Add/Edit Make File</a></li>
- <li><a href="INF_Editor_exports.html">INF Editor - Exports</a></li>
- </ul>
-
-
-<div id="footer">Copyright © 2010 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></div>
-
- </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><head>
+<title>INF Editor</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+ <h2>INF Editor - Overview Tab</h2>
+
+ <p>
+ The <b>INF Editor</b> allows you to view and modify Symbian project files and export files to be included in building your application. The settings displayed are those active for the active build configuration. However, changes made in the INF editor can be applied globally to all build configurations. Changes made in the INF editor are automatically written to the project's .INF file. You can view the .inf file by selecting the bld.inf tab located along the bottom of the INF editor.</p>
+<p>
+ The INF Editor is shown when an INF file is
+ opened from the <a href="view_cpp_projects.htm">Project Explorer</a> view or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view by double-clicking on the file. The INF Editor is shown in Figure 1.</p>
+ <p align="center"><img src="images/inf_editor_overview.png" width="656" height="563" /></p>
+ <p align="left" class="figure">Figure 1 - INF Editor</p>
+ <p></p>
+ <table cellpadding="2" cellspacing="0"
+border="0">
+<tr valign="top"><th width="173" class="Cell">Name</th><th width="516" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+ <p>
+ <b>Components</b></p></td><td class="Cell">
+ <p>
+ Add components such as MMP and make files to be part of the normal build process.</p>
+ <ul>
+ <li>Create New MMP File - creates a new MMP file at the bottom of the Component list.</li>
+ <li>Add Existing MMP File - imports a MMP file at the bottom of the Component list.</li>
+ <li>Add Existing Makefile - adds a make file to the bottom of the Component list. </li>
+ <li>Edit - Select a component and click Edit to apply the Tidy attribute or specify the Build as ARM option.</li>
+ <li>Open - Select a component and click Open to open the component in an editor window.</li>
+ <li>Up - Select a component and click Up to move the component up in the list.</li>
+ <li>Down - Select a component and click Down to move the component down in the list.</li>
+ <li>Remove - Select a component and click Remove to remove the component from the build process.</li>
+ </ul></td></tr><tr valign="top"><td class="Cell">
+ <p>
+ <b>Test Components</b>
+ </p></td><td class="Cell">
+ <p>
+ Create, import, edit, open, move, or remove MMP and make files that are part of a test build process.</p></td></tr>
+ </table>
+ <h5>Other references</h5>
+ <ul>
+ <li><a href="INF_Editor_addedit_mmp.html">INF Editor - Add/Edit MMP File</a></li>
+ <li><a href="INF_Editor_addedit_make.html">INF Editor - Add/Edit Make File</a></li>
+ <li><a href="INF_Editor_exports.html">INF Editor - Exports</a></li>
+ </ul>
+
+
+<div id="footer">Copyright © 2010 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></div>
+
+ </body>
+</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MBMEditor.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MBMEditor.html Wed Jul 21 12:11:48 2010 -0500
@@ -1,110 +1,110 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>MBM Editor</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <h2>MBM Editor</h2>
-
- <p>
- The <b>MBM Editor</b> allows you to specify the bitmaps that
- should be included in a Symbian OS multi-bitmap (MBM) file. Use of MBM files for general purpose graphics is restricted to using <span class="filename">.bmp</span> files and works for versions 2.x and later releases of the Symbian OS SDKs. For more
- information, see <a href="../concepts/MBMDefWizard.html">MBM File</a> and <a href="../tasks/Multi-BitmapFile.html">Creating a MBM File</a>. </p>
-<p>
- The MBM Editor is shown when an MBM file is
- opened for editing:</p>
- <p class="Image"><img src="../tasks/projects/images/MBM_editor.png" width="900" height="600" /></p>
- <p class="figure">Figure 1 - MBM Editor</p>
- <h5>Table 1. MBM Editor —Items</h5>
- <table width="94%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="32%" scope="col">Item</th>
- <th width="68%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td><b>Target File </b></td>
- <td><p>Specifies the EPOCROOT relative path for the compiled images. Click the Default button to set the target file based on the SDK and project name. </p></td>
- </tr>
- <tr>
- <td><b>Header File </b></td>
- <td>Shows the generated header file. Select the Header option in the Header Generation group to create a default .mbg file. The path cannot be edited in this field. </td>
- </tr>
- <tr>
- <td><b>Header Generation</b></td>
- <td><p>Options include:</p>
- <ul>
- <li>No header - If selected, no .mbg header will be generated. </li>
- <li>Header - If selected, a .mbg header will be generated.</li>
- </ul></td>
- </tr>
- <tr>
- <td><b>Up</b></td>
- <td>Select an image in the list and click Up to move the selection one position up in the list.</td>
- </tr>
- <tr>
- <td><b>Down</b></td>
- <td><p>Select an image in the list and click Down to move the selection one position down in the list. </p></td>
- </tr>
- <tr>
- <td><b>Pair Image and Mask </b></td>
- <td>Select two adjacent unpaired BMP image entries in the list and click this button to combine the images together into image/mask pairs.</td>
- </tr>
- <tr>
- <td><b>Split Image and Mask </b></td>
- <td>Select a paired BMP image in the list and click this button to split the image into image and mask entries. </td>
- </tr>
- <tr>
- <td><b>Swap Image and Mask </b></td>
- <td>Select a paired BMP image in the list and click this button to swap the image and mask files and format information in paired image entries. </td>
- </tr>
- <tr>
- <td><b><a href="add_from_project.htm">Add From Project</a> </b></td>
- <td>Click this button to open an Add Images from Project dialog to reference available images in the project.</td>
- </tr>
- <tr>
- <td><b><a href="add_from_filesys.htm">Add From Filesystem</a></b></td>
- <td>Click this button to open an Add Images From Filesystem dialog to locate and reference existing images in the filesystem or copy images to the project.</td>
- </tr>
- <tr>
- <td><b>Remove</b></td>
- <td>Select an image and click Remove to remove image entry from the list. This does not delete file from directory.</td>
- </tr>
- <tr>
- <td><b>Color depth </b></td>
- <td>Select the bit depth used to encode the image at build time.</td>
- </tr>
- <tr>
- <td><b>Mask depth </b></td>
- <td><p>Select the bit depth used to encode the mask at build time. Options include:</p>
- <ul>
- <li>n/a - Do not apply mask depth to images </li>
- <li>1 - A 1-bit mask treats pixels as "on/off" bits, where black is opaque and white is transparent. </li>
- <li>8 - An 8-bit mask is treated as alpha values, where black is transparent and white is opaque.</li>
- </ul></td>
- </tr>
- <tr>
- <td><b>Color format </b></td>
- <td>Select Color to encode the image(s) as color or select Grayscale to encode the image(s) as grayscale.</td>
- </tr>
- <tr>
- <td><b>Set from image </b></td>
- <td>Click this button to auto-detect the image depth, mask depth, and color/grayscale setting from the image contents.</td>
- </tr>
- <tr>
- <td><b>Preview</b></td>
- <td>A preview of the image as it will appear at runtime. </td>
- </tr>
- </table>
- <h5>Related concepts</h5>
-
- <ul>
- <li><a href="../concepts/MBMDefWizard.html">MBM File</a></li>
- </ul>
- <h5>Related tasks</h5>
- <ul>
- <li><a href="../tasks/Multi-BitmapFile.html">Creating an MBM File</a></li>
- </ul>
- <div id="footer">Copyright © 2010 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></div>
-
- </body>
- </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>MBM Editor</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+ <h2>MBM Editor</h2>
+
+ <p>
+ The <b>MBM Editor</b> allows you to specify the bitmaps that
+ should be included in a Symbian OS multi-bitmap (MBM) file. Use of MBM files for general purpose graphics is restricted to using <span class="filename">.bmp</span> files and works for versions 2.x and later releases of the Symbian OS SDKs. For more
+ information, see <a href="../concepts/MBMDefWizard.html">MBM File</a> and <a href="../tasks/Multi-BitmapFile.html">Creating a MBM File</a>. </p>
+<p>
+ The MBM Editor is shown when an MBM file is
+ opened for editing:</p>
+ <p align="center" class="Image"><img src="images/wnd_edit_mbm_contents.png" alt="Edit MBM Contents window" width="900" height="600"></p>
+ <p class="figure">Figure 1 - MBM Editor</p>
+ <h5>Table 1. MBM Editor —Items</h5>
+ <table width="94%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="32%" scope="col">Item</th>
+ <th width="68%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td><b>Target File </b></td>
+ <td><p>Specifies the EPOCROOT relative path for the compiled images. Click the Default button to set the target file based on the SDK and project name. </p></td>
+ </tr>
+ <tr>
+ <td><b>Header File </b></td>
+ <td>Shows the generated header file. Select the Header option in the Header Generation group to create a default .mbg file. The path cannot be edited in this field. </td>
+ </tr>
+ <tr>
+ <td><b>Header Generation</b></td>
+ <td><p>Options include:</p>
+ <ul>
+ <li>No header - If selected, no .mbg header will be generated. </li>
+ <li>Header - If selected, a .mbg header will be generated.</li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td><b>Up</b></td>
+ <td>Select an image in the list and click Up to move the selection one position up in the list.</td>
+ </tr>
+ <tr>
+ <td><b>Down</b></td>
+ <td><p>Select an image in the list and click Down to move the selection one position down in the list. </p></td>
+ </tr>
+ <tr>
+ <td><b>Pair Image and Mask </b></td>
+ <td>Select two adjacent unpaired BMP image entries in the list and click this button to combine the images together into image/mask pairs.</td>
+ </tr>
+ <tr>
+ <td><b>Split Image and Mask </b></td>
+ <td>Select a paired BMP image in the list and click this button to split the image into image and mask entries. </td>
+ </tr>
+ <tr>
+ <td><b>Swap Image and Mask </b></td>
+ <td>Select a paired BMP image in the list and click this button to swap the image and mask files and format information in paired image entries. </td>
+ </tr>
+ <tr>
+ <td><b><a href="add_from_project.htm">Add From Project</a> </b></td>
+ <td>Click this button to open an Add Images from Project dialog to reference available images in the project.</td>
+ </tr>
+ <tr>
+ <td><b><a href="add_from_filesys.htm">Add From Filesystem</a></b></td>
+ <td>Click this button to open an Add Images From Filesystem dialog to locate and reference existing images in the filesystem or copy images to the project.</td>
+ </tr>
+ <tr>
+ <td><b>Remove</b></td>
+ <td>Select an image and click Remove to remove image entry from the list. This does not delete file from directory.</td>
+ </tr>
+ <tr>
+ <td><b>Color depth </b></td>
+ <td>Select the bit depth used to encode the image at build time.</td>
+ </tr>
+ <tr>
+ <td><b>Mask depth </b></td>
+ <td><p>Select the bit depth used to encode the mask at build time. Options include:</p>
+ <ul>
+ <li>n/a - Do not apply mask depth to images </li>
+ <li>1 - A 1-bit mask treats pixels as "on/off" bits, where black is opaque and white is transparent. </li>
+ <li>8 - An 8-bit mask is treated as alpha values, where black is transparent and white is opaque.</li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td><b>Color format </b></td>
+ <td>Select Color to encode the image(s) as color or select Grayscale to encode the image(s) as grayscale.</td>
+ </tr>
+ <tr>
+ <td><b>Set from image </b></td>
+ <td>Click this button to auto-detect the image depth, mask depth, and color/grayscale setting from the image contents.</td>
+ </tr>
+ <tr>
+ <td><b>Preview</b></td>
+ <td>A preview of the image as it will appear at runtime. </td>
+ </tr>
+ </table>
+ <h5>Related concepts</h5>
+
+ <ul>
+ <li><a href="../concepts/MBMDefWizard.html">MBM File</a></li>
+ </ul>
+ <h5>Related tasks</h5>
+ <ul>
+ <li><a href="../tasks/Multi-BitmapFile.html">Creating an MBM File</a></li>
+ </ul>
+ <div id="footer">Copyright © 2010 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></div>
+
+ </body>
+ </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor.html Wed Jul 21 12:11:48 2010 -0500
@@ -7,34 +7,25 @@
<h2>MMP Editor</h2>
<p>
- The MMP Editor allows you to view and modify your project definitions. Changes made in the MMP editor are automatically written to the project's .MMP file. You can view the .mmp file by selecting the <em>project_name</em>.mmp tab located along the bottom of the MMP editor.</p>
+ The MMP Editor <strong>Overview</strong> tab allows you to view and modify your project definitions. Changes made in the MMP editor are automatically written to the project's .MMP file. You can view the .mmp file by selecting the <em>project_name</em>.mmp tab located along the bottom of the MMP editor.</p>
<p>
The MMP Editor is shown when an MMP file is
- opened from the Project Explorer, C/C++ Projects, or Symbian Project Navigator views. The MMP Editor is shown in Figure 1. MMP editor fields are validated for existing or correct entries. For example, if the UID 2 field is blank the label is highlighted in red. If an error exists in the mmp file, the line where the error occurs is marked and also displayed in the Problems view.</p>
- <p align="center"><img src="images/mmp_editor.png" width="656" height="428" /></p>
- <p align="left" class="figure">Figure 1 - MMP Editor</p>
+ opened from the <a href="view_cpp_projects.htm">Project Explorer</a> or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> views. The MMP Editor is shown in Figure 1. MMP editor fields are validated for existing or correct entries. For example, if the UID 2 field is blank the label is highlighted in red. If an error exists in the mmp file, the line where the error occurs is marked and also displayed in the Problems view.</p>
+ <p align="center"><img src="images/mmp_editor.png" width="675" height="406" /></p>
+ <p align="left" class="figure">Figure 1 - MMP Editor Overview tab</p>
<table cellpadding="2" cellspacing="0"
border="0">
- <tr valign="top"><th width="173" class="Cell">Name</th><th width="516" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+ <tr valign="top"><th width="190" class="Cell">Name</th><th width="955" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
<p>
<b>Target name</b></p></td><td class="Cell">
<p>
- Enter the name of the target file.
- </p></td></tr><tr valign="top"><td class="Cell">
+ Enter the name of the target file. </p></td></tr><tr valign="top"><td class="Cell">
<p>
- <b>Target type</b>
- </p></td><td class="Cell">
+ <b>Target type</b> </p></td><td class="Cell">
<p>
Select the type of target file from the dropdown list.</p></td></tr><tr valign="top"><td class="Cell">
<p>
- <b>Target path</b>
- </p></td><td class="Cell">
- <p>
- Enter the path to the target file.
- </p></td></tr><tr valign="top"><td class="Cell">
- <p>
- <b>UID 2</b>
- </p></td><td class="Cell">
+ <b>UID 2</b> </p></td><td class="Cell">
<p>UID 2 is a unique identifier number that identifies the type of interface that the project implements. The values are defined by Symbian:</p>
<ul>
<li>For GUI applications, it is always 0x100039CE</li>
@@ -43,23 +34,20 @@
</ul>
</td></tr><tr valign="top"><td class="Cell">
<p>
- <b>UID 3</b>
- </p></td><td class="Cell">
- <p>
- Application UID (or UID3) is used to uniquely identify the binary (EXE or DLL) within the system. The purpose of UID 3 is to prevent one executable from interfering the operation of another executable.</p></td></tr><tr valign="top"><td class="Cell">
- <p>
- <b>Project definition</b>
- </p></td><td class="Cell">
+ <b>UID 3</b> </p></td><td class="Cell">
<p>
- The Project definition group provides links to the Sources, Libraries, and Options windows. You can also select the Sources, Libraries, and Options tabs to open the related window. </p></td></tr><tr valign="top"><td class="Cell">
- <p>
- <b>Common tasks</b>
- </p></td><td class="Cell">
+ Application UID (or UID3) is used to uniquely identify the binary (EXE or DLL) within the system. The purpose of UID 3 is to prevent one executable from interfering the operation of another executable.</p></td></tr>
+ <tr valign="top">
+ <td class="Cell"><p> <b>Common tasks</b> </p></td>
+ <td class="Cell"><p> This group provides links to the User and System include path options located in the Options window. </p></td>
+ </tr>
+ <tr valign="top"><td class="Cell">
<p>
- This group provides links to the User and System include path options located in the Options window.
- </p></td></tr>
+ <b>Project definition</b> </p></td><td class="Cell">
+ <p>
+ The Project definition group provides links to the Sources, Libraries, and Options windows. You can also select the Sources, Libraries, and Options tabs to open the related window. </p></td></tr>
</table>
- <p>Any changes made to the MMP file either in Carbide or using an external editor are detected. If the build is for emulation, these changes are detected and used automatically. </p>
+ <p>Any changes made to the MMP file either in Carbide or using an external editor are detected. If the build is for emulation, these changes are detected and used automatically. </p>
<p>For other build types like GCCE you are presented with the <b>Modified MMP Files Detected</b> dialog (Figure 2) and asked which build action to take for each MMP file that has changed. Set the build option for each listed MMP file and click <b>OK</b>.</p>
<p align="center"><img src="images/wnd_modified_mmp_files.png" width="617" height="300"></p>
<p align="left" class="figure">Figure 2 - Modified MMP Files Detected dialog </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_libraries.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_libraries.html Wed Jul 21 12:11:48 2010 -0500
@@ -8,7 +8,7 @@
<p>
The MMP editor libraries window lists the libraries used by the currently selected build configuration in the selected project. The MMP editor libraries window is shown in Figure 1. Click on a library group to expand the list of libraries and show the related control buttons. You can add, remove or edit the list of libraries for each group. You can also move libraries up or down in the list.</p>
- <p align="center"><img src="images/mmp_editor_libraries.png" width="560" height="424" /></p>
+ <p align="center"><img src="images/mmp_editor_libraries.png" width="648" height="436" /></p>
<p align="left" class="figure">Figure 1 - MMP Editor Libraries window</p>
<p></p>
<table cellpadding="2" cellspacing="0"
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_mmp_tab.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_mmp_tab.html Wed Jul 21 12:11:48 2010 -0500
@@ -2,13 +2,13 @@
<html><head>
<title>MMP Editor MMP File</title>
<link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
+</head>
<body>
<h2>MMP File Window</h2>
<p>
- The MMP file tab in the MMP editor window shows the source text of the mmp file. Changes made directly in the mmp file are reflected in related tabs of the MMP editor and changes made in editor tabs are written to the mmp file. Errors are identified in red and markers are placed in mmp files at the locations errors exist.</p>
- <p align="center"><img src="images/mmp_editor_mmpfile.png" width="560" height="424" /></p>
+ The <strong>MMP</strong> file tab in the MMP editor window shows the source text of the mmp file. Changes made directly in the mmp file are reflected in related tabs of the MMP editor and changes made in editor tabs are written to the mmp file. Errors are identified in red and markers are placed in mmp files at the locations errors exist.</p>
+ <p align="center"><img src="images/mmp_editor_mmpfile.png" width="677" height="440" /></p>
<p align="left" class="figure">Figure 1 - MMP Editor MMP File</p>
<p></p>
<h5>Related references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_options.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_options.html Wed Jul 21 12:11:48 2010 -0500
@@ -8,7 +8,7 @@
<p>
The MMP editor options window allows you to edit compiler, linker, and runtime settings. The MMP editor options window is shown in Figure 1.</p>
- <p align="center"><img src="images/mmp_editor_options.png" width="939" height="450" /></p>
+ <p align="center"><img src="images/mmp_editor_options.png" width="944" height="477" /></p>
<p align="left" class="figure">Figure 1 - MMP Editor Options window</p>
<p></p>
<table cellpadding="2" cellspacing="0"
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_sources.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_sources.html Wed Jul 21 12:11:48 2010 -0500
@@ -8,24 +8,27 @@
<p>
The MMP editor sources window lists the C++ and resource files that you can select to be compiled. The MMP editor sources window is shown in Figure 1.</p>
- <p align="center"><img src="images/mmp_editor_sources.png" width="648" height="491" /></p>
+ <p align="center"><img src="images/mmp_editor_sources.png" width="701" height="504" /></p>
<p align="left" class="figure">Figure 1 - MMP Editor Sources window </p>
<p></p>
<table cellpadding="2" cellspacing="0"
border="0">
- <tr valign="top"><th width="173" class="Cell">Name</th><th width="516" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+ <tr valign="top"><th width="245" class="Cell">Name</th>
+ <th width="790" class="Cell">Function</th>
+ </tr><tr valign="top"><td class="Cell">
<p>
<b>C/C++ sources</b></p></td><td class="Cell">
<p>
- Select the C/C++ files to be compiled with your project. </p></td></tr><tr valign="top"><td class="Cell">
- <p>
- <b>Resources</b></p></td><td class="Cell">
+ Select the C/C++ files to be compiled with your project. </p></td></tr>
+ <tr valign="top">
+ <td class="Cell"><b>Missing C/C++ sources</b></td>
+ <td class="Cell">Shows a list of missing source files referenced by project MMP files.</td>
+ </tr>
+ <tr valign="top"><td class="Cell">
+ <p>
+ <b>Resources</b></p></td><td class="Cell">
<p>
- Add, remove, or edit resources, bitmaps, languages, and AIF files to be compiled with your project.</p></td></tr>
- <tr valign="top">
- <td class="Cell"><b>Missing C/C++ sources</b></td>
- <td class="Cell">Shows a list of missing source files referenced by project MMP files.</td>
- </tr>
+ Add, remove, or edit resources, bitmaps, and languages to compile with your project.</p></td></tr>
</table>
<h5>Related references</h5>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm Wed Jul 21 12:11:48 2010 -0500
@@ -5,14 +5,12 @@
<body>
<h2>References</h2>
<p>The topics include:</p>
- <ul>
- <li><a href="../concepts/cvs.htm">Concurrent Versions System (CVS)</a></li>
- <li><a href="../concepts/contextual_menus.htm">Context Menus</a></li>
+ <ul><li><a href="../concepts/contextual_menus.htm">Context Menus</a></li>
<li><a href="menus/menus.htm">Menus</a></li>
<li><a href="menus/open_cmd_window.htm">Open Command Window</a></li>
- <li><a href="menus/run_leavescan.htm">Run Leavescan</a></li>
<li><a href="menus/s60_ui_designer.htm">S60 UI Designer</a></li>
<li><a href="menus/open_explorer_window.htm">Show in Explorer</a></li>
+ <li><a href="../concepts/cvs.htm">Software Configuration Management</a></li>
<li><a href="menus/new_symbian_class.htm">Symbian OS Class</a></li>
<li><a href="menus/new_symbian_project.htm">Symbian OS C++ Project</a></li>
</ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/NewClassWizard.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/NewClassWizard.html Wed Jul 21 12:11:48 2010 -0500
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>New Class Wizard in Reference</title>
+<title>New C++ Class Wizard</title>
<link rel="StyleSheet" href="../../book.css" type="text/css"/>
</head>
<body>
@@ -8,27 +8,27 @@
<a name="ref_newclass_wizard"></a>
</div><div class="Head1">
-<h2>New Class Wizard</h2>
+<h2>New C++ Class Wizard</h2>
</div><div class="Bodytext">
<p>
- The New Class wizard allows a developer to add a new C++ class to
+ The <strong>New C++ Class</strong> wizard allows a developer to add a new C++ class to
existing or new header and source files. This wizard is supplied by the C/C++
Development Toolkit (CDT), and is not customised for Symbian OS development.
However, as it is not currently described in the C/C++ Development Toolkit User
Guide, you may find this extra information about it useful.</p>
- <p>See <a href="../tasks/projects/prj_adding_symbian_class.htm">Adding a Symbian OS Class</a> for information on adding Symbian-based classes to a project. </p>
+ <p>See <a href="../tasks/projects/prj_adding_symbian_class.htm">Adding a Symbian OS Class</a> for information on adding Symbian-based classes to a project. </p>
<p>
- To invoke the wizard, click File > New > Class from the menu bar. The New Class wizard appears. </p>
- <div class="Figure">
+ To invoke the wizard, click <strong>File > New > Class </strong>from the menu bar. The <strong>New C++ Class </strong> window appears. </p>
+ <div class="Figure">
- <p class="Image"><a name=""><img src="../images/newclasswiz.gif" alt="" width="500" height="568" border="0" /></a></p>
+ <p class="Image"><a name=""><img src="images/wiz_new_class.png" alt="" width="582" height="618" border="0" /></a></p>
</div>
- <table cellpadding="2" cellspacing="0"
+ <table width="700" cellpadding="2" cellspacing="0"
border="0">
- <tr valign="top"><th width="145" class="Cell">Name</th><th width="639" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+ <tr valign="top"><th width="30%" class="Cell">Name</th><th width="70%" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
<p>
<b>Source Folder</b>
</p></td><td class="Cell">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/NewMMP_wizard.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/NewMMP_wizard.html Wed Jul 21 12:11:48 2010 -0500
@@ -1,13 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html><head>
-<title>Symbian OS MMP File</title>
+<title>New Symbian OS MMP File</title>
<link rel="StyleSheet" href="../../book.css" type="text/css"/>
</head>
<body>
- <h2>Symbian OS MMP File</h2>
+ <h2>New Symbian OS MMP File</h2>
<p>
- Use the <b>Symbian OS MMP File</b> wizard (figure 1) to create a new MMP project file for the currently selected project. Symbian projects are defined by an <code class="code">.mmp</code> file which specifies the essential elements of the project. All details of the project lifecycle are handled by the IDE. There is no editable makefile the user can edit to modify the build behavior of the project.</p>
+ Use the <b>Symbian OS MMP File</b> wizard (figure 1) to create a new MMP project file for the currently selected project. Symbian projects are defined by an <code class="code">.mmp</code> file which specifies the essential project elements of a Symbian OS project. All details of the project lifecycle are handled by the IDE. There is no editable makefile the user can edit to modify the build behavior of the project.</p>
<div class="step">
<h4>Creating a New Symbian OS MMP File</h4>
<ol>
@@ -16,7 +16,7 @@
<li>Select the File > New > Other... menu item (Figure 1)</li>
</ul>
<blockquote>
- <p align="center"><img src="images/MMP_wizard.png" width="500" height="500" /></p>
+ <p align="center"><img src="images/MMP_wizard.png" width="525" height="500" /></p>
<p align="left" class="figure">Figure 1 - Select a wizard page in the New window</p>
<p>OR</p>
</blockquote>
@@ -25,7 +25,7 @@
</ul>
</li>
<blockquote>
- <p align="center"><img src="images/MMP_wizard2.png" width="500" height="500" /></p>
+ <p align="center"><img src="images/MMP_wizard2.png" width="525" height="500" /></p>
<p align="left" class="figure">Figure 2 - MMP File page in the New MMP File window</p>
</blockquote>
<li>On the Select the wizard page, select Symbian OS > Symbian OS MMP File, then click Next (Figure 1)</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectDirectories.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectDirectories.html Wed Jul 21 12:11:48 2010 -0500
@@ -1,61 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Project Directories in New Project Wizard</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <div class="Head1">
-<h2>Project Directories</h2>
-</div><div class="Bodytext">
-
- <p>
- You can specify the name of the project directories, where the project
- files are to be stored.
- </p>
- <div class="Figure">
-
- <p align="center" class="Image"><img src="../images/step6.png" width="500" height="567" /></p>
- <p class="Image">Figure 1 - Project Directories page </p>
- </div><table width="720"
-border="0" cellpadding="2" cellspacing="0">
- <tr valign="top"><th width="108" class="Cell">Name</th><th width="493" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
- <p>
- <b>Include</b>
- </p></td><td class="Cell">
- <p>
- Specifies the name of the include folder, where all the header
- files for the project are located.
- </p></td></tr><tr valign="top"><td class="Cell">
- <p>
- <b>Source</b>
- </p></td><td class="Cell">
- <p>
- Specifies the name of the source folder, where all the source files
- for the project are located.
- </p></td></tr>
- <tr valign="top">
- <td class="Cell"><b>Group</b></td>
- <td class="Cell">Specifies the name of the group folder, where all the group files for the project are located. </td>
- </tr>
- <tr valign="top">
- <td class="Cell"><b>Data</b></td>
- <td class="Cell">Specifies the name of the data folder, where all the data files for the project are located. </td>
- </tr>
- <tr valign="top">
- <td class="Cell"><b>Install</b></td>
- <td class="Cell">Specifies the name of the Install folder, where all the .sis files for the project are located. </td>
- </tr>
- <tr valign="top">
- <td class="Cell"><b>Graphics</b></td>
- <td class="Cell">Specifies the name of the graphics folder, where all the graphic files for the project are located. </td>
- </tr>
-</table>
-</div>
-<h5>Related tasks</h5>
-<ul>
- <li><a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>
-</li></ul>
-<div id="footer">Copyright © 2010 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></div>
-
- </body>
- </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Project Directories in New Project Wizard</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+ <div class="Head1">
+<h2>Project Directories</h2>
+</div><div class="Bodytext">
+
+ <p>
+ You can specify the name of the project directories, where the project
+ files are to be stored.
+ </p>
+ <div class="Figure">
+
+ <p align="center" class="Image"><img src="../images/step6.png" width="500" height="500" /></p>
+ <p class="Image">Figure 1 - Project Directories page </p>
+ </div><table width="720"
+border="0" cellpadding="2" cellspacing="0">
+ <tr valign="top"><th width="108" class="Cell">Name</th><th width="493" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+ <p>
+ <b>Include</b>
+ </p></td><td class="Cell">
+ <p>
+ Specifies the name of the include folder, where all the header
+ files for the project are located.
+ </p></td></tr><tr valign="top"><td class="Cell">
+ <p>
+ <b>Source</b>
+ </p></td><td class="Cell">
+ <p>
+ Specifies the name of the source folder, where all the source files
+ for the project are located.
+ </p></td></tr>
+ <tr valign="top">
+ <td class="Cell"><b>Group</b></td>
+ <td class="Cell">Specifies the name of the group folder, where all the group files for the project are located. </td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><b>Data</b></td>
+ <td class="Cell">Specifies the name of the data folder, where all the data files for the project are located. </td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><b>Install</b></td>
+ <td class="Cell">Specifies the name of the Install folder, where all the .sis files for the project are located. </td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><b>Graphics</b></td>
+ <td class="Cell">Specifies the name of the graphics folder, where all the graphic files for the project are located. </td>
+ </tr>
+</table>
+</div>
+<h5>Related tasks</h5>
+<ul>
+ <li><a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>
+</li></ul>
+<div id="footer">Copyright © 2010 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></div>
+
+ </body>
+ </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectNameAndLocation.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectNameAndLocation.html Wed Jul 21 12:11:48 2010 -0500
@@ -1,44 +1,44 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Name and Location</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <div class="Head1">
-<h2>Name and Location</h2>
-</div>
- <p>
- You can specify the name of the class and where the generated source and header
- files are to be stored.
- </p>
-
- <p align="center" class="Image"><img src="images/wiz_name_and_location_page.png" width="607" height="500" /></p>
- <p align="center" class="figure">Figure 1 - Name and Location page </p>
- <h5>Table 1 - Name and Locations page options</h5>
- <table width="785"
-border="0" cellpadding="2" cellspacing="0">
- <tr valign="top"><th width="219" class="Cell">Name</th><th width="491" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
- <p>
- <b>Class name </b></p></td><td class="Cell">
- <p>Class name to create. </p></td></tr>
- <tr valign="top">
- <td class="Cell"><b>Use default</b></td>
- <td class="Cell">Checkmark to use the suggested default names, or uncheck to customize the names.</td>
- </tr>
- <tr valign="top"><td class="Cell">
- <p>
- <b>Source</b></p></td><td class="Cell">
- <p>Specify directory to store source information. </p></td></tr>
- <tr valign="top">
- <td class="Cell"><b>Include</b></td>
- <td class="Cell">Specify directory to store header information. </td>
- </tr>
- <tr valign="top">
- <td class="Cell"><b>Force files to lowercase</b></td>
- <td class="Cell">Checkmark to force all filenames to use lowercase letters. Uncheck to use mixed case.</td>
- </tr>
-</table>
- <div id="footer">Copyright © 2010 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></div>
-
- </body>
- </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Name and Location</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+ <div class="Head1">
+<h2>Name and Location</h2>
+</div>
+ <p>
+ You can specify the name of the class and where the generated source and header
+ files are to be stored.
+ </p>
+
+ <p align="center" class="Image"><img src="images/wiz_name_and_location_page.png" width="438" height="415" /></p>
+ <p align="center" class="figure">Figure 1 - Name and Location page </p>
+ <h5>Table 1 - Name and Locations page options</h5>
+ <table width="785"
+border="0" cellpadding="2" cellspacing="0">
+ <tr valign="top"><th width="219" class="Cell">Name</th><th width="491" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+ <p>
+ <b>Class name </b></p></td><td class="Cell">
+ <p>Class name to create. </p></td></tr>
+ <tr valign="top">
+ <td class="Cell"><b>Use default</b></td>
+ <td class="Cell">Checkmark to use the suggested default names, or uncheck to customize the names.</td>
+ </tr>
+ <tr valign="top"><td class="Cell">
+ <p>
+ <b>Source</b></p></td><td class="Cell">
+ <p>Specify directory to store source information. </p></td></tr>
+ <tr valign="top">
+ <td class="Cell"><b>Include</b></td>
+ <td class="Cell">Specify directory to store header information. </td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><b>Force files to lowercase</b></td>
+ <td class="Cell">Checkmark to force all filenames to use lowercase letters. Uncheck to use mixed case.</td>
+ </tr>
+</table>
+ <div id="footer">Copyright © 2010 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></div>
+
+ </body>
+ </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectPreferences.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectPreferences.html Wed Jul 21 12:11:48 2010 -0500
@@ -1,27 +1,25 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
<title>Project and File Properties</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/></head>
<body>
<div class="Head1">
<h2>C/C++ Project and File Properties</h2>
</div>
<p>
- The <b>Properties</b> window allows you to change the general
- settings for a project and individual files.</p>
+ The<b>Properties for <<i>project_name</i>></b><strong> </strong>window allows you to change a project's build configurations, macros, and other project settings.</p>
<p>
- To change the settings for a project, right-click the project from the <b>Project Explorer</b>, <b>C/C++ Project</b>, or <b>Symbian Project Navigator</b> views, and choose <b>Properties</b> from the context menu. The <b>Properties for <<i>project_name</i>></b> window will then show all the project settings. If
+ To change the settings for a project, right-click the project from the <a href="view_cpp_projects.htm">Project Explorer</a> or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> views, and choose <b>Properties</b> from the context menu. The <b>Properties for <<i>project_name</i>></b> window then show all the project settings. If
you alter the settings, then the settings are applied as
defaults for all files in the project. </p>
- <p>The Carbide.c++ panels include:</p>
+ <p>The Carbide.c++ panels include:</p>
<ul>
<li><a href="build_properties/pane_build_config.htm">Build Configurations</a> </li>
<li><a href="build_properties/pane_macro_settings.htm">Macro Settings</a></li>
<li><a href="build_properties/pane_project_settings.htm">Project Settings</a></li>
- <li>other - additional panels may appear here as well. For example, <b>CodeScanner</b> and <b>UI Designer</b>, to name two. </li>
+ <li>other - additional panels may appear here as well. For example, <b>CodeScanner</b>. </li>
</ul>
-<p align="center"><img src="images/carbide_build_config.png" width="795" height="692"></p>
+<p align="center"><img src="images/carbide_build_config.png" width="786" height="693"></p>
<p class="figure">Figure 1. Project for <i>project_name</i> dialog</p>
<p>
To change the settings only for a particular file, right-click the file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_filesys.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_filesys.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,55 +1,55 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<title>MBM/MIF Editor</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
-
-<h2>Add Images From Filesystem</h2>
-
- <p>The <b>Add Images from Filesystem</b> dialog allows you to search for and add images currently available in the filesystem. Select an image and click <b>OK</b> to add the image.</p>
- <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM, MIF, or AIF editor. </p>
- <p align="center" class="Image"><img src="images/add_images_from_filesys.png" width="640" height="700"></p>
- <p class="figure">Figure 1 - Add Images from Filesystem </p>
- <h5>Table 1. Add Images—Items</h5>
- <table width="94%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="32%" scope="col">Item</th>
- <th width="68%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td><b>Directory</b></td>
- <td><p>Browse to the directory containing images you want to add. </p></td>
- </tr>
- <tr>
- <td><b>Available directory images </b></td>
- <td>Shows the images found in the directory. Select images to be added. </td>
- </tr>
- <tr>
- <td><b>Detected image pairs </b></td>
- <td><p>Lists the selected images and detected image pairs.</p>
- </td>
- </tr>
- <tr>
- <td><b>Copy images into project </b></td>
- <td>Enable this option to make a copy of selected images in the selected project location. </td>
- </tr>
- <tr>
- <td><b>Overwrite existing </b></td>
- <td><p>Enable this option to overwrite existing images with the same name. </p></td>
- </tr>
- <tr>
- <td><b>Project location </b></td>
- <td>Click the Choose... button to display the Select a folder dialog, then select a project folder to store the images.</td>
- </tr>
- </table>
- <h5>Other references</h5>
- <ul>
- <li><a href="MBMEditor.html">MBM Editor</a></li>
- </ul>
- <div id="footer">Copyright © 2010 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></div>
-
- </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
+<title>MBM/MIF Editor</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+
+<h2>Add Images From Filesystem</h2>
+
+ <p>The <b>Add Images from Filesystem</b> dialog allows you to search for and add images currently available in the filesystem. Select an image and click <b>OK</b> to add the image.</p>
+ <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM or MIF editor. </p>
+ <p align="center" class="Image"><img src="images/add_images_from_filesys.png" width="608" height="581"></p>
+ <p class="figure">Figure 1 - Add Images from Filesystem </p>
+ <h5>Table 1. Add Images—Items</h5>
+ <table width="94%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="32%" scope="col">Item</th>
+ <th width="68%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td><b>Directory</b></td>
+ <td><p>Browse to the directory containing images you want to add. </p></td>
+ </tr>
+ <tr>
+ <td><b>Available directory images </b></td>
+ <td>Shows the images found in the directory. Select images to be added. </td>
+ </tr>
+ <tr>
+ <td><b>Detected image pairs </b></td>
+ <td><p>Lists the selected images and detected image pairs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><b>Copy images into project </b></td>
+ <td>Enable this option to make a copy of selected images in the selected project location. </td>
+ </tr>
+ <tr>
+ <td><b>Overwrite existing </b></td>
+ <td><p>Enable this option to overwrite existing images with the same name. </p></td>
+ </tr>
+ <tr>
+ <td><b>Project location </b></td>
+ <td>Click the <strong>Choose...</strong> button to display the <strong>Select a folder</strong> dialog, then select a project folder to store the images.</td>
+ </tr>
+ </table>
+ <h5>Other references</h5>
+ <ul>
+ <li><a href="MBMEditor.html">MBM Editor</a></li>
+ </ul>
+ <div id="footer">Copyright © 2010 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></div>
+
+ </body>
+</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_project.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_project.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<title>MBM/MIF Editor</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
-
-<h2>Add Images From Project </h2>
-
- <p>The <b>Add Images from Project</b> dialog allows you to add images currently available in the project. Select an image and click <b>OK</b> to add the image. </p>
- <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM, MIF, or AIF editor.</p>
- <p align="center" class="Image"><img src="images/add_images_from_project.png" width="640" height="567"></p>
- <p class="figure">Figure 1 - Add Images from Project </p>
- <h5>Other references</h5>
- <ul>
- <li><a href="MBMEditor.html">MBM Editor</a></li>
- </ul>
- <div id="footer">Copyright © 2010 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></div>
-
- </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
+<title>MBM/MIF Editor</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+
+<h2>Add Images From Project </h2>
+
+ <p>The <b>Add Images from Project</b> dialog allows you to add images currently included in the project. Select one or more images and click <b>OK</b> to add the image to the MMP file. </p>
+ <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM or MIF editor.</p>
+ <p align="center" class="Image"><img src="images/add_images_from_project.png" width="608" height="581"></p>
+ <p class="figure">Figure 1 - Add Images from Project </p>
+ <h5>Other references</h5>
+ <ul>
+ <li><a href="MBMEditor.html">MBM Editor</a></li>
+ </ul>
+ <div id="footer">Copyright © 2010 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></div>
+
+ </body>
+</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,62 +1,62 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<meta name="keywords" content="Active Configuration, SIS Builder, Environment, Arguments, Paths and Symbols, ROM Builder" >
-<title>Carbide Build Configurations </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Carbide Build Configurations </h2>
-<p>Use the <b>Carbide Build Configurations</b> panel to specify the project's <a href="../../concepts/build_configurations.htm">active build configuration</a> and its related build properties. </p>
-<p align="center"><img src="../images/carbide_build_config.png" width="795" height="692" /></p>
-<p class="figure">Figure 1 - Carbide Build Configurations panel </p>
-<h5>Table 1 Carbide Build Configuration items </h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="20%" scope="col">Item</th>
- <th width="71%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td width="20%"><b>Active Configuration </b></td>
- <td>The <b>Active Configuration</b> drop down list allows you to <a href="../../tasks/projects/prj_set_build_tgt.htm">select</a> a configuration that is currently available for the selected project. The entries in the related sub-panes will change according to the selected configuration. The Configuration name consists of a target name and an SDK identifier in brackets.</td>
- </tr>
- <tr>
- <td width="20%"><b>Manage...</b></td>
- <td>Click the <b>Manage</b>... button to <a href="../../tasks/projects/prj_new_build_config.htm">add</a> a new SDK/Configuration or remove an existing configuration.</td>
- </tr>
- <tr>
- <td><b>SIS Builder </b></td>
- <td><p>The <a href="pane_build_config_sis.htm">SIS Builder</a> pane is used to specify a .pkg file and .sis file options to create an application .sis file. These settings apply to the currently selected Configuration.</p></td>
- </tr>
- <tr>
- <td><b>SBSv2</b></td>
- <td>The <a href="pane_build_config_sbsv2.htm">SBSv2</a> pane is used to define which build configuration variant to use.</td>
- </tr>
- <tr>
- <td><b>Environment</b></td>
- <td><p>The <a href="pane_build_config_env.htm">Environment</a> tab allows you to view the current User and System environment variables that will be used when any abld command is invoked.</p></td>
- </tr>
- <tr>
- <td><b>Paths and Symbols </b></td>
- <td>The <a href="pane_build_config_paths.htm">Paths and Symbols</a> tab allows you to see which paths and symbols have been indexed for the project. </td>
- </tr>
- <tr>
- <td><b>ROM Builder </b></td>
- <td>The <a href="../ROM_build_settings.html">ROM Builder</a> tab allows you to specify commands and a working directory for building a GUI ROM Image.</td>
- </tr>
-</table>
-<h5>Other references</h5>
-<ul>
- <li><a href="pane_build_config.htm">SIS Builder</a></li>
- <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
- <li><a href="../../concepts/build_configurations.htm">Active Configuration</a></li>
- <li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
- <li><a href="../../tasks/projects/working_with_sis_pkg_files.htm">Creating a .PKG file</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<meta name="keywords" content="Active Configuration, SIS Builder, Environment, Arguments, Paths and Symbols, ROM Builder" >
+<title>Build Configurations</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Build Configurations </h2>
+<p>Use the <b> Build Configurations</b> panel to specify the project's <a href="../../concepts/build_configurations.htm">active build configuration</a> and its related build properties. </p>
+<p align="center"><img src="../images/carbide_build_config.png" width="786" height="693" /></p>
+<p class="figure">Figure 1 - Carbide Build Configurations panel </p>
+<h5>Table 1 Build Configuration items </h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="20%" scope="col">Item</th>
+ <th width="71%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td width="20%"><b>Active Configuration </b></td>
+ <td>The <b>Active Configuration</b> drop down list allows you to <a href="../../tasks/projects/prj_set_build_tgt.htm">select</a> a configuration that is currently available for the selected project. The entries in the related sub-panes will change according to the selected configuration. The Configuration name consists of a target name and an SDK identifier in brackets.</td>
+ </tr>
+ <tr>
+ <td width="20%"><b>Manage...</b></td>
+ <td>Click the <b>Manage</b>... button to <a href="../../tasks/projects/prj_new_build_config.htm">add</a> a new SDK/Configuration or remove an existing configuration.</td>
+ </tr>
+ <tr>
+ <td><b>SIS Builder </b></td>
+ <td><p>The <a href="pane_build_config_sis.htm">SIS Builder</a> pane is used to specify a .pkg file and .sis file options to create an application .sis file. These settings apply to the currently selected Configuration.</p></td>
+ </tr>
+ <tr>
+ <td><b>SBSv2</b></td>
+ <td>The <a href="pane_build_config_sbsv2.htm">SBSv2</a> pane is used to define which build configuration variant to use.</td>
+ </tr>
+ <tr>
+ <td><b>Environment</b></td>
+ <td><p>The <a href="pane_build_config_env.htm">Environment</a> tab allows you to view the current User and System environment variables that will be used when any abld command is invoked.</p></td>
+ </tr>
+ <tr>
+ <td><b>Paths and Symbols </b></td>
+ <td>The <a href="pane_build_config_paths.htm">Paths and Symbols</a> tab allows you to see which paths and symbols have been indexed for the project. </td>
+ </tr>
+ <tr>
+ <td><b>ROM Builder </b></td>
+ <td>The <a href="../ROM_build_settings.html">ROM Builder</a> tab allows you to specify commands and a working directory for building a GUI ROM Image.</td>
+ </tr>
+</table>
+<h5>Other references</h5>
+<ul>
+ <li><a href="pane_build_config.htm">SIS Builder</a></li>
+ <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
+ <li><a href="../../concepts/build_configurations.htm">Active Configuration</a></li>
+ <li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
+ <li><a href="../../tasks/projects/working_with_sis_pkg_files.htm">Creating a .PKG file</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_args.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_args.htm Wed Jul 21 12:11:48 2010 -0500
@@ -33,7 +33,7 @@
</table>
<h5>Other references </h5>
<ul>
- <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
+ <li><a href="pane_build_config.htm">Build Configurations</a></li>
<li><a href="pane_build_config.htm">SIS Builder</a></li>
<li><a href="pane_build_config_env.htm">Environment</a></li>
<li><a href="pane_build_config_paths.htm">Paths and Symbols </a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,63 +1,63 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<meta name="keywords" content="Environment" >
-<title>Environment Variables</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Environment Variables</h2>
-<p> The <b>Environment Variables </b> pane allows you to view the current User and System environment variables that will be used when any abld command is invoked. User variables are modified or added when a process is invoked. Read only system variables are listed. Variables and values in bold are items that have been modified from their default values.</p>
-<p>Some variables have special meaning, including:</p>
-<ul>
- <li><span class="code">PATH</span> — will always place "<span class="code">${EPOCROOT}\epoc32\tools;${EPOCROOT}\epoc32\gcc\bin;</span>" at the front of the <span class="code">PATH</span> regardless of what it is changed to </li>
- <li><span class="code">PATH</span>, <span class="code">EPOCROOT</span>, and <span class="code">*MW</span> variables — <span class="note">cannot be undefined as they are required for system builds</span></li>
-</ul>
-<p align="center"><img src="../images/page_build_config_env.png" width="575" height="473"></p>
-<p class="figure">Figure 1 - Environment Variables</p>
-<h5>Table 1 Environment variable items</h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="29%" scope="col">Item</th>
- <th width="57%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td><b>New</b></td>
- <td>Click to add a new environment variable. You must specify a name and a value. </td>
- </tr>
- <tr>
- <td><b>Edit</b></td>
- <td>Allows you to edit the name and value of an environment variable.</td>
- </tr>
- <tr>
- <td><b>Undefine</b></td>
- <td><p>Undefines the selected variable so that it is not used during a build.</p>
- <p class="note"><b>NOTE</b> Some variables, like <span class="code">PATH</span>, <span class="code">EPOCROOT</span>, and those beginning with <span class="code">MW*</span> have special meaning and cannot be undefined. </p></td>
- </tr>
- <tr>
- <td><b>Variable use</b></td>
- <td><p>Shows the use for the selected variable. Uses include:</p>
- <ul>
- <li>Default – Take the variable as-is from the system, do not modify it.</li>
- <li>Append – Add the value displayed to the end of the existing variable (the existing variable name is not displayed.</li>
- <li>Prepend – Add the value displayed to the front of the existing variable (the existing variable name is not displayed.</li>
- <li>Replace – Replace the value displayed with the existing variable.</li>
- <li>Undefine – Not used during a build</li>
- </ul></td>
- </tr>
-</table>
-<h5>Other references </h5>
-<ul>
- <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
- <li><a href="pane_build_config.htm">SIS Builder</a></li>
- <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
- <li><a href="pane_build_config_paths.htm">Paths and Symbols </a></li>
- <li><a href="../ROM_build_settings.html">ROM Builder</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<meta name="keywords" content="Environment" >
+<title>Environment Variables</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Environment Variables</h2>
+<p> The <b>Environment Variables </b> pane allows you to view the current User and System environment variables that will be used when any abld command is invoked. User variables are modified or added when a process is invoked. Read only system variables are listed. Variables and values in bold are items that have been modified from their default values.</p>
+<p>Some variables have special meaning, including:</p>
+<ul>
+ <li><span class="code">PATH</span> — will always place "<span class="code">${EPOCROOT}\epoc32\tools;${EPOCROOT}\epoc32\gcc\bin;</span>" at the front of the <span class="code">PATH</span> regardless of what it is changed to </li>
+ <li><span class="code">PATH</span>, <span class="code">EPOCROOT</span>, and <span class="code">*MW</span> variables — <span class="note">cannot be undefined as they are required for system builds</span></li>
+</ul>
+<p align="center"><img src="../images/page_build_config_env.png" width="575" height="473"></p>
+<p class="figure">Figure 1 - Environment Variables</p>
+<h5>Table 1 Environment variable items</h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="29%" scope="col">Item</th>
+ <th width="57%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td><b>New</b></td>
+ <td>Click to add a new environment variable. You must specify a name and a value. </td>
+ </tr>
+ <tr>
+ <td><b>Edit</b></td>
+ <td>Allows you to edit the name and value of an environment variable.</td>
+ </tr>
+ <tr>
+ <td><b>Undefine</b></td>
+ <td><p>Undefines the selected variable so that it is not used during a build.</p>
+ <p class="note"><b>NOTE</b> Some variables, like <span class="code">PATH</span>, <span class="code">EPOCROOT</span>, and those beginning with <span class="code">MW*</span> have special meaning and cannot be undefined. </p></td>
+ </tr>
+ <tr>
+ <td><b>Variable use</b></td>
+ <td><p>Shows the use for the selected variable. Uses include:</p>
+ <ul>
+ <li>Default – Take the variable as-is from the system, do not modify it.</li>
+ <li>Append – Add the value displayed to the end of the existing variable (the existing variable name is not displayed.</li>
+ <li>Prepend – Add the value displayed to the front of the existing variable (the existing variable name is not displayed.</li>
+ <li>Replace – Replace the value displayed with the existing variable.</li>
+ <li>Undefine – Not used during a build</li>
+ </ul></td>
+ </tr>
+</table>
+<h5>Other references </h5>
+<ul>
+ <li><a href="pane_build_config.htm">Build Configurations</a></li>
+ <li><a href="pane_build_config.htm">SIS Builder</a></li>
+ <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
+ <li><a href="pane_build_config_paths.htm">Paths and Symbols </a></li>
+ <li><a href="../ROM_build_settings.html">ROM Builder</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,34 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<meta name="keywords" content="Paths and Symbols, Include Paths, Symbols" >
-<title>Paths and Symbols </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Paths and Symbols </h2>
-<p> The <b>Paths and Symbols </b> pane shows the paths and symbols used to the build the project index. This is a read-only list based on the setting of the <b>Build configuration for the indexer</b> option in the <b>C/C++ General</b> > <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_idx.htm">Indexer</a> panel. Carbide now caches the paths and symbols which persist between debug sessions. If any of the files like bld.inf, MMP, or any of their <span class="code">include</span> files change, the list is automatically recalculated and CDT notified. </p>
-<p>To change what appears in the list:</p>
-<ul>
- <li>In the <a href="../MMP_Editor.html">MMP Editor</a> - add macros, user, or system include </li>
- <li>Using the Macro File defined in the <a href="pane_macro_settings.htm">Carbide Macro Settings</a> panel </li>
-</ul>
-<p>You can also specify a macro file using the <a href="pane_macro_settings.htm">Carbide Macro Settings</a> page in the <b>Properties for <i>project</i></b> dialog. </p>
-<p align="center"><img src="../images/page_build_config_paths.png" width="575" height="473"></p>
-<p class="figure">Figure 1 - Paths and Symbols pane </p>
-<h5>Other references </h5>
-<ul>
- <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
- <li><a href="pane_build_config.htm">SIS Builder</a></li>
- <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
- <li><a href="pane_build_config_env.htm">Environment</a></li>
- <li><a href="../ROM_build_settings.html">ROM Builder</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<meta name="keywords" content="Paths and Symbols, Include Paths, Symbols" >
+<title>Paths and Symbols </title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Paths and Symbols </h2>
+<p> The <b>Paths and Symbols </b> pane shows the paths and symbols used to the build the project index. This is a read-only list based on the setting of the <b>Build configuration for the indexer</b> option in the <b>C/C++ General</b> > <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_idx.htm">Indexer</a> panel. Carbide now caches the paths and symbols which persist between debug sessions. If any of the files like bld.inf, MMP, or any of their <span class="code">include</span> files change, the list is automatically recalculated and CDT notified. </p>
+<p>To change what appears in the list:</p>
+<ul>
+ <li>In the <a href="../MMP_Editor.html">MMP Editor</a> - add macros, user, or system include </li>
+ <li>Using the Macro File defined in the <a href="pane_macro_settings.htm">Macro Settings</a> panel </li>
+</ul>
+<p>You can also specify a macro file using the <a href="pane_macro_settings.htm">Macro Settings</a> page in the <b>Properties for <i>project</i></b> dialog. </p>
+<p align="center"><img src="../images/page_build_config_paths.png" width="558" height="456"></p>
+<p class="figure">Figure 1 - Paths and Symbols pane </p>
+<h5>Other references </h5>
+<ul>
+ <li><a href="pane_build_config.htm">Build Configurations</a></li>
+ <li><a href="pane_build_config.htm">SIS Builder</a></li>
+ <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
+ <li><a href="pane_build_config_env.htm">Environment</a></li>
+ <li><a href="../ROM_build_settings.html">ROM Builder</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_macro_settings.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_macro_settings.htm Wed Jul 21 12:11:48 2010 -0500
@@ -4,19 +4,19 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide Macro Settings</title>
+<title>Macro Settings</title>
<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
</head>
<body bgcolor="#FFFFFF">
-<h2>Carbide Macro Settings</h2>
-<p> The <b>Carbide Macro Settings</b> properties page allows you to specify a file containing macros that CDT will use when parsing the source code. </p>
-<p align="center"><img src="../images/carbide_macro_settings.png" width="670" height="488"></p>
-<p class="figure">Figure 1 - Carbide Macros Settings panel </p>
-<h5>Table 1 Carbide <span class="figure">Macros Settings</span> items </h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
+<h2> Macro Settings</h2>
+<p> The <b> Macro Settings</b> properties page allows you to specify a file containing macros that CDT uses to parse the source code. </p>
+<p align="center"><img src="../images/carbide_macro_settings.png" width="786" height="476"></p>
+<p class="figure">Figure 1 - Macros Settings panel </p>
+<h5>Table 1 <span class="figure">Macros Settings</span> items </h5>
+<table width="700" border="0" cellpadding="2" cellspacing="0">
<tr>
- <th width="28%" scope="col">Item</th>
- <th width="72%" scope="col">Explanation</th>
+ <th width="30%" scope="col">Item</th>
+ <th width="70%" scope="col">Explanation</th>
</tr>
<tr>
<td width="28%"><b>Macro File </b></td>
@@ -34,8 +34,7 @@
<h5>Related references </h5>
<ul>
<li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
- <li><a href="pane_build_config.htm">Carbide Build Configuration</a></li>
- <li>Carbide Rom Build Settings </li>
+ <li><a href="pane_build_config.htm">Build Configurations</a></li>
</ul>
<div id="footer">Copyright © 2010 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></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_pkg_config.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_pkg_config.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,7 +9,7 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Set PKG File for Build Configuration</h2>
-<p>The <b>Set PKG File for Build Configuration</b> dialog appears when an Application TRK build configuration does not include a PKG file. Use it to assign a PKG file to the project's current build configuration that will be used to create a project's SIS installation file. If you define a launch configuration used for on-device debugging with the TRK debug agent, you will need to specify a PKG file for the project. A PKG file primarily provides a list of program and resource files to install on the device.</p>
+<p>The <b>Set PKG File for Build Configuration</b> dialog appears when an <strong>Application TRK</strong> build configuration does not include a PKG file. Use it to assign a PKG file to the project's current build configuration that will be used to create a project's SIS installation file. If you define a launch configuration used for on-device debugging with the TRK debug agent, you will need to specify a PKG file for the project. A PKG file primarily provides a list of program and resource files to install on the device.</p>
<p align="center"><img src="../images/set_pkg.png" width="544" height="359" /></p>
<p class="figure">Figure 1 - Set PKG File for Build Configuration</p>
<h5>Table 1 Items </h5>
@@ -44,7 +44,7 @@
</ul>
<h5>Related reference </h5>
<ul>
- <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
+ <li><a href="pane_build_config.htm">Build Configurations</a></li>
<li><a href="pane_build_config_env.htm">Environment variables</a></li>
</ul>
<div id="footer">Copyright © 2010 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></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_project_settings.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_project_settings.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,126 +1,133 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide Project Settings</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style5 {font-family: Verdana, Ariel, Helvetica, sans-serif; font-weight: bold; }
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Carbide Project Settings</h2>
-<p> Use the <b>Carbide Project Settings </b>window to specify whether all components or selected subcomponents listed in a build information file (bld.inf) should be built for the currently selected project. You can also specify whether to perform a <span class="code">clean</span> or <span class="code">reallyclean</span> command on the project before building a project.</p>
-<p align="center"><img src="../images/carbide_proj_settings.png" width="640" height="643" /></p>
-<p class="figure">Figure 1 - Carbide Project Settings</p>
-<h5>Table 1 Carbide Project Settings items </h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="29%" scope="col">Item</th>
- <th width="57%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td><b>Bld.inf file</b></td>
- <td>This is the path to the bld.inf file that lists the makefile and mmp components.</td>
- </tr>
- <tr>
- <td><b>Bld.inf</b></td>
- <td>Select this option to ensure all components are built for the selected project. </td>
- </tr>
- <tr>
- <td><b>Selected Components</b></td>
- <td><p>Select this option to specify which components of the bld.inf file to be built, including makefiles. The equivalent call to abld is <span class="code">abld build <subcomponent></span>. Use the <b>Exclude extension makefiles</b> and <b>Exclude test components</b> options to manage the items that appear in the list. </p>
- <p>Toggle the state of each component to set its build state to true or not. A checkmark indicates a component is built. Click on a column title to sort the items by that columns contents. </p>
- </td>
- </tr>
- <tr>
- <td><b>Exclude extension makefiles </b></td>
- <td>Toggles the presense of extension makefiles in the Selected components list. </td>
- </tr>
- <tr>
- <td><b>Exclude test components </b></td>
- <td>Toggles the presense of test components in the Selected components list. </td>
- </tr>
- <tr>
- <td><b>Enable project specific settings </b></td>
- <td>Click to set project specific build settings. By default a project in the workspace uses the global build settings unless this option is enabled. See the <a href="../wnd_build_prefs.htm">Build</a> preference panel for details on these options. </td>
- </tr>
- <tr>
- <td><b>Configure Workspace Settings... </b></td>
- <td>Opens the <a href="../wnd_build_prefs.htm">Build</a> preference panel. </td>
- </tr>
-</table>
-<p> </p>
-<p align="center"><img src="../images/carbide_proj_settings_sbsv1.png" alt="sbsv1 tab" width="417" height="243"></p>
-<p align="center" class="figure">Figure 2 - SBSv1 Tab</p>
-<h5 align="left">Table 2 Symbian Build System v1 tab </h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="29%" scope="col">Item</th>
- <th width="57%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td><span class="style5">Clean level </span></td>
- <td><p>Specifies the level of clean to perform on project files. The levels include:</p>
- <ul>
- <li>Level 0 (<span class="code">abld clean</span>) - removes all the intermediate files created during compilation, and all the executables and import libraries created by the linker</li>
- <li>Level 1 (<span class="code">abld reallyclean</span>) - performs a <span class="code">clean</span> operation, but also removes all exported files and makefiles</li>
- <li>Level 2 (<span class="code">abld reallyclean</span>, <span class="code">bldmake clean</span>) - performs a <span class="code">reallyclean</span> operation and then removes all files created by bldmake</li>
- </ul></td>
- </tr>
- <tr>
- <td><span class="style5">Manage dependency tracking </span></td>
- <td>If checked, the Symbian command line build system will not generate dependencies for source and resource files. These will be managed by Carbide. This can reduce build times. </td>
- </tr>
- <tr>
- <td><b>Show a dialog to modify build actions when modified MMPs are detected </b></td>
- <td><p>If checked, you will be asked what action to take before a build if a MMP file has been modified. </p>
- <p>If not checked, the default action is taken for all modified mmp files. </p></td>
- </tr>
- <tr>
- <td><b>Default action to take when mmp files are modified </b></td>
- <td>Select either None, Link only, or Compile and Link.</td>
- </tr>
-</table>
-<p align="left"> </p>
-<p align="center"><img src="../images/carbide_proj_settings_sbsv2.png" alt="sbsv2 tab" width="427" height="269"></p>
-<p align="center" class="figure">Figure 3 - SBSv2 Tab</p>
-<h5 align="left">Table 3 Symbian Build System v2 tab (only visible for Projects created with SBSv2 builder) </h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="29%" scope="col">Item</th>
- <th width="57%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td><b>Clean level </b></td>
- <td>Select the level of clean when cleaning a project.
- <ul>
- <li><strong>abld clean</strong> erases all files created by a corresponding abld target command (all intermediate files created during compilation and all executables and import libraries created by the linker)</li>
- <li><strong>abld reallyclean</strong> does what abld clean does, and also removes files exported by abld export and makefiles generated by abld makefile, or the abld test equivalents</li>
- </ul></td>
- </tr>
- <tr>
- <td><b>Keep going </b></td>
- <td><p>This build option tells a particular command to keep going even if unrelated build steps report errors or files are missing.</p> </td>
- </tr>
- <tr>
- <td><b>Debug </b></td>
- <td><p>This option generates symbolic debug information for release or debug builds, independent of the compiler optimization level.</p>
- <p>By default, the build system generates symbolic debug information only for the debug builds. With this option, the generation of symbolic debug information is extended to release builds to support debugging of release binaries on ARM ABI compliant platforms.</p></td>
- </tr>
- <tr>
- <td><b>Override default make engine</b> </td>
- <td>Check this box to enable an edit box to specify the make engine to use, for example, eMake from Electric Cloud.</td>
- </tr>
-</table>
-<p> </p>
-<h4>Related tasks</h4>
-<ul><li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Project Settings</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style5 {font-family: Verdana, Ariel, Helvetica, sans-serif; font-weight: bold; }
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Project Settings</h2>
+<p> Use the <b>Project Settings </b>window to specify whether all components or selected subcomponents listed in a build information file (bld.inf) should be built for the currently selected project. You can also specify whether to perform a <span class="code">clean</span> or <span class="code">reallyclean</span> command on the project before building a project.</p>
+<p align="center"><img src="../images/carbide_proj_settings.png" width="672" height="679" /></p>
+<p class="figure">Figure 1 - Project Settings</p>
+<h5>Table 1 Project Settings items </h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="29%" scope="col">Item</th>
+ <th width="57%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td><b>Bld.inf file</b></td>
+ <td>This is the path to the bld.inf file that lists the makefile and mmp components.</td>
+ </tr>
+ <tr>
+ <td><b>Bld.inf</b></td>
+ <td>Select this option to ensure all components are built for the selected project. </td>
+ </tr>
+ <tr>
+ <td><b>Selected Components</b></td>
+ <td><p>Select this option to specify which components of the bld.inf file to be built, including makefiles. The equivalent call to abld is <span class="code">abld build <subcomponent></span>. Use the <b>Exclude extension makefiles</b> and <b>Exclude test components</b> options to manage the items that appear in the list. </p>
+ <p>Toggle the state of each component to set its build state to true or not. A checkmark indicates a component is built. Click on a column title to sort the items by that columns contents. </p>
+ </td>
+ </tr>
+ <tr>
+ <td><b>Exclude extension makefiles </b></td>
+ <td>Toggles the presense of extension makefiles in the Selected components list. </td>
+ </tr>
+ <tr>
+ <td><b>Exclude test components </b></td>
+ <td>Toggles the presense of test components in the Selected components list. </td>
+ </tr>
+ <tr>
+ <td><b>Enable project specific settings </b></td>
+ <td>Click to set project specific build settings. By default a project in the workspace uses the global build settings unless this option is enabled. See the <a href="../wnd_build_prefs.htm">Build</a> preference panel for details on these options. </td>
+ </tr>
+ <tr>
+ <td><b>Configure Workspace Settings... </b></td>
+ <td>Opens the <a href="../wnd_build_prefs.htm">Build</a> preference panel. </td>
+ </tr>
+</table>
+<p> </p>
+<p align="center"><img src="../images/carbide_proj_settings_sbsv1.png" alt="sbsv1 tab" width="444" height="143"></p>
+<p align="center" class="figure">Figure 2 - SBSv1 Tab</p>
+<h5 align="left">Table 2 Symbian Build System v1 tab </h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="29%" scope="col">Item</th>
+ <th width="57%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td><span class="style5">Clean level </span></td>
+ <td><p>Specifies the level of clean to perform on project files. The levels include:</p>
+ <ul>
+ <li>Level 0 (<span class="code">abld clean</span>) - removes all the intermediate files created during compilation, and all the executables and import libraries created by the linker</li>
+ <li>Level 1 (<span class="code">abld reallyclean</span>) - performs a <span class="code">clean</span> operation, but also removes all exported files and makefiles</li>
+ <li>Level 2 (<span class="code">abld reallyclean</span>, <span class="code">bldmake clean</span>) - performs a <span class="code">reallyclean</span> operation and then removes all files created by bldmake</li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td><span class="style5">Manage dependency tracking </span></td>
+ <td>If checked, the Symbian command line build system will not generate dependencies for source and resource files. These will be managed by Carbide. This can reduce build times. </td>
+ </tr>
+ <tr>
+ <td><b>Show a dialog to modify build actions when modified MMPs are detected </b></td>
+ <td><p>If checked, you will be asked what action to take before a build if a MMP file has been modified. </p>
+ <p>If not checked, the default action is taken for all modified mmp files. </p></td>
+ </tr>
+ <tr>
+ <td><b>Default action to take when mmp files are modified </b></td>
+ <td>Select either None, Link only, or Compile and Link.</td>
+ </tr>
+</table>
+<p align="left"> </p>
+<p align="center"><img src="../images/carbide_proj_settings_sbsv2.png" alt="sbsv2 tab" width="423" height="176"></p>
+<p align="center" class="figure">Figure 3 - SBSv2 Tab</p>
+<h5 align="left">Table 3 Symbian Build System v2 tab (only visible for Projects created with SBSv2 builder) </h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="29%" scope="col">Item</th>
+ <th width="57%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td><b>Clean level </b></td>
+ <td>Select the level of clean when cleaning a project.
+ <ul>
+ <li><strong>abld clean</strong> erases all files created by a corresponding abld target command (all intermediate files created during compilation and all executables and import libraries created by the linker)</li>
+ <li><strong>abld reallyclean</strong> does what abld clean does, and also removes files exported by abld export and makefiles generated by abld makefile, or the abld test equivalents</li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td><b>Keep going </b></td>
+ <td><p>This build option tells a particular command to keep going even if unrelated build steps report errors or files are missing.</p> </td>
+ </tr>
+ <tr>
+ <td><b>Debug mode</b></td>
+ <td><p>This option generates symbolic debug information for release or debug builds, independent of the compiler optimization level.</p>
+ <p>By default, the build system generates symbolic debug information only for the debug builds. With this option, the generation of symbolic debug information is extended to release builds to support debugging of release binaries on ARM ABI compliant platforms.</p></td>
+ </tr>
+ <tr>
+ <td><strong>Additional SBSv2 arguments</strong></td>
+ <td>Enter any additional arguments to pass to <span class="code">sbs.bat</span>.</td>
+ </tr>
+ <tr>
+ <td><strong>Override default make engine </strong></td>
+ <td>Check this box to enable an edit box to specify the <strong>Make engine</strong> to use, for example, eMake from Electric Cloud.</td>
+ </tr>
+ <tr>
+ <td><strong>Make engine</strong></td>
+ <td>Enter the name of a different make engine to use when building.</td>
+ </tr>
+</table>
+<h4>Related tasks</h4>
+<ul><li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+</body>
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/wnd_sis_properties.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/wnd_sis_properties.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,60 +1,60 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>SIS Properties </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>SIS Properties </h2>
-<p> Use the<b> SIS Properties</b> dialog to specify SIS file creation and signing options for the selected SIS file included in the project. </p>
-<p align="center"><img src="../images/wnd_sis_properties.png" width="375" height="452" /></p>
-<p class="figure">Figure 1 - SIS Properties dialog </p>
-<h5>Table 1 <span class="figure">SIS Properties window</span> items </h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="20%" scope="col">Item</th>
- <th width="71%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td width="20%"><b>SIS File Creation Options </b></td>
- <td><p>Define the SIS file created: </p>
- <ul>
- <li><b>PKG File</b> — name of the PKG file to build. Click Browse to locate or else type in the file path and name. </li>
- <li><b>Output File Name</b> — unsigned file name that is generated from the PKG file selected</li>
- <li><b>Content Search Location</b> — root location where PKG files are specified to search </li>
- <li><b>Generate partial upgrade when appropriate</b> — enable to create package update files that only contain files changed since the last build</li>
- </ul></td>
- </tr>
- <tr>
- <td><b>Signing Options </b></td>
- <td><p>Defines the signing options applied to the configuration. The options include: </p>
- <ul>
- <li><b>Don't sign sis file</b> — builds sis file without signing it </li>
- <li><b>Self sign sis file</b> — signs the sis file without specifying the certificate/key pair </li>
- <li><b>Sign sis file with certificate/key pair</b> — signs the sis file using the specified certificate/key pair </li>
- </ul>
- <p>Enter the required information into the enabled fields based on the signing option selected above: </p>
- <ul>
- <li><b>Signed SIS File Name</b> —Final output signed file name. Default is input PKG name with ‘sisx’ extension.</li>
- <li><b>Password</b> — Optional password</li>
- <li><b>Additional options</b> — Enter unfiltered options to be passed to the tool</li>
- <li><b>Certificate</b> – Enter or browse to certificate</li>
- <li><b>Key</b> — Enter or browse to key</li>
- </ul>
- <p class="note"><b>NOTE</b> On Symbian OS 9.x builds, if the key/cert pair are not defined, <span class="code">makekeys</span> will be called and temporary ones will be generated for you to "self-sign" the application. Self-signed applications should be in the
- 0xE0000000-0xEFFFFFFF range.</p>
- <p class="note"><b>NOTE</b> All Application TRK build configuration require a PKG file. If none is found in the active project then you will be asked to <a href="pane_pkg_config.htm">choose</a> one.</p> </td>
- </tr>
-</table>
-<h5>Related reference </h5>
-<ul>
- <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
- <li><a href="pane_build_config_env.htm">Environment variables</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>SIS Properties </title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>SIS Properties </h2>
+<p> Use the<b> SIS Properties</b> dialog to specify SIS file creation and signing options for the selected SIS file included in the project. </p>
+<p align="center"><img src="../images/wnd_sis_properties.png" width="455" height="452" /></p>
+<p class="figure">Figure 1 - SIS Properties dialog </p>
+<h5>Table 1 <span class="figure">SIS Properties window</span> items </h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="20%" scope="col">Item</th>
+ <th width="71%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td width="20%"><b>SIS File Creation Options </b></td>
+ <td><p>Define the SIS file created: </p>
+ <ul>
+ <li><b>PKG File</b> — name of the PKG file to build. Click Browse to locate or else type in the file path and name. </li>
+ <li><b>Output File Name</b> — unsigned file name that is generated from the PKG file selected</li>
+ <li><b>Content Search Location</b> — root location where PKG files are specified to search </li>
+ <li><b>Generate partial upgrade when appropriate</b> — enable to create package update files that only contain files changed since the last build</li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td><b>Signing Options </b></td>
+ <td><p>Defines the signing options applied to the configuration. The options include: </p>
+ <ul>
+ <li><b>Don't sign sis file</b> — builds sis file without signing it </li>
+ <li><b>Self sign sis file</b> — signs the sis file without specifying the certificate/key pair </li>
+ <li><b>Sign sis file with certificate/key pair</b> — signs the sis file using the specified certificate/key pair </li>
+ </ul>
+ <p>Enter the required information into the enabled fields based on the signing option selected above: </p>
+ <ul>
+ <li><b>Signed SIS File Name</b> —Final output signed file name. Default is input PKG name with ‘sisx’ extension.</li>
+ <li><b>Password</b> — Optional password</li>
+ <li><b>Additional options</b> — Enter unfiltered options to be passed to the tool</li>
+ <li><b>Certificate</b> – Enter or browse to certificate</li>
+ <li><b>Key</b> — Enter or browse to key</li>
+ </ul>
+ <p class="note"><b>NOTE</b> On Symbian OS 9.x builds, if the key/cert pair are not defined, <span class="code">makekeys</span> will be called and temporary ones will be generated for you to "self-sign" the application. Self-signed applications should be in the
+ 0xE0000000-0xEFFFFFFF range.</p>
+ <p class="note"><b>NOTE</b> All Application TRK build configuration require a PKG file. If none is found in the active project then you will be asked to <a href="pane_pkg_config.htm">choose</a> one.</p> </td>
+ </tr>
+</table>
+<h5>Related reference </h5>
+<ul>
+ <li><a href="pane_build_config.htm">Build Configurations</a></li>
+ <li><a href="pane_build_config_env.htm">Environment variables</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
</html>
\ No newline at end of file
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/MMP_wizard.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/MMP_wizard2.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/add_images_from_filesys.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/add_images_from_project.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/build_all_targets.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/build_pkg_file.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/build_symbian_comp.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_build_config.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_macro_settings.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_preferences.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_proj_settings.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_proj_settings_sbsv1.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_proj_settings_sbsv2.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/clean_symbian_comp.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/codescanner_run.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/context_menu_remote_conn_view.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_install_extensions.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/icon_show_overview.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/import_bld_inf_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/import_bld_inf_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/import_bld_inf_03.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/import_bld_inf_04.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/import_bld_inf_05.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/leavescan_menu.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/leavescan_pref.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_abld.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_compile_source.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_freeze_exports.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_freeze_symbian_comp.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_mem_rendering_options.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_memory_rendering_options.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_abld.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_compile.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_compile_source.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_freeze_comp.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_freeze_exports.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_symb_preprocess.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_team_commands.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/mmp_editor.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/mmp_editor_libraries.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/mmp_editor_mmpfile.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/mmp_editor_options.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/mmp_editor_sources.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/pref_indexer.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/pref_indexer_properties.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/pref_launch_config_filter.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/prefs_carbide_cpp.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_carbide_portal.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_install_extensions.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_memory.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_project_explorer.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_remote_connections.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_show_overview_popup.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_sym_proj_nav.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wiz_new_class.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_edit_mbm_contents.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_new_connection_wizard_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_new_connection_wizard_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_new_connection_wizard_03.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_pref_code_styles.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/indexer.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/indexer.html Wed Jul 21 12:11:48 2010 -0500
@@ -1,67 +1,67 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Indexer</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
-<h2>Indexer</h2>
-<p>The C/C++ <b>Indexer</b> uses the parser to create a database of source and header files that provide the basis for C/C++ search, navigation features and content assist. The goal of indexing is to record all named elements in a project's source code and store them with their related data. The indexer parses each source file in your project and updates related indexes. By indexing your files with the indexer, useful features such as code completion and fast file search can be used. It is also possible to specify different indexer settings for each project in your workspace.</p>
- <p>If you choose to perform the <b>Full C/C++ Indexer </b>option the indexer will consume the CPU for some time, but you will gain more benefit from the process after it completes.
- However, if you do not require the benefits of indexing your project, select the <b>No Indexer</b> option to speed up the process of building your project.</p>
- <p>The indexer runs on a background thread and reacts to resource change events such as:</p>
- <ul>
- <li>C/C++ project creation/deletion</li>
- <li>Source files creation/deletion</li>
- <li>File imports</li>
- <li> Source file content changes</li>
- </ul>
- <p>The global <b>Indexer</b> is accessed by selecting <b>Window > Preferences > C/C++ > Indexer</b> (figure 1). The sections outlined in red appear as part of the project level indexer.</p>
- <p class="note"><b>NOTE</b> You can also rebuild a project's index by selecting a project, then right-click and select the <b>Rebuild Index</b> menu item. </p>
- <p align="center" class="Image"><img src="images/indexer.png" width="627" height="704" /></p>
- <p align="left" class="figure">Figure 1 - Indexer Window in Preferences Panels</p>
- <p align="left" class="Image">The project indexer is accessed by selecting a project in the Project Explorer or Symbian Project Navigator view and selecting <b>Project > Properties > C/C++ General > Indexer</b> (figure 2).</p>
- <p align="center" class="Image"><img src="images/indexer_prop.png" width="682" height="579" /></p>
- <p align="left" class="figure">Figure 2 - Indexer Window in Project Properties </p>
- <table cellpadding="2" cellspacing="0"
-border="0">
- <tr valign="top"><th width="221" class="Cell">Name</th><th width="558" class="Cell">Function</th></tr>
- <tr valign="top">
- <td class="Cell"><b>Select indexer </b></td>
- <td class="Cell"><p>Dropdown list of available index options.</p>
- <ul>
- <li>Fast C/C++ Indexer - Source files will be indexed and eat up a lot of CPU time and memory during the first generation of the indexer. This can take some time depending on the size of your project. Afterwards the indexer will only reindex the relevant parts you changed in your code and not the whole source tree.</li>
- <li>Full C/C++ Indexer - Performs a complete parse of all source files and takes up the most amount of time to complete.</li>
- <li>No Indexer - Project source files are not indexed, therefore search features will not work accurately and code completion will not be available.</li>
- </ul></td>
- </tr>
- <tr valign="top">
- <td class="Cell"><b>Apply indexer to all projects now </b></td>
- <td class="Cell">Select this option to apply the Fast C/C++ Indexer option to all projects in your current workspace. </td>
- </tr>
- <tr valign="top">
- <td class="Cell"><b>Rebuild the index when changing to a different build configuration </b></td>
- <td class="Cell">Select this option to rescan and index the source files for the current project when you change the active build configuration. The index will be built based on the active build configuration. All macros and header files used to build the index will be taken from the active build configuration.</td>
- </tr>
- <tr valign="top">
- <td class="Cell"><p><b>Build the index only for the build configuration specified in the project's indexer settings</b></p>
- <p> </p>
- <p><b>Build the index only for the specified build configuration </b></p></td>
- <td class="Cell"><p>The indexer will only be run for the build configuration specified in the Indexer panel in the project's property settings. All macros and header files used to build the index will be taken from the specified configuration.</p>
- <p> </p>
- <p class="note"><b>NOTE</b> This option appears in the project properties indexer panel. A dropdown list is provided to select a build configuration for the currently selected project.</p></td>
- </tr>
- </table>
- <p> </p>
- <h5>Related concepts</h5>
- <ul>
- <li><a href="../concepts/build_configurations.htm">Active Build Configuration</a></li>
- </ul>
- <h5>Related tasks </h5>
- <ul><li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting Active Build Configurations</a></li>
- <li><a href="../tasks/projects/prj_debug_config.htm">Creating Launch Configurations</a></li>
- <li><a href="../tasks/projects/prj_new_build_config.htm">Creating Build Configurations</a></li>
- </ul>
-<div id="footer">Copyright © 2010 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></div>
-
- </body>
- </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Indexer</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+<h2>Indexer</h2>
+<p>The C/C++ <b>Indexer</b> uses the parser to create a database of source and header files that provide the basis for C/C++ search, navigation features and content assist. The goal of indexing is to record all named elements in a project's source code and store them with their related data. The indexer parses each source file in your project and updates related indexes. By indexing your files with the indexer, useful features such as code completion and fast file search can be used. It is also possible to specify different indexer settings for each project in your workspace.</p>
+ <p>If you choose to perform the <b>Full C/C++ Indexer </b>option the indexer will consume the CPU for some time, but you will gain more benefit from the process after it completes.
+ However, if you do not require the benefits of indexing your project, select the <b>No Indexer</b> option to speed up the process of building your project.</p>
+ <p>The indexer runs on a background thread and reacts to resource change events such as:</p>
+ <ul>
+ <li>C/C++ project creation/deletion</li>
+ <li>Source files creation/deletion</li>
+ <li>File imports</li>
+ <li> Source file content changes</li>
+ </ul>
+ <p>The global <b>Indexer</b> is accessed by selecting <b>Window > Preferences > C/C++ > Indexer</b> (figure 1). The sections outlined in red appear as part of the project level indexer.</p>
+ <p class="note"><b>NOTE</b> You can also rebuild a project's index by selecting a project, then right-click and select the <b>Rebuild Index</b> menu item. </p>
+ <p align="center" class="Image"><img src="images/pref_indexer.png" alt="Indexer preference panel" width="680" height="775"></p>
+ <p align="left" class="figure">Figure 1 - C/C++ Indexer in Preferences</p>
+ <p align="left" class="Image">The project indexer is accessed by selecting a project in the <a href="view_cpp_projects.htm">Project Explorer</a> or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view and selecting <b>Project > Properties > C/C++ General > Indexer</b> (figure 2).</p>
+ <p align="center" class="Image"><img src="images/pref_indexer_properties.png" alt="Indexer properties panel" width="680" height="628"></p>
+ <p align="left" class="figure">Figure 2 - Indexer panel in Properties for project_name</p>
+ <table cellpadding="2" cellspacing="0"
+border="0">
+ <tr valign="top"><th width="221" class="Cell">Name</th><th width="558" class="Cell">Function</th></tr>
+ <tr valign="top">
+ <td class="Cell"><b>Select indexer </b></td>
+ <td class="Cell"><p>Dropdown list of available index options.</p>
+ <ul>
+ <li>Fast C/C++ Indexer - Source files will be indexed and eat up a lot of CPU time and memory during the first generation of the indexer. This can take some time depending on the size of your project. Afterwards the indexer will only reindex the relevant parts you changed in your code and not the whole source tree.</li>
+ <li>Full C/C++ Indexer - Performs a complete parse of all source files and takes up the most amount of time to complete.</li>
+ <li>No Indexer - Project source files are not indexed, therefore search features will not work accurately and code completion will not be available.</li>
+ </ul></td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><b>Apply indexer to all projects now </b></td>
+ <td class="Cell">Select this option to apply the Fast C/C++ Indexer option to all projects in your current workspace. </td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><b>Rebuild the index when changing to a different build configuration </b></td>
+ <td class="Cell">Select this option to rescan and index the source files for the current project when you change the active build configuration. The index will be built based on the active build configuration. All macros and header files used to build the index will be taken from the active build configuration.</td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><p><b>Build the index only for the build configuration specified in the project's indexer settings</b></p>
+ <p> </p>
+ <p><b>Build the index only for the specified build configuration </b></p></td>
+ <td class="Cell"><p>The indexer will only be run for the build configuration specified in the Indexer panel in the project's property settings. All macros and header files used to build the index will be taken from the specified configuration.</p>
+ <p> </p>
+ <p class="note"><b>NOTE</b> This option appears in the project properties indexer panel. A dropdown list is provided to select a build configuration for the currently selected project.</p></td>
+ </tr>
+ </table>
+ <p> </p>
+ <h5>Related concepts</h5>
+ <ul>
+ <li><a href="../concepts/build_configurations.htm">Active Build Configuration</a></li>
+ </ul>
+ <h5>Related tasks </h5>
+ <ul><li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting Active Build Configurations</a></li>
+ <li><a href="../tasks/projects/prj_debug_config.htm">Creating Launch Configurations</a></li>
+ <li><a href="../tasks/projects/prj_new_build_config.htm">Creating Build Configurations</a></li>
+ </ul>
+<div id="footer">Copyright © 2010 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></div>
+
+ </body>
+ </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configuration_filter.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configuration_filter.htm Wed Jul 21 12:11:48 2010 -0500
@@ -5,12 +5,13 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
<title>Launch Configuration Filtering</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
</head>
<body bgcolor="#FFFFFF">
<h2>Launch Configuration Filtering </h2>
-<p>Use the <b>Launch Configuration </b> preference panel to filter the launch configurations that appear in the configurations list in the <b>Run</b> or <b><a href="wnd_debug_configuration.htm">Debug</a></b> dialog. This allows you to manage which configuration types are shown. For example, enable the <b>Filter checked launch configuration types</b> option and check the configuration types that you do not want to appear in the <b>Run</b> and <b>Debug</b> dialogs. As shown in Figure 1, all the configurations related to TRK have been enabled and won't appear in the configurations list. </p>
-<p align="center"><img src="images/filter_launch_config.png" width="627" height="574" /></p>
+<p>Use the <b>Launch Configuration </b> preference panel to filter the launch configurations that appear in the configurations list in the <b>Run</b> or <b><a href="wnd_debug_configuration.htm">Debug</a></b> window. This allows you to manage which configuration types are shown. By default, all launch configurations are shown. To open click the <strong>Windows > Preferences > Run/Debug > Launching > Launch Configurations</strong> option.</p>
+<p>To hide specific launch configurations, enable the <b>Filter checked launch configuration types</b> option and check the configuration types that should be hidden in the <b>Run</b> and <b>Debug</b> dialogs. As shown in Figure 1, all the configurations checked and won't appear in the configurations list, including Snapshot Albums. </p>
+<p align="center"><img src="images/pref_launch_config_filter.png" alt="Launch Configurtion Filter preference panel" width="662" height="579"></p>
<p class="figure">Figure 1 - Launch Configurations preference panel </p>
<h5>Related references</h5>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/leavescan_pref.html Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Leavescan Preferences</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
- <body>
- <h2>Leavescan Preferences</h2>
- <p>Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.leavescan.ui.LeavescanPreferences)")'>
-Leavescan Preferences</a> page in the <b>Preferences</b> window to define the location where the <span class="code">leavescan.exe</span> program exists on the file system. Symbian OS has a standard convention for functions that may Leave. Therefore, any function that Leaves, or calls a function that Leaves (other than in a TRAP harness), must have a name ending in "L". Leavescan verifies that your code satisfies this convention.</p>
- <p align="center"><img src="images/leavescan_pref.png" width="671" height="359" alt="Leavescan preferences panel" /></p>
- <p align="center" class="figure">Figure 1. Leavescan preference page </p>
- <h5>Table 1. Leavescan Preferences —items</h5>
- <div class="Figure"></div>
- <table cellpadding="2" cellspacing="0"
-border="0">
- <tr valign="top"><th width="221" class="Cell">Name</th><th width="558" class="Cell">Function</th></tr>
- <tr valign="top">
- <td class="Cell"><b>Leavescan Directory </b></td>
- <td class="Cell"><p>Enter or Browse to the directory where <span class="code">leavescan.exe</span> resides. <span class="code">Leavescan.exe</span> is normally found in the <span class="code">${EPOCROOT}\epoc32\tools</span> directory.</p>
- <p class="note"><b>NOTE</b> The path to the Leavescan directory should not contain space characters.</p></td>
- </tr>
- <tr valign="top">
- <td class="Cell"><b>Very noisy output </b></td>
- <td class="Cell"><p>If enabled, the <span class="code">-N</span> option is passed to <span class="code">leavescan.exe</span> and produces verbose output. If unchecked, minimal output is produced. </p>
- </td>
- </tr>
- </table>
- <h5>Related Tasks</h5>
- <ul>
- <li><a href="menus/run_leavescan.htm">Run Leavescan</a></li>
- </ul>
- <div id="footer">Copyright © 2010 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></div>
-
- </body>
- </html>
-
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/memory_rendering_options.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/memory_rendering_options.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,7 +9,7 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Memory Rendering Options</h2>
-<p>You can configure the Memory Rendering pane to display data in the memory location in a variety of ways. The following options are visible on the context menu for the Memory Rendering pane. </p>
+<p>You can configure the <strong>Memory Rendering</strong> pane to display data in the memory location in a variety of ways. The following options are visible on the context menu for the Memory Rendering pane. </p>
<p>Right-click to select an option shown in Table 1. </p>
<h5>Table 1. Memory Rendering context menu options </h5>
<table width="88%" border="0" cellpadding="2" cellspacing="0">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm Wed Jul 21 12:11:48 2010 -0500
@@ -10,8 +10,8 @@
</head>
<body bgcolor="#FFFFFF">
<h2>ABLD Actions </h2>
-<p>Use the <b>ABLD</b> menu option to invoke an specific <span class="code">abld</span> command on the selected project or file. ABLD is available under <b>Project > ABLD</b> or by right-clicking a project or file in the <a href="../view_cpp_projects.htm">Project Explorer</a>, <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a>, and <a href="../view_disassembly.htm">Disassembly</a> views and choosing <b>ABLD > <i>command</i></b>. When executed any arguments specified in the <a href="../build_properties/pane_build_config_args.htm">Carbide Build Configurations</a> pane for the command are passed to the selected tool. </p>
-<p align="center"><img src="../images/menu_abld.png" width="496" height="136"></p>
+<p>Use the <b>ABLD</b> menu option to invoke an specific <span class="code">abld</span> command on the selected project or file. ABLD is available under <b>Symbian Build > ABLD</b> or by right-clicking a project or file in the <a href="../view_cpp_projects.htm">Project Explorer</a>, <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a>, and <a href="../view_disassembly.htm">Disassembly</a> views and choosing <b>ABLD > <i>command</i></b>. When executed any arguments specified in the <a href="../build_properties/pane_build_config_args.htm">Carbide Build Configurations</a> pane for the command are passed to the selected tool. </p>
+<p align="center"><img src="../images/menu_symb_abld.png" width="890" height="204"></p>
<p class="figure">Figure 1 - Available ABLD actions</p>
<p>The available commands include:</p>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_all_targets.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_all_targets.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,9 +9,14 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Build All Configurations </h2>
-<p>Select a project in the Project Explorer, C/C++ Projects, or Symbian Project Navigator view and use the Project menu or right-click to display the context menu. Select <b>Build All Configurations</b> (CTRL+ALT+A) to build all target build configurations enabled for the current project.</p>
-<p align="center"><img src="../images/build_all_targets.png" width="368" height="500" /></p>
-<p align="center" class="figure">Figure 1. Build All Configurations context menu </p>
+<p>Select a project in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then:</p>
+<ul>
+ <li>Click <b>Project > Build All Configurations</b> (<span class="code">CTRL+ALT+A</span>) , or</li>
+ <li>Right-click the project name and select <strong>Symbian Build > Build All Configurations</strong></li>
+</ul>
+<p>To build all target build configurations enabled for the current project.</p>
+<p align="center"><img src="../images/build_all_targets.png" width="280" height="262" /></p>
+<p align="center" class="figure">Figure 1. Build All Configurations menu </p>
<h5>Other references</h5>
<ul>
<li><a href="menus.htm">Carbide Menus</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,8 +9,8 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Build Package (.pkg) File</h2>
-<p>Select a .pkg file in a project′s sis folder in the Project Explorer or C/C++ Projects view and right-click to display the context menu. Select <b>Build PKG File</b> to build the package file and create the .sis installation file. This option is also available from an editor view when the file is open. The <span class="code">makesis</span> tool uses the package file and packs all the required resources together into a SIS installation file. The Console view will display the processing output. The .sis and .sisx files will appear in the sis folder.</p>
-<p align="center"><img src="../images/build_pkg_file.png" width="371" height="420" /></p>
+<p>Select a <span class="code">.PKG</span> file in a project′s <em>/sis</em> folder in the <a href="../view_cpp_projects.htm">Project Explorer</a> view and right-click to display the context menu. Select <b>Symbian Build > Build PKG File</b> to build the package file and create the .sis installation file. This option is also available from an editor view when the file is open. The <span class="code">makesis</span> tool uses the package file and packs all the required resources together into a SIS installation file. The <a href="../view_log.htm">Console</a> view displays the processing output. The .sis and .sisx files will appear in the project's <em>/sis</em> folder.</p>
+<p align="center"><img src="../images/build_pkg_file.png" width="543" height="117" /></p>
<p align="center" class="figure">Figure 1. Build PKG File context menu </p>
<h5>Other references</h5>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm Wed Jul 21 12:11:48 2010 -0500
@@ -8,8 +8,8 @@
<link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
<body bgcolor="#FFFFFF">
<h2>Build Symbian Component </h2>
-<p>Select a .mmp or .mk file in the Project Explorer, C/C++ Projects, or Symbian Project Navigator view, then right-click and select<b> Build Symbian Component</b> (CTRL+ALT+P) to build the selected component file or makefile. You can also right-click the file in an editor view and select <b>Build Symbian Componen</b><b>t</b> to also build the file. </p>
-<p align="center"><img src="../images/build_symbian_comp.png" width="432" height="357" /></p>
+<p>Select a .mmp or .mk file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then right-click and select<b> Symbian Build > Build Symbian Component</b> (<span class="code">CTRL+ALT+P</span>) to build the selected component file or makefile. You can also right-click the file in an editor view to use the same option. </p>
+<p align="center"><img src="../images/build_symbian_comp.png" width="580" height="197" /></p>
<p align="center" class="figure">Figure 1. Build Symbian Component menu item </p>
<p></p>
<h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,8 +9,8 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Clean Symbian Component </h2>
-<p>You can select a MMP or MK file in the Project Explorer, C/C++ Projects, or Symbian Project Navigator view and right-click to display the context menu. Select <b>Clean Symbian Component</b> (CTRL+ALT+X) to clean the selected MMP project file or makefile. You can also right-click the file in an editor view to see the same option. The cleaning process removes the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
-<p align="center"><img src="../images/clean_symbian_comp.png" width="461" height="347" /></p>
+<p>You can select a MMP or MK file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view and right-click to select <b>Symbian Build > Clean Symbian Component</b> (<span class="code">CTRL+ALT+X</span>) to clean the selected MMP project file or makefile. You can also right-click the file in an editor view to use the same option. The cleaning process removes the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
+<p align="center"><img src="../images/clean_symbian_comp.png" width="580" height="200" /></p>
<p align="center" class="figure">Figure 1. Clean Symbian Component context menu </p>
<h5>Other references</h5>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/compile_source.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/compile_source.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,8 +9,8 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Compile</h2>
-<p>Select a .c, .cpp, or .cia source file in the Project Explorer, C/C++ Projects, or Symbian Project Navigator view, right-click the file and choose <b> Compile</b> (<span class="code">CTRL+ALT+C</span>) to compile it. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The build progress is displayed in the Console view.</p>
-<p align="center"><img src="../images/menu_compile_source.png" width="330" height="346"></p>
+<p>Select a .c, .cpp, or .cia source file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, right-click the file and choose <b> Symbian Build > Compile</b> (<span class="code">CTRL+ALT+C</span>) to compile it. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The build progress is displayed in the Console view.</p>
+<p align="center"><img src="../images/menu_symb_compile.png" alt="Compile source" width="580" height="231"></p>
<p class="figure">Figure 1 - Right-click to compile a source file </p>
<h5>Other references</h5>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_exports.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_exports.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,8 +9,8 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Freeze Exports </h2>
-<p>Right click a project in the Project Explorer, or Symbian Project Navigator view, then choose <b> Freeze Exports</b>. This command calls the appropriate <b>abld</b> command and a .def file is generated. This enables released versions of DLLs to freeze their exports, ensuring backward compatibility of a library.</p>
-<p align="center"><img src="../images/menu_freeze_exports.png" width="335" height="410"></p>
+<p>Right-click a project in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then choose <b> Symbian Build > Freeze Exports</b>. This command calls the appropriate <b>abld</b> command and a .def file is generated. This enables released versions of DLLs to freeze their exports, ensuring backward compatibility of a library.</p>
+<p align="center"><img src="../images/menu_symb_freeze_exports.png" width="543" height="115"></p>
<p class="figure">Figure 1. Choosing Freeze Exports on a project </p>
<h5>Other references</h5>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_symbian_comp.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_symbian_comp.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,8 +9,8 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Freeze Symbian Component </h2>
-<p>Right-click a Symbian OS MMP file in the <a href="../view_cpp_projects.htm">Project Explorer</a>, or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then choose <b> Freeze Symbian Component</b> (<span class="code">CTRL+ALT+F</span>). This command only freezes the selected MMP file and not the entire project.</p>
-<p align="center"><img src="../images/menu_freeze_symbian_comp.png" width="443" height="506"></p>
+<p>Right-click a Symbian OS MMP file in the <a href="../view_cpp_projects.htm">Project Explorer</a>, or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then choose <b> Symbian Build > Freeze Symbian Component</b> (<span class="code">CTRL+ALT+F</span>). You can also right-click the file in an editor view to use the same option. This command only freezes the selected MMP file and not the entire project.</p>
+<p align="center"><img src="../images/menu_symb_freeze_comp.png" width="580" height="201"></p>
<p class="figure">Figure 1. Choosing Freeze Symbian Component on a file </p>
<h5>Other references</h5>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/menus.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/menus.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,28 +9,37 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Carbide Menus </h2>
-<p>Common menu and context menu commands used in Carbide.c++:</p>
+<p>Carbide has several menu options unique to developing Symbian OS applications and other shortcuts. Most project related commands are grouped under the Symbian Build option in context menus, while others appear under specific menus like Run or Project. </p>
<ul>
- <li><a href="abld.htm">ABLD Actions</a></li>
- <li><a href="build_all_targets.htm">Build All Configurations</a></li>
- <li><a href="build_pkg_file.htm">Build PKG File</a></li>
- <li><a href="build_symbian_comp.htm">Build Symbian Component</a></li>
- <li><a href="clean_symbian_comp.htm">Clean Symbian Component</a></li>
- <li><a href="compile_source.htm">Compile</a></li>
- <li><a href="freeze_exports.htm">Freeze Exports</a></li>
- <li><a href="freeze_symbian_comp.htm">Freeze Symbian Component</a></li>
- <li><a href="../trk/wnd_on_device_setup.htm">On-Device Connections...</a> </li>
- <li><a href="open_cmd_window.htm">Open Command Window</a></li>
- <li><a href="preprocess_source.htm">Preprocess</a></li>
- <li><a href="run_codescanner.htm">Run Codescanner</a></li>
- <li><a href="run_leavescan.htm">Run Leavescan</a></li>
- <li><a href="s60_ui_designer.htm">S60 UI Designer</a></li>
- <li><a href="open_explorer_window.htm">Show in Explorer</a></li>
- <li><a href="new_symbian_class.htm">Symbian OS C++ Class</a></li>
- <li><a href="new_symbian_project.htm">Symbian OS C++ Project</a></li>
- <li><a href="new_symbian_project.htm">Symbian OS MMP File </a></li>
- <li><a href="hardware_breakpoints.htm">Toggle HW Breakpoint</a></li>
-</ul>
+ <li><strong>File > New </strong> menu options
+ <ul>
+ <li>Qt Project</li>
+ <li><a href="../../tasks/projects/prj_adding_symbian_class.htm">Symbian OS C++ Class</a></li>
+ <li><a href="../../tasks/CreatingNewProjects.html">Symbian OS C++ Project</a></li>
+ <li><a href="../NewMMP_wizard.html">Symbian OS MMP File</a></li>
+ </ul>
+ </li>
+ <li><strong>Right-click <em>object</em> > Symbian Build</strong> menu options
+ <ul>
+ <li><a href="abld.htm">ABLD Actions</a></li>
+ <li><a href="build_all_targets.htm">Build All Configurations</a></li>
+ <li><a href="build_pkg_file.htm">Build PKG File</a></li>
+ <li><a href="build_symbian_comp.htm">Build Symbian Component</a></li>
+ <li><a href="clean_symbian_comp.htm">Clean Symbian Component</a></li>
+ <li><a href="compile_source.htm">Compile</a></li>
+ <li><a href="freeze_exports.htm">Freeze Exports</a></li>
+ <li><a href="freeze_symbian_comp.htm">Freeze Symbian Component</a></li>
+ <li><a href="preprocess_source.htm">Preprocess</a></li>
+ </ul>
+ </li>
+ <li><a href="freeze_symbian_comp.htm"></a>Other menu options
+ <ul>
+ <li><a href="open_cmd_window.htm">Open Command Window</a></li>
+ <li><a href="open_explorer_window.htm">Show in Explorer</a></li>
+ <li><a href="hardware_breakpoints.htm">Toggle HW Breakpoint</a></li>
+ </ul>
+ </li>
+ </ul>
<div id="footer">Copyright © 2010 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></div>
</body>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/new_symbian_class.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Symbian OS C++ Class</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Symbian OS C++ Class</h2>
-<p>Click <b>File > New > Symbian OS C++ Class</b> to launch the <b><a href="../../tasks/AddingClasses.html">Symbian OS C++ Class</a></b> wizard.</p>
-<h5>Other references</h5>
-<ul>
- <li><a href="menus.htm">Carbide Menus</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/new_symbian_mmp_file.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Symbian OS MMP File</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Symbian OS MMP File</h2>
-<p>Click <b>File > New > Symbian OS MMP File</b> to launch the <b><a href="../NewMMP_wizard.html">Symbian OS MMP File</a></b> wizard.</p>
-<h5>Other references</h5>
-<ul>
- <li><a href="menus.htm">Carbide Menus</a></li>
- <li><a href="../MMP_Editor.html">MMP Editor</a></li>
- <li><a href="../../concepts/mmpfiles.htm">MMP Files </a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/new_symbian_project.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Symbian OS C++ Project</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Symbian OS C++ Project </h2>
-<p>Click <b>File > New > New Symbian OS C++ Project</b> to launch the <b><a href="../../tasks/CreatingNewProjects.html">New Symbian OS C++ Project</a> </b> wizard. </p>
-<h5>Other references</h5>
-<ul>
- <li><a href="menus.htm">Carbide Menus</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/on_device_setup.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<meta name="keywords" content="abld, abld target, abld export, abld cleanexport, abld resource, abld final, abld tidy" >
-<title>On-Device Setup menu</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>On-Device Setup </h2>
-<p>Use the <b>On-Device Setup </b> menu option to open the <a href="../trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog for the downloading and installation of Carbide software to a device. </p>
-<h5>Other references</h5>
-<ul>
- <li><a href="menus.htm">Carbide Menu</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_cmd_window.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_cmd_window.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,7 +9,7 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Open Command Window</h2>
-<p>Launches a Microsoft Windows <b>Command Prompt </b> set to the workspace directory. </p>
+<p>Launches a Microsoft Windows <b>Command Prompt </b> window set to the chosen project or file's directory. </p>
<h5>Other references</h5>
<ul>
<li><a href="menus.htm">Carbide Menus</a> </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_explorer_window.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_explorer_window.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,7 +9,7 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Show in Explorer</h2>
-<p>Launches a Microsoft Windows <b>Explorer</b> window set to the workspace directory.</p>
+<p>Launches a Microsoft Windows <b>Explorer</b> window that shows the chosen project or file directory and its location on the hard disk.</p>
<h5>Other references</h5>
<ul>
<li><a href="menus.htm">Carbide Menus</a> </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/preprocess_source.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/preprocess_source.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,7 +9,9 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Preprocess</h2>
-<p>Right-click to select a .c, .cpp, or .cia source file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, and choose <b> Preprocess </b> to preprocess the file. You define the preprocess command in the <a href="../wnd_preprocess_prefs.htm">Preprocess preference panel</a>. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The preprocess progress is displayed in the Console view.</p>
+<p>Right-click to select a .c, .cpp, or .cia source file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, and choose <b> Symbian Build > Preprocess </b> to preprocess the file. You define the preprocess command in the <a href="../wnd_preprocess_prefs.htm">Preprocess preference panel</a>. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The preprocess progress is displayed in the <a href="../view_log.htm">Console</a> view.</p>
+<p align="center"><img src="../images/menu_symb_preprocess.png" alt="Preprocess menu option" width="580" height="202"></p>
+<p class="figure">Figure 1. Choosing to Preprocess a file </p>
<h5>Other references</h5>
<ul>
<li><a href="menus.htm">Carbide Menus</a> </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/run_codescanner.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Run CodeScanner </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run CodeScanner </h2>
-<p>CodeScanner is a static source code analysis tool for Symbian OS™ programs written in C++. Use <b>Run CodeScanner</b> to examine your project code and report any issues. </p>
-<p>Static analysis tools delve deep into code, exploring line by line for the sources of defects. CodeScanner is specifically for use with Symbian OS™ code. As well as identifying C++ coding convention deviations, CodeScanner identifies incorrect descriptor usage, cleanup stack errors, UID clashes, and other subtle problems that are hard to track down. </p>
-<p align="center"><img src="../images/codescanner_run.png" width="311" height="375" /></p>
-<p align="center" class="figure">Figure 1. Invoking Run CodeScanner on a project <br />
-</p>
-<h5>Other references</h5>
-<ul>
- <li><a href="menus.htm">Carbide Menus</a></li>
- <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.codescanner/html/pref_codescanner_01.htm">CodeScanner Preferences</a><br />
- </li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/run_leavescan.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Leavescan</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run Leavescan</h2>
-<p>Symbian OS has a standard convention for functions that may Leave. Therefore, any function that Leaves, or calls a function that Leaves (other than in a TRAP harness), must have a name ending in L. Leavescan verifies that your code satisfies this convention. LeaveScan ignores calls in trapped functions, commented out code, ( // and /* and */). It also checks for calls to LD, LC and LX functions as well as normal L functions. It also checks for <span class="code">User::Leave()</span>, <span class="code">ELeave</span>, and <span class="code">User::LeaveIfError()</span>. </p>
-<p>To start, define where the path to the <span class="code">leavescan.exe</span> program using the <a href="../leavescan_pref.html">Leavescan preference panel</a>.</p>
-<p>Next, to run Leavescan:</p>
-<ul>
- <li><b>on a source file</b> — right-click a .cpp source file in the C/C++ Projects or Symbian Project Navigator view and select <b>Run Leavescan</b></li>
- <li><b>on all source files in the Active Build Configuration</b> — right-click a .mmp file and select <b>Run Leavescan on Project MMP</b>. The source statements in the .mmp file are scanned to obtain a list of source files to be processed by leavescan.</li>
- <li><b>from the command line</b> — scan whole directories and output to a file. For example,</li>
-</ul>
-<blockquote>
- <p class="code">for /R %i in (*.cpp) do leavescan %i >> leavescan.out</p>
- <p>This will scan all cpp files in or below the current directory, placing the result in <span class="code">leavescan.out</span>.</p>
-</blockquote>
-<p align="center"><img src="../images/leavescan_menu.png" width="384" height="326" /></p>
-<p align="center" class="figure">Figure 1. Invoking Run Leavescan on a single source file</p>
-<h5>Other references</h5>
-<ul>
- <li><a href="menus.htm">Carbide Menus</a></li>
- <li><a href="../leavescan_pref.html">Leavescan Preferences</a><br />
- </li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/s60_ui_designer.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>S60 UI Designer</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>S60 UI Designer</h2>
-<p>Click <b>File > New > S60 UI Design</b> to launch the <b><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.uidesigner.doc.user/html/reference/uidesign/ref_ui_design_wizard.htm">S60 UI Design</a></b> wizard to add a new design to a project. </p>
-<h5>Other references</h5>
-<ul>
- <li><a href="menus.htm">Carbide Menus</a> </li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/perspective_debug.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/perspective_debug.htm Wed Jul 21 12:11:48 2010 -0500
@@ -32,7 +32,7 @@
<li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_modules_view.htm">Modules</a> view - uses the <a href="../projects/launch/wiz_new_launch_config.htm">Symbolics Loading</a> option to show modules loaded during a debug session </li>
<li><a href="view_registers.htm">Registers</a> view - shows general, FPU, or host-specific registers of the host computer or target device</li>
</ul>
-<p align="center"><img src="../images/views/perspective_debug.png" width="830" height="704" alt="" /></p>
+<p align="center"><img src="../images/views/perspective_debug.png" width="1028" height="789" alt="" /></p>
<p class="figure">Figure 1. Debug perspective used by Carbide.c++</p>
<p class="note"><b>NOTE</b> Click the <img src="../images/icons/double_arrow_icon.png" width="12" height="9" valign="absmiddle" alt="" /> icon to show additional options that may not be visible in the perspective view.</p>
<p>For more information on perspectives see <b>Workbench User Guide > Concepts > <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/concepts-4.htm">Perspectives</a></b>, and for views see <b>C/C++ Development User Guide > Reference
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/exporting_remote_conns.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/exporting_remote_conns.htm Wed Jul 21 12:11:48 2010 -0500
@@ -29,7 +29,7 @@
</ol>
<h5>Related references</h5>
<ul>
- <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
+ <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
<li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
</ul>
<div id="footer">Copyright © 2010 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></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/importing_remote_conns.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/importing_remote_conns.htm Wed Jul 21 12:11:48 2010 -0500
@@ -29,7 +29,7 @@
</ol>
<h5>Related references</h5>
<ul>
- <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
+ <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
<li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
</ul>
<div id="footer">Copyright © 2010 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></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm Wed Jul 21 12:11:48 2010 -0500
@@ -24,9 +24,8 @@
<li>Serial — mainly for boards with a serial interface</li>
<li>Bluetooth — available for debug support </li>
<li>USB — available for both debug and trace support </li>
- <li>Platform Simulator (PlatSim) — Nokia's device simulator</li>
</ul>
-<p>The columns in the Remote Connections view include:</p>
+<p>The columns in the <strong>Remote Connections</strong> view include:</p>
<ul>
<li>Connection/Services - connection name defined by you and remote agent type</li>
<li>Type - connection type, i.e. Bluetooth, USB, TCP/IP, etc.</li>
@@ -107,8 +106,8 @@
</tr>
</table>
<h3>Remote Connections view context menu options</h3>
-<p>Based on the current selection, one or more of the following commands appear on the context menu when you right-click within the Remote Connections view. For example, if no connections are defined, only the <b>New Connection</b> command is available on the context menu. Right-click on a connection name and the additional <b>Enable Service Testing</b> and <b>Disable Service Testing</b> are available.</p>
-<p align="center"><img src="../images/context_menu_remote_conn_view.png" width="211" height="104"></p>
+<p>Based on the current selection, one or more of the following commands appear on the context menu when you right-click within the Remote Connections view. For example, if no connections are defined, only the <b>New Connection</b> command is available on the context menu. </p>
+<p align="center"><img src="../images/context_menu_remote_conn_view.png" width="246" height="141"></p>
<p class="figure">Figure 3 - Remote Connections context menu</p>
<table width="100%" border="0" cellpadding="2" cellspacing="0">
<tr>
@@ -117,47 +116,42 @@
<th width="59%" scope="col">Explanation</th>
</tr>
<tr>
- <td><span class="style1">New Connection</span></td>
+ <td><span class="style1">New Connection...</span></td>
<td><center>
<img src="../images/icon_remote_connection_new.png" width="20" height="18">
</center> </td>
<td>Select to open the New Connection wizard to add a connection.</td>
</tr>
<tr>
- <td><span class="style1">Rename Connection</span></td>
+ <td><span class="style1">Rename</span></td>
<td> </td>
<td>Select to rename the currently selected connection.</td>
</tr>
<tr>
- <td><span class="style1">Edit Connection Settings</span></td>
+ <td><span class="style1">Edit Settings...</span></td>
<td><center>
<img src="../images/icon_remote_connection_edit.png" width="19" height="19">
</center> </td>
- <td><p>Select to edit the selected remote connection.</p></td>
+ <td><p>Select to edit the selected remote connection settings.</p></td>
</tr>
<tr>
- <td><span class="style1">Delete Connection</span></td>
+ <td><span class="style1">Delete</span></td>
<td><center>
<img src="../images/icon_remote_connection_delete.png" width="17" height="16">
</center> </td>
<td><p>Select to delete the selected connection from the connection list.</p></td>
</tr>
<tr>
- <td><span class="style1">Connection Documentation</span></td>
+ <td><span class="style1">Help for...</span></td>
<td><center>
<img src="../images/icon_remote_connection_docs.png" width="19" height="17">
</center></td>
- <td>Select to open the Help view with connection information.</td>
+ <td>Select to open the Help view for connection information.</td>
</tr>
<tr>
- <td><span class="style1">Disable Service Testing</span></td>
+ <td><span class="style1">Make Current</span></td>
<td> </td>
- <td>Select to disable the connection testing. This releases the port so other connection services can use it. </td>
- </tr>
- <tr>
- <td><span class="style1">Enable Service Testing</span></td>
- <td> </td>
- <td>Select to re-enable testing of the connection.</td>
+ <td>Make the selected connection the current connection.</td>
</tr>
</table>
<h5>Related references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_settings_pane.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_settings_pane.htm Wed Jul 21 12:11:48 2010 -0500
@@ -11,8 +11,8 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Install Remote Agents pane</h2>
-<p>Use the <strong>Install remote agents</strong> pane to select the latest remote agent version to download and install to the device. </p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
+<p>Use the <strong>Install Remote Agents</strong> pane to select the latest remote agent version to download and install to the device. </p>
+<p align="center"><img src="../images/tab_new_conn_install_agent.png" alt="" width="464" height="554"></p>
<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
<p>Table 3. Serial Connection Setting page - Install Remote Agents tab</p>
<table width="100%" border="0" cellpadding="2" cellspacing="0">
@@ -21,7 +21,7 @@
<th width="59%" scope="col">Explanation</th>
</tr>
<tr>
- <td><strong>Install remote agents</strong></td>
+ <td><strong>Install Remote Agents</strong></td>
<td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.1.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 2.8.7. </p>
<p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
</tr>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_add.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_add.htm Wed Jul 21 12:11:48 2010 -0500
@@ -19,7 +19,7 @@
</ul>
<h3><strong><a name="CONN_EDIT" id="INSTALL3"></a></strong>Edit connection name and type</h3>
<p>Use the <b>Edit connection name and type</b> page to assign a name and connection type to the new connection setup.</p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_01.png" width="456" height="554"></p>
+<p align="center"><img src="../images/wnd_new_connection_wizard_01.png" width="464" height="560"></p>
<p class="figure">Figure 1 - New Connection wizard Edit connection name and type page</p>
<p>Table 1. Edit connection name and type page - options</p>
<table width="100%" border="0" cellpadding="2" cellspacing="0">
@@ -28,16 +28,16 @@
<th width="59%" scope="col">Explanation</th>
</tr>
<tr>
- <td><strong>Connetion Name</strong></td>
+ <td><strong>Connection Type</strong></td>
+ <td>Select the type of connection this setup will use.</td>
+ </tr>
+ <tr>
+ <td><strong>Connection Name</strong></td>
<td><p>Enter a name for the connection.</p> </td>
</tr>
<tr>
- <td><strong>Conection Type</strong></td>
- <td>Select the type of connection this setup will use.</td>
- </tr>
- <tr>
- <td><strong>Supported Services</strong></td>
- <td><p>Shows a list of services supported by the connection type chosen.</p> </td>
+ <td><strong>Connection Settings</strong></td>
+ <td><p>Select the connection port to use for this connection setting.</p> </td>
</tr>
</table>
<h3><strong><a name="CONN_SET" id="INSTALL2"></a></strong>Set Connection Settings pane</h3>
@@ -47,7 +47,7 @@
<li>Allow easy serial port selection when connecting to a device </li>
<li>Verify that you have the latest remote agent installed on a device</li>
</ul>
-<p align="center"><img src="../images/wnd_new_connection_wizard_02.png" width="456" height="554"></p>
+<p align="center"><img src="../images/wnd_new_connection_wizard_02.png" width="464" height="560"></p>
<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
<p>Table 2. Serial Connection Setting page - Set Connection Settings tab</p>
<table width="100%" border="0" cellpadding="2" cellspacing="0">
@@ -56,24 +56,16 @@
<th width="59%" scope="col">Explanation</th>
</tr>
<tr>
- <td><strong>Serial Port </strong></td>
- <td>A dropdown list of serial ports with known identifiers for selecting the communication port used by the PC to communicate with the device. A named COM port (<span class="code">COM4 - BthModem0</span>) indicates an active port. Unnamed port numbers have usually not been opened and assigned by the PC.</td>
- </tr>
- <tr>
- <td><b>Baud Rate</b></td>
- <td>a dropdown list of baud rates common to serial connections.</td>
- </tr>
- <tr>
- <td><strong>Device OS </strong></td>
- <td><p>A dropdown list of device OSes that are supported by the remote agent software. Select the OS used by the device before running a check. </p></td>
+ <td><strong>Device OS (used to determine installer version)</strong></td>
+ <td>Select the OS used on the device.</td>
</tr>
<tr>
<td><b>Select a service to test</b></td>
<td>Click to select a listed service for testing.</td>
</tr>
<tr>
- <td><strong>Test Service Status</strong></td>
- <td><p>Click <strong>Test Service Status</strong> to query the remote agent software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear should the Check TRK version operation requires more than a few seconds.</p>
+ <td><strong>Initiate Service Testing</strong></td>
+ <td><p>Click <strong>Initiate Service Testing</strong> to query the remote agent software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear should the Check TRK version operation requires more than a few seconds.</p>
<p class="note"><strong>NOTE</strong> The PC must have an internet connection to perform a remote agent version check.</p>
<p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
<p align="center"><img src="../images/wnd_on_device_setup_install_new_version.png" width="466" height="67"></p>
@@ -87,7 +79,7 @@
</table>
<h3><strong><a name="INSTALL" id="INSTALL"></a>Install Remote Agents</strong> pane</h3>
<p>Use the <strong>Install Remote Agents</strong> pane to select the latest remote agent version to download and install to the device. </p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
+<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="464" height="560"></p>
<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
<p>Table 3. Serial Connection Setting page - Install Remote Agents tab</p>
<table width="100%" border="0" cellpadding="2" cellspacing="0">
@@ -96,8 +88,8 @@
<th width="59%" scope="col">Explanation</th>
</tr>
<tr>
- <td><strong>Install remote agents</strong></td>
- <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.1.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 2.8.7. </p>
+ <td><strong>Install Remote Agents</strong></td>
+ <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 5.x needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 3.2.6. </p>
<p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
</tr>
<tr>
@@ -113,7 +105,7 @@
<p> </p>
<h5>Related references</h5>
<ul>
- <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
+ <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
<li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
</ul>
<div id="footer">Copyright © 2010 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></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_edit.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_edit.htm Wed Jul 21 12:11:48 2010 -0500
@@ -113,7 +113,7 @@
<p> </p>
<h5>Related references</h5>
<ul>
- <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
+ <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
<li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
</ul>
<div id="footer">Copyright © 2010 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></div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_portal.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Carbide Portal view</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Carbide Portal view</h2>
+<p>The <strong>Carbide Portal</strong> view provides a single point of information on Carbide news, new releases, additional extensions, and support. The<strong> Carbide Portal</strong><strong> </strong>view is shown by clicking <strong>Help > Carbide Portal</strong>.</p>
+<p align="center"><img src="images/view_carbide_portal.png" width="765" height="507"></p>
+<p class="figure">Figure 1. Install Extensions page in the Carbide Portal view</p>
+<p>Click on the <img src="images/icon_show_overview.png" alt="Show Overview icon" width="18" height="18" align="absmiddle"> (Show Overview) icon to show an information popup with additional information on the selected plug-in.</p>
+<p align="center"><img src="images/view_show_overview_popup.png" width="748" height="349"></p>
+<p class="figure">Figure 2. Install Extensions Plug-in Information popup </p>
+<h2>Install Extensions page options</h2>
+<h5>Table 1 <span class="figure">Install Actions</span> options </h5>
+<table width="83%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="29%" scope="col">Item</th>
+ <th width="63%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td><b>Refresh</b></td>
+ <td><p>Refreshes the plug-in list.</p></td>
+ </tr>
+ <tr>
+ <td><strong>Check All Items</strong></td>
+ <td>Marks all extensions for installation.</td>
+ </tr>
+ <tr>
+ <td><strong>Uncheck All Items</strong></td>
+ <td>Unchecks all extensions to prevent installation.</td>
+ </tr>
+ <tr>
+ <td><p><strong>Installed Checked Items</strong></p> </td>
+ <td>Installs only the checked items in the extension list.</td>
+ </tr>
+ <tr>
+ <td><strong>Advanced Install...</strong></td>
+ <td>Launches the <strong>Install New Software</strong> wizard.</td>
+ </tr>
+</table>
+<h5>Related references </h5>
+<ul>
+ <li><a href="../concepts/CarbidePerspective.html">Carbide C/C++ perspective</a></li>
+ <li><a href="../tasks/installing_extensions.htm">Installing Extensions</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+</body>
+</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_cpp_projects.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_cpp_projects.htm Wed Jul 21 12:11:48 2010 -0500
@@ -8,10 +8,10 @@
<link rel="StyleSheet" href="../../book.css" type="text/css"/>
</head>
<body bgcolor="#FFFFFF">
-<h2>Project Explorer View </h2>
-<p> The <b>Project Explorer</b> view (Figure 1) display<span><span>s relevant C/C++ projects located in the current workspace using a tree structure</span></span>. Use this view to manage all the projects located in the workspace. The view is customizable and takes advantage of working sets. </p>
+<h2>Project Explorer view </h2>
+<p> The <b>Project Explorer</b> view (Figure 1) display<span><span>s relevant C/C++ projects located in the current workspace using a tree structure</span></span>. Use this view to manage all the projects located in the current workspace. The view is customizable and takes advantage of working sets. </p>
<p>The content of a project is dependent upon how it was created in the workspace.</p>
-<p align="center"><img src="images/view_cpp_projects.png" width="273" height="413" /></p>
+<p align="center"><img src="images/view_project_explorer.png" alt="Project Explorer view" width="281" height="424"></p>
<p class="figure">Figure 1 - Project Explorer view showing projects in the current workspace</p>
<p>The directories that appear in the project include:</p>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm Wed Jul 21 12:11:48 2010 -0500
@@ -24,7 +24,7 @@
<li>Set breakpoints at the start of any assembler instruction by right-clicking the left hand column to view the context menu options (Figure 2) </li>
</ul>
<p>Figure 1 shows the <b>Dissassembly</b> view stopped at a breakpoint.</p>
-<p align="center"><img src="images/view_disassembly.png" width="785" height="202" alt="" /></p>
+<p align="center"><img src="images/view_disassembly.png" width="555" height="272" alt="" /></p>
<p class="figure">Figure 1 - Disassembly view</p>
<p>Figure 2 shows the context menu that appears when you right-click in the Dissassembly pane. Right-clicking the left border opens the breakpoint context menu in Figure 3.</p>
<p class="figure"><img src="images/view_disassembly_menu.png" width="232" height="133"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_expressions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_expressions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -21,7 +21,7 @@
<li>Value pane (right) — Shows the current value of each corresponding expression. Double-click a value to change it.</li>
</ul>
<p>Figure 1 shows the <b>Expressions</b> view.</p>
-<p align="center"><img src="images/view_expressions.png" width="571" height="202" /></p>
+<p align="center"><img src="images/view_expressions.png" width="439" height="144" /></p>
<p class="figure">Figure 1 - Expressions view </p>
<h5>Table 1. Expressions view —items </h5>
<table width="88%" border="0" cellpadding="2" cellspacing="0">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_global_variables.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Global Variables Window</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Global Variables Window</h2>
-<p>The Global Variables window shows all global and static variables for each process that you debug. You can open separate Global Variables windows for each process in the same build target. Use the window to observe changes in variable values as the program executes.</p>
-<p>Figure 1 shows the Global Variables window.</p>
-<p class="figure">Figure 1 Global Variables window</p>
-<h5>Table 1 Global Variables window—items </h5>
-<table width="84%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="28%" scope="col">Item</th>
- <th width="72%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td><b>File</b></td>
- <td>Lists source files that declare global or static variables. Click a source file to view its static variables. Click Global Variables to view all global variables declared in the program.</td>
- </tr>
- <tr>
- <td><b>Variables</b></td>
- <td>Lists variables according to the file selected in the File pane. Double-click a variable to display it in a separate Variable window.</td>
- </tr>
-</table>
-<div class="step">
- <h5>Opening the Global Variables Window</h5>
- <p>Use the Global Variables window to display global variables declared in a program or static variables declared in source files that comprise the program.</p>
- <ul>
- <li>To open the Global Variables window, select View > Global Variables or Window > Global Variables Window.</li>
- </ul>
-</div>
-<p></p>
-<div class="step">
- <h5>Viewing Global Variables for Different Processes</h5>
- <p>You can open a separate Global Variables window for each process that the same parent application creates.</p>
- <p>To open the Global Variables window for a particular process, follow these steps:</p>
- <ol>
- <li>Click Project > Debug.</li>
- <p>A debugging session starts.</p>
- <li>In the Thread window toolbar, use the Process list box to specify the process that has the global variables that you want to examine.</li>
- <li>Click View > Global Variables or Window > Global Variables Window.</li>
- <p>Repeat these steps for each process that has global variables that you want to examine.</p>
- </ol>
-</div>
-<div id="footer">Copyright © 2010 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></div>
-
-</body>
-</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_install_extensions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Install Extensions view</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Install Extensions view</h2>
+<p>The <strong>Install Extensions</strong> view enables the user to locate and install Carbide plug-ins into a core Carbide.c++ installation. The Install Extensions view links to an online site that lists available plug-ins for installation. Plug-ins are grouped by type for </p>
+<p>The <strong>Install Extensions</strong> view appears as part of the <a href="../concepts/CarbidePerspective.html">C/C++ Perspective</a>. It can be added to a perspective by clicking <strong>Window > Show View > Install Extensions</strong>.</p>
+<p align="center"><img src="images/view_install_extensions.png" width="491" height="426"></p>
+<p class="figure">Figure 1. Install Extensions view</p>
+<p>Click on the <img src="images/icon_show_overview.png" alt="Show Overview icon" width="18" height="18" align="absmiddle"> (Show Overview) icon to show an information popup with additional information on the selected plug-in.</p>
+<p align="center"><img src="images/view_show_overview_popup.png" width="748" height="402"></p>
+<p class="figure">Figure 2. Install Extensions Plug-in Information popup </p>
+<h5>Table 1 <span class="figure">Install Extensions</span> view—items </h5>
+<table width="83%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="30%" scope="col">Item</th>
+ <th width="70%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td><b>Find</b></td>
+ <td><p>Filters the plug-ins shown in the view to a subset of the complete list.</p> </td>
+ </tr>
+ <tr>
+ <td><b>Show Installed</b></td>
+ <td>Toggles the plug-ins shown in the view between those that are currently installed and plug-ins available for installation.</td>
+ </tr>
+</table>
+<h2>Install Extensions view toolbar options</h2>
+<h5>Table 1 <span class="figure">Install Extensions</span> view— toolbar options </h5>
+<table width="83%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="29%" scope="col">Item</th>
+ <th width="8%" scope="col"><div align="center">Icon</div></th>
+ <th width="63%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td><b>Refresh</b></td>
+ <td><div align="center"><img src="../images/icons/btn_restart.png" width="20" height="18"></div></td>
+ <td><p>Refreshes the plug-in list.</p></td>
+ </tr>
+ <tr>
+ <td><b>Install Checked Items</b></td>
+ <td><div align="center"><img src="images/icon_install_extensions.png" width="17" height="18"></div></td>
+ <td>Click to download and install all plug-ins that are checked in the plug-in list.</td>
+ </tr>
+ <tr>
+ <td><strong>View Menu</strong></td>
+ <td><div align="center"><img src="../debugger/images/icon_menu_white.png" width="12" height="12"></div></td>
+ <td><p>Additional options include:</p>
+ <ul>
+ <li>Check All Items</li>
+ <li>Uncheck All Items</li>
+ <li>Install Checked Items</li>
+ <li>Advanced Install... – launches the <strong>Install New Software</strong> wizard.</li>
+ </ul></td>
+ </tr>
+</table>
+<h5>Related references </h5>
+<ul>
+ <li><a href="../concepts/CarbidePerspective.html">Carbide C/C++ perspective</a></li>
+ <li><a href="../tasks/installing_extensions.htm">Installing Extensions</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+</body>
+</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_log.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_log.htm Wed Jul 21 12:11:48 2010 -0500
@@ -8,7 +8,7 @@
<link rel="StyleSheet" href="../../book.css" type="text/css"/>
</head>
<body bgcolor="#FFFFFF">
-<h2>Console View </h2>
+<h2>Console view </h2>
<p> The <b>Console</b> view display<span><span>s the output of a process and allows you to provide keyboard input to a process</span></span>. There are numerous consoles available, see the Open Console dropdown list for those available to you. Most are enabled from various project panels in Carbide. </p>
<p align="center"><img src="../images/views/view_console_build.png" width="778" height="203" /></p>
<p class="figure">Figure 1 - Console view showing build console information</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_mem_array.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>ArrayWindow</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Array Window</h2>
-<p> The <b>Array</b> window allows manipulation of a contiguous block of memory, displayed as an array of elements. The window lists array contents sequentially, starting at
-element 0.</p>
-<p>The Array window title shows the base address bound to the array. The base address can bind to an address, a variable, or a register. An array bound to a local variable closes after the routine that defines the variable returns to the calling routine.</p>
-<p>For array elements cast as structured types, a hierarchical control appears to the left of each element. Use these hierarchical controls to expand or collapse the display of each element’s contents.</p>
-<p>Figure 1 shows an Array window. Table 1 explains the items in the window.</p>
-<p class="figure">Figure 1 Array window</p>
-<p> </p>
-<h5>Table 1 Array window—items </h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="25%" scope="col">Item</th>
- <th width="21%" scope="col">Icon</th>
- <th width="54%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td>Hierarchical control</td>
- <td> </td>
- <td>Click to collapse the view of the information pane.</td>
- </tr>
- <tr>
- <td>Bind To</td>
- <td> </td>
- <td>Select the base address of the array: Address, Variable, or Register.</td>
- </tr>
- <tr>
- <td>Array size</td>
- <td> </td>
- <td>Enter the number of elements to display in the Array window.</td>
- </tr>
- <tr>
- <td>Struct Member</td>
- <td> </td>
- <td>Select a specific member to show in each element, or show all members.</td>
- </tr>
- <tr>
- <td>Element</td>
- <td> </td>
- <td>Shows the array elements in a hierarchical list.</td>
- </tr>
- <tr>
- <td>Value</td>
- <td> </td>
- <td>Shows the value of each array element.</td>
- </tr>
- <tr>
- <td>Location</td>
- <td> </td>
- <td>Shows the address in memory of each array element.</td>
- </tr>
-</table>
-<div class="step">
- <h5>Opening an Array Window</h5>
- <p> Use the View Array command to manipulate a memory block in an Array window.</p>
- <ol>
- <li>Select the array that you want to view.</li>
- <li>Select Data > View Array.</li>
- <p>A new Array window appears.</p>
- </ol>
-</div>
-<p class="note"><b>TIP</b> Drag and drop a register or variable name into an Array window to set the base address. Use the View Memory As command to interpret memory displayed in an Array window as a different type.</p>
-<p>Alternatively, use a contextual menu to open an Array window, as explained in Table 2.</p>
-<h5>Table 2 Opening an Array window by using a context menu </h5>
-<table width="77%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="31%" scope="col">On this host…</th>
- <th width="69%" scope="col">Do this…</th>
- </tr>
- <tr>
- <td>Windows</td>
- <td>Right-click the array and select View Array.</td>
- </tr>
- <tr>
- <td>Solaris</td>
- <td>Click and hold on the array, then select View Array.</td>
- </tr>
- <tr>
- <td>Linux</td>
- <td>Click and hold on the array, then select View Array.</td>
- </tr>
-</table>
-<p><br />
-</p>
-<div id="footer">Copyright © 2010 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></div>
-
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_memory_wnd.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_memory_wnd.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,93 +1,88 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Memory View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Memory View </h2>
-<p> Use the <b>Memory</b> view to inspect and change process memory. You can address memory using expressions such as:</p>
-<ul>
- <li class="code">0x0847d3c </li>
- <li class="code">(&y)+1024 </li>
- <li class="code">*ptr</li>
- <li class="code">FNname + 1 </li>
-</ul>
-<p>You can configure your output to display traditional, hexadecimal, ascii and/or signed/unsigned decimal. You can also set the size of the rendering columns. </p>
-<p class="note"><b>CAUTION</b> Arbitrarily changing memory contents could degrade the stability of the IDE, another program, or the operating system itself. Understand the consequences of manipulating memory.</p>
-<p>Figure 1 shows the Memory view.</p>
-<p align="center"><img src="../images/views/view_memory.png" width="639" height="250" /></p>
-<p class="figure">Figure 2 - Memory view showing a memory rendering in traditional format</p>
-<h5>Table 1 Memory view—items </h5>
-<table width="100%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="37%" scope="col">Item</th>
- <th width="11%" scope="col">Icon</th>
- <th width="52%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td><a href="../tasks/memory/view_memory_show.htm">New Memory View</a> </td>
- <td><div align="center"><img src="images/view_mem_new_memory_btn.png" width="16" height="17" /></div></td>
- <td>Click to add a new Memory monitor view. </td>
- </tr>
- <tr>
- <td><b>Pin Memory Monitor </b></td>
- <td><div align="center"><img src="images/view_mem_pin_memory_btn.png" width="19" height="18" /></div></td>
- <td>Pin memory view.</td>
- </tr>
- <tr>
- <td><b>Refresh</b></td>
- <td> </td>
- <td>Click to refresh the memory display.</td>
- </tr>
- <tr>
- <td><b>Toggle Memory Monitors Pane </b></td>
- <td><div align="center"><img src="images/view_mem_toggle_pane_btn.png" width="19" height="17" /></div></td>
- <td>Toggles the current Memory monitors view between showing only a Memory Monitor pane and a Memory Monitor and Memory Rendering pane. </td>
- </tr>
- <tr>
- <td><b>Toggle Split Pane </b></td>
- <td><div align="center"><img src="images/view_mem_split_pane_btn.png" width="17" height="17" /></div></td>
- <td>Alternately shows and hides the Memory Rendering pane. </td>
- </tr>
- <tr>
- <td><b>Link Memory Monitor Panes </b></td>
- <td><div align="center"><img src="images/view_mem_link_btn.png" width="20" height="19" /></div></td>
- <td><span>Enable to synchronize the current selection between the rendering of the same memory monitor </span>. </td>
- </tr>
- <tr>
- <td><b>Switch Memory Monitor </b></td>
- <td><div align="center"><img src="images/view_mem_switch_monitor_btn.png" width="33" height="20" /></div></td>
- <td>If different memory monitor views have been added, select from list of memory monitor views.</td>
- </tr>
- <tr>
- <td><a href="../tasks/memory/memory_monitor_adding.htm">Add Memory Monitor</a> / <a href="../tasks/memory/memory_rendering_adding.htm">Add Rendering</a> </td>
- <td><div align="center"><img src="../images/icons/mem_add_monitor_icon.png" width="18" height="18" /></div></td>
- <td>Add a new memory address or variable to the Memory Monitors pane, or add a new rendering to the Memory Rendering pane. </td>
- </tr>
- <tr>
- <td><a href="../tasks/memory/memory_monitor_removing.htm">Remove Memory Monitor / Remove Rendering </a></td>
- <td><div align="center"><img src="../images/icons/mem_remove_monitor_icon.png" width="19" height="19" /></div></td>
- <td>Remove the selected memory address or variable from the Memory Monitors pane, or remove the selected rendering from the Memory Rendering pane. </td>
- </tr>
- <tr>
- <td><b>Remove All </b></td>
- <td><div align="center"><img src="../images/icons/mem_remove_all_icon.png" width="21" height="20" /></div></td>
- <td>Remove all memory monitors or renderings from the associated pane. </td>
- </tr>
-</table>
-<p align="left">Each memory monitor rendering pane can be configured independently. Right-click in the Renderings pane to see the rendering options available. The options presented in the context menu may differ if you have not chosen the Traditional rendering view (Figure 2). </p>
-<p align="center"><img src="images/menu_mem_rendering_options.png" width="198" height="270"></p>
-<p class="figure">Figure 2 - Rendering pane options </p>
-<h5>Related tasks</h5>
-<ul>
- <li><a href="../tasks/memory/memory_monitor_adding.htm"> Adding a Memory Monitor</a></li>
- <li><a href="../tasks/memory/memory_rendering_adding.htm">Adding a Memory Rendering </a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Memory view</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Memory view </h2>
+<p> Use the <b>Memory</b> view to inspect and change process memory. You can address memory using expressions such as:</p>
+<ul>
+ <li class="code">0x0847d3c </li>
+ <li class="code">(&y)+1024 </li>
+ <li class="code">*ptr</li>
+ <li class="code">FNname + 1 </li>
+</ul>
+<p>You can configure your output to display traditional, hexadecimal, ascii and/or signed/unsigned decimal. You can also set the size of the rendering columns. </p>
+<p class="note"><b>CAUTION</b> Arbitrarily changing memory contents could degrade the stability of the IDE, another program, or the operating system itself. Understand the consequences of manipulating memory.</p>
+<p>Figure 1 shows the Memory view.</p>
+<p align="center"><img src="images/view_memory.png" alt="Memory view" width="619" height="208"></p>
+<p class="figure">Figure 2 - Memory view showing a memory rendering in traditional format</p>
+<h5>Table 1 Memory view—items </h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="37%" scope="col">Item</th>
+ <th width="11%" scope="col">Icon</th>
+ <th width="52%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td><a href="../tasks/memory/view_memory_show.htm">New Memory View</a> </td>
+ <td><div align="center"><img src="images/view_mem_new_memory_btn.png" width="16" height="17" /></div></td>
+ <td>Click to add a new Memory monitor view. </td>
+ </tr>
+ <tr>
+ <td><b>Pin Memory Monitor </b></td>
+ <td><div align="center"><img src="images/view_mem_pin_memory_btn.png" width="19" height="18" /></div></td>
+ <td>Pin memory view.</td>
+ </tr>
+ <tr>
+ <td><b>Toggle Memory Monitors Pane </b></td>
+ <td><div align="center"><img src="images/view_mem_toggle_pane_btn.png" width="19" height="17" /></div></td>
+ <td>Toggles the current Memory monitors view between showing only a Memory Monitor pane and a Memory Monitor and Memory Rendering pane. </td>
+ </tr>
+ <tr>
+ <td><b>Toggle Split Pane </b></td>
+ <td><div align="center"><img src="images/view_mem_split_pane_btn.png" width="17" height="17" /></div></td>
+ <td>Alternately shows and hides the Memory Rendering pane. </td>
+ </tr>
+ <tr>
+ <td><b>Link Memory Monitor Panes </b></td>
+ <td><div align="center"><img src="images/view_mem_link_btn.png" width="20" height="19" /></div></td>
+ <td><span>Enable to synchronize the current selection between the rendering of the same memory monitor </span>. </td>
+ </tr>
+ <tr>
+ <td><b>Switch Memory Monitor </b></td>
+ <td><div align="center"><img src="images/view_mem_switch_monitor_btn.png" width="33" height="20" /></div></td>
+ <td>If different memory monitor views have been added, select from list of memory monitor views.</td>
+ </tr>
+ <tr>
+ <td><a href="../tasks/memory/memory_monitor_adding.htm">Add Memory Monitor</a> / <a href="../tasks/memory/memory_rendering_adding.htm">Add Rendering</a> </td>
+ <td><div align="center"><img src="../images/icons/mem_add_monitor_icon.png" width="18" height="18" /></div></td>
+ <td>Add a new memory address or variable to the Memory Monitors pane, or add a new rendering to the Memory Rendering pane. </td>
+ </tr>
+ <tr>
+ <td><a href="../tasks/memory/memory_monitor_removing.htm">Remove Memory Monitor / Remove Rendering </a></td>
+ <td><div align="center"><img src="../images/icons/mem_remove_monitor_icon.png" width="19" height="19" /></div></td>
+ <td>Remove the selected memory address or variable from the Memory Monitors pane, or remove the selected rendering from the Memory Rendering pane. </td>
+ </tr>
+ <tr>
+ <td><b>Remove All </b></td>
+ <td><div align="center"><img src="../images/icons/mem_remove_all_icon.png" width="21" height="20" /></div></td>
+ <td>Remove all memory monitors or renderings from the associated pane. </td>
+ </tr>
+</table>
+<p align="left">Each memory monitor rendering pane can be configured independently. Right-click in the Renderings pane to see the rendering options available. The options presented in the context menu may differ if you have not chosen the Traditional rendering view (Figure 2). </p>
+<p align="center"><img src="images/menu_memory_rendering_options.png" width="444" height="380"></p>
+<p class="figure">Figure 2 - Rendering pane options </p>
+<h5>Related tasks</h5>
+<ul>
+ <li><a href="../tasks/memory/memory_monitor_adding.htm"> Adding a Memory Monitor</a></li>
+ <li><a href="../tasks/memory/memory_rendering_adding.htm">Adding a Memory Rendering </a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_mifdef_editor.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_mifdef_editor.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,106 +1,106 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<title>MIF Editor</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
-
-<h2>MBM/MIF Editor</h2>
-
- <p>The <b>MIF Editor</b> allows you to create or edit the <span class="code">.mif</span> files list of scalable icons (<span class="code">.svg</span>)
- included in a S60 v3.0 and later GUI projects as well as standard <span class="code">.bmp</span> files. A .mif file is a MSX Interchange Format (MIF) file that should be built by the project. MIF files replace the functionality of AIF (and MBM) files.</p>
- <p class="note"><b>NOTE</b> This editor is only supported by the S60 3.0 and later SDKs.</p>
- <p class="note"><b>NOTE</b> For resources that are included after creating a project, you should ensure that the output location is set correctly by viewing the file properties. The output location is set to "<span class="code">{EPOCROOT}\epoc32\include</span>" by default, so if an alternate location is required you can set this in the file properties.</p>
- <p align="center" class="Image"><img src="../tasks/projects/images/mif_file_symprojnav.png" width="299" height="292"></p>
- <p class="figure">Figure 1 - MIF File in the Symbian Project Navigator view</p>
- <p>The <b>MIF Editor</b> appears when a MIF file is
- opened for editing. To open the editor double-click on a .mif file in the <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view (figure 1), or select a scalable icon makefile (for example, <span class="code">Icons_scalable_dc.mk</span>), right-click and select the <b>Add MBM/MIF Entry</b> command.</p>
- <p align="center"><img src="../tasks/projects/images/MBM_MIF_editor.png" width="900" height="600"> </p>
- <p class="figure">Figure 2 - MBM/MIF Editor</p>
- <h5>Table 1. MBM/MIF Editor —Items</h5>
- <table width="94%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="32%" scope="col">Item</th>
- <th width="68%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td><b>Target File </b></td>
- <td><p>Specifies the <span class="code">EPOCROOT</span> relative path for the compiled images. Click the Default button to set the target file based on the SDK and project name. </p></td>
- </tr>
- <tr>
- <td><b>Header File </b></td>
- <td>Shows the generated header file. Select the Header option in the Header Generation group to create a default .mbg file. The path cannot be edited in this field. </td>
- </tr>
- <tr>
- <td><b>Header Generation</b></td>
- <td><p>Options include:</p>
- <ul>
- <li>No header - If selected, no .mbg header will be generated. </li>
- <li>Header - If selected, a .mbg header will be generated.</li>
- </ul></td>
- </tr>
- <tr>
- <td><b>Up</b></td>
- <td>Select an image in the list and click Up to move the selection one position up in the list.</td>
- </tr>
- <tr>
- <td><b>Down</b></td>
- <td><p>Select an image in the list and click Down to move the selection one position down in the list. </p></td>
- </tr>
- <tr>
- <td><b>Pair Image and Mask </b></td>
- <td>Select two adjacent unpaired BMP image entries in the list and click this button to combine the images together into image/mask pairs.</td>
- </tr>
- <tr>
- <td><b>Split Image and Mask </b></td>
- <td>Select a paired BMP image in the list and click this button to split the image into image and mask entries. </td>
- </tr>
- <tr>
- <td><b>Swap Image and Mask </b></td>
- <td>Select a paired BMP image in the list and click this button to swap the image and mask files and format information in paired image entries. </td>
- </tr>
- <tr>
- <td><b>Add From Project </b></td>
- <td>Click this button to open the <b>Add Images from Project</b> dialog to reference available images in the project.</td>
- </tr>
- <tr>
- <td><b>Add From Filesystem </b></td>
- <td>Click this button to open the <b>Add Images From Filesystem</b> dialog to locate and reference existing images in the filesystem or copy images to the project.</td>
- </tr>
- <tr>
- <td><b>Remove</b></td>
- <td>Select an image and click <b>Remove</b> to remove image entry from the list. This does not delete file from directory.</td>
- </tr>
- <tr>
- <td><b>Color depth </b></td>
- <td>Select the bit depth used to encode the image at build time.</td>
- </tr>
- <tr>
- <td><b>Mask depth </b></td>
- <td><p>Select the bit depth used to encode the mask at build time. Options include:</p>
- <ul>
- <li>n/a - Do not apply mask depth to images </li>
- <li>1 - A 1-bit mask treats pixels as "on/off" bits, where black is opaque and white is transparent. </li>
- <li>8 - An 8-bit mask is treated as alpha values, where black is transparent and white is opaque.</li>
- </ul></td>
- </tr>
- <tr>
- <td><b>Color format </b></td>
- <td>Select Color to encode the image(s) as color or select Grayscale to encode the image(s) as grayscale.</td>
- </tr>
- <tr>
- <td><b>Set from image </b></td>
- <td>Click this button to auto-detect the image depth, mask depth, and color/grayscale setting from the image contents.</td>
- </tr>
- <tr>
- <td><b>Preview</b></td>
- <td>A preview of the image as it will appear at runtime. </td>
- </tr>
- </table>
- <p> </p>
- <div id="footer">Copyright © 2010 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></div>
-
- </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
+<title>MIF Editor</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+
+<h2>MBM/MIF Editor</h2>
+
+ <p>The <b>MIF Editor</b> allows you to create or edit the <span class="code">.mif</span> files list of scalable icons (<span class="code">.svg</span>)
+ included in a S60 v3.0 and later GUI projects as well as standard <span class="code">.bmp</span> files. A .mif file is a MSX Interchange Format (MIF) file that should be built by the project.</p>
+ <p class="note"><b>NOTE</b> This editor is only supported by the S60 3.0 and later SDKs.</p>
+ <p class="note"><b>NOTE</b> For resources that are included after creating a project, you should ensure that the output location is set correctly by viewing the file properties. The output location is set to "<span class="code">{EPOCROOT}\epoc32\include</span>" by default, so if an alternate location is required you can set this in the file properties.</p>
+ <p align="center" class="Image"><img src="../tasks/projects/images/mif_file_symprojnav.png" width="299" height="292"></p>
+ <p class="figure">Figure 1 - MIF File in the Symbian Project Navigator view</p>
+ <p>The <b>MIF Editor</b> appears when a MIF file is
+ opened for editing. To open the editor double-click on a .mif file in the <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view (figure 1), or select a scalable icon makefile (for example, <span class="code">Icons_scalable_dc.mk</span>), right-click and select the <b>Add MBM/MIF Entry</b> command.</p>
+ <p align="center"><img src="../tasks/projects/images/MBM_MIF_editor.png" width="900" height="600"> </p>
+ <p class="figure">Figure 2 - MBM/MIF Editor</p>
+ <h5>Table 1. MBM/MIF Editor —Items</h5>
+ <table width="94%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="32%" scope="col">Item</th>
+ <th width="68%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td><b>Target File </b></td>
+ <td><p>Specifies the <span class="code">EPOCROOT</span> relative path for the compiled images. Click the Default button to set the target file based on the SDK and project name. </p></td>
+ </tr>
+ <tr>
+ <td><b>Header File </b></td>
+ <td>Shows the generated header file. Select the Header option in the Header Generation group to create a default .mbg file. The path cannot be edited in this field. </td>
+ </tr>
+ <tr>
+ <td><b>Header Generation</b></td>
+ <td><p>Options include:</p>
+ <ul>
+ <li>No header - If selected, no .mbg header will be generated. </li>
+ <li>Header - If selected, a .mbg header will be generated.</li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td><b>Up</b></td>
+ <td>Select an image in the list and click Up to move the selection one position up in the list.</td>
+ </tr>
+ <tr>
+ <td><b>Down</b></td>
+ <td><p>Select an image in the list and click Down to move the selection one position down in the list. </p></td>
+ </tr>
+ <tr>
+ <td><b>Pair Image and Mask </b></td>
+ <td>Select two adjacent unpaired BMP image entries in the list and click this button to combine the images together into image/mask pairs.</td>
+ </tr>
+ <tr>
+ <td><b>Split Image and Mask </b></td>
+ <td>Select a paired BMP image in the list and click this button to split the image into image and mask entries. </td>
+ </tr>
+ <tr>
+ <td><b>Swap Image and Mask </b></td>
+ <td>Select a paired BMP image in the list and click this button to swap the image and mask files and format information in paired image entries. </td>
+ </tr>
+ <tr>
+ <td><b>Add From Project </b></td>
+ <td>Click this button to open the <b>Add Images from Project</b> dialog to reference available images in the project.</td>
+ </tr>
+ <tr>
+ <td><b>Add From Filesystem </b></td>
+ <td>Click this button to open the <b>Add Images From Filesystem</b> dialog to locate and reference existing images in the filesystem or copy images to the project.</td>
+ </tr>
+ <tr>
+ <td><b>Remove</b></td>
+ <td>Select an image and click <b>Remove</b> to remove image entry from the list. This does not delete file from directory.</td>
+ </tr>
+ <tr>
+ <td><b>Color depth </b></td>
+ <td>Select the bit depth used to encode the image at build time.</td>
+ </tr>
+ <tr>
+ <td><b>Mask depth </b></td>
+ <td><p>Select the bit depth used to encode the mask at build time. Options include:</p>
+ <ul>
+ <li>n/a - Do not apply mask depth to images </li>
+ <li>1 - A 1-bit mask treats pixels as "on/off" bits, where black is opaque and white is transparent. </li>
+ <li>8 - An 8-bit mask is treated as alpha values, where black is transparent and white is opaque.</li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td><b>Color format </b></td>
+ <td>Select Color to encode the image(s) as color or select Grayscale to encode the image(s) as grayscale.</td>
+ </tr>
+ <tr>
+ <td><b>Set from image </b></td>
+ <td>Click this button to auto-detect the image depth, mask depth, and color/grayscale setting from the image contents.</td>
+ </tr>
+ <tr>
+ <td><b>Preview</b></td>
+ <td>A preview of the image as it will appear at runtime. </td>
+ </tr>
+ </table>
+ <p> </p>
+ <div id="footer">Copyright © 2010 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></div>
+
+ </body>
+</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_reg_details.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Registers Details Window</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Registers Details Window</h2>
-<p> The Register Details window (Windows OS) lets you view detailed information about individual bits of registers from 2 bits to 32 bits in size. This window shows information for both system registers and memory-mapped registers. To open the Register Details window, click View > Register Details or Window > Register Details Window.</p>
-<p>The Register Details window has fields that describe the register, its bitfields, and the values of those bitfields. XML files in the Registers folder of your Carbide installation provide the information that appears in the window. The Registers folder is inside the Support folder. The Support folder is inside the Plugins folder of your Carbide installation.</p>
-<p>Figure 1 shows the Register Details window. Table 1 explains items in the window.</p>
-<p class="figure">Figure 1 Register Details window<br />
-</p>
-<h5>Table 1. Register Details window—items </h5>
-<table width="94%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="29%" scope="col">Item</th>
- <th width="17%" scope="col">Icon</th>
- <th width="54%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td>Description File text box</td>
- <td> </td>
- <td>Enter the name or full path to the XML file for the register you want to view, or click the Browse button to open a dialog box that you can use to specify the file.</td>
- </tr>
- <tr>
- <td>Register Name</td>
- <td> </td>
- <td>Shows the name of the register depicted in the window.</td>
- </tr>
- <tr>
- <td>Address text box</td>
- <td> </td>
- <td><p>Enter the starting address of the register values that you want to see in the Register Display.</p>
- <p> An error message appears if you enter an invalid starting address.</p></td>
- </tr>
- <tr>
- <td>Format list box</td>
- <td> </td>
- <td><p>Specify the data format for bit values in the Register Display:</p>
- <ul>
- <li>Binary</li>
- <li>Character</li>
- <li>Decimal</li>
- <li>Unsigned Decimal</li>
- <li>Hexadeccimal</li>
- <li>Default—have the IDE determine the best format</li>
- </ul></td>
- </tr>
- <tr>
- <td>Register Display</td>
- <td> </td>
- <td>Shows a depiction of the register that you specify in the Description File text box, including individual register bits and their values.</td>
- </tr>
- <tr>
- <td>Bitfield Name list box</td>
- <td> </td>
- <td><p>Specify a bitfield to highlight in the Register Display. The Description portion of the window reflects available information for the bitfield.</p>
- <p> Select None to have the Description portion of the window reflect information for the entire register and not a bitfield in that register.</p></td>
- </tr>
- <tr>
- <td>Bit Value text box</td>
- <td> </td>
- <td><p>Shows the current value of the bits in the Bitfield Name list box, according to the format that you specify in the Format list box.</p>
- <p>Click the spin buttons to increment or decrement the current value, or enter a new value in the text box.</p>
- <p>Changing the value changes only the Register Display. You must click the Write button to write the new value to the register itself.</p></td>
- </tr>
- <tr>
- <td>Bit Value Modifier list box</td>
- <td> </td>
- <td><p>Specify a new value for the selected bitfield, or view a brief explanation of specific bitfield values.</p>
- <p> Changing the value changes only the Register Display. You must click the Write button to write the new value to the register.</p></td>
- </tr>
- <tr>
- <td>Description</td>
- <td> </td>
- <td><p>Shows a description of the register or a selected bitfield in the register.</p>
- <p> Use the Description File text box to specify the register.</p>
- <p>Use the Text View list box to view specific register information, such as register descriptions, bitfield descriptions, and register details.</p></td>
- </tr>
- <tr>
- <td>Revert button</td>
- <td> </td>
- <td><p>Click to change a modified value in the Register Display to its original value.</p>
- <p> If you clicked the Write button to write a new value to the register, you cannot revert that value.</p></td>
- </tr>
- <tr>
- <td>Read button</td>
- <td> </td>
- <td>Click to have the Register Display reflect current bit values from the register itself.</td>
- </tr>
- <tr>
- <td>Write button</td>
- <td> </td>
- <td><p>Click to write the bit values in the Register Display to the register.</p>
- <p> After you write new values to the register, you cannot revert them.</p></td>
- </tr>
- <tr>
- <td>Reset Value button</td>
- <td> </td>
- <td><p>Click to restore the default value for the selected bitfield.</p>
- <p> The IDE disables this button if the selected bitfield does not have a default value.</p></td>
- </tr>
- <tr>
- <td>Text View list box</td>
- <td> </td>
- <td>Use to specify information that appears in the Description portion of the window.</td>
- </tr>
-</table>
-<h4> Description File</h4>
-<p> Enter in this text box the name of the register that you want to see in the Register Display of the Register Details window. Alternatively, enter the full path to the register description file on your computer, or click the Browse button to open a dialog box that lets you specify the register description file. The text box is not case sensitive.</p>
-<p>After you enter a name or path, the debugger searches for a matching register description file in the Registers folder of your Carbide installation and the project access paths. If the debugger finds a matching file, the Register Display updates the information in the Register Details window. If the debugger does not find a matching name, an error message appears.</p>
-<p>For example, to view the contents of the Opcode register, you can:</p>
-<ul>
- <li>type <span class="code">Opcode</span> in the Description File text box and press Enter or Return, or</li>
- <li>type the full path to the <span class="code">opcode.xml</span> file in the Registers folder and press Enter or Return.</li>
-</ul>
-<p>The debugger matches your entry with the <span class="code">opcode.xml</span> file in the Registers folder. The Register Display in the Register Details window updates its information to show Opcode register details.</p>
-<p>The debugger also updates the Register Display to show the current values in the register. If the debugger fails to update the display, an error message appears.</p>
-<h4>Register Display</h4>
-<p>This display shows the current contents of 32 bits of register data, starting at the address that you specify in the Address text box. The data appears according to the format that you specify in the Format list box.</p>
-<p>The Register Display groups the 32 bits of data into register bitfields. Clicking one of the bits selects its associated bitfield. Additional information about the bitfield, such as its name and permissions, appears in the Description portion of the Register Details window.</p>
-<h4>Text View</h4>
-<p>Use this list box to change the information that appears in the Description portion of the Register Details window:</p>
-<ul>
- <li><b>Auto</b>—select to have the IDE determine which information to display in the window</li>
- <li><b>Register Description</b>—select to show information about the entire register, such as the name of the register itself and the meaning of its contents</li>
- <li><b>Bitfield Description</b>—select to show information about the selected bitfield in the Register Display, such as the name of the bitfield and its access permissions</li>
- <li><b>Register Details</b>—select to show in-depth information about the current register, such as its name, its bit values, and bit-value explanations<br />
- </li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals_wnd.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals_wnd.htm Wed Jul 21 12:11:48 2010 -0500
@@ -4,14 +4,12 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Signals View</title>
+<title>Signals view</title>
<link rel="StyleSheet" href="../../book.css" type="text/css"/>
</head>
<body bgcolor="#FFFFFF">
-<h2>Signals View</h2>
-<p> The Signals view of the Debug perspective lets you view the signals defined on the selected debug target and how the debugger handles each one.</p>
-<p class="note"><b>NOTE</b> Currently Carbide.c++ does not support this CDT feature.</p>
-<p>Figure 1 shows the Signals view.</p>
+<h2>Signals view</h2>
+<p> The Signals view of the Debug perspective lets you view the signals defined on the selected debug target and how the debugger handles each one. Figure 1 shows the Signals view.</p>
<p align="center"><img src="../images/views/view_signals.png" width="500" height="205" /></p>
<p class="figure">Figure 1 - Signals view</p>
<h5>Table 1 Signals view—items </h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_proj_nav.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_proj_nav.htm Wed Jul 21 12:11:48 2010 -0500
@@ -11,12 +11,12 @@
<body bgcolor="#FFFFFF">
<h2>Symbian Project Navigator view</h2>
<p>The <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=com.nokia.carbide.cpp.project.ui.views.SymbianProjectNavigatorView)")'>Symbian Project Navigator</a> view shows all files that belong to the
-current build configuration. This view lists the Symbian projects in your current workspace and their corresponding *.inf file (typically bld.inf). The *.inf file contains the related MMP project files, which are also listed in a tree structure. You can collapse or expand the list for each MMP to see which sources belong to each MMP.</p>
+current build configuration. This view lists the Symbian projects in your current workspace and their corresponding *.inf file (typically <span class="code">bld.inf</span>). The *.inf file contains the related MMP project files, which are also listed in a tree structure. You can collapse or expand the list for each MMP to see which sources belong to each MMP.</p>
<p>To open this view select <b>Window > Show View > Symbian Project Navigator</b>, or select <b>Window > Show View > Other ...</b> and expand the Carbide.c++ folder then choose Symbian Project Navigator. </p>
<p>Figure 1 shows the Symbian Project Navigator view.</p>
-<p align="center"><img src="images/view_sym_proj_nav.png" width="279" height="404" alt=""/></p>
+<p align="center"><img src="images/view_sym_proj_nav.png" width="281" height="340" alt=""/></p>
<p class="figure">Figure 1 - Symbian Project Navigator view</p>
-<h5>Table 1. Symbian Project Navigator view —shortcut menu</h5>
+<h5>Table 1. Symbian Project Navigator view — shortcut menu</h5>
<table width="88%" border="0" cellpadding="2" cellspacing="0">
<tr>
<th width="30%" scope="col">Item</th>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_system_browser.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>System Browser View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>System Browser View</h2>
-<p> The <b>System Browser</b> view shows system level information about processes executing on various machines, like the host computer or the hardware under debugger control. The <span class="note">view</span> shows this information:</p>
-<ul>
- <li>running processes</li>
- <li>tasks for selected processes</li>
- <li>some hidden processes</li>
-</ul>
-<p>Click on the expand icon for a process to view all tasks assigned to the selected process. Processes under debugger control appear in bold. Double-click a task to open it in a new Thread window, or choose the task name and click the Stack Crawl View button.</p>
-<p>Table 1 explains items in the window.</p>
-<p class="note"><b>NOTE</b> If the System Browser view does not show processes for a specific machine, you will need to start a debugging session for that machine. For example, you might need to debug a project that runs on external hardware in order to see executing processes for that hardware.</p>
-<h5>Table 1 System Browser <span class="note">view</span>—items </h5>
-<table width="79%" border="0" cellpadding="2" cellspacing="0">
- <tr>
- <th width="30%" scope="col">Item</th>
- <th width="16%" scope="col">Icon</th>
- <th width="54%" scope="col">Explanation</th>
- </tr>
- <tr>
- <td><b>Attach to Process</b></td>
- <td> </td>
- <td>Click to have the debugger control the selected process.</td>
- </tr>
- <tr>
- <td><b>Stack Crawl view</b></td>
- <td> </td>
- <td>Click to open a Thread window for the selected process.</td>
- </tr>
- <tr>
- <td><b>Refresh</b></td>
- <td> </td>
- <td>This icon indicates that information for selected item is periodically updated. Click this icon to toggle between refresh and no refresh.</td>
- </tr>
- <tr>
- <td><b>No Refresh</b></td>
- <td> </td>
- <td>This icon indicates that information is not updated for the selected item.</td>
- </tr>
- <tr>
- <td><b>Expand</b></td>
- <td> </td>
- <td>Click to expand a process and list related tasks.</td>
- </tr>
-</table>
-<h5>Related concepts</h5>
-<ul>
- <li><a href="../tasks/processes/opening_system_browser.htm">Opening a System Browser View</a> </li>
- <li><a href="../tasks/processes/attach_debugger_to_process.htm">Attaching Debugger to a Process</a> </li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_variables.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_variables.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,7 +9,7 @@
</head>
<body bgcolor="#FFFFFF">
<h2>Variables View </h2>
-<p>The <b>Variables</b> view allows manipulation of the variables or variable hierarchy used in source code. For example, you can change the variable format, change a variables value, add watchpoints, and add global variables. </p>
+<p>The <b>Variables</b> view allows manipulation of the variables or variable hierarchy used in source code. For example, you can change the variable format, change a variables value, add watchpoints, and add global variables. In addition to the standard C/C++, Symbian, and the Qt data types: <span class="code">QString</span>, <span class="code">QByteArray</span>, <span class="code">QSet</span>, <span class="code">QHash</span>, <span class="code">QMap</span>, <span class="code">QVector</span>, <span class="code">QList</span>, <span class="code">QLinkedList</span> and <span class="code">Qvariant</span>.</p>
<p>Figure 1 shows the Variables view with <b>Show Type Names</b> option enabled.</p>
<p align="center"><img src="../images/views/view_variables.png" width="544" height="221" /></p>
<p class="figure">Figure 1 - Variables view showing type names </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm Wed Jul 21 12:11:48 2010 -0500
@@ -9,9 +9,7 @@
<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
<style type="text/css">
<!--
-.style1 { font-family: Georgia, "Times New Roman", Times, serif;
- font-weight: bold;
-}
+.style4 {font-family: Verdana, Ariel, Helvetica, sans-serif; font-weight: bold; }
-->
</style>
</head>
@@ -21,7 +19,7 @@
</a> page in the <b>Preferences</b> window provides global preferences to control general build options like clean, test components, dependency tracking, concurrent build jobs, build behavior, and emulator options.</p>
<p align="center"><img src="images/prefs_build_workspace.png" width="620" height="458" alt="" /></p>
<p class="figure">Figure 1 - Build workspace preferences page </p>
-<p>The following options are available in both the global Build preference panel and the project <b>Properties > Carbide.c++ > </b><b><a href="build_properties/pane_project_settings.htm">Carbide Project Settings</a></b> panel. </p>
+<p>The following options are available in both the global Build preference panel and the project <b>Properties > Carbide.c++ > </b><b><a href="build_properties/pane_project_settings.htm">Project Settings</a></b> panel. </p>
<h5>Table 1 Build Preferences —items</h5>
<table width="100%" border="0" cellpadding="2" cellspacing="0">
<tr>
@@ -51,7 +49,7 @@
</tr>
</table>
<p> </p>
-<p align="center"><img src="images/carbide_proj_settings_sbsv1.png" alt="sbsv1 tab" width="417" height="243"></p>
+<p align="center"><img src="images/carbide_proj_settings_sbsv1.png" alt="sbsv1 tab" width="444" height="143"></p>
<p align="center" class="figure">Figure 2 - SBSv1 tab</p>
<h5 align="left">Table 2 Symbian Build System v1 tab </h5>
<table width="100%" border="0" cellpadding="2" cellspacing="0">
@@ -60,35 +58,31 @@
<th width="57%" scope="col">Explanation</th>
</tr>
<tr>
- <td><span class="style1">Clean level </span></td>
+ <td><p class="style4">Clean level </p></td>
<td><p>Specifies the level of clean to perform on project files. The levels include:</p>
<ul>
<li>Level 0 (<span class="code">abld clean</span>) - removes all the intermediate files created during compilation, and all the executables and import libraries created by the linker</li>
<li>Level 1 (<span class="code">abld reallyclean</span>) - performs a <span class="code">clean</span> operation, but also removes all exported files and makefiles</li>
<li>Level 2 (<span class="code">abld reallyclean</span>, <span class="code">bldmake clean</span>) - performs a <span class="code">reallyclean</span> operation and then removes all files created by bldmake</li>
- </ul>
- </td>
+ </ul> </td>
</tr>
<tr>
- <td><span class="style1">Manage dependency tracking (improves build speed) </span></td>
+ <td><p class="style4">Manage dependency tracking (improves build speed) </p></td>
<td><p>Enable to have Carbide manage the dependency tracking for source and resource files. Carbide does this by separating out the generation of dependency information from the makefile and managing the entire process. All builds now can quickly compare whether new dependency information is required due to changes in a source file and only build those that need updating. </p>
- <p>If not enabled, the Symbian OS command line build system handles all dependency tracking by generating the dependency information in the makefiles. Because it does this for all project files, regardless of the number of changes, it can result in a performance penalty. A single edit in a MMP file forces a complete regeneration of the makefile dependency information for all project files. </p>
- </td>
+ <p>If not enabled, the Symbian OS command line build system handles all dependency tracking by generating the dependency information in the makefiles. Because it does this for all project files, regardless of the number of changes, it can result in a performance penalty. A single edit in a MMP file forces a complete regeneration of the makefile dependency information for all project files. </p> </td>
</tr>
<tr>
- <td><b>Show a dialog to modify build actions when modified MMPs are detected </b></td>
- <td><p>Enable to have Carbide ask before starting a build what action to take when modified files are detected. When disabled, do not show a dialog but use the default action listed below.</p>
- </td>
+ <td><p><strong>Show a dialog to modify build actions when modified MMPs are detected </strong></p></td>
+ <td><p>Enable to have Carbide ask before starting a build what action to take when modified files are detected. When disabled, do not show a dialog but use the default action listed below.</p> </td>
</tr>
<tr>
- <td><b>Default action to take when mmp files are modified </b></td>
+ <td><p><strong>Default action to take when mmp files are modified </strong></p></td>
<td><p>Defines the default action Carbide should execute when it detects modified MMP files and the option above is disabled: </p>
<ul>
<li>None</li>
<li>Link Only</li>
<li>Compile and Link</li>
- </ul>
- </td>
+ </ul> </td>
</tr>
<tr>
<td><strong>Do not offer to track dependencies for projects build on command-line </strong></td>
@@ -96,7 +90,7 @@
</tr>
</table>
<p align="left"> </p>
-<p align="center"><img src="images/carbide_proj_settings_sbsv2.png" alt="sbsv2 tab" width="427" height="269"></p>
+<p align="center"><img src="images/carbide_proj_settings_sbsv2.png" alt="sbsv2 tab" width="423" height="176"></p>
<p align="center" class="figure">Figure 3 - SBSv2 tab </p>
<h5 align="left">Table 3 Symbian Build System v2 tab </h5>
<table width="100%" border="0" cellpadding="2" cellspacing="0">
@@ -130,7 +124,7 @@
</table>
<h5>Related references</h5>
<ul>
- <li><a href="build_properties/pane_project_settings.htm">Carbide Project Settings </a></li>
+ <li><a href="build_properties/pane_project_settings.htm">Project Settings </a></li>
</ul>
<div id="footer">Copyright © 2010 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></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref.htm Wed Jul 21 12:11:48 2010 -0500
@@ -11,8 +11,8 @@
<body bgcolor="#FFFFFF">
<h2>Carbide.c++ preferences</h2>
<p>The <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage)")'>
-Carbide.c++</a> panel in the <b>Preferences</b> window provides an option to keep your projects updated when you add or create files. Figure 1 shows the Carbide.c++ preference panel.</p>
-<p align="center"><img src="images/carbide_preferences.png" width="627" height="544" alt="" /></p>
+Carbide.c++</a> panel in the <b>Preferences</b> window provides an option to keep your projects updated when you add or create files. Figure 1 shows the Carbide.c++ preference panel.</p>
+<p align="center"><img src="images/prefs_carbide_cpp.png" alt="Carbide.c++ preference panel" width="671" height="554"></p>
<p class="figure">Figure 1 - Carbide.c++ preferences page </p>
<h5>Table 1 Carbide.c++ Preferences —items</h5>
<table width="850" border="0" cellpadding="2" cellspacing="0">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_pref_code_style.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_pref_code_style.htm Wed Jul 21 12:11:48 2010 -0500
@@ -6,14 +6,15 @@
<h2>Code Styles preferences</h2>
- <p>Carbide supports the use of code styles in projects via the C/C++ <img src="../images/command_link.png" alt="" width="16" height="12" border="0" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage)")'> Code Style</a> preference panel. Use a code style profile to set specific smart typing features, like indentation, tabs or spaces, and many more options. There are several preset code styles like GNU, while Carbide supplies these profiles:</p>
+ <p>Carbide supports the use of code styles in projects via the C/C++ <img src="../images/command_link.png" alt="" width="16" height="12" border="0" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage)")'> Code Style</a> preference panel. Use a code style profile to set specific smart typing features, like indentation, tabs or spaces, and many more options. There are several built-in code styles like GNU, Whitesmith, and others, while Carbide supplies these additional styles:</p>
<ul>
- <li><b>Symbian OS</b> — settings are based on the <a href="http://developer.symbian.com/main/downloads/papers/coding_stds/2003-01_SyOSCodStn.pdf">Symbian OS C++ coding standards</a> PDF </li>
- <li><b>S60</b> — settings are based on the <a href="http://www.forum.nokia.com/document/Cpp_Developers_Library/?content=GUID-232258EC-D3B4-4D72-B12B-FFC34F070B4B_GUID-0B6641F4-8393-40B0-96A1-8BF96CB41134.html">S60 Platform: C++ Coding Conventions</a></li>
+ <li><b>Symbian OS</b> — settings are based on the <a href="http://developer.symbian.com/main/downloads/papers/coding_stds/2003-01_SyOSCodStn.pdf">Symbian OS C++ coding standards</a></li>
+ <li><b>S60</b> — settings are based on the <strong>C++ Developer's Library > </strong><a href="http://library.forum.nokia.com/index.jsp?topic=/Nokia_Symbian3_Developers_Library/GUID-B51A9A1F-8E80-4DF6-904A-7BD1A8976BBB.html">C++ Coding Conventions</a></li>
+ <li><strong>Qt</strong> — settings for Qt projects</li>
</ul>
- <p>Setting a code style sets it for the entire workspace. When a new file is created the currently selected code style rules are applied as you edit the file. You can apply a set of rules to a previously created source file by opening it in an editor view, then right-clicking and choosing <b>Source > Format</b> (<span class="code">CTRL+SHIFT+F</span>). </p>
- <p align="center"><img src="images/wnd_pref_code_styles.png" width="627" height="544" /></p>
- <p align="center" class="figure">Figure 1 - Code Style preference panel </p>
+ <p>Setting a code style sets it for the entire workspace. When a new file is created the currently selected code style rules are applied as you edit the file. You can apply a set of rules to a previously created source file by opening it in an editor view, then right-clicking and choosing <b>Source > Format</b> (<span class="code">CTRL+SHIFT+F</span>). </p>
+ <p align="center"><img src="images/wnd_pref_code_styles.png" width="658" height="562" /></p>
+ <p align="center" class="figure">Figure 1 - Code Style preference panel </p>
<h5>Related references </h5>
<ul>
<li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm">Code Style preferences</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Wed Jul 21 12:11:48 2010 -0500
@@ -31,6 +31,12 @@
changes making the tools unusable!</p>
<h3><a name="whatsNew" id="whatsNew"></a>What's New in 3.0.0 </h3>
<p>The following features for Symbian development are provided within Carbide.c++:</p>
+<h4>Milestone 2</h4>
+<ul>
+ <li>A new <a href="reference/view_carbide_portal.htm">Carbide Portal</a> view provides easier access to Carbide information, an extensions marketplace, and support.</li>
+ <li>The <a href="reference/view_variables.htm">Variables</a> view and debug hover now supports the following Qt data types: <span class="code">QString</span>, <span class="code">QByteArray</span>, <span class="code">QSet</span>, <span class="code">QHash</span>, <span class="code">QMap</span>, <span class="code">QVector</span>, <span class="code">QList</span>, <span class="code">QLinkedList</span> and <span class="code">Qvariant</span>.</li>
+</ul>
+<h4>Milestone 1</h4>
<ul>
<li><b>Eclipse 3.6 </b>— The Eclipse 3.6 project (Helios) provides the foundation, or integration platform, on which Carbide.c++ is built. See <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html">What's New in 3.6</a> for more information.</li>
<li><b>CDT 7.0 </b>— The final version of CDT is included as part of the Helios release. See the <a href="http://wiki.eclipse.org/CDT/User/NewIn70">CDT 7.0 News and Noteworthy</a> page for more information. </li>
@@ -45,16 +51,19 @@
</ul>
</li>
</ul>
-<h4><a name="new260" id="new260"></a>2.6.0 </h4>
+<h4><a name="new270" id="new270"></a>2.7.0 </h4>
+<ul>
+
+ <li>The Leavescan plug-in has been deprecated and is no longer included in Carbide.c++ releases. Use Codescanner to replace the Leavescan functionality.</li>
+</ul>
+<h4><a name="new260" id="new2"></a>2.6.0 </h4>
<ul>
<li><b>GCCE 4.0 </b> supported — required for future SBSv2 releases.</li>
<li><b>Symbian^3 </b>supported — new templates and improvements required for the public Symbian^3 SDK.</li>
- <li><b>Known Issues in v2.6.0</b>:
- <ul>
- <li>GCCE4 support requires using a SBSv2 build alias (<span class="code">-c</span> parameter) of <span class="code">armv5_udeb_gcce</span> or <span class="code">armv5_urel_gcce</span>. As of this writing, these aliases were not available in the SDK or SBSv2, but will appear in some future version. Carbide versions prior to 2.6 do not support GCCE4.</li>
- <li>Users should consult the SDK documentation for GCCE and SBSv2 issues and installation requirements.</li>
- <li>TRK: If you install the TRK app onto your phone's flash memory (Mass Storage) a Remote Connection may not find the TRK-service even though TRK is already connected to your PC. Workaround: Uninstall TRK then reinstall it onto your PHONE memory (C-drive). The TRK service should now be "Available".</li>
- </ul>
+ <li><b>Known Issues in v2.6.0</b>:
+ <p>GCCE4 support requires using a SBSv2 build alias (<span class="code">-c</span> parameter) of <span class="code">armv5_udeb_gcce</span> or <span class="code">armv5_urel_gcce</span>. As of this writing, these aliases were not available in the SDK or SBSv2, but will appear in some future version. Carbide versions prior to 2.6 do not support GCCE4.</p>
+ <p>Users should consult the SDK documentation for GCCE and SBSv2 issues and installation requirements.</p>
+ <p>TRK: If you install the TRK app onto your phone's flash memory (Mass Storage) a Remote Connection may not find the TRK-service even though TRK is already connected to your PC. Workaround: Uninstall TRK then reinstall it onto your PHONE memory (C-drive). The TRK service should now be "Available".</p>
</li>
</ul>
<h4><a name="new250" id="new"></a>2.5.0</h4>
@@ -75,10 +84,11 @@
<p>Workarounds for known issues: </p>
<ul>
<li><strong>Qt issues</strong> — If Qt does not seem to be working as expected, be sure to run the <span class="code">\configuration\qt\register_plugins.bat</span> file to properly register the Qt plugins. This is especially important if you installed Carbide using a zip file and not an installer.</li>
+ <li><strong>USB issues</strong> — There are know problems with some USB configurations. We are working to resolve these asap.</li>
</ul>
<h3><a name="support" id="support"></a>Technical support </h3>
<p>The following support services are available:</p>
-<ul><li>Visit the <a href="http://web-dev.foundationhost.org/">Symbian Foundation</a> for Carbide.c++ and Symbian development information </li>
+<ul><li>Visit the <a href="http://developer.symbian.org/">Symbian Foundation</a> for Carbide.c++ and Symbian development information </li>
</ul>
<div id="footer">Copyright © 2010 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></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/AddingClasses.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/AddingClasses.html Wed Jul 21 12:11:48 2010 -0500
@@ -69,7 +69,7 @@
</div>
<h5>Related tasks</h5>
<ul>
- <li><a href="../reference/NewClassWizard.html">New C++ Classs Wizard</a></li>
+ <li><a href="../reference/NewClassWizard.html">New C++ Class Wizard</a></li>
</ul>
<div id="footer">Copyright © 2010 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></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/AddinganSDK.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/AddinganSDK.html Wed Jul 21 12:11:48 2010 -0500
@@ -21,7 +21,7 @@
</li>
<div class="Figure">
- <p class="Image"><img src="../images/SDKPreferences.png" width="740" height="546" /></p>
+ <p class="Image"><img src="../images/SDKPreferences.png" width="696" height="583" /></p>
</div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/AppInfoFile.html Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Creating an AIF File in Modifying Resources</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <h2>Creating an AIF File</h2>
-
- <p>
- The <b>AIF Definition File</b> wizard creates a file that
- specifies an AIF file to be built as part of the project. An AIF file is a
- Symbian OS application information file, which describes an application's icons
- and properties. For more information, see <a href="../concepts/AIFDefWizard.html">Concepts >AIF File</a>.</p>
- <p class="note"><b>NOTE</b> AIF files are used only for projects created for Symbian OS versions
- before v9.1.</p>
- <div class="step">
- <h4>
- To create an AIF file</h4>
- <ol>
- <li>
- <p>
- Open the MMP file associated with the project in the <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> (double-click on MMP file or right-click and select <b>Open</b>).</p>
-
- <p align="center" class="Image"><img src="projects/images/AIF_editor_mmp_symprojnav.png" width="271" height="261" /></p>
- </li>
- <p class="figure">Figure 1 - MMP File in Symbian Project Navigator</p>
- <li>The MMP editor opens.</li>
-
- <p align="center" class="Image"><img src="projects/images/AIF_editor_mmp_editor.png" width="581" height="383" /></p>
- <p class="figure">Figure 2 - Access to AIF Editor in MMP Editor</p>
- <li>
- Select the Sources tab and select AIF in the Resources group.
- </li>
- <li>Click Add button to open the AIF editor.</li>
- <p align="center"><img src="projects/images/AIF_editor.png" width="700" height="575" /></p>
- <p class="figure">Figure 3 - AIF Editor</p>
- <li>
- Enter a name for the .aif file or click untitled.aif button to set a default name based on the SDK and project name.</li>
- <li>Specify a resource file from the dropdown list or browse the filesystem.</li>
- <li>Click the Add From Project or Add From Filesystem buttons to add image and mask bitmaps.</li>
- <li>Set the Shared Image Properties (color depth, mask depth, and color format).</li>
- <li>Select the two images (image and mask) and select Pair Image and Mask button.</li>
- <li>Click Ok to create AIF file from the information you defined in the editor. </li>
- </ol>
- <p align="center"><img src="projects/images/AIF_editor2.png" width="700" height="575" /></p>
- <p align="left" class="figure">Figure 4- AIF Editor with information defined</p>
- </div>
- <h5>Related concepts</h5>
- <ul>
- <li> <a href="../concepts/AIFDefWizard.html">AIF File</a></li>
- </ul>
- <h5>Related reference </h5>
- <ul>
- <li> <a href="../reference/AIFEditor.html">AIF Editor</a></li>
- </ul>
- <div id="footer">Copyright © 2010 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></div>
-
- </body>
- </html>
-
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html Wed Jul 21 12:11:48 2010 -0500
@@ -1,101 +1,101 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <title>Creating New Projects</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body>
-<h2>Creating New Projects</h2>
- <div class="Bodytext">
- <p>New projects are created using the <b>New Project Wizard</b>. Carbide includes a number of templates that make creating projects for different SDKs and executables quick and easy.</p>
- <p class="note"><b>NOTE</b> You must have at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
- <p class="note"><b>NOTE</b> When creating or importing projects the sources and SDK must be on the same drive. This is due to many of the internal SDK tools using an implicit working drive to calculate paths (e.g. \epoc32\tools). Avoid spaces in SDK paths since this will also cause problems.</p>
- <div class="step">
- <h3>Creating New Symbian OS C++ Projects</h3>
- <ol>
- <li class="step">Select <b>File > New > Symbian OS C++ Project</b> to invoke the <b>New Project</b> wizard.</span></li>
- <p><img src="../images/step1.png" width="546" height="142" alt="" ></p>
- <li>The <b class="step">New Symbian OS C++ Project</b> wizard appears. Select a template related to an installed SDK.</li>
- <p>A project template provides the initial source files and project settings appropriate for the chosen project type. A brief description of each template appears below the list. The project type determines the type of program that you are writing.</p>
- <p class="note"><b>NOTE</b> If the selected template requires user input, additional wizard pages will collect data from the user before creating the project.</p>
- <p>Checkmark the <b>Filter templates based on enabled SDKs</b> option to only list SDKs enabled in the <a href="../reference/SDKPreferences.html">SDK Preferences</a> panel. Uncheck this option to list SDKs that can be used with Carbide. Click <b>Next</b>.</p>
- <p align="center"><img src="../images/step2.png" width="500" height="567" alt="" ></p>
- <li>Enter a name for your project. </li>
- <p>Checkmark the <b>Use default location</b> option to save the project in the current workspace by default or uncheck it to save to another location. Enter the path in the <b>Location</b> field or click <b>Browse</b> button to locate the directory. Click <b>Next</b>.</p>
- <p align="center"><span class="Image"><img src="images/new_proj_name_location.png" alt="new project" width="500" height="567"></span><span class="Image"><br>
- </span></p>
- <li>Select the <b>SDKs and Build Configurations</b>. </li>
- <p>Checkmark the <b>Filter SDKs based on selected template</b> option to only show build configurations based on the selected SDK template, or uncheck to show all enabled SDKs and their related build configurations.</p>
- <p align="center"><img src="../images/step4.png" width="500" height="567" alt="" ></p>
- <p class="Image">The Symbian OS SDKs wizard page shows a tree of the SDKs and the type of builds available within that SDK. Select a single SDK
- if the program you are developing is for just one version of a platform,
- or select multiple SDKs to build the program for multiple build platforms or SDK versions.</p>
- <p> The build configuration allows you to specify the compiler(s) to
- do the build, and whether debug and/or release builds are required. For this example we recommend using the Emulator Debug version as the <a href="../concepts/build_configurations.htm">build configuration</a>. Later, you can <a href="projects/prj_set_build_tgt.htm">switch</a> to another build configuration to create the project for a specific device.</p>
- <p> Click <b>Next</b>.</p>
- <li>Set the project properties in the <b>Basic Settings</b> page. </li>
- <div align="center"><img src="../images/step5.png" width="500" height="567" alt="" > </div>
- <blockquote>
- <p align="left" class="note"><b>NOTE</b> The basic properties for a project may change based on the template selected for a particular project type. </p>
- <p align="left" style="font-weight: normal;">Fill in the applicable fields, which
- may include UID2, UID3, Vendor ID, Author, Support Email, Copyright
- notice and Target Type for console EXEs.</p>
-
- <p>Application UID (or UID3) is used to uniquely identify the binary (EXE or DLL) within the system. The purpose of UID 3 is to prevent one executable from interfering the operation of another executable.</p>
- <p> A Vendor ID (VID) is a unique identifier for the organization that is supplying the program. In versions of Symbian OS with platform security, a program can read a VID at runtime to check that a binary comes from a particular source. In most cases, the VID should be zero, meaning that source of the executable is not required for any security checks.</p>
- <p style="font-weight: normal;">UID 2 is a unique identifier number that identifies the type of interface that the
- project implements. The values are defined by Symbian</p>
-
- <ul>
- <li>For GUI applications, it is always 0x100039CE</li>
- <li>For static interface DLLs, the UID 2 is always 0x1000008d</li>
- <li>For polymorphic DLLs, the UID2 is defined by the framework which is being implemented</li>
- </ul>
- Author, Copyright notice, and Text to be shown are used in comments created by the wizard in the source code.
- <p><span style="font-weight: normal;"> For more information on UIDs
- and Vendor IDs, see </span><a
- href="https://www.symbiansigned.com/app/page/uidfaq"
- style="font-weight: normal;">Symbian Signed</a>,
- <span style="font-weight: normal;">which allocates these values.</span> </p>
- </blockquote>
- <li span style="font-weight: normal;">
- Click <b>Next</b> to move to the <b>Project Directories</b> page.</li>
- <div class="Figure">
- <p align="center" class="Image"><img src="../images/step6.png" width="500" height="567" alt="" ><br>
- </p>
- <p class="note" style="font-weight: normal;"> <b>NOTE</b> The project directories depends on the selected template. That is, the directories required to store project data may
- change based on the template used. </p>
- </div>
- <p>Accept the defaults or enter the names for Include and Source folders to be created under the project root directory. Generated files will be copied to these directories.</p>
- <li> Click <b>Finish</b> to create the project.</li>
- <p>This generates the necessary files for the project based on the template selected and show them in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view.</p>
- </ol>
- <blockquote>
- <p align="center"><img src="../images/step7.png" width="277" height="339" alt="" > </p>
- </blockquote>
- </div>
- <blockquote>
- <p class="note"><b>NOTE</b> If the Carbide.c++ perspective is not visible, select the <b>Window
-> Open Perspective > Other</b>... command to list all available
- perspectives, then select the Carbide.c++ perspective and click OK.</p>
- </blockquote>
-</div>
-<h5>Concepts</h5>
-<ul>
- <li><a href="../concepts/Projects.html">Projects</a> </li>
- <li><a href="../concepts/Modify.html">Project Resources</a></li>
- <li><a href="../reference/ProjectPreferences.html">Project Preferences</a></li>
- <li><a href="../reference/ProjectTypeandSDK.html">Project Types</a></li>
- <li><a href="../concepts/templates.htm">Project Templates</a> </li>
-</ul>
- <h5>Tasks</h5>
- <ul>
- <li><a href="projects/prj_build.htm">Building Projects</a></li>
- <li><a href="projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
- <li><a href="start/carbide_debugging.htm">Debugging a Symbian OS Program</a> </li>
- </ul>
-
-<div id="footer">Copyright © 2010 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></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+ <title>Creating New Symbian OS C++ Projects</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body>
+<h2>Creating New Symbian OS C++ Projects</h2>
+ <div class="Bodytext">
+ <p>New projects are created using the <b>New Project Wizard</b>. Carbide includes a number of templates that make creating projects for different SDKs and executables quick and easy.</p>
+ <p class="note"><b>NOTE</b> You must have at least one recognized SDK installed before you can create a project. See the <a href="../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+ <p class="note"><b>NOTE</b> When creating or importing projects the sources and SDK must be on the same drive. This is due to many of the internal SDK tools using an implicit working drive to calculate paths (e.g. \epoc32\tools). Avoid spaces in SDK paths since this will also cause problems.</p>
+ <div class="step">
+ <h3>Creating New Symbian OS C++ Projects</h3>
+ <ol>
+ <li class="step">Select <b>File > New > Symbian OS C++ Project</b> to invoke the <b>New Project</b> wizard.</span></li>
+ <p><img src="../images/step1.png" width="506" height="318" alt="" ></p>
+ <li>The <b class="step">New Symbian OS C++ Project</b> wizard appears. Select a template related to an installed SDK.</li>
+ <p>A project template provides the initial source files and project settings appropriate for the chosen project type. A brief description of each template appears below the list. The project type determines the type of program that you are writing.</p>
+ <p class="note"><b>NOTE</b> If the selected template requires user input, additional wizard pages will collect data from the user before creating the project.</p>
+ <p>Checkmark the <b>Filter templates based on enabled SDKs</b> option to only list SDKs enabled in the <a href="../reference/SDKPreferences.html">SDK Preferences</a> panel. Uncheck this option to list SDKs that can be used with Carbide. Click <b>Next</b>.</p>
+ <p align="center"><img src="../images/step2.png" width="500" height="567" alt="" ></p>
+ <li>Enter a name for your project. </li>
+ <p>Checkmark the <b>Use default location</b> option to save the project in the current workspace by default or uncheck it to save to another location. Enter the path in the <b>Location</b> field or click <b>Browse</b> button to locate the directory. Click <b>Next</b>.</p>
+ <p align="center"><span class="Image"><img src="images/new_proj_name_location.png" alt="new project" width="500" height="400"></span><span class="Image"><br>
+ </span></p>
+ <li>Select the <b>SDKs and Build Configurations</b>. </li>
+ <p>Checkmark the <b>Filter SDKs based on selected template</b> option to only show build configurations based on the selected SDK template, or uncheck to show all enabled SDKs and their related build configurations.</p>
+ <p align="center"><img src="../images/step4.png" width="500" height="500" alt="" ></p>
+ <p class="Image">The Symbian OS SDKs wizard page shows a tree of the SDKs and the type of builds available within that SDK. Select a single SDK
+ if the program you are developing is for just one version of a platform,
+ or select multiple SDKs to build the program for multiple build platforms or SDK versions.</p>
+ <p> The build configuration allows you to specify the compiler(s) to
+ do the build, and whether debug and/or release builds are required. For this example we recommend using the Emulator Debug version as the <a href="../concepts/build_configurations.htm">build configuration</a>. Later, you can <a href="projects/prj_set_build_tgt.htm">switch</a> to another build configuration to create the project for a specific device.</p>
+ <p> Click <b>Next</b>.</p>
+ <li>Set the project properties in the <b>Basic Settings</b> page. </li>
+ <div align="center"><img src="../images/step5.png" width="500" height="500" alt="" > </div>
+ <blockquote>
+ <p align="left" class="note"><b>NOTE</b> The basic properties for a project may change based on the template selected for a particular project type. </p>
+ <p align="left" style="font-weight: normal;">Fill in the applicable fields, which
+ may include UID2, UID3, Vendor ID, Author, Support Email, Copyright
+ notice and Target Type for console EXEs.</p>
+
+ <p>Application UID (or UID3) is used to uniquely identify the binary (EXE or DLL) within the system. The purpose of UID 3 is to prevent one executable from interfering the operation of another executable.</p>
+ <p> A Vendor ID (VID) is a unique identifier for the organization that is supplying the program. In versions of Symbian OS with platform security, a program can read a VID at runtime to check that a binary comes from a particular source. In most cases, the VID should be zero, meaning that source of the executable is not required for any security checks.</p>
+ <p style="font-weight: normal;">UID 2 is a unique identifier number that identifies the type of interface that the
+ project implements. The values are defined by Symbian</p>
+
+ <ul>
+ <li>For GUI applications, it is always 0x100039CE</li>
+ <li>For static interface DLLs, the UID 2 is always 0x1000008d</li>
+ <li>For polymorphic DLLs, the UID2 is defined by the framework which is being implemented</li>
+ </ul>
+ Author, Copyright notice, and Text to be shown are used in comments created by the wizard in the source code.
+ <p><span style="font-weight: normal;"> For more information on UIDs
+ and Vendor IDs, see </span><a
+ href="https://www.symbiansigned.com/app/page/uidfaq"
+ style="font-weight: normal;">Symbian Signed</a>,
+ <span style="font-weight: normal;">which allocates these values.</span> </p>
+ </blockquote>
+ <li span style="font-weight: normal;">
+ Click <b>Next</b> to move to the <b>Project Directories</b> page.</li>
+ <div class="Figure">
+ <p align="center" class="Image"><img src="../images/step6.png" width="500" height="500" alt="" ><br>
+ </p>
+ <p class="note" style="font-weight: normal;"> <b>NOTE</b> The project directories depends on the selected template. That is, the directories required to store project data may
+ change based on the template used. </p>
+ </div>
+ <p>Accept the defaults or enter the names for Include and Source folders to be created under the project root directory. Generated files will be copied to these directories.</p>
+ <li> Click <b>Finish</b> to create the project.</li>
+ <p>This generates the necessary files for the project based on the template selected and show them in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view.</p>
+ </ol>
+ <blockquote>
+ <p align="center"><img src="../images/step7.png" width="273" height="301" alt="" > </p>
+ </blockquote>
+ </div>
+ <blockquote>
+ <p class="note"><b>NOTE</b> If the Carbide.c++ perspective is not visible, select the <b>Window
+> Open Perspective > Other</b>... command to list all available
+ perspectives, then select the Carbide.c++ perspective and click OK.</p>
+ </blockquote>
+</div>
+<h5>Concepts</h5>
+<ul>
+ <li><a href="../concepts/Projects.html">Projects</a> </li>
+ <li><a href="../concepts/Modify.html">Project Resources</a></li>
+ <li><a href="../reference/ProjectPreferences.html">Project Preferences</a></li>
+ <li><a href="../reference/ProjectTypeandSDK.html">Project Types</a></li>
+ <li><a href="../concepts/templates.htm">Project Templates</a> </li>
+</ul>
+ <h5>Tasks</h5>
+ <ul>
+ <li><a href="projects/prj_build.htm">Building Projects</a></li>
+ <li><a href="projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+ <li><a href="start/carbide_debugging.htm">Debugging a Symbian OS Program</a> </li>
+ </ul>
+
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ExportingtoMMP_BLDinf.html Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,271 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<title>Exporting project(s) to MMP/Bld.inf files in Tasks</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
- </head>
- <body>
-
- <div class="step">
- <h2>Exporting project(s) to MMP/Bld.inf files</h2>
- <p>
- The command-line Symbian OS toolchain requires a component description
- file (<span class="code">Bld.Inf</span>) and one or more project definition files
- (<span class="code">.mmp</span>) to build a project. The export command allows you to create
- these files for your projects. </p>
- <h4>
- To export project(s) to a <span class="code">Bld.Inf</span> and/or <span class="code">MMP</span>
- file: </h4>
- <ol>
- <li>
- Click <span class="code">File > Export...</span> to get a list of the
- available export wizards:
- <p>
- OR </p>
- <p>
- Click <span class="code">Export</span> from the pop-up menus of the
- <span class="code">C/C++ Projects</span> and <span class="code">Navigator</span> views to get a
- list of the available export wizards: </p>
- <div class="Figure">
-
- <p class="Image"><a name=""><img src="../images/export1.gif" alt="" width="470" height="550" border="0"></a></p>
- </div>
- </li>
- <li>Select <span class="code">Symbian MMP/Bld.Inf</span> and click
- <span class="code">Next</span> to go to the <span class="code">Symbian Projects</span> page:
- <p></p>
- <div class="Figure">
-
- <p class="Image"><a name=""><img src="../images/export2.gif" alt="" width="470" height="550" border="0"></a></p>
- </div>
- </li>
- <li>
- Select the project(s) you intend to export from the list of
- <span class="code">Symbian Projects</span>. </li>
- <li>
- Click <span class="code">Next</span> to go to the <span class="code">SDKs and Build Configurations Selection</span> page:
- <div class="Figure">
-
- <p class="Image"><a name=""><img src="../images/export3.gif" alt="" width="470" height="550" border="0"></a></p>
- </div>
- </li>
- <li>
- Select at least one build configuration for each project in the
- left-hand pane from the list of available SDKs and build configurations in the
- right-hand pane. By default, all the build configurations chosen during the
- last export are selected. If a project is being exported for the first time, no
- build configurations are selected.
- <p>
- The build configurations chosen for a project are distinguished using
- guard macros in the <span class="code">MMP</span> file. The guard macros are placed around
- the <span class="code">MMP</span> file statements containing resources or build setting,
- only valid for a subset of the chosen build configurations. </p>
- <p>
- There are cases where guard macros may not be able to distinguish
- between two build configurations. The export wizard shows a conflict when two
- such ambiguous build configurations are selected by the user. </p>
- <p>
- The combination of build configurations which results in a conflict
- are as follows: </p>
-
- <ul>
- <li>
- <p>
- Any two build configurations that differ only in the build
- variant (UDEB/UREL). For example, "UIQ 3.0 Phone (GCCE) Debug" and "UIQ 3.0
- Phone (GCCE) Release" configurations will result in a conflict, as they differ
- only in the build variant. </p>
- </li>
- <li>
- <p>
- Any two build configurations, of which one is user-defined based
- on the other using the <span class="code">Manage</span> option in the <span class="code">C/C++
- Build properties</span> view of the project. </p>
- <p>
- <i>For more information on managing build configurations,
- refer to the CDT user guide.</i> </p>
- </li>
- </ul>
-
- <p>
- The wizard will change the build settings in the <span class="code">MMP</span>
- file based on the chosen build configuration. If more than one build
- configuration which require different build settings are chosen, guard macros
- are used to determine the build settings. For example, if you want to change
- the <span class="code">SECUREID</span> option for all the <code>EKA2 build
- configurations, the wizard will append the following lines into the
- <span class="code">MMP</span> file: </code></p><code>
- <p class="CodeBlock">#if def EKA2<br> SECUREID 0x00301<br>#endif</p>
- <p>
- Where <code>EKA2 is the guard macro for all the build
- configurations designed for the EKA2 kernel. The above <span class="code">MMP</span> file
- statements check whether the <code>EKA2 guard macro is defined, and if
- it is, change the <code>SECUREID option accordingly. </code></code></code></p>
- </code></li><code><code><code><code>
- <li>
- Click <span class="code">Next</span> to go to the <span class="code">MMP File and Bld.inf
- File</span> page:
- <div class="Figure">
- <div align="center"><a name=""><img src="../images/export4.gif" alt="" width="470" height="550" border="0"></a></div>
- </div>
- <ol type="a">
- <li>
- Type the <span class="code">MMP</span> file location in the <span class="code">MMP
- File</span> field, or click <span class="code">Browse</span> to select the
- <span class="code">MMP</span> file for each project listed above.
- <p>
- By default, the <span class="code">MMP</span> file is exported to one of the
- following locations in the order listed below: </p>
- <ul>
- <li> The location where the project was exported the last time. </li>
- <li> The group folder of the exported project, if it exists. </li>
- <li> The exported project's root directory. </li>
- </ul>
- </li>
- <li>
- If you select the <span class="code">Export Bld.inf file</span> option, then
- type the <span class="code">Bld.Inf</span> file location in the <span class="code">Bld.inf
- File</span> field, or click <span class="code">Browse</span> to select the
- <span class="code">Bld.Inf</span> file.
- <p>
- If you do not select the <span class="code">Export Bld.inf file</span> option,
- then you need not specify the <span class="code">Bld.Inf</span> file location. </p>
- <p>
- By default, the <span class="code">Bld.Inf</span> file is exported to one of the
- following locations in the order listed below: </p>
- <ul>
- <li>
- The location where the <span class="code">Bld.Inf</span> was created when the
- project was last exported to an <span class="code">MMP</span> file. </li>
- <li> The <span class="code">MMP</span> file location.</li>
- </ul>
- </li>
- </ol>
- </li>
- <li>Click Next to go to the Other Makefiles page where you can specify extra Makefiles to invoke from bld.inf </li>
-
- <blockquote>
- <p align="center"><img src="../images/export4a.gif" width="470" height="550"></p>
- </blockquote>
- <li>Click Next to open the Scalable Icon Makefiles page where you can specify the Makefiles used to generate scalable icon files.</li>
- <p align="center"><img src="../images/export4b.gif" width="470" height="550"></p>
- <li>Click <span class="code">Next</span> to go to the <span class="code">PRJ_EXPORTS</span> page, to specify the list of files to be copied from the source directories to
- the releasables directories while building the project:
- <div class="Figure">
-
- <p class="Image"><a name=""><img src="../images/export5.gif" alt="" width="470" height="550" border="0"></a></p>
- </div>
- <p>
- <i>Note that this page is displayed only if you have selected
- the Export Bld.inf file option in the previous page.</i> </p>
- </li>
- <li>
- Type the <span class="code">Source</span> and <span class="code">Target</span>
- locations of the file to be copied, and click <span class="code">Add</span> to append
- the source-target pair to the <span class="code">PRJ_EXPORTS</span> list. You can use
- <span class="code">Browse</span> to specify the source file and its target location. If
- the target location for the file is not specified, it will be copied to
- <span class="code">epoc32\include</span> directory.
- <p>
- Note that the contents of the <span class="code">PRJ_EXPORTS</span> list is
- exactly the same as it appears in the <code>PRJ_EXPORTS section of the
- <span class="code">Bld.Inf</span> file. </code></p>
- </li><code>
- <li>
- If you want to modify or delete any entry from the
- <span class="code">PRJ_EXPORTS</span> list, select the entry and click
- <span class="code">Modify</span> or <span class="code">Delete</span>. </li>
- <li>
- Click <span class="code">Next</span> to go to the <span class="code">MMP Preview</span>
- page:
- <div class="Figure">
-
- <p class="Image"><a name=""><img src="../images/export6.gif" alt="" width="470" height="550" border="0"></a></p>
- </div>
- </li>
- <li>
- Select a project from the list of projects to be exported, to see a
- preview of the <span class="code">MMP</span> file in the pane below. You can edit the
- contents if required. </li>
- <li>
- Click <span class="code">Finish</span> to complete the export process. The
- wizard will create the managed <span class="code">MMP</span> file and <code class="filename">Bld.inf
- file in their specified locations.
- <p>
- A managed <span class="code">MMP</span> file contains the same content as a
- standard <span class="code">MMP</span> file would, but the contents are organised into
- following managed sections using special tags: </p>
-
- <ul>
- <li>
- <p>
- Binary Build Information </p>
- </li>
- <li>
- <p>
- Search Path </p>
- </li>
- <li>
- <p>
- Project Content Managed </p>
- </li>
- <li>
- <p>
- Linkage </p>
- </li>
- <li>
- <p>
- Customization </p>
- </li>
- </ul>
-
- <p>
- You will be notified in case of any errors during the updated
- process, which results in not creating the <span class="code">MMP</span> or
- <span class="code">Bld.Inf</span> files.</p>
- </code></li>
- </code></code></code></code></code></ol>
- </div><code><code><code><code><code><code class="filename">
- <p>
- The following <span class="code">MMP</span> file generated by the wizard, shows how
- its content is organised using managed sections: </p>
- <h4 class="listing">// HelloCarbide.mmp</h4>
- <p class="listing">/*& START_BINARY_BUILD &*/<br>
- // NOTE Content in this section is auto-generated, any changes are overwritten in the next update process.<br>
- CAPABILITY READUSERDATA<br>
- TARGET HelloCarbide.exe<br>
- TARGETTYPE exe<br>
- UID 0x00000000 0xe4d95f85<br>
- VENDORID 0x00000000<br>
- SECUREID 0xE4D95F85<br>
- /*& END_BINARY_BUILD &*/</p>
- <p class="listing">/*& START_SEARCH_PATHS &*/<br>
- // NOTE Content in this section is auto-generated, any changes are overwritten in the next update process.<br>
- SYSTEMINCLUDE \epoc32\include \epoc32\include\variant \epoc32\include\oem<br>
- USERINCLUDE ..\inc ..\data<br>
- /*& END_SEARCH_PATHS &*/</p>
- <p class="listing">/*& START_PROJECT_CONTENT &*/<br>
- // NOTE Content in this section is auto-generated, any changes are overwritten in the next update process.<br>
- SOURCEPATH ..\data<br>
- START RESOURCE HelloCarbide.rss<br>
- TARGETPATH resource\apps<br>
- HEADER<br>
- END<br>
- START RESOURCE HelloCarbide_reg.rss<br>
- TARGETPATH private\10003a3f\apps<br>
- HEADER<br>
- END<br>
- SOURCEPATH ..\src<br>
- SOURCE Waving.cpp HelloCarbideDocument.cpp HelloCarbideApplication.cpp<br>
- SOURCE HelloCarbideAppView.cpp HelloCarbideAppUi.cpp HelloCarbide.cpp<br>
- /*& END_PROJECT_CONTENT &*/</p>
- <p class="listing">/*& START_LINKAGE_INFORMATION &*/<br>
- // NOTE Content in this section is auto-generated, any changes are overwritten in the next update process.<br>
- LIBRARY euser.lib apparc.lib cone.lib eikcore.lib avkon.lib commonengine.lib<br>
- LIBRARY efsrv.lib estor.lib<br>
- /*& END_LINKAGE_INFORMATION &*/</p>
- <div id="footer">Copyright © 2010 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></div>
-
- </code></code></code></code></code></code></body>
-</html>
-
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html Wed Jul 21 12:11:48 2010 -0500
@@ -49,58 +49,62 @@
<ol>
<li>
Click File > Import... to get a list of available import wizards</li>
- <li>Select Symbian OS Bld.inf file and click Next to go to the Import Bld.inf page
- <div class="Figure">
-
- <p class="Image"><img src="../images/import1.gif" alt="" width="373" height="419" border="0" /></p>
- </div>
+ <li>Select Symbian OS > Symbian OS Bld.inf file and click Next to go to the Import Bld.inf page
+ <div class="Figure"></div>
</li>
- <li>
- Type the location of the bld.inf file to import, or browse to the file using the Browse button. </li>
-
- <p class="Image"><img src="images/file_import.png" alt="file import" width="521" height="391"></p>
- <p class="note"><strong>NOTE</strong> There will be two builders available in Carbide, one for SBSv1 (current version of Symbian Build System) and one for SBSv2 (newer version). The Builder option will only be displayed when a SBSv2 installation is detected.</p>
- <p class="Image">SBSv2 only works with recent versions of Symbian OS9.5. Both SBSv1 and SBSv2 are GNU make based build systems. SBSv1 uses Perl to generate make files, while SBSv2 uses Python. Select the appropriate builder for your project.</p>
- When building for SBSv2, the builder will set EPOCROOT to the absolute path (including drive letter) to the kit for the active build configuration. It will also add the path to the sbs bin directory to the start of the PATH variable. This is derived from the SBS_HOME environment variable.<p class="Image">For SBSv2, all build configurations (platform/target), including the built-in platforms (WISNCW, ARMV5), are declared in xml files in the \sbs\lib\config directory. The Build Configurations selection page will display only those kits known to support SBSv2.</p>
- <li> Click Next to select the recognized SDKs and Build Configurations to be created for this project
- <p>The SDKs and Build Configurations shows a tree of
- the SDKs that are available to be used, and for each SDK, the type of build configurations
- that are available. You can select a single SDK if you are developing the program
- for just one version of a platform, or multiple SDKs if your
- program is to be built against multiple platforms or operating system
- versions.</p>
- <p class="note"><b>NOTE</b> The platforms listed are dependent upon the filter settings in the <a href="sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a>.</p>
- <p></p>
- <div class="Figure">
- <p class="Image"><img src="../images/import3.gif" alt="" width="448" height="410" border="0" /></p>
- </div>
- </li>
- <li value="5"> Click Next to select the mmp and extension make files
- <div class="Figure">
- <p>One MMP file must be selected in order to continue. If the bld.inf file contains more than three MMP files, just select the MMP files you need to import. If there are three or less MMP files, then all are selected for importing.</p>
- <p class="Image"><img src="../images/import4.gif" alt="" width="521" height="550" border="0" /></p>
- </div>
- </li>
- <li>Click Next to enter the Project name and root directory</li>
- <p>When creating a project, project files are created in the root directory. Carbide.c++ creates additional files for each project. They consist of:</p>
- <ul>
- <li>.project - an xml file that provides a project description </li>
- <li>.cproject - an xml file that provides additional project information </li>
- <li>.settings folder - contains files that provide build configuration and preference settings </li>
- </ul>
- <p>The root directory is a path to the root of your project. All necessary tool components, developer libraries, and information about the SDK are stored in subdirectories under this root. The whole path leading to the SDK root directory must be declared to the Windows system via the Environment Variables settings. The variable name is EPOCROOT and the variable value is the full path where a Symbian OS SDK is installed in the Windows system.</p>
- <p>The root directory should contain all project related files that you want to work with in Carbide. The default directory is calculated by parsing the bld.inf file and mmp file(s).</p>
- <p class="Image"><img src="../images/import5.gif" alt="" width="518" height="313" border="0" /></p>
-
- <li> Click Finish to import the project
- <p>
- The
- wizard creates the project in the C/C++ Projects view, where it can be built and edited as normal. If the wizard is unable to read the project files, then the page
- describes the error that occurred. If an error occurs, you must fix the project file, and then
- re-import the bld.inf.</p>
- </li>
- </ol>
+ </ol>
+ <blockquote>
+ <p><img src="../reference/images/import_bld_inf_01.png" alt="Select Symbian bld.inf file to import" width="525" height="550"></p>
+ </blockquote>
+ <ol start="3">
+ <li>
+ Type the location of the bld.inf file to import, or browse to the file using the Browse button. </li>
+ <p class="Image"><img src="../reference/images/import_bld_inf_02.png" alt="Select bld.inf file to import" width="573" height="550"></p>
+ <p class="note"><strong>NOTE</strong> Depending upon which SDKs are installed, you may see both SBSv1 and SBSv2 builders available. It is recommended that SBSv2 be the primary choice as SBSv1 has been deprecated for future Symbian OS development.</p>
+ <p class="Image">SBSv2 works with recent versions of Symbian^3 and Symbian ^4 SDKs. Both SBSv1 and SBSv2 are GNU make based build systems. SBSv1 uses Perl to generate make files, while SBSv2 uses Python. Select the appropriate builder for your project.</p>
+ When building for SBSv2, the builder will set <span class="code">EPOCROOT</span> to the absolute path (including drive letter) to the kit for the active build configuration. It will also add the path to the sbs bin directory to the start of the <span class="code">PATH</span> variable. This is derived from the SBS_HOME environment variable.
+ <p class="Image">For SBSv2, all build configurations (platform/target), including the built-in platforms (WINSCW, ARMV5), are declared in xml files in the <span class="code">\sbs\lib\config</span> directory. The Build Configurations selection page displays only kits known to support SBSv2.</p>
+ <li> Click Next to select the recognized SDKs and Build Configurations to be created for this project
+ <blockquote>
+ <p>The SDKs and Build Configurations shows a tree of
+ the SDKs that are available to be used, and for each SDK, the type of build configurations
+ that are available. You can select a single SDK if you are developing the program
+ for just one version of a platform, or multiple SDKs if your
+ program is to be built against multiple platforms or operating system
+ versions.</p>
+ </blockquote>
+ </li>
+ </ol>
+ <blockquote>
+ <p class="note"><b>NOTE</b> The platforms listed are dependent upon the filter settings in the <a href="sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a>.</p>
+ <p><img src="../reference/images/import_bld_inf_03.png" alt="Symbian OS SDKs page" width="573" height="550"></p>
+ </blockquote>
+ <ol>
+ <li value="5"> Click Next to select the mmp and extension make files
+ <div class="Figure">
+ <p>One MMP file must be selected in order to continue. If the bld.inf file contains more than three MMP files, just select the MMP files you need to import. If there are three or less MMP files, then all are selected for importing.</p>
+ <p class="Image"><img src="../reference/images/import_bld_inf_04.png" alt="" width="573" height="550" border="0" /></p>
+ </div>
+ </li>
+ <li>Click Next to enter the Project name and root directory</li>
+ <p>When creating a project, project files are created in the root directory. Carbide.c++ creates additional files for each project. They consist of:</p>
+ <ul>
+ <li>.project - an xml file that provides a project description </li>
+ <li>.cproject - an xml file that provides additional project information </li>
+ <li>.settings folder - contains files that provide build configuration and preference settings </li>
+ </ul>
+ <p>The root directory is a path to the root of your project. All necessary tool components, developer libraries, and information about the SDK are stored in subdirectories under this root. The whole path leading to the SDK root directory must be declared to the Windows system via the Environment Variables settings. The variable name is <span class="code">EPOCROOT</span> and the variable value is the full path where a Symbian OS SDK is installed in the Windows system.</p>
+ <p>The root directory should contain all project related files that you want to work with in Carbide. The default directory is calculated by parsing the bld.inf file and mmp file(s).</p>
+ <p class="Image"><img src="../reference/images/import_bld_inf_05.png" alt="" width="573" height="550" border="0" /></p>
+ <li> Click Finish to import the project
+ <p>
+ The
+ wizard creates the project in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view, where it can be built and edited as normal. If the wizard is unable to read the project files, then the page
+ describes the error that occurred. If an error occurs, you must fix the project file, and then
+ re-import the bld.inf.</p>
+ </li>
+ </ol>
</div>
<h5>Related concepts</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ModifyingResources.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/ModifyingResources.html Wed Jul 21 12:11:48 2010 -0500
@@ -9,10 +9,8 @@
<p>
- This section describes the steps for adding and modifying resources of an
- existing project. The resources may be a bitmap resource (MBM) or an
- application information file (AIF) definition file.
- </p>
+ This section describes the steps for adding and modifying bitmap resources (MBM) of an
+ existing project. </p>
<p>
Note that the Symbian OS plug-ins do not provide a graphical editor for the
Symbian OS resource (.rss) file format. Files of this type though
@@ -20,7 +18,6 @@
resource compiler.</p>
<ul>
<li><a href="Multi-BitmapFile.html">Creating an MBM File</a></li>
-<li><a href="AppInfoFile.html">Creating an AIF File</a></li>
</ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/code_style_reformatting_sources.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/code_style_reformatting_sources.htm Wed Jul 21 12:11:48 2010 -0500
@@ -14,8 +14,8 @@
<li>Open an editor view with the source file you want to reformat</li>
<li>Right-click and choose <b>Source > Format</b> (<span class="code">CTRL+SHIFT+F</span>)</li>
</ol>
- <p align="center"><img src="images/menu_reformat_source_file.png" width="444" height="431" /></p>
- <p align="center" class="figure">Figure 1 -Selecting Source > Format from an editor view </p>
+ <p align="center"><img src="images/menu_reformat_source_file.png" width="604" height="258" /></p>
+ <p align="center" class="figure">Figure 1 -Selecting Source > Format from within an editor view </p>
</div>
<h5>Related references </h5>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/code_style_workspace.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/code_style_workspace.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Code Styles preferences</title>
+<title>Setting the Workspace Code Style</title>
<link rel="StyleSheet" href="../../book.css" type="text/css"/>
</head>
<body>
@@ -7,8 +7,8 @@
<p>You can set the default code style for a workspace using the <img src="../images/command_link.png" alt="" width="16" height="12" border="0" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage)")'> Code Style</a> preference panel. Once set, the specified code style is applied to all new files and projects created in the workspace. To update a source file already in the workspace, see <a href="code_style_reformatting_sources.htm">Reformatting a Source File</a>.</p>
- <p align="center"><img src="../reference/images/wnd_pref_code_styles.png" width="627" height="544"></p>
- <p align="center" class="figure">Figure 1 -Select a profile from the Select a profile list</p>
+ <p align="center"><img src="../reference/images/wnd_pref_code_styles.png" width="658" height="562"></p>
+ <p align="center" class="figure">Figure 1 -Select a profile from the Select a profile list</p>
<p align="left">You can also create your own profiles based on the one's included with Carbide. Simply click <b>Edit</b> and change the options presented in the <b>Profile <<i>profile_name</i>></b> window that appears. </p>
<div class="step">
<h4>To set the workspace code style</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_01.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_01.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Installing PERL</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Installing PERL</h2>
-<p>PERL is required for many Symbian OS utilities and commands.</p>
-<div class="step">
-<h4><a name="runPerl" id="runPerl"> </a>Installing PERL</h4>
-<ul>
- <li>Install ActivePERL version 5.6.1 b638</li>
-</ul>
-<blockquote>
- <p>Software can be downloaded from: <a href="http://www.activestate.com/Products/ActivePerl/">http://www.activestate.com/Products/ActivePerl/</a>.</p>
- <p class="note"><b>NOTE</b> Later releases of Perl are not yet supported by the Symbian utilities and can cause unknown compiling errors. </p>
- </blockquote>
-</div>
-<h5>Other references</h5>
-<ul>
- <li><a href="run_mode_debug.htm">Run Mode On-Device Debugging</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Installing Perl</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Installing Perl</h2>
+<p><a href="http://en.wikipedia.org/wiki/Perl">Perl</a> is a high-level, general-purpose, interpreted, dynamic programming language which many Symbian OS build utilities and commands require.</p>
+<div class="step">
+<h4><a name="runPerl" id="runPerl"> </a>Installing Perl</h4>
+<ul>
+ <li>Download and install ActivePerl version 5.6.1 b638</li>
+</ul>
+<blockquote>
+ <p>Software can be downloaded from: <a href="http://www.activestate.com/Products/ActivePerl/">http://www.activestate.com/Products/ActivePerl/</a>.</p>
+ <p class="note"><b>NOTE</b> Later releases of Perl are not yet supported by the Symbian utilities and can cause unknown compiling errors. </p>
+ </blockquote>
+</div>
+<h5>Other references</h5>
+<ul>
+ <li><a href="../../projects/tutorials/run_mode_debug_example_01.htm">Verify System Setup (Run-mode) Tutorial</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,61 +1,59 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Installing an SDK</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Installing an SDK</h2>
-<p>To create projects an SDK must be installed. If more than one SDK is installed one must be specified as the default.</p>
-<div class="step">
-<h4><a name="runSDK" id="runSDK"> </a>Installing an SDK</h4>
-<p>The following SDKs can be downloaded from Nokia at: <a href="http://www.forum.nokia.com/Tools_Docs_and_Code/">http://www.forum.nokia.com/</a>.</p>
-<ol>
- <li>Install at least one of the following SDKs using the install directions that accompany the SDK:
- <ul>
- <li>Series 60 5.0</li>
- <li>Qt for S60</li>
- <li>Series80</li>
- <li>Series 60 cust kits</li>
- <li>Techview Development kits</li>
- </ul>
- </li>
- <li>Set the default SDK to use for projects
- <ol type="A">
- <li>In Carbide.c++
- <ol type="i">
- <li>Click Window > Preferences > Carbide.c++ > SDK Preferences to open the SDK Preferences panel</li>
- <li>Select the SDK and click SDK Properties to open the SDK Properties dialog</li>
- <li>Set the Default SDK value to Yes</li>
- <li>Close all the dialogs</li>
- </ol>
- </li>
- <li>In a command-line prompt:
- <ol type="i">
- <li>Set the default device devkit by typing on the command line:<br>
- <br />
- > <span class="code">devices –setdefault @device id: name</span></li>
- <p>The device id and name can be found in the devices.xml file. For example, for a Techview 9.2 kit you might type<br>
- <br />
- <span class="code">> devices –setdefault @ SymbianOS_92_2006_wk40:com.symbian.techview</span></p>
- <li>Now ensure the default device is set by entering:<br>
- <br />
- > <span class="code">devices</span></li>
- </ol>
- </li>
- <li>Make sure the correct SDK default is set.</li>
- </ol>
- </li>
- </ol>
- </div>
-
-<h5>Other references</h5>
-<ul>
- <li><a href="run_mode_debug.htm">Run Mode On-Device Debugging</a> </li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Installing an SDK</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Installing an SDK</h2>
+<p>To create projects an SDK must be installed. If more than one SDK is installed one must be specified as the default.</p>
+<div class="step">
+<h4><a name="runSDK" id="runSDK"> </a>Installing an SDK</h4>
+<p>The following SDKs can be downloaded from Nokia at: <a href="http://www.forum.nokia.com/Tools_Docs_and_Code/">http://www.forum.nokia.com/</a>.</p>
+<ol>
+ <li>Install at least one of the following SDKs using the install directions that accompany the SDK:
+ <ul>
+ <li>Nokia Symbian^3</li>
+ <li>Nokia Qt for SDK 1.0</li>
+ <li>S60 5th Edition v1.0</li>
+ </ul>
+ </li>
+ <li>Set the default SDK to use for projects
+ <ol type="A">
+ <li>In Carbide.c++
+ <ol type="i">
+ <li>Click Window > Preferences > Carbide.c++ > SDK Preferences to open the SDK Preferences panel</li>
+ <li>Select the SDK and click SDK Properties to open the SDK Properties dialog</li>
+ <li>Set the Default SDK value to Yes</li>
+ <li>Close all the dialogs</li>
+ </ol>
+ </li>
+ <li>In a command-line prompt:
+ <ol type="i">
+ <li>Set the default device devkit by typing on the command line:<br>
+ <br />
+ > <span class="code">devices –setdefault @device id: name</span></li>
+ <p>The device id and name can be found in the devices.xml file. For example, for a Techview 9.2 kit you might type<br>
+ <br />
+ <span class="code">> devices –setdefault @ SymbianOS_92_2006_wk40:com.symbian.techview</span></p>
+ <li>Now ensure the default device is set by entering:<br>
+ <br />
+ > <span class="code">devices</span></li>
+ </ol>
+ </li>
+ <li>Make sure the correct SDK default is set.</li>
+ </ol>
+ </li>
+ </ol>
+</div>
+
+<h5>Other references</h5>
+<ul>
+ <li><a href="../../projects/tutorials/run_mode_debug_example_01.htm">Verify System Setup (Run-mode) Tutorial</a><a href="run_mode_debug.htm"></a> </li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_03.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_03.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,49 +1,49 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Configuring Environment Variables</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Configuring Environment Variables</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<div class="step">
-<h4><a name="runEnvVars" id="runEnvVars"> </a>Configuring Environment Variables</h4>
-<ol>
- <li>Set EPOCROOT variable
- <ol type="a">
- <li>Right click on My Computer and select Properties</li>
- <li>Select the Advanced tab</li>
- <li>Select the Environmental Variables button</li>
- <li>Setup a new System variable called EPOCROOT. The value will depend on the path of the epoc32 folder in the kit, for example: </li>
- <p>Variable name: <span class="code">EPOCROOT</span><br />
- Variable value: <span class="code">\bin\techview\</span></p>
- </ol>
- </li>
- <p class="note"><b>NOTE</b> Take note of the location of the epoc32 folder when using multiple kits. Some kits place the epoc32 folder at \bin\techview\ and some kits will place it at the root. If you have multiple installations and switch to a new kit, you will need to change the EPOCROOT path; otherwise build problems may occur. When building the ROM image, scripts may complain about the EPOCROOT path or that it can’t find bldmake.bat if an incorrect EPOCROOT path is set.</p>
- <li>Set Path to Tools Directory
- <ol type="a">
- <li>If using an installer the tools path is set up automatically and points to:</li>
- Variable: <span class="code">PATH</span><br>
- Value: <span class="code">C:\Program Files\Common Files\Symbian\Tools</span>
- <li>If installing from zip files you will need to setup the tools path manually. Add the path to the beginning of the PATH variable:</li>
- Variable: <span class="code">PATH</span><br />
- Variable Value: <span class="code">\epoc32\tools;\epoc32\gcc\bin;</span>
- <li>If using multiple kits that use a mix of installer and zip files then you can set up your PATH variable like this:</li>
- Variable: <span class="code">PATH</span><br />
- Value: <span class="code">\epoc32\tools;\epoc32\gcc\bin;C:\Program Files\Common Files\Symbian\Tools</span>
- </ol>
- </li>
- </ol>
-</div>
-<h5>Other references</h5>
-<ul>
- <li><a href="run_mode_debug.htm">Run Mode On-Device Debugging</a> </li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Configuring Environment Variables</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Configuring Environment Variables</h2>
+<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
+<div class="step">
+<h4><a name="runEnvVars" id="runEnvVars"> </a>Configuring Environment Variables</h4>
+<ol>
+ <li>Set EPOCROOT variable
+ <ol type="a">
+ <li>Right click on My Computer and select Properties</li>
+ <li>Select the Advanced tab</li>
+ <li>Select the Environmental Variables button</li>
+ <li>Setup a new System variable called EPOCROOT. The value will depend on the path of the epoc32 folder in the kit, for example: </li>
+ <p>Variable name: <span class="code">EPOCROOT</span><br />
+ Variable value: <span class="code">\bin\techview\</span></p>
+ </ol>
+ </li>
+ <p class="note"><b>NOTE</b> Take note of the location of the epoc32 folder when using multiple kits. Some kits place the epoc32 folder at \bin\techview\ and some kits will place it at the root. If you have multiple installations and switch to a new kit, you will need to change the EPOCROOT path; otherwise build problems may occur. When building the ROM image, scripts may complain about the EPOCROOT path or that it can’t find bldmake.bat if an incorrect EPOCROOT path is set.</p>
+ <li>Set Path to Tools Directory
+ <ol type="a">
+ <li>If using an installer the tools path is set up automatically and points to:</li>
+ Variable: <span class="code">PATH</span><br>
+ Value: <span class="code">C:\Program Files\Common Files\Symbian\Tools</span>
+ <li>If installing from zip files you will need to setup the tools path manually. Add the path to the beginning of the PATH variable:</li>
+ Variable: <span class="code">PATH</span><br />
+ Variable Value: <span class="code">\epoc32\tools;\epoc32\gcc\bin;</span>
+ <li>If using multiple kits that use a mix of installer and zip files then you can set up your PATH variable like this:</li>
+ Variable: <span class="code">PATH</span><br />
+ Value: <span class="code">\epoc32\tools;\epoc32\gcc\bin;C:\Program Files\Common Files\Symbian\Tools</span>
+ </ol>
+ </li>
+ </ol>
+</div>
+<h5>Other references</h5>
+<ul>
+ <li><a href="../../projects/tutorials/run_mode_debug_example_01.htm">Verify System Setup (Run-mode) Tutorial</a><a href="run_mode_debug.htm"></a> </li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_04.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_04.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Setup a Virtual Drive for Techview and Cust Kits</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Setup a Virtual Drive for Techview and Cust Kits (optional)</h2>
-<p>Techview Kits and cust kits have kernel components, kernel extensions and device drivers that are typically built on a virtual drive. So if you want to debug them the debugger will need to load files from the virtual drive that the binaries were built on. If you do not know the virtual drive the kit was built on you should first pick a drive letter randomly.</p>
-<div class="step">
- <h4><a name="runVirDrive" id="runVirDrive"> </a>Setup a Virtual Drive for Techview and Cust Kits</h4>
- <ol>
- <li>To subst a drive, type on a command line:<br />
- > subst <span class="question">drive_letter:</span> <span class="question">path_to_kit<br />
- </span>For example:<br />
-><span class="code"> subst M: C:\Symbian\S60_3_0_200626</span></li>
- <li>On the command line type:<br />
-><span class="code">subst</span><br />
- <p>You should see the new virtual drive pointing to your kit. If the debugger tries to load a file it can’t find, it will look for it on the virtual drive. You can see this in the stack crawl. The stack crawl should give the full path of the file on the virtual drive the file was built on. The debugger will not be able to load the file until the correct virtual drive is specified.</p>
- <p>If this happens you can redo the virtual drive to use the drive specified in the stack crawl or navigate to the file using the existing virtual drive. From that point the IDE will add that path and recursively check folders for files it needs.</p>
- </li>
- <li>Make sure when you set up your default SDK in the Carbide IDE that you use the virtual drive.</li>
- </ol>
-</div>
-<h5>Other references</h5>
-<ul>
- <li><a href="run_mode_debug.htm">Run Mode On-Device Debugging</a> </li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Setup a Virtual Drive</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Setup a Virtual Drive (optional)</h2>
+<p>SDKs have kernel components, kernel extensions and device drivers that are typically built on a virtual drive. So if you want to debug them the debugger will need to load files from the virtual drive that the binaries were built on. If you do not know the virtual drive the kit was built on you should first pick a drive letter randomly.</p>
+<div class="step">
+ <h4><a name="runVirDrive" id="runVirDrive"> </a>Setup a Virtual Drive for SDKs</h4>
+ <ol>
+ <li>To subst a drive, type on a command line:<br />
+ > subst <span class="question">drive_letter:</span> <span class="question">path_to_kit<br />
+ </span>For example:<br />
+><span class="code"> subst M: C:\Symbian\S60_5_0_201012</span></li>
+ <li>On the command line type:<br />
+><span class="code">subst</span><br />
+ <p>You should see the new virtual drive pointing to your kit. If the debugger tries to load a file it can’t find, it will look for it on the virtual drive. You can see this in the stack crawl. The stack crawl should give the full path of the file on the virtual drive the file was built on. The debugger will not be able to load the file until the correct virtual drive is specified.</p>
+ <p>If this happens you can redo the virtual drive to use the drive specified in the stack crawl or navigate to the file using the existing virtual drive. From that point the IDE will add that path and recursively check folders for files it needs.</p>
+ </li>
+ <li>Make sure when you set up your default SDK in the Carbide IDE that you use the virtual drive.</li>
+ </ol>
+</div>
+<h5>Other references</h5>
+<ul>
+ <li><a href="../../projects/tutorials/run_mode_debug_example_01.htm">Verify System Setup (Run-mode) Tutorial</a><a href="run_mode_debug.htm"></a> </li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm Wed Jul 21 12:11:48 2010 -0500
@@ -18,7 +18,7 @@
<p>or</p>
<li>Select Run > Debug from the menu bar </li>
<p>Both of these methods create a new debug launch configuration if none previously existed in the project or uses the last one launched for debugging. </p>
- <li>To launch using a specific debug launch configuration, right-click the project's EXE file in the C/C++ Projects view and select Debug As > <em>Project_Name</em> from the C/C++ Projects context menu</li>
+ <li>To launch using a specific debug launch configuration, right-click the project's EXE file in the Project Explorer view and select Debug As > <em>Project_Name</em> from the Project Explorer context menu</li>
</ul>
<ul>
<p>The debugger assumes control of the program execution as the program runs.</p>
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/menu_reformat_source_file.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/index.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/index.html Wed Jul 21 12:11:48 2010 -0500
@@ -36,15 +36,12 @@
<p>
You can then add and build code in the project. This is mostly done using
the standard CDT tools and techniques. The plug-ins through also offer special
- support for the Symbian OS specific file formats for application information
- files (AIF) and multi-bitmap files (MBM), as described in <i>Modifying
- Resources</i>.
- </p>
+ support for the Symbian OS specific file formats and multi-bitmap files (MBM), as described in <i>Modifying
+ Resources</i>. </p>
<ul>
<li><a href="WorkingwithSDKs.html">Working with SDKs</a></li>
<li><a href="CreatingNewProjects.html">Creating New Projects</a></li>
<li><a href="ImportingProjects.html">Importing Projects from a Bld.Inf File</a></li>
-<li><a href="ExportingtoMMP_BLDinf.html">Exporting Project(s) to MMP/Bld.inf Files </a></li>
<li><a href="AddingClasses.html">Adding Classes</a></li>
<li><a href="ModifyingResources.html">Modifying Resources</a></li>
<li><a href="projects/prj_build.htm">Building Projects</a></li>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/installing_extensions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Installing Extensions</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+
+<body>
+<h2>Installing Extensions</h2>
+
+<p>Use the <strong>Install Extensions</strong> page in the <a href="../reference/view_carbide_portal.htm">Carbide Portal</a> view to find, select, download, and install Carbide extensions to your work environment.</p>
+<div class="step">
+ <h4><strong>Installing one or more extension</strong>s</h4>
+ <ol>
+ <li>Select one or more extensions to install from the extensions list.
+ <ul>
+ <li>Click to checkmark an extension to mark it for installation, or</li>
+ <li>Click Check all items to mark all extensions for installation</li>
+ </ul>
+ </li>
+
+ <li>Click the Install Checked Items... option.</li>
+ </ol>
+ <p>Carbide then downloads and installs the selected extensions to your work environment. A restart of Carbide may be required to completely load the new features.</p>
+</div>
+<h4>Other references</h4>
+<ul>
+ <li><a href="../reference/view_carbide_portal.htm">Carbide Portal</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+</body>
+</html>
+
\ No newline at end of file
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/add_build_config_manage_wnd.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/clean.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/panel_active_config.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_add_sos_class_03.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_add_sos_class_04.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_add_sos_class_05.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_add_sos_class_06.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_add_sos_class_07.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_new_sos_class_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_new_sos_class_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_new_sos_class_03.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_new_sos_class_04.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wiz_new_sos_class_05.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/wnd_add_build_config_manager.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_adding_symbian_class.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_adding_symbian_class.htm Wed Jul 21 12:11:48 2010 -0500
@@ -15,24 +15,24 @@
<ol class="figure">
<li>Right-click the project name and select the New > Symbian OS C++ Class menu item.</li>
<p>The <b>New Symbian OS C++ Class</b> wizard appears showing the <b>Select project</b> page (Figure 1).</p>
- <p align="center"><img src="images/wiz_add_sos_class_03.png" width="388" height="404" /></p>
+ <p align="center"><img src="images/wiz_new_sos_class_01.png" width="624" height="500" /></p>
<p class="figure">Figure 1 - Symbian OS C++ Class wizard window</p>
<li>Select the project to add the new class to, then click Next.</li>
<p>The <b>Name and Location</b> page appears (Figure 2). </p>
- <p align="center"><img src="images/wiz_add_sos_class_05.png" alt="location" width="531" height="319" /></p>
+ <p align="center"><img src="images/wiz_new_sos_class_02.png" width="624" height="500"></p>
<p class="figure">Figure 2 - Name and Location page</p>
<li>Enter class name and header and source directory information, and optionally enable filenames to be lowercase, then click Next.</li>
<p>The <b>Select a type of class</b> page appears (Figure 3). </p>
- <p align="center"><img src="images/wiz_add_sos_class_04.png" alt="template" width="388" height="404" /></p>
+ <p align="center"><img src="images/wiz_new_sos_class_03.png" width="624" height="500"></p>
<p class="figure">Figure 3 - <b>Select a type of class</b> page</p>
<li>Click a class template to use for the new class, then click Next.</li>
<p>The <b>Other Settings</b> page appears (Figure 4).</p>
- <p align="center"><img src="images/wiz_add_sos_class_06.png" width="419" height="420" /></p>
+ <p align="center"><img src="images/wiz_new_sos_class_04.png" width="624" height="500"></p>
<p class="figure">Figure 4 - Other Settings page</p>
<li>Enter Author and Copyright information, then click Finish. </li>
- <p>The new defined Symbian-based class titled <span class="code">NewClass</span>, is added to the project and appears in the src folder (Figure 5). </p>
- <p align="center"><img src="images/wiz_add_sos_class_07.png" width="279" height="436" /></p>
- <p class="figure">Figure 5 -New class appears in C/C++ Projects list inside the project </p>
+ <p>The new defined Symbian-based class titled <span class="code">SOSClassName</span> is added to the project and appears in the src folder (Figure 5). </p>
+ <p align="center"><img src="images/wiz_new_sos_class_05.png" width="281" height="390"></p>
+ <p class="figure">Figure 5 -New class appears in Project Explorer list inside the project </p>
</ol>
</div>
<h5>Related tasks</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,83 +1,83 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Building Projects</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Building Projects and Symbian Components </h2>
-<p>Building projects consists of a new abld-based build system that wraps build functionality around existing SDK build tools that invoke <span class="code">makmake</span> commands (e.g. <span class="code">bldmake bldfiles</span> and <span class="code">abld build</span>).</p>
-<p> The plug-ins provide extra functionality to set up suitable build configurations for Symbian OS C++ projects. The initial selection of a build configuration is done when you create a project, as described in <a href="../CreatingNewProjects.html">Creating New Projects</a>. You can later <a href="prj_set_build_tgt.htm">change</a> the Active Build Configuration. The Build Configurations also provides a command (<b>Project > <a href="../../reference/menus/build_all_targets.htm">Build All Configurations</a></b>) to build all the selected build configurations in a batch.</p>
-<p> Building Symbian OS C++ projects can involve the use of Symbian OS specific tools, such as the Symbian OS resource compiler. For detailed information on such tools, see the documentation for the SDK that you are using.</p>
-<p>You build projects to process the source files that comprise a program and
- generate object code. The compiler flags syntax errors in the source files. Use the <a href="../../reference/ProjectPreferences.html">Properties for <project_name> </a> window to control how the project is built. The following methods build a project:</p>
-<ul><li><b>Build All Configurations</b>—builds all build configurations for a project</li>
- <li><b>Build Working Set</b>—specify which projects to build in a working set </li>
- <li><b>Build Project</b>—(CTRL+B) builds the entire project if it has never been built before or on subsequent builds only those files that have changed since the last build operation</li>
-</ul>
-<p align="center"><img src="images/menu_build_project.png" width="359" height="341" /></p>
-<p class="figure">Figure 1 - Right-click project name to build a project </p>
-<div class="step">
- <h4>Building a Project</h4>
- <ul>
- <li>Right-click the project name in the Project Explorer view and select Build Project (Figure 1) </li>
- </ul>
- <ol>
- <p></p>
- or
- </ol>
- <ul>
- <li>Select the Project > Build Project menu item </li>
- </ul>
- <ul>
- <p></p>
- or
- </ul>
- <ul>
- <li>Click the Build icon in the tool bar (Figure 2) to build the current build configuration </li>
- <p align="center"><img src="images/wnd_build_config_select_tgt.png" width="341" height="128" /></p>
- <p class="figure">Figure 2 - Build icon </p>
- <p>or
- </p>
- </ul>
- <ul>
- <li>Select a build configuration using the Build icon’s dropdown list in the tool bar (Figure 2)</li>
- </ul>
- <ol>
- <p>Carbide.c++ builds the project. A build dialog and a task bar appear during a build process. All build output is shown in the Console view while build errors and warnings appear in the Problems view.</p>
- <p>Whether a full build or incremental build is requested, Carbide forwards the request to the SDK make system. The SDK make system determines if anything needs to be
- built. Carbide always checks that makefiles are up-to-date and
- dependencies present.</p>
- <p>Project is also built if you make a change to it and then click <b>Debug</b>. It may be useful to automatically save modified resources before a manual build process by enabling the <b>Save automatically before build</b> option in the <b>Window > Preferences > General ></b> <img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'> Workspace</a> preference panel. </p>
- <p class="note"><b>NOTE</b> If you want to turn off building before launching, uncheck the <b>Build (if required) before launching</b> option in the <b>Window > Preferences > Run/Debug ><img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel.</p>
- </ol>
- <p>When performing a build, output is displayed in the Console window. If you do not want to clear the console before each build you need to uncheck the option <b>Always clear console before building</b> in the <b>Build Console</b> panel. This option is enabled by default. You can access this panel by selecting <b>Window > Preferences > C/C++ ><img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'> Build Console</a></b> preference panel (figure 2).</p>
- <p>Not clearing the console is useful when you are performing multiple builds, such as a regular project build, building a project package (.pkg) file, and building a ROM image. For example, if you do not clear the console before each build, then a subsequent build will not overwrite information from a previous build.</p>
-<p align="center"><img src="images/build_console.png" width="562" height="446" /></p>
-<p align="left" class="figure">Figure 4 - Build Console Preference Panel</p>
-<p> </p>
-</div>
- <h5>Concepts</h5>
- <ul>
- <li><a href="../../concepts/Projects.html">Projects</a></li>
-</ul>
- <h5>Tasks</h5>
- <ul>
- <li><a href="prj_clean.htm">Cleaning Projects</a> </li>
- <li><a href="../../reference/menus/compile_source.htm">Compile Source</a></li>
- <li><a href="../CreatingNewProjects.html">Creating Projects</a></li>
- <li><a href="prj_debug_config.htm">Creating a Launch Configuration</a></li>
- <li><a href="../start/carbide_debugging.htm">Debugging a Symbian OS Program</a></li>
- <li><a href="../../reference/menus/build_symbian_comp.htm">Build Symbian Component</a></li>
- <li><a href="../../reference/menus/clean_symbian_comp.htm">Clean Symbian Component</a></li>
- <li><a href="../../reference/menus/build_pkg_file.htm">Build Package (.pkg) File</a></li>
- <li><a href="../ImportingProjects.html">Importing BLD.INF Files</a></li>
- </ul>
- <div id="footer">Copyright © 2010 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></div>
-
-</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" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Building Projects</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Building Projects and Symbian Components </h2>
+<p>Building projects consists of a new abld-based build system that wraps build functionality around existing SDK build tools that invoke <span class="code">makmake</span> commands (e.g. <span class="code">bldmake bldfiles</span> and <span class="code">abld build</span>).</p>
+<p> The plug-ins provide extra functionality to set up suitable build configurations for Symbian OS C++ projects. The initial selection of a build configuration is done when you create a project, as described in <a href="../CreatingNewProjects.html">Creating New Projects</a>. You can later <a href="prj_set_build_tgt.htm">change</a> the Active Build Configuration. The Build Configurations also provides a command (<b>Project > <a href="../../reference/menus/build_all_targets.htm">Build All Configurations</a></b>) to build all the selected build configurations in a batch.</p>
+<p> Building Symbian OS C++ projects can involve the use of Symbian OS specific tools, such as the Symbian OS resource compiler. For detailed information on such tools, see the documentation for the SDK that you are using.</p>
+<p>You build projects to process the source files that comprise a program and
+ generate object code. The compiler flags syntax errors in the source files. Use the <a href="../../reference/ProjectPreferences.html">Properties for <project_name> </a> window to control how the project is built. The following methods build a project:</p>
+<ul><li><b>Build All Configurations</b>—builds all build configurations for a project</li>
+ <li><b>Build Working Set</b>—specify which projects to build in a working set </li>
+ <li><b>Build Project</b>—(CTRL+B) builds the entire project if it has never been built before or on subsequent builds only those files that have changed since the last build operation</li>
+</ul>
+<p align="center"><img src="images/menu_build_project.png" width="359" height="341" /></p>
+<p class="figure">Figure 1 - Right-click project name to build a project </p>
+<div class="step">
+ <h4>Building a project</h4>
+ <ul>
+ <li>Right-click the project name in the Project Explorer view and select Build Project (Figure 1) </li>
+ </ul>
+ <ol>
+ <p></p>
+ or
+ </ol>
+ <ul>
+ <li>Select the Project > Build Project menu item </li>
+ </ul>
+ <ul>
+ <p></p>
+ or
+ </ul>
+ <ul>
+ <li>Click the Build icon in the tool bar (Figure 2) to build the current build configuration </li>
+ <p align="center"><img src="images/wnd_build_config_select_tgt.png" width="321" height="69" /></p>
+ <p class="figure">Figure 2 - Build icon </p>
+ <p>or
+ </p>
+ </ul>
+ <ul>
+ <li>Select a build configuration using the Build icon’s dropdown list in the tool bar (Figure 2)</li>
+ </ul>
+ <ol>
+ <p>Carbide.c++ builds the project. A build dialog and a task bar appear during a build process. All build output is shown in the Console view while build errors and warnings appear in the Problems view.</p>
+ <p>Whether a full build or incremental build is requested, Carbide forwards the request to the SDK make system. The SDK make system determines if anything needs to be
+ built. Carbide always checks that makefiles are up-to-date and
+ dependencies present.</p>
+ <p>Project is also built if you make a change to it and then click <b>Debug</b>. It may be useful to automatically save modified resources before a manual build process by enabling the <b>Save automatically before build</b> option in the <b>Window > Preferences > General ></b> <img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'> Workspace</a> preference panel. </p>
+ <p class="note"><b>NOTE</b> If you want to turn off building before launching, uncheck the <b>Build (if required) before launching</b> option in the <b>Window > Preferences > Run/Debug ><img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel.</p>
+ </ol>
+ <p>When performing a build, output is displayed in the Console window. If you do not want to clear the console before each build you need to uncheck the option <b>Always clear console before building</b> in the <b>Build Console</b> panel. This option is enabled by default. You can access this panel by selecting <b>Window > Preferences > C/C++ ><img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'> Build Console</a></b> preference panel (figure 2).</p>
+ <p>Not clearing the console is useful when you are performing multiple builds, such as a regular project build, building a project package (.pkg) file, and building a ROM image. For example, if you do not clear the console before each build, then a subsequent build will not overwrite information from a previous build.</p>
+<p align="center"><img src="images/build_console.png" width="532" height="451" /></p>
+<p align="left" class="figure">Figure 4 - Build Console Preference Panel</p>
+<p> </p>
+</div>
+ <h5>Concepts</h5>
+ <ul>
+ <li><a href="../../concepts/Projects.html">Projects</a></li>
+</ul>
+ <h5>Tasks</h5>
+ <ul>
+ <li><a href="prj_clean.htm">Cleaning Projects</a> </li>
+ <li><a href="../../reference/menus/compile_source.htm">Compile Source</a></li>
+ <li><a href="../CreatingNewProjects.html">Creating Projects</a></li>
+ <li><a href="prj_debug_config.htm">Creating a Launch Configuration</a></li>
+ <li><a href="../start/carbide_debugging.htm">Debugging a Symbian OS Program</a></li>
+ <li><a href="../../reference/menus/build_symbian_comp.htm">Build Symbian Component</a></li>
+ <li><a href="../../reference/menus/clean_symbian_comp.htm">Clean Symbian Component</a></li>
+ <li><a href="../../reference/menus/build_pkg_file.htm">Build Package (.pkg) File</a></li>
+ <li><a href="../ImportingProjects.html">Importing BLD.INF Files</a></li>
+ </ul>
+ <div id="footer">Copyright © 2010 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></div>
+
+</body>
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_clean.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_clean.htm Wed Jul 21 12:11:48 2010 -0500
@@ -4,29 +4,53 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Building Projects</title>
+<title>Cleaning Projects</title>
<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
</head>
<body bgcolor="#FFFFFF">
<h2>Cleaning Projects</h2>
-<p>In the Project Explorer, C/C++ Projects, or Symbian Project Navigator views you can select a project, right-click and select <b>Clean Project</b> (CTRL+SHIFT+-) to remove the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
-<p>If you select a project and select the menu option <b>Project > Clean...</b> a <b>Clean</b> dialog will appear (Figure 1). You can clean all projects or select individual projects to clean. This method of cleaning projects performs the same operations as the <b>Clean Project</b> context menu option. If the <b>Start a build immediately</b> option is selected, then the selected project(s) are rebuilt after the clean operation.</p>
-<p align="center"><img src="images/clean.png" width="443" height="285" /></p>
-<p class="figure">Figure 1 - Clean Project Dialog</p>
+<p>In the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> or <a href="../../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> views you can select a project, right-click and select <b>Clean Project</b> (<span class="code">CTRL+SHIFT+-</span>) to remove the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
+<p>If you select a project and select the menu option <b>Project > Clean...</b> the <b>Clean</b> dialog appears (Figure 1). You can clean all projects or select individual projects to clean within the workspace. This method of cleaning projects performs the same operations as the <b>Clean Project</b> context menu option. If the <b>Start a build immediately</b> option is selected, then the selected project(s) are rebuilt after the clean operation.</p>
+<p align="center"><img src="images/clean.png" width="500" height="440" /></p>
+<p class="figure">Figure 1 - Clean project options</p>
<p>By default, performing a<b> Clean Project</b> complies with the global <b>Clean level</b> settings in the <a href="../../reference/wnd_build_prefs.htm">Build</a> preference panel and inherited by the project on creation. You can also assign project specific clean settings in the <span class="note"><a href="../../reference/build_properties/pane_project_settings.htm">Carbide Project Settings</a></span> panel in the <b>Properties for <<i>project</i>></b> dialog. </p>
-<h5>Concepts</h5>
- <ul>
- <li><a href="../../concepts/Projects.html">Projects</a></li>
-</ul>
- <h5>Tasks</h5>
+<h5>Table 1. Clean dialog — options</h5>
+ <table width="700" border="0" cellpadding="2" cellspacing="0">
+ <tr valign="top">
+ <th width="30%" class="Cell">Name</th>
+ <th width="70%" class="Cell">Function</th>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><p> <b>Clean all projects</b></p></td>
+ <td class="Cell"><p>Enable to clean all the projects in the workspace.</p></td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><p><b>Clean projects selected below</b></p></td>
+ <td class="Cell"><p>Enable to clean only the selected project(s).</p></td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><b>Start a build immediately</b></td>
+ <td class="Cell">Rebuild the selected project(s) immediately after a clean operation.</td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><b>Build the entire workspace</b></td>
+ <td class="Cell">Build the entire workspace once the clean operation is complete.</td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><strong>Build only the selected projects</strong></td>
+ <td class="Cell">Build only the selected projects once the clean operation is complete.</td>
+ </tr>
+ </table>
+ <h5>Other references</h5>
<ul>
<li><a href="../../reference/menus/compile_source.htm">Compile Source</a></li>
<li><a href="../CreatingNewProjects.html">Creating Projects</a></li>
<li><a href="../../reference/menus/build_symbian_comp.htm">Build Symbian Component</a></li>
<li><a href="../../reference/menus/clean_symbian_comp.htm">Clean Symbian Component</a></li>
<li><a href="../../reference/menus/build_pkg_file.htm">Build Package (.pkg) File</a></li>
+ <li><a href="../../concepts/Projects.html">Projects</a></li>
</ul>
- <div id="footer">Copyright © 2010 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></div>
+<div id="footer">Copyright © 2010 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></div>
</body>
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm Wed Jul 21 12:11:48 2010 -0500
@@ -21,7 +21,7 @@
<ul>
<li>For non-Platform Security SDKs (pre-OS 9.x), <span class="code">makesis</span> is called</li>
</ul>
-<p>Depending upon which tool is used, you will need to complete some entries in the<a href="../../reference/build_properties/pane_build_config_sis.htm"> SIS Builder</a> pane of the Carbide Build Configurations window of the project Properties dialog box. You can access this pane by selecting a project in the C/C++ Projects view and select <b>Project > Properties</b> > <b>Carbide Build Configurations</b>. Fill in the necessary information to add PKG files to the project for downloading. </p>
+<p>Depending upon which tool is used, you will need to complete some entries in the<a href="../../reference/build_properties/pane_build_config_sis.htm"> SIS Builder</a> pane of the Carbide Build Configurations window of the project Properties dialog box. You can access this pane by selecting a project in the Project Explorer view and select <b>Project > Properties</b> > <b>Carbide Build Configurations</b>. Fill in the necessary information to add PKG files to the project for downloading. </p>
<table width="88%" border="0" cellpadding="2" cellspacing="0">
<tr>
<th width="19%" scope="col">Tool</th>
@@ -38,7 +38,7 @@
<td><b>SIS Properties </b></td>
<td><div align="center">
<p align="left">Complete the PKG File, and Signing Options settings in the <a href="../../reference/build_properties/wnd_sis_properties.htm">SIS Properties</a> dialog. By default, SIS files are output in the directory of the original SIS file.</p>
- <p><img src="../../reference/images/wnd_sis_properties.png" width="375" height="452"></p>
+ <p><img src="../../reference/images/wnd_sis_properties.png" width="455" height="452"></p>
<p class="figure">Figure 2 - SIS Properties dialog </p>
</div></td>
</tr>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_config.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_config.htm Wed Jul 21 12:11:48 2010 -0500
@@ -42,7 +42,7 @@
<p>The appropriate Run or <a href="../../reference/wnd_debug_configuration.htm">Debug</a> launch configuration window appears (Figure 1).</p>
</li>
</ul>
- <p align="center"><img src="images/wnd_launch_configuration_blank.png" width="736" height="505" alt="Undefined launch configuration"/> </p>
+ <p align="center"><img src="images/wnd_launch_configuration_blank.png" width="709" height="455" alt="Undefined launch configuration"/> </p>
<p class="figure">Figure 1 - Initial blank Debug launch configuration window</p>
</li>
<li>Select a type of launch configuration (for example, Symbian OS Emulation), then click the New launch configuration icon to create a new
@@ -51,7 +51,7 @@
appropriate section using the project name and target to create the configuration name.</p>
<p class="note"><b>NOTE</b> Project information is used to fill in the <b>Project</b> and <b>Process to launch</b> text boxes by default when you click <b>New</b>. You should not have to edit these for a normal run/debug project. If a <span class="code">bld.inf</span> has multiple MMP files listed, then the first executable in the list is used to fill in the executable field. Therefore, for projects with multiple MMPs you may need to change the executable field. </p>
</li>
- <p align="center"><img src="images/run_config_new.png" width="819" height="539" alt="New launch configuration" /> </p>
+ <p align="center"><img src="images/run_config_new.png" width="787" height="489" alt="New launch configuration" /> </p>
<p class="figure">Figure 2 - New launch configuration with name and settings filled in (emulator)</p>
<li>View the information to define the project and executable
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_new_build_config.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_new_build_config.htm Wed Jul 21 12:11:48 2010 -0500
@@ -15,16 +15,16 @@
<ol>
<li>Open Carbide Build Configuration panel in the project's Properties window
<p>Select the <b>Project > Properties</b> menu item or right-click the project name in the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> view, then select <b>Properties</b>. The project <b>Properties for <em><project_name></em></b> window appears. Then select Carbide Build Configurations. </p>
- <p align="center"><img src="images/panel_active_config.png" width="695" height="291" alt=""/></p>
+ <p align="center"><img src="images/panel_active_config.png" width="801" height="350" alt=""/></p>
<p class="figure">Figure 1 - Active Configuration group in project Properties window </p></li>
<li>Click Manage... in the Active Configuration group (Figure 1)
<p>The <b>Add/Remove Carbide Build Configuration </b> window appears (Figure 2). Use the <b>Add/Remove Carbide Build Configuration</b> window to manage the build configurations that appear on the Build Configurations sub-menu for the current project. You can also click the <b>Manage configurations for the current project</b> icon (<img src="images/icon_manage_project_configs.png" width="16" height="16" align="absmiddle">) on the toolbar to open this dialog. </p>
</li>
- <li>
- <p align="center"><img src="images/add_build_config_manage_wnd.png" width="650" height="500" alt="" /></p>
+ </ol>
+ <p align="center"><img src="images/wnd_add_build_config_manager.png" width="650" height="500" alt="" /></p>
+ <blockquote>
<p class="figure">Figure 2 - Window for managing build configurations</p>
- </li>
- </ol>
+ </blockquote>
</div>
<h5>Related concepts</h5>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_set_build_tgt.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_set_build_tgt.htm Wed Jul 21 12:11:48 2010 -0500
@@ -16,7 +16,7 @@
<li>From the
toolbar
<ol>
- <li>Select the project in the Project Explorer or C/C++ Projects view </li>
+ <li>Select the project in the Project Explorer view </li>
<li>In the toolbar click Manage configurations for the current project control (<img src="../../images/icons/toolbar_manage_configs.png" width="29" height="16" align="absmiddle">) > <i>configuration_name</i></li>
</ol>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm Wed Jul 21 12:11:48 2010 -0500
@@ -10,28 +10,28 @@
<body bgcolor="#FFFFFF">
<h2>Debugging a Symbian OS Program</h2>
<p>Use the Carbide.c++ debugger to debug a compiled Symbian OS program in an emulator or on-device. The same process works for other emulators and target devices as well.</p>
-<p class="note"><b>NOTE</b> This example uses the emulator included with the S60 5th Edition SDK. The steps are identical for on-device debugging, although a <span class="code">.sym</span> file is not needed for emulator builds.</p>
+<p class="note"><b>NOTE</b> This example uses the Symbian Emulator included with the Symbian^3 SDK. The steps are identical for on-device debugging, although a <span class="code">.sym</span> file is not needed for emulator builds.</p>
<div class="step">
<h4>Debugging a Symbian OS program</h4>
<p class="note"><b>NOTE</b> You can only debug compiled programs. Use the <a href="../projects/prj_build.htm">Build Project</a> command to compile project sources into a binary file if you do not already have an executable in the project. A symbolics (<span class="code">.sym</span>) file is also required for debugging on a target device. Ensure that a <span class="code">.sym</span> file has been created. If you are importing an existing application, you may have to rebuild the application and create a related <span class="code">.sym</span> file. Make sure a <span class="code">.sym</span> file has been created in the output directory.</p>
<ol>
<li>Set a breakpoint in the MyProject program</li>
- <p>Open the <span class="code">\src\MyProjectAppUI.cpp</span> file and <a href="../breakpoints/pgm_bp_setting.htm">set a breakpoint</a> in the <span class="code">HandleCommandL</span> routine.</p>
- <p align="center"><img src="images/debug_set_breakpoint.png" width="707" height="253" /></p>
- <p class="figure">Figure 1 - Breakpoint set in MyProjectAppUI::HandleCommandL routine. </p>
- <li>Launch the Carbide debugger and S60 SDK Emulator</li>
- <p><a href="../../debugger/debug/cmds_starting.htm">Start</a> the Carbide debugger which launches the S60 SDK Emulator, installs and launches the executable. For on-device debugging, the application is installed on the target device.</p>
- <p>The HelloCarbide application launches (Figure 2). </p>
- <p align="center"><img src="images/debug_s60_emulator_04.png" width="465" height="811" /></p>
- <p class="figure">Figure 2 - MyProject application running on S60 Emulator </p>
+ <p>Open the <span class="code">\src\OortCloudAppUI.cpp</span> file and <a href="../breakpoints/pgm_bp_setting.htm">set a breakpoint</a> in the <span class="code">HandleCommandL</span> routine.</p>
+ <p align="center"><img src="images/debug_set_breakpoint.png" width="678" height="281" /></p>
+ <p class="figure">Figure 1 - Breakpoint set in COortCloudAppUI::HandleCommandL routine. </p>
+ <li>Launch the Carbide debugger and Symbian Emulator</li>
+ <p><a href="../../debugger/debug/cmds_starting.htm">Start</a> the Carbide debugger which launches the Symbian Emulator, then installs and launches the executable. For on-device debugging, the application is installed on the target device.</p>
+ <p>The OortCloud application launches (Figure 2). </p>
+ <p align="center"><img src="images/wnd_symbian_emulator_01.png" alt="Symbian Emulator" width="238" height="458"></p>
+ <p class="figure">Figure 2 - OortCloud application running on Symbian Emulator </p>
<p class="note"><b>NOTE</b> For SDKs prior to the S60 5th Edition it may be necessary to locate the installed application and manually launch it in the emulator or on the target device.</p>
- <li>Click the Options soft-key on the S60 Emulator to display the Options menu.</li>
+ <li>Click the Options soft-key on the Symbian Emulator to display the Options menu.</li>
<li>Choose the Message menu item and press the Select soft-key to send a message (Figure 3).</li>
- <p></p><p align="center"><img src="images/debug_s60_emulator_05.png" width="465" height="458" /></p>
- <p class="figure">Figure 3 - Send Message to MyProject application </p>
+ <p></p><p align="center"><img src="images/wnd_symbian_emulator_02.png" alt="Menu selection" width="378" height="431"></p>
+ <p class="figure">Figure 3 - Send Message to OortCloud application </p>
<p>The <span class="code">HandleCommandL</span> breakpoint is hit in the program and control returns to the Carbide debugger (Figure 4). You can now set additional breakpoints, examine variables, or use the <a href="../../debugger/debug/viewing_debug.htm">Debug</a> view buttons to control the program. </p>
- <p align="center"><img src="images/debug_s60_emulator_06.png" width="686" height="276" /></p>
- <p class="figure">Figure 4 - Back in the CMyProjectAppUI::HandleCommandL routine</p>
+ <p align="center"><img src="images/wnd_symbian_emulator_03.png" alt="Breakpoint hit" width="678" height="281"></p>
+ <p class="figure">Figure 4 - Back in the COortCloudAppUI::HandleCommandL routine</p>
</ol>
<p>That's it for this basic introduction to debugging with Carbide.c++.</p>
</div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_deploying.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_deploying.htm Wed Jul 21 12:11:48 2010 -0500
@@ -11,7 +11,7 @@
<h2>Deploying Programs to Devices</h2>
<p>Once you have completed the program and tested it with the emulator, it’s possible to create a <a href="../projects/prj_new_build_config.htm">new</a> build configuration for your device, <a href="../projects/prj_build.htm">build</a> it, then create a <span class="code">.sis</span> file and deploy it to a device.</p>
<p>To upload a valid <span class="code">.sis</span> file to the target device you need software that communicates with the target device from your PC. Every Symbian phone ships with this connectivity software, which we will refer to generically as Symbian Connect. The actual name for the software is vendor dependent, so refer to your phone’s documentation for the name.</p>
-<p>For example, most phones from Nokia that use Symbian OS come with <a href="http://europe.nokia.com/nokia/0,,72014,00.html">Nokia PC Suite</a>, which allows you to synchronize and transfer data between your compatible phone and a compatible PC via a compatible data cable or a wireless connection. </p>
+<p>For example, most phones from Nokia that use Symbian OS come with <a href="http://europe.nokia.com/support/download-software/nokia-ovi-suite">Ovi Suite</a><a href="http://europe.nokia.com/nokia/0,,72014,00.html"></a>, which allows you to synchronize and transfer data between your compatible phone and a compatible PC via a compatible data cable or a wireless connection. </p>
<p> Essentially, the Symbian Connect program provides a method of connecting a PC to the target device via USB, IrDA, Bluetooth, or other serial connection. Once you make a connection, you can upload your <span class="code">.sis</span> file to the target device and install the program. </p>
<p class="note"><b>NOTE</b> A simple guide is provided to show the basic steps necessary to upload a .sis file to a target device. The actual steps required by the specific Symbian Connect program that ships with the SDK you are using may differ, so always refer to that phone ’s documentation for details.</p>
<div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm Wed Jul 21 12:11:48 2010 -0500
@@ -15,7 +15,7 @@
<h4>Debugging a Run-mode Project using Application TRK </h4>
<ol>
<li>Import the Bld.inf to create a project using the Import wizard </li>
- <p>In this example we are importing a project called Music, a complex project that includes several EXEs (MusicPlayer, MusicShop, MusicVisualizer). When we import, we select an ARM target.</p>
+ <p>In this example we are importing a project called Music, a complex project that includes several EXEs (MusicPlayer, MusicShop, MusicVisualizer). For the import, we select an ARM target.</p>
<li>Go to the project Properties page and in the Carbide Build Configuration panel specify the PKG file in the <a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> tab </li>
<li>Build the project (Ctrl+B) </li>
<li>Verify that all the binaries built by the project appear in the <a href="../../reference/view_executables.htm">Executables</a> view. </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_requirements.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_requirements.htm Wed Jul 21 12:11:48 2010 -0500
@@ -4,16 +4,15 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide.c++ Installation</title>
+<title>System Requirements</title>
<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
</head>
<body bgcolor="#FFFFFF">
<h2>System Requirements</h2>
-<p>You use the Carbide.c++ IDE in conjunction with a recognized SDK to develop Symbian software.</p>
+<p>You use the Carbide.c++ IDE in conjunction with a recognized SDK to develop Symbian OS software.</p>
<p> In practice, whether you use an SDK, a developer kit (DevKit), or both depends on the edition of
Carbide.c++ you have (see Table 1). Further, if you use an OS devkit,
- it must be version 9.1b or higher for EKA2 with
- Platform Security support.</p>
+ it must use SBSv2.</p>
<h5>Table 1. Support packages used for development with each Carbide.c++ Editions </h5>
<table width="100%" border="0" cellpadding="3" cellspacing="0">
<tr>
@@ -26,12 +25,12 @@
<td rowspan="2" valign="middle"><p>An SDK or OS developer kit (DevKit) including:</p>
<ul><li>9.x or higher for Platform Security </li>
</ul></td>
- <td height="65"><p>Targets: S60 5th Ed., Qt</p>
+ <td height="65"><p>Targets: Symbian ^3, S60 5th Ed., Qt</p>
<p>Debugger: Emulators, on-device debugging</p>
<p>UI Designer: create graphical interfaces quickly using standard UI components</p></td>
</tr>
<tr>
- <td><p>Targets: S60 5th Ed., Qt</p>
+ <td><p>Targets: Symbian ^3, S60 5th Ed., Qt</p>
<p>Debugger: Emulators, on-device debugging, device debugging in ROM, kernel debugging </p>
<p>Performance Investigator: application performance data, memory usage, power usage, button event reporting </p></td>
</tr>
@@ -56,21 +55,19 @@
</tr>
<tr>
<th scope="row">Other Software </th>
- <td><p>A Symbian OS™ SDK and Perl:</p>
+ <td><p>A Symbian OS SDK and Perl:</p>
<ul>
- <li>S60 Platform SDKs (<a href="http://www.forum.nokia.com/Tools_Docs_and_Code/">http://www.forum.nokia.com/Tools_Docs_and_Code/</a>)
- <ul>
- <li>S60 5th Edition</li>
- <li>S60 3rd Edition, FP1</li>
- <li>S60 3rd Edition, MR </li>
- </ul>
- </li>
- <li>Qt
- (<a href="http://www.trolltech.com/">www.trolltech.com</a>)
- <ul>
- <li>Qt SDK for S60</li>
- </ul>
- </li>
+ <li>Nokia Qt SDK
+ <ul>
+ <li><a href="http://www.forum.nokia.com/Develop/Qt/">Nokia Qt SDK</a></li>
+ </ul>
+ </li>
+ </ul>
+ <ul>
+ <li>Symbian, S60 platform, and S60 device SDKs <ul><li><a href="http://www.forum.nokia.com/info/sw.nokia.com/id/ec866fab-4b76-49f6-b5a5-af0631419e9c/S60_All_in_One_SDKs.html">Symbian ^3</a></li>
+ <li>S60 5th Editio</li>
+ </ul>
+ </li>
</ul>
<ul><li>Perl (<a href="http://www.activestate.com">www.activestate.com</a>)
(required)
@@ -78,14 +75,15 @@
<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></li>
</ul></li>
<li>Symbian Connect software
- <p>Software that communicates between a PC and a target device. For example, <a href="http://europe.nokia.com/nokia/0,,72014,00.html">Nokia PC Suite</a>. </p></li>
+ <p>Software that communicates between a PC and a target device. For example, <a href="http://europe.nokia.com/support/download-software/nokia-ovi-suite">Ovi Suite</a>. </p>
+ </li>
</ul></td>
</tr>
<tr>
<th scope="row">Disk Space </th>
<td><ul>
<li>800 MB for Carbide.c++</li>
- <li>Up to 2.0 GB for each S60 SDK installation</li>
+ <li>Up to 2.0 GB for each SDK installation</li>
</ul></td>
</tr>
</table>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm Wed Jul 21 12:11:48 2010 -0500
@@ -22,7 +22,7 @@
<p class="note"><b>NOTE</b> Always run the <b>Help > Check for Updates</b> wizard and install all updates before attempting to install new software. This can prevent the occurrence of any dependency errors.</p>
<ol>
<li>Select <b class="step">Help > Install New Software...</b> to display the Available Software pane of the Install dialog.
- <p align="center"><img src="images/p2_available_sw.png" width="616" height="544"></p>
+ <p align="center"><img src="images/p2_available_sw.png" width="737" height="667"></p>
<p class="figure">Figure 1 - Install dialog - Available Software pane</p>
<ol type="a">
<li>Select an update site from the Work with drop down, or click Add... to enter a new site URL.</li>
@@ -30,18 +30,14 @@
<li>Click Next</li>
</ol>
</li>
- <li>In the Install Details pane select the specific items to install from those displayed, then click Next.
- <p align="center"><img src="images/p2_install_details_01.png" width="555" height="560"></p>
- <p class="figure">Figure 2 - Install dialog - Install Details pane</p>
- </li>
<li>Review the items to install in the second Install Details pane<b>, then click Next.</b>
- <p align="center"><img src="images/p2_install_details_02.png" width="555" height="560"></p>
- <p class="figure">Figure 3 - Install dialog - second Install Details pane</p>
+ <p align="center"><img src="images/p2_install_details_01.png" width="737" height="667"></p>
+ <p class="figure">Figure 2 - Install dialog - Install Details pane</p>
</li>
<li>Accept the license
terms, then click Finish.
- <p align="center"><img src="images/p2_review_licenses.png" width="643" height="560"></p>
- <p class="figure">Figure 4 - Install dialog -Review Licenses pane</p>
+ <p align="center"><img src="images/p2_review_licenses.png" width="737" height="667"></p>
+ <p class="figure">Figure 3 - Install dialog -Review Licenses pane</p>
</li>
</ol>
</div>
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/debug_set_breakpoint.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/p2_available_sw.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/p2_install_details_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/p2_review_licenses.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/wnd_symbian_emulator_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/wnd_symbian_emulator_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/start/images/wnd_symbian_emulator_03.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm Wed Jul 21 12:11:48 2010 -0500
@@ -38,7 +38,7 @@
<h5>Related references</h5>
<ul>
- <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
+ <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections </a></li>
<li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
</ul>
<h5>Related tasks</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm Wed Jul 21 12:11:48 2010 -0500
@@ -42,7 +42,7 @@
<h5>Related reference</h5>
<ul>
- <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
+ <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections </a></li>
<li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
</ul>
<h5>Related tasks</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_usb.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_usb.htm Wed Jul 21 12:11:48 2010 -0500
@@ -40,7 +40,7 @@
</ul>
<h5>Related reference</h5>
<ul>
- <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
+ <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections </a></li>
<li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
</ul>
<h5>Related tasks</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm Wed Jul 21 12:11:48 2010 -0500
@@ -19,7 +19,7 @@
<h5>Related references </h5>
<ul>
<li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
- <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
+ <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections </a></li>
<li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
</ul>
<div id="footer">Copyright © 2010 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></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm Wed Jul 21 12:11:48 2010 -0500
@@ -22,11 +22,11 @@
<li>Nokia PC Suite (or equivilent software) for connecting and installing applications to the device </li>
</ul>
</li>
- <li>Download and install the current TRK SISX file using the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog</li>
+ <li>Download and install the current TRK SISX file using the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog</li>
<p>The Application TRK debug agents are stored If not, install it now using the <a href="../../projects/launch/wiz_new_launch_config.htm">On-Device Connections > New Connection Wizard > Install remote agents</a> pane.</p>
<p class="note"><b>NOTE</b> The Application TRK versions included with Carbide is for CE versions of devices only. They are not intended for use with RnD devices. </p>
<li>Specify the communication method with the on-target device during the debug session</li>
- <p>Start the Application TRK or System TRK on the device. During startup of TRK on the device you must specify the communication method the on-device agent uses to debug the device. Currently, those methods include <a href="trk_connection_bluetooth.htm">Bluetooth</a> and <a href="trk_connection_usb.htm">USB</a> or a null serial cable. For Bluetooth, you must pair the device with the PC and a valid serial port assigned. For USB, A USB cable must connect the PC to the device and a valid serial port assigned. Use <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog to make the identification and connection setup quick and easy. </p>
+ <p>Start the Application TRK or System TRK on the device. During startup of TRK on the device you must specify the communication method the on-device agent uses to debug the device. Currently, those methods include <a href="trk_connection_bluetooth.htm">Bluetooth</a> and <a href="trk_connection_usb.htm">USB</a> or a null serial cable. For Bluetooth, you must pair the device with the PC and a valid serial port assigned. For USB, A USB cable must connect the PC to the device and a valid serial port assigned. Use <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to make the identification and connection setup quick and easy. </p>
</ol>
</div>
<h5>Related concepts</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_troubleshooting.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_troubleshooting.htm Wed Jul 21 12:11:48 2010 -0500
@@ -113,7 +113,7 @@
<p>Check that Carbide.c++ and your USB Virtual COM port or BT Serial Port agree on the port settings.</p>
</blockquote>
<ul>
- <li>Use the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog to quickly determine if you can communicate with the device in the <strong>Check TRK version</strong> pane </li>
+ <li>Use the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to quickly determine if you can communicate with the device in the <strong>Check TRK version</strong> pane </li>
<li>Open your Bluetooth or USB cable's connection settings: Start -> Settings -> Control panel -> System -> Hardware -> Device Manager. In the Device Manager dialog, click open the Ports directory, then you will see all the com ports available on the machine. Here you will be able to see the COM port for Bluetooth or USB. Sometimes you will have two COM ports for Bluetooth, so you might have to try specifying either of them. </li>
<li>In the Carbide tools, <a href="../projects/prj_debug_config.htm">open</a> the launch configuration associated with the target device and verify that you have specified the correct launch configuration for TRK. For example, the launch configuration should be either Symbian OS Application TRK or Symbian OS System TRK configuration. </li>
<li>In the Carbide tools, <a href="../projects/prj_debug_config.htm">open</a> the launch configuration associated with the target device. In the Connections tab make sure you specify the same COM port number as in the device manager. For Bluetooth, if two ports are listed in the device manager, then you need to try to both, to see which one works. For USB, don't select the COM port assigned to the serial port. Always select the COM port assigned to the virtual COM port ID for the phone that is specified in the Device Manager. </li>
--- a/core/com.nokia.carbide.cpp.doc.user/index.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/index.xml Wed Jul 21 12:11:48 2010 -0500
@@ -8,11 +8,6 @@
<topic href="html/concepts/build_configurations.htm"/>
</entry>
- <entry keyword="AIF">
- <topic label="editor" href="html/reference/AIFEditor.html"/>
- <topic label="file" href="html/concepts/AIFDefWizard.html"/>
- </entry>
-
<entry keyword="ARM registers">
<topic href="html/concepts/arm_registers.htm"/>
</entry>
--- a/core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml Wed Jul 21 12:11:48 2010 -0500
@@ -12,29 +12,30 @@
<group label="Carbide.c++ Development" id="carbide-cpp" style-id="content-group">
<link
- label="Create an application emulator debug example"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm"
+ label="Emulator Application Projects"
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_00.htm"
id="carbide-sample"
style-id="content-link">
- <text>Learn how to create, build, and debug a program for the emulator called HelloCarbide using Carbide project templates.</text>
+ <text>Learn how to create, build, and debug programs on the emulator using Carbide project templates.</text>
</link>
<link
- label="Create a simple DLL example"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/concepts/SampleExampleProjectCreate.html"
+ label="DLL Projects"
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_00.htm"
id="carbide-sample"
style-id="content-link">
- <text>Learn how to create a simple “Test1” DLL project.</text>
+ <text>Learn how to create and debug DLL projects.</text>
</link>
<link
- label="Create a run mode debugging application"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug.htm"
+ label="Remote Target Debugging (Run-mode)"
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_00.htm"
id="carbide-sample"
style-id="content-link">
- <text>Learn how create and build an application and debug it on a device using the App TRK on-device debug agent.</text>
+ <text>Learn how debug applications on remote devices using the TRK remote agent.</text>
</link>
+ <!--
<link
label="Create a stop mode debugging application"
url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm"
@@ -42,14 +43,7 @@
style-id="content-link">
<text>Learn how to create and build an application and debug it on a device using JTAG debug software on Lauterbach hardware.</text>
</link>
-
- <link
- label="Using soft attach for on-device debugging example"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/soft_attach_debug.htm"
- id="carbide-sample"
- style-id="content-link">
- <text>Learn how to use soft attach to debug an image flashed to ROM or on a memory card.</text>
- </link>
+ -->
</group>
</extensionContent>
--- a/core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContentMisc.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContentMisc.xml Wed Jul 21 12:11:48 2010 -0500
@@ -9,6 +9,7 @@
style="carbide.css"
path="tutorials/@">
+ <!--
<group label="N-Gage Development" id="carbide-cpp" style-id="content-group">
<link
@@ -20,6 +21,8 @@
</link>
</group>
+ -->
+
</extensionContent>
</introContent>
--- a/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml Wed Jul 21 12:11:48 2010 -0500
@@ -28,25 +28,6 @@
</link>
</group>
- <group style-id="content-group" id="carbide-cpp">
- <link
- label="Performance Improvements (2.1)"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm#new210"
- id="carbide-link"
- style-id="content-link">
- <text>Complete Carbide performance improvements are explained under the notes for Carbide.c++ 2.1.</text>
- </link>
- </group>
-
- <group style-id="content-group" id="carbide-cpp">
- <link
- label="Hover Help (2.0.4)"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.sysdoc.hover/resources/help%20context/dl_hover/html/getting_started.html"
- id="carbide-link"
- style-id="content-link">
- <text>See Symbian API Reference information appear when you hover over a Symbian symbol in C/C++ editors.</text>
- </link>
- </group>
</extensionContent>
--- a/core/com.nokia.carbide.cpp.doc.user/plugin.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/plugin.xml Wed Jul 21 12:11:48 2010 -0500
@@ -1,263 +1,264 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-
-<plugin>
- <extension
- point="org.eclipse.help.toc">
- <toc
- file="debuggerTOC.xml"
- primary="true"/>
- <toc
- file="tocCarbide.xml"
- primary="false"/>
- <!--<toc
- file="tocRelease.xml"
- primary="false"/> -->
-
- <!-- Prebuilt Index -->
- <index path="index" />
- </extension>
-
-
-<!-- =================================================================================== -->
-<!-- Manual Index -->
-<!-- =================================================================================== -->
-
- <extension point="org.eclipse.help.index">
- <index file="html/index.xml"/>
- </extension>
-
-
-<!-- =================================================================================== -->
-<!-- Cheatsheets extension -->
-<!-- =================================================================================== -->
-
- <extension
- point="org.eclipse.ui.cheatsheets.cheatSheetContent">
- <category
- id="com.nokia.carbide.ide.cheatsheets"
- name="Carbide.c++ Getting Started" />
-
- <cheatsheet
- category="com.nokia.carbide.ide.cheatsheets"
- contentFile="html/cheatsheets/getStarted_cs.xml"
- id="com.nokia.carbide.cpp.doc.user.getStarted"
- name="HelloCarbide Project Example"/>
- </extension>
-
- <extension
- point="org.eclipse.ui.cheatsheets.cheatSheetContent">
-
- <category
- id="com.nokia.carbide.trk.cheatsheets"
- name="Carbide.c++ On-device Debugging"/>
-
- <cheatsheet
- category="com.nokia.carbide.trk.cheatsheets"
- contentFile="html/cheatsheets/new_remote_conn.xml"
- id="com.nokia.carbide.cpp.doc.user.new_remote_connection"
- name="Creating On-device Connections"/>
-
- <cheatsheet
- category="com.nokia.carbide.trk.cheatsheets"
- contentFile="html/cheatsheets/install_remote_agent.xml"
- id="com.nokia.carbide.cpp.doc.user.install_remote_agent"
- name="Downloading and Installing Remote Agents"/>
-
- <cheatsheet
- category="com.nokia.carbide.trk.cheatsheets"
- contentFile="html/cheatsheets/run_mode_cs.xml"
- id="com.nokia.carbide.cpp.doc.user.trk_appTRK_Using"
- name="Run Mode On-Device Debugging"/>
-
- <cheatsheet
- category="com.nokia.carbide.trk.cheatsheets"
- contentFile="html/cheatsheets/stop_mode_cs.xml"
- id="com.nokia.carbide.cpp.doc.user.stop_mode"
- name="Stop Mode On-Device Debugging" />
-
- </extension>
-
- <!--
- <extension
- point="org.eclipse.ui.cheatsheets.cheatSheetContent">
-
- <cheatsheet
- contentFile="html/cheatsheets/trk_appTrk_intro_cs.xml"
- id="com.nokia.carbide.cpp.doc.user.trk_appTrk_intro"
- name="Introduction to Run Mode Debugging" />
-
- <cheatsheet
- contentFile="html/cheatsheets/trk_appTrk_transfer_cs.xml"
- id="com.nokia.carbide.cpp.doc.user.trk_appTrk_transfer"
- name="Transferring and Installing Trk Debug Agent" />
-
- <cheatsheet
- contentFile="html/cheatsheets/trk_appTrk_pkgsis_cs.xml"
- id="com.nokia.carbide.cpp.doc.user.trk_appTrk_pkgsis"
- name="Creating a Project .pkg file and Application .sis file" />
-
- <cheatsheet
- contentFile="html/cheatsheets/trk_appTrk_launch_cs.xml"
- id="com.nokia.carbide.cpp.doc.user.trk_appTrk_launch"
- name="Defining a Launch Configuration for Run Mode Debugging" />
-
- <cheatsheet
- contentFile="html/cheatsheets/trk_appTrk_debugapps_cs.xml"
- id="com.nokia.carbide.cpp.doc.user.trk_appTrk_debugapps"
- name="Debugging DLLs, Applications, and Executables" />
-
- <cheatsheet
- contentFile="html/cheatsheets/trk_appTrk_viewdata_cs.xml"
- id="com.nokia.carbide.cpp.doc.user.trk_appTrk_viewdata"
- name="Viewing Registers and Symbian OS Data and Troubleshooting Tips" />
-
-
- </extension>
- -->
-
-<!-- =================================================================================== -->
-<!-- CONTEXT IDs for CONTEXTUAL HELP in windows, dialogs, and views -->
-<!-- XML help content is stored in these files: -->
-<!-- carbide_debug_dialogs_help.xml (debugger help) -->
-<!-- carbide_ide_dialogs_help.xml (ide help) -->
-<!-- cdt_dialogs_help.xml (cdt help) -->
-<!-- eclipse_dialogs_help.xml (eclipse ide help) -->
-<!-- =================================================================================== -->
-
- <extension point="org.eclipse.help.contexts" >
-
- <!-- ==================================================== -->
- <!-- CARBIDE DIALOGS AND PREFS -->
- <!-- XML: carbide_ide_dialogs_help.xml -->
- <!-- ==================================================== -->
-
- <!-- CARBIDE BUILDER HELP -->
- <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
- plugin="com.nokia.carbide.cdt.builder" />
-
- <!-- PREPROCESS PREF/PROPERTIES PANEL -->
- <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
- plugin="com.nokia.carbide.cpp.builder.utils" />
-
- <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
- plugin="com.nokia.carbide.cpp.leavescan" />
-
- <!-- SPN VIEW, INF IMPORTER, MMP, MBM, AIF editors, and miscellaneous HELP -->
- <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
- plugin="com.nokia.carbide.cpp.project.ui" />
-
- <!-- SDK Preferences HELP -->
- <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
- plugin="com.nokia.carbide.cpp.sdk.ui" />
-
- <!-- NEW OS CLASS/ NEW OS PROJECT WIZARD HELP -->
- <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
- plugin="com.nokia.carbide.templatewizard" />
-
- <!-- Project Updater HELP -->
- <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
- plugin="com.nokia.carbide.updater" />
-
- <!-- System Search HELP (added 1.3) -->
- <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
- plugin="com.nokia.carbide.search.system" />
-
- <!-- System Search HELP (added 2.0) -->
- <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
- plugin="com.nokia.carbide.remoteConnections" />
-
- <!-- News Reader HELP (added 2.0.2) -->
- <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
- plugin="com.nokia.carbide.cpp.news.reader" />
-
- <!-- ==================================================== -->
- <!-- CARBIDE DEBUGGER DIALOGS AND PREFS -->
- <!-- XML: carbide_debug_dialogs_help.xml -->
- <!-- ==================================================== -->
-
- <!-- PREFERENCE PANEL F1 HELP -->
- <contexts file="html/context_help/carbide_debug_dialogs_help.xml"
- plugin="com.freescale.cdt.debug.cw.core.ui" />
-
- <!-- SYMBIAN OS VIEW HELP -->
- <contexts file="html/context_help/carbide_debug_dialogs_help.xml"
- plugin="com.nokia.cdt.debug.cw.symbian" />
-
- <!-- SYMBIAN OS DATA VIEW HELP -->
- <contexts file="html/context_help/carbide_debug_dialogs_help.xml"
- plugin="com.nokia.carbide.cpp.debug.kernelaware" />
-
- <!-- LAUNCH CONFIG WIZARD HELP -->
- <contexts file="html/context_help/carbide_debug_dialogs_help.xml"
- plugin="com.nokia.cdt.debug.launch" />
-
-
- <!-- ==================================================== -->
- <!-- CDT DIALOGS AND PREFS -->
- <!-- XML: cdt_dialogs_help.xml -->
- <!-- ==================================================== -->
-
- <!-- ECLIPSE DEBUG UI CONTEXT HELP (MEM/DIS/SIG, etc) -->
- <contexts file="html/context_help/cdt_dialogs_help.xml"
- plugin="org.eclipse.cdt.debug.ui" />
-
- <contexts file="html/context_help/cdt_dialogs_help.xml"
- plugin="org.eclipse.cdt.ui" />
-
-
- <!-- ==================================================== -->
- <!-- ECLIPSE DIALOGS AND PREFS -->
- <!-- XML: eclipse_dialogs_help.xml -->
- <!-- ==================================================== -->
-
- <!-- CARBIDE DEBUG UI HELP (BRKPT, VAR, EXPR, etc) -->
- <contexts file="html/context_help/eclipse_dialogs_help.xml"
- plugin="org.eclipse.debug.ui" />
-
- <!-- ECLIPSE NEW/IMPORT/EXPORT WIZARDS and PREF PANELS HELP -->
- <contexts file="html/context_help/eclipse_dialogs_help.xml"
- plugin="org.eclipse.ui" />
-
- <!-- ECLIPSE CONSOLE VIEW HELP -->
- <contexts file="html/context_help/eclipse_dialogs_help.xml"
- plugin="org.eclipse.ui.console" />
-
- <!-- ECLIPSE NEW PROJECT WIZARD HELP -->
- <contexts file="html/context_help/eclipse_dialogs_help.xml"
- plugin="org.eclipse.ui.ide" />
-
- <contexts file="html/context_help/eclipse_dialogs_help.xml"
- plugin="org.eclipse.ui.workbench" />
-
- </extension>
-
-
-
-<!-- =================================================================================== -->
-<!-- Universal intro extensions to show content in welcome pages -->
-<!-- =================================================================================== -->
- <extension
- point="org.eclipse.ui.intro.configExtension">
-
- <configExtension
- content="intro/whatsnew_IntroExt.xml"
- configId="org.eclipse.ui.intro.universalConfig" />
-
- <configExtension
- content="intro/tutorialsCarbideExtContent.xml"
- configId="org.eclipse.ui.intro.universalConfig" />
-
- <configExtension
- content="intro/tutorialsCarbideExtContentMisc.xml"
- configId="org.eclipse.ui.intro.universalConfig" />
-
- <!--
- <configExtension
- content="intro/migrateExtensionContent.xml"
- configId="org.eclipse.ui.intro.universalConfig" />
- -->
-
- </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+
+<plugin>
+ <extension
+ point="org.eclipse.help.toc">
+ <toc
+ file="debuggerTOC.xml"
+ primary="true"/>
+ <toc
+ file="tocCarbide.xml"
+ primary="false"/>
+ <!--<toc
+ file="tocRelease.xml"
+ primary="false"/> -->
+
+ <!-- Prebuilt Index -->
+ <index path="index" />
+ </extension>
+
+
+<!-- =================================================================================== -->
+<!-- Manual Index -->
+<!-- =================================================================================== -->
+
+ <extension point="org.eclipse.help.index">
+ <index file="html/index.xml"/>
+ </extension>
+
+
+<!-- =================================================================================== -->
+<!-- Cheatsheets extension -->
+<!-- =================================================================================== -->
+
+ <extension
+ point="org.eclipse.ui.cheatsheets.cheatSheetContent">
+ <category
+ id="com.nokia.carbide.ide.cheatsheets"
+ name="Carbide.c++ Getting Started" />
+
+ <cheatsheet
+ category="com.nokia.carbide.ide.cheatsheets"
+ contentFile="html/cheatsheets/getStarted_cs.xml"
+ id="com.nokia.carbide.cpp.doc.user.getStarted"
+ name="HelloCarbide Project Example"/>
+ </extension>
+
+ <extension
+ point="org.eclipse.ui.cheatsheets.cheatSheetContent">
+
+ <category
+ id="com.nokia.carbide.trk.cheatsheets"
+ name="Carbide.c++ On-device Debugging"/>
+
+ <cheatsheet
+ category="com.nokia.carbide.trk.cheatsheets"
+ contentFile="html/cheatsheets/new_remote_conn.xml"
+ id="com.nokia.carbide.cpp.doc.user.new_remote_connection"
+ name="Creating On-device Connections"/>
+
+ <cheatsheet
+ category="com.nokia.carbide.trk.cheatsheets"
+ contentFile="html/cheatsheets/install_remote_agent.xml"
+ id="com.nokia.carbide.cpp.doc.user.install_remote_agent"
+ name="Downloading and Installing Remote Agents"/>
+
+ <cheatsheet
+ category="com.nokia.carbide.trk.cheatsheets"
+ contentFile="html/cheatsheets/run_mode_cs.xml"
+ id="com.nokia.carbide.cpp.doc.user.trk_appTRK_Using"
+ name="Run Mode On-Device Debugging"/>
+
+ <cheatsheet
+ category="com.nokia.carbide.trk.cheatsheets"
+ contentFile="html/cheatsheets/stop_mode_cs.xml"
+ id="com.nokia.carbide.cpp.doc.user.stop_mode"
+ name="Stop Mode On-Device Debugging" />
+
+ </extension>
+
+ <!--
+ <extension
+ point="org.eclipse.ui.cheatsheets.cheatSheetContent">
+
+ <cheatsheet
+ contentFile="html/cheatsheets/trk_appTrk_intro_cs.xml"
+ id="com.nokia.carbide.cpp.doc.user.trk_appTrk_intro"
+ name="Introduction to Run Mode Debugging" />
+
+ <cheatsheet
+ contentFile="html/cheatsheets/trk_appTrk_transfer_cs.xml"
+ id="com.nokia.carbide.cpp.doc.user.trk_appTrk_transfer"
+ name="Transferring and Installing Trk Debug Agent" />
+
+ <cheatsheet
+ contentFile="html/cheatsheets/trk_appTrk_pkgsis_cs.xml"
+ id="com.nokia.carbide.cpp.doc.user.trk_appTrk_pkgsis"
+ name="Creating a Project .pkg file and Application .sis file" />
+
+ <cheatsheet
+ contentFile="html/cheatsheets/trk_appTrk_launch_cs.xml"
+ id="com.nokia.carbide.cpp.doc.user.trk_appTrk_launch"
+ name="Defining a Launch Configuration for Run Mode Debugging" />
+
+ <cheatsheet
+ contentFile="html/cheatsheets/trk_appTrk_debugapps_cs.xml"
+ id="com.nokia.carbide.cpp.doc.user.trk_appTrk_debugapps"
+ name="Debugging DLLs, Applications, and Executables" />
+
+ <cheatsheet
+ contentFile="html/cheatsheets/trk_appTrk_viewdata_cs.xml"
+ id="com.nokia.carbide.cpp.doc.user.trk_appTrk_viewdata"
+ name="Viewing Registers and Symbian OS Data and Troubleshooting Tips" />
+
+
+ </extension>
+ -->
+
+<!-- =================================================================================== -->
+<!-- CONTEXT IDs for CONTEXTUAL HELP in windows, dialogs, and views -->
+<!-- XML help content is stored in these files: -->
+<!-- carbide_debug_dialogs_help.xml (debugger help) -->
+<!-- carbide_ide_dialogs_help.xml (ide help) -->
+<!-- cdt_dialogs_help.xml (cdt help) -->
+<!-- eclipse_dialogs_help.xml (eclipse ide help) -->
+<!-- =================================================================================== -->
+
+ <extension point="org.eclipse.help.contexts" >
+
+ <!-- ==================================================== -->
+ <!-- CARBIDE DIALOGS AND PREFS -->
+ <!-- XML: carbide_ide_dialogs_help.xml -->
+ <!-- ==================================================== -->
+
+ <!-- CARBIDE BUILDER HELP -->
+ <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
+ plugin="com.nokia.carbide.cdt.builder" />
+
+ <!-- PREPROCESS PREF/PROPERTIES PANEL -->
+ <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
+ plugin="com.nokia.carbide.cpp.builder.utils" />
+
+ <!-- SPN VIEW, INF IMPORTER, MMP, MBM, and miscellaneous HELP -->
+ <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
+ plugin="com.nokia.carbide.cpp.project.ui" />
+
+ <!-- SDK Preferences HELP -->
+ <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
+ plugin="com.nokia.carbide.cpp.sdk.ui" />
+
+ <!-- NEW OS CLASS/ NEW OS PROJECT WIZARD HELP -->
+ <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
+ plugin="com.nokia.carbide.templatewizard" />
+
+ <!-- Project Updater HELP -->
+ <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
+ plugin="com.nokia.carbide.updater" />
+
+ <!-- System Search HELP (added 1.3) -->
+ <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
+ plugin="com.nokia.carbide.search.system" />
+
+ <!-- System Search HELP (added 2.0) -->
+ <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
+ plugin="com.nokia.carbide.remoteConnections" />
+
+ <!-- News Reader HELP (added 2.0.2) -->
+ <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
+ plugin="com.nokia.carbide.cpp.news.reader" />
+
+ <!-- Install Extensions HELP (added 3.0.0) -->
+ <contexts file="html/context_help/carbide_ide_dialogs_help.xml"
+ plugin="com.nokia.carbide.discovery.ui" />
+
+ <!-- ==================================================== -->
+ <!-- CARBIDE DEBUGGER DIALOGS AND PREFS -->
+ <!-- XML: carbide_debug_dialogs_help.xml -->
+ <!-- ==================================================== -->
+
+ <!-- PREFERENCE PANEL F1 HELP -->
+ <contexts file="html/context_help/carbide_debug_dialogs_help.xml"
+ plugin="com.freescale.cdt.debug.cw.core.ui" />
+
+ <!-- SYMBIAN OS VIEW HELP -->
+ <contexts file="html/context_help/carbide_debug_dialogs_help.xml"
+ plugin="com.nokia.cdt.debug.cw.symbian" />
+
+ <!-- SYMBIAN OS DATA VIEW HELP -->
+ <contexts file="html/context_help/carbide_debug_dialogs_help.xml"
+ plugin="com.nokia.carbide.cpp.debug.kernelaware" />
+
+ <!-- LAUNCH CONFIG WIZARD HELP -->
+ <contexts file="html/context_help/carbide_debug_dialogs_help.xml"
+ plugin="com.nokia.cdt.debug.launch" />
+
+
+ <!-- ==================================================== -->
+ <!-- CDT DIALOGS AND PREFS -->
+ <!-- XML: cdt_dialogs_help.xml -->
+ <!-- ==================================================== -->
+
+ <!-- ECLIPSE DEBUG UI CONTEXT HELP (MEM/DIS/SIG, etc) -->
+ <contexts file="html/context_help/cdt_dialogs_help.xml"
+ plugin="org.eclipse.cdt.debug.ui" />
+
+ <contexts file="html/context_help/cdt_dialogs_help.xml"
+ plugin="org.eclipse.cdt.ui" />
+
+
+ <!-- ==================================================== -->
+ <!-- ECLIPSE DIALOGS AND PREFS -->
+ <!-- XML: eclipse_dialogs_help.xml -->
+ <!-- ==================================================== -->
+
+ <!-- CARBIDE DEBUG UI HELP (BRKPT, VAR, EXPR, etc) -->
+ <contexts file="html/context_help/eclipse_dialogs_help.xml"
+ plugin="org.eclipse.debug.ui" />
+
+ <!-- ECLIPSE NEW/IMPORT/EXPORT WIZARDS and PREF PANELS HELP -->
+ <contexts file="html/context_help/eclipse_dialogs_help.xml"
+ plugin="org.eclipse.ui" />
+
+ <!-- ECLIPSE CONSOLE VIEW HELP -->
+ <contexts file="html/context_help/eclipse_dialogs_help.xml"
+ plugin="org.eclipse.ui.console" />
+
+ <!-- ECLIPSE NEW PROJECT WIZARD HELP -->
+ <contexts file="html/context_help/eclipse_dialogs_help.xml"
+ plugin="org.eclipse.ui.ide" />
+
+ <contexts file="html/context_help/eclipse_dialogs_help.xml"
+ plugin="org.eclipse.ui.workbench" />
+
+ </extension>
+
+
+
+<!-- =================================================================================== -->
+<!-- Universal intro extensions to show content in welcome pages -->
+<!-- =================================================================================== -->
+ <extension
+ point="org.eclipse.ui.intro.configExtension">
+
+ <configExtension
+ content="intro/whatsnew_IntroExt.xml"
+ configId="org.eclipse.ui.intro.universalConfig" />
+
+ <configExtension
+ content="intro/tutorialsCarbideExtContent.xml"
+ configId="org.eclipse.ui.intro.universalConfig" />
+
+ <configExtension
+ content="intro/tutorialsCarbideExtContentMisc.xml"
+ configId="org.eclipse.ui.intro.universalConfig" />
+
+ <!--
+ <configExtension
+ content="intro/migrateExtensionContent.xml"
+ configId="org.eclipse.ui.intro.universalConfig" />
+ -->
+
+ </extension>
+
+</plugin>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Wed Jul 21 12:11:48 2010 -0500
@@ -12,20 +12,33 @@
<topic href="html/tasks/debugger/run_mode_debug_04.htm" label="Setting up a virtual drive">
</topic>
</topic>
+ <topic label="Tour of the UI" href="html/concepts/tour.html" />
<topic label="Carbide Help" href="html/tasks/start/carbide_help.htm" />
<topic label="Supported Target Types" href="html/concepts/build_targets.htm" />
<topic label="Supported SDKs" href="html/sos_references.htm" />
<topic label="Updating Carbide" href="html/tasks/start/carbide_updating.htm" />
- <topic label="Tour of the UI" href="html/concepts/tour.html" />
<topic label="Concepts" href="html/concepts/concepts.htm" />
- <topic label="Application Emulator Example" href="html/tasks/start/carbide_example.htm" >
- <topic label="1. Creating New Projects" href="html/tasks/CreatingNewProjects.html" />
- <topic label="2. Building Projects and Symbian Components" href="html/tasks/projects/prj_build.htm" />
- <topic label="3. Creating a Launch Configuration" href="html/tasks/projects/prj_debug_config.htm" />
- <topic label="4. Debugging a Symbian OS Program" href="html/tasks/start/carbide_debugging.htm" />
- </topic>
</topic>
- <topic label="Carbide Menus " href="html/reference/menus/menus.htm" >
+ <topic label="Carbide tutorials">
+ <topic label="Emulator Application Projects" href="html/projects/tutorials/new_proj_from_template_00.htm" >
+ <topic label="Creating new projects from templates" href="html/projects/tutorials/new_proj_from_template_01.htm" />
+ <topic label="Building projects and components" href="html/projects/tutorials/new_proj_from_template_02.htm" />
+ <topic label="Defining a launch configuration" href="html/projects/tutorials/new_proj_from_template_03.htm" />
+ <topic label="Launching and debugging an executable" href="html/projects/tutorials/new_proj_from_template_04.htm" />
+ </topic>
+ <topic label="DLL Projects" href="html/projects/tutorials/new_proj_dll_example_00.htm" >
+ <topic label="Creating DLL Projects" href="html/projects/tutorials/new_proj_dll_example_01.htm" />
+ <topic label="Building the DLL Project" href="html/projects/tutorials/new_proj_dll_example_02.htm" />
+ <topic label="Debugging a DLL Project" href="html/projects/tutorials/new_proj_dll_example_03.htm" />
+ </topic>
+ <topic label="Remote Target Debugging (Run-mode)" href="html/projects/tutorials/run_mode_debug_example_00.htm" >
+ <topic label="Connect remote device to PC" href="html/projects/tutorials/run_mode_debug_example_01.htm" />
+ <topic label="Install remote debug agent" href="html/projects/tutorials/run_mode_debug_example_02.htm" />
+ <topic label="Configure project for downloading" href="html/projects/tutorials/run_mode_debug_example_03.htm" />
+ <topic label="Debug on remote device" href="html/projects/tutorials/run_mode_debug_example_04.htm" />
+ </topic>
+ </topic>
+ <topic label="Carbide menus" href="html/reference/menus/menus.htm" >
<topic label="ABLD Actions" href="html/reference/menus/abld.htm" />
<topic label="Build All Configurations" href="html/reference/menus/build_all_targets.htm" />
<topic label="Build PKG File" href="html/reference/menus/build_pkg_file.htm" />
@@ -35,41 +48,71 @@
<topic label="Context menus" href="html/concepts/contextual_menus.htm" />
<topic label="Freeze Exports" href="html/reference/menus/freeze_exports.htm" />
<topic label="Freeze Symbian Component" href="html/reference/menus/freeze_symbian_comp.htm" />
- <topic label="On-Device Connections..." href="html/reference/trk/wnd_on_device_setup.htm" />
<topic label="Open Command Window" href="html/reference/menus/open_cmd_window.htm" />
<topic label="Preprocess" href="html/reference/menus/preprocess_source.htm" />
- <topic label="Run CodeScanner" href="html/reference/menus/run_codescanner.htm" />
- <topic label="Run Leavescan" href="html/reference/menus/run_leavescan.htm" />
- <topic label="S60 UI Designer" href="html/reference/menus/s60_ui_designer.htm" />
<topic label="Show in Explorer" href="html/reference/menus/open_explorer_window.htm" />
<topic label="Symbian OS C++ Class" href="html/tasks/projects/prj_adding_symbian_class.htm" />
<topic label="Symbian OS C++ Project" href="html/tasks/CreatingNewProjects.html" />
<topic label="Symbian OS MMP File" href="html/reference/NewMMP_wizard.html" />
- <topic label="Toggle HW Breakpoint" href="html/reference/menus/hardware_breakpoints.htm" />
+ <topic label="Toggle HW Breakpoint" href="html/reference/menus/hardware_breakpoints.htm" />
<topic label="Update Projects" href="html/reference/olderproject_updater.html" />
</topic>
+ <topic label="Carbide views" >
+ <topic label="BreakPoints view" href="html/reference/view_breakpoints.htm" />
+ <topic label="Carbide.c++ News view" href="html/reference/view_carbide_news.htm" />
+ <topic label="Carbide Portal" href="html/reference/view_carbide_portal.htm" >
+ <topic label="Installing Extensions" href="html/tasks/installing_extensions.htm" />
+ </topic>
+ <topic label="Console view" href="html/reference/view_log.htm" />
+ <topic label="Debug view" href="html/debugger/debug/viewing_debug.htm" />
+ <topic label="Disassembly view" href="html/reference/view_disassembly.htm" />
+ <topic label="Executables view" href="html/reference/view_executables.htm" />
+ <topic label="Memory view" href="html/reference/view_memory_wnd.htm" >
+ <topic href="html/concepts/working_with_memory.htm" label="Working with Memory"></topic>
+ <topic label="Opening a Memory View" href="html/tasks/memory/view_memory_show.htm" />
+ <topic label="Adding a Memory Monitor" href="html/tasks/memory/memory_monitor_adding.htm" />
+ <topic label="Adding a Memory Rendering" href="html/tasks/memory/memory_rendering_adding.htm" />
+ <topic label="Removing a Memory Monitor or Rendering" href="html/tasks/memory/memory_monitor_removing.htm" />
+ <topic label="Memory Rendering Options" href="html/reference/memory_rendering_options.htm" />
+ </topic>
+ <topic label="Modules View" href="html/reference/view_module_wnd.htm" />
+ <topic label="Project Explorer view" href="html/reference/view_cpp_projects.htm" />
+ <topic label="Registers" href="html/concepts/registers.htm" >
+ <topic label="Registers view" href="html/reference/view_registers.htm" />
+ <topic label="Opening a Registers View" href="html/tasks/registers/mem_reg_open_wnd.htm" />
+ <topic href="html/tasks/registers/mem_reg_data_views.htm" label="Changing Register Data Views"></topic>
+ <topic label="Expanding Register Groups" href="html/tasks/registers/mem_reg_viewing.htm" />
+ <topic label="Changing Register Values" href="html/tasks/registers/mem_reg_changing.htm" />
+ <topic label="ARM Registers" href="html/concepts/arm_registers.htm" />
+ </topic>
+ <topic label="Remote Connections view" href="html/reference/trk/view_remote_connection.htm" />
+ <topic href="html/reference/view_symbian_kernel.htm" label="Symbian OS Data view">
+ <topic href="html/tasks/debugger/view_symbian_kernel_set.htm" label="Setting the Refresh Rate"></topic>
+ </topic>
+ <topic label="Symbian Project Navigator view" href="html/reference/view_sym_proj_nav.htm" />
+ <topic label="Variables and Expressions" href="Variables and Expressions" >
+ <topic label="Variables view" href="html/reference/view_variables.htm" />
+ <topic label="Viewing Variables" href="html/debugger/variables/viewing_variables.htm" />
+ <topic label="Adding and Removing Global Variables" href="html/debugger/variables/adding_variables.htm" />
+ <topic label="Expressions view" href="html/reference/view_expressions.htm" />
+ <topic label="Viewing Expressions" href="html/debugger/variables/viewing_expressions.htm" />
+ <topic label="Editing Expressions" href="html/debugger/variables/editing_expressions.htm" />
+ <topic label="Adding and Removing Expressions" href="html/debugger/variables/adding_expressions.htm" />
+ </topic>
+ <topic label="Workspace Information" href="html/concepts/workspaces.htm" />
+ </topic>
<topic label="Project management" >
- <topic label="Carbide C/C++ perspective" href="html/concepts/CarbidePerspective.html" >
- <topic label="Carbide.c++ News view" href="html/reference/view_carbide_news.htm" />
- <topic label="Executables view" href="html/reference/view_executables.htm" />
- <topic label="Project Explorer view" href="html/reference/view_cpp_projects.htm" />
- <topic label="Remote Connections view" href="html/reference/trk/view_remote_connection.htm" />
- <topic label="Symbian Project Navigator view" href="html/reference/view_sym_proj_nav.htm" />
- <topic label="Workspace Information" href="html/concepts/workspaces.htm" />
- </topic>
- <topic label="Carbide.c++ preferences" href="html/reference/wnd_carbide_pref.htm" >
- <topic label="Bug Reports" href="PLUGINS_ROOT/com.nokia.carbide.bugreport/html/prefs_bug_reporter.htm" />
+ <topic label="Carbide C/C++ perspective" href="html/concepts/CarbidePerspective.html" />
+ <topic label="Carbide.c++ preferences" href="html/reference/wnd_carbide_pref.htm" >
+ <topic label="Bug Reports" href="PLUGINS_ROOT/com.nokia.carbide.bugreport/html/prefs_bug_reporter.htm" />
<topic label="Build" href="html/reference/wnd_build_prefs.htm" />
- <topic label="Carbide.c++ News" href="html/reference/prefs_carbide_news.htm" />
- <topic label="Debugger" href="html/reference/wnd_debugger_prefs.htm" />
- <topic label="CodeScanner" href="PLUGINS_ROOT/com.nokia.carbide.cpp.codescanner/html/pref_codescanner_01.htm" />
+ <topic label="Carbide.c++ News" href="html/reference/prefs_carbide_news.htm" />
+ <topic label="Debugger" href="html/reference/wnd_debugger_prefs.htm" />
<topic label="Diagnostic Logs" href="html/reference/wnd_diagnostic_logs_pref.htm" />
- <topic label="Leavescan Preferences" href="html/reference/leavescan_pref.html" />
<topic label="Performance Investigator" href="PLUGINS_ROOT/com.nokia.carbide.cpp.pi.doc.user/html/tasks/analyser/key_profile_pref.htm" />
<topic label="Platform Filtering Preferences" href="html/tasks/sdks/sdk_platform_filter.htm" />
<topic label="Preprocess" href="html/reference/wnd_preprocess_prefs.htm" />
<topic label="SDK Preferences" href="html/reference/SDKPreferences.html" />
- <topic label="UI Designer" href="PLUGINS_ROOT/com.nokia.carbide.cpp.uidesigner.doc.user/html/reference/uidesign/ref_ui_designer_prefs.htm" />
<topic label="Code Styles" href="html/reference/wnd_pref_code_style.htm" >
<topic label="Setting the Workspace Code Style" href="html/tasks/code_style_workspace.htm" />
<topic label="Reformatting a Source File" href="html/tasks/code_style_reformatting_sources.htm" />
@@ -93,8 +136,8 @@
<topic label="N-Gage Projects" href="html/concepts/ngage_projects.htm" />
</topic>
<topic label="C/C++ Project and File Properties" href="html/reference/ProjectPreferences.html" >
- <topic label="Carbide Build Configurations" href="html/reference/build_properties/pane_build_config.htm" >
- <topic label="SIS Builder" href="html/reference/build_properties/pane_build_config_sis.htm" >
+ <topic label="Build Configurations" href="html/reference/build_properties/pane_build_config.htm" >
+ <topic label="SIS Builder" href="html/reference/build_properties/pane_build_config_sis.htm" >
<topic label="SIS Properties" href="html/reference/build_properties/wnd_sis_properties.htm" />
</topic>
<topic label="SBSv2" href="html/reference/build_properties/pane_build_config_sbsv2.htm" />
@@ -103,10 +146,10 @@
<topic label="Paths and Symbols" href="html/reference/build_properties/pane_build_config_paths.htm" />
<topic label="ROM Builder" href="html/reference/ROM_build_settings.html" />
</topic>
- <topic label="Carbide Macro Settings" href="html/reference/build_properties/pane_macro_settings.htm" />
- <topic label="Carbide Project Settings" href="html/reference/build_properties/pane_project_settings.htm" />
+ <topic label="Macro Settings" href="html/reference/build_properties/pane_macro_settings.htm" />
+ <topic label="Project Settings" href="html/reference/build_properties/pane_project_settings.htm" />
</topic>
- <topic label="Building projects" href="html/concepts/build_system.htm" >
+ <topic label="Building projects" href="html/concepts/build_system.htm" >
<topic label="Active Build Configuration" href="html/concepts/build_configurations.htm" />
<topic label="Setting an Active Configuration" href="html/tasks/projects/prj_set_build_tgt.htm" />
<topic label="Adding/Removing Build Configurations" href="html/tasks/projects/prj_new_build_config.htm" />
@@ -125,13 +168,9 @@
<topic label="Freeze Exports" href="html/reference/menus/freeze_exports.htm" />
</topic>
<topic label="Resource and project editors" href="html/tasks/ModifyingResources.html" >
- <topic label="AIF files" href="html/concepts/AIFDefWizard.html" >
- <topic label="AIF Editor" href="html/reference/AIFEditor.html" />
- <topic label="Creating an AIF File" href="html/tasks/AppInfoFile.html" />
- </topic>
<topic label="Classes" href="html/tasks/ClassesToc.htm" >
<topic label="Adding Classes" href="html/tasks/AddingClasses.html" />
- <topic label="New Class Wizard" href="html/reference/NewClassWizard.html" />
+ <topic label="New C++ Class Wizard" href="html/reference/NewClassWizard.html" />
<topic label="Adding Symbian OS Classes Wizard" href="html/tasks/projects/prj_adding_symbian_class.htm" />
</topic>
<topic label="INF editor" href="html/reference/INF_Editor.html" >
@@ -193,44 +232,11 @@
<topic label="Qt preference panel" href="html/qt_help/qt_pref_panel.htm" />
<topic label="Qt project properties" href="html/qt_help/qt_project_properties.htm" />
</topic>
+ <topic label="Software Configuration Management" href="html/concepts/cvs.htm" />
</topic>
<topic label="Debugging projects" href="html/concepts/debugger_about.htm" >
<topic label="Running a program" href="html/debugger/debug/cmds_starting.htm" />
<topic label="Debug perspective" href="html/reference/perspective_debug.htm" >
- <topic label="BreakPoints view" href="html/reference/view_breakpoints.htm" />
- <topic label="Console view" href="html/reference/view_log.htm" />
- <topic label="Debug view" href="html/debugger/debug/viewing_debug.htm" />
- <topic label="Disassembly view" href="html/reference/view_disassembly.htm" />
- <topic href="html/reference/view_executables.htm" label="Executables view"></topic>
- <topic label="Variables and Expressions" href="Variables and Expressions" >
- <topic label="Variables view" href="html/reference/view_variables.htm" />
- <topic label="Viewing Variables" href="html/debugger/variables/viewing_variables.htm" />
- <topic label="Adding and Removing Global Variables" href="html/debugger/variables/adding_variables.htm" />
- <topic label="Expressions view" href="html/reference/view_expressions.htm" />
- <topic label="Viewing Expressions" href="html/debugger/variables/viewing_expressions.htm" />
- <topic label="Editing Expressions" href="html/debugger/variables/editing_expressions.htm" />
- <topic label="Adding and Removing Expressions" href="html/debugger/variables/adding_expressions.htm" />
- </topic>
- <topic label="Memory view" href="html/reference/view_memory_wnd.htm" >
- <topic href="html/concepts/working_with_memory.htm" label="Working with Memory"></topic>
- <topic label="Opening a Memory View" href="html/tasks/memory/view_memory_show.htm" />
- <topic label="Adding a Memory Monitor" href="html/tasks/memory/memory_monitor_adding.htm" />
- <topic label="Adding a Memory Rendering" href="html/tasks/memory/memory_rendering_adding.htm" />
- <topic label="Removing a Memory Monitor or Rendering" href="html/tasks/memory/memory_monitor_removing.htm" />
- <topic label="Memory Rendering Options" href="html/reference/memory_rendering_options.htm" />
- </topic>
- <topic label="Modules View" href="html/reference/view_module_wnd.htm" />
- <topic label="Registers" href="html/concepts/registers.htm" >
- <topic label="Registers view" href="html/reference/view_registers.htm" />
- <topic label="Opening a Registers View" href="html/tasks/registers/mem_reg_open_wnd.htm" />
- <topic href="html/tasks/registers/mem_reg_data_views.htm" label="Changing Register Data Views"></topic>
- <topic label="Expanding Register Groups" href="html/tasks/registers/mem_reg_viewing.htm" />
- <topic label="Changing Register Values" href="html/tasks/registers/mem_reg_changing.htm" />
- <topic label="ARM Registers" href="html/concepts/arm_registers.htm" />
- </topic>
- <topic href="html/reference/view_symbian_kernel.htm" label="Symbian OS Data view">
- <topic href="html/tasks/debugger/view_symbian_kernel_set.htm" label="Setting the Refresh Rate"></topic>
- </topic>
</topic>
<topic label="Debugging actions" href="html/debugger/debug/debug.htm">
<topic href="html/debugger/debug/viewing_debug.htm" label="View debugging"></topic>
@@ -250,6 +256,7 @@
<topic href="html/reference/trk/importing_remote_conns.htm" label="Importing remote connections"></topic>
</topic>
+ <!--
<topic label="Debugging with an emulator" href="html/projects/launch/launch_emulator.htm" >
<topic label="Executable Selection" href="html/projects/launch/wiz_new_launch_config.htm#EXE_SEL" />
<topic label="Build Options Selection" href="html/projects/launch/wiz_new_launch_config.htm#BLD_OPT" />
@@ -260,7 +267,7 @@
</topic>
<topic label="DLL Emulator Example" href="html/concepts/SampleExampleProjectCreate.html" />
</topic>
-
+
<topic label="Run mode projects" href="html/projects/launch/pnp_debug_overview.htm" >
<topic label="Run Mode Overview" href="html/tasks/start/carbide_overview_trk.htm" ></topic>
<topic href="html/concepts/autotargeting.htm" label="Auto-Targeting of Executables"></topic>
@@ -272,6 +279,8 @@
</topic>
<topic href="html/tasks/debugger/run_mode_debug.htm" label="Run Mode Example">
</topic>
+ </topic>
+ -->
<topic href="html/tasks/projects/prj_debug_dlls.htm" label="Debugging DLLs"></topic>
<topic href="html/tasks/projects/prj_import_exe.htm" label="Importing a Symbian Executable"></topic>
@@ -280,7 +289,6 @@
<topic href="html/concepts/arm_registers.htm" label="Registers"></topic>
<topic href="html/reference/view_symbian_kernel.htm" label="Symbian OS Data View"></topic>
- </topic>
<topic label="Stop mode projects" href="html/tasks/StopModeToc.htm">
<topic href="html/projects/launch/launch_board.htm" label="Debugging a reference board">
--- a/core/com.nokia.carbide.cpp.featureTracker/META-INF/MANIFEST.MF Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.featureTracker/META-INF/MANIFEST.MF Wed Jul 21 12:11:48 2010 -0500
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: FeatureTracker Plug-in
+Bundle-Name: FeatureTracker
Bundle-SymbolicName: com.nokia.carbide.cpp.featureTracker;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerPlugin
-Bundle-Vendor: NOKIA
+Bundle-Vendor: Nokia
Require-Bundle: org.eclipse.core.runtime
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
--- a/core/com.nokia.carbide.cpp.leavescan/.classpath Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
--- a/core/com.nokia.carbide.cpp.leavescan/.project Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>com.nokia.carbide.cpp.internal.leavescan</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
--- a/core/com.nokia.carbide.cpp.leavescan/META-INF/MANIFEST.MF Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Leavescan Plug-in
-Bundle-SymbolicName: com.nokia.carbide.cpp.leavescan; singleton:=true
-Bundle-Version: 1.4.0.qualifier
-Bundle-Activator: com.nokia.carbide.cpp.internal.leavescan.LeavescanPlugin
-Bundle-Vendor: Nokia
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt.core,
- com.nokia.carbide.cdt.builder,
- com.nokia.carbide.cpp.sdk.core,
- com.nokia.cpp.utils.core,
- com.nokia.cpp.utils.ui
-Bundle-ActivationPolicy: lazy
--- a/core/com.nokia.carbide.cpp.leavescan/book.css Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-/*
- Nokia DPT Tools CSS
- Nokia C++ Development Tools Austin
- Date: 2005/11/04
-
-*/
-
-/* Add whitespace around entire display to avoid crowding edges of view */
-/* 20070523-Removed top margin size to close gap between location breadcrumbs and page title */
-html {
- margin: 0px 10px 10px 10px;
- }
-
-/* Set default font to serif style, 12-pt and plain */
-body, p, table {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: normal;
-}
-
-/* Use sans-serif fonts for all title styles */
-h1, h2, h3, h4, h5, h6, strong, em {
- font-family: Arial, Helvetica, sans-serif;
- color: #000000;
- }
-
-h1 { font-size:20px }
-h2 { font-size:18px }
-h3 { font-size:16px }
-h4 { font-size:14px }
-h5 { font-size:12px }
-h6 { font-size:10px }
-
-/* For headlines at the top of a view, add space */
-/* 20070522-added gradiant to background to update visual style of docs */
-h1, h2, h3 {
- background-image: url(html/images/green_fade_left_68_165_28.png);
- background-repeat: no-repeat;
- padding:10px 0px 10px 12px;
- }
-
-li {
- margin-bottom:8px;
- margin-top:8px;
- }
-
-/* Footer includes space and a gray line above the company logo */
-#footer {
- padding-top:10px;
- margin-top:20px;
- border-top:1px solid #999;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
- color: #03C;
- }
-
-.listing {
- font-family: "Courier New", Courier, mono;
- color: #009;
- background-color: #EEE;
- padding: 10px 0px;
- margin: 10px 0px;
- }
-
-.code, pre {
- font-family: "Courier New", Courier, mono;
- font-size: 11px;
- color: #333;
- }
-
-.step {
- /* background-color: #EEE; */
- /* margin: 10px 0px; */
- color: #333;
- border-bottom:2px solid #EEE;
- }
-
-.substep {
- background-color: #EEE;
- }
-
-
-/* Figure/Listing/Table titles are centered and gray */
-p.table {
- color: #999;
- font-weight: bold;
- padding-top: 5px;
- }
-
-table {
- border: solid #999 1px;
- table-layout: auto;
- font-size: 12px;
- }
-
-td, th {
- border: solid #999 1px;
- padding: 5px;
- vertical-align:top;
- }
-
-/* 20070522-replaced gray with green background to match gradiant color for title */
-th {
- background-color:#ACD79B;
- /* background-color:#999;
- color:#FFF; */
- }
-
-div.ol.p {
- margin-left: 3em;
- }
-
-/* Make all ordered/unordered list items appear in bold gray */
-div ol > li, div ul > li {
- font-weight:bold;
- color: #333;
- }
-
-div ol > p, div ul > p, div li > p {
- font-weight:normal;
- }
-
-/* Make all H4 and H5 items appear in bold gray against a light green background */
-div h5, div h4 {
- padding:5px 0px 5px 12px;
- background-color:#ECFBEA;
- /* background-color: #EEE; */
- font-weight:bold;
- color: #333;
- }
-
-
-/* Notes stand out using a light top & bottom borders with dark gray text */
-p.note {
- /* color: #03C; */
- /* background-color: #FFFF99; */
- color: #333;
- padding: 5px;
- margin-left: 1em;
- margin-right: 1em;
- border-top: solid #BBB thin;
- border-bottom: solid #BBB thin;
- }
-
-
-/* Figure/Listing/Table titles are centered and gray */
-p.figure {
- color: #333;
- text-align: center;
- font-weight: bold;
- }
-
-/* highly visible red background and white text for things that need fixing before release */
-/* SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
-.fix {
- background-color: red;
- font-weight: bold;
- color: white;
- }
-
-.question {
- font-style:italic;
- font-weight:bold;
- color: #555;
- }
-
-.titleSmall {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
- }
-
-
-.plain {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- font-style: normal;
- line-height: normal;
- font-weight: normal;
- font-variant: normal;
- color: #000000;
- text-decoration: none;
- }
-
-a:link { color: #0033CC }
-a:visited { color: #555555 }
-a:hover { color: #0033CC }
-
--- a/core/com.nokia.carbide.cpp.leavescan/build.properties Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
- META-INF/,\
- .,\
- icons/,\
- html/
--- a/core/com.nokia.carbide.cpp.leavescan/html/cheatsheets/getStarted_tool.xml Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<cheatsheet title="Getting Started with TOOL NAME">
- <intro>
- <description>
- Add TOOL NAME introduction message here.
- </description>
- </intro>
-
- <item title="STEP 1" href="/com.nokia.carbide.cpp.leavescan/html/reference/reference.htm" skip="true" >
- <description>
- Add STEP 1 info here and link to more indepth step information.
- </description>
- </item>
-
- <item title="STEP 2" href="/com.nokia.carbide.cpp.leavescan/html/reference/reference.htm" skip="true" >
- <description>
- Add additional STEPs as required and link to more indepth step information.
- </description>
- </item>
-
-
-</cheatsheet>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.leavescan/html/concepts/concepts.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Concepts</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h1>Introduction</h1>
-<p>LeaveScan is a useful tool that can be used regularly against your source code. LeaveScan is a command-line utility developed by Symbian Ltd that verifies that your code respects the naming conventions for leaving functions.</p>
-<p>LeaveScan checks that all functions which have the potential to leave are named according to the Symbian OS convention, with a trailing L. Any function that Leaves, or calls a function that Leaves (other than in a TRAP harness), must have a name ending in L. LeaveScan can be used on your source to indicate areas of code where you may have forgotten to use the naming convention. By revealing where leaves may occur but are not indicated by the function name, it highlights potential bugs and gives you an opportunity to fix the problem and ensure that your code handles any leaves correctly. </p>
-<h4>Related Topic</h4>
-<p><a href="../reference/reference.htm">How it Works</a></p>
-<p><a href="../tasks/tasks.htm">Using Leavescan</a> </p>
-<div class="step">
- <p><img src="../images/nokia_copyright.png" alt="copyright" width="280" height="21"></img></p>
-</div>
-</body>
-</html>
Binary file core/com.nokia.carbide.cpp.leavescan/html/images/green_fade_left_68_165_28.png has changed
Binary file core/com.nokia.carbide.cpp.leavescan/html/images/nokia_copyright.png has changed
--- a/core/com.nokia.carbide.cpp.leavescan/html/index.xml Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.index"?>
-
- <!-- INDEX INSTRUCTIONS
-
- Use the index.xml file to define the index entries for the plugin's
- help contents. In Eclipse 3.2 and beyond an Index tab appears in the Help
- viewer making it possible for user to more easily locate subjects of
- interest to them.
-
- In brief, every file used in the help documentation should have at least one
- associated index entry for it. Ideally, it's simple to make two entries per
- page by simply re-wording the subject slightly. For example, a view could
- be indexed twice like this, 1) Breakpoint view, and 2) Views/Breakpoint.
-
- -->
-
-
-<index>
-
- <!-- AAAAAAAA -->
-
- <!--
- <entry keyword="--index topic here--" >
- <topic href="--url to html file here" />
- </entry>
- -->
-
- <!-- BBBBBBBB -->
- <!-- CCCCCCCC -->
- <!-- DDDDDDDD -->
- <!-- EEEEEEEE -->
- <!-- FFFFFFFF -->
- <!-- GGGGGGGG -->
- <!-- HHHHHHHH -->
- <!-- IIIIIIII -->
- <!-- JJJJJJJJ -->
- <!-- KKKKKKKK -->
- <!-- LLLLLLLL -->
- <entry keyword="Leavescan" >
- <topic href="html/concepts/concepts.htm" />
- </entry>
- <!-- MMMMMMMM -->
- <!-- NNNNNNNN -->
- <!-- OOOOOOOO -->
- <!-- PPPPPPPP -->
- <!-- QQQQQQQQ -->
- <!-- RRRRRRRR -->
- <!-- SSSSSSSS -->
- <!-- TTTTTTTT -->
- <!-- UUUUUUUU -->
- <!-- VVVVVVVV -->
- <!-- WWWWWWWW -->
- <!-- XXXXXXXX -->
- <!-- YYYYYYYY -->
- <!-- ZZZZZZZZ -->
-
-</index>
-
--- a/core/com.nokia.carbide.cpp.leavescan/html/nokia.css Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-/* Nokia DPT Tools CSS
- Nokia DPT Austin
- Date: 2006/11/02
-*/
-
-/* Add whitespace around entire display to avoid crowding edges of view */
-html {
- margin: 10px;
- /* fixes gray backgrounds when displayed in external browsers */
- background-color:#FFFFFF;
- }
-
-/* Set default font to serif style, 12-pt and plain */
-body {
- font-family: Georgia, "Times New Roman", Times, serif;
- font-size: 12px;
- font-weight: plain;
-}
-
-/* Use sans-serif fonts for all title styles and Nokia blue */
-h1, h2, h3, h4, h5, h6, strong, em {
- font-family: Arial, Helvetica, sans-serif;
- color: #333;
- }
-
-strong{
- color: #333;
- }
-
-/* For headlines at the top of a view, add space and a gray line underneath */
-h2, h3 {
- padding:10px 0px;
- border-bottom:1px solid #BBB;
- }
-
-li {
- margin-bottom:8px;
- margin-top:8px;
- }
-
-
-/* Footer includes space and a gray line above the company logo */
-#footer {
- padding-top:10px;
- margin-top:20px;
- border-top:1px solid #999;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- color: #333;
- }
-
-.listing {
- font-family: "Courier New", Courier, mono;
- color: #009;
- background-color: #EEE;
- padding: 10px 0px;
- margin: 10px 0px;
- }
-
-.code, pre {
- font-family: "Courier New", Courier, mono;
- font-size: 12px;
- color: #333;
- }
-
-.step {
- /* background-color: #EEE; */
- /* margin: 10px 0px; */
- color: #333;
- border-bottom:2px solid #EEE;
- }
-
-.substep {
- background-color: #EEE;
- }
-
-
-/* Figure/Listing/Table titles are centered and gray */
-p.table {
- color: #999;
- font-weight: bold;
- padding-top: 5px;
- }
-
-table {
- border: 1px solid #999;
- table-layout: auto;
- }
-
-td, th {
- border: 1px solid #999;
- padding: 5px;
- vertical-align:top;
- }
-
-th {
- background-color:#999;
- color:#FFF;
- }
-
-div.ol.p {
- margin-left: 3em;
- }
-
-/* Make all ordered/unordered list items appear in bold gray */
-div ol > li, div ul > li {
- font-weight:bold;
- color: #333;
- }
-
-/* Make all H4 and H5 items appear in bold gray against a light gray background */
-div h5, div h4 {
- padding: 5px;
- background-color: #EEE;
- font-weight:bold;
- color: #333;
- }
-
-
-/* Notes stand out using a light top & bottom borders with dark gray text */
-p.note {
- /* color: #03C; */
- /* background-color: #FFFF99; */
- color: #333;
- padding: 5px;
- margin-left: 1em;
- margin-right: 1em;
- border-top:1px solid #BBB;
- border-bottom:1px solid #BBB;
-}
-
-
-/* Figure/Listing/Table titles are centered and gray */
-p.figure {
- color: #333;
- text-align: center;
- font-weight: bold;
-}
-
-/* red background and white text for things that need fixing before release */
-.fix {
- background-color: red;
- font-weight: bold;
- color: white;
- }
-
-.question {
- font-style:italic;
- font-weight:bold;
- color: #333;
- }
-
-.titleSmall {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- }
-
-.copyrightStatement {
- font-size: 11px;
- color: #006699; /* Symbian blue */
- }
-
-div.Footer table, div.Footer td, div.Footer th {
- border: 0px none #000;
- }
--- a/core/com.nokia.carbide.cpp.leavescan/html/reference/reference.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>References</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>How it Works </h2>
-<p>LeaveScan works by examining each line of source code and checking that functions which do not terminate in L cannot leave. However, there are a few functions (more accurately, operators) in Symbian OS that may leave but cannot have an L suffix (such as <strong>operator<<</strong> and <strong>operator>></strong> for <strong>RWriteStream</strong> and <strong>RReadStream</strong> respectively).</p>
-<p>The naming convention cannot be applied appropriately to operators and, unfortunately, LeaveScan does not have the logic needed to recognize operators that may leave. When you use operators that you know have the potential to leave, you’ll have to remember to check this code by sight yourself.</p>
-<p>LeaveScan also checks functions which do have a trailing L to see if they really can leave. If functions are encountered which do not leave, LeaveScan raises a warning. However, this scenario can be perfectly valid, for example, when implementing an abstract function such as CActive::RunL(), some implementations may leave but others may not.</p>
-<p>LeaveScan ignores calls in trapped functions, commented out code, i.e. // and /* and */. It also checks for calls to LD, LC and LX functions as well as normal L functions. It also checks for User::Leave(), ELeave, User::LeaveIfError().</p>
-<p> </p>
-<div class="step">
- <p><img src="../images/nokia_copyright.png" alt="copyright" width="280" height="21"></img></p>
-</div>
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.leavescan/html/tasks/tasks.htm Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Tasks</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Using Leavescan </h2>
-<p>LeaveScan preferences can be defined in Carbide.c++ by selecting <strong>Windows > Preferences...</strong> and expanding the Carbide Extensions group and selecting <strong>Leavescan preferences</strong>. Specify the path to the leavescan command to avoid calling the leavescan stub.</p>
-<p>LeaveScan can also be run from the command line to scan whole directories and output to a file. You can use the <strong>for</strong> command to scan directories. For example, <strong>for /R %i in (*.cpp) do leavescan %i >> leavescan.out</strong>. This will scan all cpp files in or below the current directory and places the result in leavescan.out.</p>
-<div class="step">
- <p><img src="../images/nokia_copyright.png" alt="copyright" width="280" height="21"></img></p>
-</div>
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.leavescan/html/tocConcepts.xml Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc>
-
- <!-- Enter topic entries here for Concepts section of help -->
-
- <topic label="Introduction" href="html/concepts/concepts.htm" />
-
-</toc>
--- a/core/com.nokia.carbide.cpp.leavescan/html/tocReference.xml Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc>
-
- <!-- Enter topic entries here for References section of help -->
-
- <topic label="How it Works" href="html/reference/reference.htm" />
-
-</toc>
--- a/core/com.nokia.carbide.cpp.leavescan/html/tocTasks.xml Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc>
-
- <!-- Enter topic entries here for Tasks section of help -->
-
- <topic label="Using Leavescan" href="html/tasks/tasks.htm" />
-
-</toc>
--- a/core/com.nokia.carbide.cpp.leavescan/html/toolTOC.xml Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<!--
- Links tool docs to main TOC for Carbide help in the defined location.
- NOTE: Tool name seems to be ignored here for display purposes but needed to
- make the link_to section work.
--->
-
-<toc label="TOOL NAME"
- link_to="../com.nokia.carbide.cpp/nokiaTOC.xml#anchorCarbideMisc" >
-
- <!--
- Define the TOOL NAME as it should appear in the TOC. The tool.htm page
- is the cover page for the tool help.
- -->
- <topic label="TOOL NAME" href="html/tool.htm" >
-
- <!--
- Following the Eclipse guidelines, the tool help is arranged as Concepts,
- References, and Tasks. Each has their own associated XML file to make it
- easy to edit each section as well as an overview page.
- -->
- <topic label="Concepts"
- href="html/concepts/concepts.htm" >
- <link toc="tocConcepts.xml" />
- </topic>
-
- <topic label="References" >
- href="html/reference/references.htm" >
- <link toc="tocReference.xml" />
- </topic>
-
- <topic label="Tasks" >
- href="html/tasks/tasks.htm" >
- <link toc="tocTasks.xml" />
- </topic>
-
- </topic>
-
-</toc>
\ No newline at end of file
Binary file core/com.nokia.carbide.cpp.leavescan/icons/Run_Leavescan.png has changed
--- a/core/com.nokia.carbide.cpp.leavescan/plugin.xml Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- adaptable="true"
- objectClass="org.eclipse.core.resources.IFile"
- id="com.nokia.carbide.cpp.leavescan.runLeaveScan">
- <!-- Only show action for Carbide.c++ projects. The leavescan action utilizes some Carbide.c++ specific APIs -->
- <visibility>
- <and>
- <objectState
- name="projectNature"
- value="com.nokia.carbide.cdt.builder.carbideCPPBuilderNature"/>
- <or>
- <objectState
- name="extension"
- value="cpp"
- />
- <objectState
- name="extension"
- value="cp"
- />
- </or>
- </and>
- </visibility>
- <action
- label="Run Leavescan"
- class="com.nokia.carbide.cpp.internal.leavescan.popup.actions.LeavescanAction"
- menubarPath="buildGroup"
- enablesFor="+"
- icon="icons/Run_Leavescan.png"
- id="com.nokia.carbide.cpp.leavescan.leaveScanAction">
- </action>
- </objectContribution>
- </extension>
-
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- adaptable="true"
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.mmp"
- id="com.nokia.carbide.cpp.leavescan.runLeaveScanOnMMP">
- <!-- Only show action for Carbide.c++ projects. The leavescan action utilizes some Carbide.c++ specific APIs -->
- <visibility>
- <objectState
- name="projectNature"
- value="com.nokia.carbide.cdt.builder.carbideCPPBuilderNature"/>
- </visibility>
- <action
- label="Run Leavescan on Project MMP"
- class="com.nokia.carbide.cpp.internal.leavescan.popup.actions.LeavescanAction"
- menubarPath="buildGroup"
- enablesFor="1"
- icon="icons/Run_Leavescan.png"
- id="com.nokia.carbide.cpp.leavescan.leaveScanActionOnMMP">
- </action>
- </objectContribution>
- </extension>
-
- <extension
- id="LeaveScanErrorParser"
- name="LeaveScan Error Parser"
- point="org.eclipse.cdt.core.ErrorParser">
- <errorparser
- class="com.nokia.carbide.cpp.internal.leavescan.error.parsers.LeaveScanErrorParser">
- </errorparser>
- </extension>
-
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- name="Leavescan Preferences"
- class="com.nokia.carbide.cpp.internal.leavescan.ui.LeavescanPreferences"
- category="com.nokia.carbide.cpp.preferences.ExtensionsPreferencesPage"
- id="com.nokia.carbide.cpp.leavescan.ui.LeavescanPreferences">
- </page>
- </extension>
-
- <extension
- point="org.eclipse.core.runtime.preferences">
- <initializer
- class="com.nokia.carbide.cpp.internal.leavescan.ui.LeavescanPreferenceInitializer">
- </initializer>
- </extension>
- <extension
- point="org.eclipse.ui.startup">
- </extension>
-
-
- <!-- Carbide Tool Help extension -->
- <!-- Uncomment to add content assist material to the Help system -->
- <!--
- <extension point="org.eclipse.help.toc">
- <toc
- file="html/toolTOC.xml"
- primary="true"/>
- </extension>
- -->
-
- <!-- Carbide.c++ cheatsheets extension -->
- <!-- Uncomment to add cheatsheet content -->
-
- <!-- Rename the "id" as appropriate for your tool -->
- <!--
- <extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">
- <cheatsheet
- category="com.nokia.carbide.ide.cheatsheets"
- contentFile="html/cheatsheets/getStarted_tool.xml"
- id="com.nokia.carbide.cpp.leavescan.tool"
- name="Tool Example"/>
- </extension>
- -->
-
- <!-- CONTEXT IDs for CONTEXTUAL HELP in windows, dialogs, and views -->
- <!-- Uncomment to add F1 user assistance content -->
- <!--
- <extension point="org.eclipse.help.contexts" >
-
- <contexts file="html/context_help/org_eclipse_debug_ui.xml"
- plugin="org.eclipse.debug.ui" />
-
- </extension>
- -->
-
- <!-- Keyword Indexing support -->
- <!-- Uncomment to add keyword index to Help system -->
- <!--
- <extension point="org.eclipse.help.index" >
- <index file="html/index.xml"/>
- </extension>
- -->
-
-</plugin>
--- a/core/com.nokia.carbide.cpp.leavescan/src/com/nokia/carbide/cpp/internal/leavescan/LeavescanPlugin.java Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-*/
-package com.nokia.carbide.cpp.internal.leavescan;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IStartup;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class LeavescanPlugin extends AbstractUIPlugin implements IStartup {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "com.nokia.carbide.cpp.leavescan";
-
- // The shared instance
- private static LeavescanPlugin plugin;
-
- private static IPreferenceStore prefsStore;
-
- /**
- * The constructor
- */
- public LeavescanPlugin() {
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- getLeaveScanPrefsStore();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static LeavescanPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
-
- public static IPreferenceStore getLeaveScanPrefsStore(){
- if (prefsStore == null){
- prefsStore = getDefault().getPreferenceStore();
- }
-
- return prefsStore;
- }
-
- public void earlyStartup() {
- }
-
-}
--- a/core/com.nokia.carbide.cpp.leavescan/src/com/nokia/carbide/cpp/internal/leavescan/error/parsers/LeaveScanErrorParser.java Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-*/
-package com.nokia.carbide.cpp.internal.leavescan.error.parsers;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.cdt.core.ErrorParserManager;
-import org.eclipse.cdt.core.IErrorParser;
-import org.eclipse.cdt.core.IMarkerGenerator;
-import org.eclipse.core.resources.IFile;
-
-public class LeaveScanErrorParser implements IErrorParser {
-
- private Pattern leaveScanErrorPattern = Pattern.compile("(.*)?(\\((\\d+)\\))\\s+:\\s+(.*)"); //$NON-NLS-1$;
- private Pattern leaveScanWarningPattern = Pattern.compile("(.*)?(\\((\\d+)\\))\\s+:\\s+Warning\\s+(.*)"); //$NON-NLS-1$;
-
-
-
- public LeaveScanErrorParser() {
- }
-
- public boolean processLine(String line, ErrorParserManager errorParserManager) {
- // Known patterns.
- //
- // (a) warning
- // <file>(<line number>) : Warning - <message>
- // e.g.....
- // C:\Symbian\UIQ3SDK\Examples\UIQ\QMyDirectory\Src\MyDirectoryAppUi.cpp(211) : Warning - CMyDirectoryAppUi::DoMergeCategoriesL appears to contain no leavers.
- //
- //
- // (b) error
- // <file>(<line number>) : <message>
- // e.g....
- // C:\Symbian\9.1\S60_3rd_MR\Examples\Basics\StaticDLL\CreateStaticDLL.cpp(40) : CMessenger::Construct Calls a function that can leave. QUALIFIED WITH-> // copy given string into own descriptor
-
- Matcher warningMatcher = leaveScanWarningPattern.matcher(line);
- if (warningMatcher.matches()) {
- String fileName = warningMatcher.group(1);
- IFile file = errorParserManager.findFileName(fileName);
- String lineNumberStr = warningMatcher.group(3);
- int lineNumber = Integer.parseInt(lineNumberStr);
- String msgDescription = warningMatcher.group(4);
- msgDescription = msgDescription.trim();
- errorParserManager.generateMarker(file, lineNumber, msgDescription, IMarkerGenerator.SEVERITY_WARNING, null);
- return true;
- }
-
- Matcher errorMatcher = leaveScanErrorPattern.matcher(line);
- if (errorMatcher.matches()) {
- String fileName = errorMatcher.group(1);
- IFile file = errorParserManager.findFileName(fileName);
- String lineNumberStr = errorMatcher.group(3);
- int lineNumber = Integer.parseInt(lineNumberStr);
- String msgDescription = errorMatcher.group(4);
- msgDescription = msgDescription.trim();
- errorParserManager.generateMarker(file, lineNumber, msgDescription, IMarkerGenerator.SEVERITY_ERROR_RESOURCE, null);
- return true;
- }
-
- // check for other process errors
- if (line.toLowerCase().contains("the system cannot find the path specified") ||
- line.toLowerCase().contains("is not supported in this release") ||
- line.toLowerCase().contains("is not recognized as an internal or external command")){
- errorParserManager.generateMarker(null, -1, "Cannot run leavescan. Check that leavescan is on your PATH or go to the Carbide.c++ > Leavescan Preferences and set the Leavescan Directory. Leavescan.exe can be found at: http://www3.symbiandevnet.com/faq.nsf/0/f3765f69e4fb9baa80256a570051b952?OpenDocument", IMarkerGenerator.SEVERITY_ERROR_BUILD, null);
-
- }
-
- return false;
- }
-
-}
--- a/core/com.nokia.carbide.cpp.leavescan/src/com/nokia/carbide/cpp/internal/leavescan/popup/actions/LeavescanAction.java Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,309 +0,0 @@
-/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-*/
-package com.nokia.carbide.cpp.internal.leavescan.popup.actions;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
-import com.nokia.carbide.cdt.builder.EpocEngineHelper;
-import com.nokia.carbide.cdt.builder.builder.CarbideCPPBuilder;
-import com.nokia.carbide.cdt.builder.builder.CarbideCommandLauncher;
-import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
-import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo;
-import com.nokia.carbide.cpp.internal.leavescan.LeavescanPlugin;
-import com.nokia.carbide.cpp.internal.leavescan.ui.LeavescanPreferenceConstants;
-import com.nokia.cpp.internal.api.utils.core.HostOS;
-
-public class LeavescanAction implements IObjectActionDelegate {
-
- private ISelection selection;
-
- // id definied from plugin.xml
- public static final String LEAVE_SCAN_ACTION_POP_UP_ID = "com.nokia.carbide.cpp.leavescan.leaveScanAction";
- public static final String LEAVE_SCAN_ACTION_MMP_POP_UP_ID = "com.nokia.carbide.cpp.leavescan.leaveScanActionOnMMP";
-
-
- /**
- * Constructor for Action1.
- */
- public LeavescanAction() {
- super();
- }
-
- /**
- * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
- */
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
- }
-
- /**
- * @see IActionDelegate#run(IAction)
- */
- public void run(IAction action) {
- if (action.getId().equals(LEAVE_SCAN_ACTION_POP_UP_ID)){
- // scan the selected source file(s)
- handleLeaveScanAction(action);
- } else if (action.getId().equals(LEAVE_SCAN_ACTION_MMP_POP_UP_ID)){
- // scan the selected source file(s)
- handleLeaveScanActionOnMMP(action);
- }
- }
-
- /**
- * @see IActionDelegate#selectionChanged(IAction, ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) {
- this.selection = selection;
- }
-
- /**
- * Run leavescan on source file selection(s)
- * @param action
- */
- private void handleLeaveScanAction(IAction action){
- // get the project each file belongs to...
- HashMap<IProject, List<IPath>> projectSourceMap = new HashMap<IProject, List<IPath>>();
- if (selection != null && selection instanceof IStructuredSelection) {
- Iterator iter = ((IStructuredSelection)selection).iterator();
- while (iter.hasNext()) {
- Object selItem = iter.next();
- if (selItem instanceof IFile) {
- IProject currProject = ((IResource)selItem).getProject();
- if (projectSourceMap.get(currProject) == null){
- // project is not a key, create a new key/value entry
- List<IPath> pathList = new ArrayList<IPath>();
- pathList.add(((IResource)selItem).getLocation());
- projectSourceMap.put(currProject, pathList);
-
- } else {
- // this key already exists, update the source list
- List<IPath> pathList = projectSourceMap.get(currProject);
- pathList.add(((IResource)selItem).getLocation());
- projectSourceMap.put(currProject, pathList); // 2+ paths exist for this project
- }
- }
- }
- }
-
- // Get the leavescan preferences...
- IPreferenceStore store = LeavescanPlugin.getLeaveScanPrefsStore();
- final boolean noisyOutput = store.getBoolean(LeavescanPreferenceConstants.LEAVESCAN_NOISY_OUTPUT);
- final String leaveScanFolder = store.getString(LeavescanPreferenceConstants.LEAVESCAN_FOLDER);
-
- for (final IProject project : projectSourceMap.keySet()){
- final List<IPath> finalPathList = projectSourceMap.get(project);
- // Run a job on each project. The arguments for leavescan is:
- // leavescan [-h|-n|-v|-N] <iFilename.cpp> [<iFilename.cpp> ...]
- //
- // -h: This help.
- // -n: Noisy output - provides diagnostics (if available).
- // -N: Very noisy output - provides diagnostics (if available).
- // -v: Displays version (for build & automation systems).
- Job buildJob = new Job("Running Leave Scan on Project: " + project.getName()) { //$NON-NLS-1$
- protected IStatus run(IProgressMonitor monitor){
-
- final String[] leaveScanParserIds = new String[] {
- "com.nokia.carbide.cpp.leavescan.LeaveScanErrorParser"
- };
-
- ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project);
- try {
- CarbideCPPBuilder.removeAllMarkers(project);
- } catch (CoreException e){
- e.printStackTrace();
- }
- IPath workingDir = cpi.getINFWorkingDirectory();
- CarbideCommandLauncher cmdLauncher = new CarbideCommandLauncher(project, monitor, leaveScanParserIds, workingDir);
- cmdLauncher.startTimingStats();
- int fileCount = 1;
- int listSize = finalPathList.size();
- for (IPath currPath : finalPathList){
-
- //System.out.print("\nProject: " + project.getName() + " | Source File: " + currPath.toOSString()); // Debug
-
- ICarbideBuildConfiguration defaultConfig = cpi.getDefaultConfiguration();
- monitor.beginTask("Running leavescan.", 100);
-
- double dWorked = ((double)fileCount / (double)listSize) * 100;
- monitor.worked((int)dWorked);
- String taskName = "Running leavescan on file \"" + currPath.toOSString() + "\" for project \"" + project.getName() + ".";
- monitor.setTaskName(taskName);
- cmdLauncher.writeToConsole("\n***" + taskName + "\n");
- // Construct the leavescan arguments
- List<String> leaveScanArgList = new ArrayList<String>();
- leaveScanArgList.add("/c");
-
- if (leaveScanFolder.length() > 0){
- leaveScanArgList.add(leaveScanFolder + "leavescan" + HostOS.EXE_EXT);
- } else {
- leaveScanArgList.add("leavescan" + HostOS.EXE_EXT);
- }
-
- if (noisyOutput) {
- leaveScanArgList.add("-N");
- } else {
- leaveScanArgList.add("-n");
- }
-
- leaveScanArgList.add(currPath.toOSString());
- String[] args = new String[leaveScanArgList.size()];
- leaveScanArgList.toArray(args);
- cmdLauncher.showCommand(true);
-
- // executeCommand, a special extension to the regular execute which will handle
- // writing the console output, error parsing, and creating error markers.
- cmdLauncher.executeCommand(CarbideCommandLauncher.getCmdExeLocation(), args, CarbideCPPBuilder.getResolvedEnvVars(defaultConfig), workingDir);
-
- fileCount++;
- }
- cmdLauncher.writeToConsole(cmdLauncher.getTimingStats());
- return new Status(IStatus.OK, LeavescanPlugin.PLUGIN_ID, IStatus.OK, "LeaveScan Complete", null);
- }
- };
-
- buildJob.setPriority(Job.BUILD);
- buildJob.schedule();
- }
- }
-
- /**
- * Run leavescan on all the sources in the current project MMP file.
- * The sources files will be build configuration specifc (i.e. MMP is preprocessed) to return
- * platform specific source list.
- * @param action - The IAction interface from the eclipse core
- */
- private void handleLeaveScanActionOnMMP(IAction action){
- // get the project each file belongs to...
- IProject project = null;
- IPath mmpFile = null;
- if (selection != null && selection instanceof IStructuredSelection) {
- Iterator iter = ((IStructuredSelection)selection).iterator();
- while (iter.hasNext()) {
- Object selItem = iter.next();
- if (selItem instanceof IFile) {
- project = ((IResource)selItem).getProject();
- mmpFile = ((IResource)selItem).getLocation();
- //System.out.print("\nMMP File Selected: " + ((IResource)selItem).getLocation());
- }
- }
- }
-
- if (project == null){
- return;
- }
-
- // Get the leavescan preferences...
- IPreferenceStore store = LeavescanPlugin.getLeaveScanPrefsStore();
- final boolean noisyOutput = store.getBoolean(LeavescanPreferenceConstants.LEAVESCAN_NOISY_OUTPUT);
- final String leaveScanFolder = store.getString(LeavescanPreferenceConstants.LEAVESCAN_FOLDER);
-
- ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project);
- if (cpi.getDefaultConfiguration() == null)
- return;
-
- List<IPath> sourceFileList = new ArrayList<IPath>();
- // Get the list of source files for the default configuration this MMP is associated with.
- sourceFileList = EpocEngineHelper.getSourceFilesForConfiguration(cpi.getDefaultConfiguration(), mmpFile);
-
- final List<IPath> finalPathList = new ArrayList<IPath>(sourceFileList);
- final IProject finalProject = project;
- final Path finalMMPPath = new Path(mmpFile.toOSString());
- Job buildJob = new Job("Running Leave Scan on MMP: " + mmpFile.toOSString()) { //$NON-NLS-1$
- protected IStatus run(IProgressMonitor monitor){
-
- final String[] leaveScanParserIds = new String[] {
- "com.nokia.carbide.cpp.leavescan.LeaveScanErrorParser"
- };
-
- ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(finalProject);
- try {
- CarbideCPPBuilder.removeAllMarkers(finalProject);
- } catch (CoreException e){
- e.printStackTrace();
- }
- IPath workingDir = cpi.getINFWorkingDirectory();
- CarbideCommandLauncher cmdLauncher = new CarbideCommandLauncher(finalProject, monitor, leaveScanParserIds, workingDir);
- cmdLauncher.startTimingStats();
- int fileCount = 1;
- int listSize = finalPathList.size();
- for (IPath currPath : finalPathList){
-
- //System.out.print("\nMMP Project: " + finalMMPPath.lastSegment() + " | Source File: " + currPath.toOSString()); // Debug
-
- ICarbideBuildConfiguration defaultConfig = cpi.getDefaultConfiguration();
- monitor.beginTask("Running leavescan.", 100);
-
- double dWorked = ((double)fileCount / (double)listSize) * 100;
- monitor.worked((int)dWorked);
- String taskName = "Running leavescan on file \"" + currPath.toOSString() + "\" for MMP \"" + finalMMPPath.lastSegment() + ".";
- monitor.setTaskName(taskName);
- cmdLauncher.writeToConsole("\n***" + taskName + "\n");
- // Construct the leavescan arguments
- List<String> leaveScanArgList = new ArrayList<String>();
- leaveScanArgList.add("/c");
-
- if (leaveScanFolder.length() > 0){
- leaveScanArgList.add(leaveScanFolder + "leavescan" + HostOS.EXE_EXT);
- } else {
- leaveScanArgList.add("leavescan" + HostOS.EXE_EXT);
- }
-
- if (noisyOutput) {
- leaveScanArgList.add("-N");
- } else {
- leaveScanArgList.add("-n");
- }
-
- leaveScanArgList.add(currPath.toOSString());
- String[] args = new String[leaveScanArgList.size()];
- leaveScanArgList.toArray(args);
- cmdLauncher.showCommand(true);
-
- // executeCommand, a special extension to the regular execute which will handle
- // writing the console output, error parsing, and creating error markers.
- cmdLauncher.executeCommand(CarbideCommandLauncher.getCmdExeLocation(), args, CarbideCPPBuilder.getResolvedEnvVars(defaultConfig), workingDir);
-
- fileCount++;
- }
- cmdLauncher.writeToConsole(cmdLauncher.getTimingStats());
- return new Status(IStatus.OK, LeavescanPlugin.PLUGIN_ID, IStatus.OK, "LeaveScan Complete", null);
- }
- };
-
- buildJob.setPriority(Job.BUILD);
- buildJob.schedule();
-
- }
-
-}
--- a/core/com.nokia.carbide.cpp.leavescan/src/com/nokia/carbide/cpp/internal/leavescan/ui/LeavescanPreferenceConstants.java Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-*/
-package com.nokia.carbide.cpp.internal.leavescan.ui;
-
-public class LeavescanPreferenceConstants {
-
- public final static String LEAVESCAN_NOISY_OUTPUT = "leavescanEnableNoisyOutput"; //$NON-NLS-1$
- public final static String LEAVESCAN_FOLDER = "leavescanFolder"; //$NON-NLS-1$
-}
--- a/core/com.nokia.carbide.cpp.leavescan/src/com/nokia/carbide/cpp/internal/leavescan/ui/LeavescanPreferenceInitializer.java Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-*/
-package com.nokia.carbide.cpp.internal.leavescan.ui;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import com.nokia.carbide.cpp.internal.leavescan.LeavescanPlugin;
-
-/**
- * Class used to initialize default preference values.
- */
-public class LeavescanPreferenceInitializer extends AbstractPreferenceInitializer {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
- */
- public void initializeDefaultPreferences() {
- IPreferenceStore store = LeavescanPlugin.getLeaveScanPrefsStore();
- store.setDefault(LeavescanPreferenceConstants.LEAVESCAN_NOISY_OUTPUT, false);
- store.setDefault(LeavescanPreferenceConstants.LEAVESCAN_FOLDER, "");
- }
-
-}
--- a/core/com.nokia.carbide.cpp.leavescan/src/com/nokia/carbide/cpp/internal/leavescan/ui/LeavescanPreferences.java Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-*/
-package com.nokia.carbide.cpp.internal.leavescan.ui;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-import com.nokia.carbide.cpp.internal.leavescan.LeavescanPlugin;
-import com.nokia.cpp.internal.api.utils.ui.BrowseDialogUtils;
-
-public class LeavescanPreferences extends PreferencePage implements
- IWorkbenchPreferencePage,Listener {
-
- private Text leaveScanDirEditText;
- private Button browseButton;
- private Button veryNoisyOuputButton;
- public static final String LEAVESCAN_PREF_HELP_ID = LeavescanPlugin.PLUGIN_ID + ".leavescan_prefs_page"; //$NON-NLS-1$
-
- /**
- * Create the preference page
- */
- public LeavescanPreferences() {
- super();
- }
-
- /**
- * Create contents of the preference page
- * @param parent
- */
- @Override
- public Control createContents(Composite parent) {
- Composite container = new Composite(parent, SWT.NULL);
- final GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 3;
- container.setLayout(gridLayout);
-
- final Label leavescanDirectoryLabel = new Label(container, SWT.NONE);
- leavescanDirectoryLabel.setToolTipText("Choose the directory where leavescan.exe lives.");
- leavescanDirectoryLabel.setText("Leavescan Directory:");
-
- leaveScanDirEditText = new Text(container, SWT.BORDER);
- leaveScanDirEditText.setLayoutData(new GridData(250, SWT.DEFAULT));
-
- browseButton = new Button(container, SWT.NONE);
- browseButton.setToolTipText("Choose the directory where leavescan.exe lives.");
- browseButton.setText("Browse...");
- browseButton.addListener(SWT.Selection, this);
-
- veryNoisyOuputButton = new Button(container, SWT.CHECK);
- veryNoisyOuputButton.setToolTipText("When enabled, -N is passed to leavescan for very verbose output. Otherwise -n is passed for minimal output.");
- veryNoisyOuputButton.setText("Very noisy ouput");
-
- getPrefsStoreValues();
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp(super.getControl(), LEAVESCAN_PREF_HELP_ID);
-
- return container;
- }
-
- /**
- * Initialize the preference page
- */
- public void init(IWorkbench workbench) {
- // Initialize the preference page
- }
-
- public void handleEvent(Event event) {
- if (event.widget == browseButton) {
- handleBrowse();
- }
-
- }
-
- private void getPrefsStoreValues(){
- IPreferenceStore store = LeavescanPlugin.getLeaveScanPrefsStore();
- boolean noisyOutput = store.getBoolean(LeavescanPreferenceConstants.LEAVESCAN_NOISY_OUTPUT);
- veryNoisyOuputButton.setSelection(noisyOutput);
-
- String leaveScanFolder = store.getString(LeavescanPreferenceConstants.LEAVESCAN_FOLDER);
- leaveScanDirEditText.setText(leaveScanFolder);
- }
-
- @Override
- protected void performDefaults() {
- veryNoisyOuputButton.setSelection(false);
- leaveScanDirEditText.setText("");
- super.performDefaults();
- }
-
- @Override
- public boolean performOk() {
-
- IPreferenceStore store = LeavescanPlugin.getLeaveScanPrefsStore();
-
- String leaveScanDir = leaveScanDirEditText.getText();
- if (leaveScanDir.length() > 0){
- if (!leaveScanDir.endsWith("\\")){
- leaveScanDir += "\\";
- leaveScanDirEditText.setText(leaveScanDir);
- }
- }
-
- if (leaveScanDir.length() > 0){
- IPath leaveScanPath = new Path(leaveScanDir);
- if (!leaveScanPath.toFile().exists()){
- if (!MessageDialog.openQuestion(getShell(), "Directory does not exist.", "The directory " + leaveScanPath + " does not exist.\n\nDo you want to continue?")){
- return false;
- }
- }
- }
-
- store.setValue(LeavescanPreferenceConstants.LEAVESCAN_FOLDER, leaveScanDir);
- store.setValue(LeavescanPreferenceConstants.LEAVESCAN_NOISY_OUTPUT, veryNoisyOuputButton.getSelection());
-
- return super.performOk();
- }
-
- private void handleBrowse() {
- String selectedDir = showBrowseDialog();
- if (selectedDir != null) {
- if (!selectedDir.equals(leaveScanDirEditText.getText())) {
- leaveScanDirEditText.setText(selectedDir);
- }
- }
- }
-
- private String showBrowseDialog() {
- DirectoryDialog dialog = new DirectoryDialog(leaveScanDirEditText.getShell(), SWT.OPEN);
- dialog.setText("Choose a folder...");
- BrowseDialogUtils.initializeFrom(dialog, leaveScanDirEditText);
- return dialog.open();
- }
-
-}
--- a/core/com.nokia.carbide.cpp.sdk.core/META-INF/MANIFEST.MF Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/META-INF/MANIFEST.MF Wed Jul 21 12:11:48 2010 -0500
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: SDK Core Plug-in
+Bundle-Name: SDK Core
Bundle-SymbolicName: com.nokia.carbide.cpp.sdk.core; singleton:=true
Bundle-Version: 2.0.0.qualifier
Bundle-Activator: com.nokia.carbide.cpp.sdk.core.SDKCorePlugin
--- a/core/com.nokia.carbide.cpp.sysdoc.hover.dependencies/META-INF/MANIFEST.MF Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover.dependencies/META-INF/MANIFEST.MF Wed Jul 21 12:11:48 2010 -0500
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Developer Library Hover Plug-in Open Source Dependencies
+Bundle-Name: Developer Library Hover Open Source Dependencies
Bundle-SymbolicName: com.nokia.carbide.cpp.sysdoc.hover.dependencies;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Nokia
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0",
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/META-INF/MANIFEST.MF Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/META-INF/MANIFEST.MF Wed Jul 21 12:11:48 2010 -0500
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Nokia Carbide Developer Library Hover
Bundle-SymbolicName: com.nokia.carbide.cpp.sysdoc.hover;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: com.nokia.carbide.cpp.sysdoc.hover.Activator
Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",
org.eclipse.core.runtime,
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/core/HoverManager.java Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/core/HoverManager.java Wed Jul 21 12:11:48 2010 -0500
@@ -26,7 +26,6 @@
import com.nokia.carbide.cpp.sysdoc.internal.hover.dal.interX.InterXIndexController;
import com.nokia.carbide.cpp.sysdoc.internal.hover.dal.sdk.SDKController;
import com.nokia.carbide.cpp.sysdoc.internal.hover.preferences.PreferencesPageController;
-import com.nokia.carbide.cpp.sysdoc.internal.hover.uitlis.DialogHelper;
import com.nokia.carbide.cpp.sysdoc.internal.hover.uitlis.Logger;
import com.nokia.carbide.cpp.sysdoc.internal.hover.webserver.IEmbeddedWebServer;
import com.nokia.carbide.cpp.sysdoc.internal.hover.webserver.JettyWebServer;
@@ -104,7 +103,9 @@
public void haltHoveringService(final String msg) {
HoverManager.getInstance().setEnabled(false);
PreferencesPageController.setDeActivateHoverPlugin(true);
- DialogHelper.displayErrorDialog(MessagesConstants.DEACTIVATED + msg);
+
+ // don't show error dialog here - fixes bug #10130
+ // DialogHelper.displayErrorDialog(MessagesConstants.DEACTIVATED + msg);
}
/**
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/dal/sdk/SDKController.java Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/dal/sdk/SDKController.java Wed Jul 21 12:11:48 2010 -0500
@@ -148,11 +148,13 @@
List<ISymbianSDK> sdkList = sdkMgr.getSDKList();
for (ISymbianSDK currSDK : sdkList) {
- String epocRootStr = currSDK.getEPOCROOT();
- try {
- addDirToSDKDirectoryList(epocRootStr);
- } catch (Exception e){
- continue;
+ if (currSDK.isEnabled()) {
+ String epocRootStr = currSDK.getEPOCROOT();
+ try {
+ addDirToSDKDirectoryList(epocRootStr);
+ } catch (Exception e){
+ continue;
+ }
}
}
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/uitlis/DialogHelper.java Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/uitlis/DialogHelper.java Wed Jul 21 12:11:48 2010 -0500
@@ -27,7 +27,7 @@
public class DialogHelper {
public static void displayErrorDialog(final String msg) {
- displayErrorDialog(msg, "Developer Libary Hover Help Error",
+ displayErrorDialog(msg, "Developer Library Hover Help Error",
MessageDialog.ERROR);
}
Binary file core/com.nokia.carbide.cpp.ui/icons/Run_Leavescan.png has changed
--- a/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/ui/ICarbideSharedImages.java Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/ui/ICarbideSharedImages.java Wed Jul 21 12:11:48 2010 -0500
@@ -251,10 +251,6 @@
*/
public static final String IMG_ROM_LOG_16_16 = "ROM_Log.png"; //$NON-NLS-1$
/**
- * File path: icons/Run_Leavescan.png
- */
- public static final String IMG_LEAVESCAN_16_16 = "Run_Leavescan.png"; //$NON-NLS-1$
- /**
* File path: icons/Start_Resource_Block.png
*/
public static final String IMG_START_RESOURCE_BLOCK_16_16 = "Start_Resource_Block.png"; //$NON-NLS-1$
--- a/core/com.nokia.carbide.cpp/about.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/about.html Wed Jul 21 12:11:48 2010 -0500
@@ -1,26 +1,25 @@
-<!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>Tips & Hints</title>
- <link href="carbide.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<p align="center"> </p>
-<table width="530" border="0" align="center" cellspacing="5" bgcolor="#FFFFFF">
- <tr>
- <td width="215"><img src="icons/about.png" width="215" height="199"></td>
- <td width="294"><p align="right" class="text"><b><img src="intro/css/graphics/rootpage/brandmark.gif" ></b></p>
- <p class="text"> </p>
- <p class="text"> </p>
- <p class="titleSmall">Copyright (c) 2010 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>
- <p class="titleSmall">This product includes software developed by Eclipse Project. <a href="http://www.eclipse.org">http://www.eclipse.org</a></p>
- </td>
- </tr>
-</table>
-</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>Tips & Hints</title>
+ <link href="carbide.css" rel="stylesheet" type="text/css">
+</head>
+
+<body background="intro/css/graphics/rootpage/background_carbide.jpg">
+<p align="center"> </p>
+<table width="530" border="0" align="center" cellspacing="5" bgcolor="#FFFFFF">
+ <tr>
+ <td width="215"><img src="icons/about.png" width="215" height="199"></td>
+ <td width="294"><p align="right" class="text"><b><img src="intro/css/graphics/rootpage/brandmark.gif" ></b></p>
+ <p class="text"> </p>
+ <p class="titleSmall">Copyright (c) 2010 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>
+ <p class="titleSmall">This product includes software developed by Eclipse Project. <a href="http://www.eclipse.org">http://www.eclipse.org</a></p>
+ </td>
+ </tr>
+</table>
+</body>
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/book.css Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/book.css Wed Jul 21 12:11:48 2010 -0500
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved.
License: http://www.eclipse.org/legal/epl-v10.html
*/
@@ -10,9 +10,9 @@
}
/* 20091007 added verdana and ariel to list to match SFO website fonts choices */
-body, p, table {
+body, p, table, li {
font-family: Verdana, Ariel, Helvetica, sans-serif;
- font-size: 0.9em;
+ font-size: 1.0em;
font-weight: normal;
}
@@ -32,11 +32,15 @@
/* For headlines at the top of a view, add space */
/* 20090224-changed green fade to gold header image */
h1, h2, h3 {
- background-image: url(icons/gold_header.png);
+ background-image: url(html/images/gold_header.png);
background-repeat: no-repeat;
padding:10px 0px 10px 12px;
}
+/* 20091007 SFO styling added */
+h1.NavTitle { font-size: 1.2em }
+h3 .NavListTitle { font-size: 1.1em }
+
li {
margin-bottom:8px;
margin-top:8px;
@@ -53,7 +57,7 @@
}
.listing {
- background-color: #ffe869;
+ background-color: #FFFFCC;
font-family: "Courier New", Courier, mono;
font-size: 1.1em;
color: #000000;
@@ -97,7 +101,7 @@
}
th {
- background-color: #ffd62c;
+ background-color: #66CC66;
}
div.ol.p {
@@ -116,7 +120,7 @@
div h5, div h4 {
padding:5px 0px 5px 12px;
- background-color: #ffd62c;
+ background-color: #D3DAD4;
font-weight:bold;
color: #000000;
}
@@ -174,4 +178,4 @@
a:link { color: #026690 }
a:visited { color: #555555 }
-aa:hover { color: #FFD62C }
+a:hover { color: #FFD62C }
--- a/core/com.nokia.carbide.cpp/html/help_home.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/html/help_home.html Wed Jul 21 12:11:48 2010 -0500
@@ -6,12 +6,12 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Using the Carbide help system</title>
<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<LINK REL="STYLESHEET" HREF="../carbide.css" CHARSET="ISO-8859-1" TYPE="text/css">
+<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
</head>
<body style="margin-top: 5; margin-left: 5; margin-right: 5;">
<table width="100%" >
- <tr><td align=right valign="center" bgcolor="#FFC550"><img src="../intro/css/graphics/rootpage/brandmark.gif" alt="Carbide icon"></td>
+ <tr><td align=right valign="center" bgcolor="#CCCCCC"><img src="../intro/css/graphics/rootpage/brandmark.gif" alt="Carbide icon"></td>
</tr>
</table>
@@ -22,24 +22,20 @@
<ul>
<li>New technologies support:
<ul>
- <li>PnP On-device Debugging</li>
- <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/index.html">Hover Help</a></li>
- <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_overview.htm">Qt SDK for S60</a></li>
- </ul>
+ <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_overview.htm">Nokia Qt SDK 1.0</a></li>
+ </ul>
</li>
- <li>Connecting, updating, and installing remote agents
- <ul>
- <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog</li>
- </ul>
+ <li>Carbide Portal
+ <ul>
+ <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_portal.htm">Install Extensions</a></li>
+ </ul>
</li>
<li>Carbide examples and tutorials
- <ul>
- <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/soft_attach_debug.htm">Soft-attach for on-device debugging </a></li>
- <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm">Importing and Building N-Gage Projects </a></li>
- <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm">Application Emulator Debug Example using Templates</a></li>
- <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm">Run Mode Debug Example (Application TRK)</a></li>
- <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm">Stop Mode Debug Example</a></li>
- </ul>
+ <ul>
+ <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_00.htm">Emulator Application Project Tutorial</a></li>
+ <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_00.htm">DLL Project Tutorial</a></li>
+ <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_00.htm">Remote Project Debugging (Run-mode)</a></li>
+ </ul>
</li>
<li><a href="help_keys_Toc.htm">Key Shortcuts</a></li>
</ul></td>
--- a/core/com.nokia.carbide.cpp/html/help_keys_carbide.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/html/help_keys_carbide.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,126 +1,126 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Nokia Carbide.c++ Shortcuts</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<link href="../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<h2>Nokia Carbide.c++ Shortcuts</h2>
-<p>Table 1 describes the Nokia Carbide.c++ key shortcuts. </p>
-<p>Keys can be viewed or edited in the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" border="0" align="absmiddle">
-<b>General > Keys</b></a> preference panel.</p>
-<h5>Table 1. Nokia Carbide.c++ key shortcuts</h5>
-<table cellspacing="0" cellpadding="0" width="100%" border="1">
- <tr>
- <th width="24%" scope="col"><p class="style2">Category</p></th>
- <th width="31%" scope="col">Carbide.c++</th>
- <th width="45%" scope="col"><span class="style2">Shortcut Added </span></th>
- </tr>
- <tr bgcolor="#FFFFCC">
- <td colspan="3"><b>Project</b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Build All Configurations </td>
- <td class="code" >CTRL+ALT+A</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Build Clean </td>
- <td class="code" >CTRL+SHIFT+-</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Build Project </td>
- <td class="code" >CTRL+B</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Build Symbian Component </td>
- <td class="code" >CTRL+ALT+P</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Clean Symbian Component </td>
- <td class="code" >CTRL+ALT+X</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Freeze Symbian Component </td>
- <td class="code" >CTRL+ALT+B</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Compile</td>
- <td class="code" >CTRL+ALT+C</td>
- </tr>
- <tr bgcolor="#FFFFCC">
- <td><b>Run/Debug</b></td>
- <td> </td>
- <td> </td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Debug</td>
- <td class="code" >F11</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Run</td>
- <td class="code" >CTRL+F11</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Step Into </td>
- <td class="code" >F5</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Step Over </td>
- <td class="code" >F6</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Step Return </td>
- <td class="code" >F7</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Build Project </td>
- <td class="code" >CTRL+B</td>
- </tr>
- <tr bgcolor="#FFFFCC">
- <td><b>Search</b></td>
- <td> </td>
- <td> </td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >System Search </td>
- <td class="code" >ALT+SHIFT+G</td>
- </tr>
- <tr bgcolor="#FFFFCC">
- <td><b>Help</b></td>
- <td> </td>
- <td> </td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Show Key Assist </td>
- <td class="code" >CTRL+SHIFT+L</td>
- </tr>
-</table>
-<h5>Related references</h5>
-<ul>
- <li><a href="help_keys_vs.htm">Microsoft Visual Studio Shortcuts</a></li>
- <li><a href="help_keys_cw.htm">Nokia Codewarrior Shortcuts</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-</body>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Nokia Carbide.c++ Shortcuts</title>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<link href="../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<h2>Nokia Carbide.c++ Shortcuts</h2>
+<p>Table 1 describes the Nokia Carbide.c++ key shortcuts. </p>
+<p>Keys can be viewed or edited in the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'>
+<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" border="0" align="absmiddle">
+<b>General > Keys</b></a> preference panel.</p>
+<h5>Table 1. Nokia Carbide.c++ key shortcuts</h5>
+<table cellspacing="0" cellpadding="0" width="100%" border="1">
+ <tr>
+ <th width="24%" scope="col"><p class="style2"><strong>Category</strong></p></th>
+ <th width="31%" scope="col">Carbide.c++</th>
+ <th width="45%" scope="col"><span class="style2">Shortcut Added </span></th>
+ </tr>
+ <tr bgcolor="#EEEEEE">
+ <td colspan="3"><b>Project</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Build All Configurations </td>
+ <td class="code" >CTRL+ALT+A</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Build Clean </td>
+ <td class="code" >CTRL+SHIFT+-</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Build Project </td>
+ <td class="code" >CTRL+B</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Build Symbian Component </td>
+ <td class="code" >CTRL+ALT+P</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Clean Symbian Component </td>
+ <td class="code" >CTRL+ALT+X</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Freeze Symbian Component </td>
+ <td class="code" >CTRL+ALT+B</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Compile</td>
+ <td class="code" >CTRL+ALT+C</td>
+ </tr>
+ <tr bgcolor="#EEEEEE">
+ <td><b>Run/Debug</b></td>
+ <td> </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Debug</td>
+ <td class="code" >F11</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Run</td>
+ <td class="code" >CTRL+F11</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Step Into </td>
+ <td class="code" >F5</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Step Over </td>
+ <td class="code" >F6</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Step Return </td>
+ <td class="code" >F7</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Build Project </td>
+ <td class="code" >CTRL+B</td>
+ </tr>
+ <tr bgcolor="#EEEEEE">
+ <td><b>Search</b></td>
+ <td> </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >System Search </td>
+ <td class="code" >ALT+SHIFT+G</td>
+ </tr>
+ <tr bgcolor="#EEEEEE">
+ <td><b>Help</b></td>
+ <td> </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Show Key Assist </td>
+ <td class="code" >CTRL+SHIFT+L</td>
+ </tr>
+</table>
+<h5>Related references</h5>
+<ul>
+ <li><a href="help_keys_vs.htm">Microsoft Visual Studio Shortcuts</a></li>
+ <li><a href="help_keys_cw.htm">Nokia Codewarrior Shortcuts</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+</body>
+
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/help_keys_cw.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/html/help_keys_cw.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,211 +1,211 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Nokia CodeWarrior Shortcuts</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<style type="text/css">
-<!--
-.style2 {font-weight: bold}
--->
-</style>
-</head>
-
-<h2>Nokia CodeWarrior Shortcuts</h2>
-<p>Table 1 describes the Nokia CodeWarrior key shortcuts supported by Carbide.c++. </p>
-<p class="note"><b>NOTE</b> These shortcuts extend the Default key shortcuts and not every CodeWarror tool shortcut is supported.</p>
-<p>Keys can be viewed or edited in the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" border="0" align="absmiddle">
-<b>General > Keys</b></a> preference panel.</p>
-<h5>Table 1. Nokia CodeWarrior key shortcuts</h5>
-<table cellspacing="0" cellpadding="0" width="100%" border="1">
- <tr>
- <th width="24%" scope="col"><p class="style2">Category</p></th>
- <th width="31%" scope="col">Nokia CodeWarrior</th>
- <th width="31%" scope="col">Carbide.c++</th>
- <th width="45%" scope="col"><span class="style2">Shortcut Added </span></th>
- </tr>
- <tr bgcolor="#FFFFCC">
- <td colspan="4"><b>C/C++ Source </b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Find Definition </td>
- <td class="code" >Open Definition </td>
- <td class="code" >CTRL+'</td>
- </tr>
- <tr bgcolor="#FFFFCC">
- <td colspan="4"><b>Edit</b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Find Next </td>
- <td class="code" >Find Next </td>
- <td class="code" >F3</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Find Previous </td>
- <td class="code" >Find Previous </td>
- <td class="code" >SHIFT+F3</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Replace</td>
- <td class="code" >Find and Replace </td>
- <td class="code" >CTRL+H</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Undo</td>
- <td class="code" >Undo</td>
- <td class="code" >CTRL+Backspace</td>
- </tr>
- <tr bgcolor="#FFFFCC">
- <td colspan="4"><b>Project</b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Make</td>
- <td class="code" >Build Project </td>
- <td class="code" >F7</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" > </td>
- <td class="code" >Compile</td>
- <td class="code" >CTRL+F7</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" > </td>
- <td class="code" >Build Target Only </td>
- <td class="code" >CTRL+SHIFT+F7</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >New</td>
- <td class="code" >New</td>
- <td class="code" >CTRL+SHIFT+N</td>
- </tr>
- <tr>
- <td> </td>
- <td><span class="code">Remove Object Code </span></td>
- <td class="code" >Build Clean</td>
- <td class="code" >CTRL+-</td>
- </tr>
- <tr bgcolor="#FFFFCC">
- <td colspan="4"><b>Run/Debug</b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Debug</td>
- <td class="code" >Start</td>
- <td class="code" >F5</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Goto Line </td>
- <td class="code" >Run to Line </td>
- <td class="code" >CTRL+G</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Run</td>
- <td class="code" >Start without Debugging</td>
- <td class="code" >CTRL+F5</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Set/Clear Breakpoint </td>
- <td class="code" >Toggle Breakpoint </td>
- <td class="code" >F9</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Step Into </td>
- <td class="code" >Step Into </td>
- <td class="code" >F11</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Step Over </td>
- <td class="code" >Step Over </td>
- <td class="code" >F10</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Step Return </td>
- <td class="code" >Step Return </td>
- <td class="code" >SHIFT+F11</td>
- </tr>
- <tr>
- <td colspan="4" bgcolor="#FFFFCC"><b>Search</b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" > </td>
- <td class="code" >Search Backwards </td>
- <td class="code" >CTRL+B</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" > </td>
- <td class="code" >Search Forwards </td>
- <td class="code" >CTRL+F</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" > </td>
- <td class="code" >Find Text in Workspace </td>
- <td class="code" >CTRL+F3</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Find in Files </td>
- <td class="code" >Search</td>
- <td class="code" >CTRL+SHIFT+M</td>
- </tr>
- <tr>
- <td colspan="4" bgcolor="#FFFFCC"><b>Text Editing </b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Select Word Left </td>
- <td class="code" >Select Next Word </td>
- <td class="code" >CTRL+RIGHT ARROW </td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Select Word Right </td>
- <td class="code" >Select Previous Word </td>
- <td class="code" >CTRL+LEFT ARROW </td>
- </tr>
- <tr>
- <td colspan="4" bgcolor="#FFFFCC"><b>Windows</b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Cycle Windows</td>
- <td class="code" >Next Editor </td>
- <td class="code" >CTRL+TAB</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Cycle Windows</td>
- <td class="code" >Previous Editor </td>
- <td class="code" >CTRL+SHIFT+TAB</td>
- </tr>
-</table>
-<h5>Related references</h5>
-<ul>
- <li><a href="help_keys_vs.htm">Microsoft Visual Studio Shortcuts</a></li>
- <li><a href="help_keys_carbide.htm">Nokia Carbide.c++ Shortcuts</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-</body>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Nokia CodeWarrior Shortcuts</title>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
+<style type="text/css">
+<!--
+.style2 {font-weight: bold}
+-->
+</style>
+</head>
+
+<h2>Nokia CodeWarrior Shortcuts</h2>
+<p>Table 1 describes the Nokia CodeWarrior key shortcuts supported by Carbide.c++. </p>
+<p class="note"><b>NOTE</b> These shortcuts extend the Default key shortcuts and not every CodeWarror tool shortcut is supported.</p>
+<p>Keys can be viewed or edited in the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'>
+<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" border="0" align="absmiddle">
+<b>General > Keys</b></a> preference panel.</p>
+<h5>Table 1. Nokia CodeWarrior key shortcuts</h5>
+<table cellspacing="0" cellpadding="0" width="100%" border="1">
+ <tr>
+ <th width="24%" scope="col"><p class="style2">Category</p></th>
+ <th width="31%" scope="col">Nokia CodeWarrior</th>
+ <th width="31%" scope="col">Carbide.c++</th>
+ <th width="45%" scope="col"><span class="style2">Shortcut Added </span></th>
+ </tr>
+ <tr bgcolor="#EEEEEE">
+ <td colspan="4"><b>C/C++ Source </b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Find Definition </td>
+ <td class="code" >Open Definition </td>
+ <td class="code" >CTRL+'</td>
+ </tr>
+ <tr bgcolor="#EEEEEE">
+ <td colspan="4"><b>Edit</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Find Next </td>
+ <td class="code" >Find Next </td>
+ <td class="code" >F3</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Find Previous </td>
+ <td class="code" >Find Previous </td>
+ <td class="code" >SHIFT+F3</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Replace</td>
+ <td class="code" >Find and Replace </td>
+ <td class="code" >CTRL+H</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Undo</td>
+ <td class="code" >Undo</td>
+ <td class="code" >CTRL+Backspace</td>
+ </tr>
+ <tr bgcolor="#EEEEEE">
+ <td colspan="4"><b>Project</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Make</td>
+ <td class="code" >Build Project </td>
+ <td class="code" >F7</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" > </td>
+ <td class="code" >Compile</td>
+ <td class="code" >CTRL+F7</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" > </td>
+ <td class="code" >Build Target Only </td>
+ <td class="code" >CTRL+SHIFT+F7</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >New</td>
+ <td class="code" >New</td>
+ <td class="code" >CTRL+SHIFT+N</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><span class="code">Remove Object Code </span></td>
+ <td class="code" >Build Clean</td>
+ <td class="code" >CTRL+-</td>
+ </tr>
+ <tr bgcolor="#EEEEEE">
+ <td colspan="4"><b>Run/Debug</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Debug</td>
+ <td class="code" >Start</td>
+ <td class="code" >F5</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Goto Line </td>
+ <td class="code" >Run to Line </td>
+ <td class="code" >CTRL+G</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Run</td>
+ <td class="code" >Start without Debugging</td>
+ <td class="code" >CTRL+F5</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Set/Clear Breakpoint </td>
+ <td class="code" >Toggle Breakpoint </td>
+ <td class="code" >F9</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Step Into </td>
+ <td class="code" >Step Into </td>
+ <td class="code" >F11</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Step Over </td>
+ <td class="code" >Step Over </td>
+ <td class="code" >F10</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Step Return </td>
+ <td class="code" >Step Return </td>
+ <td class="code" >SHIFT+F11</td>
+ </tr>
+ <tr>
+ <td colspan="4" bgcolor="#EEEEEE"><b>Search</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" > </td>
+ <td class="code" >Search Backwards </td>
+ <td class="code" >CTRL+B</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" > </td>
+ <td class="code" >Search Forwards </td>
+ <td class="code" >CTRL+F</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" > </td>
+ <td class="code" >Find Text in Workspace </td>
+ <td class="code" >CTRL+F3</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Find in Files </td>
+ <td class="code" >Search</td>
+ <td class="code" >CTRL+SHIFT+M</td>
+ </tr>
+ <tr>
+ <td colspan="4" bgcolor="#EEEEEE"><b>Text Editing </b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Select Word Left </td>
+ <td class="code" >Select Next Word </td>
+ <td class="code" >CTRL+RIGHT ARROW </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Select Word Right </td>
+ <td class="code" >Select Previous Word </td>
+ <td class="code" >CTRL+LEFT ARROW </td>
+ </tr>
+ <tr>
+ <td colspan="4" bgcolor="#EEEEEE"><b>Windows</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Cycle Windows</td>
+ <td class="code" >Next Editor </td>
+ <td class="code" >CTRL+TAB</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Cycle Windows</td>
+ <td class="code" >Previous Editor </td>
+ <td class="code" >CTRL+SHIFT+TAB</td>
+ </tr>
+</table>
+<h5>Related references</h5>
+<ul>
+ <li><a href="help_keys_vs.htm">Microsoft Visual Studio Shortcuts</a></li>
+ <li><a href="help_keys_carbide.htm">Nokia Carbide.c++ Shortcuts</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+</body>
+
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/help_keys_vs.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/html/help_keys_vs.htm Wed Jul 21 12:11:48 2010 -0500
@@ -1,202 +1,202 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Microsoft Visual Studio Key Shortcuts</title>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<style type="text/css">
-<!--
-.style2 {color: #FFFFFF}
--->
-</style>
-</head>
-
-<h2>Microsoft Visual Studio Shortcuts</h2>
-<p>Table 1 describes the Microsoft Visual Studio key shortcuts supported by Carbide.c++. </p>
-<p class="note"><b>NOTE</b> These shortcuts extend the Default key shortcuts and not every Visual Studio tool shortcut is supported.</p>
-<p>Keys can be viewed or edited in the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" border="0" align="absmiddle">
-<b>General > Keys</b></a> preference panel.</p>
-<h5>Table 1. Microsoft Visual Studio key shortcuts</h5>
-<table cellspacing="0" cellpadding="0" width="100%" border="1" valign="center">
- <tr>
- <th width="24%" scope="col"><p class="style2">Category</p></th>
- <th width="31%" scope="col">Visual Studio </th>
- <th width="31%" scope="col">Carbide.c++</th>
- <th width="45%" scope="col"><span class="style2">Shortcut Added </span></th>
- </tr>
- <tr bgcolor="#FFFFCC">
- <td colspan="4"><b>C/C++ Source </b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Edit.GoToDefinition </td>
- <td class="code" >Open Definition</td>
- <td class="code" >F12</td>
- </tr>
- <tr bgcolor="#FFFFCC">
- <td colspan="4"><b>Edit</b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Edit.FindNext </td>
- <td class="code" >Find Next </td>
- <td class="code" >F3</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" > </td>
- <td class="code" >Find at Current Cursor Position </td>
- <td class="code" >CTRL+F3</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Edit.FindPrevious </td>
- <td class="code" >Find Previous </td>
- <td class="code" >SHIFT+F3</td>
- </tr>
- <tr bgcolor="#FFFFCC">
- <td colspan="4"><b>Project</b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Build.BuildSolution</td>
- <td class="code" >Build Project </td>
- <td class="code" >F7</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" > </td>
- <td class="code" >Compile</td>
- <td class="code" >CTRL+F7</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" > </td>
- <td class="code" >Build Target Only </td>
- <td class="code" >CTRL+SHIFT+F7</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >File.NewProject</td>
- <td class="code" >New</td>
- <td class="code" >CTRL+SHIFT+N</td>
- </tr>
- <tr bgcolor="#FFFFCC">
- <td colspan="4"><strong>Navigation</strong></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Add Bookmark </td>
- <td class="code" >Add Bookmark </td>
- <td class="code" >CTRL+F2</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Go to Line </td>
- <td class="code" >Go to Line... </td>
- <td class="code" >CTRL+G</td>
- </tr>
- <tr bgcolor="#FFFFCC">
- <td colspan="4"><b>Run/Debug</b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Debug.Start</td>
- <td class="code" >Start / Resume </td>
- <td class="code" >F5</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Debug.StartWithoutDebugging</td>
- <td class="code" >Start without Debugging</td>
- <td class="code" >CTRL+F5</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Debug.StepInto</td>
- <td class="code" >Step Into </td>
- <td class="code" >F11</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Debug.StepOut</td>
- <td class="code" >Step Return </td>
- <td class="code" >SHIFT+F11</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Debug.StepOver</td>
- <td class="code" >Step Over </td>
- <td class="code" >F10</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Debug.ToggleBreakpoint</td>
- <td class="code" >Toggle Breakpoint </td>
- <td class="code" >F9</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Debug.RunToCursor</td>
- <td class="code" >Run to Line </td>
- <td class="code" >CTRL+F10</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Debug.Breakpoints</td>
- <td class="code" >Breakpoints</td>
- <td class="code" >CTRL+ALT+B</td>
- </tr>
- <tr>
- <td colspan="4" bgcolor="#FFFFCC"><b>Search</b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Edit.FindinFiles</td>
- <td class="code" >Search</td>
- <td class="code" >CTRL+SHIFT+F</td>
- </tr>
- <tr>
- <td colspan="4" bgcolor="#FFFFCC"><b>Text Editing </b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Edit.WordNext</td>
- <td class="code" >Select Next Word </td>
- <td class="code" >CTRL+RIGHT ARROW </td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Edit.WordPrevious</td>
- <td class="code" >Select Previous Word </td>
- <td class="code" >CTRL+LEFT ARROW </td>
- </tr>
- <tr>
- <td colspan="4" bgcolor="#FFFFCC"><b>Windows</b></td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Window.NextDocumentWindow</td>
- <td class="code" >Next Editor </td>
- <td class="code" >CTRL+TAB</td>
- </tr>
- <tr>
- <td> </td>
- <td class="code" >Window.PreviousDocumentWindow</td>
- <td class="code" >Previous Editor </td>
- <td class="code" >CTRL+SHIFT+TAB</td>
- </tr>
-</table>
-<h5>Related references</h5>
-<ul>
- <li><a href="help_keys_carbide.htm">Nokia Carbide.c++ Shortcuts</a></li>
- <li><a href="help_keys_cw.htm">Nokia Codewarrior Shortcuts</a></li>
-</ul>
-<div id="footer">Copyright © 2010 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></div>
-</body>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Microsoft Visual Studio Key Shortcuts</title>
+<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<style type="text/css">
+<!--
+.style2 {color: #FFFFFF}
+-->
+</style>
+</head>
+
+<h2>Microsoft Visual Studio Shortcuts</h2>
+<p>Table 1 describes the Microsoft Visual Studio key shortcuts supported by Carbide.c++. </p>
+<p class="note"><b>NOTE</b> These shortcuts extend the Default key shortcuts and not every Visual Studio tool shortcut is supported.</p>
+<p>Keys can be viewed or edited in the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'>
+<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" border="0" align="absmiddle">
+<b>General > Keys</b></a> preference panel.</p>
+<h5>Table 1. Microsoft Visual Studio key shortcuts</h5>
+<table cellspacing="0" cellpadding="0" width="100%" border="1" valign="center">
+ <tr>
+ <th width="24%" scope="col"><p class="style2">Category</p></th>
+ <th width="31%" scope="col">Visual Studio </th>
+ <th width="31%" scope="col">Carbide.c++</th>
+ <th width="45%" scope="col"><span class="style2">Shortcut Added </span></th>
+ </tr>
+ <tr bgcolor="#EEEEEE">
+ <td colspan="4"><b>C/C++ Source </b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Edit.GoToDefinition </td>
+ <td class="code" >Open Definition</td>
+ <td class="code" >F12</td>
+ </tr>
+ <tr bgcolor="#EEEEEE">
+ <td colspan="4"><b>Edit</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Edit.FindNext </td>
+ <td class="code" >Find Next </td>
+ <td class="code" >F3</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" > </td>
+ <td class="code" >Find at Current Cursor Position </td>
+ <td class="code" >CTRL+F3</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Edit.FindPrevious </td>
+ <td class="code" >Find Previous </td>
+ <td class="code" >SHIFT+F3</td>
+ </tr>
+ <tr bgcolor="#EEEEEE">
+ <td colspan="4"><b>Project</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Build.BuildSolution</td>
+ <td class="code" >Build Project </td>
+ <td class="code" >F7</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" > </td>
+ <td class="code" >Compile</td>
+ <td class="code" >CTRL+F7</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" > </td>
+ <td class="code" >Build Target Only </td>
+ <td class="code" >CTRL+SHIFT+F7</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >File.NewProject</td>
+ <td class="code" >New</td>
+ <td class="code" >CTRL+SHIFT+N</td>
+ </tr>
+ <tr bgcolor="#EEEEEE">
+ <td colspan="4"><strong>Navigation</strong></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Add Bookmark </td>
+ <td class="code" >Add Bookmark </td>
+ <td class="code" >CTRL+F2</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Go to Line </td>
+ <td class="code" >Go to Line... </td>
+ <td class="code" >CTRL+G</td>
+ </tr>
+ <tr bgcolor="#EEEEEE">
+ <td colspan="4"><b>Run/Debug</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Debug.Start</td>
+ <td class="code" >Start / Resume </td>
+ <td class="code" >F5</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Debug.StartWithoutDebugging</td>
+ <td class="code" >Start without Debugging</td>
+ <td class="code" >CTRL+F5</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Debug.StepInto</td>
+ <td class="code" >Step Into </td>
+ <td class="code" >F11</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Debug.StepOut</td>
+ <td class="code" >Step Return </td>
+ <td class="code" >SHIFT+F11</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Debug.StepOver</td>
+ <td class="code" >Step Over </td>
+ <td class="code" >F10</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Debug.ToggleBreakpoint</td>
+ <td class="code" >Toggle Breakpoint </td>
+ <td class="code" >F9</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Debug.RunToCursor</td>
+ <td class="code" >Run to Line </td>
+ <td class="code" >CTRL+F10</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Debug.Breakpoints</td>
+ <td class="code" >Breakpoints</td>
+ <td class="code" >CTRL+ALT+B</td>
+ </tr>
+ <tr>
+ <td colspan="4" bgcolor="#EEEEEE"><b>Search</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Edit.FindinFiles</td>
+ <td class="code" >Search</td>
+ <td class="code" >CTRL+SHIFT+F</td>
+ </tr>
+ <tr>
+ <td colspan="4" bgcolor="#EEEEEE"><b>Text Editing </b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Edit.WordNext</td>
+ <td class="code" >Select Next Word </td>
+ <td class="code" >CTRL+RIGHT ARROW </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Edit.WordPrevious</td>
+ <td class="code" >Select Previous Word </td>
+ <td class="code" >CTRL+LEFT ARROW </td>
+ </tr>
+ <tr>
+ <td colspan="4" bgcolor="#EEEEEE"><b>Windows</b></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Window.NextDocumentWindow</td>
+ <td class="code" >Next Editor </td>
+ <td class="code" >CTRL+TAB</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td class="code" >Window.PreviousDocumentWindow</td>
+ <td class="code" >Previous Editor </td>
+ <td class="code" >CTRL+SHIFT+TAB</td>
+ </tr>
+</table>
+<h5>Related references</h5>
+<ul>
+ <li><a href="help_keys_carbide.htm">Nokia Carbide.c++ Shortcuts</a></li>
+ <li><a href="help_keys_cw.htm">Nokia Codewarrior Shortcuts</a></li>
+</ul>
+<div id="footer">Copyright © 2010 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></div>
+</body>
+
</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/online_banner.html Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/html/online_banner.html Wed Jul 21 12:11:48 2010 -0500
@@ -37,8 +37,8 @@
<table width="100%" cellspacing="0" cellpadding="8" border="0">
<tr>
- <td align="left" valign="center" bgcolor="#FFC550"><img src="../intro/css/graphics/rootpage/brandmark.gif" alt="Carbide icon" title="Carbide icon"> </td>
- <td align="right" valign="center" bgcolor="#FFC550"><B>Carbide Online Help Center v3.0</B></td>
+ <td align="left" valign="center" bgcolor="#EEEEEE"><img src="../intro/css/graphics/rootpage/brandmark.gif" alt="Carbide icon" title="Carbide icon"> </td>
+ <td align="right" valign="center" bgcolor="#EEEEEE"><B>Carbide Online Help Center v3.0</B></td>
</tr>
</table>
--- a/core/com.nokia.carbide.cpp/html/welcome_note.htm Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/html/welcome_note.htm Wed Jul 21 12:11:48 2010 -0500
@@ -8,8 +8,15 @@
</head>
<body>
<h2>Welcome to Carbide.c++ 3.0</h2>
-<p>Thank you for installing Carbide.c++ 3.0! It's an improvement over 2.6 with many improvements including support for Eclipse 3.6 and CDT 7.0, as well as numerous bug fixes. </p>
-<p>However, perhaps the best part about Carbide.c++ is the <a href="http://carbidehelp.nokia.com/help/topic/com.nokia.carbide.cpp.sdk.doc.user/html/sdkTOC.htm">Carbide.c++ Development Kit</a> (CDK) that you can use to build custom extensions for Carbide.c++. <a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm">Update</a> your installation of Carbide through the <b>Carbide.c++ Update Site</b> to get a copy of the <b>Carbide.c++ Development Kit > Carbide.c++ Plug-in SDK</b>. Take a look, and let us know what you build!</p>
+<p>Thank you for installing Carbide.c++ 3.0! It's an improvement over 2.7 with many improvements including support for Eclipse 3.6 and CDT 7.0, as well as numerous bug fixes. </p>
+<p>For initial help, check out the Welcome pages, a great resource for leearning about Carbide. Click <strong>Help > Welcome</strong> to open the Welcome screen and choose from the following topics:</p>
+<ul>
+ <li><strong>What's New</strong> – learn about new features in this release of Carbide.c++</li>
+ <li><strong>Tutorials </strong>– tutorials on using Carbide and other major features</li>
+ <li><strong>Web Resources</strong> – lots of Symbian and Carbide resources on the web to visit and explore</li>
+ <li><strong>Migrating</strong> – tips on features useful to new Carbide users</li>
+</ul>
+<p>Want to learn how to add additional features to Carbide? Download the <a href="http://carbidehelp.nokia.com/help/topic/com.nokia.carbide.cpp.sdk.doc.user/html/sdkTOC.htm">Carbide.c++ Development Kit</a> (CDK) that you can use to build custom extensions for Carbide.c++.</p>
<p>Finally, if you find bugs, please let us know by submitting it at the new Carbide Bugzilla bug tracking site located at <a href="https://xdabug001.ext.nokia.com/bugzilla">https://xdabug001.ext.nokia.com/bugzilla</a> </p>
<p>For any other questions, please don't hesitate to contact us.</p>
<p> Thank you again for choosing Carbide.c++! We hope you like it. </p>
Binary file core/com.nokia.carbide.cpp/icons/gold_header.png has changed
Binary file core/com.nokia.carbide.cpp/intro/css/graphics/rootpage/background_carbide.jpg has changed
--- a/core/com.nokia.carbide.cpp/plugin.properties Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.properties Wed Jul 21 12:11:48 2010 -0500
@@ -7,13 +7,13 @@
CHEAT_SHEETS_MENU = &Cheat Sheets...
productBlurb=\nCarbide.c++ Version 3.0.0\n\
-Build {0} {1}\n\n\n\n\n\n\n\
+Build {0} {1}\n\n\n\
Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.\n\
Visit http://developer.symbian.org/\n\
This product includes software developed by Eclipse Project.\n\
Visit http://www.eclipse.org/
-theme.name.carbide = Carbide
+theme.name.carbide = slate
carbcPreference.common=carbide symbian cpp cplusplus
carbcPreference.diagnostics=diagnostic logs
@@ -23,5 +23,5 @@
PreferencePages.Capabilities.categoryName = &Capabilities
PreferencePages.Capabilities.activityPromptButton = &Prompt when enabling capabilities
PreferencePages.Capabilities.activityPromptButtonTooltip = Prompt when a feature is first used that requires enablement of capabilities
-PreferencePages.Capabilities.captionMessage = Capabilities allow you to enable or disable various product components. These capabilities are grouped according to a set of predefined categories.
+PreferencePages.Capabilities.captionMessage = Capabilities allow you to enable or disable various product components. These capabilities are grouped according to a set of predefined categories.
--- a/core/com.nokia.carbide.cpp/plugin.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.xml Wed Jul 21 12:11:48 2010 -0500
@@ -61,18 +61,18 @@
value="Migration information available."/>
<property
name="introDescription-webresources"
- value="The following web resources provide information and guidance on creating Symbian OS progams using Carbide.c++"/>
+ value="The following web resources provide information and guidance on creating Symbian OS programs using Carbide.c++"/>
<!-- Splash screen attributes -->
<property
name="startupProgressRect"
- value="0,244,469,22" />
+ value="0,257,469,10" />
<property
name="startupForegroundColor"
- value="777777" />
+ value="333333" />
<property
name="startupMessageRect"
- value="12,180,441,15" />
+ value="24,190,441,15" />
</product>
</extension>
@@ -90,6 +90,7 @@
</introProductBinding>
</extension>
+<!--
<extension
id="intro"
point="org.eclipse.ui.intro.config">
@@ -97,25 +98,26 @@
introId="com.nokia.carbide.cpp.intro"
id="com.nokia.carbide.cpp.introConfig"
content="intro/introContent.xml">
- <presentation
- home-page-id="root" standby-page-id="standby">
- <implementation
- ws="win32"
- style="$theme$/html/shared.css"
- kind="html"
- os="win32">
- </implementation>
- <implementation
- kind="swt">
- </implementation>
- <launchBar
- location="fastview"
- bg="$launchbarBackground$"
- computed="true" >
- </launchBar>
- </presentation>
+ <presentation
+ home-page-id="root" standby-page-id="standby">
+ <implementation
+ ws="win32"
+ style="$theme$/html/shared.css"
+ kind="html"
+ os="win32">
+ </implementation>
+ <implementation
+ kind="swt">
+ </implementation>
+ <launchBar
+ location="fastview"
+ bg="$launchbarBackground$"
+ computed="true" >
+ </launchBar>
+ </presentation>
</config>
</extension>
+-->
<!-- =================================================================================== -->
<!-- Universal intro extensions to show content in welcome pages -->
Binary file core/com.nokia.carbide.cpp/splash.bmp has changed
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/contentpage/background.jpg has changed
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/icons/obj48/c3_new.png has changed
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/icons/obj48/c3_new_hover.png has changed
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/root/background.jpg has changed
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/firststeps.css Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/firststeps.css Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-body {
- /* background-image : url(../graphics/root/background.jpg); */
-}
-
-/* show the "selected" image for this page */
-#navigation-links a#firststeps img,
-#navigation-links a#firststeps:hover img,
-#navigation-links a#firststeps:focus img,
-#navigation-links a#firststeps:active img {
- background-image : url(../graphics/icons/ctool/firsteps48sel.gif);
-}
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+body {
+ background-image : url(../graphics/root/background.jpg);
+}
+
+/* show the "selected" image for this page */
+#navigation-links a#firststeps img,
+#navigation-links a#firststeps:hover img,
+#navigation-links a#firststeps:focus img,
+#navigation-links a#firststeps:active img {
+ background-image : url(../graphics/icons/ctool/firsteps48sel.gif);
+}
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/migrate.css Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/migrate.css Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-body {
- /* background-image : url(../graphics/root/background.jpg); */
-}
-
-/* show the "selected" image for this page */
-#navigation-links a#migrate img,
-#navigation-links a#migrate:hover img,
-#navigation-links a#migrate:focus img,
-#navigation-links a#migrate:active img {
- background-image : url(../graphics/icons/ctool/migrate48sel.gif);
-}
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+body {
+ background-image : url(../graphics/root/background.jpg);
+}
+
+/* show the "selected" image for this page */
+#navigation-links a#migrate img,
+#navigation-links a#migrate:hover img,
+#navigation-links a#migrate:focus img,
+#navigation-links a#migrate:active img {
+ background-image : url(../graphics/icons/ctool/migrate48sel.gif);
+}
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/overview.css Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/overview.css Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-body {
- /* background-image : url(../graphics/root/background.jpg); */
-}
-
-/* show the "selected" image for this page */
-#navigation-links a#overview img,
-#navigation-links a#overview:hover img,
-#navigation-links a#overview:focus img,
-#navigation-links a#overview:active img {
- background-image : url(../graphics/icons/ctool/overview48sel.gif);
-}
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+body {
+ background-image : url(../graphics/root/background.jpg);
+}
+
+/* show the "selected" image for this page */
+#navigation-links a#overview img,
+#navigation-links a#overview:hover img,
+#navigation-links a#overview:focus img,
+#navigation-links a#overview:active img {
+ background-image : url(../graphics/icons/ctool/overview48sel.gif);
+}
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/root.css Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/root.css Wed Jul 21 12:11:48 2010 -0500
@@ -1,291 +1,292 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-/*
- * Set up general font colours, sizes, etc. Some of these will override
- * settings from the shared CSS
- */
-.intro-header H1 {
- font-family: Helvetica, sans-serif;
- font-size: 20px;
- color: #0A94D6;
-}
-
-#page-links a .link-label, #action-links a .link-label {
- font-size : 13pt;
- font-weight : 600;
- color : #0A94D6;
-}
-#page-links a p .text, #action-links a p .text {
- font-size : 13pt;
- font-weight : 500;
- color : #333333;
-}
-
-/*
- * Turn off shared backround image.
- */
-
-.page {
- background-image: none;
-}
-
-/*
- * Set up the content for the root page.
- */
-body {
- min-width : 770px;
- /* since IE doesn't support min-width, use expression */
- width:expression(document.body.clientWidth < 770? "770px": "auto" );
- /* background-image : url(../graphics/root/background.jpg); */
- background-repeat : no-repeat;
- background-position : top left;
- /* background-color : #7169D1; */
-}
-#root {
-/*
- /* background-image : url(../graphics/root/brandmark.gif); */
-*/
- background-repeat : no-repeat;
- background-position : bottom left;
- min-height : 450px;
- height : 100%;
- height : expression(document.body.clientHeight < 450? "450px": "100%" );
-}
-
-#branding {
- position: absolute;
- bottom : 10px;
- left : 10px;
-}
-
-/*
- * We will not use the general-purpose group1 used in
- * other pages for a curve image.
- */
-
-#extra-group1 {
- display : none;
-}
-/*
- * Set up the navigation bar. It should be centered in the middle
- * of the page
- */
-#links-background {
- /* background-image : url(../graphics/root/dots.gif); */
- background-repeat : repeat-x;
- width : 100%;
- height : 177px;
- margin-top : 18%;
- margin-bottom : auto;
- text-align : center;
-}
-/* specify a width for Moz so we can center.
- * **Important** If additional links are added, we will have to increase this width
- * to accomodate them, otherwise they will wrap to a new line
- */
-
-#links-background > #page-links {
- width: 33em;
- margin: 0 auto;
-}
-
-#page-links {
- position : relative;
- top : 50px;
- text-align: center;
-}
-#page-links a {
- position : relative;
- width : 86px;
- margin-left : 1em;
- margin-right : 1em;
- text-align : center;
- vertical-align : top;
-}
-/* float left for Moz so the items all appear inline */
-#page-links > a {
- float : left;
- position : relative;
-}
-#page-links a img {
- height : 82px;
- width : 82px;
- vertical-align : middle;
-}
-
-/* remove the hover image from the flow of the document,
- so it doesn't take up space and change the position
- of the link label and descriptions */
-#page-links a .background-image {
- position : absolute;
-}
-/* properly align the link label and text based on class (left vs. right) */
-#page-links a:hover {
- /* This is needed for IE to force the hover pseudo selectors below to work.*/
- padding : 0 em;
-}
-/* Hide both the label and the description of the link and remove them from static HTML flow, until user hovers over link */
-/* First, set the width of both the label and the description to a max of 15 em. */
-/* This can be changed when translated to different country locals. */
-#page-links a span {
- width : 16em;
-}
-
-/* Set up left links orientation first. */
-#page-links a.left:link .link-label,
-#page-links a.left:visited .link-label {
- display: none;
-}
-#page-links a.left:hover .link-label,
-#page-links a.left:focus .link-label,
-#page-links a.left:active .link-label {
- text-align: left;
- display: block;
- position: absolute;
- top : 120 %;
- left : 0;
-}
-
-/* hide description and remove it from static HTML flow, until user hovers over link */
-#page-links a.left:link .text,
-#page-links a.left:visited .text {
- display: none;
-}
-#page-links a.left:hover .text,
-#page-links a.left:focus .text,
-#page-links a.left:active .text {
- text-align: left;
- display: block;
- position: absolute;
- left : 0;
- top: 145%;
-}
-/* Set up right links orientation now. */
-#page-links a.right:link .link-label,
-#page-links a.right:visited .link-label {
- display: none;
-}
-#page-links a.right:hover .link-label,
-#page-links a.right:focus .link-label,
-#page-links a.right:active .link-label {
- text-align: right;
- display: block;
- position: absolute;
- top : 120 %;
- right : 0;
-}
-/* hide description and remove it from static HTML flow, until user hovers over link */
-#page-links a.right:link .text,
-#page-links a.right:visited .text {
- display: none;
-}
-#page-links a.right:hover .text,
-#page-links a.right:focus .text,
-#page-links a.right:active .text {
- text-align: right;
- display: block;
- position: absolute;
- right : 0;
- top: 145%;
-}
-
-/* properties for each of the page-links */
-#page-links a#overview img { background-image : url(../graphics/icons/etool/overview72.gif); }
-#page-links a:hover#overview img { background-image : url(../graphics/icons/ctool/overview72.gif); }
-
-#page-links a#tutorials img { background-image : url(../graphics/icons/etool/tutorials72.gif); }
-#page-links a:hover#tutorials img { background-image : url(../graphics/icons/ctool/tutorials72.gif); }
-
-#page-links a#samples img { background-image : url(../graphics/icons/etool/samples72.gif); }
-#page-links a:hover#samples img { background-image : url(../graphics/icons/ctool/samples72.gif); }
-
-#page-links a#whatsnew img { background-image : url(../graphics/icons/etool/whatsnew72.gif); }
-#page-links a:hover#whatsnew img { background-image : url(../graphics/icons/ctool/whatsnew72.gif); }
-
-#page-links a#firststeps img { background-image : url(../graphics/icons/etool/firsteps72.gif); }
-#page-links a:hover#firststeps img { background-image : url(../graphics/icons/ctool/firsteps72.gif); }
-
-#page-links a#webresources img { background-image : url(../graphics/icons/etool/webrsrc72.gif); }
-#page-links a:hover#webresources img { background-image : url(../graphics/icons/ctool/webrsrc72.gif); }
-
-#page-links a#migrate img { background-image : url(../graphics/icons/etool/migrate72.gif); }
-#page-links a:hover#migrate img { background-image : url(../graphics/icons/ctool/migrate72.gif); }
-
-/*
- * Set up the action links
- */
-#action-links {
- width : 98%;
- position : absolute;
- left : 0px;
- top : 20px;
-}
-#action-links a#workbench {
- position : absolute;
- top : -16px;
- right : -8px;
- text-align : right;
-}
-#action-links a .background-image,
-#action-links a #workbench_img {
- height : 53px;
- width : 53px;
- text-align : center;
- vertical-align : top;
-}
-/* special case for mozilla */
-#action-links a > .background-image,
-#action-links a > #workbench_img {
- vertical-align : middle;
-}
-/* remove the hover image from the flow of the document,
- so it doesn't take up space and change the position
- of the main image */
-#action-links a .background-image {
- position : absolute;
-}
-
-#action-links a#workbench .background-image {
- background-image : url(../graphics/icons/etool/wb48.gif);
-}
-
-#action-links a#workbench:hover .background-image,
-#action-links a#workbench:focus .background-image,
-#action-links a#workbench:active .background-image {
- background-image : url(../graphics/icons/ctool/wb48.gif);
- visibility : visible;
- position: absolute;
- top: 0px;
- right: 0px;
-}
-/* hide the link and description until users hover over the link */
-#action-links a p .text, #action-links a .link-label {
- display : none;
-}
-#action-links a:hover .link-label,
-#action-links a:focus .link-label,
-#action-links a:active .link-label {
- display : block;
- width : 16em;
- margin-left : 10px;
-}
-#action-links a:hover p .text,
-#action-links a:focus p .text,
-#action-links a:active p .text {
- display : block;
- width : 16em;
-}
-#action-links a:hover,
-#action-links a:focus,
-#action-links a:active {
- border : 0px;
-}
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/*
+ * Set up general font colours, sizes, etc. Some of these will override
+ * settings from the shared CSS
+ */
+.intro-header H1 {
+ font-family: Helvetica, sans-serif;
+ font-size: 20px;
+ color: #000000;
+}
+
+#page-links a .link-label, #action-links a .link-label {
+ font-size : 13pt;
+ font-weight : 600;
+ color : #000000;
+}
+#page-links a p .text, #action-links a p .text {
+ font-size : 13pt;
+ font-weight : 500;
+ color : #333333;
+}
+
+/*
+ * Turn off shared backround image.
+ */
+
+.page {
+ background-position:left-10 top-10;
+ background-image: background.jpg;
+}
+
+/*
+ * Set up the content for the root page.
+ */
+body {
+ min-width : 770px;
+ /* since IE doesn't support min-width, use expression */
+ width:expression(document.body.clientWidth < 770? "770px": "auto" );
+ /* background-image : url(../graphics/root/background.jpg); */
+ background-repeat : no-repeat;
+ background-position : top left;
+ /* background-color : #7169D1; */
+}
+#root {
+/*
+ /* background-image : url(../graphics/root/brandmark.gif); */
+*/
+ background-repeat : no-repeat;
+ background-position : bottom left;
+ min-height : 450px;
+ height : 100%;
+ height : expression(document.body.clientHeight < 450? "450px": "100%" );
+}
+
+#branding {
+ position: absolute;
+ bottom : 10px;
+ left : 10px;
+}
+
+/*
+ * We will not use the general-purpose group1 used in
+ * other pages for a curve image.
+ */
+
+#extra-group1 {
+ display : none;
+}
+/*
+ * Set up the navigation bar. It should be centered in the middle
+ * of the page
+ */
+#links-background {
+ /* background-image : url(../graphics/root/dots.gif); */
+ background-repeat : repeat-x;
+ width : 100%;
+ height : 177px;
+ margin-top : 18%;
+ margin-bottom : auto;
+ text-align : center;
+}
+/* specify a width for Moz so we can center.
+ * **Important** If additional links are added, we will have to increase this width
+ * to accomodate them, otherwise they will wrap to a new line
+ */
+
+#links-background > #page-links {
+ width: 33em;
+ margin: 0 auto;
+}
+
+#page-links {
+ position : relative;
+ top : 50px;
+ text-align: center;
+}
+#page-links a {
+ position : relative;
+ width : 86px;
+ margin-left : 1em;
+ margin-right : 1em;
+ text-align : center;
+ vertical-align : top;
+}
+/* float left for Moz so the items all appear inline */
+#page-links > a {
+ float : left;
+ position : relative;
+}
+#page-links a img {
+ height : 82px;
+ width : 82px;
+ vertical-align : middle;
+}
+
+/* remove the hover image from the flow of the document,
+ so it doesn't take up space and change the position
+ of the link label and descriptions */
+#page-links a .background-image {
+ position : absolute;
+}
+/* properly align the link label and text based on class (left vs. right) */
+#page-links a:hover {
+ /* This is needed for IE to force the hover pseudo selectors below to work.*/
+ padding : 0 em;
+}
+/* Hide both the label and the description of the link and remove them from static HTML flow, until user hovers over link */
+/* First, set the width of both the label and the description to a max of 15 em. */
+/* This can be changed when translated to different country locals. */
+#page-links a span {
+ width : 16em;
+}
+
+/* Set up left links orientation first. */
+#page-links a.left:link .link-label,
+#page-links a.left:visited .link-label {
+ display: none;
+}
+#page-links a.left:hover .link-label,
+#page-links a.left:focus .link-label,
+#page-links a.left:active .link-label {
+ text-align: left;
+ display: block;
+ position: absolute;
+ top : 120 %;
+ left : 0;
+}
+
+/* hide description and remove it from static HTML flow, until user hovers over link */
+#page-links a.left:link .text,
+#page-links a.left:visited .text {
+ display: none;
+}
+#page-links a.left:hover .text,
+#page-links a.left:focus .text,
+#page-links a.left:active .text {
+ text-align: left;
+ display: block;
+ position: absolute;
+ left : 0;
+ top: 145%;
+}
+/* Set up right links orientation now. */
+#page-links a.right:link .link-label,
+#page-links a.right:visited .link-label {
+ display: none;
+}
+#page-links a.right:hover .link-label,
+#page-links a.right:focus .link-label,
+#page-links a.right:active .link-label {
+ text-align: right;
+ display: block;
+ position: absolute;
+ top : 120 %;
+ right : 0;
+}
+/* hide description and remove it from static HTML flow, until user hovers over link */
+#page-links a.right:link .text,
+#page-links a.right:visited .text {
+ display: none;
+}
+#page-links a.right:hover .text,
+#page-links a.right:focus .text,
+#page-links a.right:active .text {
+ text-align: right;
+ display: block;
+ position: absolute;
+ right : 0;
+ top: 145%;
+}
+
+/* properties for each of the page-links */
+#page-links a#overview img { background-image : url(../graphics/icons/etool/overview72.gif); }
+#page-links a:hover#overview img { background-image : url(../graphics/icons/ctool/overview72.gif); }
+
+#page-links a#tutorials img { background-image : url(../graphics/icons/etool/tutorials72.gif); }
+#page-links a:hover#tutorials img { background-image : url(../graphics/icons/ctool/tutorials72.gif); }
+
+#page-links a#samples img { background-image : url(../graphics/icons/etool/samples72.gif); }
+#page-links a:hover#samples img { background-image : url(../graphics/icons/ctool/samples72.gif); }
+
+#page-links a#whatsnew img { background-image : url(../graphics/icons/etool/whatsnew72.gif); }
+#page-links a:hover#whatsnew img { background-image : url(../graphics/icons/ctool/whatsnew72.gif); }
+
+#page-links a#firststeps img { background-image : url(../graphics/icons/etool/firsteps72.gif); }
+#page-links a:hover#firststeps img { background-image : url(../graphics/icons/ctool/firsteps72.gif); }
+
+#page-links a#webresources img { background-image : url(../graphics/icons/etool/webrsrc72.gif); }
+#page-links a:hover#webresources img { background-image : url(../graphics/icons/ctool/webrsrc72.gif); }
+
+#page-links a#migrate img { background-image : url(../graphics/icons/etool/migrate72.gif); }
+#page-links a:hover#migrate img { background-image : url(../graphics/icons/ctool/migrate72.gif); }
+
+/*
+ * Set up the action links
+ */
+#action-links {
+ width : 98%;
+ position : absolute;
+ left : 0px;
+ top : 20px;
+}
+#action-links a#workbench {
+ position : absolute;
+ top : -16px;
+ right : -8px;
+ text-align : right;
+}
+#action-links a .background-image,
+#action-links a #workbench_img {
+ height : 53px;
+ width : 53px;
+ text-align : center;
+ vertical-align : top;
+}
+/* special case for mozilla */
+#action-links a > .background-image,
+#action-links a > #workbench_img {
+ vertical-align : middle;
+}
+/* remove the hover image from the flow of the document,
+ so it doesn't take up space and change the position
+ of the main image */
+#action-links a .background-image {
+ position : absolute;
+}
+
+#action-links a#workbench .background-image {
+ background-image : url(../graphics/icons/etool/wb48.gif);
+}
+
+#action-links a#workbench:hover .background-image,
+#action-links a#workbench:focus .background-image,
+#action-links a#workbench:active .background-image {
+ background-image : url(../graphics/icons/ctool/wb48.gif);
+ visibility : visible;
+ position: absolute;
+ top: 0px;
+ right: 0px;
+}
+/* hide the link and description until users hover over the link */
+#action-links a p .text, #action-links a .link-label {
+ display : none;
+}
+#action-links a:hover .link-label,
+#action-links a:focus .link-label,
+#action-links a:active .link-label {
+ display : block;
+ width : 16em;
+ margin-left : 10px;
+}
+#action-links a:hover p .text,
+#action-links a:focus p .text,
+#action-links a:active p .text {
+ display : block;
+ width : 16em;
+}
+#action-links a:hover,
+#action-links a:focus,
+#action-links a:active {
+ border : 0px;
+}
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/shared.css Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/shared.css Wed Jul 21 12:11:48 2010 -0500
@@ -1,443 +1,443 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-/*
- * Set up general fonts, sizes and colors
- */
-body { font-family : Verdana, Helvetica, sans-serif; }
-
-H1, H2, H3, H4, p, a { color : #0A94D6; }
-
-.intro-header H1 {
- font-family: Verdana, Helvetica, sans-serif;
- font-size: 20px;
- color: #0A94D6;
-}
-
-h2 {
- font-size : 13pt;
- font-weight : normal;
- color : #0A94D6;
-}
-/* For regular div labels */
-H4 .div-label {
- font-size : 10pt;
- font-weight : bold;
-}
-
-/* For separators */
-HR {
- width: 90%;
- align: left;
- height : 1px;
- color : #0A94D6;
-}
-
-/* For the main page content's title */
-#content-header H4 .div-label {
- font-size : 14pt;
- font-weight : bold;
- color : #0A94D6;
- float : none;
- clear : both;
-}
-
-.page-description {
- font-size : 10pt;
- float : none;
- clear : both;
-}
-
-a {
- font-weight : bold;
- text-decoration : none;
- color : #4D4D4D;
-}
-
-a .link-label {
- font-size : 10pt;
- font-weight : normal;
-}
-
-/* Hide the 'special-effect' extra div in links by default. */
-.link-extra-div {
- display : none;
-}
-
-#navigation-links a .link-label {
- font-size : 9pt;
- font-weight : normal;
- color : #0A94D6;
-}
-
-a .text {
- font-size : 8pt;
- font-weight : normal;
-}
-
-p .group-description {
- font-size : 10pt;
- font-weight : normal;
-}
-
-
-/*
- * Set up other general properties like padding/margins
- */
-html, body { width : 100%; height : 100%; }
-
-html, body, div, h1, h4, p, a { margin : 0px; padding : 0px; }
-
-.intro-header H1 { padding-top : 10px; margin-left : 10px; }
-
-.section { }
-.section-body { display: none; padding : 0px; }
-
-/* For regular div labels */
-#page-content div H4 {
- padding : 10px;
- padding-bottom : 0px;
-}
-
-/* For the main page content's div label */
-#page-content #content-header H4 {
- padding-bottom : 10px;
- padding-top : 0px;
-}
-
-/* special case for Mozilla's main content-header label.
- Mozilla 1.4 needs more room at the top */
-#page-content > #content-header H4 { padding-top : 10px; }
-
-/* Needed in IE to get shift+tab to show the active image properly */
-a:active {
- border : solid 0px;
-}
-
-a img {
- border-width : 0;
- background-repeat : no-repeat;
-}
-
-/*
- * to get scrollbars working in both IE and Mozilla
- */
-html,body { overflow: auto; }
-html>body { overflow: visible; }
-
-/*
- * Set up the body, decorative background, and navigation for the content
- * pages.
- * Note: the root page handles its own background and navigation; these
- * settings primarily apply to the content pages
- */
-body {
- /*background-color : #FFFFFF;*/
- background-repeat : no-repeat;
- background-position : bottom right;
-}
-
-/*
- * We will use one of the general purpose groups to show
- * the curve image
- */
-#extra-group1 {
- /* width : 100%;
- height : 164px;
- position : absolute;
- top : 0px;
- /* background-image : url(../graphics/contentpage/backgroundcurve.gif); */
- background-repeat : no-repeat;
- background-position : top center;
- margin : 0;
- padding : 0;
- */
-}
-
-/*
- * Hide the other general-purpose groups
- */
-
-#extra-group2,
-#extra-group3,
-#extra-group4,
-#extra-group5 {
- display : none;
-}
-
-.intro-header { background-color : transparent; z-index : 100;}
-
-body, .page{
- min-width : 770px;
- /* since IE doesn't support min-width, try expression */
- width:expression(document.body.clientWidth < 770? "770px": "auto" );
- min-height : 425px;
- height : 100%;
- height : expression(document.body.clientHeight < 425? "425px": "100%" );
-}
-
-.page {
- min-height : 475px;
- /* background-image : url(../graphics/root/background.jpg); */
- background-repeat : repeat-x;
- background-position : top left;
-}
-
-#page-content {
- background-repeat : no-repeat;
- background-position : bottom right;
- height : 70%;
-}
-
-/*
- * Lay out the navigation links
- * (Root page does something similar for its navigation)
- */
-#navigation-links {
- position : relative;
- left : 10px;
- top : 5px;
- height : 60px;
- width : 98%;
-}
-
-#navigation-links a {
- padding-left : 5px;
- padding-right : 5px;
- float : left;
- text-align : center;
-}
-
-#navigation-links #customize {
- padding-left : 5px;
- padding-right : 5px;
- float : left;
- text-align : center;
-}
-
-#navigation-links a img {
- height : 52px;
- width : 52px;
- vertical-align : middle;
-}
-
-#navigation-links a .link-label { display : block; margin-top : 5px;}
-
-#navigation-links a .text { display : none; }
-
-#navigation-links a:hover,
-#navigation-links a:focus
-#navigation-links a:active { border-right : 0px;}
-
-/* properties for each of the navigation-links */
-#navigation-links a#overview img { background-image : url(../graphics/icons/etool/overview48.gif); }
-#navigation-links a#overview:hover img,
-#navigation-links a#overview:focus img,
-#navigation-links a#overview:active img { background-image : url(../graphics/icons/ctool/overview48.gif); }
-
-#navigation-links a#tutorials img { background-image : url(../graphics/icons/etool/tutorials48.gif); }
-#navigation-links a#tutorials:hover img,
-#navigation-links a#tutorials:active img,
-#navigation-links a#tutorials:focus img { background-image : url(../graphics/icons/ctool/tutorials48.gif); }
-
-#navigation-links a#samples img { background-image : url(../graphics/icons/etool/samples48.gif); }
-#navigation-links a#samples:hover img,
-#navigation-links a#samples:active img,
-#navigation-links a#samples:focus img { background-image : url(../graphics/icons/ctool/samples48.gif); }
-
-#navigation-links a#whatsnew img { background-image : url(../graphics/icons/etool/whatsnew48.gif); }
-#navigation-links a#whatsnew:hover img,
-#navigation-links a#whatsnew:focus img,
-#navigation-links a#whatsnew:active img { background-image : url(../graphics/icons/ctool/whatsnew48.gif); }
-
-#navigation-links a#firststeps img { background-image : url(../graphics/icons/etool/firsteps48.gif); }
-#navigation-links a#firststeps:hover img,
-#navigation-links a#firststeps:focus img,
-#navigation-links a#firststeps:active img { background-image : url(../graphics/icons/ctool/firsteps48.gif); }
-
-#navigation-links a#webresources img { background-image : url(../graphics/icons/etool/webrsrc48.gif); }
-#navigation-links a#webresources:hover img,
-#navigation-links a#webresources:focus img,
-#navigation-links a#webresources:active img { background-image : url(../graphics/icons/ctool/webrsrc48.gif); }
-
-#navigation-links a#migrate img { background-image : url(../graphics/icons/etool/migrate48.gif); }
-#navigation-links a#migrate:hover img,
-#navigation-links a#migrate:focus img,
-#navigation-links a#migrate:active img { background-image : url(../graphics/icons/ctool/migrate48.gif); }
-
-
-#navigation-links a#workbench { position : absolute; right : 0px; top : -35px; text-align : right;}
-#navigation-links a#workbench .text { display : none; }
-#navigation-links a#workbench img { background-image : url(../graphics/icons/etool/wb48.gif); width : 53px; height : 53px;}
-#navigation-links a#workbench:hover img,
-#navigation-links a#workbench:focus img,
-#navigation-links a#workbench:active img { background-image : url(../graphics/icons/ctool/wb48.gif); }
-
-/*
- * Lay out the page title and description
- */
-h1, p { margin-left : 10px; } /* required in mozilla so the page description is properly indented */
-
-/* position the page content so that the page title overlays the bottom
- * of the background image, but make sure the content is always on top
- * (using z-index) */
-#page-content {
- float : none;
- clear : both;
- text-align : center;
- margin-top : 35px;
-}
-
-.page > #page-content { margin-top : 50px; }
-
-#page-content p {
- padding-bottom : 15px;
- text-align : left;
- float : none;
- clear : both;
-}
-
-/* Page content bins */
-
-#page-content #top-left {
- border: none; float: left; margin: 0px; padding: 0px; width: 50%;
- clear: left;
-}
-#page-content #top-right {
- border: none; float: right; margin: 0px; padding: 0px; width: 50%;
- clear: right;
-}
-
-/* top-bottom divider - runs the entire width to ensure
- * bottom boxes start at the same y
- */
-#page-content #content-divider {
- border: none; float: none; margin: 0; padding: 0px; width: 100%;
- clear: both;
-}
-
-#page-content #bottom-left {
- border: none; float: left; margin: 0px; padding: 0px; width: 50%;
- clear: left;
-}
-#page-content #bottom-right {
- border: none; float: right; margin: 0px; padding: 0px; width: 50%;
- clear: right;
-}
-
-#page-content #content-header H4, .page-description {
- text-align : left;
- margin-right : 10px;
- float : none;
- clear : both;
-}
-
-#page-content #top-left > *,
-#page-content #top-right > *,
-#page-content #bottom-left > *,
-#page-content #bottom-right > * {
- display: block;
-}
-
-#page-content * > a {
- vertical-align : middle;
-}
-
-#page-content * a img {
- height : 57px;
- width : 57px;
- vertical-align : middle;
-}
-
-/* Controls link titles on welcome page */
-#page-content * a .link-label {
- font-weight : bold;
- display : block;
- position : relative;
- top : -50px;
- left : 60px;
- margin-right: 60px;
-}
-
-#page-content * a > .link-label { left: 65px; }
-
-/* Controls text description 0n welcome page */
-#page-content * a p .text {
- display : block;
- position : relative;
- top : -45px;
- margin-bottom: -25px;
- left : 53px;
- margin-right: 53px;
- color: #000;
-}
-
-#page-content * a p > .text { left: 58px; }
-
-#page-content * a:hover { border-right : 5px; }
-
-
-/* The following rules are for extensions in all pages. Extensions should be placed in
- * groups with the style 'content-group' and contain links with the style 'content-link'.
- * Group is important so that importance mixin style can be applied to the group that
- * uses block display. We need to see a solid rectangle around the extension, not
- * a tight polygon around the link perimeter.
- */
-
-.content-group {
- margin-left: 10px;
- margin-right: 10px;
- padding-left: 10px;
- padding-right: 10px;
- float : none;
- clear : both;
- text-align : left;
- /* color: #000000; */
- /* Carbide branding mod
- margin-bottom : 0px;
- /* background-image : url(../graphics/contentpage/page-link-wide.gif); */
- background-repeat:no-repeat;
- background-position : top left;
- */
-}
-
-
-.categoryContentnav {
- font-size: 9pt;
- font-weight: bold;
- color: #4A4D4A;
-}
-
-.topicList {
- font-size: 8pt;
- line-height:1.75;
- color: #00507C;
-}
-
-/* .content-link:hover { border-right : 0px; } */
-.content-link:hover {
- background-image : url(../graphics/contentpage/page-link-wide.gif);
-}
-
-
-iframe {
- position:relative;
- top:16px;
- width:100%;
- height:100%;
- padding-left:10px;
- }
-
-/* mozilla scrollbar appearing off page fix */
-#page-content > iframe {
- width: 98%;
- padding-left: 2%;
-}
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/*
+ * Set up general fonts, sizes and colors
+ */
+body { font-family : Verdana, Helvetica, sans-serif; }
+
+H1, H2, H3, H4, p, a { color : #000000; }
+
+.intro-header H1 {
+ font-family: Verdana, Helvetica, sans-serif;
+ font-size: 20px;
+ color: #000000;
+}
+
+h2 {
+ font-size : 13pt;
+ font-weight : normal;
+ color : #000000;
+}
+/* For regular div labels */
+H4 .div-label {
+ font-size : 10pt;
+ font-weight : bold;
+}
+
+/* For separators */
+HR {
+ width: 90%;
+ align: left;
+ height : 1px;
+ color : #000000;
+}
+
+/* For the main page content's title */
+#content-header H4 .div-label {
+ font-size : 14pt;
+ font-weight : bold;
+ color : #000000;
+ float : none;
+ clear : both;
+}
+
+.page-description {
+ font-size : 10pt;
+ float : none;
+ clear : both;
+}
+
+a {
+ font-weight : bold;
+ text-decoration : none;
+ color : #4D4D4D;
+}
+
+a .link-label {
+ font-size : 10pt;
+ font-weight : normal;
+}
+
+/* Hide the 'special-effect' extra div in links by default. */
+.link-extra-div {
+ display : none;
+}
+
+#navigation-links a .link-label {
+ font-size : 9pt;
+ font-weight : normal;
+ color : #000000;
+}
+
+a .text {
+ font-size : 8pt;
+ font-weight : normal;
+}
+
+p .group-description {
+ font-size : 10pt;
+ font-weight : normal;
+}
+
+
+/*
+ * Set up other general properties like padding/margins
+ */
+html, body { width : 100%; height : 100%; }
+
+html, body, div, h1, h4, p, a { margin : 0px; padding : 0px; }
+
+.intro-header H1 { padding-top : 10px; margin-left : 10px; }
+
+.section { }
+.section-body { display: none; padding : 0px; }
+
+/* For regular div labels */
+#page-content div H4 {
+ padding : 10px;
+ padding-bottom : 0px;
+}
+
+/* For the main page content's div label */
+#page-content #content-header H4 {
+ padding-bottom : 10px;
+ padding-top : 0px;
+}
+
+/* special case for Mozilla's main content-header label.
+ Mozilla 1.4 needs more room at the top */
+#page-content > #content-header H4 { padding-top : 10px; }
+
+/* Needed in IE to get shift+tab to show the active image properly */
+a:active {
+ border : solid 0px;
+}
+
+a img {
+ border-width : 0;
+ background-repeat : no-repeat;
+}
+
+/*
+ * to get scrollbars working in both IE and Mozilla
+ */
+html,body { overflow: auto; }
+html>body { overflow: visible; }
+
+/*
+ * Set up the body, decorative background, and navigation for the content
+ * pages.
+ * Note: the root page handles its own background and navigation; these
+ * settings primarily apply to the content pages
+ */
+body {
+ /*background-color : #FFFFFF;*/
+ background-repeat : no-repeat;
+ background-position : bottom right;
+}
+
+/*
+ * We will use one of the general purpose groups to show
+ * the curve image
+ */
+#extra-group1 {
+ /* width : 100%;
+ height : 164px;
+ position : absolute;
+ top : 0px;
+ /* background-image : url(../graphics/contentpage/backgroundcurve.gif); */
+ background-repeat : no-repeat;
+ background-position : top center;
+ margin : 0;
+ padding : 0;
+ */
+}
+
+/*
+ * Hide the other general-purpose groups
+ */
+
+#extra-group2,
+#extra-group3,
+#extra-group4,
+#extra-group5 {
+ display : none;
+}
+
+.intro-header { background-color : transparent; z-index : 100;}
+
+body, .page{
+ min-width : 770px;
+ /* since IE doesn't support min-width, try expression */
+ width:expression(document.body.clientWidth < 770? "770px": "auto" );
+ min-height : 425px;
+ height : 100%;
+ height : expression(document.body.clientHeight < 425? "425px": "100%" );
+}
+
+.page {
+ min-height : 475px;
+ background-image : url(../graphics/root/background.jpg);
+ background-repeat : repeat-x;
+ background-position : top left;
+}
+
+#page-content {
+ background-repeat : no-repeat;
+ background-position : bottom right;
+ height : 70%;
+}
+
+/*
+ * Lay out the navigation links
+ * (Root page does something similar for its navigation)
+ */
+#navigation-links {
+ position : relative;
+ left : 10px;
+ top : 5px;
+ height : 60px;
+ width : 98%;
+}
+
+#navigation-links a {
+ padding-left : 5px;
+ padding-right : 5px;
+ float : left;
+ text-align : center;
+}
+
+#navigation-links #customize {
+ padding-left : 5px;
+ padding-right : 5px;
+ float : left;
+ text-align : center;
+}
+
+#navigation-links a img {
+ height : 52px;
+ width : 52px;
+ vertical-align : middle;
+}
+
+#navigation-links a .link-label { display : block; margin-top : 5px;}
+
+#navigation-links a .text { display : none; }
+
+#navigation-links a:hover,
+#navigation-links a:focus
+#navigation-links a:active { border-right : 0px;}
+
+/* properties for each of the navigation-links */
+#navigation-links a#overview img { background-image : url(../graphics/icons/etool/overview48.gif); }
+#navigation-links a#overview:hover img,
+#navigation-links a#overview:focus img,
+#navigation-links a#overview:active img { background-image : url(../graphics/icons/ctool/overview48.gif); }
+
+#navigation-links a#tutorials img { background-image : url(../graphics/icons/etool/tutorials48.gif); }
+#navigation-links a#tutorials:hover img,
+#navigation-links a#tutorials:active img,
+#navigation-links a#tutorials:focus img { background-image : url(../graphics/icons/ctool/tutorials48.gif); }
+
+#navigation-links a#samples img { background-image : url(../graphics/icons/etool/samples48.gif); }
+#navigation-links a#samples:hover img,
+#navigation-links a#samples:active img,
+#navigation-links a#samples:focus img { background-image : url(../graphics/icons/ctool/samples48.gif); }
+
+#navigation-links a#whatsnew img { background-image : url(../graphics/icons/etool/whatsnew48.gif); }
+#navigation-links a#whatsnew:hover img,
+#navigation-links a#whatsnew:focus img,
+#navigation-links a#whatsnew:active img { background-image : url(../graphics/icons/ctool/whatsnew48.gif); }
+
+#navigation-links a#firststeps img { background-image : url(../graphics/icons/etool/firsteps48.gif); }
+#navigation-links a#firststeps:hover img,
+#navigation-links a#firststeps:focus img,
+#navigation-links a#firststeps:active img { background-image : url(../graphics/icons/ctool/firsteps48.gif); }
+
+#navigation-links a#webresources img { background-image : url(../graphics/icons/etool/webrsrc48.gif); }
+#navigation-links a#webresources:hover img,
+#navigation-links a#webresources:focus img,
+#navigation-links a#webresources:active img { background-image : url(../graphics/icons/ctool/webrsrc48.gif); }
+
+#navigation-links a#migrate img { background-image : url(../graphics/icons/etool/migrate48.gif); }
+#navigation-links a#migrate:hover img,
+#navigation-links a#migrate:focus img,
+#navigation-links a#migrate:active img { background-image : url(../graphics/icons/ctool/migrate48.gif); }
+
+
+#navigation-links a#workbench { position : absolute; right : 0px; top : -35px; text-align : right;}
+#navigation-links a#workbench .text { display : none; }
+#navigation-links a#workbench img { background-image : url(../graphics/icons/etool/wb48.gif); width : 53px; height : 53px;}
+#navigation-links a#workbench:hover img,
+#navigation-links a#workbench:focus img,
+#navigation-links a#workbench:active img { background-image : url(../graphics/icons/ctool/wb48.gif); }
+
+/*
+ * Lay out the page title and description
+ */
+h1, p { margin-left : 10px; } /* required in mozilla so the page description is properly indented */
+
+/* position the page content so that the page title overlays the bottom
+ * of the background image, but make sure the content is always on top
+ * (using z-index) */
+#page-content {
+ float : none;
+ clear : both;
+ text-align : center;
+ margin-top : 35px;
+}
+
+.page > #page-content { margin-top : 50px; }
+
+#page-content p {
+ padding-bottom : 15px;
+ text-align : left;
+ float : none;
+ clear : both;
+}
+
+/* Page content bins */
+
+#page-content #top-left {
+ border: none; float: left; margin: 0px; padding: 0px; width: 50%;
+ clear: left;
+}
+#page-content #top-right {
+ border: none; float: right; margin: 0px; padding: 0px; width: 50%;
+ clear: right;
+}
+
+/* top-bottom divider - runs the entire width to ensure
+ * bottom boxes start at the same y
+ */
+#page-content #content-divider {
+ border: none; float: none; margin: 0; padding: 0px; width: 100%;
+ clear: both;
+}
+
+#page-content #bottom-left {
+ border: none; float: left; margin: 0px; padding: 0px; width: 50%;
+ clear: left;
+}
+#page-content #bottom-right {
+ border: none; float: right; margin: 0px; padding: 0px; width: 50%;
+ clear: right;
+}
+
+#page-content #content-header H4, .page-description {
+ text-align : left;
+ margin-right : 10px;
+ float : none;
+ clear : both;
+}
+
+#page-content #top-left > *,
+#page-content #top-right > *,
+#page-content #bottom-left > *,
+#page-content #bottom-right > * {
+ display: block;
+}
+
+#page-content * > a {
+ vertical-align : middle;
+}
+
+#page-content * a img {
+ height : 57px;
+ width : 57px;
+ vertical-align : middle;
+}
+
+/* Controls link titles on welcome page */
+#page-content * a .link-label {
+ font-weight : bold;
+ display : block;
+ position : relative;
+ top : -50px;
+ left : 60px;
+ margin-right: 60px;
+}
+
+#page-content * a > .link-label { left: 65px; }
+
+/* Controls text description 0n welcome page */
+#page-content * a p .text {
+ display : block;
+ position : relative;
+ top : -45px;
+ margin-bottom: -25px;
+ left : 53px;
+ margin-right: 53px;
+ color: #000;
+}
+
+#page-content * a p > .text { left: 58px; }
+
+#page-content * a:hover { border-right : 5px; }
+
+
+/* The following rules are for extensions in all pages. Extensions should be placed in
+ * groups with the style 'content-group' and contain links with the style 'content-link'.
+ * Group is important so that importance mixin style can be applied to the group that
+ * uses block display. We need to see a solid rectangle around the extension, not
+ * a tight polygon around the link perimeter.
+ */
+
+.content-group {
+ margin-left: 10px;
+ margin-right: 10px;
+ padding-left: 10px;
+ padding-right: 10px;
+ float : none;
+ clear : both;
+ text-align : left;
+ /* color: #000000; */
+ /* Carbide branding mod
+ margin-bottom : 0px;
+ /* background-image : url(../graphics/contentpage/page-link-wide.gif); */
+ background-repeat:no-repeat;
+ background-position : top left;
+ */
+}
+
+
+.categoryContentnav {
+ font-size: 9pt;
+ font-weight: bold;
+ color: #4A4D4A;
+}
+
+.topicList {
+ font-size: 8pt;
+ line-height:1.75;
+ color: #00507C;
+}
+
+/* .content-link:hover { border-right : 0px; } */
+.content-link:hover {
+ background-image : url(../graphics/contentpage/page-link-wide.gif);
+}
+
+
+iframe {
+ position:relative;
+ top:16px;
+ width:100%;
+ height:100%;
+ padding-left:10px;
+ }
+
+/* mozilla scrollbar appearing off page fix */
+#page-content > iframe {
+ width: 98%;
+ padding-left: 2%;
+}
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/tutorials.css Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/tutorials.css Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-body {
- /* background-image : url(../graphics/root/background.jpg); */
-}
-
-/* show the "selected" image for this page */
-#navigation-links a#tutorials img,
-#navigation-links a#tutorials:hover img,
-#navigation-links a#tutorials:focus img,
-#navigation-links a#tutorials:active img {
- background-image : url(../graphics/icons/ctool/tutorials48sel.gif);
-}
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+body {
+ background-image : url(../graphics/root/background.jpg);
+}
+
+/* show the "selected" image for this page */
+#navigation-links a#tutorials img,
+#navigation-links a#tutorials:hover img,
+#navigation-links a#tutorials:focus img,
+#navigation-links a#tutorials:active img {
+ background-image : url(../graphics/icons/ctool/tutorials48sel.gif);
+}
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/webresources.css Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/webresources.css Wed Jul 21 12:11:48 2010 -0500
@@ -1,22 +1,22 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-body {
- /* background-image : url(../graphics/root/background.jpg); */
-}
-
-/* show the "selected" image for this page */
-#navigation-links a#webresources img,
-#navigation-links a#webresources:hover img,
-#navigation-links a#webresources:focus img,
-#navigation-links a#webresources:active img {
- background-image : url(../graphics/icons/ctool/webrsrc48sel.gif);
-}
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+body {
+ background-image : url(../graphics/root/background.jpg);
+}
+
+/* show the "selected" image for this page */
+#navigation-links a#webresources img,
+#navigation-links a#webresources:hover img,
+#navigation-links a#webresources:focus img,
+#navigation-links a#webresources:active img {
+ background-image : url(../graphics/icons/ctool/webrsrc48sel.gif);
+}
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/whatsnew.css Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/whatsnew.css Wed Jul 21 12:11:48 2010 -0500
@@ -1,28 +1,28 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-body {
- /* background-image : url(../graphics/root/background.jpg); */
-}
-
-/* show the "selected" image for this page */
-#navigation-links a#whatsnew img,
-#navigation-links a#whatsnew:hover img,
-#navigation-links a#whatsnew:focus img,
-#navigation-links a#whatsnew:active img {
- background-image : url(../graphics/icons/ctool/whatsnew48sel.gif);
-}
-
-/*
- * Default images for content links in this page.
- */
-.content-link img { background-image : url(../graphics/icons/obj48/new_obj.gif); }
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+body {
+ background-image : url(../graphics/root/background.jpg);
+}
+
+/* show the "selected" image for this page */
+#navigation-links a#whatsnew img,
+#navigation-links a#whatsnew:hover img,
+#navigation-links a#whatsnew:focus img,
+#navigation-links a#whatsnew:active img {
+ background-image : url(../graphics/icons/ctool/whatsnew48sel.gif);
+}
+
+/*
+ * Default images for content links in this page.
+ */
+.content-link img { background-image : url(../graphics/icons/obj48/new_obj.gif); }
.content-link:hover img { background-image : url(../graphics/icons/obj48/newhov_obj.gif); }
\ No newline at end of file
--- a/core/com.nokia.carbide.discovery.ui/META-INF/MANIFEST.MF Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/META-INF/MANIFEST.MF Wed Jul 21 12:11:48 2010 -0500
@@ -7,6 +7,7 @@
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
+ org.eclipse.core.net;bundle-version="1.2.100",
org.eclipse.equinox.p2.discovery;bundle-version="1.0.0",
org.eclipse.equinox.p2.discovery.compatibility;bundle-version="1.0.0",
org.eclipse.equinox.p2.ui.discovery;bundle-version="1.0.0",
@@ -14,7 +15,13 @@
org.eclipse.equinox.p2.operations;bundle-version="2.0.0",
org.eclipse.equinox.p2.core;bundle-version="2.0.0",
org.eclipse.equinox.p2.metadata;bundle-version="2.0.0",
- org.eclipse.equinox.p2.repository;bundle-version="2.0.0"
+ org.eclipse.equinox.p2.repository;bundle-version="2.0.0",
+ org.eclipse.equinox.p2.engine;bundle-version="2.0.0",
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.forms;bundle-version="3.5.0",
+ com.nokia.cpp.utils.ui;bundle-version="1.0.0",
+ com.nokia.cpp.utils.core;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Nokia
Binary file core/com.nokia.carbide.discovery.ui/icons/Carbide_c_icon_16x16.png has changed
--- a/core/com.nokia.carbide.discovery.ui/plugin.properties Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/plugin.properties Wed Jul 21 12:11:48 2010 -0500
@@ -1,1 +1,3 @@
view.name=Install Extensions
+menu.title=Carbide Portal
+portal.desc=Install extensions, get support, install SDKs, find latest news
\ No newline at end of file
--- a/core/com.nokia.carbide.discovery.ui/plugin.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/plugin.xml Wed Jul 21 12:11:48 2010 -0500
@@ -1,33 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
-
- <extension
- point="org.eclipse.ui.views">
- <view
- name="%view.name"
- icon="icons/icon-discovery.png"
- category="com.nokia.carbide.cpp"
- class="com.nokia.carbide.discovery.ui.view.DiscoveryView"
- id="com.nokia.carbide.discovery.view">
- </view>
- </extension>
- <extension
- point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension
- targetID="com.nokia.carbide.cpp.CarbideCppPerspective">
- <view
- id="com.nokia.carbide.discovery.view"
- relationship="stack"
- relative="org.eclipse.ui.internal.introview">
- </view>
- </perspectiveExtension>
- </extension>
+ <extension-point id="portalPage" name="Portal Page" schema="schema/portalPage.exsd"/>
<extension
point="org.eclipse.help.contexts">
<contexts
file="contexts.xml">
</contexts>
</extension>
+ <extension
+ point="org.eclipse.ui.editors">
+ <editor
+ class="com.nokia.carbide.internal.discovery.ui.editor.PortalEditor"
+ default="false"
+ icon="icons/Carbide_c_icon_16x16.png"
+ id="com.nokia.carbide.discovery.ui.portalEditor"
+ name="%menu.title">
+ </editor>
+ </extension>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ description="%portal.desc"
+ id="com.nokia.carbide.discovery.commands.launch"
+ name="%menu.title">
+ </command>
+ </extension>
+ <extension point="org.eclipse.ui.handlers">
+ <handler
+ class="com.nokia.carbide.internal.discovery.ui.command.LaunchHandler"
+ commandId="com.nokia.carbide.discovery.commands.launch">
+ </handler>
+ </extension>
+
+ <extension point="org.eclipse.ui.menus">
+ <!-- Defines a new menu contribution to the Eclipse help menu -->
+ <menuContribution
+ locationURI="menu:help?after=helpEnd">
+ <command
+ commandId="com.nokia.carbide.discovery.commands.launch"
+ icon="icons/Carbide_c_icon_16x16.png"
+ label="%menu.title"
+ id="portalCommand">
+ </command>
+ </menuContribution>
+ </extension>
+ <extension
+ point="com.nokia.carbide.discovery.ui.portalPage">
+ <portalPage
+ class="com.nokia.carbide.internal.discovery.ui.view.InstallExtensionsPage"
+ rank="50">
+ </portalPage>
+ </extension>
+ <extension
+ point="com.nokia.carbide.discovery.ui.portalPage">
+ <portalPage
+ class="com.nokia.carbide.internal.discovery.ui.view.HomePage"
+ rank="1">
+ </portalPage>
+ </extension>
+ <extension
+ point="com.nokia.carbide.discovery.ui.portalPage">
+ <portalPage
+ class="com.nokia.carbide.internal.discovery.ui.view.SupportPage"
+ rank="100">
+ </portalPage>
+ </extension>
</plugin>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/schema/portalPage.exsd Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,109 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="com.nokia.carbide.discovery.ui" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appinfo>
+ <meta.schema plugin="com.nokia.carbide.discovery.ui" id="portalPage" name="Portal Page"/>
+ </appinfo>
+ <documentation>
+ [Enter description of this extension point.]
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="portalPage"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="portalPage">
+ <complexType>
+ <attribute name="class" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute kind="java" basedOn=":com.nokia.carbide.internal.discovery.ui.extension.IPortalPage"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ <attribute name="rank" type="string">
+ <annotation>
+ <documentation>
+ relative ordering of pages in the navigation bar (1-100)
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="since"/>
+ </appinfo>
+ <documentation>
+ [Enter the first release in which this extension point appears.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="examples"/>
+ </appinfo>
+ <documentation>
+ [Enter extension point usage example here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="apiinfo"/>
+ </appinfo>
+ <documentation>
+ [Enter API information here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="implementation"/>
+ </appinfo>
+ <documentation>
+ [Enter information about supplied implementation of this extension point.]
+ </documentation>
+ </annotation>
+
+
+</schema>
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Activator.java Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Activator.java Wed Jul 21 12:11:48 2010 -0500
@@ -16,12 +16,28 @@
*/
package com.nokia.carbide.discovery.ui;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.Properties;
+
+import org.eclipse.core.net.proxy.IProxyData;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import com.nokia.cpp.internal.api.utils.core.ProxyUtils;
+
/**
* The activator class controls the plug-in life cycle
*/
@@ -32,6 +48,9 @@
// The shared instance
private static Activator plugin;
+ private static final String PROPERTY_PROXYPORT = "network.proxy_port"; //$NON-NLS-1$
+ private static final String PROPERTY_PROXYHOST = "network.proxy_host"; //$NON-NLS-1$
+
/**
* The constructor
*/
@@ -44,6 +63,9 @@
*/
public void start(BundleContext context) throws Exception {
super.start(context);
+ IProxyData proxyData = ProxyUtils.getProxyData(new URI("http://www.yahoo.com"));
+ System.setProperty(PROPERTY_PROXYHOST, proxyData.getHost());
+ System.setProperty(PROPERTY_PROXYPORT, String.valueOf(proxyData.getPort()));
}
/*
@@ -83,4 +105,29 @@
public static void logError(String message, Throwable t) {
getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, message, t));
}
+
+ /**
+ * Get a value from the server.properties file
+ * @param key
+ * @return
+ */
+ public static String getFromServerProperties(String key) {
+ Location installLocation = Platform.getInstallLocation();
+ URL url = installLocation.getURL();
+ IPath path = new Path(url.getPath());
+ path = path.append("configuration/server.properties"); //$NON-NLS-1$
+ File file = path.toFile();
+ Properties properties = new Properties();
+ try {
+ InputStream is = new FileInputStream(file);
+ properties.load(is);
+ is.close();
+ } catch (IOException e) {
+ String message =
+ MessageFormat.format("Could not find URL in configuration/server.properties file for key={0}", key);
+ Activator.logError(message, e);
+ }
+ return (String) properties.get(key);
+ }
+
}
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Messages.java Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Messages.java Wed Jul 21 12:11:48 2010 -0500
@@ -6,11 +6,22 @@
private static final String BUNDLE_NAME = "com.nokia.carbide.discovery.ui.messages"; //$NON-NLS-1$
public static String DiscoveryView_AdvancedInstallLabel;
public static String DiscoveryView_CheckAllLabel;
+ public static String DiscoveryView_GatherExtensionsTitle;
+ public static String DiscoveryView_GatheringInstallInfoTitle;
public static String DiscoveryView_InstallLabel;
public static String DiscoveryView_MissingDirectoryURLError;
public static String DiscoveryView_RefreshLabel;
public static String DiscoveryView_StatusLineFmt;
public static String DiscoveryView_UncheckAllLabel;
+ public static String HomePage_Title;
+ public static String InstallExtensionsPage_ActionBarTitle;
+ public static String InstallExtensionsPage_BuzillaActionName;
+ public static String InstallExtensionsPage_LinkBarTitle;
+ public static String InstallExtensionsPage_Title;
+ public static String PortalEditor_Name;
+ public static String PortalEditor_PageLoadError;
+ public static String PortalEditor_PageOpenError;
+ public static String SupportPage_Title;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/messages.properties Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/messages.properties Wed Jul 21 12:11:48 2010 -0500
@@ -1,7 +1,17 @@
DiscoveryView_AdvancedInstallLabel=Advanced Install...
DiscoveryView_CheckAllLabel=Check All Items
+DiscoveryView_GatherExtensionsTitle=Gathering Extensions
+DiscoveryView_GatheringInstallInfoTitle=Gathering Install Information
DiscoveryView_InstallLabel=Install Checked Items...
-DiscoveryView_MissingDirectoryURLError=Could not find URL in configuration/server.properties file for key={0}
DiscoveryView_RefreshLabel=Refresh
DiscoveryView_StatusLineFmt={0} item(s) checked
DiscoveryView_UncheckAllLabel=Uncheck All Items
+HomePage_Title=Home
+InstallExtensionsPage_ActionBarTitle=Install Actions
+InstallExtensionsPage_BuzillaActionName=Carbide Bugzilla
+InstallExtensionsPage_LinkBarTitle=Links
+InstallExtensionsPage_Title=Install Extensions
+PortalEditor_Name=Carbide Portal
+PortalEditor_PageLoadError=Could not load portal page
+PortalEditor_PageOpenError=Could not open portal
+SupportPage_Title=Carbide Support
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/view/DiscoveryView.java Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,274 +0,0 @@
-package com.nokia.carbide.discovery.ui.view;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.equinox.internal.p2.discovery.Catalog;
-import org.eclipse.equinox.internal.p2.discovery.DiscoveryCore;
-import org.eclipse.equinox.internal.p2.discovery.compatibility.BundleDiscoveryStrategy;
-import org.eclipse.equinox.internal.p2.discovery.compatibility.RemoteBundleDiscoveryStrategy;
-import org.eclipse.equinox.internal.p2.discovery.model.CatalogItem;
-import org.eclipse.equinox.internal.p2.ui.discovery.DiscoveryUi;
-import org.eclipse.equinox.internal.p2.ui.discovery.wizards.CatalogConfiguration;
-import org.eclipse.equinox.internal.p2.ui.discovery.wizards.CatalogViewer;
-import org.eclipse.equinox.p2.core.IProvisioningAgent;
-import org.eclipse.equinox.p2.operations.ProvisioningSession;
-import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager;
-import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
-import org.eclipse.equinox.p2.ui.ProvisioningUI;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.BaseSelectionListenerAction;
-import org.eclipse.ui.part.ViewPart;
-
-import com.nokia.carbide.discovery.ui.Activator;
-import com.nokia.carbide.discovery.ui.Messages;
-
-@SuppressWarnings("restriction")
-public class DiscoveryView extends ViewPart {
-
- private static final String DIRECTORY_KEY = "com.nokia.carbide.discovery.directory"; //$NON-NLS-1$
-
- private CatalogViewer viewer;
- private Action refreshAction;
- private BaseSelectionListenerAction checkAllAction;
- private BaseSelectionListenerAction checkNoneAction;
- private BaseSelectionListenerAction installAction;
- private Action showInstallWizardAction;
-
- private boolean initialized;
-
- private ISelectionChangedListener selectionListener;
-
- public DiscoveryView() {
- }
-
- /**
- * This is a callback that will allow us
- * to create the viewer and initialize it.
- */
- public void createPartControl(Composite parent) {
- Composite c = new Composite(parent, SWT.NONE);
- GridLayoutFactory.fillDefaults().applyTo(c);
- viewer = new CatalogViewer(getCatalog(), getSite(), getSite().getWorkbenchWindow(), getConfiguration());
- viewer.createControl(c);
- GridDataFactory.fillDefaults().grab(true, true).applyTo(viewer.getControl());
-
- // Create the help context id for the viewer's control
- PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(),
- "com.nokia.carbide.discovery.ui.view.DiscoveryView.viewer"); //$NON-NLS-1$
- makeActions();
- contributeToActionBars();
- }
-
- private CatalogConfiguration getConfiguration() {
- CatalogConfiguration configuration = new CatalogConfiguration();
- configuration.setShowTagFilter(false);
- return configuration;
- }
-
- private Catalog getCatalog() {
- Catalog catalog = new Catalog();
- catalog.setEnvironment(DiscoveryCore.createEnvironment());
- catalog.setVerifyUpdateSiteAvailability(false);
-
- // look for remote descriptor
- RemoteBundleDiscoveryStrategy remoteDiscoveryStrategy = new RemoteBundleDiscoveryStrategy();
- String url = getFromServerProperties(DIRECTORY_KEY);
- if (url != null) {
- remoteDiscoveryStrategy.setDirectoryUrl(url);
- catalog.getDiscoveryStrategies().add(remoteDiscoveryStrategy);
- }
- else // look for descriptors from installed bundles
- catalog.getDiscoveryStrategies().add(new BundleDiscoveryStrategy());
-
- return catalog;
- }
-
- public static String getFromServerProperties(String key) {
- Location installLocation = Platform.getInstallLocation();
- URL url = installLocation.getURL();
- IPath path = new Path(url.getPath());
- path = path.append("configuration/server.properties"); //$NON-NLS-1$
- File file = path.toFile();
- Properties properties = new Properties();
- try {
- InputStream is = new FileInputStream(file);
- properties.load(is);
- is.close();
- } catch (IOException e) {
- String message =
- MessageFormat.format(Messages.DiscoveryView_MissingDirectoryURLError, key);
- Activator.logError(message, e);
- }
- return (String) properties.get(key);
- }
-
- private void contributeToActionBars() {
- IActionBars bars = getViewSite().getActionBars();
- fillLocalPullDown(bars.getMenuManager());
- fillLocalToolBar(bars.getToolBarManager());
- }
-
- private void fillLocalPullDown(IMenuManager manager) {
- manager.add(checkAllAction);
- manager.add(checkNoneAction);
- manager.add(new Separator());
- manager.add(showInstallWizardAction);
- }
-
- private void fillLocalToolBar(IToolBarManager manager) {
- manager.add(refreshAction);
- manager.add(installAction);
- }
-
- private void makeActions() {
- refreshAction = new Action() {
- public void run() {
- viewer.setSelection(StructuredSelection.EMPTY);
- viewer.refresh();
- viewer.updateCatalog();
- }
- };
- refreshAction.setText(Messages.DiscoveryView_RefreshLabel);
- refreshAction.setImageDescriptor(Activator.getImageDescriptor("icons/refresh.gif")); //$NON-NLS-1$
- checkAllAction = new BaseSelectionListenerAction(Messages.DiscoveryView_CheckAllLabel) {
- public void run() {
- viewer.setSelection(StructuredSelection.EMPTY);
- viewer.setSelection(getAllItemsSelection());
- viewer.refresh();
- }
-
- private IStructuredSelection getAllItemsSelection() {
- List<CatalogItem> catalogItems = viewer.getCatalog().getItems();
- return new StructuredSelection(catalogItems);
- }
-
- protected boolean updateSelection(IStructuredSelection selection) {
- return !getAllItemsSelection().equals(selection);
- };
- };
- checkNoneAction = new BaseSelectionListenerAction(Messages.DiscoveryView_UncheckAllLabel) {
- public void run() {
- viewer.setSelection(StructuredSelection.EMPTY);
- viewer.refresh();
- };
-
- protected boolean updateSelection(IStructuredSelection selection) {
- return !selection.isEmpty();
- };
- };
- installAction = new BaseSelectionListenerAction(Messages.DiscoveryView_InstallLabel) {
- public void run() {
- DiscoveryUi.install(viewer.getCheckedItems(), new ProgressMonitorDialog(DiscoveryView.this.getViewSite().getShell()));
- };
-
- protected boolean updateSelection(IStructuredSelection selection) {
- return !selection.isEmpty();
- };
- };
- installAction.setImageDescriptor(Activator.getImageDescriptor("icons/icon-discovery.png")); //$NON-NLS-1$
- showInstallWizardAction = new Action(Messages.DiscoveryView_AdvancedInstallLabel) {
- public void run() {
- showInstallWizard();
- }
- };
- viewer.addSelectionChangedListener(checkAllAction);
- viewer.addSelectionChangedListener(checkNoneAction);
- viewer.addSelectionChangedListener(installAction);
- selectionListener = new ISelectionChangedListener() {
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- IActionBars bars = getViewSite().getActionBars();
- bars.getStatusLineManager().setMessage(
- selection.isEmpty() ? null : MessageFormat.format(
- Messages.DiscoveryView_StatusLineFmt, selection.size()));
- }
- };
- viewer.addSelectionChangedListener(selectionListener);
- }
-
- @Override
- public void dispose() {
- viewer.removeSelectionChangedListener(checkAllAction);
- viewer.removeSelectionChangedListener(checkNoneAction);
- viewer.removeSelectionChangedListener(installAction);
- viewer.removeSelectionChangedListener(selectionListener);
-
- super.dispose();
- }
-
- /**
- * Passing the focus request to the viewer's control.
- */
- public void setFocus() {
- if (!initialized) {
- initialized = true;
- Display.getDefault().asyncExec(new Runnable() {
- @Override
- public void run() {
- if (viewer.getViewer().getContentProvider() != null) {
- viewer.updateCatalog();
- }
- }
- });
- }
- }
-
- private void showInstallWizard() {
- ProvisioningUI defaultUI = ProvisioningUI.getDefaultUI();
- ProvisioningSession session = defaultUI.getSession();
- IProvisioningAgent agent = session.getProvisioningAgent();
- IMetadataRepositoryManager metadataManager = (IMetadataRepositoryManager) agent.getService(IMetadataRepositoryManager.SERVICE_NAME);
- IArtifactRepositoryManager artifactManager = (IArtifactRepositoryManager) agent.getService(IArtifactRepositoryManager.SERVICE_NAME);
- for (URI uri : getCatalogURIs()) {
- metadataManager.addRepository(uri);
- artifactManager.addRepository(uri);
- }
- defaultUI.openInstallWizard(null, null, null);
- }
-
- private Collection<URI> getCatalogURIs() {
- Set<URI> uris = new HashSet<URI>();
- for (CatalogItem catalogItem : viewer.getCatalog().getItems()) {
- try {
- uris.add(new URI(catalogItem.getSiteUrl()));
- } catch (URISyntaxException e) {
- // ignore bad URIs
- }
- }
- return uris;
- };
-
-}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/command/LaunchHandler.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,33 @@
+/*
+* Copyright (c) 2010 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.internal.discovery.ui.command;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+
+import com.nokia.carbide.internal.discovery.ui.editor.PortalEditor;
+
+public class LaunchHandler extends AbstractHandler {
+
+ @Override
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ PortalEditor.openPortal();
+ return null;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/ActionUIUpdater.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,50 @@
+/*
+* Copyright (c) 2010 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.internal.discovery.ui.editor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.nokia.carbide.internal.discovery.ui.extension.IPortalPage.IActionUIUpdater;
+
+class ActionUIUpdater implements IActionUIUpdater {
+
+ private List<TaskBar> taskBars;
+
+ public ActionUIUpdater() {
+ taskBars = new ArrayList<TaskBar>();
+ }
+
+ void addTaskBar(TaskBar taskBar) {
+ taskBars.add(taskBar);
+ }
+
+ @Override
+ public void update(String actionId) {
+ for (TaskBar taskBar : taskBars) {
+ taskBar.updateActionUI(actionId);
+ }
+ }
+
+ @Override
+ public void updateAll() {
+ for (TaskBar taskBar : taskBars) {
+ taskBar.updateAllActionsUI();
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/NavigationBar.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,105 @@
+/*
+* Copyright (c) 2010 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.internal.discovery.ui.editor;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.jface.layout.RowDataFactory;
+import org.eclipse.jface.layout.RowLayoutFactory;
+import org.eclipse.jface.resource.FontDescriptor;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+import com.nokia.carbide.internal.discovery.ui.extension.IPortalPage;
+
+class NavigationBar extends RoundedCornerComposite {
+
+ private PortalEditor portalEditor;
+
+
+ private final class ButtonListener extends SelectionAdapter {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ Button button = (Button) e.getSource();
+ selectNavButton(button);
+ }
+ }
+
+ private Map<Button, IPortalPage> buttonToPageMap;
+ private SelectionListener listener;
+ private Font buttonFont;
+ private Font selectedButtonFont;
+
+ NavigationBar(PortalEditor portalEditor, Composite parent) {
+ super(parent, portalEditor.getBackgroundParent(),
+ parent.getDisplay().getSystemColor(SWT.COLOR_BLACK),
+ parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+ this.portalEditor = portalEditor;
+ buttonToPageMap = new LinkedHashMap<Button, IPortalPage>();
+ RowLayoutFactory.swtDefaults().margins(3, 3).wrap(false).applyTo(this);
+ listener = new ButtonListener();
+ selectedButtonFont = JFaceResources.getHeaderFont();
+ FontData[] fontData = selectedButtonFont.getFontData();
+ for (FontData fd : fontData) {
+ fd.setStyle(SWT.NORMAL);
+ }
+ FontDescriptor desc = FontDescriptor.createFrom(fontData);
+ buttonFont = portalEditor.createFont(desc);
+ }
+
+ public void initUI() {
+ if (buttonToPageMap.isEmpty())
+ return;
+ selectNavButton(buttonToPageMap.keySet().iterator().next());
+ }
+
+ public void addNavButton(NavigationBar bar, IPortalPage page) {
+ Button b = new Button(bar, SWT.TOGGLE | SWT.FLAT);
+ b.setFont(buttonFont);
+ b.setText(page.getText());
+ b.setImage(portalEditor.createImage(page.getImageDescriptor(), 16, 16));
+ b.addSelectionListener(listener);
+ RowDataFactory.swtDefaults().applyTo(b);
+ buttonToPageMap.put(b, page);
+ }
+
+
+ public void selectNavButton(Button button) {
+ for (Button other : buttonToPageMap.keySet()) {
+ other.setSelection(false);
+ other.setFont(buttonFont);
+ }
+ button.setSelection(true);
+ portalEditor.showPage(buttonToPageMap.get(button));
+ button.setFont(selectedButtonFont);
+ layout();
+ }
+
+ @Override
+ public void layout() {
+ super.layout();
+ pack();
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalEditor.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,322 @@
+/*
+* Copyright (c) 2010 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.internal.discovery.ui.editor;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.resource.FontDescriptor;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.graphics.Resource;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPersistableElement;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.EditorPart;
+
+import com.nokia.carbide.discovery.ui.Activator;
+import com.nokia.carbide.discovery.ui.Messages;
+import com.nokia.carbide.internal.discovery.ui.extension.IPortalPage;
+import com.nokia.carbide.internal.discovery.ui.extension.IPortalPage.IActionBar;
+import com.nokia.cpp.internal.api.utils.core.Pair;
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
+public class PortalEditor extends EditorPart {
+
+ private static final String ID = "com.nokia.carbide.discovery.ui.portalEditor"; //$NON-NLS-1$
+ private static final String CONTEXT_ID = ID + ".context"; //$NON-NLS-1$
+ private static IEditorInput input;
+ private List<IPortalPage> uninitializedPages;
+ private Composite backgroundParent;
+ private Image oldBGImg;
+ private List<Resource> resources;
+ private StackComposite stackComposite;
+
+ private Map<IPortalPage, Control> pageToControlMap;
+ private NavigationBar navigationBar;
+
+ public PortalEditor() {
+ resources = new ArrayList<Resource>();
+ loadPortalPages();
+ pageToControlMap = new HashMap<IPortalPage, Control>();
+ }
+
+ private void loadPortalPages() {
+ List<Pair<IPortalPage, Integer>> pageExtensions = new ArrayList<Pair<IPortalPage,Integer>>();
+ IConfigurationElement[] elements =
+ Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID + ".portalPage"); //$NON-NLS-1$
+ for (IConfigurationElement element : elements) {
+ try {
+ IPortalPage portalPage = (IPortalPage) element.createExecutableExtension("class"); //$NON-NLS-1$
+ String rankString = element.getAttribute("rank"); //$NON-NLS-1$
+ int rank = Integer.MAX_VALUE;
+ if (rankString != null) {
+ try {
+ rank = Integer.parseInt(rankString);
+ }
+ catch (NumberFormatException e) {
+ Activator.logError(MessageFormat.format("Could not get rank for portal page {0}",
+ portalPage.getClass().getName()), e);
+ }
+ }
+ pageExtensions.add(new Pair<IPortalPage, Integer>(portalPage, rank));
+ }
+ catch (CoreException e) {
+ Activator.logError(Messages.PortalEditor_PageLoadError, e);
+ }
+ }
+ Collections.sort(pageExtensions, new Comparator<Pair<IPortalPage, Integer>>() {
+ @Override
+ public int compare(Pair<IPortalPage, Integer> o1, Pair<IPortalPage, Integer> o2) {
+ return o1.second.compareTo(o2.second);
+ }
+ });
+ uninitializedPages = new ArrayList<IPortalPage>();
+ for (Pair<IPortalPage, Integer> pair : pageExtensions) {
+ uninitializedPages.add(pair.first);
+ }
+ }
+
+ @Override
+ public void doSave(IProgressMonitor monitor) {
+ }
+
+ @Override
+ public void doSaveAs() {
+ }
+
+ @Override
+ public boolean isDirty() {
+ return false;
+ }
+
+ @Override
+ public boolean isSaveAsAllowed() {
+ return false;
+ }
+
+ @Override
+ public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+ setSite(site);
+ setInput(input);
+ }
+
+ @Override
+ public void createPartControl(final Composite parent) {
+ Composite body = createBody(parent);
+ navigationBar.initUI();
+
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(body, CONTEXT_ID);
+ }
+
+ private Composite createBody(final Composite parent) {
+ // create background
+ backgroundParent = new Composite(parent, SWT.NONE);
+ applyBG(backgroundParent);
+ GridLayoutFactory.fillDefaults().applyTo(backgroundParent);
+ // create top naviation bar
+ navigationBar = createNavigationBar(backgroundParent);
+ GridDataFactory.swtDefaults().grab(true, false).align(SWT.CENTER, SWT.TOP).indent(10, 10).applyTo(navigationBar);
+ // create stack composite
+ createStackComposite(backgroundParent, navigationBar);
+ return backgroundParent;
+ }
+
+ private void createStackComposite(Composite parent, NavigationBar bar) {
+ stackComposite = new StackComposite(parent, backgroundParent);
+ for (IPortalPage page : uninitializedPages) {
+ Control control = createPage(page);
+ pageToControlMap.put(page, control);
+ }
+ GridDataFactory.fillDefaults().grab(true, true).applyTo(stackComposite);
+ }
+
+ private Control createPage(IPortalPage page) {
+ Composite pageComposite = new SharedBackgroundComposite(stackComposite, backgroundParent);
+ GridLayoutFactory.fillDefaults().numColumns(2).spacing(20, 0).extendedMargins(20, 20, 20, 0).applyTo(pageComposite);
+ ActionUIUpdater updater = new ActionUIUpdater();
+ IActionBar[] commandBars = page.createCommandBars(this, updater);
+ if (commandBars.length > 0) {
+ Composite taskComposite = new SharedBackgroundComposite(pageComposite, backgroundParent);
+ GridLayoutFactory.fillDefaults().applyTo(taskComposite);
+ GridDataFactory.fillDefaults().grab(false, true).applyTo(taskComposite);
+ for (IActionBar actionBar : commandBars) {
+ Control control = createTaskBarControl(taskComposite, actionBar, updater);
+ GridDataFactory.fillDefaults().minSize(150, SWT.DEFAULT).grab(true, false).indent(0, 0).applyTo(control);
+ }
+ }
+ Composite pageControl = new RoundedCornerComposite(pageComposite, backgroundParent,
+ null, pageComposite.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
+ GridLayoutFactory.fillDefaults().margins(2, 2).applyTo(pageControl);
+ GridDataFactory.fillDefaults().grab(true, true).applyTo(pageControl);
+ Control control = page.createControl(pageControl, this);
+ GridDataFactory.fillDefaults().grab(true, true).applyTo(control);
+ return pageComposite;
+ }
+
+ private Control createTaskBarControl(Composite clientArea, IActionBar actionBar, ActionUIUpdater updater) {
+ TaskBar taskBar = new TaskBar(clientArea, this, actionBar);
+ updater.addTaskBar(taskBar);
+ return taskBar;
+ }
+
+ private NavigationBar createNavigationBar(Composite parent) {
+ NavigationBar bar = new NavigationBar(this, parent);
+ for (IPortalPage page : uninitializedPages) {
+ bar.addNavButton(bar, page);
+ }
+
+ return bar;
+ }
+
+ void showPage(IPortalPage page) {
+ if (uninitializedPages.contains(page)) {
+ uninitializedPages.remove(page);
+ page.init();
+ }
+ stackComposite.showControl(pageToControlMap.get(page));
+ }
+
+ private void applyBG(final Composite composite) {
+ composite.addListener(SWT.Resize, new Listener() {
+ @Override
+ public void handleEvent(Event event) {
+ Rectangle rect = composite.getClientArea();
+ Image newImage = new Image(composite.getDisplay(), rect.width, rect.height);
+ GC gc = new GC(newImage);
+ gc.setForeground(composite.getDisplay().getSystemColor(SWT.COLOR_BLACK));
+ gc.setBackground(composite.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
+ gc.fillGradientRectangle(0, 0, rect.width, rect.height, true);
+ gc.dispose();
+ composite.setBackgroundImage(newImage);
+
+ if (oldBGImg != null)
+ oldBGImg.dispose();
+ oldBGImg = newImage;
+ backgroundParent.layout();
+ }
+ });
+ }
+
+ @Override
+ public void setFocus() {
+ }
+
+ public static void openPortal() {
+ try {
+ WorkbenchUtils.openEditor(getInput(), ID);
+ } catch (PartInitException e) {
+ Activator.logError(Messages.PortalEditor_PageOpenError, e);
+ }
+ }
+
+ private static IEditorInput getInput() {
+ if (input == null) {
+ input = new IEditorInput() {
+ @SuppressWarnings("rawtypes")
+ @Override
+ public Object getAdapter(Class adapter) {
+ return null;
+ }
+
+ @Override
+ public String getToolTipText() {
+ return getName();
+ }
+
+ @Override
+ public IPersistableElement getPersistable() {
+ return null;
+ }
+
+ @Override
+ public String getName() {
+ return Messages.PortalEditor_Name;
+ }
+
+ @Override
+ public ImageDescriptor getImageDescriptor() {
+ return null;
+ }
+
+ @Override
+ public boolean exists() {
+ return false;
+ }
+ };
+ }
+
+ return input;
+ }
+
+ Image createImage(ImageDescriptor desc, int width, int height) {
+ Image image;
+ ImageData data = desc.getImageData();
+ if (data.width != width || data.height != height) {
+ image = new Image(Display.getCurrent(), desc.getImageData().scaledTo(width, height));
+ }
+ else {
+ image = desc.createImage();
+ }
+ resources.add(image);
+ return image;
+ }
+
+ Font createFont(FontDescriptor desc) {
+ Font font = desc.createFont(Display.getCurrent());
+ resources.add(font);
+ return font;
+ }
+
+ @Override
+ public void dispose() {
+ super.dispose();
+ for (Resource resource : resources) {
+ resource.dispose();
+ }
+ if (oldBGImg != null)
+ oldBGImg.dispose();
+ }
+
+ public Composite getBackgroundParent() {
+ return backgroundParent;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/RoundedCornerComposite.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 2010 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.internal.discovery.ui.editor;
+
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.widgets.Composite;
+
+class RoundedCornerComposite extends SharedBackgroundComposite {
+
+ private final Color background;
+ private final Color outline;
+
+ public RoundedCornerComposite(Composite parent, Composite backgroundParent, Color outline, Color background) {
+ super(parent, backgroundParent);
+ this.background = background;
+ this.outline = outline;
+ }
+
+ @Override
+ public void drawBackground(GC gc, int x, int y, int width, int height) {
+ super.drawBackground(gc, x, y, width, height);
+ if (background != null) {
+ gc.setBackground(background);
+ gc.fillRoundRectangle(0, 0, width, height, 6, 6);
+ }
+ if (outline != null) {
+ gc.setForeground(outline);
+ gc.drawRoundRectangle(2, 2, width - 4, height - 4, 6, 6);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/SharedBackgroundComposite.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,65 @@
+/*
+* Copyright (c) 2010 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.internal.discovery.ui.editor;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.swt.widgets.Composite;
+
+class SharedBackgroundComposite extends Canvas {
+
+ private final Composite backgroundParent;
+
+ public SharedBackgroundComposite(Composite parent, Composite backgroundParent) {
+ super(parent, SWT.NO_BACKGROUND);
+ this.backgroundParent = backgroundParent;
+ addPaintListener(new PaintListener() {
+ @Override
+ public void paintControl(PaintEvent e) {
+ Rectangle b = getBounds();
+ drawBackground(e.gc, b.x, b.y, b.width, b.height);
+ }
+ });
+ }
+
+ @Override
+ public void drawBackground(GC gc, int x, int y, int width, int height) {
+ Composite relParent = getParent();
+ while (relParent != backgroundParent) {
+ Rectangle relB = relParent.getBounds();
+ x += relB.x;
+ y += relB.y;
+ relParent = relParent.getParent();
+ }
+
+ Image image = backgroundParent.getBackgroundImage();
+ Rectangle imageBounds = image.getBounds();
+ width = Math.min(width, imageBounds.width - x);
+ height = Math.min(height, imageBounds.height - y);
+ if (width > 0 && height > 0)
+ gc.drawImage(image, x, y, width, height, 0, 0, width, height);
+// gc.drawText(getClass().getSimpleName(), 2, 2);
+// gc.setForeground(gc.getDevice().getSystemColor(SWT.COLOR_WHITE));
+// gc.drawRectangle(1, 1, width - 2, height - 2);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/StackComposite.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,26 @@
+package com.nokia.carbide.internal.discovery.ui.editor;
+
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+public class StackComposite extends SharedBackgroundComposite {
+
+ private StackLayout stackLayout;
+ private Control currentControl;
+
+ public StackComposite(Composite parent, Composite backgroundParent) {
+ super(parent, backgroundParent);
+ stackLayout = new StackLayout();
+ setLayout(stackLayout);
+ }
+
+ public void showControl(Control control) {
+ if (control == currentControl)
+ return;
+
+ stackLayout.topControl = control;
+ layout();
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/TaskBar.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,116 @@
+/*
+* Copyright (c) 2010 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.internal.discovery.ui.editor;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.layout.RowDataFactory;
+import org.eclipse.jface.layout.RowLayoutFactory;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.events.IHyperlinkListener;
+import org.eclipse.ui.forms.widgets.Hyperlink;
+
+import com.nokia.carbide.internal.discovery.ui.extension.IPortalPage.IActionBar;
+
+class TaskBar extends RoundedCornerComposite {
+
+ private final class ActionListener implements IHyperlinkListener {
+ @Override
+ public void linkActivated(HyperlinkEvent e) {
+ Hyperlink link = (Hyperlink) e.getSource();
+ runAction(link);
+ }
+
+ @Override
+ public void linkEntered(HyperlinkEvent e) {
+ Hyperlink link = (Hyperlink) e.getSource();
+ link.setUnderlined(true);
+ }
+
+ @Override
+ public void linkExited(HyperlinkEvent e) {
+ Hyperlink link = (Hyperlink) e.getSource();
+ link.setUnderlined(false);
+ }
+ }
+
+ private Map<Hyperlink, IAction> linkToActionMap;
+ private ActionListener listener;
+
+ public TaskBar(Composite parent, PortalEditor portalEditor, IActionBar actionBar) {
+ super(parent, portalEditor.getBackgroundParent(),
+ parent.getDisplay().getSystemColor(SWT.COLOR_BLACK),
+ parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+ createTitle(actionBar);
+ createActions(actionBar);
+ RowLayoutFactory.swtDefaults().type(SWT.VERTICAL).margins(10, 10).extendedMargins(5, 5, 5, 10).fill(true).wrap(false).applyTo(this);
+ }
+
+ private void createTitle(IActionBar actionBar) {
+ Label l = new Label(this, SWT.LEFT);
+ l.setFont(JFaceResources.getBannerFont());
+ l.setBackground(l.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+ l.setText(actionBar.getTitle());
+ RowDataFactory.swtDefaults().applyTo(l);
+ l = new Label(this, SWT.HORIZONTAL | SWT.SEPARATOR);
+ RowDataFactory.swtDefaults().applyTo(l);
+ }
+
+ private void createActions(IActionBar actionBar) {
+ listener = new ActionListener();
+ linkToActionMap = new HashMap<Hyperlink, IAction>();
+ for (IAction action : actionBar.getActions()) {
+ Hyperlink link = new Hyperlink(this, SWT.NONE);
+ link.setText(action.getText());
+ String toolTipText = action.getToolTipText();
+ if (toolTipText != null)
+ link.setToolTipText(toolTipText);
+ link.setForeground(link.getDisplay().getSystemColor(SWT.COLOR_DARK_BLUE));
+ link.setBackground(link.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+ linkToActionMap.put(link, action);
+ link.addHyperlinkListener(listener);
+ }
+ }
+
+ public void runAction(Hyperlink link) {
+ IAction action = linkToActionMap.get(link);
+ action.run();
+ }
+
+ public void updateActionUI(String actionId) {
+ for (Entry<Hyperlink, IAction> entry : linkToActionMap.entrySet()) {
+ IAction action = entry.getValue();
+ if (actionId.equals(action.getId())) {
+ entry.getKey().setEnabled(action.isEnabled());
+ }
+ }
+ }
+
+ public void updateAllActionsUI() {
+ for (Entry<Hyperlink, IAction> entry : linkToActionMap.entrySet()) {
+ entry.getKey().setEnabled(entry.getValue().isEnabled());
+ }
+ }
+
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractBrowserPortalPage.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,209 @@
+/*
+* Copyright (c) 2010 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.internal.discovery.ui.extension;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTError;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.LocationAdapter;
+import org.eclipse.swt.browser.LocationEvent;
+import org.eclipse.swt.browser.ProgressAdapter;
+import org.eclipse.swt.browser.ProgressEvent;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IEditorPart;
+
+import com.nokia.carbide.discovery.ui.Activator;
+
+public abstract class AbstractBrowserPortalPage implements IPortalPage {
+
+ private final class NavigationActionBar implements IActionBar {
+ private List<IAction> actions;
+ private IActionUIUpdater updater;
+ private boolean loading;
+
+ private NavigationActionBar(IActionUIUpdater updater) {
+ this.updater = updater;
+ makeActions();
+ }
+
+ public void hookBrowser() {
+ browser.addLocationListener(new LocationAdapter() {
+ @Override
+ public void changed(LocationEvent event) {
+ NavigationActionBar.this.updater.updateAll();
+ }
+ });
+ browser.addProgressListener(new ProgressAdapter() {
+ @Override
+ public void changed(ProgressEvent event) {
+ if (event.total == 0)
+ return;
+ setLoading(event.current != event.total);
+ NavigationActionBar.this.updater.updateAll();
+ }
+ @Override
+ public void completed(ProgressEvent event) {
+ setLoading(false);
+ NavigationActionBar.this.updater.updateAll();
+ }
+ });
+ }
+
+ @Override
+ public String getTitle() {
+ return "Navigation";
+ }
+
+ @Override
+ public IAction[] getActions() {
+ return (IAction[]) actions.toArray(new IAction[actions.size()]);
+ }
+
+ private void makeActions() {
+ actions = new ArrayList<IAction>();
+ IAction a = new Action("Back") {
+ @Override
+ public void run() {
+ if (browser != null) {
+ browser.back();
+ }
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return browser != null ? browser.isBackEnabled() : false;
+ }
+ };
+ actions.add(a);
+
+ a = new Action("Forward") {
+ @Override
+ public void run() {
+ if (browser != null) {
+ browser.forward();
+ }
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return browser != null ? browser.isForwardEnabled() : false;
+ }
+ };
+ actions.add(a);
+
+ a = new Action("Refresh Page") {
+ @Override
+ public void run() {
+ if (browser != null) {
+ browser.refresh();
+ update();
+ }
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return browser != null ? !loading : false;
+ }
+ };
+ actions.add(a);
+
+ a = new Action("Stop Loading") {
+ @Override
+ public void run() {
+ if (browser != null) {
+ browser.stop();
+ update();
+ }
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return browser != null ? loading : false;
+ }
+ };
+ actions.add(a);
+ }
+
+ public void update() {
+ updater.updateAll();
+ }
+
+ private void setLoading(boolean loading) {
+ browser.setCursor(loading ? browser.getDisplay().getSystemCursor(SWT.CURSOR_WAIT) : null);
+ this.loading = loading;
+ }
+ }
+
+ private Browser browser;
+ private NavigationActionBar actionBar;
+
+ @Override
+ public Control createControl(Composite parent, IEditorPart part) {
+ Composite composite = new Composite(parent, SWT.NONE);
+ composite.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
+ composite.setLayout(new FillLayout());
+ try {
+ browser = new Browser(composite, SWT.MOZILLA);
+ } catch (SWTError e) {
+ e.printStackTrace();
+ }
+
+ return composite;
+ }
+
+ protected String getURL() {
+ try {
+ URL url = new URL(Activator.getFromServerProperties(getClass().getName()));
+ return url.toString();
+ } catch (MalformedURLException e) {
+ Activator.logError("Could not load page due to bad URL", e);
+ }
+
+ return null;
+ }
+
+ @Override
+ public void init() {
+ if (browser != null) {
+ browser.setUrl(getURL());
+ actionBar.hookBrowser();
+ }
+ actionBar.update();
+ }
+
+ @Override
+ public IActionBar[] createCommandBars(IEditorPart part, IActionUIUpdater updater) {
+ actionBar = new NavigationActionBar(updater);
+ return new IActionBar[] {
+ actionBar
+ };
+ }
+
+ @Override
+ public void dispose() {
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/IPortalPage.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,107 @@
+/*
+* Copyright (c) 2010 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.internal.discovery.ui.extension;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * Interface to a portal page extension
+ */
+public interface IPortalPage {
+
+ /**
+ * Interface to an action/navigation bar for the portal page
+ */
+ public interface IActionBar {
+
+ /**
+ * Required title for the action bar
+ * @return String
+ */
+ String getTitle();
+
+ /**
+ * Actions shown in the action bar:
+ * Required: text and run() methods
+ * Optional: tool tip text
+ * Unused: image
+ * @return IAction
+ */
+ IAction[] getActions();
+
+ }
+
+ /**
+ * Interface allowing the UI for provided actions of an IActionBar to be updated (e.g., enabled state)
+ */
+ public interface IActionUIUpdater {
+
+ /**
+ * Update the UI for a specific action by id
+ * @param actionId
+ */
+ void update(String actionId);
+
+ /**
+ * Update the UI for all actions in the IActionBar
+ */
+ void updateAll();
+
+ }
+
+ /**
+ * Required title text used by main navigation bar
+ * @return String
+ */
+ String getText();
+
+ /**
+ * Required image descriptor used by main navigation bar
+ * @return ImageDescriptor
+ */
+ ImageDescriptor getImageDescriptor();
+
+ /**
+ * Called to create the control for the page
+ * @param parent Composite
+ * @param part IEditorPart
+ * @return Control
+ */
+ Control createControl(Composite parent, IEditorPart part);
+
+ /**
+ * Called to initialize the page when shown for the first time
+ */
+ void init();
+
+ /**
+ * Return action bars for the page (can't be null)
+ * @param part IEditorPart
+ * @param updater IActionUIUpdater
+ * @return IActionBar[]
+ */
+ IActionBar[] createCommandBars(IEditorPart part, IActionUIUpdater updater);
+
+ /**
+ * Called to dispose internal resources of the page
+ */
+ void dispose();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/DiscoveryView.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,294 @@
+/*
+* Copyright (c) 2010 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.internal.discovery.ui.view;
+
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.equinox.internal.p2.discovery.Catalog;
+import org.eclipse.equinox.internal.p2.discovery.DiscoveryCore;
+import org.eclipse.equinox.internal.p2.discovery.compatibility.BundleDiscoveryStrategy;
+import org.eclipse.equinox.internal.p2.discovery.compatibility.RemoteBundleDiscoveryStrategy;
+import org.eclipse.equinox.internal.p2.discovery.model.CatalogItem;
+import org.eclipse.equinox.internal.p2.ui.discovery.DiscoveryUi;
+import org.eclipse.equinox.internal.p2.ui.discovery.wizards.CatalogConfiguration;
+import org.eclipse.equinox.internal.p2.ui.discovery.wizards.CatalogViewer;
+import org.eclipse.equinox.p2.core.IProvisioningAgent;
+import org.eclipse.equinox.p2.operations.ProvisioningSession;
+import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager;
+import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
+import org.eclipse.equinox.p2.ui.ProvisioningUI;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.BaseSelectionListenerAction;
+import org.eclipse.ui.part.ViewPart;
+
+import com.nokia.carbide.discovery.ui.Activator;
+import com.nokia.carbide.discovery.ui.Messages;
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
+@SuppressWarnings("restriction")
+public class DiscoveryView extends ViewPart {
+
+ private final class RunnableContextDialog extends ProgressMonitorDialog {
+ private final String title;
+
+ private RunnableContextDialog(Shell parent, String title) {
+ super(parent);
+ this.title = title;
+ }
+
+ @Override
+ protected void configureShell(Shell shell) {
+ super.configureShell(shell);
+ shell.setText(title);
+ }
+
+ }
+
+ private static final String DIRECTORY_KEY = "com.nokia.carbide.discovery.directory"; //$NON-NLS-1$
+
+ private CatalogViewer viewer;
+ private Action refreshAction;
+ private BaseSelectionListenerAction checkAllAction;
+ private BaseSelectionListenerAction checkNoneAction;
+ private BaseSelectionListenerAction installAction;
+ private Action showInstallWizardAction;
+ private ISelectionChangedListener selectionListener;
+
+ /**
+ * This is a callback that will allow us
+ * to create the viewer and initialize it.
+ */
+ public void createPartControl(Composite parent) {
+ Composite c = new Composite(parent, SWT.NONE);
+ GridLayoutFactory.fillDefaults().applyTo(c);
+ viewer = new CatalogViewer(getCatalog(), getSite(),
+ new RunnableContextDialog(DiscoveryView.this.getViewSite().getShell(),
+ Messages.DiscoveryView_GatherExtensionsTitle),
+ getConfiguration());
+ viewer.createControl(c);
+ GridDataFactory.fillDefaults().grab(true, true).applyTo(viewer.getControl());
+
+ // Create the help context id for the viewer's control
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(),
+ "com.nokia.carbide.discovery.ui.view.DiscoveryView.catalogviewer"); //$NON-NLS-1$
+ makeActions();
+ contributeToActionBars();
+ if (!WorkbenchUtils.isJUnitRunning()) { // do not initialize the catalog if JUnit is running
+ getSite().getShell().getDisplay().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ viewer.updateCatalog();
+ }
+ });
+ }
+ }
+
+ private CatalogConfiguration getConfiguration() {
+ CatalogConfiguration configuration = new CatalogConfiguration();
+ configuration.setShowTagFilter(false);
+ return configuration;
+ }
+
+ private Catalog getCatalog() {
+ Catalog catalog = new Catalog();
+ catalog.setEnvironment(DiscoveryCore.createEnvironment());
+ catalog.setVerifyUpdateSiteAvailability(false);
+
+ // look for remote descriptor
+ RemoteBundleDiscoveryStrategy remoteDiscoveryStrategy = new RemoteBundleDiscoveryStrategy();
+ String url = Activator.getFromServerProperties(DIRECTORY_KEY);
+ if (url != null) {
+ remoteDiscoveryStrategy.setDirectoryUrl(url);
+ catalog.getDiscoveryStrategies().add(remoteDiscoveryStrategy);
+ }
+ else // look for descriptors from installed bundles
+ catalog.getDiscoveryStrategies().add(new BundleDiscoveryStrategy());
+
+ return catalog;
+ }
+
+ private void contributeToActionBars() {
+ IActionBars bars = getViewSite().getActionBars();
+ fillLocalPullDown(bars.getMenuManager());
+ fillLocalToolBar(bars.getToolBarManager());
+ }
+
+ private void fillLocalPullDown(IMenuManager manager) {
+ manager.add(checkAllAction);
+ manager.add(checkNoneAction);
+ manager.add(new Separator());
+ manager.add(installAction);
+ manager.add(showInstallWizardAction);
+ }
+
+ private void fillLocalToolBar(IToolBarManager manager) {
+ manager.add(refreshAction);
+ manager.add(installAction);
+ }
+
+ private void makeActions() {
+ refreshAction = new Action() {
+ public void run() {
+ viewer.setSelection(StructuredSelection.EMPTY);
+ viewer.updateCatalog();
+ viewer.refresh();
+ }
+ };
+ refreshAction.setText(Messages.DiscoveryView_RefreshLabel);
+ refreshAction.setImageDescriptor(Activator.getImageDescriptor("icons/refresh.gif")); //$NON-NLS-1$
+ checkAllAction = new BaseSelectionListenerAction(Messages.DiscoveryView_CheckAllLabel) {
+ public void run() {
+ viewer.setSelection(StructuredSelection.EMPTY);
+ viewer.setSelection(getAllItemsSelection());
+ viewer.refresh();
+ }
+
+ private IStructuredSelection getAllItemsSelection() {
+ List<CatalogItem> catalogItems = new ArrayList<CatalogItem>();
+ for (CatalogItem catalogItem : viewer.getCatalog().getItems()) {
+ if (!catalogItem.isInstalled())
+ catalogItems.add(catalogItem);
+ }
+ return new StructuredSelection(catalogItems);
+ }
+
+ protected boolean updateSelection(IStructuredSelection selection) {
+ return !getAllItemsSelection().equals(selection);
+ };
+ };
+ checkNoneAction = new BaseSelectionListenerAction(Messages.DiscoveryView_UncheckAllLabel) {
+ public void run() {
+ viewer.setSelection(StructuredSelection.EMPTY);
+ viewer.refresh();
+ };
+
+ protected boolean updateSelection(IStructuredSelection selection) {
+ return !selection.isEmpty();
+ };
+ };
+ installAction = new BaseSelectionListenerAction(Messages.DiscoveryView_InstallLabel) {
+ public void run() {
+ DiscoveryUi.install(viewer.getCheckedItems(),
+ new RunnableContextDialog(DiscoveryView.this.getViewSite().getShell(),
+ Messages.DiscoveryView_GatheringInstallInfoTitle));
+ };
+
+ protected boolean updateSelection(IStructuredSelection selection) {
+ return !selection.isEmpty();
+ };
+ };
+ installAction.setImageDescriptor(Activator.getImageDescriptor("icons/icon-discovery.png")); //$NON-NLS-1$
+ showInstallWizardAction = new Action(Messages.DiscoveryView_AdvancedInstallLabel) {
+ public void run() {
+ showInstallWizard();
+ }
+ };
+ viewer.addSelectionChangedListener(checkAllAction);
+ viewer.addSelectionChangedListener(checkNoneAction);
+ viewer.addSelectionChangedListener(installAction);
+ selectionListener = new ISelectionChangedListener() {
+ @Override
+ public void selectionChanged(SelectionChangedEvent event) {
+ IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+ IActionBars bars = getViewSite().getActionBars();
+ bars.getStatusLineManager().setMessage(
+ selection.isEmpty() ? null : MessageFormat.format(
+ Messages.DiscoveryView_StatusLineFmt, selection.size()));
+ }
+ };
+ viewer.addSelectionChangedListener(selectionListener);
+ }
+
+ @Override
+ public void dispose() {
+ viewer.removeSelectionChangedListener(checkAllAction);
+ viewer.removeSelectionChangedListener(checkNoneAction);
+ viewer.removeSelectionChangedListener(installAction);
+ viewer.removeSelectionChangedListener(selectionListener);
+
+ super.dispose();
+ }
+
+ /**
+ * Passing the focus request to the viewer's control.
+ */
+ public void setFocus() {
+ }
+
+ private void showInstallWizard() {
+ ProvisioningUI defaultUI = ProvisioningUI.getDefaultUI();
+ ProvisioningSession session = defaultUI.getSession();
+ IProvisioningAgent agent = session.getProvisioningAgent();
+ IMetadataRepositoryManager metadataManager = (IMetadataRepositoryManager) agent.getService(IMetadataRepositoryManager.SERVICE_NAME);
+ IArtifactRepositoryManager artifactManager = (IArtifactRepositoryManager) agent.getService(IArtifactRepositoryManager.SERVICE_NAME);
+ for (URI uri : getCatalogURIs()) {
+ metadataManager.addRepository(uri);
+ artifactManager.addRepository(uri);
+ }
+ defaultUI.openInstallWizard(null, null, null);
+
+// String profileId = defaultUI.getProfileId();
+// IProfileRegistry profileRegistry = (IProfileRegistry) agent.getService(IProfileRegistry.SERVICE_NAME);
+// IProfile profile = profileRegistry.getProfile(profileId);
+// IQueryResult<IInstallableUnit> queryResult = profile.query(QueryUtil.createIUGroupQuery(), null);
+// List<String> list = new ArrayList<String>();
+// for (Iterator<IInstallableUnit> iter = queryResult.iterator(); iter.hasNext();) {
+// IInstallableUnit iu = iter.next();
+// list.add(iu.getId() + "|" + iu.getVersion());
+// }
+// Collections.sort(list);
+// for (String s : list) {
+// System.out.println(s);
+// }
+ }
+
+ private Collection<URI> getCatalogURIs() {
+ Set<URI> uris = new HashSet<URI>();
+ for (CatalogItem catalogItem : viewer.getCatalog().getItems()) {
+ try {
+ uris.add(new URI(catalogItem.getSiteUrl()));
+ } catch (URISyntaxException e) {
+ // ignore bad URIs
+ }
+ }
+ return uris;
+ };
+
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/HomePage.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,21 @@
+package com.nokia.carbide.internal.discovery.ui.view;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+
+import com.nokia.carbide.discovery.ui.Activator;
+import com.nokia.carbide.discovery.ui.Messages;
+import com.nokia.carbide.internal.discovery.ui.extension.AbstractBrowserPortalPage;
+
+public class HomePage extends AbstractBrowserPortalPage {
+
+ @Override
+ public String getText() {
+ return Messages.HomePage_Title;
+ }
+
+ @Override
+ public ImageDescriptor getImageDescriptor() {
+ return Activator.getImageDescriptor("icons/Carbide_c_icon_16x16.png"); //$NON-NLS-1$
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/InstallExtensionsPage.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,326 @@
+package com.nokia.carbide.internal.discovery.ui.view;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.equinox.internal.p2.discovery.Catalog;
+import org.eclipse.equinox.internal.p2.discovery.DiscoveryCore;
+import org.eclipse.equinox.internal.p2.discovery.compatibility.BundleDiscoveryStrategy;
+import org.eclipse.equinox.internal.p2.discovery.compatibility.RemoteBundleDiscoveryStrategy;
+import org.eclipse.equinox.internal.p2.discovery.model.CatalogItem;
+import org.eclipse.equinox.internal.p2.ui.discovery.DiscoveryUi;
+import org.eclipse.equinox.internal.p2.ui.discovery.wizards.CatalogConfiguration;
+import org.eclipse.equinox.internal.p2.ui.discovery.wizards.CatalogViewer;
+import org.eclipse.equinox.p2.core.IProvisioningAgent;
+import org.eclipse.equinox.p2.operations.ProvisioningSession;
+import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager;
+import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
+import org.eclipse.equinox.p2.ui.ProvisioningUI;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.BaseSelectionListenerAction;
+import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
+
+import com.nokia.carbide.discovery.ui.Activator;
+import com.nokia.carbide.discovery.ui.Messages;
+import com.nokia.carbide.internal.discovery.ui.extension.IPortalPage;
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
+@SuppressWarnings("restriction")
+public class InstallExtensionsPage implements IPortalPage {
+
+ private final class RunnableContextDialog extends ProgressMonitorDialog {
+ private final String title;
+
+ private RunnableContextDialog(Shell parent, String title) {
+ super(parent);
+ this.title = title;
+ }
+
+ @Override
+ protected void configureShell(Shell shell) {
+ super.configureShell(shell);
+ shell.setText(title);
+ }
+
+ }
+
+ private final class ActionBar implements IActionBar {
+ private IAction[] actions;
+
+ public ActionBar(IEditorPart part) {
+ actions = makeActions(part);
+ }
+
+ @Override
+ public String getTitle() {
+ return Messages.InstallExtensionsPage_ActionBarTitle;
+ }
+
+ @Override
+ public IAction[] getActions() {
+ return actions;
+ }
+ }
+
+ private final class LinkBar implements IActionBar {
+ @Override
+ public String getTitle() {
+ return Messages.InstallExtensionsPage_LinkBarTitle;
+ }
+
+ @Override
+ public IAction[] getActions() {
+ IAction action = new Action(Messages.InstallExtensionsPage_BuzillaActionName) {
+ @Override
+ public void run() {
+ try {
+ URL url = new URL("https://xdabug001.ext.nokia.com/bugzilla"); //$NON-NLS-1$
+ IWorkbenchBrowserSupport browserSupport = PlatformUI.getWorkbench().getBrowserSupport();
+ browserSupport.createBrowser(null).openURL(url);
+ } catch (MalformedURLException e) {
+ } catch (PartInitException e) {
+ }
+ }
+ };
+ return new IAction[] { action };
+ }
+ }
+
+ private static final String DIRECTORY_KEY = "com.nokia.carbide.discovery.directory"; //$NON-NLS-1$
+
+ private CatalogViewer viewer;
+ private List<ISelectionChangedListener> selectionListeners;
+ private IActionUIUpdater updater;
+
+ public InstallExtensionsPage() {
+ }
+
+ @Override
+ public String getText() {
+ return Messages.InstallExtensionsPage_Title;
+ }
+
+ @Override
+ public ImageDescriptor getImageDescriptor() {
+ return Activator.getImageDescriptor("icons/icon-discovery.png"); //$NON-NLS-1$
+ }
+
+ @Override
+ public Control createControl(Composite parent, IEditorPart part) {
+ Composite c = new Composite(parent, SWT.NONE);
+ GridLayoutFactory.swtDefaults().applyTo(c);
+ viewer = new CatalogViewer(getCatalog(), part.getEditorSite(),
+ new RunnableContextDialog(part.getEditorSite().getShell(),
+ Messages.DiscoveryView_GatherExtensionsTitle),
+ getConfiguration());
+ viewer.createControl(c);
+ GridDataFactory.fillDefaults().grab(true, true).applyTo(viewer.getControl());
+
+ // Create the help context id for the viewer's control
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(),
+ "com.nokia.carbide.discovery.ui.view.DiscoveryView.catalogviewer"); //$NON-NLS-1$
+ return c;
+ }
+
+ @Override
+ public void init() {
+ if (!WorkbenchUtils.isJUnitRunning()) { // do not initialize the catalog if JUnit is running
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ for (ISelectionChangedListener listener : selectionListeners) {
+ viewer.addSelectionChangedListener(listener);
+ }
+ viewer.updateCatalog();
+ }
+ });
+ }
+ }
+
+ @Override
+ public IActionBar[] createCommandBars(IEditorPart part, IActionUIUpdater updater) {
+ this.updater = updater;
+ return new IActionBar[] { new ActionBar(part), new LinkBar() };
+ }
+
+ private CatalogConfiguration getConfiguration() {
+ CatalogConfiguration configuration = new CatalogConfiguration();
+ configuration.setShowTagFilter(false);
+ return configuration;
+ }
+
+ private Catalog getCatalog() {
+ Catalog catalog = new Catalog();
+ catalog.setEnvironment(DiscoveryCore.createEnvironment());
+ catalog.setVerifyUpdateSiteAvailability(false);
+
+ // look for remote descriptor
+ RemoteBundleDiscoveryStrategy remoteDiscoveryStrategy = new RemoteBundleDiscoveryStrategy();
+ String url = Activator.getFromServerProperties(DIRECTORY_KEY);
+ if (url != null) {
+ remoteDiscoveryStrategy.setDirectoryUrl(url);
+ catalog.getDiscoveryStrategies().add(remoteDiscoveryStrategy);
+ }
+ else // look for descriptors from installed bundles
+ catalog.getDiscoveryStrategies().add(new BundleDiscoveryStrategy());
+
+ return catalog;
+ }
+
+ private IAction[] makeActions(final IEditorPart part) {
+ selectionListeners = new ArrayList<ISelectionChangedListener>();
+ List<IAction> actions = new ArrayList<IAction>();
+ IAction action = new Action(Messages.DiscoveryView_RefreshLabel) {
+ public void run() {
+ viewer.setSelection(StructuredSelection.EMPTY);
+ viewer.updateCatalog();
+ viewer.refresh();
+ }
+ };
+ actions.add(action);
+
+ action = new BaseSelectionListenerAction(Messages.DiscoveryView_CheckAllLabel) {
+ public void run() {
+ viewer.setSelection(StructuredSelection.EMPTY);
+ viewer.setSelection(getAllItemsSelection());
+ viewer.refresh();
+ }
+
+ private IStructuredSelection getAllItemsSelection() {
+ List<CatalogItem> catalogItems = new ArrayList<CatalogItem>();
+ for (CatalogItem catalogItem : viewer.getCatalog().getItems()) {
+ if (!catalogItem.isInstalled())
+ catalogItems.add(catalogItem);
+ }
+ return new StructuredSelection(catalogItems);
+ }
+
+ protected boolean updateSelection(IStructuredSelection selection) {
+ scheduleUpdateAllActionUIs();
+ return !getAllItemsSelection().equals(selection);
+ }
+ };
+ action.setId(getClass().getName() + ".checkAll"); //$NON-NLS-1$
+ selectionListeners.add((ISelectionChangedListener) action);
+ actions.add(action);
+
+ action = new BaseSelectionListenerAction(Messages.DiscoveryView_UncheckAllLabel) {
+ public void run() {
+ viewer.setSelection(StructuredSelection.EMPTY);
+ viewer.refresh();
+ };
+
+ protected boolean updateSelection(IStructuredSelection selection) {
+ scheduleUpdateAllActionUIs();
+ return !selection.isEmpty();
+ };
+ };
+ action.setId(getClass().getName() + ".uncheckAll"); //$NON-NLS-1$
+ selectionListeners.add((ISelectionChangedListener) action);
+ actions.add(action);
+
+ action = new BaseSelectionListenerAction(Messages.DiscoveryView_InstallLabel) {
+ public void run() {
+ DiscoveryUi.install(viewer.getCheckedItems(),
+ new RunnableContextDialog(part.getEditorSite().getShell(),
+ Messages.DiscoveryView_GatheringInstallInfoTitle));
+ };
+
+ protected boolean updateSelection(IStructuredSelection selection) {
+ scheduleUpdateAllActionUIs();
+ return !selection.isEmpty();
+ };
+ };
+ action.setId(getClass().getName() + ".install"); //$NON-NLS-1$
+ selectionListeners.add((ISelectionChangedListener) action);
+ actions.add(action);
+
+ action = new Action(Messages.DiscoveryView_AdvancedInstallLabel) {
+ public void run() {
+ showInstallWizard();
+ }
+ };
+ actions.add(action);
+
+ ISelectionChangedListener selectionListener = new ISelectionChangedListener() {
+ @Override
+ public void selectionChanged(SelectionChangedEvent event) {
+ IStructuredSelection selection = (IStructuredSelection) event.getSelection();
+ IActionBars bars = part.getEditorSite().getActionBars();
+ bars.getStatusLineManager().setMessage(
+ selection.isEmpty() ? null : MessageFormat.format(
+ Messages.DiscoveryView_StatusLineFmt, selection.size()));
+ }
+ };
+ selectionListeners.add(selectionListener);
+
+ return (IAction[]) actions.toArray(new IAction[actions.size()]);
+ }
+
+ @Override
+ public void dispose() {
+ for (ISelectionChangedListener listener : selectionListeners) {
+ viewer.removeSelectionChangedListener(listener);
+ }
+ }
+
+ private void showInstallWizard() {
+ ProvisioningUI defaultUI = ProvisioningUI.getDefaultUI();
+ ProvisioningSession session = defaultUI.getSession();
+ IProvisioningAgent agent = session.getProvisioningAgent();
+ IMetadataRepositoryManager metadataManager = (IMetadataRepositoryManager) agent.getService(IMetadataRepositoryManager.SERVICE_NAME);
+ IArtifactRepositoryManager artifactManager = (IArtifactRepositoryManager) agent.getService(IArtifactRepositoryManager.SERVICE_NAME);
+ for (URI uri : getCatalogURIs()) {
+ metadataManager.addRepository(uri);
+ artifactManager.addRepository(uri);
+ }
+ defaultUI.openInstallWizard(null, null, null);
+ }
+
+ private Collection<URI> getCatalogURIs() {
+ Set<URI> uris = new HashSet<URI>();
+ for (CatalogItem catalogItem : viewer.getCatalog().getItems()) {
+ try {
+ uris.add(new URI(catalogItem.getSiteUrl()));
+ } catch (URISyntaxException e) {
+ // ignore bad URIs
+ }
+ }
+ return uris;
+ };
+
+ private void scheduleUpdateAllActionUIs() {
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ updater.updateAll();
+ }
+ });
+ };
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/SupportPage.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,24 @@
+package com.nokia.carbide.internal.discovery.ui.view;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+
+import com.nokia.carbide.discovery.ui.Activator;
+import com.nokia.carbide.discovery.ui.Messages;
+import com.nokia.carbide.internal.discovery.ui.extension.AbstractBrowserPortalPage;
+
+public class SupportPage extends AbstractBrowserPortalPage {
+
+ public SupportPage() {
+ }
+
+ @Override
+ public String getText() {
+ return Messages.SupportPage_Title;
+ }
+
+ @Override
+ public ImageDescriptor getImageDescriptor() {
+ return Activator.getImageDescriptor("icons/Carbide_c_icon_16x16.png"); //$NON-NLS-1$
+ }
+
+}
--- a/core/com.nokia.carbide.search.system-feature/feature.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.search.system-feature/feature.xml Wed Jul 21 12:11:48 2010 -0500
@@ -4,7 +4,6 @@
label="%featureName"
version="3.0.0.qualifier"
provider-name="Nokia"
- plugin="com.nokia.carbide.cpp"
image="Carbide_Image.png">
<description>
--- a/core/com.nokia.carbide.templatewizard/META-INF/MANIFEST.MF Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.templatewizard/META-INF/MANIFEST.MF Wed Jul 21 12:11:48 2010 -0500
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Carbide.c++ Template Wizard Plug-in
+Bundle-Name: Carbide.c++ Template Wizard
Bundle-SymbolicName: com.nokia.carbide.templatewizard; singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Activator: com.nokia.carbide.templatewizard.TemplateWizardPlugin
-Bundle-Vendor: NOKIA
+Bundle-Vendor: Nokia
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
--- a/core/com.nokia.carbide.win32.utils/META-INF/MANIFEST.MF Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.win32.utils/META-INF/MANIFEST.MF Wed Jul 21 12:11:48 2010 -0500
@@ -9,5 +9,6 @@
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.cdt.core,
- org.eclipse.cdt.ui
+ org.eclipse.cdt.ui,
+ org.eclipse.core.expressions;bundle-version="3.4.100"
Bundle-ActivationPolicy: lazy
--- a/core/com.nokia.carbide.win32.utils/plugin.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.win32.utils/plugin.xml Wed Jul 21 12:11:48 2010 -0500
@@ -1,23 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<plugin>
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- adaptable="true"
- id="com.nokia.carbide.win32.utils.contribution1"
- nameFilter="*"
- objectClass="org.eclipse.core.resources.IResource">
- <action
- class="com.nokia.carbide.internal.win32.utils.actions.WindowsOpenFileUtils"
- enablesFor="1"
- id="openInWindowsExplorer"
- label="Show in Explorer"/>
- <action
- class="com.nokia.carbide.internal.win32.utils.actions.WindowsOpenFileUtils"
- enablesFor="1"
- id="openInCmdPrompt"
- label="Open Command Window"/>
- </objectContribution>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ id="com.nokia.carbide.win32.utils.openInWindowsExplorer"
+ name="Show in Explorer">
+ </command>
+ <command
+ id="com.nokia.carbide.win32.utils.openInCmdPrompt"
+ name="Open Command Window">
+ </command>
+ </extension>
+ <extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ class="com.nokia.carbide.internal.win32.utils.actions.OpenInExplorerHandler"
+ commandId="com.nokia.carbide.win32.utils.openInWindowsExplorer">
+ </handler>
+ <handler
+ class="com.nokia.carbide.internal.win32.utils.actions.OpenInCmdPromptHandler"
+ commandId="com.nokia.carbide.win32.utils.openInCmdPrompt">
+ </handler>
+ </extension>
+ <extension point="org.eclipse.core.expressions.definitions">
+ <definition id="com.nokia.carbide.win32.utils.singleResource">
+ <with variable="activeMenuSelection">
+ <count value="1"/>
+ <iterate ifEmpty="false">
+ <adapt type="org.eclipse.core.resources.IResource"/>
+ </iterate>
+ </with>
+ </definition>
+ </extension>
+ <extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+ <command
+ commandId="com.nokia.carbide.win32.utils.openInWindowsExplorer"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <reference definitionId="com.nokia.carbide.win32.utils.singleResource"/>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="com.nokia.carbide.win32.utils.openInCmdPrompt"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <reference definitionId="com.nokia.carbide.win32.utils.singleResource"/>
+ </visibleWhen>
+ </command>
+ </menuContribution>
</extension>
</plugin>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.win32.utils/src/com/nokia/carbide/internal/win32/utils/actions/OpenInCmdPromptHandler.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,43 @@
+/*
+* Copyright (c) 2010 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.internal.win32.utils.actions;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+public class OpenInCmdPromptHandler extends AbstractHandler {
+
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ ISelection s = HandlerUtil.getActiveMenuSelection(event);
+ if (s != null && s instanceof IStructuredSelection) {
+ Object o = ((IStructuredSelection) s).getFirstElement();
+ if (o instanceof IAdaptable) {
+ IResource r = (IResource) ((IAdaptable) o).getAdapter(IResource.class);
+ if (r != null)
+ WindowsOpenFileUtils.executeAction(WindowsOpenFileUtils.OPEN_IN_COMMAND_PROMPT, r);
+ }
+ }
+ return null;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.win32.utils/src/com/nokia/carbide/internal/win32/utils/actions/OpenInExplorerHandler.java Wed Jul 21 12:11:48 2010 -0500
@@ -0,0 +1,43 @@
+/*
+* Copyright (c) 2010 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.internal.win32.utils.actions;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+public class OpenInExplorerHandler extends AbstractHandler {
+
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ ISelection s = HandlerUtil.getActiveMenuSelection(event);
+ if (s != null && s instanceof IStructuredSelection) {
+ Object o = ((IStructuredSelection) s).getFirstElement();
+ if (o instanceof IAdaptable) {
+ IResource r = (IResource) ((IAdaptable) o).getAdapter(IResource.class);
+ if (r != null)
+ WindowsOpenFileUtils.executeAction(WindowsOpenFileUtils.OPEN_IN_EXPLORER, r);
+ }
+ }
+ return null;
+ }
+
+}
--- a/core/com.nokia.carbide.win32.utils/src/com/nokia/carbide/internal/win32/utils/actions/WindowsOpenFileUtils.java Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.carbide.win32.utils/src/com/nokia/carbide/internal/win32/utils/actions/WindowsOpenFileUtils.java Wed Jul 21 12:11:48 2010 -0500
@@ -22,13 +22,15 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IActionDelegate;
import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart;
public class WindowsOpenFileUtils extends ActionResourceAction implements IViewActionDelegate {
+ public final static int OPEN_IN_EXPLORER = 1;
+ public final static int OPEN_IN_COMMAND_PROMPT = 2;
+
/**
* ProcessResourceTree default constructor.
*/
@@ -50,14 +52,22 @@
// First get the folder name for the selected workspace resource.
// Then our simple operations will work on the folder where the resource lives.
- Shell shell = new Shell();
-
IResource res = (IResource) selection.getFirstElement();
String pathList = ""; //$NON-NLS-1$
pathList = pathList.concat(Messages.getString("WindowsOpenFileUtils.2") + res + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
traceEnabled = false;
+ int actionType = 0;
+ if (action.getId().equals("openInWindowsExplorer"))
+ actionType = OPEN_IN_EXPLORER;
+ else if (action.getId().equals("openInCmdPrompt"))
+ actionType = OPEN_IN_COMMAND_PROMPT;
+
+ executeAction(actionType, res);
+ }
+
+ public static void executeAction(int actionType, IResource res) {
String folderFullPath = ""; //$NON-NLS-1$
if (res instanceof IFolder || res instanceof IProject){
folderFullPath = res.getLocation().toOSString();
@@ -66,7 +76,7 @@
}
// figure out what action logic to run based on xml id
- if (action.getId().equals("openInWindowsExplorer")) //$NON-NLS-1$
+ if (actionType == OPEN_IN_EXPLORER)
{
String exeCmd = "explorer.exe "; //$NON-NLS-1$
exeCmd += "\""; //$NON-NLS-1$
@@ -80,12 +90,12 @@
catch (CoreException e)
{
MessageDialog.openInformation(
- shell,
+ null,
Messages.getString("WindowsOpenFileUtils.10"), //$NON-NLS-1$
""); //$NON-NLS-1$
}
}
- else if (action.getId().equals("openInCmdPrompt")) //$NON-NLS-1$
+ else if (actionType == OPEN_IN_COMMAND_PROMPT)
{
String exeCmd = "cmd.exe /c start cd /d "; //$NON-NLS-1$
exeCmd += folderFullPath;
@@ -96,7 +106,7 @@
catch (CoreException e)
{
MessageDialog.openInformation(
- shell,
+ null,
Messages.getString("WindowsOpenFileUtils.14"), //$NON-NLS-1$
""); //$NON-NLS-1$
}
--- a/core/com.nokia.cpp.utils.core/src/com/nokia/cpp/internal/api/utils/core/ExternalFileInfoCache.java Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.cpp.utils.core/src/com/nokia/cpp/internal/api/utils/core/ExternalFileInfoCache.java Wed Jul 21 12:11:48 2010 -0500
@@ -167,7 +167,7 @@
// update info
info.put(file, newInfo);
- return finfo.isChangedFrom(newInfo);
+ return finfo == null || finfo.isChangedFrom(newInfo);
}
/**
--- a/core/com.nokia.cpp.utils.ui/src/com/nokia/cpp/internal/api/utils/ui/WorkbenchUtils.java Wed Jul 21 11:37:56 2010 -0500
+++ b/core/com.nokia.cpp.utils.ui/src/com/nokia/cpp/internal/api/utils/ui/WorkbenchUtils.java Wed Jul 21 12:11:48 2010 -0500
@@ -195,6 +195,48 @@
}
/**
+ * Open and provide an editor with the given input and id.
+ * @param input
+ * @param editorId
+ * @return IEditorPart
+ * @throws PartInitException
+ */
+ public static IEditorPart openEditor(final IEditorInput input, final String editorId) throws PartInitException {
+ final IEditorPart[] parts = { null } ;
+ final PartInitException ex[] = { null };
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ IWorkbench workbench = PlatformUI.getWorkbench();
+ IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+ if (workbenchWindow == null) {
+ if (workbench.getWorkbenchWindowCount() == 0)
+ return;
+ workbenchWindow = workbench.getWorkbenchWindows()[0];
+ }
+ IWorkbenchPage page = workbenchWindow.getActivePage();
+ if (page == null) {
+ if (workbenchWindow.getPages().length == 0)
+ return;
+ page = workbenchWindow.getPages()[0];
+ }
+ IEditorPart editor;
+ try {
+ editor = page.openEditor(input, editorId);
+ } catch (PartInitException e) {
+ ex[0] = e;
+ return;
+ }
+ parts[0] = editor;
+ }
+
+ });
+ if (ex[0] != null)
+ throw ex[0];
+ return parts[0];
+ }
+
+ /**
* Open an external browser and go to the given URL.
* Note this function must be called in UI thread.
*
--- a/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/META-INF/MANIFEST.MF Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/META-INF/MANIFEST.MF Wed Jul 21 12:11:48 2010 -0500
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Capabilities Plug-in
+Bundle-Name: Capabilities
Bundle-SymbolicName: com.nokia.carbide.cpp.debug.capabilities;singleton:=true
Bundle-Version: 1.4.0.qualifier
Bundle-Vendor: Nokia
--- a/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml Wed Jul 21 12:11:48 2010 -0500
@@ -6,34 +6,96 @@
<extension
point="org.eclipse.ui.activities">
-<!-- The following UI elements are from org.eclipse.cdt.launch -->
+<!-- The following UI elements are from org.eclipse.cdt.launch & org.eclipse.cdt.core -->
<category
- name="CDT - Launch UI"
- description="CDT Launch UI Elements"
- id="org.eclipse.cdt.launch.category">
+ name="CDT - C/C++ Standard Launch Configurations"
+ description="C/C++ Standard launch configurations provided by CDT"
+ id="org.eclipse.cdt.standard.category">
</category>
+<!-- Create Process Configuration -->
<activity
- name="CDT - Launch UI"
- description="CDT Launch UI"
- id="org.eclipse.cdt.launch.activity">
+ name="CDT - C/C++ Standard Create Process Type"
+ description="Start new application optionally under control of the standard debugger"
+ id="org.eclipse.cdt.standard.launch.activityAppLaunch">
</activity>
<categoryActivityBinding
- activityId="org.eclipse.cdt.launch.activity"
- categoryId="org.eclipse.cdt.launch.category">
+ activityId="org.eclipse.cdt.standard.launch.activityAppLaunch"
+ categoryId="org.eclipse.cdt.standard.category">
</categoryActivityBinding>
<activityPatternBinding
- activityId="org.eclipse.cdt.launch.activity"
+ activityId="org.eclipse.cdt.standard.launch.activityAppLaunch"
isEqualityPattern="true"
pattern="org.eclipse.cdt.launch/org.eclipse.cdt.cdi.launch.localCLaunch">
</activityPatternBinding>
- <activityPatternBinding
- activityId="org.eclipse.cdt.launch.activity"
+ <activityPatternBinding
+ activityId="org.eclipse.cdt.standard.launch.activityAppLaunch"
+ isEqualityPattern="true"
+ pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.applicationLaunchType">
+ </activityPatternBinding>
+
+<!-- Multiple Launch Configuration -->
+ <activity
+ name="CDT - C/C++ Launch Group Type"
+ description="Launch several other configurations sequentially"
+ id="org.eclipse.cdt.standard.launch.activityGroupLaunch">
+ </activity>
+ <categoryActivityBinding
+ activityId="org.eclipse.cdt.standard.launch.activityGroupLaunch"
+ categoryId="org.eclipse.cdt.standard.category">
+ </categoryActivityBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.cdt.standard.launch.activityGroupLaunch"
isEqualityPattern="true"
pattern="org.eclipse.cdt.launch/org.eclipse.cdt.launch.launchGroup">
</activityPatternBinding>
+<!-- Standard Postmortem Debugger -->
+ <activity
+ name="CDT - C/C++ Postmortem Debugger Type"
+ description="Load an application dump into the standard debugger"
+ id="org.eclipse.cdt.standard.launch.activityPostmortem">
+ </activity>
+ <categoryActivityBinding
+ activityId="org.eclipse.cdt.standard.launch.activityPostmortem"
+ categoryId="org.eclipse.cdt.standard.category">
+ </categoryActivityBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.cdt.standard.launch.activityPostmortem"
+ isEqualityPattern="true"
+ pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.postmortemLaunchType">
+ </activityPatternBinding>
+<!-- Standard Attach to Process -->
+ <activity
+ name="CDT - C/C++ Standard Attach to Process Type"
+ description="Attach standard debugger to a running program"
+ id="org.eclipse.cdt.standard.launch.activityAttach">
+ </activity>
+ <categoryActivityBinding
+ activityId="org.eclipse.cdt.standard.launch.activityAttach"
+ categoryId="org.eclipse.cdt.standard.category">
+ </categoryActivityBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.cdt.standard.launch.activityAttach"
+ isEqualityPattern="true"
+ pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.attachLaunchType">
+ </activityPatternBinding>
+<!-- Local C/C++ Application Shorcut -->
+ <activity
+ name="CDT - C/C++ Application Launch Shortcut"
+ description="Runs/Debugs a local C/C++ application from a shortcut"
+ id="org.eclipse.cdt.standard.launch.activityAppLaunchShortcut">
+ </activity>
+ <categoryActivityBinding
+ activityId="org.eclipse.cdt.standard.launch.activityAppLaunchShortcut"
+ categoryId="org.eclipse.cdt.standard.category">
+ </categoryActivityBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.cdt.standard.launch.activityAppLaunchShortcut"
+ isEqualityPattern="true"
+ pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.localCShortcut">
+ </activityPatternBinding>
<!-- -->
-<!-- The following UI elements are from org.eclipse.cdt.dsf.gdb -->
- <category
+<!-- The following UI elements are from org.eclipse.cdt.dsf.gdb NOT INCLUDED IN C3-->
+<!-- <category
name="CDT - DSF GDB"
description="CDT DSF GDB Elements"
id="org.eclipse.cdt.dsf.gdb.category">
@@ -56,10 +118,10 @@
activityId="org.eclipse.cdt.dsf.gdb.activity"
isEqualityPattern="true"
pattern="org.eclipse.cdt.dsf.gdb/org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch">
- </activityPatternBinding>
+ </activityPatternBinding>-->
<!-- -->
-<!-- The following UI elements are from org.eclipse.cdt.debug.core -->
- <category
+<!-- The following UI elements are from org.eclipse.cdt.debug.core MERGED ABOVE-->
+<!-- <category
name="CDT - Core Debug Launch"
description="CDT Core Debug Launch"
id="org.eclipse.cdt.debug.core.category">
@@ -89,10 +151,10 @@
activityId="org.eclipse.cdt.debug.core.activity"
isEqualityPattern="true"
pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.applicationLaunchType">
- </activityPatternBinding>
+ </activityPatternBinding> -->
<!-- -->
-<!-- The following UI elements are from org.eclipse.cdt.launch.remote -->
- <category
+<!-- The following UI elements are from org.eclipse.cdt.launch.remote NOT IN C3-->
+<!-- <category
name="CDT - Remote Launch"
description="CDT Remote Launch Elements"
id="org.eclipse.cdt.launch.remote.category">
@@ -110,10 +172,10 @@
activityId="org.eclipse.cdt.launch.remote.activity"
isEqualityPattern="true"
pattern="org.eclipse.cdt.launch.remote/org.eclipse.rse.remotecdt.RemoteApplicationLaunch">
- </activityPatternBinding>
+ </activityPatternBinding>-->
<!-- -->
-<!-- The following UI elements are from org.eclipse.cdt.examples.dsf.pda -->
- <category
+<!-- The following UI elements are from org.eclipse.cdt.examples.dsf.pda NOT IN C3-->
+<!-- <category
name="CDT - DSF PDA"
description="CDT DSF PDA Elements"
id="org.eclipse.cdt.examples.dsf.pda.category">
@@ -131,71 +193,60 @@
activityId="org.eclipse.cdt.examples.dsf.pda.activity"
isEqualityPattern="true"
pattern="org.eclipse.cdt.examples.dsf.pda/org.eclipse.cdt.examples.dsf.pda.launchType">
- </activityPatternBinding>
+ </activityPatternBinding> -->
<!-- -->
<!-- The following UI elements are from org.eclipse.cdt.debug.ui -->
<category
- name="CDT - Debug UI"
- description="CDT Debug UI Elements"
+ name="CDT - C/C++ Standard Debug UI"
+ description="CDT C/C++ Standard debug preferences, actions, and views"
id="org.eclipse.cdt.debug.ui.category">
</category>
- <activity
- name="CDT - Debugger Local C Shortcut"
- description="CDT Local C Shortcut"
- id="org.eclipse.cdt.debug.ui.activity1">
- </activity>
+<!-- Debugger Types Preference Page -->
<activity
name="CDT - Debugger Types Preference Page"
description="CDT Debugger types preference page"
- id="org.eclipse.cdt.debug.ui.activity2">
+ id="org.eclipse.cdt.debug.ui.activityDebuggerTypesPref">
</activity>
+ <categoryActivityBinding
+ activityId="org.eclipse.cdt.debug.ui.activityDebuggerTypesPref"
+ categoryId="org.eclipse.cdt.debug.ui.category">
+ </categoryActivityBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.cdt.debug.ui.activityDebuggerTypesPref"
+ isEqualityPattern="true"
+ pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.DebuggerTypesPreferencePage">
+ </activityPatternBinding>
+<!-- Debugger Signals View -->
<activity
name="CDT - Debugger Signals View"
description="CDT Debugger Signals View"
- id="org.eclipse.cdt.debug.ui.activity3">
+ id="org.eclipse.cdt.debug.ui.activitySignalsView">
</activity>
+ <categoryActivityBinding
+ activityId="org.eclipse.cdt.debug.ui.activitySignalsView"
+ categoryId="org.eclipse.cdt.debug.ui.category">
+ </categoryActivityBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.cdt.debug.ui.activitySignalsView"
+ pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.SignalsView">
+ </activityPatternBinding>
+<!-- Debugger Add Breakpoint Event Action -->
<activity
name="CDT - Debugger Add Breakpoint Event Action"
description="CDT Debugger Add Breakpoint Event Action"
- id="org.eclipse.cdt.debug.ui.activity4">
+ id="org.eclipse.cdt.debug.ui.activityAddBreakpointEvent">
</activity>
<categoryActivityBinding
- activityId="org.eclipse.cdt.debug.ui.activity1"
- categoryId="org.eclipse.cdt.debug.ui.cdtCategory">
- </categoryActivityBinding>
- <categoryActivityBinding
- activityId="org.eclipse.cdt.debug.ui.activity2"
- categoryId="org.eclipse.cdt.debug.ui.cdtCategory">
- </categoryActivityBinding>
- <categoryActivityBinding
- activityId="org.eclipse.cdt.debug.ui.activity3"
- categoryId="org.eclipse.cdt.debug.ui.cdtCategory">
- </categoryActivityBinding>
- <categoryActivityBinding
- activityId="org.eclipse.cdt.debug.ui.activity4"
- categoryId="org.eclipse.cdt.debug.ui.cdtCategory">
+ activityId="org.eclipse.cdt.debug.ui.activityAddBreakpointEvent"
+ categoryId="org.eclipse.cdt.debug.ui.category">
</categoryActivityBinding>
- <activityPatternBinding
- activityId="org.eclipse.cdt.debug.ui.activity1"
- isEqualityPattern="true"
- pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.localCShortcut">
- </activityPatternBinding>
- <activityPatternBinding
- activityId="org.eclipse.cdt.debug.ui.activity2"
- isEqualityPattern="true"
- pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.DebuggerTypesPreferencePage">
- </activityPatternBinding>
<activityPatternBinding
- activityId="org.eclipse.cdt.debug.ui.activity3"
- pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.SignalsView">
- </activityPatternBinding>
- <activityPatternBinding
- activityId="org.eclipse.cdt.debug.ui.activity4"
+ activityId="org.eclipse.cdt.debug.ui.activityAddBreakpointEvent"
pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.internal.ui.actions.AddEventBreakpointActionDelegate">
</activityPatternBinding>
<!-- -->
-<!-- The following UI elements are from org.eclipse.cdt.debug.gdbjtag.core -->
- <category
+<!-- The following UI elements are from org.eclipse.cdt.debug.gdbjtag.core NOT IN C3-->
+<!-- <category
name="CDT - GDB JTAG Debug UI"
description="CDT GDB JTAG Debug UI Elements"
id="org.eclipse.cdt.debug.gdbjtag.core.category">
@@ -213,17 +264,17 @@
activityId="org.eclipse.cdt.debug.gdbjtag.core.activity"
isEqualityPattern="true"
pattern="org.eclipse.cdt.debug.gdbjtag.core/org.eclipse.cdt.debug.gdbjtag.launchConfigurationType">
- </activityPatternBinding>
+ </activityPatternBinding> -->
<!-- -->
<!-- The following UI elements are from org.eclipse.cdt.managedbuilder.ui -->
<category
- name="CDT - Managed Builder UI"
- description="CDT Managed Builder UI Elements"
+ name="CDT - C/C++ Managed Builder UI"
+ description="All preferences, actions, wizards supplied by the Managed Builder CDT plug-ins"
id="org.eclipse.cdt.managedbuilder.ui.category">
</category>
<activity
- name="CDT - Managed Builder UI"
- description="CDT Managed Builder UI Elements"
+ name="CDT - C/C++ Managed Builder UI"
+ description="All preferences, actions, wizards supplied by the Managed Builder CDT plug-ins"
id="org.eclipse.cdt.managedbuilder.ui.activity">
</activity>
<categoryActivityBinding
@@ -287,13 +338,13 @@
<!-- -->
<!-- The following UI elements are from org.eclipse.cdt.make.ui -->
<category
- name="CDT - Make UI"
- description="CDT Make UI Elements"
+ name="CDT - C/C++ Make UI"
+ description="CDT C/C++ Make file preferences"
id="org.eclipse.cdt.make.ui.category">
</category>
<activity
- name="CDT - Make UI"
- description="CDT Make UI Elements"
+ name="CDT - C/C++ Build Make Targets Preference Page"
+ description="CDT C/C++ Build Make Targets Preference Page"
id="org.eclipse.cdt.make.ui.activity">
</activity>
<categoryActivityBinding
@@ -305,154 +356,216 @@
pattern="org.eclipse.cdt.make.ui/org.eclipse.cdt.make.ui.preferences.MakePreferencePage">
</activityPatternBinding>
<!-- -->
-<!-- The following UI elements are from org.eclipse.cdt.ui -->
+<!-- The following UI elements are from org.eclipse.cdt.ui dealing with C/C++ projects -->
<category
- name="CDT - UI"
- description="CDT UI Elements"
+ name="CDT - C/C++ Standard Project Actions"
+ description="CDT C/C++ Standard Project Creation and Modification Actions"
id="org.eclipse.cdt.ui.category">
</category>
- <activity
- name="CDT - UI for New* Wizards"
- description="CDT UI for New* Wizards"
- id="org.eclipse.cdt.ui.activity">
- </activity>
+<!-- Project settings import/export -->
<activity
- name="CDT - Project Settings Actions"
- description="CDT Project settings import and export actions"
- id="org.eclipse.cdt.ui.activity2">
- </activity>
- <activity
- name="CDT - Import Executable Action"
- description="CDT Import executable action"
- id="org.eclipse.cdt.ui.activity3">
+ name="CDT - Project Settings Wizards"
+ description="CDT C/C++ Standard project settings import and export wizards"
+ id="org.eclipse.cdt.ui.activityProjectSettings">
</activity>
<categoryActivityBinding
- activityId="org.eclipse.cdt.ui.activity"
+ activityId="org.eclipse.cdt.ui.activityProjectSettings"
categoryId="org.eclipse.cdt.ui.category">
</categoryActivityBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.cdt.ui.activityProjectSettings"
+ pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.projectSettingsImportWizard">
+ </activityPatternBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.cdt.ui.activityProjectSettings"
+ pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.projectSettingsExportWizard">
+ </activityPatternBinding>
+<!-- Resource Configurations -->
+ <activity
+ name="CDT - Resource Configurations"
+ description="CDT C/C++ Resource configurations context menu commands"
+ id="org.eclipse.cdt.ui.activityResourceConfigurations">
+ </activity>
<categoryActivityBinding
- activityId="org.eclipse.cdt.ui.activity2"
+ activityId="org.eclipse.cdt.ui.activityResourceConfigurations"
categoryId="org.eclipse.cdt.ui.category">
</categoryActivityBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.cdt.ui.activityResourceConfigurations"
+ pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.buildConfigContributionM">
+ </activityPatternBinding>
+<!-- Import Executable action -->
+ <activity
+ name="CDT - C/C++ Import Executable Wizard"
+ description="CDT C/C++ import executable wizard"
+ id="org.eclipse.cdt.ui.activityImportExecutable">
+ </activity>
<categoryActivityBinding
- activityId="org.eclipse.cdt.ui.activity3"
+ activityId="org.eclipse.cdt.ui.activityImportExecutable"
categoryId="org.eclipse.cdt.ui.category">
</categoryActivityBinding>
<activityPatternBinding
- activityId="org.eclipse.cdt.ui.activity"
+ activityId="org.eclipse.cdt.ui.activityImportExecutable"
+ pattern=".*ImportExecutableWizard">
+ </activityPatternBinding>
+<!-- New C/C++ Project wizards -->
+ <activity
+ name="CDT - New C/C++ Project Wizards"
+ description="CDT New C and New C++ project wizards"
+ id="org.eclipse.cdt.ui.activityNewProject">
+ </activity>
+ <categoryActivityBinding
+ activityId="org.eclipse.cdt.ui.activityNewProject"
+ categoryId="org.eclipse.cdt.ui.category">
+ </categoryActivityBinding>
+ <activityPatternBinding
+ activityId="org.eclipse.cdt.ui.activityNewProject"
pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.wizards.NewCWizard1">
</activityPatternBinding>
<activityPatternBinding
- activityId="org.eclipse.cdt.ui.activity"
+ activityId="org.eclipse.cdt.ui.activityNewProject"
pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.wizards.NewCWizard2">
</activityPatternBinding>
<activityPatternBinding
- activityId="org.eclipse.cdt.ui.activity"
+ activityId="org.eclipse.cdt.ui.activityNewProject"
pattern="org\.eclipse\.cdt.*/.*NewProjectDropDown">
</activityPatternBinding>
+<!-- New Type Wizard -->
+ <activity
+ name="CDT - New C++ Class Wizard"
+ description="CDT New C++ class wizard"
+ id="org.eclipse.cdt.ui.activityNewType">
+ </activity>
+ <categoryActivityBinding
+ activityId="org.eclipse.cdt.ui.activityNewType"
+ categoryId="org.eclipse.cdt.ui.category">
+ </categoryActivityBinding>
<activityPatternBinding
- activityId="org.eclipse.cdt.ui.activity"
+ activityId="org.eclipse.cdt.ui.activityNewType"
pattern="org\.eclipse\.cdt.*/.*NewTypeDropDown">
</activityPatternBinding>
+<!-- New File Wizard -->
+ <activity
+ name="CDT - New C/C++ File Wizard"
+ description="CDT New C/C++ source file wizard"
+ id="org.eclipse.cdt.ui.activityNewFile">
+ </activity>
+ <categoryActivityBinding
+ activityId="org.eclipse.cdt.ui.activityNewFile"
+ categoryId="org.eclipse.cdt.ui.category">
+ </categoryActivityBinding>
<activityPatternBinding
- activityId="org.eclipse.cdt.ui.activity"
+ activityId="org.eclipse.cdt.ui.activityNewFile"
pattern="org\.eclipse\.cdt.*/.*NewFileDropDown">
</activityPatternBinding>
- <activityPatternBinding
- activityId="org.eclipse.cdt.ui.activity"
- pattern="org\.eclipse\.cdt.*/.*NewFolderDropDown">
- </activityPatternBinding>
+<!-- New Folder Wizard -->
+ <activity
+ name="CDT - New C/C++ Folder Wizard"
+ description="CDT New C/C++ source folder wizard"
+ id="org.eclipse.cdt.ui.activityNewFolder">
+ </activity>
+ <categoryActivityBinding
+ activityId="org.eclipse.cdt.ui.activityNewFolder"
+ categoryId="org.eclipse.cdt.ui.category">
+ </categoryActivityBinding>
<activityPatternBinding
- activityId="org.eclipse.cdt.ui.activity2"
- pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.projectSettingsImportWizard">
- </activityPatternBinding>
- <activityPatternBinding
- activityId="org.eclipse.cdt.ui.activity2"
- pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.projectSettingsExportWizard">
- </activityPatternBinding>
- <activityPatternBinding
- activityId="org.eclipse.cdt.ui.activity3"
- pattern=".*ImportExecutableWizard">
+ activityId="org.eclipse.cdt.ui.activityNewFolder"
+ pattern="org\.eclipse\.cdt.*/.*NewFolderDropDown">
</activityPatternBinding>
<!-- -->
<!-- The following UI elements are from org.eclipse.debug.ui -->
<category
- name="Platform Debug UI"
- description="Platform Debug UI Elements"
+ name="Platform Debug Actions"
+ description="Debugger actions supplied by the Eclipse Platform"
id="org.eclipse.debug.ui.category">
</category>
+<!-- Terminate, remove, relaunch actions -->
<activity
- name="Platform Debug UI"
- description="Platform Debug UI Elements"
- id="org.eclipse.debug.ui.activity">
+ name="Debugger Terminate/Launch"
+ description="Relaunch, terminate and relaunch, terminate and remove, terminate all actions"
+ id="org.eclipse.debug.ui.activityTerminateLaunch">
</activity>
<categoryActivityBinding
- activityId="org.eclipse.debug.ui.activity"
+ activityId="org.eclipse.debug.ui.activityTerminateLaunch"
categoryId="org.eclipse.debug.ui.category">
</categoryActivityBinding>
<activityPatternBinding
- activityId="org.eclipse.debug.ui.activity"
+ activityId="org.eclipse.debug.ui.activityTerminateLaunch"
pattern="org\.eclipse\.debug.*/.*relaunch">
</activityPatternBinding>
-
- <activityPatternBinding
- activityId="org.eclipse.debug.ui.activity"
+ <activityPatternBinding
+ activityId="org.eclipse.debug.ui.activityTerminateLaunch"
pattern="org\.eclipse\.debug.*/.*TerminateAndRelaunch">
</activityPatternBinding>
-
<activityPatternBinding
- activityId="org.eclipse.debug.ui.activity"
+ activityId="org.eclipse.debug.ui.activityTerminateLaunch"
pattern="org\.eclipse\.debug.*/.*terminateAndRemove">
</activityPatternBinding>
-
<activityPatternBinding
- activityId="org.eclipse.debug.ui.activity"
+ activityId="org.eclipse.debug.ui.activityTerminateLaunch"
pattern="org\.eclipse\.debug.*/.*terminateAll">
</activityPatternBinding>
-
+<!-- Step filters actions -->
+ <activity
+ name="Debugger Filtered Stepping"
+ description="Stepping with filtering actions"
+ id="org.eclipse.debug.ui.activityStepFilters">
+ </activity>
+ <categoryActivityBinding
+ activityId="org.eclipse.debug.ui.activityStepFilters"
+ categoryId="org.eclipse.debug.ui.category">
+ </categoryActivityBinding>
<activityPatternBinding
- activityId="org.eclipse.debug.ui.activity"
+ activityId="org.eclipse.debug.ui.activityStepFilters"
pattern="org\.eclipse\.debug.*/.*stepWithFilters">
</activityPatternBinding>
-
<activityPatternBinding
- activityId="org.eclipse.debug.ui.activity"
+ activityId="org.eclipse.debug.ui.activityStepFilters"
pattern="org\.eclipse\.debug.*/.*toggleStepFilters">
</activityPatternBinding>
-
<activityPatternBinding
- activityId="org.eclipse.debug.ui.activity"
+ activityId="org.eclipse.debug.ui.activityStepFilters"
pattern="org\.eclipse\.debug.*/.*ToggleStepFilters">
</activityPatternBinding>
<!-- -->
<!-- The following UI elements are from org.eclipse.ui.ide -->
<category
- name="Platform IDE UI"
- description="Platform IDE UI Elements"
+ name="Platform Build Actions"
+ description="Build project actions supplied by the Eclipse Platform"
id="org.eclipse.ui.ide.category">
</category>
+<!-- Build Automatically -->
<activity
- name="Platform IDE UI"
- description="Platform IDE UI Elements"
- id="org.eclipse.ui.ide.activity">
+ name="Build Automatically Action"
+ description="Build all projects automatically action"
+ id="org.eclipse.ui.ide.activityBuildAuto">
</activity>
<categoryActivityBinding
- activityId="org.eclipse.ui.ide.activity"
+ activityId="org.eclipse.ui.ide.activityBuildAuto"
categoryId="org.eclipse.ui.ide.category">
</categoryActivityBinding>
<activityPatternBinding
- activityId="org.eclipse.ui.ide.activity"
+ activityId="org.eclipse.ui.ide.activityBuildAuto"
pattern="org.eclipse.ui.project.buildAutomatically">
</activityPatternBinding>
-
+<!-- Build All Action -->
+ <activity
+ name="Build All Action"
+ description="Build all projects action"
+ id="org.eclipse.ui.ide.activityBuildAll">
+ </activity>
+ <categoryActivityBinding
+ activityId="org.eclipse.ui.ide.activityBuildAll"
+ categoryId="org.eclipse.ui.ide.category">
+ </categoryActivityBinding>
<activityPatternBinding
- activityId="org.eclipse.ui.ide.activity"
+ activityId="org.eclipse.ui.ide.activityBuildAll"
pattern="org.eclipse.ui.project.buildAll">
</activityPatternBinding>
<!-- -->
-<!-- The following UI elements are from org.eclipse.cdt.debug.mi.ui -->
- <category
+<!-- The following UI elements are from org.eclipse.cdt.debug.mi.ui NOT IN C3-->
+<!-- <category
name="CDT - MI Debug UI"
description="CDT - MI Debug UI Elements"
id="org.eclipse.cdt.debug.mi.ui.category">
@@ -469,7 +582,7 @@
<activityPatternBinding
activityId="org.eclipse.cdt.debug.mi.ui.activity"
pattern="org.eclipse.cdt.debug.mi.ui/org.eclipse.cdt.debug.mi.ui.MIPreferencePage">
- </activityPatternBinding>
+ </activityPatternBinding> -->
<!-- -->
</extension>
--- a/debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/plugin.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/plugin.xml Wed Jul 21 12:11:48 2010 -0500
@@ -9,7 +9,7 @@
id="com.nokia.carbide.cpp">
</category>
<view
- name="Symbian OS Data"
+ name="Classic Symbian OS Data"
icon="icons/symbian-120.gif"
category="com.nokia.carbide.cpp"
class="com.nokia.carbide.cpp.debug.kernelaware.ui.SymbianOSView"
--- a/debuggercdi/com.nokia.carbide.trk.support/META-INF/MANIFEST.MF Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/META-INF/MANIFEST.MF Wed Jul 21 12:11:48 2010 -0500
@@ -18,6 +18,6 @@
lib/commons-httpclient-3.1.jar,
lib/commons-codec-1.3.jar,
lib/commons-logging-1.1.jar
-Export-Package: com.nokia.carbide.trk.support.connection;x-friends:="com.nokia.carbide.symsee.trk.support",
- com.nokia.carbide.trk.support.service;x-friends:="com.nokia.carbide.symsee.trk.support,com.nokia.cdt.debug.launch.platSim"
+Export-Package: com.nokia.carbide.trk.support.connection;x-friends:="com.nokia.carbide.symsee.trk.support,com.nokia.carbide.cpp.edc",
+ com.nokia.carbide.trk.support.service;x-friends:="com.nokia.carbide.symsee.trk.support,com.nokia.cdt.debug.launch.platSim,com.nokia.carbide.cpp.edc"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
--- a/debuggercdi/com.nokia.carbide.trk.support/plugin.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/plugin.xml Wed Jul 21 12:11:48 2010 -0500
@@ -44,18 +44,5 @@
class="com.nokia.carbide.trk.support.connection.TCPIPConnectionType">
</connectionType>
</extension>
-
- <extension
- point="com.nokia.carbide.remoteConnections.connectionType">
- <connectionType
- class="com.nokia.carbide.trk.support.connection.TCFConnectionType">
- </connectionType>
- </extension>
- <extension
- point="com.nokia.carbide.remoteConnections.connectionType">
- <connectionType
- class="com.nokia.carbide.trk.support.connection.TCFUSBConnectionType">
- </connectionType>
- </extension>
-
+
</plugin>
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/SerialConnectionFactory.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/SerialConnectionFactory.java Wed Jul 21 12:11:48 2010 -0500
@@ -18,19 +18,26 @@
package com.nokia.carbide.trk.support.connection;
-import com.freescale.cdt.debug.cw.core.SerialConnectionSettings;
-import com.nokia.carbide.remoteconnections.interfaces.*;
-import com.nokia.carbide.trk.support.Messages;
+import java.util.HashMap;
+import java.util.Map;
-import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
-import java.util.HashMap;
-import java.util.Map;
+import com.freescale.cdt.debug.cw.core.SerialConnectionSettings;
+import com.nokia.carbide.remoteconnections.interfaces.IConnection;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectionFactory;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectionType;
+import com.nokia.carbide.trk.support.Messages;
/**
* Implementation of IConnectionFactory for serial connections
@@ -122,7 +129,8 @@
for (String key : map.keySet()) {
ComboViewer viewer = viewers.get(key);
if (viewer != null) {
- viewer.setSelection(new StructuredSelection(settings.getSettings().get(key)));
+ String element = map.get(key);
+ viewer.setSelection(element != null ? new StructuredSelection(element) : StructuredSelection.EMPTY);
}
}
}
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/TCFConnection.java Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* 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.trk.support.connection;
-
-import com.nokia.carbide.remoteconnections.interfaces.IConnectionType;
-
-import java.util.Map;
-
-public class TCFConnection extends TCPIPConnection {
-
- public TCFConnection(IConnectionType connectionType, Map<String, String> settings) {
- super(connectionType, settings);
- }
-
-
-}
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/TCFConnectionFactory.java Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-/*
-* 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.trk.support.connection;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.widgets.Composite;
-
-import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
-import com.nokia.carbide.remoteconnections.interfaces.IConnection;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectionType;
-import com.nokia.carbide.remoteconnections.interfaces.IService;
-import com.nokia.carbide.remoteconnections.interfaces.IService2;
-
-public class TCFConnectionFactory extends TCPIPConnectionFactory {
-
- private static final int MIN_DYN_PORT_NUM = 49152;
- private static final int MAX_DYN_PORT_NUM = 65535;
- private Map<String, Integer> serviceIdToPortMappings;
- private TableViewer viewer;
-
- public TCFConnectionFactory(IConnectionType connectionType) {
- super(connectionType);
- serviceIdToPortMappings = new HashMap<String, Integer>();
- initializePortMappings();
- }
-
- private void initializePortMappings() {
- Collection<IService> services = RemoteConnectionsActivator.getConnectionTypeProvider().getCompatibleServices(connectionType);
- for (IService service : services) {
- IService2 service2 = service instanceof IService2 ? (IService2) service : null;
- Integer defaultPort = null;
- if (service2 != null) {
- try {
- String defaultPortString = service2.getDefaults().get(IP_PORT);
- defaultPort = Integer.valueOf(defaultPortString);
- } catch (NumberFormatException e) {
- // if it doesn't parse as an int, we ignore it and provide a dynamic default
- }
- }
- if (defaultPort != null)
- serviceIdToPortMappings.put(service.getIdentifier(), defaultPort);
- }
- for (IService service : services) {
- String identifier = service.getIdentifier();
- if (!serviceIdToPortMappings.containsKey(identifier))
- serviceIdToPortMappings.put(identifier, getUnusedDynamicDefault());
- }
-
- }
-
- private Integer getUnusedDynamicDefault() {
- for (Integer val = MIN_DYN_PORT_NUM; val < MAX_DYN_PORT_NUM; val++) {
- if (!serviceIdToPortMappings.containsValue(val))
- return val;
- }
- return -1; // should never get here!!!
- }
-
- @Override
- public IConnection createConnection(Map<String, String> settings) {
- if (settings == null)
- settings = getSettingsFromUI();
- return new TCFConnection(connectionType, settings);
- }
-
- @Override
- public void createEditingUI(Composite parent, IValidationErrorReporter errorReporter, Map<String, String> initialSettings) {
- super.createEditingUI(parent, errorReporter, initialSettings);
-/* updatePortMappings(initialSettings);
- Label label = new Label(composite, SWT.NONE);
- GridDataFactory.defaultsFor(label).span(2, 1).applyTo(label);
- label.setText(Messages.getString("TCPIPPortMappingConnectionFactory.ViewerLabel")); //$NON-NLS-1$
-
- viewer = new TableViewer(composite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
- viewer.setContentProvider(new ArrayContentProvider());
-
- TableViewerColumn serviceColumn = new TableViewerColumn(viewer, SWT.LEFT);
- serviceColumn.getColumn().setText(Messages.getString("TCPIPPortMappingConnectionFactory.ServiceHeader")); //$NON-NLS-1$
-
- TableViewerColumn portColumn = new TableViewerColumn(viewer, SWT.RIGHT);
- portColumn.getColumn().setText(Messages.getString("TCPIPPortMappingConnectionFactory.PortHeader")); //$NON-NLS-1$
- portColumn.setEditingSupport(new PortColumnEditingSupport(viewer));
-
- viewer.setLabelProvider(new TableLabelProvider());
- viewer.setInput(serviceIdToPortMappings.keySet());
-
- Table table = viewer.getTable();
- table.setHeaderVisible(true);
- GridDataFactory.defaultsFor(table).span(2, 1).hint(SWT.DEFAULT, 60).grab(true, false).applyTo(table);
- table.setToolTipText(Messages.getString("TCPIPPortMappingConnectionFactory.ViewerTooltip")); //$NON-NLS-1$
- table.setData(UID, "TCPIPPortMappingConnectionFactory.table"); //$NON-NLS-1$
- table.setData("viewer", viewer); //$NON-NLS-1$
- packColumns();
-*/ }
-
- private Integer getValidValue(String value) {
- try {
- int intVal = Integer.parseInt(value);
- if (intVal < 0)
- return new Integer(0);
- else if (intVal > MAX_DYN_PORT_NUM)
- return new Integer(MAX_DYN_PORT_NUM);
- else
- return new Integer(intVal);
- } catch (Exception e) {
- }
- return null;
- }
-
- @Override
- public Map<String, String> getSettingsFromUI() {
- Map<String, String> settings = super.getSettingsFromUI();
- addMappings(settings);
- return settings;
- }
-
- private void addMappings(Map<String, String> settings) {
- for (String serviceId : serviceIdToPortMappings.keySet()) {
- settings.put(serviceId, String.valueOf(serviceIdToPortMappings.get(serviceId).intValue()));
- }
- settings.remove(IP_PORT);
- }
-
-}
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/TCFConnectionType.java Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the 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.trk.support.connection;
-
-import com.nokia.carbide.remoteconnections.interfaces.IConnectionFactory;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectionType;
-import com.nokia.carbide.trk.support.Messages;
-
-/**
- * Implementation of IConnectionType for TCP/IP connections
- */
-public class TCFConnectionType implements IConnectionType {
-
- public static final String ID = "com.nokia.carbide.connection.TCFConnectionType"; //$NON-NLS-1$
-
- public IConnectionFactory getConnectionFactory() {
- return new TCFConnectionFactory(this);
- }
-
- public String getDescription() {
- return Messages.getString("TCFConnectionType.Desc"); //$NON-NLS-1$
- }
-
- public String getDisplayName() {
- return Messages.getString("TCFConnectionType.Label"); //$NON-NLS-1$
- }
-
- public String getHelpContext() {
- return null;
- }
-
- public String getIdentifier() {
- return ID;
- }
-
-}
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties Wed Jul 21 12:11:48 2010 -0500
@@ -60,8 +60,4 @@
TracingService.Label=Tracing
USBConnectionType.Desc=USB serial port connection settings
USBConnectionType.Label=USB
-TCFConnectionType.Desc=TCP/IP settings
-TCFConnectionType.Label=TCP/IP
-TCFUSBConnectionType.Desc=USB serial port connection settings\n(This is a temporary variant used to target the TCF debug agent on the device.)
-TCFUSBConnectionType.Label=USB (TCF)
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java Wed Jul 21 12:11:48 2010 -0500
@@ -29,9 +29,6 @@
import com.nokia.carbide.remoteconnections.interfaces.IService;
import com.nokia.carbide.trk.support.connection.SerialBTConnectionType;
import com.nokia.carbide.trk.support.connection.SerialConnectionType;
-import com.nokia.carbide.trk.support.connection.TCFConnection;
-import com.nokia.carbide.trk.support.connection.TCFConnectionType;
-import com.nokia.carbide.trk.support.connection.TCFUSBConnectionType;
import com.nokia.carbide.trk.support.connection.USBConnectionType;
import com.nokia.cpp.internal.api.utils.core.HostOS;
@@ -52,11 +49,10 @@
}
else if (service instanceof TRKService &&
isCompatibleConnection(getCompatibleTRKConnectionTypeIds(), connection)) {
- if (HostOS.IS_UNIX || connection instanceof TCFConnection)
+ if (HostOS.IS_UNIX)
return new RemoteConnectedService(service); // TODO: not ported
return new TRKConnectedService(service, (AbstractSynchronizedConnection) connection);
}
-
return null;
}
@@ -73,20 +69,17 @@
private Collection<String> getCompatibleTracingConnectionTypeIds() {
return Arrays.asList(new String[] {
USBConnectionType.ID,
- TCFUSBConnectionType.ID,
});
}
private Collection<String> getCompatibleTRKConnectionTypeIds() {
return Arrays.asList(new String[] {
SerialConnectionType.ID,
- TCFConnectionType.ID,
SerialBTConnectionType.ID,
USBConnectionType.ID,
- TCFUSBConnectionType.ID,
});
}
-
+
/* (non-Javadoc)
* @see com.nokia.carbide.remoteconnections.interfaces.IConnectedServiceFactory#getCompatibleConnectionTypeIds(com.nokia.carbide.remoteconnections.interfaces.IService)
*/
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKConnectedService.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKConnectedService.java Wed Jul 21 12:11:48 2010 -0500
@@ -29,10 +29,10 @@
import com.freescale.cdt.debug.cw.core.SerialConnectionSettings;
import com.nokia.carbide.remoteconnections.interfaces.AbstractConnectedService2;
import com.nokia.carbide.remoteconnections.interfaces.AbstractSynchronizedConnection;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
import com.nokia.carbide.remoteconnections.interfaces.IConnectionType;
+import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider.IRemoteAgentInstaller;
import com.nokia.carbide.remoteconnections.interfaces.IService;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
-import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider.IRemoteAgentInstaller;
import com.nokia.carbide.trk.support.Messages;
import com.nokia.carbide.trk.support.connection.IUSBConnectionType;
import com.nokia.carbide.trk.support.connection.SerialConnectionType;
@@ -92,7 +92,7 @@
private static final int REQUIRED_MSG_LEN =
SYS_TRK_RESPONSE_STR.length + SYS_TRK_RESPONSE_STR_OFFSET;
- private Pair<String, Version> deviceOS;
+ private Pair<String, String> deviceOS;
private TRKService trkService;
static Class<?> startTCFServer = TCFClassFactory.class; // force the tcf plugin to load
@@ -365,7 +365,7 @@
return new TestResult(estatus, getShortDescription(estatus), message);
}
- public void setDeviceOS(String familyName, Version version) {
- deviceOS = new Pair<String, Version>(familyName, version);
+ public void setDeviceOS(String familyName, String version) {
+ deviceOS = new Pair<String, String>(familyName, version);
}
}
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKService.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKService.java Wed Jul 21 12:11:48 2010 -0500
@@ -46,7 +46,6 @@
SerialBTConnectionType.ID,
TCPIPConnectionType.ID,
USBConnectionType.ID,
- TCFUSBConnectionType.ID
});
}
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingConnectedService.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingConnectedService.java Wed Jul 21 12:11:48 2010 -0500
@@ -23,14 +23,13 @@
import java.util.Arrays;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.osgi.framework.Version;
import com.freescale.cdt.debug.cw.core.SerialConnectionSettings;
import com.nokia.carbide.remoteconnections.interfaces.AbstractConnectedService2;
import com.nokia.carbide.remoteconnections.interfaces.AbstractSynchronizedConnection;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
import com.nokia.carbide.remoteconnections.interfaces.IConnectionType;
import com.nokia.carbide.remoteconnections.interfaces.IService;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
import com.nokia.carbide.trk.support.Messages;
import com.nokia.carbide.trk.support.connection.IUSBConnectionType;
import com.nokia.carbide.trk.support.connection.TCPIPConnectionFactory;
@@ -244,7 +243,7 @@
return new TestResult(estatus, getShortDescription(estatus), message);
}
- public void setDeviceOS(String familyName, Version version) {
+ public void setDeviceOS(String familyName, String version) {
// unimplemented
}
}
\ No newline at end of file
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingInstallerProvider.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingInstallerProvider.java Wed Jul 21 12:11:48 2010 -0500
@@ -18,40 +18,28 @@
package com.nokia.carbide.trk.support.service;
-import com.nokia.carbide.installpackages.InstallPackages.IServerData;
-import com.nokia.carbide.remoteconnections.interfaces.*;
-import com.nokia.carbide.trk.support.Activator;
+import java.util.List;
import org.eclipse.jface.operation.IRunnableContext;
-import org.osgi.framework.Version;
-import java.net.URL;
-import java.util.List;
+import com.nokia.carbide.installpackages.InstallPackages.IServerData;
+import com.nokia.carbide.remoteconnections.interfaces.AbstractPackageInstallerProvider;
+import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider;
+import com.nokia.carbide.remoteconnections.interfaces.IService;
/**
- *
+ * @deprecated
*/
public class TracingInstallerProvider extends AbstractPackageInstallerProvider {
public class ServerData implements IServerData {
- private static final String SERVER = "http://dacvs002.americas.nokia.com/trk"; //$NON-NLS-1$
- private static final String MASTER_FILE_NAME = "TracingPackages.xml"; //$NON-NLS-1$
+ private static final String MASTER_FILE_NAME = "TracingPackages.xml"; //$NON-NLS-1$
public String getMasterFileName() {
return MASTER_FILE_NAME;
}
- public URL getRelativePathRoot() {
- URL url = null;
- try {
- url = new URL(SERVER);
- } catch (Exception e) {
- Activator.log(e);
- }
- return url;
- }
-
public IRemoteAgentInstallerProvider getRemoteAgentInstallerProvider() {
return TracingInstallerProvider.this;
}
@@ -65,7 +53,7 @@
}
@Override
- public List<IRemoteAgentInstaller> getRemoteAgentInstallers(String familyName, Version version) {
+ public List<IRemoteAgentInstaller> getRemoteAgentInstallers(String familyName, String version) {
return super.getRemoteAgentInstallers(familyName, version);
}
@@ -75,7 +63,7 @@
}
@Override
- public List<Version> getVersions(String familyName) {
+ public List<String> getVersions(String familyName) {
return super.getVersions(familyName);
}
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingService.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingService.java Wed Jul 21 12:11:48 2010 -0500
@@ -18,17 +18,18 @@
package com.nokia.carbide.trk.support.service;
-import com.nokia.carbide.remoteconnections.interfaces.*;
+import java.util.Arrays;
+import java.util.Collection;
+
+import com.nokia.carbide.remoteconnections.interfaces.AbstractSynchronizedConnection;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectedService;
+import com.nokia.carbide.remoteconnections.interfaces.IConnection;
+import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider;
+import com.nokia.carbide.remoteconnections.interfaces.IService;
import com.nokia.carbide.trk.support.Messages;
-import com.nokia.carbide.trk.support.connection.TCFUSBConnectionType;
import com.nokia.carbide.trk.support.connection.TCPIPConnectionType;
import com.nokia.carbide.trk.support.connection.USBConnectionType;
import com.nokia.cpp.internal.api.utils.core.Check;
-import com.nokia.cpp.internal.api.utils.core.HostOS;
-
-
-import java.util.Arrays;
-import java.util.Collection;
/**
* Implementation of IService for Tracing
@@ -48,7 +49,6 @@
return Arrays.asList(new String[] {
TCPIPConnectionType.ID,
USBConnectionType.ID,
- TCFUSBConnectionType.ID,
});
}
@@ -61,9 +61,7 @@
}
public IRemoteAgentInstallerProvider getInstallerProvider() {
- if (HostOS.IS_UNIX)
- return null; // TODO: implement
- return new TracingInstallerProvider(this);
+ return null;
}
public boolean isTestable() {
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/status/ConnectionStatusReconciler.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/status/ConnectionStatusReconciler.java Wed Jul 21 12:11:48 2010 -0500
@@ -37,7 +37,6 @@
import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus;
import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus.EConnectionStatus;
import com.nokia.carbide.trk.support.Messages;
-import com.nokia.carbide.trk.support.connection.TCFUSBConnectionType;
import com.nokia.carbide.trk.support.connection.USBConnectionType;
import com.nokia.carbide.trk.support.service.TRKConnectedService;
import com.nokia.carbide.trk.support.service.TracingConnectedService;
@@ -205,8 +204,7 @@
private boolean canBeSetToCurrent(IConnection connection) {
// USB connections for now
- return USBConnectionType.ID.equals(connection.getConnectionType().getIdentifier())
- || TCFUSBConnectionType.ID.equals(connection.getConnectionType().getIdentifier());
+ return USBConnectionType.ID.equals(connection.getConnectionType().getIdentifier());
}
private void reconcileStatus(IConnection connection) {
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java Wed Jul 21 12:11:48 2010 -0500
@@ -67,10 +67,12 @@
import com.nokia.carbide.cpp.sdk.core.ISymbianSDKFeatures;
import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin;
import com.nokia.carbide.remoteconnections.interfaces.IConnection;
+import com.nokia.carbide.remoteconnections.internal.registry.Registry;
import com.nokia.cpp.internal.api.utils.core.PathUtils;
import cwdbg.PreferenceConstants;
+@SuppressWarnings("restriction")
public class SettingsData {
// NOTE: Many of these constants are mirrored in
@@ -254,7 +256,7 @@
if (cpi != null) {
ICarbideBuildConfiguration buildConfig = cpi.getDefaultConfiguration();
String configName = projectName + " " + buildConfig.getDisplayString(); //$NON-NLS-1$
- configuration.rename(DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(configName));
+ setLaunchConfigurationName(configuration, configName);
// make sure the selected build configuration of the current project
// is an emulator build, otherwise warn them that we can't set default values.
@@ -346,6 +348,7 @@
//
configuration.setAttribute(PreferenceConstants.J_PN_RemoteProcessToLaunch, ""); //$NON-NLS-1$
configuration.setAttribute(PreferenceConstants.J_PN_ProgramArguments, ""); //$NON-NLS-1$
+ configuration.setAttribute(RemoteConnectionsTRKHelper.CONNECTION_ATTRIBUTE, Registry.CURRENT_CONNECTION_ID);
HashSet<String> set = new HashSet<String>();
set.add(ILaunchManager.DEBUG_MODE);
@@ -371,7 +374,7 @@
if (cpi != null) {
ICarbideBuildConfiguration buildConfig = cpi.getDefaultConfiguration();
String configName = projectName + " " + buildConfig.getDisplayString(); //$NON-NLS-1$
- configuration.rename(DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(configName));
+ setLaunchConfigurationName(configuration, configName);
// make sure the selected build configuration of the current project is not an emulator build
// otherwise warn them that we can't set default values.
@@ -406,7 +409,7 @@
if (cpi != null) {
ICarbideBuildConfiguration buildConfig = cpi.getDefaultConfiguration();
String configName = projectName + " " + buildConfig.getDisplayString(); //$NON-NLS-1$
- configuration.rename(DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(configName));
+ setLaunchConfigurationName(configuration, configName);
// make sure the selected build configuration of the current project is not an emulator build
// otherwise warn them that we can't set default values.
@@ -673,14 +676,13 @@
configuration.setAttribute(DebuggerCommonData.Host_App_Path, ""); //$NON-NLS-1$
configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); //$NON-NLS-1$
configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, ""); //$NON-NLS-1$
- if (project != null)
- {
+ configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_BUILD_BEFORE_LAUNCH, ICDTLaunchConfigurationConstants.BUILD_BEFORE_LAUNCH_USE_WORKSPACE_SETTING);
+
+ if (project != null) {
configuration.setMappedResources( new IResource[] { project });
ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project);
- if (cpi != null) {
- configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, cpi.getDefaultBuildConfigName());
- }
-
+ configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID,
+ cpi != null ? cpi.getDefaultBuildConfigName() : ""); //$NON-NLS-1$
}
// set rom log file defaults. do this for all launch types since it shouldn't hurt
@@ -902,4 +904,20 @@
configuration.setAttribute(PreferenceConstants.J_PN_RemoteProcessToLaunch, PathUtils.convertPathToWindows(path));
}
-}
\ No newline at end of file
+ private static void setLaunchConfigurationName(ILaunchConfigurationWorkingCopy config, String proposedName) {
+ String name = proposedName;
+
+ // the call to generateLaunchConfigurationName below will replace all \'s with _'s
+ // the code below just removes any \ or : at the end of the SDK name, if for example
+ // they gave the SDK a name of "M:" or "M:\".
+ if (name.endsWith("\\]")) { //$NON-NLS-1$
+ name = name.substring(0, name.length() - 2) + "]"; //$NON-NLS-1$
+ }
+
+ if (name.endsWith(":]")) { //$NON-NLS-1$
+ name = name.substring(0, name.length() - 2) + "]"; //$NON-NLS-1$
+ }
+
+ config.rename(DebugPlugin.getDefault().getLaunchManager().generateLaunchConfigurationName(name));
+ }
+}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/AbstractSymbianLaunchShortcut.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/AbstractSymbianLaunchShortcut.java Wed Jul 21 12:11:48 2010 -0500
@@ -18,6 +18,10 @@
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.window.Window;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IFileEditorInput;
@@ -68,32 +72,36 @@
public void launch(ISelection selection, String mode) {
- // launch an existing config if one exists
- ILaunchConfiguration[] configs = getLaunchConfigurations(selection);
- if (configs != null && configs.length > 0) {
- // find all the ones that support the mode and shortcut (#11013)
- List<ILaunchConfiguration> matches = new ArrayList<ILaunchConfiguration>();
- for (int i = 0; i < configs.length; i++) {
- ILaunchConfiguration config = configs[i];
- try {
- if (config.supportsMode(mode) && isSupportedConfiguration(config)) {
- matches.add(config);
+ // if user holds down SHIFT, do not use existing launch (bug 11279)
+ if (!isShiftKeyPressed()) {
+
+ // launch an existing config if one exists
+ ILaunchConfiguration[] configs = getLaunchConfigurations(selection);
+ if (configs != null && configs.length > 0) {
+ // find all the ones that support the mode and shortcut (#11013)
+ List<ILaunchConfiguration> matches = new ArrayList<ILaunchConfiguration>();
+ for (int i = 0; i < configs.length; i++) {
+ ILaunchConfiguration config = configs[i];
+ try {
+ if (config.supportsMode(mode) && isSupportedConfiguration(config)) {
+ matches.add(config);
+ }
+ } catch (CoreException e) {
+ e.printStackTrace();
}
- } catch (CoreException e) {
- e.printStackTrace();
}
- }
- // if only one matches, just launch
- if (matches.size() > 0) {
- if (matches.size() == 1 || WorkbenchUtils.isJUnitRunning()) {
- DebugUITools.launch(matches.get(0), mode);
- } else {
- // else, ask the user
- ILaunchConfiguration selected = chooseConfiguration(matches, mode);
- if (selected != null)
- DebugUITools.launch(selected, mode);
+ // if only one matches, just launch
+ if (matches.size() > 0) {
+ if (matches.size() == 1 || WorkbenchUtils.isJUnitRunning()) {
+ DebugUITools.launch(matches.get(0), mode);
+ } else {
+ // else, ask the user
+ ILaunchConfiguration selected = chooseConfiguration(matches, mode);
+ if (selected != null)
+ DebugUITools.launch(selected, mode);
+ }
+ return;
}
- return;
}
}
@@ -140,6 +148,43 @@
}
/**
+ * Tell whether a shift key is pressed or released in a 1/4 second period.
+ * @return
+ */
+ private boolean isShiftKeyPressed() {
+ final boolean[] pressed = { false };
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ final boolean[] event = { false };
+ Listener listener = new Listener() {
+ public void handleEvent(Event arg0) {
+ if ((arg0.stateMask & SWT.SHIFT) != 0 || arg0.keyCode == SWT.SHIFT)
+ pressed[0] = true;
+ event[0] = true;
+ }
+ };
+ Display display = Display.getDefault();
+ display.addFilter(SWT.KeyDown, listener);
+ display.addFilter(SWT.KeyUp, listener);
+ display.addFilter(SWT.MouseMove, listener); // mouse move carries keyboard state
+
+ try {
+ long end = System.currentTimeMillis() + 250;
+ while (System.currentTimeMillis() < end && !pressed[0] && !event[0]) {
+ if (!display.readAndDispatch())
+ display.sleep();
+ }
+ } finally {
+ display.removeFilter(SWT.MouseMove, listener);
+ display.removeListener(SWT.KeyDown, listener);
+ display.removeListener(SWT.KeyUp, listener);
+ }
+ }
+ });
+ return pressed[0];
+ }
+
+ /**
* Show a selection dialog that allows the user to choose one of the specified
* launch configurations. Return the chosen config, or <code>null</code> if the
* user cancelled the dialog.
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java Wed Jul 21 12:11:48 2010 -0500
@@ -222,20 +222,19 @@
}
private boolean getExePathsFromProjectAndDetermineIfX86(IProject project, List<IPath> exePaths) {
+ // changed logic to allow paths for executables for !isExecutable(path) for non-x86
+ // this allows new plug-and-play wizard to create attach configs for imported dlls (see bug 11444)
boolean isX86 = false;
ICProject cProject = CoreModel.getDefault().create(project);
if (cProject != null) {
try {
for (IBinary bin : cProject.getBinaryContainer().getBinaries()) {
- if (bin.isExecutable()) {
- IPath path = bin.getResource().getLocation();
-
- if (isEmulatorBinaryPath(path)) {
- isX86 = true;
- }
+ IPath path = bin.getResource().getLocation();
+
+ isX86 = isX86 || isEmulatorBinaryPath(path); // only check once
+ if (!isX86 || bin.isExecutable())
exePaths.add(path);
- }
}
} catch (CModelException e) {
log(e);
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessSection.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessSection.java Wed Jul 21 12:11:48 2010 -0500
@@ -76,7 +76,7 @@
}
if (data.getExeSelection().equals(EExeSelection.ATTACH_TO_PROCESS)) {
- data.setInstallPackage(true);
+ data.setInstallPackage(false);
} else {
Boolean detectedSysTrk = data.isSysTRKConnection(); // TRUE, FALSE, or null
boolean isSysTrk = detectedSysTrk == Boolean.TRUE || (detectedSysTrk == null && data.isInternalLayout());
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/AttachMainTab.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/AttachMainTab.java Wed Jul 21 12:11:48 2010 -0500
@@ -59,7 +59,10 @@
fProjText.setToolTipText(Messages.getString("RunModeMainTab.8")); //$NON-NLS-1$
createVerticalSpacer(comp, 1);
- clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
+ /* TODO: do not filter by service: we need to match either TRK or TCF TRK and the API does not support this yet;
+ * this isn't a problem, though, since all stock connections support TRK anyway */
+ //clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
+ clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(null);
clientSiteUI.createComposite(comp);
clientSiteUI.addListener(new IListener() {
public void connectionSelected() {
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java Wed Jul 21 12:11:48 2010 -0500
@@ -417,8 +417,15 @@
// removeLastSegments(2) will strip the filename and 'urel', 'udeb' or 'lib'
IPath launchExeTargetPath = new Path(new File(launchExeName).getCanonicalPath()).removeLastSegments(2);
for (Executable executable : ExecutablesManager.getExecutablesManager().getExecutables(true)) {
- IPath exePath = executable.getPath();
- if (launchExeTargetPath.isPrefixOf(exePath))
+ IPath exePath = executable.getPath();
+ // remove last two segments here also (ignore urel, udeb, lib on executables)
+ // this is so we can match down to the compiler but not beyond:
+ // y:\epoc32\release\armv5.<variant>\... (for a variant build in raptor) will match
+ // y:\epco32\release\armv5\... for a non-variant built executable
+ IPath exePathShort = exePath.removeLastSegments(2);
+ String sLaunchExeTargetPath = launchExeTargetPath.toOSString();
+ String sExePath = exePathShort.toOSString();
+ if (sExePath.startsWith(sLaunchExeTargetPath) || sLaunchExeTargetPath.startsWith(sExePath))
files.add(new ExeFileToDebug(exePath.toOSString(), true));
}
} catch (Exception e) {
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/FileTransferTab.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/FileTransferTab.java Wed Jul 21 12:11:48 2010 -0500
@@ -35,6 +35,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.PlatformUI;
+import java.io.File;
import java.util.*;
public class FileTransferTab extends CLaunchConfigurationTab {
@@ -127,11 +128,11 @@
*/
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
FileToTransfer[] files = fFilesBlock.getFiles();
- String filesString = ""; //$NON-NLS-1$
+ StringBuilder filesString = new StringBuilder();
for (int i=0; i<files.length; i++) {
- filesString += files[i].getHostPath() + "," + files[i].getTargetPath() + "," + (files[i].getEnabled() ? "1" : "0") + ","; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ filesString.append(files[i].getHostPath()).append(",").append(files[i].getTargetPath()).append(",").append(files[i].getEnabled() ? "1" : "0").append(","); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
}
- configuration.setAttribute( PreferenceConstants.J_PN_FilesToTransfer, filesString);
+ configuration.setAttribute( PreferenceConstants.J_PN_FilesToTransfer, filesString.toString());
}
/* (non-Javadoc)
@@ -176,9 +177,12 @@
// be building before launch which would build the missing
// files before launching the debugger.
for (FileToTransfer file : fFilesBlock.getFiles()) {
- if (file.getEnabled() && !new Path(file.getHostPath()).toFile().exists()) {
- setMessage(Messages.getString("FileTransferTab.HostFilesDontExist")); //$NON-NLS-1$
- break;
+ if (file.getEnabled()) {
+ File hostFile = new Path(file.getHostPath()).toFile();
+ if (!fFilesBlock.fileExists(hostFile)) {
+ setMessage(Messages.getString("FileTransferTab.HostFilesDontExist")); //$NON-NLS-1$
+ break;
+ }
}
}
}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/FilesBlock.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/FilesBlock.java Wed Jul 21 12:11:48 2010 -0500
@@ -19,7 +19,9 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.IDialogSettings;
@@ -61,6 +63,7 @@
import org.eclipse.swt.widgets.TableColumn;
import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
+import com.nokia.cpp.internal.api.utils.core.Pair;
/**
* A composite that displays files in a table. Files can be
@@ -101,6 +104,12 @@
// index of column used for sorting
private int fSortColumn = 1;
+ // cache of file info: we expect this to remain relatively static while
+ // any UI using FilesBlock is up.
+ private static Map<File, Pair<Long, Boolean>> fFileInfoCache = new LinkedHashMap<File, Pair<Long,Boolean>>();
+ private static long fFileInfoCacheFlushTime = 0;
+ private static final int CACHE_CHECK_QUANTUM = 60 * 1000;
+
/**
* Content provider to show a list of files to be transferred
*/
@@ -149,7 +158,7 @@
// add warning icon for any host files that don't exist
FileToTransfer file = (FileToTransfer)element;
File hostFile = new Path(file.getHostPath()).toFile();
- if (!hostFile.exists()) {
+ if (!fileExists(hostFile)) {
return LaunchPlugin.getImageDescriptor("icons/Launch/etool16/warning_obj.gif").createImage();
}
}
@@ -160,6 +169,7 @@
FilesBlock(FileTransferTab launchTab) {
fLaunchTab = launchTab;
+ fFileInfoCacheFlushTime = System.currentTimeMillis();
}
/**
@@ -541,7 +551,7 @@
private void removeFiles() {
IStructuredSelection selection= (IStructuredSelection)fFileList.getSelection();
FileToTransfer[] files = new FileToTransfer[selection.size()];
- Iterator iter = selection.iterator();
+ Iterator<?> iter = selection.iterator();
int i = 0;
while (iter.hasNext()) {
files[i] = (FileToTransfer)iter.next();
@@ -633,4 +643,32 @@
Viewer getViewer() {
return fFileList;
}
+
+ boolean fileExists(File file) {
+ Pair<Long, Boolean> entry = fFileInfoCache.get(file);
+
+ // recheck the status occasionally, either after time passes or
+ // whenever the UI is recreated (as in constructor)
+ if (System.currentTimeMillis() >= fFileInfoCacheFlushTime) {
+ // remove entries not checked at all in a while
+ long deadLine = System.currentTimeMillis() - CACHE_CHECK_QUANTUM;
+ Iterator<Pair<Long, Boolean>> iter = fFileInfoCache.values().iterator();
+ while (iter.hasNext()) {
+ Pair<Long, Boolean> ientry = iter.next();
+ if (ientry.first < deadLine) {
+ iter.remove();
+ }
+ }
+ fFileInfoCacheFlushTime = System.currentTimeMillis() + CACHE_CHECK_QUANTUM;
+ }
+
+ if (entry == null) {
+ //System.out.println("Checking " + file);
+ entry = new Pair<Long, Boolean>(System.currentTimeMillis(), file.exists());
+ fFileInfoCache.put(file, entry);
+ } else {
+ //System.out.println("Not checking " + file);
+ }
+ return entry.second;
+ }
}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java Wed Jul 21 11:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java Wed Jul 21 12:11:48 2010 -0500
@@ -81,7 +81,10 @@
if (wantsConnectionUI)
{
createVerticalSpacer(comp, 1);
- clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
+ /* TODO: do not filter by service: we need to match either TRK or TCF TRK and the API does not support this yet;
+ * this isn't a problem, though, since all stock connections support TRK anyway */
+ //clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
+ clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(null);
clientSiteUI.createComposite(comp);
clientSiteUI.addListener(new IListener() {
public void connectionSelected() {
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/views/SPNViewContentProvider.java Wed Jul 21 11:37:56 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/views/SPNViewContentProvider.java Wed Jul 21 12:11:48 2010 -0500
@@ -932,12 +932,24 @@
visitedPaths.add(baseExtensionMakefilePath);
IPath extensionMakefilePath = baseExtensionMakefilePath.addFileExtension("mk");
- IPath extensionMetaPath = baseExtensionMakefilePath.addFileExtension("meta");
-
- addBldInfExtensionMakefile(objects, project, cpi, view,
- extensionMakefilePath);
- addBldInfExtensionMakefile(objects, project, cpi, view,
- extensionMetaPath);
+
+ if (extensionMakefilePath.toFile().exists()) {
+ // old-style
+ IPath extensionMetaPath = baseExtensionMakefilePath.addFileExtension("meta");
+ addBldInfExtensionMakefile(objects, project, cpi, view,
+ extensionMakefilePath);
+ addBldInfExtensionMakefile(objects, project, cpi, view,
+ extensionMetaPath);
+ } else {
+ // new-style (default for the future)
+ IPath flmMakefilePath;
+ if ("export".equals(baseExtensionMakefilePath.getFileExtension()))
+ flmMakefilePath = baseExtensionMakefilePath.removeFileExtension().addFileExtension("flm");
+ else
+ flmMakefilePath = baseExtensionMakefilePath.addFileExtension("flm");
+ addBldInfExtensionMakefile(objects, project, cpi, view,
+ flmMakefilePath);
+ }
}
return null;
}
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.xml Wed Jul 21 12:11:48 2010 -0500
@@ -13,8 +13,7 @@
label="%uid3.label"
min="0xe0000000"
max="0xefffffff"
- mandatory="true"
- persist="true">
+ mandatory="true">
<description>%uid3.desc</description>
</uidField>
<textField
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.xml Wed Jul 21 12:11:48 2010 -0500
@@ -20,8 +20,7 @@
label="%uid3.label"
min="0xe0000000"
max="0xefffffff"
- mandatory="true"
- persist="true">
+ mandatory="true">
<description>%uid3.desc</description>
</uidField>
<textField
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.xml Wed Jul 21 12:11:48 2010 -0500
@@ -20,8 +20,7 @@
label="%uid3.label"
min="0xe0000000"
max="0xefffffff"
- mandatory="true"
- persist="true">
+ mandatory="true">
<description>%uid3.desc</description>
</uidField>
<textField
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.xml Wed Jul 21 12:11:48 2010 -0500
@@ -20,8 +20,7 @@
label="%uid3.label"
min="0xe0000000"
max="0xefffffff"
- mandatory="true"
- persist="true">
+ mandatory="true">
<description>%uid3.desc</description>
</uidField>
<textField
Binary file templates/com.nokia.carbide.cpp.templates/icons/icon_S80.png has changed
Binary file templates/com.nokia.carbide.cpp.templates/icons/icon_UIQ.png has changed
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.properties Wed Jul 21 11:37:56 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.properties Wed Jul 21 12:11:48 2010 -0500
@@ -2,7 +2,6 @@
template.desc=A simple Open C Hello World console application. \r\n\
You can use this project type for all S60 3rd-Future Ed. SDKs with Open C support installed.
directories.label=Project Directories
-#projectBasicSettings2xPage
basics.label=Basic Settings
basics.desc=Basic properties of a project
basics.uid3.label=Application UID:
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.xml Wed Jul 21 11:37:56 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.xml Wed Jul 21 12:11:48 2010 -0500
@@ -2,7 +2,6 @@
<!DOCTYPE template [
<!ENTITY projectDirsPageCommonFields SYSTEM "../../shared/projectDirsPageCommonFields.inc">
<!ENTITY projectCreateAndCommonFoldersProcess SYSTEM "../../shared/projectCreateAndCommonFoldersProcess.inc">
-<!ENTITY projectCommonFilesProcessParams2x SYSTEM "../../shared/projectCommonFilesProcessParams2x.inc">
]>
<template
version="1.0"
--- a/templates/com.nokia.carbide.cpp.templates/templates/shared/projectBasicSettings2xPage.inc Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<wizardPage
- id="basics"
- label="%projectBasicSettings2xPage.label">
- <description>%projectBasicSettings2xPage.desc</description>
- <uidField
- id="uid3"
- label="%projectBasicSettings2xPage.uid3.label"
- min="0x01000000"
- max="0x0fffffff"
- mandatory="true">
- <description>%projectBasicSettings2xPage.uid3.desc</description>
- </uidField>
- <textField
- id="author"
- label="%projectBasicSettings2xPage.author.label"
- persist="true">
- <description>%projectBasicSettings2xPage.author.desc</description>
- </textField>
- <textField
- id="copyright"
- label="%projectBasicSettings2xPage.copyright.label"
- multiline="true"
- default="Your copyright notice"
- persist="true">
- <description>%projectBasicSettings2xPage.copyright.desc</description>
- </textField>
-</wizardPage>
--- a/templates/com.nokia.carbide.cpp.templates/templates/shared/projectCommonFilesProcessParams2x.inc Wed Jul 21 11:37:56 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-<parameter name="project" projectName="$(projectName)" />
-
-<!-- AIF DIR -->
-
-<parameter name="file"
- sourcePath="aif/Basenameaif.rss"
- targetPath="$(aifDir)/$(baseName)aif.rss"
- />
-<parameter name="file"
- sourcePath="aif/context_pane_icon.bmp"
- targetPath="$(aifDir)/context_pane_icon.bmp"
- substitute="false"
- />
-<parameter name="file"
- sourcePath="aif/context_pane_icon_mask.bmp"
- targetPath="$(aifDir)/context_pane_icon_mask.bmp"
- substitute="false"
- />
-<parameter name="file"
- sourcePath="aif/list_icon.bmp"
- targetPath="$(aifDir)/list_icon.bmp"
- substitute="false"
- />
-<parameter name="file"
- sourcePath="aif/list_icon_mask.bmp"
- targetPath="$(aifDir)/list_icon_mask.bmp"
- substitute="false"
- />
-
-<!-- DATA DIR -->
-
-<parameter name="file"
- sourcePath="data/Basename.rss"
- targetPath="$(dataDir)/$(baseName).rss"
- />
-<parameter name="file"
- sourcePath="data/Basename_caption.rss"
- targetPath="$(dataDir)/$(baseName)_caption.rss"
- />
-
-<!-- GROUP DIR -->
-
-<parameter name="file"
- sourcePath="group/bld.inf"
- targetPath="$(groupDir)/bld.inf"
- />
-<parameter name="file"
- sourcePath="group/Basename.mmp"
- targetPath="$(groupDir)/$(baseName).mmp"
- />
-
-<!-- HELP DIR -->
-
-<parameter name="file"
- sourcePath="help/Basename.cshlp"
- targetPath="$(helpDir)/$(baseName).cshlp"
- />
-<parameter name="file"
- sourcePath="help/Basename.xml"
- targetPath="$(helpDir)/$(baseName).xml"
- />
-<parameter name="file"
- sourcePath="help/build_help.mk"
- targetPath="$(helpDir)/build_help.mk"
- />
-<parameter name="file"
- sourcePath="help/Custom.xml"
- targetPath="$(helpDir)/Custom.xml"
- />
