diff --git a/src/core/copyjob.cpp b/src/core/copyjob.cpp --- a/src/core/copyjob.cpp +++ b/src/core/copyjob.cpp @@ -54,15 +54,15 @@ #include #include #include -#include #include // mode_t #include #include "job_p.h" #include #include #include +#include #include Q_DECLARE_LOGGING_CATEGORY(KIO_COPYJOB_DEBUG) @@ -175,8 +175,8 @@ bool m_bURLDirty; // Used after copying all the files into the dirs, to set mtime (TODO: and permissions?) // after the copy is done - QLinkedList m_directoriesCopied; - QLinkedList::const_iterator m_directoriesCopiedIterator; + std::list m_directoriesCopied; + std::list::const_iterator m_directoriesCopiedIterator; CopyJob::CopyMode m_mode; bool m_asMethod; @@ -1155,7 +1155,7 @@ } else { // no error : remove from list, to move on to next dir //this is required for the undo feature emit q->copyingDone(q, (*it).uSource, finalDestUrl((*it).uSource, (*it).uDest), (*it).mtime, true, false); - m_directoriesCopied.append(*it); + m_directoriesCopied.push_back(*it); dirs.erase(it); } @@ -1774,19 +1774,19 @@ } else { // This step is done, move on state = STATE_SETTING_DIR_ATTRIBUTES; - m_directoriesCopiedIterator = m_directoriesCopied.constBegin(); + m_directoriesCopiedIterator = m_directoriesCopied.cbegin(); setNextDirAttribute(); } } void CopyJobPrivate::setNextDirAttribute() { Q_Q(CopyJob); - while (m_directoriesCopiedIterator != m_directoriesCopied.constEnd() && + while (m_directoriesCopiedIterator != m_directoriesCopied.cend() && !(*m_directoriesCopiedIterator).mtime.isValid()) { ++m_directoriesCopiedIterator; } - if (m_directoriesCopiedIterator != m_directoriesCopied.constEnd()) { + if (m_directoriesCopiedIterator != m_directoriesCopied.cend()) { const QUrl url = (*m_directoriesCopiedIterator).uDest; const QDateTime dt = (*m_directoriesCopiedIterator).mtime; ++m_directoriesCopiedIterator;