Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix ###'es in qrect.h (2)

Browse source 
I missed those

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-05-28 20:27:51 +00:00
parent ace9408af4
commit ef9ef0da73
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/tools/qrect.h
View file

@ -542,9 +542,7 @@ public:
bool contains(const QPointF &p) const;
bool contains(qreal x, qreal y) const;
bool contains(const QRectF &r) const;
QRectF unite(const QRectF &r) const; // ### Qt 5: make QT4_SUPPORT
QRectF united(const QRectF &other) const;
QRectF intersect(const QRectF &r) const; // ### Qt 5: make QT4_SUPPORT
QRectF intersected(const QRectF &other) const;
bool intersects(const QRectF &r) const;
@ -762,24 +760,14 @@ inline QRectF& QRectF::operator&=(const QRectF &r)
return *this;
}
inline QRectF QRectF::intersect(const QRectF &r) const
inline QRectF QRectF::intersected(const QRectF &r) const
{
return *this & r;
}
inline QRectF QRectF::intersected(const QRectF &r) const
{
return intersect(r);
}
inline QRectF QRectF::unite(const QRectF &r) const
{
return *this | r;
}
inline QRectF QRectF::united(const QRectF &r) const
{
return unite(r);
return *this | r;
}
inline bool operator==(const QRectF &r1, const QRectF &r2)