diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:23:24 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:23:24 -0600 |
commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /karbon/karbon_part.cc | |
parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'karbon/karbon_part.cc')
-rw-r--r-- | karbon/karbon_part.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc index 955b21f5..c4dc2041 100644 --- a/karbon/karbon_part.cc +++ b/karbon/karbon_part.cc @@ -635,7 +635,7 @@ KarbonPart::initConfig() undos = config->readNumEntry( "UndoRedo", -1 ); TQString defaultUnit = "cm"; - if( KGlobal::locale()->measureSystem() == KLocale::Imperial ) + if( TDEGlobal::locale()->measureSystem() == KLocale::Imperial ) defaultUnit = "in"; setUnit( KoUnit::unit( config->readEntry( "Units", defaultUnit ) ) ); |