diff options
| author | Thomas Preud'homme <robotux@celest.fr> | 2018-02-23 23:49:48 +0000 |
|---|---|---|
| committer | Thomas Preud'homme <robotux@celest.fr> | 2018-02-23 23:49:48 +0000 |
| commit | bd56579c7d9de94c17287adefa118290e6b7ba33 (patch) | |
| tree | 666d7d0b6945b442573b7a3145969f66a53aa460 /plugins/CopyEngine/Ultracopier/ListThread_InodeAction.cpp | |
| parent | b3c8bdcc0d1e4b2ab298847a7902b6d60410a5bc (diff) | |
New upstream version 1.4.0.3
Diffstat (limited to 'plugins/CopyEngine/Ultracopier/ListThread_InodeAction.cpp')
| -rw-r--r-- | plugins/CopyEngine/Ultracopier/ListThread_InodeAction.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/CopyEngine/Ultracopier/ListThread_InodeAction.cpp b/plugins/CopyEngine/Ultracopier/ListThread_InodeAction.cpp index b47fbdf..12421f2 100644 --- a/plugins/CopyEngine/Ultracopier/ListThread_InodeAction.cpp +++ b/plugins/CopyEngine/Ultracopier/ListThread_InodeAction.cpp @@ -9,7 +9,7 @@ ActionToDoInode& currentActionToDoInode=actionToDoListInode[int_for_internal_loo switch(currentActionToDoInode.type) { case ActionType_RealMove: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("launch real move, source: %1, destination: %2").arg(currentActionToDoInode.source.absoluteFilePath()).arg(currentActionToDoInode.destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("launch real move, source: %1, destination: %2").arg(currentActionToDoInode.source.absoluteFilePath()).arg(currentActionToDoInode.destination.absoluteFilePath()).toStdString()); mkPathQueue.addPath(currentActionToDoInode.source.absoluteFilePath(),currentActionToDoInode.destination.absoluteFilePath(),currentActionToDoInode.type); currentActionToDoInode.isRunning=true; numberOfInodeOperation++; @@ -17,7 +17,7 @@ switch(currentActionToDoInode.type) return; break; case ActionType_MkPath: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("launch mkpath, source: %1, destination: %2").arg(currentActionToDoInode.source.absoluteFilePath()).arg(currentActionToDoInode.destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("launch mkpath, source: %1, destination: %2").arg(currentActionToDoInode.source.absoluteFilePath()).arg(currentActionToDoInode.destination.absoluteFilePath()).toStdString()); mkPathQueue.addPath(currentActionToDoInode.source.absoluteFilePath(),currentActionToDoInode.destination.absoluteFilePath(),currentActionToDoInode.type); currentActionToDoInode.isRunning=true; numberOfInodeOperation++; @@ -26,7 +26,7 @@ switch(currentActionToDoInode.type) break; #ifdef ULTRACOPIER_PLUGIN_RSYNC case ActionType_RmSync: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QString("launch rmsync, destination: %1").arg(currentActionToDoInode.destination.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QString("launch rmsync, destination: %1").arg(currentActionToDoInode.destination.absoluteFilePath()).toStdString()); mkPathQueue.addPath(currentActionToDoInode.destination.absoluteFilePath(),currentActionToDoInode.destination.absoluteFilePath(),currentActionToDoInode.type); currentActionToDoInode.isRunning=true; numberOfInodeOperation++; @@ -36,9 +36,9 @@ switch(currentActionToDoInode.type) #endif case ActionType_MovePath: //then empty (no file), can try remove it - if(currentActionToDoInode.size==0 || actionToDoListTransfer.isEmpty())//don't put afterTheTransfer because actionToDoListInode_afterTheTransfer -> already afterTheTransfer + if(currentActionToDoInode.size==0 || actionToDoListTransfer.empty())//don't put afterTheTransfer because actionToDoListInode_afterTheTransfer -> already afterTheTransfer { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("launch rmpath: %1").arg(currentActionToDoInode.source.absoluteFilePath())); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("launch rmpath: %1").arg(currentActionToDoInode.source.absoluteFilePath()).toStdString()); mkPathQueue.addPath(currentActionToDoInode.source.absoluteFilePath(),currentActionToDoInode.destination.absoluteFilePath(),currentActionToDoInode.type); currentActionToDoInode.isRunning=true; numberOfInodeOperation++; @@ -48,8 +48,8 @@ switch(currentActionToDoInode.type) else //have do the destination, put the remove to after { currentActionToDoInode.size=0; - actionToDoListInode_afterTheTransfer << currentActionToDoInode; - actionToDoListInode.removeAt(int_for_internal_loop); + actionToDoListInode_afterTheTransfer.push_back(currentActionToDoInode); + actionToDoListInode.erase(actionToDoListInode.cbegin()+int_for_internal_loop); int_for_internal_loop--; actionToDoListInode_count--; if(numberOfInodeOperation>=inodeThreads) @@ -57,7 +57,7 @@ switch(currentActionToDoInode.type) } break; default: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("Wrong type at inode action")); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Wrong type at inode action"); return; } |