[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kicker/extensions/kasbar
From:       Nadeem Hasan <nhasan () kde ! org>
Date:       2005-03-24 17:19:17
Message-ID: 20050324171917.658CD3EE () office ! kde ! org
[Download RAW message or body]

CVS commit by nhasan: 

Simplify life.


  M +2 -2      kasaboutdlg.cpp   1.13
  M +1 -1      kasbar.cpp   1.55
  M +2 -2      kasprefsdlg.cpp   1.34
  M +1 -1      kastaskitem.cpp   1.51


--- kdebase/kicker/extensions/kasbar/kasaboutdlg.cpp  #1.12:1.13
@@ -81,6 +81,6 @@
 #include "version.h"
 
-#define Icon(x) KGlobal::instance()->iconLoader()->loadIcon( x, KIcon::NoGroup, \
                KIcon::SizeMedium )
-#define LargeIcon(x) KGlobal::instance()->iconLoader()->loadIcon( x, KIcon::NoGroup, \
KIcon::SizeLarge ) +#define Icon(x) KGlobal::iconLoader()->loadIcon( x, \
KIcon::NoGroup, KIcon::SizeMedium ) +#define LargeIcon(x) \
KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )  
 KasAboutDialog::KasAboutDialog( QWidget *parent )

--- kdebase/kicker/extensions/kasbar/kasbar.cpp  #1.54:1.55
@@ -718,5 +718,5 @@ void KasBar::addTestItems()
    insert( 0, i );
    i->setText( "Animated" );
-   i->setIcon( KGlobal::instance()->iconLoader()->loadIcon( "icons", KIcon::NoGroup, \
KIcon::SizeMedium ) ); +   i->setIcon( KGlobal::iconLoader()->loadIcon( "icons", \
KIcon::NoGroup, KIcon::SizeMedium ) );  i->setAnimation( \
resources()->startupAnimation() );  QTimer *aniTimer = new QTimer( i );

--- kdebase/kicker/extensions/kasbar/kasprefsdlg.cpp  #1.33:1.34
@@ -76,6 +76,6 @@
 #include "kasprefsdlg.moc"
 
-#define Icon(x) KGlobal::instance()->iconLoader()->loadIcon( x, KIcon::NoGroup, \
                KIcon::SizeMedium )
-#define LargeIcon(x) KGlobal::instance()->iconLoader()->loadIcon( x, KIcon::NoGroup, \
KIcon::SizeLarge ) +#define Icon(x) KGlobal::iconLoader()->loadIcon( x, \
KIcon::NoGroup, KIcon::SizeMedium ) +#define LargeIcon(x) \
KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )  
 

--- kdebase/kicker/extensions/kasbar/kastaskitem.cpp  #1.50:1.51
@@ -86,5 +86,5 @@
 #include "kasbarextension.h"
 
-#define Icon(x) KGlobal::instance()->iconLoader()->loadIcon( x, KIcon::NoGroup, \
KIcon::SizeMedium ) +#define Icon(x) KGlobal::iconLoader()->loadIcon( x, \
KIcon::NoGroup, KIcon::SizeMedium )  
 static const int CHECK_ATTENTION_DELAY = 2000;


[prev in list] [next in list] [prev in thread] [next in thread]