Index: krusader_kde4/krusader/Dialogs/newftpgui.cpp
===================================================================
--- krusader_kde4/krusader/Dialogs/newftpgui.cpp	(revision 2584)
+++ krusader_kde4/krusader/Dialogs/newftpgui.cpp	(working copy)
@@ -29,6 +29,7 @@
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <khistorycombobox.h>
+#include <kconfiggroup.h>
 #include "../krusader.h"
 
 
@@ -61,7 +62,7 @@
     hbox_image->setSpacing( 6 );
     
     PixmapLabel1 = new QLabel( hbox_image, "PixmapLabel1" );
-    PixmapLabel1->setPixmap( krLoader->loadIcon("network", K3Icon::Desktop, 32) );
+    PixmapLabel1->setPixmap( krLoader->loadIcon("network", KIconLoader::Desktop, 32) );
     PixmapLabel1->setSizePolicy( SIZE_MINIMUM );
 
     TextLabel3 = new QLabel( i18n( "About to connect to..."  ), hbox_image, "TextLabel3" );
Index: krusader_kde4/krusader/Dialogs/kurllistrequester.cpp
===================================================================
--- krusader_kde4/krusader/Dialogs/kurllistrequester.cpp	(revision 2584)
+++ krusader_kde4/krusader/Dialogs/kurllistrequester.cpp	(working copy)
@@ -47,8 +47,8 @@
 KURLListRequester::KURLListRequester( QWidget *parent, const char * name ) : QWidget( parent, name )
 {
   KIconLoader *iconLoader = new KIconLoader();
-  QPixmap imageAdd = iconLoader->loadIcon( "1downarrow", K3Icon::Panel, 16 );
-  QPixmap imageFolder = iconLoader->loadIcon( "folder", K3Icon::Panel, 16 );
+  QPixmap imageAdd = iconLoader->loadIcon( "1downarrow", KIconLoader::Panel, 16 );
+  QPixmap imageFolder = iconLoader->loadIcon( "folder", KIconLoader::Panel, 16 );
     
   // Creating the widget
   
Index: krusader_kde4/krusader/Dialogs/checksumdlg.cpp
===================================================================
--- krusader_kde4/krusader/Dialogs/checksumdlg.cpp	(revision 2584)
+++ krusader_kde4/krusader/Dialogs/checksumdlg.cpp	(working copy)
@@ -240,7 +240,7 @@
 	// title (icon+text)	
 	Q3HBoxLayout *hlayout = new Q3HBoxLayout(layout, KDialog::spacingHint());
 	QLabel *p = new QLabel(widget);
-	p->setPixmap(krLoader->loadIcon("binary", K3Icon::Desktop, 32));
+	p->setPixmap(krLoader->loadIcon("binary", KIconLoader::Desktop, 32));
 	hlayout->addWidget(p);
 	QLabel *l1 = new QLabel(i18n("About to calculate checksum for the following files") + 
 		(containFolders ? i18n(" and folders:") : ":"), widget);
@@ -348,7 +348,7 @@
 	// title (icon+text)	
 	Q3HBoxLayout *hlayout = new Q3HBoxLayout(layout, KDialog::spacingHint());
 	QLabel *p = new QLabel(widget);
-	p->setPixmap(krLoader->loadIcon("binary", K3Icon::Desktop, 32));
+	p->setPixmap(krLoader->loadIcon("binary", KIconLoader::Desktop, 32));
 	hlayout->addWidget(p);
 	QLabel *l1 = new QLabel(i18n("About to verify checksum for the following files") +
 		(containFolders ? i18n(" and folders:") : ":"), widget);
@@ -462,7 +462,7 @@
 	// create the icon and title
 	Q3HBoxLayout *hlayout = new Q3HBoxLayout(layout, KDialog::spacingHint());
 	QLabel p(widget);
-	p.setPixmap(krLoader->loadIcon(errors ? "messagebox_critical" : "messagebox_info", K3Icon::Desktop, 32));
+	p.setPixmap(krLoader->loadIcon(errors ? "messagebox_critical" : "messagebox_info", KIconLoader::Desktop, 32));
 	hlayout->addWidget(&p);
 	
 	QLabel *l1 = new QLabel((errors ? i18n("Errors were detected while verifying the checksums") :
@@ -508,7 +508,7 @@
 	// create the icon and title
 	Q3HBoxLayout *hlayout = new Q3HBoxLayout(layout, KDialog::spacingHint());
 	QLabel p(widget);
-	p.setPixmap(krLoader->loadIcon(errors ? "messagebox_critical" : "messagebox_info", K3Icon::Desktop, 32));
+	p.setPixmap(krLoader->loadIcon(errors ? "messagebox_critical" : "messagebox_info", KIconLoader::Desktop, 32));
 	hlayout->addWidget(&p);
 	
 	QLabel *l1 = new QLabel((errors ? i18n("Errors were detected while creating the checksums") :
Index: krusader_kde4/krusader/Dialogs/krprogress.cpp
===================================================================
--- krusader_kde4/krusader/Dialogs/krprogress.cpp	(revision 2584)
+++ krusader_kde4/krusader/Dialogs/krprogress.cpp	(working copy)
@@ -51,8 +51,8 @@
 #ifdef Q_WS_X11 //FIXME(E): Remove once all the KWindowSystem::foo calls have been ported to QWS
   // Set a useful icon for this window!
   KWindowSystem::setIcons( winId(),
-          KIconLoader::global()->loadIcon( "filesave", K3Icon::NoGroup, 32 ),
-          KIconLoader::global()->loadIcon( "filesave", K3Icon::NoGroup, 16 ) );
+          KIconLoader::global()->loadIcon( "filesave", KIconLoader::NoGroup, 32 ),
+          KIconLoader::global()->loadIcon( "filesave", KIconLoader::NoGroup, 16 ) );
 #endif
 
   Q3VBoxLayout *topLayout = new Q3VBoxLayout( this, KDialog::marginHint(),
Index: krusader_kde4/krusader/Dialogs/krspwidgets.cpp
===================================================================
--- krusader_kde4/krusader/Dialogs/krspwidgets.cpp	(revision 2584)
+++ krusader_kde4/krusader/Dialogs/krspwidgets.cpp	(working copy)
@@ -153,7 +153,7 @@
 
 /////////////////////////// KRMaskChoiceSub ///////////////////////////////
 KRMaskChoiceSub::KRMaskChoiceSub() : KRMaskChoice(0,0,true) {
-  PixmapLabel1->setPixmap(krLoader->loadIcon("kr_select", K3Icon::Desktop, 32));
+  PixmapLabel1->setPixmap(krLoader->loadIcon("kr_select", KIconLoader::Desktop, 32));
   label->setText(i18n("Enter a selection:"));
   // the predefined selections list
   KConfigGroup group( krConfig, "Private");
Index: krusader_kde4/krusader/Dialogs/packguibase.cpp
===================================================================
--- krusader_kde4/krusader/Dialogs/packguibase.cpp	(revision 2584)
+++ krusader_kde4/krusader/Dialogs/packguibase.cpp	(working copy)
@@ -119,7 +119,7 @@
     hbox_3->setContentsMargins( 0, 0, 0, 0 );
 
     PixmapLabel1 = new QLabel( this, "PixmapLabel1" );
-    PixmapLabel1->setPixmap( krLoader->loadIcon("package", K3Icon::Desktop, 32) );
+    PixmapLabel1->setPixmap( krLoader->loadIcon("package", KIconLoader::Desktop, 32) );
     PixmapLabel1->setScaledContents( TRUE );
     PixmapLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0 ) );
     hbox_3->addWidget( PixmapLabel1 );
Index: krusader_kde4/krusader/BookMan/krbookmarkbutton.cpp
===================================================================
--- krusader_kde4/krusader/BookMan/krbookmarkbutton.cpp	(revision 2584)
+++ krusader_kde4/krusader/BookMan/krbookmarkbutton.cpp	(working copy)
@@ -9,7 +9,7 @@
 #include <kdebug.h>
 
 KrBookmarkButton::KrBookmarkButton(QWidget *parent): QToolButton(parent) {
-	QPixmap icon = krLoader->loadIcon("bookmark", K3Icon::Toolbar, 16);
+	QPixmap icon = krLoader->loadIcon("bookmark", KIconLoader::Toolbar, 16);
 	setFixedSize(icon.width() + 4, icon.height() + 4);
 	setPixmap(icon);
 	setTextLabel(i18n("BookMan II"), true);
Index: krusader_kde4/krusader/BookMan/krbookmarkhandler.cpp
===================================================================
--- krusader_kde4/krusader/BookMan/krbookmarkhandler.cpp	(revision 2584)
+++ krusader_kde4/krusader/BookMan/krbookmarkhandler.cpp	(working copy)
@@ -282,7 +282,7 @@
 	for (KrBookmark *bm = parent->children().first(); bm; bm = parent->children().next()) {
 		if (!bm->isFolder()) continue;
 		KMenu *newMenu = new KMenu(menu);
-		newMenu->setIcon( QIcon(krLoader->loadIcon(bm->iconName(), K3Icon::Small)) );
+		newMenu->setIcon( QIcon(krLoader->loadIcon(bm->iconName(), KIconLoader::Small)) );
 		newMenu->setTitle( bm->text() );
 		menu->addMenu( newMenu );
 		
@@ -314,7 +314,7 @@
 			// add the popular links submenu
 			KMenu *newMenu = new KMenu(menu);
 			newMenu->setTitle( i18n("Popular URLs") );
-			newMenu->setIcon( QIcon(krLoader->loadIcon("bookmark_folder", K3Icon::Small)) );
+			newMenu->setIcon( QIcon(krLoader->loadIcon("bookmark_folder", KIconLoader::Small)) );
 			QAction *bmfAct  = menu->addMenu( newMenu );
 			_specialBookmarks.append( bmfAct );
 			// add the top 15 urls
@@ -381,10 +381,10 @@
 		if( !hasJumpback )
 			menu->addSeparator();
 		
-		QAction *bmAddAct = menu->addAction(krLoader->loadIcon("bookmark_add", K3Icon::Small),
+		QAction *bmAddAct = menu->addAction(krLoader->loadIcon("bookmark_add", KIconLoader::Small),
 			i18n("Bookmark Current"), this, SLOT( slotBookmarkCurrent() ) );
 		_specialBookmarks.append( bmAddAct );
-		QAction *bmAct = menu->addAction(krLoader->loadIcon("bookmark", K3Icon::Small),
+		QAction *bmAct = menu->addAction(krLoader->loadIcon("bookmark", KIconLoader::Small),
 			i18n("Manage Bookmarks"), manager, SLOT( slotEditBookmarks() ) );
 		_specialBookmarks.append( bmAct );
 	
@@ -517,10 +517,10 @@
 void KrBookmarkHandler::rightClicked( QMenu *menu, KrBookmark * bm ) {
 	Q3PopupMenu popup( _mainBookmarkPopup );
 	
-	popup.insertItem( krLoader->loadIcon( "fileopen", K3Icon::Panel ), i18n( "Open" ), OPEN_ID );
-	popup.insertItem( krLoader->loadIcon( "tab_new", K3Icon::Panel ), i18n( "Open in a new tab" ), OPEN_NEW_TAB_ID );
+	popup.insertItem( krLoader->loadIcon( "fileopen", KIconLoader::Panel ), i18n( "Open" ), OPEN_ID );
+	popup.insertItem( krLoader->loadIcon( "tab_new", KIconLoader::Panel ), i18n( "Open in a new tab" ), OPEN_NEW_TAB_ID );
 	popup.insertSeparator();
-	popup.insertItem( krLoader->loadIcon( "editdelete", K3Icon::Panel ), i18n( "Delete" ), DELETE_ID );
+	popup.insertItem( krLoader->loadIcon( "editdelete", KIconLoader::Panel ), i18n( "Delete" ), DELETE_ID );
 	
 	connect( menu, SIGNAL( highlighted( int ) ), &popup, SLOT( close() ) );
 	connect( menu, SIGNAL( activated( int ) ), &popup, SLOT( close() ) );
Index: krusader_kde4/krusader/BookMan/kraddbookmarkdlg.cpp
===================================================================
--- krusader_kde4/krusader/BookMan/kraddbookmarkdlg.cpp	(revision 2584)
+++ krusader_kde4/krusader/BookMan/kraddbookmarkdlg.cpp	(working copy)
@@ -53,7 +53,7 @@
 	_folder->setReadOnly(true);
 
 	_createInBtn = new QToolButton(page);
-	_createInBtn->setPixmap(krLoader->loadIcon("down", K3Icon::Small));
+	_createInBtn->setPixmap(krLoader->loadIcon("down", KIconLoader::Small));
 	_createInBtn->setToggleButton(true);
 	connect(_createInBtn, SIGNAL(toggled(bool)), this, SLOT(toggleCreateIn(bool )));
 	layout->addWidget(_createInBtn, 2, 2);
@@ -64,7 +64,7 @@
 }
 
 void KrAddBookmarkDlg::toggleCreateIn(bool show) {
-	_createInBtn->setPixmap(krLoader->loadIcon(show ? "up" :"down", K3Icon::Small));
+	_createInBtn->setPixmap(krLoader->loadIcon(show ? "up" :"down", KIconLoader::Small));
 	showButton(KDialog::User1, show);
 	setDetailsWidgetVisible(show);
 }
Index: krusader_kde4/krusader/BookMan/krbookmark.cpp
===================================================================
--- krusader_kde4/krusader/BookMan/krbookmark.cpp	(revision 2584)
+++ krusader_kde4/krusader/BookMan/krbookmark.cpp	(working copy)
@@ -57,7 +57,7 @@
 	if ( !bm )
 	{
 		bm = new KrBookmark ( i18n ( NAME_DEVICES ), KUrl("media:/"), collection );
-		bm->setIconSet ( krLoader->loadIcon ( "blockdevice", K3Icon::Small ) );
+		bm->setIconSet ( krLoader->loadIcon ( "blockdevice", KIconLoader::Small ) );
 	}
 	return bm;
 }
@@ -68,7 +68,7 @@
 	if ( !bm )
 	{
 		bm = new KrBookmark ( i18n ( NAME_VIRTUAL ), KUrl("virt:/"), collection );
-		bm->setIconSet ( krLoader->loadIcon ( "pipe", K3Icon::Small ) );
+		bm->setIconSet ( krLoader->loadIcon ( "pipe", KIconLoader::Small ) );
 	}
 	return bm;
 }
@@ -79,7 +79,7 @@
 	if ( !bm )
 	{
 		bm = new KrBookmark ( i18n ( NAME_LAN ), KUrl("lan:/"), collection );
-		bm->setIconSet ( krLoader->loadIcon ( "network", K3Icon::Small ) );
+		bm->setIconSet ( krLoader->loadIcon ( "network", KIconLoader::Small ) );
 	}
 	return bm;
 }
Index: krusader_kde4/krusader/Synchronizer/synchronizertask.cpp
===================================================================
--- krusader_kde4/krusader/Synchronizer/synchronizertask.cpp	(revision 2584)
+++ krusader_kde4/krusader/Synchronizer/synchronizertask.cpp	(working copy)
@@ -149,8 +149,8 @@
 
     localFileCompareCycle();
   } else {
-    leftReadJob = KIO::get( leftURL, false, false );
-    rightReadJob = KIO::get( rightURL, false, false );
+    leftReadJob = KIO::get( leftURL, KIO::NoReload, KIO::HideProgressInfo );
+    rightReadJob = KIO::get( rightURL, KIO::NoReload, KIO::HideProgressInfo );
 
     connect(leftReadJob, SIGNAL(data(KIO::Job *, const QByteArray &)),
             this, SLOT(slotDataReceived(KIO::Job *, const QByteArray &)));
Index: krusader_kde4/krusader/Synchronizer/synchronizer.cpp
===================================================================
--- krusader_kde4/krusader/Synchronizer/synchronizer.cpp	(revision 2584)
+++ krusader_kde4/krusader/Synchronizer/synchronizer.cpp	(working copy)
@@ -968,15 +968,15 @@
         destURL = KUrl( task->destination() );
 
       if( task->rightLink().isNull() ) {
-        KIO::FileCopyJob *job = KIO::file_copy(rightURL, destURL, -1,
-                                  overWrite || task->overWrite(), false, false );
+        KIO::FileCopyJob *job = KIO::file_copy(rightURL, destURL, -1, 
+		((overWrite || task->overWrite())?KIO::Overwrite:KIO::DefaultFlags) | KIO::HideProgressInfo );
         connect(job,SIGNAL(processedSize (KJob *, qulonglong )), this,
                     SLOT  (slotProcessedSize (KJob *, qulonglong )));
         connect(job,SIGNAL(result(KJob*)),this,SLOT(slotTaskFinished(KJob*)));
         jobMap[ job ] = task;
       } else {
         KIO::SimpleJob *job = KIO::symlink( task->rightLink(), destURL,
-                                            overWrite || task->overWrite(), false );
+		((overWrite || task->overWrite())?KIO::Overwrite:KIO::DefaultFlags) | KIO::HideProgressInfo );
         connect(job,SIGNAL(result(KJob*)),this,SLOT(slotTaskFinished(KJob*)));
         jobMap[ job ] = task;
       }
@@ -998,14 +998,14 @@
 
       if( task->leftLink().isNull() ) {
         KIO::FileCopyJob *job = KIO::file_copy(leftURL, destURL, -1,
-                                  overWrite || task->overWrite(), false, false );
+		((overWrite || task->overWrite())?KIO::Overwrite:KIO::DefaultFlags) | KIO::HideProgressInfo );
         connect(job,SIGNAL(processedSize (KJob *, qulonglong )), this,
                     SLOT  (slotProcessedSize (KJob *, qulonglong )));
         connect(job,SIGNAL(result(KJob*)),this,SLOT(slotTaskFinished(KJob*)));
         jobMap[ job ] = task;
       } else {
         KIO::SimpleJob *job = KIO::symlink( task->leftLink(), destURL,
-                                            overWrite || task->overWrite(), false );
+		((overWrite || task->overWrite())?KIO::Overwrite:KIO::DefaultFlags) | KIO::HideProgressInfo );
         connect(job,SIGNAL(result(KJob*)),this,SLOT(slotTaskFinished(KJob*)));
         jobMap[ job ] = task;
       }
Index: krusader_kde4/krusader/krusader.cpp
===================================================================
--- krusader_kde4/krusader/krusader.cpp	(revision 2584)
+++ krusader_kde4/krusader/krusader.cpp	(working copy)
@@ -362,7 +362,7 @@
    // This enables Krusader to show a tray icon
    sysTray = new KSystemTrayIcon( this );
    // Krusader::privIcon() returns either "krusader_blue" or "krusader_red" if the user got root-privileges
-   sysTray->setIcon( iconLoader->loadIcon( privIcon(), K3Icon::Panel, 22 ) );
+   sysTray->setIcon( iconLoader->loadIcon( privIcon(), KIconLoader::Panel, 22 ) );
    sysTray->hide();
 
    connect( sysTray, SIGNAL( quitSelected() ), this, SLOT( setDirectExit() ) );
Index: krusader_kde4/krusader/Splitter/combiner.cpp
===================================================================
--- krusader_kde4/krusader/Splitter/combiner.cpp	(revision 2584)
+++ krusader_kde4/krusader/Splitter/combiner.cpp	(working copy)
@@ -85,7 +85,7 @@
   {
     permissions = file.permissions() | QFileInfo::WriteUser;
     
-    combineReadJob = KIO::get( splURL, false, false );
+    combineReadJob = KIO::get( splURL, KIO::NoReload, KIO::HideProgressInfo );
 
     connect(combineReadJob, SIGNAL(data(KIO::Job *, const QByteArray &)),
             this, SLOT(combineSplitFileDataReceived(KIO::Job *, const QByteArray &)));
@@ -195,7 +195,7 @@
   }
 
       /* creating a write job */
-  combineReadJob = KIO::get( readURL, false, false );
+  combineReadJob = KIO::get( readURL, KIO::NoReload, KIO::HideProgressInfo );
 
   connect(combineReadJob, SIGNAL(data(KIO::Job *, const QByteArray &)),
           this, SLOT(combineDataReceived(KIO::Job *, const QByteArray &)));
@@ -226,7 +226,7 @@
     else if( unixNaming )
       writeURL.setFileName( baseURL.fileName() + ".out" );
     
-    combineWriteJob = KIO::put( writeURL, permissions, true, false, false );    
+    combineWriteJob = KIO::put( writeURL, permissions, KIO::HideProgressInfo | KIO::Overwrite );
 
     connect(combineWriteJob, SIGNAL(dataReq(KIO::Job *, QByteArray &)),
                              this, SLOT(combineDataSend(KIO::Job *, QByteArray &)));
Index: krusader_kde4/krusader/Splitter/splitter.cpp
===================================================================
--- krusader_kde4/krusader/Splitter/splitter.cpp	(revision 2584)
+++ krusader_kde4/krusader/Splitter/splitter.cpp	(working copy)
@@ -78,7 +78,7 @@
   fileSize = 0;
   fileNumber = 0;
 
-  splitReadJob = KIO::get( fileName, false, false );
+  splitReadJob = KIO::get( fileName, KIO::NoReload, KIO::HideProgressInfo );
     
   connect(splitReadJob, SIGNAL(data(KIO::Job *, const QByteArray &)),
                         this, SLOT(splitDataReceived(KIO::Job *, const QByteArray &)));
@@ -150,7 +150,7 @@
   writeURL.addPath( outFileName );
 
       /* creating a write job */
-  splitWriteJob = KIO::put( writeURL, permissions, true, false, false );
+  splitWriteJob = KIO::put( writeURL, permissions, KIO::HideProgressInfo | KIO::Overwrite );
   outputFileSize = 0;
   connect(splitWriteJob, SIGNAL(dataReq(KIO::Job *, QByteArray &)),
                          this, SLOT(splitDataSend(KIO::Job *, QByteArray &)));
@@ -210,7 +210,7 @@
       /* writing the split information file out */
     writeURL      = destinationDir;
     writeURL.addPath( fileName.fileName() + ".crc" );
-    splitWriteJob = KIO::put( writeURL, permissions, true, false, false );
+    splitWriteJob = KIO::put( writeURL, permissions, KIO::HideProgressInfo | KIO::Overwrite );
     connect(splitWriteJob, SIGNAL(dataReq(KIO::Job *, QByteArray &)),
                            this, SLOT(splitFileSend(KIO::Job *, QByteArray &)));
     connect(splitWriteJob, SIGNAL(result(KJob*)),
Index: krusader_kde4/krusader/Konfigurator/krresulttabledialog.cpp
===================================================================
--- krusader_kde4/krusader/Konfigurator/krresulttabledialog.cpp	(revision 2584)
+++ krusader_kde4/krusader/Konfigurator/krresulttabledialog.cpp	(working copy)
@@ -54,7 +54,7 @@
   // prepare the icon
   _iconBox = new Q3HBox(_page, "_iconBox");
   _iconLabel = new QLabel(_iconBox, "iconLabel");
-  _iconLabel->setPixmap(krLoader->loadIcon(headerIcon, K3Icon::Desktop, 32));
+  _iconLabel->setPixmap(krLoader->loadIcon(headerIcon, KIconLoader::Desktop, 32));
   _iconLabel->setMinimumWidth(fontMetrics().maxWidth()*20);
   _iconLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
   _iconLabel->setFixedSize( _iconLabel->sizeHint() );
Index: krusader_kde4/krusader/Konfigurator/kggeneral.cpp
===================================================================
--- krusader_kde4/krusader/Konfigurator/kggeneral.cpp	(revision 2584)
+++ krusader_kde4/krusader/Konfigurator/kggeneral.cpp	(working copy)
@@ -121,13 +121,13 @@
   int size = QFontMetrics( atomLabel->font() ).height();
 
   QToolButton *addButton = new QToolButton( hbox3, "addBtnList" );
-  QPixmap icon = krLoader->loadIcon("add",K3Icon::Desktop, size );
+  QPixmap icon = krLoader->loadIcon("add",KIconLoader::Desktop, size );
   addButton->setFixedSize( icon.width() + 4, icon.height() + 4 );
   addButton->setPixmap( icon );
   connect( addButton, SIGNAL( clicked() ), this, SLOT( slotAddExtension() ) );
 
   QToolButton *removeButton = new QToolButton( hbox3, "removeBtnList" );
-  icon = krLoader->loadIcon("remove",K3Icon::Desktop, size );
+  icon = krLoader->loadIcon("remove",KIconLoader::Desktop, size );
   removeButton->setFixedSize( icon.width() + 4, icon.height() + 4 );
   removeButton->setPixmap( icon );
   connect( removeButton, SIGNAL( clicked() ), this, SLOT( slotRemoveExtension() ) );
Index: krusader_kde4/krusader/Konfigurator/kgprotocols.cpp
===================================================================
--- krusader_kde4/krusader/Konfigurator/kgprotocols.cpp	(revision 2584)
+++ krusader_kde4/krusader/Konfigurator/kgprotocols.cpp	(working copy)
@@ -84,10 +84,10 @@
   
   addSpacer( vbox1 );
   btnAddProtocol = new QPushButton( vbox1, "btnAddProtocolButton" );
-  btnAddProtocol->setPixmap( krLoader->loadIcon( "1leftarrow", K3Icon::Small ) );
+  btnAddProtocol->setPixmap( krLoader->loadIcon( "1leftarrow", KIconLoader::Small ) );
   Q3WhatsThis::add( btnAddProtocol, i18n( "Add protocol to the link list." ) );
   btnRemoveProtocol = new QPushButton( vbox1, "btnRemoveProtocolButton" );
-  btnRemoveProtocol->setPixmap( krLoader->loadIcon( "1rightarrow", K3Icon::Small ) );
+  btnRemoveProtocol->setPixmap( krLoader->loadIcon( "1rightarrow", KIconLoader::Small ) );
   Q3WhatsThis::add( btnRemoveProtocol, i18n( "Remove protocol from the link list." ) );
   addSpacer( vbox1 );
   
@@ -97,10 +97,10 @@
   
   addSpacer( vbox2 );
   btnAddMime = new QPushButton( vbox2, "btnAddMimeButton" );
-  btnAddMime->setPixmap( krLoader->loadIcon( "1leftarrow", K3Icon::Small ) );
+  btnAddMime->setPixmap( krLoader->loadIcon( "1leftarrow", KIconLoader::Small ) );
   Q3WhatsThis::add( btnAddMime, i18n( "Add mime to the selected protocol on the link list." ) );
   btnRemoveMime = new QPushButton( vbox2, "btnRemoveMimeButton" );
-  btnRemoveMime->setPixmap( krLoader->loadIcon( "1rightarrow", K3Icon::Small ) );
+  btnRemoveMime->setPixmap( krLoader->loadIcon( "1rightarrow", KIconLoader::Small ) );
   Q3WhatsThis::add( btnRemoveMime, i18n( "Remove mime from the link list." ) );
   addSpacer( vbox2 );
   
@@ -212,7 +212,7 @@
   {
     protocolList->removeItem( protocolList->index( item ) );
     Q3ListViewItem *listViewItem = new Q3ListViewItem( linkList, name );
-    listViewItem->setPixmap( 0, krLoader->loadIcon( "exec", K3Icon::Small ) );
+    listViewItem->setPixmap( 0, krLoader->loadIcon( "exec", KIconLoader::Small ) );
     
     if( changeCurrent )
       linkList->setCurrentItem( listViewItem );
@@ -268,7 +268,7 @@
   {
     mimeList->removeItem( mimeList->index( item ) );
     Q3ListViewItem *listViewItem = new Q3ListViewItem( currentListItem, name );
-    listViewItem->setPixmap( 0, krLoader->loadIcon( "mime", K3Icon::Small ) );
+    listViewItem->setPixmap( 0, krLoader->loadIcon( "mime", KIconLoader::Small ) );
     currentListItem->setOpen( true );
   }
 }
Index: krusader_kde4/krusader/kicons.h
===================================================================
--- krusader_kde4/krusader/kicons.h	(revision 2584)
+++ krusader_kde4/krusader/kicons.h	(working copy)
@@ -7,11 +7,11 @@
 #include <kicontheme.h>
 
 // can be used everywhere - EXCEPT in KFileList related calls, loads the icon according to
-// K3Icon::Desktop settings and resizes it to a smaller size. If this is used to toolbuttons,
+// KIconLoader::Desktop settings and resizes it to a smaller size. If this is used to toolbuttons,
 // the the icon is resized again to fit into the toolbutton or menu.
 // IMPORTANT: this SHOULD NOT BE USED for actions. If creating an action, just state the file-name
 // of the icon to allow automatic resizing when needed.
-#define LOADICON(X) QIcon(krLoader->loadIcon(X,K3Icon::Desktop)).pixmap(QIcon::Small,true)
+#define LOADICON(X) QIcon(krLoader->loadIcon(X,KIconLoader::Desktop)).pixmap(QIcon::Small,true)
 
 // used only for calls within the kfilelist framework, handles icon sizes
 QPixmap FL_LOADICON(QString name);
Index: krusader_kde4/krusader/VFS/virt_vfs.cpp
===================================================================
--- krusader_kde4/krusader/VFS/virt_vfs.cpp	(revision 2584)
+++ krusader_kde4/krusader/VFS/virt_vfs.cpp	(working copy)
@@ -123,10 +123,10 @@
 	// delete of move to trash ?
 	KConfigGroup group( krConfig, "General" );
 	if ( group.readEntry( "Move To Trash", _MoveToTrash ) ) {
-		job = KIO::trash( filesUrls, true );
+		job = KIO::trash( filesUrls );
 		connect( job, SIGNAL( result( KJob* ) ), krApp, SLOT( changeTrashIcon() ) );
 	} else
-		job = KIO::del( filesUrls, false, true );
+		job = KIO::del( filesUrls );
 
 	// refresh will remove the deleted files...
 	connect( job, SIGNAL( result( KJob* ) ), this, SLOT( vfs_refresh( KJob* ) ) );
@@ -202,7 +202,7 @@
 	// so we don't have to worry if the job was successful
 	virtVfsDict[ path ] ->append( dest );
 
-	KIO::Job *job = KIO::move( fileUrls, dest, true );
+	KIO::Job *job = KIO::move( fileUrls, dest );
 	connect( job, SIGNAL( result( KJob* ) ), this, SLOT( vfs_refresh( KJob* ) ) );
 }
 
@@ -280,7 +280,8 @@
 
 KConfig*  virt_vfs::getVirtDB(){
 	if( !virt_vfs_db ){
-		virt_vfs_db = new KConfig("data",VIRT_VFS_DB,KConfig::NoGlobals);
+//		virt_vfs_db = new KConfig("data",VIRT_VFS_DB,KConfig::NoGlobals);
+		virt_vfs_db = new KConfig(VIRT_VFS_DB, KConfig:: CascadeConfig, "data");
 	}
 	return virt_vfs_db; 
 }
Index: krusader_kde4/krusader/VFS/ftp_vfs.cpp
===================================================================
--- krusader_kde4/krusader/VFS/ftp_vfs.cpp	(revision 2584)
+++ krusader_kde4/krusader/VFS/ftp_vfs.cpp	(working copy)
@@ -218,11 +218,11 @@
 	KIO::Job* job = 0;
 	switch( mode ) {
 	case KIO::CopyJob::Copy:
-		job = KIO::copy( *fileUrls, destUrl, true );
+		job = KIO::copy( *fileUrls, destUrl );
 	case KIO::CopyJob::Move:
-		job = KIO::move( *fileUrls, destUrl, true );
+		job = KIO::move( *fileUrls, destUrl );
 	case KIO::CopyJob::Link:
-		job = KIO::link( *fileUrls, destUrl, true );
+		job = KIO::link( *fileUrls, destUrl );
 	}
 
 	connect( job, SIGNAL( result( KJob* ) ), this, SLOT( vfs_refresh( KJob* ) ) );
@@ -242,7 +242,7 @@
 		url.addPath( filename );
 		filesUrls.append( url );
 	}
-	KIO::Job *job = KIO::del( filesUrls, false, true );
+	KIO::Job *job = KIO::del( filesUrls );
 	connect( job, SIGNAL( result( KJob* ) ), this, SLOT( vfs_refresh( KJob* ) ) );
 }
 
