1.1 --- a/imageobj.cpp	Wed May 04 20:35:39 2005 +0000
     1.2 +++ b/imageobj.cpp	Mon Oct 30 12:39:37 2006 +0000
     1.3 @@ -1,10 +1,12 @@
     1.4  #include "imageobj.h"
     1.5 +//Added by qt3to4:
     1.6 +#include <QPixmap>
     1.7  
     1.8  /////////////////////////////////////////////////////////////////
     1.9  // ImageObj
    1.10  /////////////////////////////////////////////////////////////////
    1.11 -ImageObj::ImageObj( QCanvas *canvas )
    1.12 -    : QCanvasRectangle( canvas )
    1.13 +ImageObj::ImageObj( Q3Canvas *canvas )
    1.14 +    : Q3CanvasRectangle( canvas )
    1.15  {
    1.16  //	cout << "Const ImageObj (canvas)\n";
    1.17      setZ(Z_ICON);	
    1.18 @@ -54,7 +56,7 @@
    1.19  	type=qimage;
    1.20  
    1.21  #if !defined(Q_WS_QWS)
    1.22 -    pixmap.convertFromImage(image, OrderedAlphaDither);
    1.23 +    pixmap.convertFromImage(image, Qt::OrderedAlphaDither);
    1.24  #endif
    1.25  	return true;
    1.26  }
    1.27 @@ -78,7 +80,7 @@
    1.28  {
    1.29  	type=qimage;
    1.30  	image=img;
    1.31 -    pixmap.convertFromImage(image, OrderedAlphaDither);
    1.32 +    pixmap.convertFromImage(image, Qt::OrderedAlphaDither);
    1.33  }
    1.34  
    1.35  QPixmap ImageObj::getPixmap()
    1.36 @@ -91,7 +93,7 @@
    1.37  // On Qt/Embedded, we can paint a QImage as fast as a QPixmap,
    1.38  // but on other platforms, we need to use a QPixmap.
    1.39  #if defined(Q_WS_QWS)
    1.40 -    p.drawImage( int(x()), int(y()), image, 0, 0, -1, -1, OrderedAlphaDither );
    1.41 +    p.drawImage( int(x()), int(y()), image, 0, 0, -1, -1, Qt::OrderedAlphaDither );
    1.42  #else
    1.43      p.drawPixmap( int(x()), int(y()), pixmap );
    1.44  #endif