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 /karbon/karbon_resourceserver.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_resourceserver.cc')
| -rw-r--r-- | karbon/karbon_resourceserver.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/karbon/karbon_resourceserver.cc b/karbon/karbon_resourceserver.cc index 6348865c..3e96adcf 100644 --- a/karbon/karbon_resourceserver.cc +++ b/karbon/karbon_resourceserver.cc @@ -497,7 +497,7 @@ KarbonResourceServer::cachePixmap( const TQString &key, int group_or_size ) TQPixmap *result = 0L; if( !( result = m_pixmaps[ key ] ) ) { - result = new TQPixmap( KGlobal::iconLoader()->iconPath( key, group_or_size ) ); + result = new TQPixmap( TDEGlobal::iconLoader()->iconPath( key, group_or_size ) ); m_pixmaps.insert( key, result ); } return result; |