Index: krusader_kde4/krusader/VFS/krquery.cpp
===================================================================
--- krusader_kde4/krusader/VFS/krquery.cpp	(revision 2584)
+++ krusader_kde4/krusader/VFS/krquery.cpp	(working copy)
@@ -387,7 +387,7 @@
 
 bool KRQuery::containsContent( KUrl url ) const
 {
-  KIO::TransferJob *contentReader = KIO::get( url, false, false );
+  KIO::TransferJob *contentReader = KIO::get( url, KIO::NoReload, KIO::HideProgressInfo );
   connect(contentReader, SIGNAL(data(KIO::Job *, const QByteArray &)),
           this, SLOT(containsContentData(KIO::Job *, const QByteArray &)));
   connect(contentReader, SIGNAL( result( KIO::Job* ) ),
Index: krusader_kde4/krusader/VFS/normal_vfs.cpp
===================================================================
--- krusader_kde4/krusader/VFS/normal_vfs.cpp	(revision 2584)
+++ krusader_kde4/krusader/VFS/normal_vfs.cpp	(working copy)
@@ -185,11 +185,11 @@
 	// delete of move to trash ?
 	KConfigGroup group( krConfig, "General");
 	if( group.readEntry("Move To Trash",_MoveToTrash) ){
-	  job = KIO::trash(filesUrls, true );
+	  job = KIO::trash(filesUrls);
 	  connect(job,SIGNAL(result(KJob*)),SLOTS,SLOT(changeTrashIcon()));
 	}
 	else
-	  job = KIO::del(filesUrls, false, true);
+	  job = KIO::del(filesUrls);
 	
 	connect(job,SIGNAL(result(KJob*)),this,SLOT(vfs_refresh(KJob*)));
 }
@@ -231,7 +231,7 @@
   fileUrls.append(url);
   dest.setPath(vfs_workingDir()+"/"+newName);
 
-  KIO::Job *job = KIO::move(fileUrls,dest, true );
+  KIO::Job *job = KIO::move(fileUrls,dest);
   connect(job,SIGNAL(result(KJob*)),this,SLOT(vfs_refresh(KJob*)));
 }
 
