From de9b6c9ad15f9f51812daae17cce635d1050a9ba Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:14:55 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- ksysguard/gui/SensorBrowser.cc | 6 +++--- ksysguard/gui/SensorDisplayLib/ProcessList.cc | 10 +++++----- ksysguard/gui/SensorDisplayLib/SensorDisplay.cc | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'ksysguard/gui') diff --git a/ksysguard/gui/SensorBrowser.cc b/ksysguard/gui/SensorBrowser.cc index c3c8bcb10..b0c898e16 100644 --- a/ksysguard/gui/SensorBrowser.cc +++ b/ksysguard/gui/SensorBrowser.cc @@ -128,7 +128,7 @@ void SensorBrowser::update() TQString hostName = mSensorManager->hostName( host ); HostItem* lvi = new HostItem( this, hostName, id, host ); - TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( "computer", KIcon::Desktop, KIcon::SizeSmall ); + TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( "computer", TDEIcon::Desktop, TDEIcon::SizeSmall ); lvi->setPixmap( 0, pix ); HostInfo* hostInfo = new HostInfo( id, host, hostName, lvi ); @@ -214,8 +214,8 @@ void SensorBrowser::answerReceived( int id, const TQString &answer ) if ( !found ) { TQListViewItem* lvi = new TQListViewItem( parent, name ); if ( j == absolutePath.count() - 1 ) { - TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( "ksysguardd", KIcon::Desktop, - KIcon::SizeSmall ); + TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( "ksysguardd", TDEIcon::Desktop, + TDEIcon::SizeSmall ); lvi->setPixmap( 0, pix ); lvi->setText( 1, KSGRD::SensorMgr->translateSensorType( sensorType ) ); diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index 507e57927..d151486e5 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -613,16 +613,16 @@ ProcessList::addProcess(KSGRD::SensorPSLine* p, ProcessLVI* pli) TQPixmap pix; if (!iconCache[name]) { - pix = TDEGlobal::iconLoader()->loadIcon(name, KIcon::Small, - KIcon::SizeSmall, KIcon::DefaultState, + pix = TDEGlobal::iconLoader()->loadIcon(name, TDEIcon::Small, + TDEIcon::SizeSmall, TDEIcon::DefaultState, 0L, true); if (pix.isNull() || !pix.mask()) - pix = TDEGlobal::iconLoader()->loadIcon("unknownapp", KIcon::User, - KIcon::SizeSmall); + pix = TDEGlobal::iconLoader()->loadIcon("unknownapp", TDEIcon::User, + TDEIcon::SizeSmall); if (pix.width() != 16 || pix.height() != 16) { - /* I guess this isn't needed too often. The KIconLoader should + /* I guess this isn't needed too often. The TDEIconLoader should * scale the pixmaps already appropriately. Since I got a bug * report claiming that it doesn't work with GNOME apps I've * added this safeguard. */ diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc index 593dcb00a..c6650b77f 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc @@ -439,8 +439,8 @@ void SensorDisplay::setSensorOk( bool ok ) if ( mErrorIndicator ) return; - TQPixmap errorIcon = TDEGlobal::iconLoader()->loadIcon( "connect_creating", KIcon::Desktop, - KIcon::SizeSmall ); + TQPixmap errorIcon = TDEGlobal::iconLoader()->loadIcon( "connect_creating", TDEIcon::Desktop, + TDEIcon::SizeSmall ); if ( !mPlotterWdg ) return; -- cgit v1.2.1