summaryrefslogtreecommitdiffstats
path: root/kig/objects/conic_imp.cc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 04:44:41 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 04:44:41 +0000
commita374efce3a207b39514be3c52264091400ce297e (patch)
tree77bdf654b55826d4f59b53a5621310206bcaead1 /kig/objects/conic_imp.cc
parentf81a494f3957d5cf38c787973415597941934727 (diff)
downloadtdeedu-a374efce3a207b39514be3c52264091400ce297e.tar.gz
tdeedu-a374efce3a207b39514be3c52264091400ce297e.zip
TQt4 port kdeedu
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kig/objects/conic_imp.cc')
-rw-r--r--kig/objects/conic_imp.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/kig/objects/conic_imp.cc b/kig/objects/conic_imp.cc
index 81331522..11e01c28 100644
--- a/kig/objects/conic_imp.cc
+++ b/kig/objects/conic_imp.cc
@@ -47,7 +47,7 @@ bool ConicImp::valid() const
return true;
}
-bool ConicImp::contains( const Coordinate& o, int width, const KigWidget& w ) const
+bool ConicImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const
{
return internalContainsPoint( o, w.screenInfo().normalMiss( width ) );
}
@@ -204,12 +204,12 @@ TQString ConicImp::cartesianEquationString( const KigDocument& ) const
{
TQString ret = i18n( "%1 x² + %2 y² + %3 xy + %4 x + %5 y + %6 = 0" );
ConicCartesianData data = cartesianData();
- ret = ret.arg( data.coeffs[0], 0, 'g', 3 );
- ret = ret.arg( data.coeffs[1], 0, 'g', 3 );
- ret = ret.arg( data.coeffs[2], 0, 'g', 3 );
- 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[0], 0, 'g', 3 );
+ ret = ret.tqarg( data.coeffs[1], 0, 'g', 3 );
+ ret = ret.tqarg( data.coeffs[2], 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;
}
@@ -218,11 +218,11 @@ TQString ConicImp::polarEquationString( const KigDocument& w ) const
TQString ret = i18n( "rho = %1/(1 + %2 cos theta + %3 sin theta)\n [centered at %4]" );
const ConicPolarData data = polarData();
- ret = ret.arg( data.pdimen, 0, 'g', 3 );
- ret = ret.arg( -data.ecostheta0, 0, 'g', 3 );
- ret = ret.arg( -data.esintheta0, 0, 'g', 3 );
+ ret = ret.tqarg( data.pdimen, 0, 'g', 3 );
+ ret = ret.tqarg( -data.ecostheta0, 0, 'g', 3 );
+ ret = ret.tqarg( -data.esintheta0, 0, 'g', 3 );
- ret = ret.arg( w.coordinateSystem().fromScreen( data.focus1, w ) );
+ ret = ret.tqarg( w.coordinateSystem().fromScreen( data.focus1, w ) );
return ret;
}