summaryrefslogtreecommitdiffstats
path: root/kig/objects/circle_imp.cc
diff options
context:
space:
mode:
Diffstat (limited to 'kig/objects/circle_imp.cc')
-rw-r--r--kig/objects/circle_imp.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/kig/objects/circle_imp.cc b/kig/objects/circle_imp.cc
index 38522c22..059ff592 100644
--- a/kig/objects/circle_imp.cc
+++ b/kig/objects/circle_imp.cc
@@ -63,7 +63,7 @@ void CircleImp::draw( KigPainter& p ) const
p.drawCircle( mcenter, mradius );
}
-bool CircleImp::contains( const Coordinate& p, int width, const KigWidget& w ) const
+bool CircleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const
{
return fabs((mcenter - p).length() - mradius) <= w.screenInfo().normalMiss( width );
}
@@ -72,10 +72,10 @@ bool CircleImp::inRect( const Rect& r, int width, const KigWidget& w ) const
{
// first we check if the rect contains at least one of the
// north/south/east/west points of the circle
- 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;
+ 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;
// we allow a miss of some pixels ..
double miss = w.screenInfo().normalMiss( width );
@@ -235,8 +235,8 @@ TQString CircleImp::polarEquationString( const KigDocument& w ) const
{
TQString ret = i18n( "rho = %1 [centered at %2]" );
ConicPolarData data = polarData();
- ret = ret.arg( data.pdimen, 0, 'g', 3 );
- ret = ret.arg( w.coordinateSystem().fromScreen( data.focus1, w ) );
+ ret = ret.tqarg( data.pdimen, 0, 'g', 3 );
+ ret = ret.tqarg( w.coordinateSystem().fromScreen( data.focus1, w ) );
return ret;
}
@@ -244,18 +244,18 @@ TQString CircleImp::cartesianEquationString( const KigDocument& ) const
{
TQString ret = i18n( "x² + y² + %1 x + %2 y + %3 = 0" );
ConicCartesianData data = cartesianData();
- ret = ret.arg( data.coeffs[3], 0, 'g', 3 );
- ret = ret.arg( data.coeffs[4], 0, 'g', 3 );
- ret = ret.arg( data.coeffs[5], 0, 'g', 3 );
+ ret = ret.tqarg( data.coeffs[3], 0, 'g', 3 );
+ ret = ret.tqarg( data.coeffs[4], 0, 'g', 3 );
+ ret = ret.tqarg( data.coeffs[5], 0, 'g', 3 );
return ret;
}
TQString CircleImp::simplyCartesianEquationString( const KigDocument& ) const
{
TQString ret = i18n( "( x - %1 )² + ( y - %2 )² = %3" );
- ret = ret.arg( mcenter.x, 0, 'g', 3 );
- ret = ret.arg( mcenter.y, 0, 'g', 3 );
- ret = ret.arg( mradius * mradius, 0, 'g', 3 );
+ ret = ret.tqarg( mcenter.x, 0, 'g', 3 );
+ ret = ret.tqarg( mcenter.y, 0, 'g', 3 );
+ ret = ret.tqarg( mradius * mradius, 0, 'g', 3 );
return ret;
}