mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 17:26:01 +02:00
Code Issues Wiki Activity

Fixed a few compiler warnings.

Browse source
This commit is contained in:
Markus Schorn 2009-10-21 14:29:08 +00:00
parent 90b40763b4
commit 6936409241
4 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/MacroExpansionHandler.java
View file

@ -118,7 +118,7 @@ public class MacroExpansionHandler {
int eOff = mName.getFileLocation().getNodeOffset(); int eOff = mName.getFileLocation().getNodeOffset();
int eLength = mName.getFileLocation().getNodeLength(); int eLength = mName.getFileLocation().getNodeLength();
if(eOff < nOff && Math.abs((eOff+eLength-nOff)) < 3) { if(eOff < nOff && Math.abs((eOff+eLength-nOff)) < 3) {
scribe.print(mName.toString() + " "); scribe.print(mName.toString() + " "); //$NON-NLS-1$
} }
} }
} }

23
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailNodeEqualityChecker.java
View file

@ -445,6 +445,9 @@ public class TrailNodeEqualityChecker implements EqualityChecker<IASTNode> {
}else { }else {
IType oType = getType(trailName.getRealName().resolveBinding()); IType oType = getType(trailName.getRealName().resolveBinding());
IType nType = getType(name.resolveBinding()); IType nType = getType(name.resolveBinding());
if (oType == null || nType == null)
return false;
if(oType.isSameType(nType)) { if(oType.isSameType(nType)) {
return true; return true;
} }
@ -459,25 +462,7 @@ public class TrailNodeEqualityChecker implements EqualityChecker<IASTNode> {
return var.getType(); return var.getType();
} }
} catch (DOMException e) { } catch (DOMException e) {
return new NullType();
} }
return new NullType(); return null;
}
private class NullType implements IType{
@Override
public Object clone() {
try {
return super.clone();
} catch (CloneNotSupportedException e) {
return null;
}
}
public boolean isSameType(IType type) {
return false;
}
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
View file

@ -915,7 +915,7 @@ public class CUIPlugin extends AbstractUIPlugin {
*/ */
public ContextTypeRegistry getCodeTemplateContextRegistry() { public ContextTypeRegistry getCodeTemplateContextRegistry() {
if (fCodeTemplateContextTypeRegistry == null) { if (fCodeTemplateContextTypeRegistry == null) {
fCodeTemplateContextTypeRegistry= new ContributionContextTypeRegistry("org.eclipse.cdt.ui.codeTemplates"); fCodeTemplateContextTypeRegistry= new ContributionContextTypeRegistry("org.eclipse.cdt.ui.codeTemplates"); //$NON-NLS-1$
CodeTemplateContextType.registerContextTypes(fCodeTemplateContextTypeRegistry); CodeTemplateContextType.registerContextTypes(fCodeTemplateContextTypeRegistry);
FileTemplateContextType.registerContextTypes(fCodeTemplateContextTypeRegistry); FileTemplateContextType.registerContextTypes(fCodeTemplateContextTypeRegistry);

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java
View file

@ -227,7 +227,7 @@ public final class RegexErrorParserOptionPage extends AbstractCOptionPage {
// TODO: remove the warning before 6.1 // TODO: remove the warning before 6.1
MessageLine errorImageLabel = new MessageLine(composite, SWT.NONE); MessageLine errorImageLabel = new MessageLine(composite, SWT.NONE);
errorImageLabel.setImage(JFaceResources.getImage(Dialog.DLG_IMG_MESSAGE_WARNING)); errorImageLabel.setImage(JFaceResources.getImage(Dialog.DLG_IMG_MESSAGE_WARNING));
errorImageLabel.setText("Error Parser Options user entries may be lost on CDT update as persistence will be finalized with CDT 6.1 final release."); errorImageLabel.setText("Error Parser Options user entries may be lost on CDT update as persistence will be finalized with CDT 6.1 final release."); //$NON-NLS-1$
} }
setControl(group); setControl(group);