diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
| commit | d8762de95349dc6edaa34db9bf699b367c1af6b1 (patch) | |
| tree | 8c76a6ab8e4e92d13196cb11ddab2d0fb64ec680 /kig/misc/common.cpp | |
| parent | 03458c4e2ca2e92deafe078d0e09e1acd4c4765f (diff) | |
| download | tdeedu-d8762de95349dc6edaa34db9bf699b367c1af6b1.tar.gz tdeedu-d8762de95349dc6edaa34db9bf699b367c1af6b1.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kig/misc/common.cpp')
| -rw-r--r-- | kig/misc/common.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kig/misc/common.cpp b/kig/misc/common.cpp index 83fdd077..275170ef 100644 --- a/kig/misc/common.cpp +++ b/kig/misc/common.cpp @@ -422,7 +422,7 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b, // if ( fabs( a.x - b.x ) <= 1e-7 ) // { // // too small to be useful.. -// return r.tqcontains( Coordinate( a.x, r.center().y ), miss ); +// return r.contains( Coordinate( a.x, r.center().y ), miss ); // } // in case we have a segment we need also to check for the case when @@ -433,7 +433,7 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b, // - if the midpoint is in the rect than returning true is safe (also // in the cases where we have a ray or a line) - if ( r.tqcontains( 0.5*( a + b ), miss ) ) return true; + if ( r.contains( 0.5*( a + b ), miss ) ) return true; Coordinate dir = b - a; double m = dir.y / dir.x; @@ -455,10 +455,10 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b, // intersection is not between the begin and end point.. ) and if // the rect contains the intersection.. If it does, we have a winner.. return - ( imp->tqcontains( leftint, width, w ) && r.tqcontains( leftint, miss ) ) || - ( imp->tqcontains( rightint, width, w ) && r.tqcontains( rightint, miss ) ) || - ( imp->tqcontains( bottomint, width, w ) && r.tqcontains( bottomint, miss ) ) || - ( imp->tqcontains( topint, width, w ) && r.tqcontains( topint, miss ) ); + ( imp->contains( leftint, width, w ) && r.contains( leftint, miss ) ) || + ( imp->contains( rightint, width, w ) && r.contains( rightint, miss ) ) || + ( imp->contains( bottomint, width, w ) && r.contains( bottomint, miss ) ) || + ( imp->contains( topint, width, w ) && r.contains( topint, miss ) ); } bool operator==( const LineData& l, const LineData& r ) |