summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qbrush.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-05-03 21:51:54 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-05-03 21:51:54 +0200
commit52352c6c572f15c10c4c3de641db81723aada468 (patch)
treec87f2be7179e2d7a203719aa4eed9480dc7d9748 /src/gui/painting/qbrush.h
parent34f712e79e97b757b4426e1ffa09e065c9e379a1 (diff)
remove obsolete stuff
everything inside QT3_SUPPORT is gone in gui/painting
Diffstat (limited to 'src/gui/painting/qbrush.h')
-rw-r--r--src/gui/painting/qbrush.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h
index 8b313196db..89be376ad9 100644
--- a/src/gui/painting/qbrush.h
+++ b/src/gui/painting/qbrush.h
@@ -126,12 +126,6 @@ public:
bool operator==(const QBrush &b) const;
inline bool operator!=(const QBrush &b) const { return !(operator==(b)); }
-#ifdef QT3_SUPPORT
- inline QT3_SUPPORT operator const QColor&() const;
- QT3_SUPPORT QPixmap *pixmap() const;
- inline QT3_SUPPORT void setPixmap(const QPixmap &pixmap) { setTexture(pixmap); }
-#endif
-
private:
#if defined(Q_WS_X11)
friend class QX11PaintEngine;
@@ -185,10 +179,6 @@ inline const QMatrix &QBrush::matrix() const { return d->transform.toAffine(); }
inline QTransform QBrush::transform() const { return d->transform; }
inline bool QBrush::isDetached() const { return d->ref == 1; }
-#ifdef QT3_SUPPORT
-inline QBrush::operator const QColor&() const { return d->color; }
-#endif
-
/*******************************************************************************
* QGradients