summaryrefslogtreecommitdiffstats
path: root/kig/objects/circle_imp.cc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:18:52 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:18:52 +0000
commit648ba4a456d3aad2825193ff8f3bd52a875783b5 (patch)
tree0b50d2253a0c85238cc4dcba5c4f949de3f0eb15 /kig/objects/circle_imp.cc
parent98a12d05a48814bec3870b9a6d5865475cfa1c95 (diff)
downloadtdeedu-648ba4a456d3aad2825193ff8f3bd52a875783b5.tar.gz
tdeedu-648ba4a456d3aad2825193ff8f3bd52a875783b5.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1212481 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kig/objects/circle_imp.cc')
-rw-r--r--kig/objects/circle_imp.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/kig/objects/circle_imp.cc b/kig/objects/circle_imp.cc
index 86e6f978..38522c22 100644
--- a/kig/objects/circle_imp.cc
+++ b/kig/objects/circle_imp.cc
@@ -63,19 +63,19 @@ void CircleImp::draw( KigPainter& p ) const
p.drawCircle( mcenter, mradius );
}
-bool CircleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const
+bool CircleImp::contains( const Coordinate& p, int width, const KigWidget& w ) const
{
return fabs((mcenter - p).length() - mradius) <= w.screenInfo().normalMiss( width );
}
bool CircleImp::inRect( const Rect& r, int width, const KigWidget& w ) const
{
- // first we check if the rect tqcontains at least one of the
+ // first we check if the rect contains at least one of the
// north/south/east/west points of the circle
- if ( r.tqcontains( mcenter + Coordinate( 0, -mradius ) ) ) return true;
- if ( r.tqcontains( mcenter + Coordinate( mradius, 0 ) ) ) return true;
- if ( r.tqcontains( mcenter + Coordinate( 0, mradius ) ) ) return true;
- if ( r.tqcontains( mcenter + Coordinate( -mradius, 0 ) ) ) return true;
+ if ( r.contains( mcenter + Coordinate( 0, -mradius ) ) ) return true;
+ if ( r.contains( mcenter + Coordinate( mradius, 0 ) ) ) return true;
+ if ( r.contains( mcenter + Coordinate( 0, mradius ) ) ) return true;
+ if ( r.contains( mcenter + Coordinate( -mradius, 0 ) ) ) return true;
// we allow a miss of some pixels ..
double miss = w.screenInfo().normalMiss( width );