summaryrefslogtreecommitdiffstats
path: root/kexi/3rdparty/kolibs/koUnit.cc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:23:24 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:23:24 -0600
commit5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch)
treefb31321c80b12ee8e2237bdcf8c228fe44e67772 /kexi/3rdparty/kolibs/koUnit.cc
parentfe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff)
downloadkoffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz
koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kexi/3rdparty/kolibs/koUnit.cc')
-rw-r--r--kexi/3rdparty/kolibs/koUnit.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc
index e8dd16ff..38c8b111 100644
--- a/kexi/3rdparty/kolibs/koUnit.cc
+++ b/kexi/3rdparty/kolibs/koUnit.cc
@@ -116,7 +116,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 )
@@ -144,7 +144,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 )