Index: krusader_kde4/krusader/VFS/preservingcopyjob.cpp
===================================================================
--- krusader_kde4/krusader/VFS/preservingcopyjob.cpp	(revision 2584)
+++ krusader_kde4/krusader/VFS/preservingcopyjob.cpp	(working copy)
@@ -347,11 +347,11 @@
 {
   switch( mode ) {
     case KIO::CopyJob::Copy:
-        return KIO::copy( src, dest, showProgressInfo );
+        return KIO::copy( src, dest, showProgressInfo?KIO::DefaultFlags:KIO::HideProgressInfo );
     case KIO::CopyJob::Move:
-        return KIO::move( src, dest, showProgressInfo );
+        return KIO::move( src, dest, showProgressInfo?KIO::DefaultFlags:KIO::HideProgressInfo );
     case KIO::CopyJob::Link:
-        return KIO::link( src, dest, showProgressInfo );
+        return KIO::link( src, dest, showProgressInfo?KIO::DefaultFlags:KIO::HideProgressInfo );
     default:
       return 0;
   }
Index: krusader_kde4/krusader/krusader.h
===================================================================
--- krusader_kde4/krusader/krusader.h	(revision 2584)
+++ krusader_kde4/krusader/krusader.h	(working copy)
@@ -43,6 +43,7 @@
 #include <kstandardaction.h>
 #include <kaction.h>
 #include <kconfig.h>
+#include <kconfiggroup.h>
 #include <qstringlist.h>
 #include <q3textstream.h>
 //Added by qt3to4:
Index: krusader_kde4/krusader/DiskUsage/filelightParts/Config.cpp
===================================================================
--- krusader_kde4/krusader/DiskUsage/filelightParts/Config.cpp	(revision 2584)
+++ krusader_kde4/krusader/DiskUsage/filelightParts/Config.cpp	(working copy)
@@ -3,6 +3,7 @@
 #include <kconfig.h>
 #include <kglobal.h>
 #include <ksharedconfig.h>
+#include <kconfiggroup.h>
 
 
 bool Config::varyLabelFontSizes = true;
Index: krusader_kde4/krusader/DiskUsage/radialMap/segmentTip.cpp
===================================================================
--- krusader_kde4/krusader/DiskUsage/radialMap/segmentTip.cpp	(revision 2584)
+++ krusader_kde4/krusader/DiskUsage/radialMap/segmentTip.cpp	(working copy)
@@ -8,7 +8,6 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
-#include <kpixmapeffect.h>
 #include <qpainter.h>
 #include <qtooltip.h>        //for its palette
 //Added by qt3to4:
@@ -69,7 +68,9 @@
     paint.drawRect( rect() );
     paint.end();
 
-  m_pixmap = KPixmapEffect::fade( m_pixmap, 0.6, QToolTip::palette().color( QPalette::Active, QPalette::Window ) );
+#if 0 // TODO: PORTME
+  m_pixmap = KImageEffect::fade( m_pixmap, 0.6, QToolTip::palette().color( QPalette::Active, QPalette::Window ) );
+#endif
 
   paint.begin( &m_pixmap );
   paint.drawText( rect(), Qt::AlignCenter, m_text );
Index: krusader_kde4/krusader/DiskUsage/radialMap/widgetEvents.cpp
===================================================================
--- krusader_kde4/krusader/DiskUsage/radialMap/widgetEvents.cpp	(revision 2584)
+++ krusader_kde4/krusader/DiskUsage/radialMap/widgetEvents.cpp	(working copy)
@@ -220,12 +220,16 @@
 
          if( !isDir || e->button() == Qt::MidButton )
          {
+#if 0 // TODO: PORTME
             KIconEffect::visualActivate( this, rect );
+#endif
             new KRun( url, this, true ); //FIXME see above
          }
          else if( m_focus->file() != m_tree ) //is left mouse button
          {
+#if 0 // TODO: PORTME
             KIconEffect::visualActivate( this, rect );
+#endif
             emit activated( url ); //activate first, this will cause UI to prepare itself
             if( m_focus )
               createFromCache( (Directory *)m_focus->file() );
Index: krusader_kde4/krusader/DiskUsage/radialMap/map.cpp
===================================================================
--- krusader_kde4/krusader/DiskUsage/radialMap/map.cpp	(revision 2584)
+++ krusader_kde4/krusader/DiskUsage/radialMap/map.cpp	(working copy)
@@ -3,7 +3,7 @@
 
 #include <kcursor.h>         //make()
 #include <kglobalsettings.h> //kdeColours
-#include <kimageeffect.h>    //desaturate()
+#include <kiconeffect.h>     //desaturate()
 #include <qapplication.h>    //make()
 #include <qimage.h>          //make() & paint()
 #include <qfont.h>           //ctor
@@ -48,8 +48,8 @@
     {
         QImage img = this->convertToImage();
 
-        KImageEffect::desaturate( img, 0.7 );
-        KImageEffect::toGray( img, true );
+        KIconEffect::deSaturate( img, 0.7 );
+        KIconEffect::toGray( img, true );
 
         this->convertFromImage( img );
     }
Index: krusader_kde4/krusader/DiskUsage/diskusage.cpp
===================================================================
--- krusader_kde4/krusader/DiskUsage/diskusage.cpp	(revision 2584)
+++ krusader_kde4/krusader/DiskUsage/diskusage.cpp	(working copy)
@@ -650,12 +650,12 @@
 
   if( trash )
   {
-    job = KIO::trash( url, true );
+    job = KIO::trash( url );
     connect(job,SIGNAL(result(KJob*)),krApp,SLOT(changeTrashIcon()));
   }
   else
   {
-    job = KIO::del( KUrl( file->fullPath() ), false, false);
+    job = KIO::del( KUrl( file->fullPath() ), KIO::HideProgressInfo);
   }
 
   deleting = true;    // during qApp->processEvent strange things can occur
Index: krusader_kde4/krusader/DiskUsage/diskusagegui.cpp
===================================================================
--- krusader_kde4/krusader/DiskUsage/diskusagegui.cpp	(revision 2584)
+++ krusader_kde4/krusader/DiskUsage/diskusagegui.cpp	(working copy)
@@ -61,32 +61,32 @@
   duTools->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
     
   btnNewSearch = new QToolButton( duTools, "btnNewSearch" );
-  btnNewSearch->setIconSet( QIcon(krLoader->loadIcon("fileopen",K3Icon::Desktop)) );
+  btnNewSearch->setIconSet( QIcon(krLoader->loadIcon("fileopen",KIconLoader::Desktop)) );
   QToolTip::add( btnNewSearch, i18n( "Start new disk usage search" ) );
   
   btnRefresh = new QToolButton( duTools, "btnRefresh" );
-  btnRefresh->setIconSet( QIcon(krLoader->loadIcon("reload",K3Icon::Desktop)) );
+  btnRefresh->setIconSet( QIcon(krLoader->loadIcon("reload",KIconLoader::Desktop)) );
   QToolTip::add( btnRefresh, i18n( "Refresh" ) );
 
   btnDirUp = new QToolButton( duTools, "btnDirUp" );
-  btnDirUp->setIconSet( QIcon(krLoader->loadIcon("up",K3Icon::Desktop)) );
+  btnDirUp->setIconSet( QIcon(krLoader->loadIcon("up",KIconLoader::Desktop)) );
   QToolTip::add( btnDirUp, i18n( "Parent directory" ) );
   
   QWidget * separatorWidget = new QWidget( duTools, "separatorWidget" );
   separatorWidget->setMinimumWidth( 10 );
   
   btnLines = new QToolButton( duTools, "btnLines" );
-  btnLines->setIconSet( QIcon(krLoader->loadIcon("leftjust",K3Icon::Desktop)) );
+  btnLines->setIconSet( QIcon(krLoader->loadIcon("leftjust",KIconLoader::Desktop)) );
   btnLines->setToggleButton( true );
   QToolTip::add( btnLines, i18n( "Line view" ) );
 
   btnDetailed = new QToolButton( duTools, "btnDetailed" );
-  btnDetailed->setIconSet( QIcon(krLoader->loadIcon("view_detailed",K3Icon::Desktop)) );
+  btnDetailed->setIconSet( QIcon(krLoader->loadIcon("view_detailed",KIconLoader::Desktop)) );
   btnDetailed->setToggleButton( true );
   QToolTip::add( btnDetailed, i18n( "Detailed view" ) );
 
   btnFilelight = new QToolButton( duTools, "btnFilelight" );
-  btnFilelight->setIconSet( QIcon(krLoader->loadIcon("kr_diskusage",K3Icon::Desktop)) );
+  btnFilelight->setIconSet( QIcon(krLoader->loadIcon("kr_diskusage",KIconLoader::Desktop)) );
   btnFilelight->setToggleButton( true );
   QToolTip::add( btnFilelight, i18n( "Filelight view" ) );
     
Index: krusader_kde4/krusader/GUI/mediabutton.cpp
===================================================================
--- krusader_kde4/krusader/GUI/mediabutton.cpp	(revision 2584)
+++ krusader_kde4/krusader/GUI/mediabutton.cpp	(working copy)
@@ -79,7 +79,7 @@
 		popupMenu( 0 ), rightMenu( 0 ), hasMedia( false ), waitingForMount( -1 ), mountCheckerTimer()
 	 {
 	KIconLoader * iconLoader = new KIconLoader();
-	QPixmap icon = iconLoader->loadIcon( "blockdevice", K3Icon::Toolbar, 16 );
+	QPixmap icon = iconLoader->loadIcon( "blockdevice", KIconLoader::Toolbar, 16 );
 
 	setFixedSize( icon.width() + 4, icon.height() + 4 );
 	setPixmap( icon );
Index: krusader_kde4/krusader/GUI/krremoteencodingmenu.cpp
===================================================================
--- krusader_kde4/krusader/GUI/krremoteencodingmenu.cpp	(revision 2584)
+++ krusader_kde4/krusader/GUI/krremoteencodingmenu.cpp	(working copy)
@@ -178,8 +178,10 @@
 //    kDebug() << k_funcinfo << "Domain to remove: " << *it << endl;
       if (config.hasGroup(*it))
         config.deleteGroup(*it);
+#if 0 // TODO: PORTME
       else if (config.hasKey(*it))
         KConfigGroup( &config, QString() ).deleteEntry(*it);
+#endif
     }
   }
   config.sync();
Index: krusader_kde4/krusader/GUI/syncbrowsebutton.cpp
===================================================================
--- krusader_kde4/krusader/GUI/syncbrowsebutton.cpp	(revision 2584)
+++ krusader_kde4/krusader/GUI/syncbrowsebutton.cpp	(working copy)
@@ -35,8 +35,8 @@
 SyncBrowseButton::SyncBrowseButton(QWidget *parent, const char *name) : QToolButton(parent,name)
 {
   KIconLoader *iconLoader = new KIconLoader();
-  _icon_on = iconLoader->loadIcon( "kr_syncbrowse_on", K3Icon::Toolbar, 16 );
-  _icon_off = iconLoader->loadIcon( "kr_syncbrowse_off", K3Icon::Toolbar, 16 );
+  _icon_on = iconLoader->loadIcon( "kr_syncbrowse_on", KIconLoader::Toolbar, 16 );
+  _icon_off = iconLoader->loadIcon( "kr_syncbrowse_off", KIconLoader::Toolbar, 16 );
 
   setFixedSize( _icon_off.width() + 4, _icon_off.height() + 4 );
   setPixmap( _icon_off );
Index: krusader_kde4/krusader/GUI/profilemanager.cpp
===================================================================
--- krusader_kde4/krusader/GUI/profilemanager.cpp	(revision 2584)
+++ krusader_kde4/krusader/GUI/profilemanager.cpp	(working copy)
@@ -43,7 +43,7 @@
 {
   setText( "" );
   KIconLoader *iconLoader = new KIconLoader();
-  setPixmap( iconLoader->loadIcon( "kr_profile", K3Icon::Toolbar, 16 ) );
+  setPixmap( iconLoader->loadIcon( "kr_profile", KIconLoader::Toolbar, 16 ) );
   QToolTip::add( this, i18n( "Profiles" ) );
   
   this->profileType = profileType;
Index: krusader_kde4/krusader/GUI/dirhistorybutton.cpp
===================================================================
--- krusader_kde4/krusader/GUI/dirhistorybutton.cpp	(revision 2584)
+++ krusader_kde4/krusader/GUI/dirhistorybutton.cpp	(working copy)
@@ -30,7 +30,7 @@
 
 DirHistoryButton::DirHistoryButton( DirHistoryQueue* hQ, QWidget *parent, const char *name ) : QToolButton( parent, name ) {
 	KIconLoader * iconLoader = new KIconLoader();
-	QPixmap icon = iconLoader->loadIcon( "history", K3Icon::Toolbar, 16 );
+	QPixmap icon = iconLoader->loadIcon( "history", KIconLoader::Toolbar, 16 );
 
 	setFixedSize( icon.width() + 4, icon.height() + 4 );
 	setPixmap( icon );
Index: krusader_kde4/krusader/Filter/advancedfilter.cpp
===================================================================
--- krusader_kde4/krusader/Filter/advancedfilter.cpp	(revision 2584)
+++ krusader_kde4/krusader/Filter/advancedfilter.cpp	(working copy)
@@ -113,7 +113,7 @@
 
 	// Options for date
 
-	QPixmap iconDate = krLoader->loadIcon ( "date", K3Icon::Toolbar, 16 );
+	QPixmap iconDate = krLoader->loadIcon ( "date", KIconLoader::Toolbar, 16 );
 
 	Q3ButtonGroup *dateGroup = new Q3ButtonGroup ( this, "dateGroup" );
 	dateGroup->setTitle ( i18n ( "Date" ) );
Index: krusader_kde4/krusader/ActionMan/useractionlistview.cpp
===================================================================
--- krusader_kde4/krusader/ActionMan/useractionlistview.cpp	(revision 2584)
+++ krusader_kde4/krusader/ActionMan/useractionlistview.cpp	(working copy)
@@ -217,7 +217,7 @@
       return;
 
    if ( ! _action->icon().isNull() )
-      setPixmap( COL_TITLE, KIconLoader::global()->loadIcon( _action->iconName(), K3Icon::Small ) );
+      setPixmap( COL_TITLE, KIconLoader::global()->loadIcon( _action->iconName(), KIconLoader::Small ) );
    setText( COL_TITLE, _action->text() );
    setText( COL_NAME, _action->name() );
 }
Index: krusader_kde4/krusader/ActionMan/useractionpage.cpp
===================================================================
--- krusader_kde4/krusader/ActionMan/useractionpage.cpp	(revision 2584)
+++ krusader_kde4/krusader/ActionMan/useractionpage.cpp	(working copy)
@@ -32,7 +32,7 @@
 #include "../UserAction/kraction.h"
 #include "../krusader.h"
 
-#define ICON(N)		KIconLoader::global()->loadIcon(N, K3Icon::Toolbar)
+#define ICON(N)		KIconLoader::global()->loadIcon(N, KIconLoader::Toolbar)
 //This is the filter in the KFileDialog of Import/Export:
 static const char* FILE_FILTER = I18N_NOOP("*.xml|xml-files\n*|all files");
 
Index: krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp
===================================================================
--- krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp	(revision 2584)
+++ krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp	(working copy)
@@ -358,7 +358,7 @@
    _lineEdit = new KLineEdit( hbox );
    _button = new QToolButton( hbox);
    KIconLoader *iconLoader = new KIconLoader();
-  _button->setPixmap( iconLoader->loadIcon( "fileopen", K3Icon::Toolbar, 16 ) );
+  _button->setPixmap( iconLoader->loadIcon( "fileopen", KIconLoader::Toolbar, 16 ) );
    connect( _button, SIGNAL(clicked()), this, SLOT(addFile()) );
 }
 
@@ -450,7 +450,7 @@
    _lineEdit->setCompletionObject( new KUrlCompletion( KUrlCompletion::DirCompletion ) );
    _dirButton = new QToolButton( hbox );
    KIconLoader *iconLoader = new KIconLoader();
-  _dirButton->setPixmap( iconLoader->loadIcon( "fileopen", K3Icon::Toolbar, 16 ) );
+  _dirButton->setPixmap( iconLoader->loadIcon( "fileopen", KIconLoader::Toolbar, 16 ) );
    connect( _dirButton, SIGNAL(clicked()), this, SLOT(setDir()) );
    _placeholderButton = new QToolButton( hbox);
    _placeholderButton->setText( i18n("add") );
Index: krusader_kde4/krusader/ActionMan/actionproperty.cpp
===================================================================
--- krusader_kde4/krusader/ActionMan/actionproperty.cpp	(revision 2584)
+++ krusader_kde4/krusader/ActionMan/actionproperty.cpp	(working copy)
@@ -34,7 +34,7 @@
 #include <ktextedit.h>
 #include <kiconloader.h>
 
-#define ICON(N)		KIconLoader::global()->loadIcon(N, K3Icon::Small)
+#define ICON(N)		KIconLoader::global()->loadIcon(N, KIconLoader::Small)
 
 ActionProperty::ActionProperty( QWidget *parent, const char *name, KrAction *action )
  : Ui_ActionPropertyBase(parent, name), _modified(false)
Index: krusader_kde4/krusader/Panel/krpopupmenu.cpp
===================================================================
--- krusader_kde4/krusader/Panel/krpopupmenu.cpp	(revision 2584)
+++ krusader_kde4/krusader/Panel/krpopupmenu.cpp	(working copy)
@@ -72,7 +72,7 @@
       if ( vf->vfile_isDir() ) {
          QAction * openTab = addAction( i18n( "Open in New Tab" ) );
          openTab->setData( QVariant( OPEN_TAB_ID ) );
-         openTab->setIcon( krLoader->loadIcon( "tab_new", K3Icon::Panel ) );
+         openTab->setIcon( krLoader->loadIcon( "tab_new", KIconLoader::Panel ) );
          openTab->setText( i18n( "Open in New Tab" ) );
       }
       addSeparator();
@@ -105,12 +105,12 @@
       for ( int i = 0; i < offers.count(); ++i ) {
          KSharedPtr<KService> service = offers[ i ];
          if ( service->isValid() && service->isApplication() ) {
-            openWith.addAction( krLoader->loadIcon( service->icon(), K3Icon::Small ), service->name() )->setData( QVariant( SERVICE_LIST_ID + i ) );
+            openWith.addAction( krLoader->loadIcon( service->icon(), KIconLoader::Small ), service->name() )->setData( QVariant( SERVICE_LIST_ID + i ) );
          }
       }
       openWith.addSeparator();
       if ( vf->vfile_isDir() )
-         openWith.addAction( krLoader->loadIcon( "konsole", K3Icon::Small ), i18n( "Terminal" ))->setData( QVariant( OPEN_TERM_ID ) );
+         openWith.addAction( krLoader->loadIcon( "konsole", KIconLoader::Small ), i18n( "Terminal" ))->setData( QVariant( OPEN_TERM_ID ) );
       openWith.addAction( i18n( "Other..." ) )->setData( QVariant( CHOOSE_ID ) );
       QAction *owAct = addMenu( &openWith );
       owAct->setData( QVariant( OPEN_WITH_ID ) );
@@ -124,7 +124,7 @@
    for ( KrViewItemList::Iterator it = items.begin(); it != items.end(); ++it ) {
 		vfile *file = panel->func->files()->vfs_search(((*it)->name()));
 		KUrl url = file->vfile_getUrl();
-		_items.append( new KFileItem( url,  file->vfile_getMime(), file->vfile_getMode() ) );
+		_items.append( KFileItem( url,  file->vfile_getMime(), file->vfile_getMode() ) );
    }
    
 #ifdef __LIBKONQ__
@@ -216,8 +216,6 @@
 }
 
 KrPopupMenu::~KrPopupMenu() {
-	for( int i=0; i != _items.count(); i++ )
-		delete _items[ i ];
 	_items.clear();
 	if (actions) delete actions;
 #ifdef __LIBKONQ__
@@ -230,8 +228,8 @@
 }
 
 void KrPopupMenu::addCreateNewMenu() {
-	createNewPopup.addAction( krLoader->loadIcon( "folder", K3Icon::Small ), i18n("Folder...") )->setData( QVariant( MKDIR_ID) );
-	createNewPopup.addAction( krLoader->loadIcon( "txt", K3Icon::Small ), i18n("Text File...") )->setData( QVariant( NEW_TEXT_FILE_ID) );
+	createNewPopup.addAction( krLoader->loadIcon( "folder", KIconLoader::Small ), i18n("Folder...") )->setData( QVariant( MKDIR_ID) );
+	createNewPopup.addAction( krLoader->loadIcon( "txt", KIconLoader::Small ), i18n("Text File...") )->setData( QVariant( NEW_TEXT_FILE_ID) );
 	
 	QAction *newAct = addMenu( &createNewPopup );
 	newAct->setData( QVariant( CREATE_NEW_ID) );
Index: krusader_kde4/krusader/Panel/listpanel.cpp
===================================================================
--- krusader_kde4/krusader/Panel/listpanel.cpp	(revision 2584)
+++ krusader_kde4/krusader/Panel/listpanel.cpp	(working copy)
@@ -180,13 +180,13 @@
 	// a cancel button for the inplace refresh mechanism
 	inlineRefreshCancelButton = new KPushButton(this);
 	inlineRefreshCancelButton->setFixedSize( 22, 20 );
-	inlineRefreshCancelButton->setPixmap(krLoader->loadIcon("cancel", K3Icon::Toolbar, 16));
+	inlineRefreshCancelButton->setPixmap(krLoader->loadIcon("cancel", KIconLoader::Toolbar, 16));
 	connect(inlineRefreshCancelButton, SIGNAL(clicked()), this, SLOT(inlineRefreshCancel()));
 
 	// a quick button to open the popup panel
 	popupBtn = new QToolButton( this, "popupbtn" );
 	popupBtn->setFixedSize( 22, 20 );
-	popupBtn->setPixmap(krLoader->loadIcon("1uparrow", K3Icon::Toolbar, 16));
+	popupBtn->setPixmap(krLoader->loadIcon("1uparrow", KIconLoader::Toolbar, 16));
 	connect(popupBtn, SIGNAL(clicked()), this, SLOT(togglePanelPopup()));
 	QToolTip::add(  popupBtn, i18n( "Open the popup panel" ) );
 	totalsLayout->addWidget(totals);
@@ -205,7 +205,7 @@
 	bool clearButton = group.readEntry("Clear Location Bar Visible", _ClearLocation);
 	if (clearButton){
 		clearOrigin = new QToolButton(hbox, "clearorigin");
-		clearOrigin->setPixmap(krLoader->loadIcon("locationbar_erase", K3Icon::Toolbar, 16));
+		clearOrigin->setPixmap(krLoader->loadIcon("locationbar_erase", KIconLoader::Toolbar, 16));
 		QToolTip::add(  clearOrigin, i18n( "Clear the location bar" ) );
 	}
 	
@@ -408,13 +408,13 @@
 		}
 		
 		popup->show();
-		popupBtn->setPixmap(krLoader->loadIcon("1downarrow", K3Icon::Toolbar, 16));
+		popupBtn->setPixmap(krLoader->loadIcon("1downarrow", KIconLoader::Toolbar, 16));
 		QToolTip::add(  popupBtn, i18n( "Close the popup panel" ) );
 	} else {
 		popupSizes.clear();
 		popupSizes = dynamic_cast<QSplitter*>(popup->parent())->sizes();
 		popup->hide();
-		popupBtn->setPixmap(krLoader->loadIcon("1uparrow", K3Icon::Toolbar, 16));
+		popupBtn->setPixmap(krLoader->loadIcon("1uparrow", KIconLoader::Toolbar, 16));
 		QToolTip::add(  popupBtn, i18n( "Open the popup panel" ) );
 		
 		Q3ValueList<int> lst;
Index: krusader_kde4/krusader/Panel/panelfunc.cpp
===================================================================
--- krusader_kde4/krusader/Panel/panelfunc.cpp	(revision 2584)
+++ krusader_kde4/krusader/Panel/panelfunc.cpp	(working copy)
@@ -851,7 +851,7 @@
 
 	// copy from the temp file to it's right place
 	if ( tempDestFile ) {
-		KIO::NetAccess::file_move( KUrl( arcFile ), destURL );
+		KIO::NetAccess::move( KUrl( arcFile ), destURL );
 		delete tempDestFile;
 	}
 
@@ -1081,7 +1081,7 @@
 		if ( !vf )
 			continue;
 		KUrl url = files()->vfs_getFile( names[i] );
-		fi.push_back( new KFileItem( vf->vfile_getEntry(), url ) );
+		fi.push_back( KFileItem( vf->vfile_getEntry(), url ) );
 	}
 
 	if ( fi.isEmpty() )
