summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/painting')
-rw-r--r--src/gui/painting/qmatrix.cpp9
-rw-r--r--src/gui/painting/qmatrix.h3
-rw-r--r--src/gui/painting/qregion.cpp5
-rw-r--r--src/gui/painting/qregion.h3
4 files changed, 0 insertions, 20 deletions
diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index 1da5982c28..6b5eb14f5f 100644
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -923,15 +923,6 @@ QMatrix &QMatrix::rotate(qreal a)
*/
/*!
- \obsolete
- \fn qreal QMatrix::det() const
-
- Returns the matrix's determinant.
-
- \sa determinant()
-*/
-
-/*!
\since 4.6
\fn qreal QMatrix::determinant() const
diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h
index 2b438aae11..7acc962afa 100644
--- a/src/gui/painting/qmatrix.h
+++ b/src/gui/painting/qmatrix.h
@@ -101,9 +101,6 @@ public:
bool isInvertible() const { return !qFuzzyIsNull(_m11*_m22 - _m12*_m21); }
qreal determinant() const { return _m11*_m22 - _m12*_m21; }
-#ifdef QT_DEPRECATED
- QT_DEPRECATED qreal det() const { return _m11*_m22 - _m12*_m21; }
-#endif
QMatrix inverted(bool *invertible = 0) const;
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index 865e226f1c..48b0c00014 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -4257,11 +4257,6 @@ void QRegion::setRects(const QRect *rects, int num)
}
}
-int QRegion::numRects() const
-{
- return (d->qt_rgn ? d->qt_rgn->numRects : 0);
-}
-
int QRegion::rectCount() const
{
return (d->qt_rgn ? d->qt_rgn->numRects : 0);
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index 1aaa4279d2..aa8b21b624 100644
--- a/src/gui/painting/qregion.h
+++ b/src/gui/painting/qregion.h
@@ -113,9 +113,6 @@ public:
QRect boundingRect() const;
QVector<QRect> rects() const;
void setRects(const QRect *rect, int num);
-#ifdef QT_DEPRECATED
- QT_DEPRECATED int numRects() const;
-#endif
int rectCount() const;
const QRegion operator|(const QRegion &r) const;