summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxpixmap.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/fx/qfxpixmap.h')
-rw-r--r--src/declarative/fx/qfxpixmap.h16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/declarative/fx/qfxpixmap.h b/src/declarative/fx/qfxpixmap.h
index 297dba7..ae693c1 100644
--- a/src/declarative/fx/qfxpixmap.h
+++ b/src/declarative/fx/qfxpixmap.h
@@ -42,10 +42,10 @@
#ifndef QFXPIXMAP_H
#define QFXPIXMAP_H
-#include <QString>
-#include <qsimplecanvas.h>
-#include <qfxglobal.h>
-#include <QPixmap>
+#include <QtCore/QString>
+#include <QtGui/QPixmap>
+#include <QtDeclarative/qsimplecanvas.h>
+#include <QtDeclarative/qfxglobal.h>
QT_BEGIN_HEADER
@@ -71,16 +71,10 @@ public:
bool isNull() const;
- bool opaque() const;
- void setOpaque(bool);
-
int width() const;
int height() const;
- QPixmap pixmap() const;
- void setPixmap(const QPixmap &pix);
-
- operator const QSimpleCanvasConfig::Image &() const;
+ operator const QPixmap &() const;
private:
QFxPixmapPrivate *d;