Git commit c07b02396f1e84964d9a507ff14204d921516ba6 by Maik Qualmann. Committed on 31/03/2018 at 20:39. Pushed by mqualmann into branch 'master'. polish and constify M +1 -1 core/libs/database/utils/dio.cpp M +12 -12 core/libs/iojobs/iojobsthread.cpp M +4 -4 core/libs/iojobs/iojobsthread.h https://commits.kde.org/digikam/c07b02396f1e84964d9a507ff14204d921516ba6 diff --git a/core/libs/database/utils/dio.cpp b/core/libs/database/utils/di= o.cpp index d87a7a3017..cc678f3ffd 100644 --- a/core/libs/database/utils/dio.cpp +++ b/core/libs/database/utils/dio.cpp @@ -422,7 +422,7 @@ void DIO::slotResult() if (jobThread->hasErrors() && operation !=3D IOJobData::Rename) { // Pop-up a message about the error. - QString errors =3D QStringList(jobThread->errorsList()).join(QLati= n1String("\n")); + QString errors =3D jobThread->errorsList().join(QLatin1String("\n"= )); DNotificationWrapper(QString(), errors, DigikamApp::instance(), DigikamApp::instance()->windowTitle()); } diff --git a/core/libs/iojobs/iojobsthread.cpp b/core/libs/iojobs/iojobsthr= ead.cpp index 5bc735da71..a5cfaeca4f 100644 --- a/core/libs/iojobs/iojobsthread.cpp +++ b/core/libs/iojobs/iojobsthread.cpp @@ -52,12 +52,12 @@ public: { } = - int jobsCount; - bool isCanceled; + int jobsCount; + bool isCanceled; = - IOJobData* jobData; + IOJobData* jobData; = - QList errorsList; + QStringList errorsList; }; = IOJobsThread::IOJobsThread(QObject* const parent) @@ -198,21 +198,26 @@ void IOJobsThread::deleteDTrashItems(const DTrashItem= InfoList& items) appendJobs(collection); } = -bool IOJobsThread::isCanceled() +bool IOJobsThread::isCanceled() const { return d->isCanceled; } = -bool IOJobsThread::hasErrors() +bool IOJobsThread::hasErrors() const { return !d->errorsList.isEmpty(); } = -QList& IOJobsThread::errorsList() +QStringList& IOJobsThread::errorsList() const { return d->errorsList; } = +IOJobData* IOJobsThread::jobData() const +{ + return d->jobData; +} + void IOJobsThread::connectOneJob(IOJob* const j) { connect(j, SIGNAL(signalError(QString)), @@ -247,9 +252,4 @@ void IOJobsThread::slotCancel() ActionThreadBase::cancel(); } = -IOJobData* IOJobsThread::jobData() -{ - return d->jobData; -} - } // namespace Digikam diff --git a/core/libs/iojobs/iojobsthread.h b/core/libs/iojobs/iojobsthrea= d.h index 9a4dcf00ac..472aa93242 100644 --- a/core/libs/iojobs/iojobsthread.h +++ b/core/libs/iojobs/iojobsthread.h @@ -92,25 +92,25 @@ public: * @brief isCanceled * @return true if the thread was inturrupted */ - bool isCanceled(); + bool isCanceled() const; = /** * @brief hasErrors * @return true if string list was not empty */ - bool hasErrors(); + bool hasErrors() const; = /** * @brief errorsList * @return */ - QList& errorsList(); + QStringList& errorsList() const; = /** * @brief jobData * @return */ - IOJobData* jobData(); + IOJobData* jobData() const; = public Q_SLOTS: =20