diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
| commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
| tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /lib/kofficecore/KoUnit.cpp | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficecore/KoUnit.cpp')
| -rw-r--r-- | lib/kofficecore/KoUnit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kofficecore/KoUnit.cpp b/lib/kofficecore/KoUnit.cpp index 3ba89f24b..9068fc940 100644 --- a/lib/kofficecore/KoUnit.cpp +++ b/lib/kofficecore/KoUnit.cpp @@ -114,7 +114,7 @@ double KoUnit::ptToUnit( const double ptValue, const Unit unit ) TQString KoUnit::toUserStringValue( double ptValue, Unit unit ) { - return KGlobal::locale()->formatNumber( toUserValue( ptValue, unit ) ); + return TDEGlobal::locale()->formatNumber( toUserValue( ptValue, unit ) ); } double KoUnit::fromUserValue( double value, Unit unit ) @@ -142,7 +142,7 @@ double KoUnit::fromUserValue( double value, Unit unit ) double KoUnit::fromUserValue( const TQString& value, Unit unit, bool* ok ) { - return fromUserValue( KGlobal::locale()->readNumber( value, ok ), unit ); + return fromUserValue( TDEGlobal::locale()->readNumber( value, ok ), unit ); } double KoUnit::parseValue( TQString value, double defaultVal ) |