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 /kspread/kspread_util.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 'kspread/kspread_util.cc')
-rw-r--r-- | kspread/kspread_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kspread/kspread_util.cc b/kspread/kspread_util.cc index ab6871a5..81761bad 100644 --- a/kspread/kspread_util.cc +++ b/kspread/kspread_util.cc @@ -114,7 +114,7 @@ TQDomElement KSpread::util_createElement( const TQString & tagName, const TQFont e.setAttribute( "underline", "yes" ); if ( font.strikeOut() ) e.setAttribute( "strikeout", "yes" ); - //e.setAttribute( "charset", KGlobal::charsets()->name( font ) ); + //e.setAttribute( "charset", TDEGlobal::charsets()->name( font ) ); return e; } @@ -157,11 +157,11 @@ TQFont KSpread::util_toFont( TQDomElement & element ) /* Uncomment when charset is added to kspread_dlg_layout + save a document-global charset if ( element.hasAttribute( "charset" ) ) - KGlobal::charsets()->setTQFont( f, element.attribute("charset") ); + TDEGlobal::charsets()->setTQFont( f, element.attribute("charset") ); else */ // ######## Not needed anymore in 3.0? - //KGlobal::charsets()->setTQFont( f, KGlobal::locale()->charset() ); + //TDEGlobal::charsets()->setTQFont( f, TDEGlobal::locale()->charset() ); return f; } |