diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-06-28 23:19:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-06-29 15:10:14 +0200 |
| commit | 7b46ec16017d5b467b2b04e9d7e27ce1cee8659e (patch) | |
| tree | a4a26bff1329deac642fcd8234d15ffea0519d8e /src/corelib/tools/qrect.h | |
| parent | 28cf5c5356e0591e3d9f31b5df1f69ce9f514ad3 (diff) | |
remove QT3_SUPPORT from corelib/tools
Change-Id: Ie224cf992be675c7d405d4be05e4acd4157e590e
Reviewed-on: http://codereview.qt.nokia.com/863
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Diffstat (limited to 'src/corelib/tools/qrect.h')
| -rw-r--r-- | src/corelib/tools/qrect.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h index cbed04f628..5d6db9867e 100644 --- a/src/corelib/tools/qrect.h +++ b/src/corelib/tools/qrect.h @@ -73,15 +73,6 @@ public: int bottom() const; QRect normalized() const; -#ifdef QT3_SUPPORT - QT3_SUPPORT int &rLeft() { return x1; } - QT3_SUPPORT int &rTop() { return y1; } - QT3_SUPPORT int &rRight() { return x2; } - QT3_SUPPORT int &rBottom() { return y2; } - - QT3_SUPPORT QRect normalize() const { return normalized(); } -#endif - int x() const; int y() const; void setLeft(int pos); @@ -120,18 +111,10 @@ public: void moveTo(int x, int t); void moveTo(const QPoint &p); -#ifdef QT3_SUPPORT - QT3_SUPPORT void moveBy(int dx, int dy) { translate(dx, dy); } - QT3_SUPPORT void moveBy(const QPoint &p) { translate(p); } -#endif - void setRect(int x, int y, int w, int h); inline void getRect(int *x, int *y, int *w, int *h) const; void setCoords(int x1, int y1, int x2, int y2); -#ifdef QT3_SUPPORT - QT3_SUPPORT void addCoords(int x1, int y1, int x2, int y2); -#endif inline void getCoords(int *x1, int *y1, int *x2, int *y2) const; inline void adjust(int x1, int y1, int x2, int y2); @@ -162,12 +145,6 @@ public: friend Q_CORE_EXPORT_INLINE bool operator==(const QRect &, const QRect &); friend Q_CORE_EXPORT_INLINE bool operator!=(const QRect &, const QRect &); -#ifdef QT3_SUPPORT - inline QT3_SUPPORT void rect(int *x, int *y, int *w, int *h) const { getRect(x, y, w, h); } - inline QT3_SUPPORT void coords(int *ax1, int *ay1, int *ax2, int *ay2) const - { getCoords(ax1, ay1, ax2, ay2); } -#endif - private: #if defined(Q_WS_X11) friend void qt_setCoords(QRect *r, int xp1, int yp1, int xp2, int yp2); @@ -421,13 +398,6 @@ inline void QRect::setCoords(int xp1, int yp1, int xp2, int yp2) y2 = yp2; } -#ifdef QT3_SUPPORT -inline void QRect::addCoords(int dx1, int dy1, int dx2, int dy2) -{ - adjust(dx1, dy1, dx2, dy2); -} -#endif - inline QRect QRect::adjusted(int xp1, int yp1, int xp2, int yp2) const { return QRect(QPoint(x1 + xp1, y1 + yp1), QPoint(x2 + xp2, y2 + yp2)); } |