From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- tdecore/twin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tdecore/twin.cpp') diff --git a/tdecore/twin.cpp b/tdecore/twin.cpp index 63cdc761f..bdd1e099a 100644 --- a/tdecore/twin.cpp +++ b/tdecore/twin.cpp @@ -483,7 +483,7 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) if( XGetClassHint( tqt_xdisplay(), win, &hint ) ) { TQString className = hint.res_class; - TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon( className.lower(), KIcon::Small, iconWidth, + TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon( className.lower(), KIcon::Small, iconWidth, KIcon::DefaultState, 0, true ); if( scale && !pm.isNull() ) result.convertFromImage( TQImage(pm.convertToImage()).smoothScale( width, height ) ); @@ -500,7 +500,7 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) // If the icon is still a null pixmap, load the 'xapp' icon // as a last resort: if ( result.isNull() ) { - TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon( "xapp", KIcon::Small, iconWidth, + TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon( "xapp", KIcon::Small, iconWidth, KIcon::DefaultState, 0, true ); if( scale && !pm.isNull() ) result.convertFromImage( TQImage(pm.convertToImage()).smoothScale( width, height ) ); -- cgit v1.2.1