diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:03 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:03 -0600 |
commit | 2258bd412b615d026e3756ff0f3aa44b61551479 (patch) | |
tree | d605650d77c1fe4aa680407396264cdb229103cb /adept/libadept/desktoplist.cpp | |
parent | ddccba6852223a4675d49beeb5f1e72e264aeeef (diff) | |
download | adept-2258bd412b615d026e3756ff0f3aa44b61551479.tar.gz adept-2258bd412b615d026e3756ff0f3aa44b61551479.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'adept/libadept/desktoplist.cpp')
-rw-r--r-- | adept/libadept/desktoplist.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/adept/libadept/desktoplist.cpp b/adept/libadept/desktoplist.cpp index fe35fcd..8f89f93 100644 --- a/adept/libadept/desktoplist.cpp +++ b/adept/libadept/desktoplist.cpp @@ -74,9 +74,9 @@ void DesktopEntry::showEvent( TQShowEvent *e ) { if ( m_polished ) return; item()->list()->polishing(); kdDebug() << "polish for " << entity().name() << endl; - TQImage icon( KGlobal::iconLoader()->iconPath( entity().icon(), -32, true ) ); + TQImage icon( TDEGlobal::iconLoader()->iconPath( entity().icon(), -32, true ) ); if ( icon.isNull() ) { - icon = TQImage( KGlobal::dirs()->findResource( "desktopicon", entity().icon() ) ); + icon = TQImage( TDEGlobal::dirs()->findResource( "desktopicon", entity().icon() ) ); } m_icon->setPixmap( icon.isNull() ? item()->list()->emptyIcon() : TQPixmap( icon.smoothScale( 32, 32, TQ_ScaleMin ) ) ); @@ -148,7 +148,7 @@ DesktopList::DesktopList( TQWidget *parent, const char *name ) setExtenderHighlight( true ); m_emptyIcon = TQPixmap( TQImage( - KGlobal::iconLoader()->iconPath( u8( "exec" ), -32, false ) + TDEGlobal::iconLoader()->iconPath( u8( "exec" ), -32, false ) ).smoothScale( 32, 32, TQ_ScaleMin ) ); connect( this, TQT_SIGNAL( clicked( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( processClick( TQListViewItem *, const TQPoint &, int ) ) ); |