diff -r 7a96bd401351 -r 9aadd0f58300 imageobj.cpp
--- a/imageobj.cpp	Sun Jan 30 12:58:47 2005 +0000
+++ b/imageobj.cpp	Tue Aug 15 11:42:10 2006 +0000
@@ -1,10 +1,12 @@
 #include "imageobj.h"
+//Added by qt3to4:
+#include <QPixmap>
 
 /////////////////////////////////////////////////////////////////
 // ImageObj
 /////////////////////////////////////////////////////////////////
-ImageObj::ImageObj( QCanvas *canvas )
-    : QCanvasRectangle( canvas )
+ImageObj::ImageObj( Q3Canvas *canvas )
+    : Q3CanvasRectangle( canvas )
 {
 //	cout << "Const ImageObj (canvas)\n";
     setZ(Z_ICON);	
@@ -39,7 +41,7 @@
 {
 	switch (type)
 	{
-		case undef: qWarning("undef");break;
+		case undef: qWarning("Warning: ImageObj::save() type=undef");break;
 		case qimage: image.save (fn,format,-1);break;
 		case qpixmap: pixmap.save (fn,format,-1);break;
 	}
@@ -54,7 +56,7 @@
 	type=qimage;
 
 #if !defined(Q_WS_QWS)
-    pixmap.convertFromImage(image, OrderedAlphaDither);
+    pixmap.convertFromImage(image, Qt::OrderedAlphaDither);
 #endif
 	return true;
 }
@@ -78,7 +80,7 @@
 {
 	type=qimage;
 	image=img;
-    pixmap.convertFromImage(image, OrderedAlphaDither);
+    pixmap.convertFromImage(image, Qt::OrderedAlphaDither);
 }
 
 QPixmap ImageObj::getPixmap()
@@ -91,7 +93,7 @@
 // On Qt/Embedded, we can paint a QImage as fast as a QPixmap,
 // but on other platforms, we need to use a QPixmap.
 #if defined(Q_WS_QWS)
-    p.drawImage( int(x()), int(y()), image, 0, 0, -1, -1, OrderedAlphaDither );
+    p.drawImage( int(x()), int(y()), image, 0, 0, -1, -1, Qt::OrderedAlphaDither );
 #else
     p.drawPixmap( int(x()), int(y()), pixmap );
 #endif