From 0f10e95c219e3b3e691f404a15dd940d5baca8f2 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Fri, 14 May 2004 23:09:16 +0000
Subject: [PATCH] Get rid of warnings.

---
 .../model/org/eclipse/cdt/internal/core/model/CProject.java | 6 +++---
 .../eclipse/cdt/internal/ui/cview/CViewLabelProvider.java   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java
index 43f65312244..8141349c693 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java
@@ -366,21 +366,21 @@ public class CProject extends Openable implements ICProject {
 	 * @see org.eclipse.cdt.core.model.ICProject#getResolvedCPathEntries()
 	 */
 	public IPathEntry[] getResolvedPathEntries() throws CModelException {
-		return CoreModel.getDefault().getResolvedPathEntries(this);
+		return CoreModel.getResolvedPathEntries(this);
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.ICProject#getRawCPathEntries()
 	 */
 	public IPathEntry[] getRawPathEntries() throws CModelException {
-		return CoreModel.getDefault().getRawPathEntries(this);
+		return CoreModel.getRawPathEntries(this);
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.ICProject#setRawCPathEntries(org.eclipse.cdt.core.model.IPathEntry[], org.eclipse.core.runtime.IProgressMonitor)
 	 */
 	public void setRawPathEntries(IPathEntry[] newEntries, IProgressMonitor monitor) throws CModelException {
-		CoreModel.getDefault().setRawPathEntries(this, newEntries, monitor);
+		CoreModel.setRawPathEntries(this, newEntries, monitor);
 	}
 
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java
index e762607b5fa..a0cf61b697c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java
@@ -14,7 +14,6 @@ import org.eclipse.cdt.core.model.IIncludeReference;
 import org.eclipse.cdt.internal.ui.IAdornmentProvider;
 import org.eclipse.cdt.internal.ui.StandardCElementLabelProvider;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
 
 /*
  * CViewLabelProvider