diff --git a/mozilla/cmd/macfe/central/CImageIconMixin.cp b/mozilla/cmd/macfe/central/CImageIconMixin.cp
index ca61f4b8e8e..756727941ca 100644
--- a/mozilla/cmd/macfe/central/CImageIconMixin.cp
+++ b/mozilla/cmd/macfe/central/CImageIconMixin.cp
@@ -73,7 +73,7 @@ CImageIconMixin :: ListenToMessage ( const MessageT inMessage, void* ioData )
 // draw the standby in its place
 //
 void 
-CImageIconMixin :: DrawImage ( const Point & inTopLeft, const IconTransformType inTransform, 
+CImageIconMixin :: DrawImage ( const Point & inTopLeft, IconTransformType inTransform, 
 								Uint32 inWidth, Uint32 inHeight ) const
 {
 	try { 
@@ -110,7 +110,7 @@ CImageIconMixin :: DrawImage ( const Point & inTopLeft, const IconTransformType
 
 void
 CImageIconMixin :: DoDrawing ( DrawingState & inState, const Point & inTopLeft,
-								const IconTransformType inTransform, Uint32 inWidth, Uint32 inHeight ) const
+								IconTransformType inTransform, Uint32 inWidth, Uint32 inHeight ) const
 {
 	if ( inWidth == 0 && inHeight == 0 ) {
 		inWidth = inState.pixmap->pixmap.bounds.right;
@@ -158,7 +158,7 @@ CTiledImageMixin :: ~CTiledImageMixin ( )
 //
 void
 CTiledImageMixin :: DoDrawing ( DrawingState & inState, const Point & inTopLeft,
-								const IconTransformType inTransform, Uint32 inWidth, Uint32 inHeight ) const
+								IconTransformType inTransform, Uint32 inWidth, Uint32 inHeight ) const
 {
 	DrawTiledImage ( &inState, inTopLeft, 0, 0, inWidth, inHeight );
 
diff --git a/mozilla/cmd/macfe/central/CImageIconMixin.h b/mozilla/cmd/macfe/central/CImageIconMixin.h
index 4a0cf0d471c..33f813fffb4 100644
--- a/mozilla/cmd/macfe/central/CImageIconMixin.h
+++ b/mozilla/cmd/macfe/central/CImageIconMixin.h
@@ -54,7 +54,7 @@ public:
 		// Draw the image. Will begin loading it if the data has not yet arrived and will
 		// draw the standby in its place. Pass zero's for width and height to use image defaults
 		// or the image will be scaled to what you put in.
-	void DrawImage ( const Point & inTopLeft, const IconTransformType inTransform,
+	void DrawImage ( const Point & inTopLeft, IconTransformType inTransform,
 						Uint32 inWidth, Uint32 inHeight ) const;
 	
 protected:
@@ -68,12 +68,11 @@ protected:
 	
 		// Draw a scaled image as an icon. Override to draw differently
 	virtual void DoDrawing ( DrawingState & inState, const Point & inTopLeft,
-								const IconTransformType inTransform, Uint32 inWidth,
+								IconTransformType inTransform, Uint32 inWidth,
 								Uint32 inHeight ) const ;
 	
 		// Draw something when the real image is not yet here.
-	virtual void DrawStandby ( const Point & inTopLeft, 
-								const IconTransformType inTransform ) const = 0;
+	virtual void DrawStandby ( const Point & inTopLeft, IconTransformType inTransform ) const = 0;
 
 private:
 
@@ -101,7 +100,7 @@ protected:
 		// reinterpreted to mean the width and height of the area the image is being tiled
 		// in.
 	virtual void DoDrawing ( DrawingState & inState, const Point & inTopLeft,
-								const IconTransformType inTransform, Uint32 inWidth,
+								IconTransformType inTransform, Uint32 inWidth,
 								Uint32 inHeight ) const ;
 
 }; // class CTiledImageMixin
diff --git a/mozilla/cmd/macfe/rdfui/CHyperTreeFlexTable.cp b/mozilla/cmd/macfe/rdfui/CHyperTreeFlexTable.cp
index f2662f8003a..60c4d987042 100644
--- a/mozilla/cmd/macfe/rdfui/CHyperTreeFlexTable.cp
+++ b/mozilla/cmd/macfe/rdfui/CHyperTreeFlexTable.cp
@@ -1689,8 +1689,7 @@ CTreeIcon :: ImageIsReady ( )
 }
 
 void
-CTreeIcon :: DrawStandby ( const Point & inTopLeft, 
-								const IconTransformType inTransform ) const
+CTreeIcon :: DrawStandby ( const Point & inTopLeft, IconTransformType inTransform ) const
 {
 	Rect where;
 	where.top = inTopLeft.v; where.left = inTopLeft.h;
diff --git a/mozilla/cmd/macfe/rdfui/CHyperTreeFlexTable.h b/mozilla/cmd/macfe/rdfui/CHyperTreeFlexTable.h
index 847c6a95b48..f4e6c0ab16b 100644
--- a/mozilla/cmd/macfe/rdfui/CHyperTreeFlexTable.h
+++ b/mozilla/cmd/macfe/rdfui/CHyperTreeFlexTable.h
@@ -79,8 +79,7 @@ public:
 protected:
 		
 		// Background image tiling stuff
-	virtual void DrawStandby ( const Point & inTopLeft, 
-								const IconTransformType inTransform ) const;
+	virtual void DrawStandby ( const Point & inTopLeft, IconTransformType inTransform ) const;
 	virtual void DrawSelf ( ) ;
 	virtual void ImageIsReady ( ) ;
 	virtual void EraseTableBackground ( ) const;
@@ -258,8 +257,7 @@ public:
 	
 private:
 	void ImageIsReady ( ) ;
-	void DrawStandby ( const Point & inTopLeft, 
-								const IconTransformType inTransform ) const;
+	void DrawStandby ( const Point & inTopLeft, IconTransformType inTransform ) const;
 	
 	const CHyperTreeFlexTable*	mTree;
 	HT_Resource					mNode;
diff --git a/mozilla/cmd/macfe/rdfui/CNavCenterTitle.cp b/mozilla/cmd/macfe/rdfui/CNavCenterTitle.cp
index 36376838f31..9b00e7402b3 100644
--- a/mozilla/cmd/macfe/rdfui/CNavCenterTitle.cp
+++ b/mozilla/cmd/macfe/rdfui/CNavCenterTitle.cp
@@ -179,7 +179,7 @@ CNavCenterStrip :: ImageIsReady ( )
 //
 void
 CNavCenterStrip :: DrawStandby ( const Point & /*inTopLeft*/, 
-									const IconTransformType /*inTransform*/ ) const
+									IconTransformType /*inTransform*/ ) const
 {
 	// we're just waiting for the image to come in, who cares if we don't use
 	// HT's color?
diff --git a/mozilla/cmd/macfe/rdfui/CNavCenterTitle.h b/mozilla/cmd/macfe/rdfui/CNavCenterTitle.h
index 59b6340dac1..59eecc342a4 100644
--- a/mozilla/cmd/macfe/rdfui/CNavCenterTitle.h
+++ b/mozilla/cmd/macfe/rdfui/CNavCenterTitle.h
@@ -58,8 +58,7 @@ protected:
 	virtual void ClickSelf ( const SMouseDownEvent & inMouseDown ) ;
 	
 	virtual	void DrawBeveledFill ( ) ;
-	virtual void DrawStandby ( const Point & inTopLeft, 
-								const IconTransformType inTransform ) const;
+	virtual void DrawStandby ( const Point & inTopLeft, IconTransformType inTransform ) const;
 	virtual void EraseBackground ( HT_Resource inTopNode ) const ;
 	virtual void ImageIsReady ( ) ;