diff --git a/src/jobs/backupfilesystemjob.h b/src/jobs/backupfilesystemjob.h index 89f4fb6..67a9c92 100644 --- a/src/jobs/backupfilesystemjob.h +++ b/src/jobs/backupfilesystemjob.h @@ -22,7 +22,7 @@ #include "jobs/job.h" #include -#include + class Partition; class Device; class Report; diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp index 75e7e3e..e71fc98 100644 --- a/src/util/externalcommand.cpp +++ b/src/util/externalcommand.cpp @@ -25,7 +25,6 @@ #include "util/externalcommand.h" #include "util/report.h" -#include #include #include #include @@ -85,8 +84,6 @@ bool ExternalCommand::copyBlocks() if (cmd.isEmpty()) cmd = QStandardPaths::findExecutable(QStringLiteral("dd"), { QStringLiteral("/sbin/"), QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/") }); - qDebug() << "ExternalCommand::copyBlocks\n"; - KAuth::Action action(QStringLiteral("org.kde.kpmcore.externalcommand.copyblockshelper")); action.setHelperId(QStringLiteral("org.kde.kpmcore.externalcommand")); @@ -118,7 +115,6 @@ bool ExternalCommand::copyBlocks() m_Output = job->data()[QStringLiteral("output")].toByteArray(); setExitCode(job->data()[QStringLiteral("exitCode")].toInt()); - qDebug() << "ExternalCommand::copyBlocks finished"; emit finished(); return true; } diff --git a/src/util/externalcommandhelper.cpp b/src/util/externalcommandhelper.cpp index 1735f0f..d9e79f1 100644 --- a/src/util/externalcommandhelper.cpp +++ b/src/util/externalcommandhelper.cpp @@ -59,17 +59,14 @@ bool ExternalCommandHelper::writeData(QByteArray& buffer, qint64 offset) return true; } - qDebug() << "cmd exitCode "< 1000) { // const qint64 mibsPerSec = (blocksCopied * blockSize / 1024 / 1024) / (t.elapsed() / 1000); // const qint64 estSecsLeft = (100 - percent) * t.elapsed() / percent / 1000; @@ -135,10 +129,8 @@ ActionReply ExternalCommandHelper::copyblockshelper(const QVariantMap& args) if (rval) rval = writeData(buffer, lastBlockWriteOffset); - if (rval){ - qDebug() << "Percent 100"<<"\n"; + if (rval) emit progress(100); - } }