@@ -1091,8 +1091,6 @@
 	KPropertiesDialog *dlg = new KPropertiesDialog( fi, krApp );
 	connect( dlg, SIGNAL( applied() ), SLOTS, SLOT( refresh() ) );
 	
-	while (!fi.isEmpty())
-		delete fi.takeFirst();
 }
 
 void ListPanelFunc::refreshActions() {
Index: krusader_kde4/krusader/Panel/panelpopup.cpp
===================================================================
--- krusader_kde4/krusader/Panel/panelpopup.cpp	(revision 2584)
+++ krusader_kde4/krusader/Panel/panelpopup.cpp	(working copy)
@@ -72,7 +72,7 @@
 	
 	treeBtn = new QToolButton(this);
 	QToolTip::add(treeBtn, i18n("Tree Panel: a tree view of the local file system"));
-	treeBtn->setPixmap(krLoader->loadIcon( "view_tree", K3Icon::Toolbar, 16 ));
+	treeBtn->setPixmap(krLoader->loadIcon( "view_tree", KIconLoader::Toolbar, 16 ));
 	treeBtn->setFixedSize(20, 20);
 	treeBtn->setToggleButton(true);
 	btns->insert(treeBtn, Tree);
@@ -80,28 +80,28 @@
 	
 	previewBtn = new QToolButton(this);
 	QToolTip::add(previewBtn, i18n("Preview Panel: display a preview of the current file"));
-	previewBtn->setPixmap(krLoader->loadIcon( "thumbnail", K3Icon::Toolbar, 16 ));
+	previewBtn->setPixmap(krLoader->loadIcon( "thumbnail", KIconLoader::Toolbar, 16 ));
 	previewBtn->setFixedSize(20, 20);
 	previewBtn->setToggleButton(true);
 	btns->insert(previewBtn, Preview);
 	
 	quickBtn = new QToolButton(this);
 	QToolTip::add(quickBtn, i18n("Quick Panel: quick way to perform actions"));
-	quickBtn->setPixmap(krLoader->loadIcon( "misc", K3Icon::Toolbar, 16 ));
+	quickBtn->setPixmap(krLoader->loadIcon( "misc", KIconLoader::Toolbar, 16 ));
 	quickBtn->setFixedSize(20, 20);
 	quickBtn->setToggleButton(true);
 	btns->insert(quickBtn, QuickPanel);
 
 	viewerBtn = new QToolButton(this);
 	QToolTip::add(viewerBtn, i18n("View Panel: view the current file"));
-	viewerBtn->setPixmap(krLoader->loadIcon( "viewmag", K3Icon::Toolbar, 16 ));
+	viewerBtn->setPixmap(krLoader->loadIcon( "viewmag", KIconLoader::Toolbar, 16 ));
 	viewerBtn->setFixedSize(20, 20);
 	viewerBtn->setToggleButton(true);
 	btns->insert(viewerBtn, View);	
 		
 	duBtn = new QToolButton(this);
 	QToolTip::add(duBtn, i18n("Disk Usage Panel: view the usage of a directory"));
-	duBtn->setPixmap(krLoader->loadIcon( "kr_diskusage", K3Icon::Toolbar, 16 ));
+	duBtn->setPixmap(krLoader->loadIcon( "kr_diskusage", KIconLoader::Toolbar, 16 ));
 	duBtn->setFixedSize(20, 20);
 	duBtn->setToggleButton(true);
 	btns->insert(duBtn, DskUsage);	
@@ -174,19 +174,19 @@
 		this, SLOT(quickSelect(const QString& )));
 	
 	QToolButton *qselectBtn = new QToolButton(quickPanel);
