summaryrefslogtreecommitdiffstats
path: root/lib/kofficeui/KoUnitWidgets.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:23:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:23:24 -0600
commit5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch)
treefb31321c80b12ee8e2237bdcf8c228fe44e67772 /lib/kofficeui/KoUnitWidgets.cpp
parentfe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff)
downloadkoffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz
koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficeui/KoUnitWidgets.cpp')
-rw-r--r--lib/kofficeui/KoUnitWidgets.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp
index 2a2c854e..3599c76a 100644
--- a/lib/kofficeui/KoUnitWidgets.cpp
+++ b/lib/kofficeui/KoUnitWidgets.cpp
@@ -90,7 +90,7 @@ KoUnitDoubleValidator::validate( TQString &s, int &pos ) const
TQString KoUnitDoubleBase::getVisibleText( double value ) const
{
- const TQString num ( TQString( "%1%2").arg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
+ const TQString num ( TQString( "%1%2").arg( TDEGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) );
kdDebug(30004) << "getVisibleText: " << TQString::number( value, 'f', 12 ) << " => " << num << endl;
return num;
}
@@ -100,11 +100,11 @@ double KoUnitDoubleBase::toDouble( const TQString& str, bool* ok ) const
TQString str2( str );
/* KLocale::readNumber wants the thousand separator exactly at 1000.
But when editing, it might be anywhere. So we need to remove it. */
- const TQString sep( KGlobal::locale()->thousandsSeparator() );
+ const TQString sep( TDEGlobal::locale()->thousandsSeparator() );
if ( !sep.isEmpty() )
str2.remove( sep );
str2.remove( KoUnit::unitName( m_unit ) );
- const double dbl = KGlobal::locale()->readNumber( str2, ok );
+ const double dbl = TDEGlobal::locale()->readNumber( str2, ok );
if ( ok )
kdDebug(30004) << "toDouble:" << str << ": => :" << str2 << ": => " << TQString::number( dbl, 'f', 12 ) << endl;
else