--- a/javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/library/graphics/qt/pixmap.h	Mon Oct 04 11:29:25 2010 +0300
+++ b/javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/library/graphics/qt/pixmap.h	Fri Oct 15 12:29:39 2010 +0300
@@ -12,11 +12,11 @@
 #define PIXMAP_H_
 
 #include <QPixmap>
-#include "graphics.h"
+#include "imagebase.h"
 
 namespace Java { namespace GFX {
 
-class Pixmap: public Image
+class Pixmap: public ImageBase
 {
 public:
     /**
@@ -41,24 +41,26 @@
     virtual void createFromRGB(int* aRgbdata, int aWidth, int aHeight, bool aHasAlpha);
     virtual void dispose();
     virtual QPaintDevice* getBindable();
-    virtual int getFormat();
+    virtual TImageFormat getFormat();
     virtual int getHeight();
+    virtual const QImage* getConstImage();
+    virtual QImage* getImage();
+    virtual const QPixmap* getConstPixmap();
     virtual QPixmap* getPixmap();
     virtual void getRgb(int* aRgbdata, int aOffset, int aScanlength, int aX, int aY, int aWidth, int aHeight);
     virtual void getRgb(char* aRgbdata, char* aTransparencyMask,int aOffset, int aScanlength, int aX, int aY, int aWidth, int aHeight, int aFormat);
     virtual void getRgb(short* aRgbdata, int aOffset, int aScanlength, int aX, int aY, int aWidth, int aHeight, int aFormat);
     virtual int getWidth();
+    virtual const QImage toConstImage();
     virtual QImage toImage();
+    virtual QPixmap toPixmap();
     virtual void transform(TTransform aTransform);
     virtual TImageType type();
-    virtual int getAlpha();
-    virtual bool hasMask();
+
     virtual bool hasAlphaChannel();
 
 private:
     QPixmap  mPixmap;
-    int      mAlpha;
-    bool     mHasMask;
 };
 
 } // namespace GFX