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

List:       kde-commits
Subject:    koffice/libs/kofficeui
From:       Ariya Hidayat <ariya () kde ! org>
Date:       2007-01-02 21:41:10
Message-ID: 1167774070.754433.8512.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 619156 by ariya:

adjust to today's API change(s)


 M  +1 -0      KoTemplateChooseDia.h  
 M  +2 -1      KoTemplateCreateDia.cpp  
 M  +5 -5      tktoolbarbutton.cpp  


--- trunk/koffice/libs/kofficeui/KoTemplateChooseDia.h #619155:619156
@@ -24,6 +24,7 @@
 #ifndef koTemplateChooseDia_h
 #define koTemplateChooseDia_h
 
+#include <kinstance.h>
 #include <kpagedialog.h>
 #include <kicondialog.h>
 #include <k3iconview.h>
--- trunk/koffice/libs/kofficeui/KoTemplateCreateDia.cpp #619155:619156
@@ -37,6 +37,7 @@
 #include <QFrame>
 #include <QByteArray>
 
+#include <kapplication.h>
 #include <ktemporaryfile.h>
 #include <klineedit.h>
 #include <k3listview.h>
@@ -394,7 +395,7 @@
         return;
     }
     // ### TODO: do a better remote loading without having to have d->m_tempFile
-    QString path = KGlobal::iconLoader()->iconPath(name, K3Icon::Desktop);
+    QString path = kapp->iconLoader()->iconPath(name, K3Icon::Desktop);
     d->m_customFile = path;
     d->m_customPixmap=QPixmap();
     updatePixmap();
--- trunk/koffice/libs/kofficeui/tktoolbarbutton.cpp #619155:619156
@@ -194,23 +194,23 @@
   d->m_iconName = icon;
   int iconSize = 16;
 
-  setPixmap( BarIcon(icon, iconSize, K3Icon::ActiveState, d->m_instance), false );
-  setDisabledPixmap( BarIcon(icon, iconSize, K3Icon::DisabledState, d->m_instance) );
-  setDefaultPixmap( BarIcon(icon, iconSize, K3Icon::DefaultState, d->m_instance) );
+  setPixmap( KIcon(icon, kapp->iconLoader()).pixmap(iconSize, KIcon::Active) );
+  setDisabledPixmap( KIcon(icon, kapp->iconLoader()).pixmap(iconSize, KIcon::Disabled) );
+  setDefaultPixmap( KIcon(icon, kapp->iconLoader()).pixmap(iconSize, KIcon::Normal) );
 }
 
 void TKToolBarButton::setDisabledIcon( const QString &icon )
 {
   d->m_disabledIconName = icon;
   int iconSize = 16;
-  setDisabledPixmap( BarIcon(icon, iconSize, K3Icon::DisabledState, d->m_instance) );
+  setDisabledPixmap( KIcon(icon, kapp->iconLoader()).pixmap(iconSize, KIcon::Disabled) );
 }
 
 void TKToolBarButton::setDefaultIcon( const QString &icon )
 {
   d->m_defaultIconName = icon;
   int iconSize = 16;
-  setDefaultPixmap( BarIcon(icon, iconSize, K3Icon::DefaultState, d->m_instance) );
+  setDefaultPixmap( KIcon(icon, kapp->iconLoader()).pixmap(iconSize, KIcon::Normal) );
 }
 
 QPixmap TKToolBarButton::getActivePixmap() const
[prev in list] [next in list] [prev in thread] [next in thread]