-	qselectBtn->setPixmap(krLoader->loadIcon( "kr_selectall", K3Icon::Toolbar, 16 ));
+	qselectBtn->setPixmap(krLoader->loadIcon( "kr_selectall", KIconLoader::Toolbar, 16 ));
 	qselectBtn->setFixedSize(20, 20);
 	QToolTip::add( qselectBtn, i18n("apply the selection") );
 	connect(qselectBtn, SIGNAL(clicked()), this, SLOT(quickSelect()));
 
 	QToolButton *qstoreBtn = new QToolButton(quickPanel);
-	qstoreBtn->setPixmap(krLoader->loadIcon( "filesave", K3Icon::Toolbar, 16 ));
+	qstoreBtn->setPixmap(krLoader->loadIcon( "filesave", KIconLoader::Toolbar, 16 ));
 	qstoreBtn->setFixedSize(20, 20);
 	QToolTip::add( qstoreBtn, i18n("store the current selection") );
 	connect(qstoreBtn, SIGNAL(clicked()), this, SLOT(quickSelectStore()));
 	
 	QToolButton *qsettingsBtn = new QToolButton(quickPanel);
-	qsettingsBtn->setPixmap(krLoader->loadIcon( "configure", K3Icon::Toolbar, 16 ));
+	qsettingsBtn->setPixmap(krLoader->loadIcon( "configure", KIconLoader::Toolbar, 16 ));
 	qsettingsBtn->setFixedSize(20, 20);
 	QToolTip::add( qsettingsBtn, i18n("select group dialog") );
 	connect(qsettingsBtn, SIGNAL(clicked()), krSelect, SLOT(trigger()));
