Merged revisions 618564-620354 via svnmerge from

svn+ssh://hausmann@svn.kde.org/home/kde/trunk/KDE

svn path=/branches/work/kaction-cleanup-branch/KDE/kdemultimedia/juk/; revision=620435

deletedialog.cpp

@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include <kdialog.h>
-#include <kglobal.h>
+#include <KApplication>
 #include <KStandardGuiItem>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -59,12 +59,12 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete)
     if(shouldDelete) {
         ddDeleteText->setText(i18n("<qt>These items will be <b>permanently "
             "deleted</b> from your hard disk.</qt>"));
-        ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning",
+        ddWarningIcon->setPixmap(kapp->iconLoader()->loadIcon("messagebox_warning",
             K3Icon::Desktop, K3Icon::SizeLarge));
     }
     else {
         ddDeleteText->setText(i18n("<qt>These items will be moved to the Trash Bin.</qt>"));
-        ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("trashcan_full",
+        ddWarningIcon->setPixmap(kapp->iconLoader()->loadIcon("trashcan_full",
             K3Icon::Desktop, K3Icon::SizeLarge));
     }
 }