diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:44:46 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:44:46 -0600 |
commit | cee429821aa6f1acc97fb482d325fb4eb37376ca (patch) | |
tree | 4f55e04b7f000c854fe2b8347dcdb62d97de3c73 /kig/misc/coordinate_system.cpp | |
parent | ab801f72ab45e8066a8ec6c533ef13c2da67e559 (diff) | |
download | tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.tar.gz tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kig/misc/coordinate_system.cpp')
-rw-r--r-- | kig/misc/coordinate_system.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kig/misc/coordinate_system.cpp b/kig/misc/coordinate_system.cpp index 36cfef0b..35269399 100644 --- a/kig/misc/coordinate_system.cpp +++ b/kig/misc/coordinate_system.cpp @@ -114,7 +114,7 @@ void CoordinateValidator::fixup( TQString & input ) const if ( sc == -1 ) { sc = input.length(); - KLocale* l = KGlobal::locale(); + KLocale* l = TDEGlobal::locale(); if ( mpolar ) input.append( TQString::fromLatin1( ";" ) + l->positiveSign() + TQString::fromLatin1( "0�" ) ); @@ -144,8 +144,8 @@ TQString EuclideanCoords::fromScreen( const Coordinate& p, const KigDocument& d Rect sr = d.suggestedRect(); double m = kigMax( sr.width(), sr.height() ); int l = kigMax( 0, (int) ( 3 - log10( m ) ) ); - TQString xs = KGlobal::locale()->formatNumber( p.x, l ); - TQString ys = KGlobal::locale()->formatNumber( p.y, l ); + TQString xs = TDEGlobal::locale()->formatNumber( p.x, l ); + TQString ys = TDEGlobal::locale()->formatNumber( p.y, l ); return TQString::fromLatin1( "( %1; %2 )" ).arg( xs ).arg( ys ); } @@ -157,7 +157,7 @@ Coordinate EuclideanCoords::toScreen(const TQString& s, bool& ok) const { TQString xs = r.cap(1); TQString ys = r.cap(2); - KLocale* l = KGlobal::locale(); + KLocale* l = TDEGlobal::locale(); double x = l->readNumber( xs, &ok ); if ( ! ok ) x = xs.toDouble( &ok ); if ( ! ok ) return Coordinate(); @@ -272,7 +272,7 @@ void EuclideanCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) co p.drawText( Rect( Coordinate( i, 0 ), hd, -2*vd ).normalized(), - KGlobal::locale()->formatNumber( i, hnfrac ), + TDEGlobal::locale()->formatNumber( i, hnfrac ), AlignLeft | AlignTop ); }; @@ -281,7 +281,7 @@ void EuclideanCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) co { if( fabs( i ) < 1e-8 ) continue; p.drawText ( Rect( Coordinate( 0, i ), 2*hd, vd ).normalized(), - KGlobal::locale()->formatNumber( i, vnfrac ), + TDEGlobal::locale()->formatNumber( i, vnfrac ), AlignBottom | AlignLeft ); }; @@ -351,8 +351,8 @@ TQString PolarCoords::fromScreen( const Coordinate& pt, const KigDocument& d ) c double r = pt.length(); double theta = Goniometry::convert( atan2( pt.y, pt.x ), Goniometry::Rad, Goniometry::Deg ); - TQString rs = KGlobal::locale()->formatNumber( r, l ); - TQString ts = KGlobal::locale()->formatNumber( theta, 0 ); + TQString rs = TDEGlobal::locale()->formatNumber( r, l ); + TQString ts = TDEGlobal::locale()->formatNumber( theta, 0 ); return TQString::fromLatin1("( %1; %2� )").arg( rs ).arg( ts ); } @@ -378,11 +378,11 @@ Coordinate PolarCoords::toScreen(const TQString& s, bool& ok) const if (ok) { TQString rs = regexp.cap( 1 ); - double r = KGlobal::locale()->readNumber( rs, &ok ); + double r = TDEGlobal::locale()->readNumber( rs, &ok ); if ( ! ok ) r = rs.toDouble( &ok ); if ( ! ok ) return Coordinate(); TQString ts = regexp.cap( 2 ); - double theta = KGlobal::locale()->readNumber( ts, &ok ); + double theta = TDEGlobal::locale()->readNumber( ts, &ok ); if ( ! ok ) theta = ts.toDouble( &ok ); if ( ! ok ) return Coordinate(); theta *= M_PI; @@ -465,7 +465,7 @@ void PolarCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) const // through the 0 etc. ) if( fabs( i ) < 1e-8 ) continue; - TQString is = KGlobal::locale()->formatNumber( fabs( i ), nfrac ); + TQString is = TDEGlobal::locale()->formatNumber( fabs( i ), nfrac ); p.drawText( Rect( Coordinate( i, 0 ), hd, -2*vd ).normalized(), is, AlignLeft | AlignTop ); @@ -475,7 +475,7 @@ void PolarCoords::drawGrid( KigPainter& p, bool showgrid, bool showaxes ) const { if( fabs( i ) < 1e-8 ) continue; - TQString is = KGlobal::locale()->formatNumber( fabs( i ), nfrac ); + TQString is = TDEGlobal::locale()->formatNumber( fabs( i ), nfrac ); p.drawText ( Rect( Coordinate( 0, i ), hd, vd ).normalized(), is, AlignBottom | AlignLeft |