summaryrefslogtreecommitdiffstats
path: root/kig/objects/cubic_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/cubic_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/cubic_imp.cc')
-rw-r--r--kig/objects/cubic_imp.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/kig/objects/cubic_imp.cc b/kig/objects/cubic_imp.cc
index 3879c5d9..f727f49a 100644
--- a/kig/objects/cubic_imp.cc
+++ b/kig/objects/cubic_imp.cc
@@ -50,7 +50,7 @@ void CubicImp::draw( KigPainter& p ) const
p.drawCurve( this );
}
-bool CubicImp::contains( const Coordinate& o, int width, const KigWidget& w ) const
+bool CubicImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const
{
return internalContainsPoint( o, w.screenInfo().normalMiss( width ) );
}
@@ -409,7 +409,7 @@ Rect CubicImp::surroundingRect() const
TQString CubicImp::cartesianEquationString( const KigDocument& ) const
{
/*
- * unfortunately QStrings.arg method is limited to %1, %9, so we cannot
+ * unfortunately TQStrings.arg method is limited to %1, %9, so we cannot
* treat all 10 arguments! Let's split the equation in two parts...
* Now this ends up also in the translation machinery, is this really
* necessary? Otherwise we could do a little bit of tidy up on the
@@ -417,21 +417,21 @@ TQString CubicImp::cartesianEquationString( const KigDocument& ) const
*/
TQString ret = i18n( "%6 x³ + %9 y³ + %7 x²y + %8 xy² + %5 y² + %3 x² + %4 xy + %1 x + %2 y" );
- ret = ret.arg( mdata.coeffs[1], 0, 'g', 3 );
- ret = ret.arg( mdata.coeffs[2], 0, 'g', 3 );
- ret = ret.arg( mdata.coeffs[3], 0, 'g', 3 );
- ret = ret.arg( mdata.coeffs[4], 0, 'g', 3 );
- ret = ret.arg( mdata.coeffs[5], 0, 'g', 3 );
- ret = ret.arg( mdata.coeffs[6], 0, 'g', 3 );
- ret = ret.arg( mdata.coeffs[7], 0, 'g', 3 );
- ret = ret.arg( mdata.coeffs[8], 0, 'g', 3 );
- ret = ret.arg( mdata.coeffs[9], 0, 'g', 3 );
+ ret = ret.tqarg( mdata.coeffs[1], 0, 'g', 3 );
+ ret = ret.tqarg( mdata.coeffs[2], 0, 'g', 3 );
+ ret = ret.tqarg( mdata.coeffs[3], 0, 'g', 3 );
+ ret = ret.tqarg( mdata.coeffs[4], 0, 'g', 3 );
+ ret = ret.tqarg( mdata.coeffs[5], 0, 'g', 3 );
+ ret = ret.tqarg( mdata.coeffs[6], 0, 'g', 3 );
+ ret = ret.tqarg( mdata.coeffs[7], 0, 'g', 3 );
+ ret = ret.tqarg( mdata.coeffs[8], 0, 'g', 3 );
+ ret = ret.tqarg( mdata.coeffs[9], 0, 'g', 3 );
ret.append( i18n( " + %1 = 0" ) );
- ret = ret.arg( mdata.coeffs[0], 0, 'g', 3 );
+ ret = ret.tqarg( mdata.coeffs[0], 0, 'g', 3 );
// we should find a common place to do this...
- ret.replace( "+ -", "- " );
- ret.replace( "+-", "-" );
+ ret.tqreplace( "+ -", "- " );
+ ret.tqreplace( "+-", "-" );
return ret;
}