@@ -389,13 +389,13 @@
 	KIO::CopyJob *job;
    switch ( result ) {
          case 1 :
-			job = KIO::copy(lst, dest, true);
+			job = KIO::copy(lst, dest);
          break;
          case 2 :
-			job = KIO::move(lst, dest, true);
+			job = KIO::move(lst, dest);
          break;
          case 3 :
-			job = KIO::link(lst, dest, true);
+			job = KIO::link(lst, dest);
          break;
          case - 1 :         // user pressed outside the menu
          case 4:
Index: krusader_kde4/krusader/kicons.cpp
===================================================================
--- krusader_kde4/krusader/kicons.cpp	(revision 2584)
+++ krusader_kde4/krusader/kicons.cpp	(working copy)
@@ -39,9 +39,9 @@
   KConfigGroup group( krConfig, "Look&Feel");
   int size = (group.readEntry("Filelist Icon Size",_FilelistIconSize)).toInt();
   if (size!=22)
-    return krLoader->loadIcon(name,K3Icon::Desktop,size);
+    return krLoader->loadIcon(name,KIconLoader::Desktop,size);
   // else implied
-  return QIcon(krLoader->loadIcon(name,K3Icon::Desktop,32)).pixmap(QIcon::Small,true);
+  return QIcon(krLoader->loadIcon(name,KIconLoader::Desktop,32)).pixmap(QIcon::Small,true);
 }
 
 const char * no_xpm[] = {
Index: krusader_kde4/krusader/KViewer/krviewer.cpp
===================================================================
--- krusader_kde4/krusader/KViewer/krviewer.cpp	(revision 2584)
+++ krusader_kde4/krusader/KViewer/krviewer.cpp	(working copy)
@@ -308,7 +308,7 @@
 	KUrl url = pvb->url();
 	setCaption( msg+": " + url.prettyUrl() );
 
-	QIcon icon = QIcon(krLoader->loadIcon(iconName,K3Icon::Small));
+	QIcon icon = QIcon(krLoader->loadIcon(iconName,KIconLoader::Small));
 
 	manager.addPart( part, this );
 	manager.setActivePart( part );
@@ -460,7 +460,7 @@
 		QString label = tabBar.tabText( tabBar.indexOf( pvb ) );
 		if( !label.startsWith("*" + pvb->part()->url().fileName() ) ){
 			label.prepend("*");
-			QIcon icon = QIcon(krLoader->loadIcon(MODIFIED_ICON,K3Icon::Small));
+			QIcon icon = QIcon(krLoader->loadIcon(MODIFIED_ICON,KIconLoader::Small));
 
 			tabBar.changeTab(pvb,icon,label);
 		}
@@ -470,7 +470,7 @@
 		QString label = tabBar.tabText( tabBar.indexOf( pvb ) );
 		if( label.startsWith("*" + pvb->part()->url().fileName() ) ){
 			label = label.mid( 1 );
-			QIcon icon = QIcon(krLoader->loadIcon(EDIT_ICON,K3Icon::Small));
+			QIcon icon = QIcon(krLoader->loadIcon(EDIT_ICON,KIconLoader::Small));
 
 			tabBar.changeTab(pvb,icon,label);
 		}		
Index: krusader_kde4/krusader/KViewer/kimagefilepreview.cpp
===================================================================
--- krusader_kde4/krusader/KViewer/kimagefilepreview.cpp	(revision 2584)
+++ krusader_kde4/krusader/KViewer/kimagefilepreview.cpp	(working copy)
@@ -115,8 +115,8 @@
 	if ( item->isDir() )
 		imageLabel->clear();
 	else if ( item->url() == currentURL )   // should always be the case
-		imageLabel->setPixmap( SmallIcon( "file_broken", K3Icon::SizeLarge,
-		                                  K3Icon::DisabledState ) );
+		imageLabel->setPixmap( SmallIcon( "file_broken", KIconLoader::SizeLarge,
+		                                  KIconLoader::DisabledState ) );
 }
 
 void KrusaderImageFilePreview::slotResult( KJob *job ) {
Index: krusader_kde4/iso/kiso.cpp
===================================================================
--- krusader_kde4/iso/kiso.cpp	(revision 2584)
+++ krusader_kde4/iso/kiso.cpp	(working copy)
@@ -36,6 +36,7 @@
 #include <kconfig.h>
 #include <kfilterdev.h>
 #include <kfilterbase.h>
+#include <kconfiggroup.h>
 
 #include "kiso.h"
 #include "libisofs/isofs.h"
Index: krusader_kde4/iso/iso.cpp
===================================================================
--- krusader_kde4/iso/iso.cpp	(revision 2584)
+++ krusader_kde4/iso/iso.cpp	(working copy)
@@ -205,7 +205,7 @@
                   isoEntry->isFile() ? ((KIsoFile *)isoEntry)->cdate() :
                                        ((KIsoDirectory *)isoEntry)->cdate() );
 
