[ark] kerfuffle: Merge branch 'gsoc2016/master'

[Elvis Angelaccio]

Git commit 4d0eaefcf59f7b191bf4a1f740817a8bee3c4395 by Elvis Angelaccio.
Committed on 09/09/2016 at 13:56.
Pushed by elvisangelaccio into branch 'master'.

Merge branch 'gsoc2016/master'

This commit merges the work done by Vladyslav Batyrenko during the Google
Summer of Code 2016 program.

Cut, copy, paste and rename functionalities are now implemented.
It is also possible to add new files to a specific folder in an archive.

More information about the project here: https://community.kde.org/GSoC/2016/StatusReports/Batyrenko_Vladyslav

CCMAIL: mvlabat at gmail.com

GUI:

FEATURE: 65576
FEATURE: 181749
FEATURE: 234375
FIXED-IN: 16.12.0

Task: T917

M  +121  -41   kerfuffle/jobs.cpp

http://commits.kde.org/ark/4d0eaefcf59f7b191bf4a1f740817a8bee3c4395

diff --cc kerfuffle/jobs.cpp
index 986b5bc,8b9aa02..c4feeab
--- a/kerfuffle/jobs.cpp
+++ b/kerfuffle/jobs.cpp
@@@ -434,11 -441,11 +441,10 @@@ void AddJob::doWork(
      qulonglong totalCount = 0;
      QElapsedTimer timer;
      timer.start();
-     foreach (const QString &f, m_files) {
+     foreach (const Archive::Entry* entry, m_entries) {
          totalCount++;
-         if (QFileInfo(f).isDir()) {
-             QDirIterator it(f, QDir::AllEntries | QDir::Readable | QDir::Hidden |
-                             QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+         if (QFileInfo(entry->fullPath()).isDir()) {
 -            QDirIterator it(entry->fullPath(), QDir::AllEntries | QDir::Readable | QDir::Hidden |
 -                            QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
++            QDirIterator it(entry->fullPath(), QDir::AllEntries | QDir::Readable | QDir::Hidden | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
              while (it.hasNext()) {
                  it.next();
                  totalCount++;