Menu
▾
▴
[Krusader-commits] SF.net SVN: krusader: [2708] trunk/krusader_kde4
|
From: <ck...@us...> - 2008-02-03 22:57:50
|
Revision: 2708
http://krusader.svn.sourceforge.net/krusader/?rev=2708&view=rev
Author: ckarai
Date: 2008-02-03 14:57:53 -0800 (Sun, 03 Feb 2008)
Log Message:
-----------
Q3Dict -> QHash, final
FIXED: virtual copyjob overwrite all / skip all
Modified Paths:
--------------
trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp
trunk/krusader_kde4/krusader/Dialogs/popularurls.h
trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp
trunk/krusader_kde4/krusader/KViewer/panelviewer.h
trunk/krusader_kde4/krusader/Panel/krbriefview.cpp
trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp
trunk/krusader_kde4/krusader/Panel/krview.cpp
trunk/krusader_kde4/krusader/Panel/krview.h
trunk/krusader_kde4/krusader/Panel/panelfunc.cpp
trunk/krusader_kde4/krusader/VFS/virtualcopyjob.cpp
trunk/krusader_kde4/krusader/VFS/virtualcopyjob.h
trunk/krusader_kde4/virt/virt.h
Modified: trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp 2008-02-03 00:41:56 UTC (rev 2707)
+++ trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp 2008-02-03 22:57:53 UTC (rev 2708)
@@ -110,14 +110,14 @@
appendNode(pnode);
ranks.insert(tmpurl.url(), head);
} else {
- pnode = ranks.find(tmpurl.url());
- if (!pnode) { // is the added url new? if so, append it
+ if( ranks.find(tmpurl.url()) == ranks.end() ) { // is the added url new? if so, append it
pnode = new UrlNode;
pnode->rank = STARTING_RANK;
pnode->url = tmpurl;
appendNode(pnode);
ranks.insert(tmpurl.url(), pnode);
} else {
+ pnode = ranks[ tmpurl.url() ];
pnode->rank += INCREASE;
}
}
Modified: trunk/krusader_kde4/krusader/Dialogs/popularurls.h
===================================================================
--- trunk/krusader_kde4/krusader/Dialogs/popularurls.h 2008-02-03 00:41:56 UTC (rev 2707)
+++ trunk/krusader_kde4/krusader/Dialogs/popularurls.h 2008-02-03 22:57:53 UTC (rev 2708)
@@ -3,7 +3,7 @@
#include <qobject.h>
#include <kurl.h>
-#include <q3dict.h>
+#include <qhash.h>
#include <kdialog.h>
// the class holds a list of most popular links in a dual data structure
@@ -52,7 +52,7 @@
private:
UrlNodeP head, tail;
- Q3Dict<UrlNode> ranks; // actually holds UrlNode*
+ QHash<QString, UrlNode *> ranks; // actually holds UrlNode*
int count;
static const int maxUrls = 30;
PopularUrlsDlg *dlg;
Modified: trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp
===================================================================
--- trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp 2008-02-03 00:41:56 UTC (rev 2707)
+++ trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp 2008-02-03 22:57:53 UTC (rev 2708)
@@ -5,7 +5,7 @@
#include <kparts/part.h>
#include <kparts/browserextension.h>
#include <kmessagebox.h>
-#include <q3dict.h>
+#include <qhash.h>
#include <qlabel.h>
#include <kmimetype.h>
#include <k3tempfile.h>
@@ -27,9 +27,8 @@
PanelViewerBase::PanelViewerBase( QWidget *parent ) :
QStackedWidget( parent ), mimes( 0 ), cpart( 0 ) {
setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored ) );
-
- mimes = new Q3Dict<KParts::ReadOnlyPart>( DICTSIZE, false );
- mimes->setAutoDelete( true );
+
+ mimes = new QHash<QString, KParts::ReadOnlyPart *>();
cpart = 0;
fallback = new QLabel( i18n( "No file selected or selected file can't be displayed." ), this );
fallback->setAlignment( Qt::AlignCenter | Qt::ExpandTabs | Qt::WordBreak );
@@ -40,6 +39,9 @@
PanelViewerBase::~PanelViewerBase() {
// cpart->queryClose();
closeUrl();
+ QHashIterator< QString, KParts::ReadOnlyPart *> lit( *mimes );
+ while( lit.hasNext() )
+ delete lit.next().value();
mimes->clear();
delete mimes;
delete fallback;
@@ -62,11 +64,12 @@
if( mode == KrViewer::Generic ){
KMimeType::Ptr mt = KMimeType::findByUrl( curl );
cmimetype = mt ? mt->name() : QString();
- cpart = ( *mimes ) [ cmimetype ];
- if ( !cpart ){
+ if( mimes->find( cmimetype ) == mimes->end() ) {
cpart = getPart( cmimetype );
mimes->insert( cmimetype, cpart );
}
+ else
+ cpart = ( *mimes ) [ cmimetype ];
}
K3TempFile tmpFile;
@@ -217,11 +220,12 @@
if( mode == KrViewer::Generic ){
KMimeType::Ptr mt = KMimeType::findByUrl( curl );
cmimetype = mt ? mt->name() : QString();
- cpart = ( *mimes ) [ cmimetype ];
- if ( !cpart ){
+ if( mimes->find( cmimetype ) == mimes->end() ) {
cpart = getPart( cmimetype );
mimes->insert( cmimetype, cpart );
}
+ else
+ cpart = ( *mimes ) [ cmimetype ];
}
if ( !cpart ) cpart = getPart( "text/plain" );
Modified: trunk/krusader_kde4/krusader/KViewer/panelviewer.h
===================================================================
--- trunk/krusader_kde4/krusader/KViewer/panelviewer.h 2008-02-03 00:41:56 UTC (rev 2707)
+++ trunk/krusader_kde4/krusader/KViewer/panelviewer.h 2008-02-03 22:57:53 UTC (rev 2708)
@@ -7,7 +7,7 @@
#include <kparts/part.h>
#include <kio/job.h>
#include <k3tempfile.h>
-#include <q3dict.h>
+#include <qhash.h>
#include <qlabel.h>
#include "krviewer.h"
@@ -35,7 +35,7 @@
void urlChanged( PanelViewerBase *, const KUrl & );
protected:
- Q3Dict<KParts::ReadOnlyPart> *mimes;
+ QHash<QString, KParts::ReadOnlyPart*> *mimes;
KParts::ReadOnlyPart *cpart;
QString cmimetype;
Modified: trunk/krusader_kde4/krusader/Panel/krbriefview.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krbriefview.cpp 2008-02-03 00:41:56 UTC (rev 2707)
+++ trunk/krusader_kde4/krusader/Panel/krbriefview.cpp 2008-02-03 22:57:53 UTC (rev 2708)
@@ -325,9 +325,9 @@
}
void KrBriefView::setCurrentItem( const QString& name ) {
- KrBriefViewItem * it = dynamic_cast<KrBriefViewItem*>(_dict[ name ]);
- if ( it )
- K3IconView::setCurrentItem( it );
+ QHash<QString, KrViewItem*>::iterator itr = _dict.find( name );
+ if ( itr != _dict.end() )
+ K3IconView::setCurrentItem( dynamic_cast<KrBriefViewItem*>( *itr ) );
}
void KrBriefView::clear() {
@@ -602,7 +602,7 @@
K3IconView::contentsMousePressEvent( e );
- if( name.isEmpty() || _dict.find( name ) == 0 ) // is the file still valid?
+ if( name.isEmpty() || _dict.find( name ) == _dict.end() ) // is the file still valid?
newCurrent = 0; // if not, don't do any crash...
} else {
// emitting the missing signals from QIconView::contentsMousePressEvent();
Modified: trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp 2008-02-03 00:41:56 UTC (rev 2707)
+++ trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp 2008-02-03 22:57:53 UTC (rev 2708)
@@ -381,9 +381,9 @@
}
void KrDetailedView::setCurrentItem( const QString& name ) {
- KrDetailedViewItem * it = dynamic_cast<KrDetailedViewItem*>(_dict[ name ]);
- if ( it )
- K3ListView::setCurrentItem( it );
+ QHash<QString, KrViewItem*>::iterator itr = _dict.find( name );
+ if ( itr != _dict.end() )
+ K3ListView::setCurrentItem( dynamic_cast<KrDetailedViewItem*>( *itr ) );
}
void KrDetailedView::clear() {
@@ -691,7 +691,7 @@
K3ListView::contentsMousePressEvent( e );
- if( name.isEmpty() || _dict.find( name ) == 0 ) // is the file still valid?
+ if( name.isEmpty() || _dict.find( name ) == _dict.end() ) // is the file still valid?
newCurrent = 0; // if not, don't do any crash...
} else {
// emitting the missing signals from QListView::contentsMousePressEvent();
Modified: trunk/krusader_kde4/krusader/Panel/krview.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krview.cpp 2008-02-03 00:41:56 UTC (rev 2707)
+++ trunk/krusader_kde4/krusader/Panel/krview.cpp 2008-02-03 22:57:53 UTC (rev 2708)
@@ -243,11 +243,13 @@
}
void KrView::delItem(const QString &name) {
- KrViewItem * it = _dict[ name ];
- if ( !it ) {
- krOut << "got signal deletedVfile(" << name << ") but can't find KrViewItem" << endl;
+ QHash<QString, KrViewItem*>::iterator itr = _dict.find( name );
+ if ( itr == _dict.end() ) {
+ krOut << "got signal deletedVfile(" << name << ") but can't find KrViewItem" << endl;
return;
- }
+ }
+
+ KrViewItem * it = *itr;
if (!preDelItem(it)) return; // do not delete this after all
// remove from dict
@@ -291,11 +293,12 @@
void KrView::updateItem(vfile *vf) {
// since we're deleting the item, make sure we keep
// it's properties first and repair it later
- KrViewItem * it = _dict[ vf->vfile_getName() ];
- if ( !it ) {
+ QHash<QString, KrViewItem*>::iterator itr = _dict.find( vf->vfile_getName() );
+ if ( itr == _dict.end() ) {
krOut << "got signal updatedVfile(" << vf->vfile_getName() << ") but can't find KrViewItem" << endl;
} else {
- bool selected = it->isSelected();
+ KrViewItem * it = *itr;
+ bool selected = it->isSelected();
bool current = ( getCurrentKrViewItem() == it );
delItem( vf->vfile_getName() );
KrViewItem *updatedItem = addItem( vf );
Modified: trunk/krusader_kde4/krusader/Panel/krview.h
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krview.h 2008-02-03 00:41:56 UTC (rev 2707)
+++ trunk/krusader_kde4/krusader/Panel/krview.h 2008-02-03 22:57:53 UTC (rev 2708)
@@ -32,7 +32,7 @@
#include <qpixmap.h>
#include <qvariant.h>
-#include <q3dict.h>
+#include <qhash.h>
#include <QDropEvent>
#include <QList>
#include "../krusader.h"
@@ -239,7 +239,7 @@
bool _left;
KrViewProperties *_properties;
KrViewOperator *_operator;
- Q3Dict<KrViewItem> _dict;
+ QHash<QString, KrViewItem*> _dict;
bool _focused;
QString _nameInKConfig;
};
Modified: trunk/krusader_kde4/krusader/Panel/panelfunc.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/panelfunc.cpp 2008-02-03 00:41:56 UTC (rev 2707)
+++ trunk/krusader_kde4/krusader/Panel/panelfunc.cpp 2008-02-03 22:57:53 UTC (rev 2708)
@@ -451,7 +451,7 @@
if( !virtualBaseURL.isEmpty() ) {
// keep the directory structure for virtual paths
- VirtualCopyJob *vjob = new VirtualCopyJob( &fileNames, files(), dest, virtualBaseURL, pmode, KIO::CopyJob::Move, false, true );
+ VirtualCopyJob *vjob = new VirtualCopyJob( &fileNames, files(), dest, virtualBaseURL, pmode, KIO::CopyJob::Move, true );
connect( vjob, SIGNAL( result( KJob* ) ), this, SLOT( refresh() ) );
if ( dest.equals( panel->otherPanel->virtualPath(), KUrl::CompareWithoutTrailingSlash ) )
connect( vjob, SIGNAL( result( KJob* ) ), panel->otherPanel->func, SLOT( refresh() ) );
@@ -599,7 +599,7 @@
if( !virtualBaseURL.isEmpty() ) {
// keep the directory structure for virtual paths
- VirtualCopyJob *vjob = new VirtualCopyJob( &fileNames, files(), dest, virtualBaseURL, pmode, KIO::CopyJob::Copy, false, true );
+ VirtualCopyJob *vjob = new VirtualCopyJob( &fileNames, files(), dest, virtualBaseURL, pmode, KIO::CopyJob::Copy, true );
connect( vjob, SIGNAL( result( KJob* ) ), this, SLOT( refresh() ) );
if ( dest.equals( panel->otherPanel->virtualPath(), KUrl::CompareWithoutTrailingSlash ) )
connect( vjob, SIGNAL( result( KJob* ) ), panel->otherPanel->func, SLOT( refresh() ) );
Modified: trunk/krusader_kde4/krusader/VFS/virtualcopyjob.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/virtualcopyjob.cpp 2008-02-03 00:41:56 UTC (rev 2707)
+++ trunk/krusader_kde4/krusader/VFS/virtualcopyjob.cpp 2008-02-03 22:57:53 UTC (rev 2708)
@@ -40,12 +40,89 @@
#define REPORT_TIMEOUT 200
+class MyUiDelegate : public KIO::JobUiDelegate {
+public:
+ MyUiDelegate( VirtualCopyJob * ref ) : KIO::JobUiDelegate(), copyJobRef( ref ) {}
+
+ virtual KIO::RenameDialog_Result askFileRename(KJob * job, const QString & caption, const QString& src,
+ const QString & dest, KIO::RenameDialog_Mode mode,
+ QString& newDest, KIO::filesize_t sizeSrc = (KIO::filesize_t) -1,
+ KIO::filesize_t sizeDest = (KIO::filesize_t) -1,
+ time_t ctimeSrc = (time_t) -1, time_t ctimeDest = (time_t) -1,
+ time_t mtimeSrc = (time_t) -1, time_t mtimeDest = (time_t) -1)
+ {
+ if( copyJobRef->isSkipAll() )
+ {
+ if( mode & KIO::M_MULTI )
+ return KIO::R_AUTO_SKIP;
+ else
+ return KIO::R_SKIP;
+ }
+ if( copyJobRef->isOverwriteAll() )
+ {
+ if( mode & KIO::M_MULTI )
+ return KIO::R_OVERWRITE_ALL;
+ else
+ return KIO::R_OVERWRITE;
+ }
+
+ KIO::RenameDialog_Mode mmode = (KIO::RenameDialog_Mode)0;
+ if( copyJobRef->isMulti() )
+ mmode = (KIO::RenameDialog_Mode)( mmode | KIO::M_MULTI | KIO::M_SKIP );
+ else
+ mmode = (KIO::RenameDialog_Mode)( mmode | KIO::M_SINGLE );
+
+ if( mode & KIO::M_OVERWRITE )
+ mmode = (KIO::RenameDialog_Mode)( mmode | KIO::M_OVERWRITE );
+ if( mode & KIO::M_OVERWRITE_ITSELF )
+ mmode = (KIO::RenameDialog_Mode)( mmode | KIO::M_OVERWRITE_ITSELF );
+
+ KIO::RenameDialog_Result res = KIO::JobUiDelegate::askFileRename( job, caption, src, dest, mode, newDest,
+ sizeSrc, sizeDest, ctimeSrc, ctimeDest, mtimeSrc, mtimeDest );
+
+ if( res == KIO::R_AUTO_SKIP ) {
+ copyJobRef->setSkipAll();
+ if( !(mode & KIO::M_MULTI) )
+ res = KIO::R_SKIP;
+ }
+ if( res == KIO::R_OVERWRITE_ALL ) {
+ copyJobRef->setOverwriteAll();
+ if( !(mode & KIO::M_MULTI) )
+ res = KIO::R_OVERWRITE;
+ }
+ return res;
+ }
+
+ virtual KIO::SkipDialog_Result askSkip(KJob * job, bool multi, const QString & error_text)
+ {
+ if( copyJobRef->isSkipAll() )
+ {
+ if( multi )
+ return KIO::S_AUTO_SKIP;
+ else
+ return KIO::S_SKIP;
+ }
+
+ KIO::SkipDialog_Result res = KIO::JobUiDelegate::askSkip( job, copyJobRef->isMulti(), error_text );
+ if( res == KIO::S_AUTO_SKIP ) {
+ copyJobRef->setSkipAll();
+ if( !multi )
+ res = KIO::S_SKIP;
+ }
+
+ return res;
+ }
+
+private:
+ VirtualCopyJob * copyJobRef;
+};
+
VirtualCopyJob::VirtualCopyJob( const QStringList *names, vfs * vfs, const KUrl& dest, const KUrl& baseURL,
- PreserveMode pmode, KIO::CopyJob::CopyMode mode, bool asMethod, bool showProgressInfo ) :
- KIO::Job(), m_totalSize( 0 ), m_totalFiles( 0 ), m_totalSubdirs( 0 ),
+ PreserveMode pmode, KIO::CopyJob::CopyMode mode, bool showProgressInfo ) : KIO::Job(), m_overwriteAll( false ),
+ m_skipAll( false ), m_multi( false ), m_totalSize( 0 ), m_totalFiles( 0 ), m_totalSubdirs( 0 ),
m_processedSize( 0 ), m_processedFiles( 0 ), m_processedSubdirs( 0 ), m_tempSize( 0 ), m_tempFiles( 0 ),
- m_tempSubdirs( 0 ), m_dirsToGetSize(), m_filesToCopy(), m_size(), m_filenum(), m_subdirs(), m_baseURL( baseURL ),
- m_dest( dest ), m_pmode( pmode ), m_mode( mode ), m_asMethod( asMethod ), m_showProgressInfo( showProgressInfo ),
+ m_dirsToGetSize(), m_filesToCopy(), m_size(), m_filenum(), m_subdirs(), m_baseURL( baseURL ),
+ m_dest( dest ), m_pmode( pmode ), m_mode( mode ), m_showProgressInfo( showProgressInfo ),
m_state( ST_STARTING ), m_reportTimer(), m_current(), m_currentDir(), m_dirStack() {
m_dest.adjustPath( KUrl::AddTrailingSlash );
@@ -82,7 +159,7 @@
}
if ( showProgressInfo ) {
- setUiDelegate(new KIO::JobUiDelegate() );
+ setUiDelegate(new MyUiDelegate( this ) );
KIO::getJobTracker()->registerJob(this);
}
@@ -113,7 +190,7 @@
break;
case ST_COPYING:
{
- setProcessedAmount( KJob::Directories, m_processedSubdirs + m_tempSubdirs );
+ setProcessedAmount( KJob::Directories, m_processedSubdirs );
setProcessedAmount( KJob::Files, m_processedFiles + m_tempFiles );
setProcessedAmount( KJob::Bytes, m_processedSize + m_tempSize );
@@ -161,6 +238,9 @@
void VirtualCopyJob::createNextDir() {
m_state = ST_CREATING_DIRECTORY;
+ if( m_totalFiles + m_totalSubdirs > 1 )
+ m_multi = true;
+
QHashIterator<QString, KUrl::List *> diter( m_filesToCopy );
if( !diter.hasNext() ) {
emitResult();
@@ -208,7 +288,24 @@
KUrl url = (static_cast<KIO::SimpleJob*>(job) )->url();
if ( job && job->error() ) {
- job->uiDelegate()->showErrorMessage();
+ if( ui() && !m_skipAll ) {
+ KIO::SkipDialog_Result skipResult = ui()->askSkip( this, m_multi,
+ job->errorString() );
+ switch( skipResult )
+ {
+ case KIO::S_CANCEL:
+ setError( KIO::ERR_USER_CANCELED );
+ emitResult();
+ return;
+ case KIO::S_AUTO_SKIP:
+ m_skipAll = true;
+ break;
+ case KIO::S_SKIP:
+ default:
+ break;
+ }
+ }
+
directoryFinished( m_currentDir );
createNextDir();
return;
@@ -230,18 +327,16 @@
m_state = ST_COPYING;
KIO::CopyJob * copy_job = PreservingCopyJob::createCopyJob( m_pmode, *m_filesToCopy[ m_currentDir ], m_current,
- m_mode, m_asMethod, false );
+ m_mode, false, false );
+ copy_job->setParentJob( this );
+ copy_job->setUiDelegate(new MyUiDelegate( this ) );
connect( copy_job, SIGNAL( copying(KIO::Job *, const KUrl &, const KUrl &) ),
this, SLOT( slotCopying(KIO::Job *, const KUrl &, const KUrl &) ) );
connect( copy_job, SIGNAL( moving(KIO::Job *, const KUrl &, const KUrl &) ),
this, SLOT( slotMoving(KIO::Job *, const KUrl &, const KUrl &) ) );
- connect( copy_job, SIGNAL( creatingDir(KIO::Job *, const KUrl &) ),
- this, SLOT( slotCreatingDir(KIO::Job *, const KUrl &) ) );
connect( copy_job, SIGNAL( processedFiles (KIO::Job *, unsigned long) ),
this, SLOT( slotProcessedFiles (KIO::Job *, unsigned long) ) );
- connect( copy_job, SIGNAL( processedDirs (KIO::Job *, unsigned long) ),
- this, SLOT( slotProcessedDirs (KIO::Job *, unsigned long) ) );
connect( copy_job, SIGNAL( processedSize (KJob *, qulonglong) ),
this, SLOT( slotProcessedSize (KJob *, qulonglong) ) );
connect( copy_job, SIGNAL( result( KJob* ) ), this, SLOT( slotCopyResult( KJob* ) ) );
@@ -249,7 +344,17 @@
void VirtualCopyJob::slotCopyResult( KJob *job ) {
if ( job && job->error() ) {
- job->uiDelegate()->showErrorMessage();
+ setError( job->error() );
+ setErrorText( job->errorText() );
+
+ if( job->error() == KIO::ERR_USER_CANCELED ) {
+ emitResult();
+ return;
+ }
+
+ if( uiDelegate() )
+ uiDelegate()->showErrorMessage();
+ setError( 0 );
}
directoryFinished( m_currentDir );
@@ -264,7 +369,7 @@
m_processedFiles += m_filenum[ name ];
m_processedSubdirs += m_subdirs[ name ];
- m_tempSize = m_tempFiles = m_tempSubdirs = 0;
+ m_tempSize = m_tempFiles = 0;
m_size.remove( name );
m_filenum.remove( name );
@@ -283,17 +388,10 @@
qMakePair(i18n("Destination"), dest.prettyUrl()));
}
-void VirtualCopyJob::slotCreatingDir(KIO::Job *, const KUrl &) {
-}
-
void VirtualCopyJob::slotProcessedFiles (KIO::Job *, unsigned long filenum) {
m_tempFiles = filenum;
}
-void VirtualCopyJob::slotProcessedDirs (KIO::Job *, unsigned long subdirs) {
- m_tempSubdirs = subdirs;
-}
-
void VirtualCopyJob::slotProcessedSize (KJob *, qulonglong size) {
m_tempSize = size;
}
Modified: trunk/krusader_kde4/krusader/VFS/virtualcopyjob.h
===================================================================
--- trunk/krusader_kde4/krusader/VFS/virtualcopyjob.h 2008-02-03 00:41:56 UTC (rev 2707)
+++ trunk/krusader_kde4/krusader/VFS/virtualcopyjob.h 2008-02-03 22:57:53 UTC (rev 2708)
@@ -53,9 +53,15 @@
public:
VirtualCopyJob( const QStringList *names, vfs * vfs, const KUrl& dest, const KUrl& baseURL,
- PreserveMode pmode, KIO::CopyJob::CopyMode mode, bool asMethod, bool showProgressInfo );
+ PreserveMode pmode, KIO::CopyJob::CopyMode mode, bool showProgressInfo );
virtual ~VirtualCopyJob();
+ inline bool isSkipAll() { return m_skipAll; }
+ inline void setSkipAll() { m_skipAll = true; }
+ inline bool isOverwriteAll() { return m_overwriteAll; }
+ inline void setOverwriteAll() { m_overwriteAll = true; }
+ inline bool isMulti() { return m_multi; }
+
protected:
void statNextDir();
void createNextDir();
@@ -73,10 +79,8 @@
void slotCopying(KIO::Job *, const KUrl &, const KUrl &);
void slotMoving(KIO::Job *, const KUrl &, const KUrl &);
- void slotCreatingDir(KIO::Job *, const KUrl &);
- void slotProcessedFiles (KIO::Job *, unsigned long);
- void slotProcessedDirs (KIO::Job *, unsigned long);
+ void slotProcessedFiles (KIO::Job *, unsigned long );
void slotProcessedSize (KJob *, qulonglong);
signals:
@@ -86,6 +90,10 @@
void processedDirs( KIO::Job *job, unsigned long dirs );
private:
+ bool m_overwriteAll;
+ bool m_skipAll;
+ bool m_multi;
+
KIO::filesize_t m_totalSize;
unsigned long m_totalFiles;
unsigned long m_totalSubdirs;
@@ -96,7 +104,6 @@
qulonglong m_tempSize;
unsigned long m_tempFiles;
- unsigned long m_tempSubdirs;
QList<KUrl> m_dirsToGetSize;
@@ -110,7 +117,6 @@
KUrl m_dest;
PreserveMode m_pmode;
KIO::CopyJob::CopyMode m_mode;
- bool m_asMethod;
bool m_showProgressInfo;
State m_state;
Modified: trunk/krusader_kde4/virt/virt.h
===================================================================
--- trunk/krusader_kde4/virt/virt.h 2008-02-03 00:41:56 UTC (rev 2707)
+++ trunk/krusader_kde4/virt/virt.h 2008-02-03 22:57:53 UTC (rev 2708)
@@ -19,7 +19,7 @@
#define _VIRT_H
#include <sys/types.h>
-#include <q3dict.h>
+#include <qhash.h>
#include <QByteArray>
#include <kconfig.h>
#include <kio/slavebase.h>
@@ -46,7 +46,7 @@
bool addDir(QString& path);
- static Q3Dict<KUrl::List> kioVirtDict;
+ static QHash<QString, KUrl::List*> kioVirtDict;
static KConfig* kio_virt_db;
bool rewriteURL(const KUrl&, KUrl&);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|