-    entry.insert( UDSEntry::UDS_LINK_DEST, isoEntry->symlink() );
+    entry.insert( UDSEntry::UDS_LINK_DEST, isoEntry->symLinkTarget() );
 }
 
 void kio_isoProtocol::listDir( const KUrl & url )
@@ -499,10 +499,10 @@
     }
 
     const KIsoFile* isoFileEntry = static_cast<const KIsoFile *>(isoEntry);
-    if ( !isoEntry->symlink().isEmpty() )
+    if ( !isoEntry->symLinkTarget().isEmpty() )
     {
-      kDebug() << "Redirection to " << isoEntry->symlink() << endl;
-      KUrl realURL( url, isoEntry->symlink() );
+      kDebug() << "Redirection to " << isoEntry->symLinkTarget() << endl;
+      KUrl realURL( url, isoEntry->symLinkTarget() );
       kDebug() << "realURL= " << realURL.url() << endl;
       redirection( realURL.url() );
       finished();
Index: krusader_kde4/krArc/krarc.h
===================================================================
--- krusader_kde4/krArc/krarc.h	(revision 2584)
+++ krusader_kde4/krArc/krarc.h	(working copy)
@@ -27,6 +27,7 @@
 #include <kio/global.h>
 #include <kio/slavebase.h>
 #include <k3process.h>
+#include <kconfiggroup.h>
 
 class K3Process;
 class KFileItem;