Git commit c5b190a6e126dbd296f6c9b0f54a88a5ba98e1c0 by Maik Qualmann. Committed on 31/03/2018 at 20:08. Pushed by mqualmann into branch 'master'. add signal prefix M +34 -34 core/libs/iojobs/iojob.cpp M +1 -1 core/libs/iojobs/iojob.h M +4 -4 core/libs/iojobs/iojobsthread.cpp https://commits.kde.org/digikam/c5b190a6e126dbd296f6c9b0f54a88a5ba98e1c0 diff --git a/core/libs/iojobs/iojob.cpp b/core/libs/iojobs/iojob.cpp index bf97c599ba..78294c8195 100644 --- a/core/libs/iojobs/iojob.cpp +++ b/core/libs/iojobs/iojob.cpp @@ -74,14 +74,14 @@ void CopyJob::run() = if (!srcInfo.exists()) { - emit error(i18n("File/Folder %1 does not exist anymore", srcIn= fo.baseName())); + emit signalError(i18n("File/Folder %1 does not exist anymore",= srcInfo.baseName())); emit signalOneProccessed(m_data->operation()); continue; } = if (!dstDir.exists()) { - emit error(i18n("Album %1 does not exist anymore", dstDir.dirN= ame())); + emit signalError(i18n("Album %1 does not exist anymore", dstDi= r.dirName())); emit signalOneProccessed(m_data->operation()); continue; } @@ -93,8 +93,8 @@ void CopyJob::run() = if (fileInfoForDestination.exists()) { - emit error(i18n("A file or folder named %1 already exists in %= 2", - srcInfo.baseName(), QDir::toNativeSeparators(d= stDir.path()))); + emit signalError(i18n("A file or folder named %1 already exist= s in %2", + srcInfo.baseName(), QDir::toNativeSepara= tors(dstDir.path()))); emit signalOneProccessed(m_data->operation()); continue; } @@ -112,19 +112,19 @@ void CopyJob::run() // If QDir::rename fails, try copy and remove. if (!DFileOperations::copyFolderRecursively(srcDir.pat= h(), dstDir.path())) { - emit error(i18n("Could not move folder %1 to album= %2", - QDir::toNativeSeparators(srcDir.pa= th()), - QDir::toNativeSeparators(dstDir.pa= th()))); + emit signalError(i18n("Could not move folder %1 to= album %2", + QDir::toNativeSeparators(src= Dir.path()), + QDir::toNativeSeparators(dst= Dir.path()))); = emit signalOneProccessed(m_data->operation()); continue; } else if (!srcDir.removeRecursively()) { - emit error(i18n("Could not move folder %1 to album= %2. " - "The folder %1 was copied as well = to album %2", - QDir::toNativeSeparators(srcDir.pa= th()), - QDir::toNativeSeparators(dstDir.pa= th()))); + emit signalError(i18n("Could not move folder %1 to= album %2. " + "The folder %1 was copied as= well to album %2", + QDir::toNativeSeparators(src= Dir.path()), + QDir::toNativeSeparators(dst= Dir.path()))); } } } @@ -134,9 +134,9 @@ void CopyJob::run() = if (!srcFile.rename(destenation)) { - emit error(i18n("Could not move file %1 to album %2", - srcInfo.filePath(), - QDir::toNativeSeparators(dstDir.path()= ))); + emit signalError(i18n("Could not move file %1 to album= %2", + srcInfo.filePath(), + QDir::toNativeSeparators(dstDir.= path()))); = emit signalOneProccessed(m_data->operation()); continue; @@ -151,9 +151,9 @@ void CopyJob::run() = if (!DFileOperations::copyFolderRecursively(srcDir.path(),= dstDir.path())) { - emit error(i18n("Could not copy folder %1 to album %2", - QDir::toNativeSeparators(srcDir.path()= ), - QDir::toNativeSeparators(dstDir.path()= ))); + emit signalError(i18n("Could not copy folder %1 to alb= um %2", + QDir::toNativeSeparators(srcDir.= path()), + QDir::toNativeSeparators(dstDir.= path()))); = emit signalOneProccessed(m_data->operation()); continue; @@ -163,9 +163,9 @@ void CopyJob::run() { if (!QFile::copy(srcInfo.filePath(), destenation)) { - emit error(i18n("Could not copy file %1 to album %2", - QDir::toNativeSeparators(srcInfo.path(= )), - QDir::toNativeSeparators(dstDir.path()= ))); + emit signalError(i18n("Could not copy file %1 to album= %2", + QDir::toNativeSeparators(srcInfo= .path()), + QDir::toNativeSeparators(dstDir.= path()))); = emit signalOneProccessed(m_data->operation()); continue; @@ -208,8 +208,8 @@ void DeleteJob::run() = if (!fileInfo.exists()) { - emit error(i18n("File/Folder %1 does not exist", - QDir::toNativeSeparators(fileInfo.filePath()))= ); + emit signalError(i18n("File/Folder %1 does not exist", + QDir::toNativeSeparators(fileInfo.filePa= th()))); = emit signalOneProccessed(m_data->operation()); continue; @@ -221,8 +221,8 @@ void DeleteJob::run() { if (!DTrash::deleteDirRecursivley(deleteUrl.toLocalFile())) { - emit error(i18n("Couldn't move folder %1 to collection= trash", - QDir::toNativeSeparators(fileInfo.path= ()))); + emit signalError(i18n("Couldn't move folder %1 to coll= ection trash", + QDir::toNativeSeparators(fileInf= o.path()))); = emit signalOneProccessed(m_data->operation()); continue; @@ -232,8 +232,8 @@ void DeleteJob::run() { if (!DTrash::deleteImage(deleteUrl.toLocalFile())) { - emit error(i18n("Couldn't move image %1 to collection = trash", - QDir::toNativeSeparators(fileInfo.filePath= ()))); + emit signalError(i18n("Couldn't move image %1 to colle= ction trash", + QDir::toNativeSeparators(fileInf= o.filePath()))); = emit signalOneProccessed(m_data->operation()); continue; @@ -248,8 +248,8 @@ void DeleteJob::run() = if (!dir.removeRecursively()) { - emit error(i18n("Album %1 could not be removed", - QDir::toNativeSeparators(fileInfo.path= ()))); + emit signalError(i18n("Album %1 could not be removed", + QDir::toNativeSeparators(fileInf= o.path()))); = emit signalOneProccessed(m_data->operation()); continue; @@ -295,8 +295,8 @@ void DeleteJob::run() = if (!file.remove()) { - emit error(i18n("Image %1 could not be removed", - QDir::toNativeSeparators(fileInfo.file= Path()))); + emit signalError(i18n("Image %1 could not be removed", + QDir::toNativeSeparators(fileInf= o.filePath()))); = emit signalOneProccessed(m_data->operation()); continue; @@ -368,8 +368,8 @@ void RenameFileJob::run() if (QFileInfo(destUrl.toLocalFile()).exists()) { qCDebug(DIGIKAM_IOJOB_LOG) << "File with the same name exists!= "; - emit error(i18n("Image with the same name %1 already there", - QDir::toNativeSeparators(destUrl.toLocalFile()= ))); + emit signalError(i18n("Image with the same name %1 already the= re", + QDir::toNativeSeparators(destUrl.toLocal= File()))); = emit signalOneProccessed(m_data->operation()); emit signalRenameFailed(renameUrl); @@ -385,8 +385,8 @@ void RenameFileJob::run() if (!file.rename(destUrl.toLocalFile())) { qCDebug(DIGIKAM_IOJOB_LOG) << "File couldn't be renamed!"; - emit error(i18n("Image %1 could not be renamed", - QDir::toNativeSeparators(renameUrl.toLocalFile= ()))); + emit signalError(i18n("Image %1 could not be renamed", + QDir::toNativeSeparators(renameUrl.toLoc= alFile()))); = emit signalOneProccessed(m_data->operation()); emit signalRenameFailed(renameUrl); diff --git a/core/libs/iojobs/iojob.h b/core/libs/iojobs/iojob.h index 46dae2730d..f088f3404c 100644 --- a/core/libs/iojobs/iojob.h +++ b/core/libs/iojobs/iojob.h @@ -52,7 +52,7 @@ protected: Q_SIGNALS: = void signalOneProccessed(int operation); - void error(const QString& errMsg); + void signalError(const QString& errMsg); }; = // --------------------------------------- diff --git a/core/libs/iojobs/iojobsthread.cpp b/core/libs/iojobs/iojobsthr= ead.cpp index 7df6d41722..5bc735da71 100644 --- a/core/libs/iojobs/iojobsthread.cpp +++ b/core/libs/iojobs/iojobsthread.cpp @@ -78,7 +78,7 @@ void IOJobsThread::copy(IOJobData* const data) = ActionJobCollection collection; = - for (int i =3D 0; i < maximumNumberOfThreads(); i++) + for (int i =3D 0 ; i < maximumNumberOfThreads() ; i++) { CopyJob* const j =3D new CopyJob(data); = @@ -97,7 +97,7 @@ void IOJobsThread::move(IOJobData* const data) = ActionJobCollection collection; = - for (int i =3D 0; i < maximumNumberOfThreads(); i++) + for (int i =3D 0 ; i < maximumNumberOfThreads() ; i++) { CopyJob* const j =3D new CopyJob(data); = @@ -116,7 +116,7 @@ void IOJobsThread::deleteFiles(IOJobData* const data) = ActionJobCollection collection; = - for (int i =3D 0; i < maximumNumberOfThreads(); i++) + for (int i =3D 0 ; i < maximumNumberOfThreads() ; i++) { DeleteJob* const j =3D new DeleteJob(data); = @@ -215,7 +215,7 @@ QList& IOJobsThread::errorsList() = void IOJobsThread::connectOneJob(IOJob* const j) { - connect(j, SIGNAL(error(QString)), + connect(j, SIGNAL(signalError(QString)), this, SLOT(slotError(QString))); = connect(j, SIGNAL(signalDone()),