diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /libkonq/konq_pixmapprovider.cc | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkonq/konq_pixmapprovider.cc')
| -rw-r--r-- | libkonq/konq_pixmapprovider.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc index a23ea3ff6..291857887 100644 --- a/libkonq/konq_pixmapprovider.cc +++ b/libkonq/konq_pixmapprovider.cc @@ -176,7 +176,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon // favicon? => blend the favicon in the large if ( url.startsWith( "http:/" ) && icon.startsWith("favicons/") ) { TQPixmap small = SmallIcon( icon, size ); - big = KGlobal::iconLoader()->loadIcon( KProtocolInfo::icon("http"), + big = TDEGlobal::iconLoader()->loadIcon( KProtocolInfo::icon("http"), KIcon::Panel, size ); int x = big.width() - small.width(); @@ -195,7 +195,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon } else // not a favicon.. - big = KGlobal::iconLoader()->loadIcon( icon, KIcon::Panel, size ); + big = TDEGlobal::iconLoader()->loadIcon( icon, KIcon::Panel, size ); return big; } |