mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-25 05:45:42 +03:00
Merge pull request #5070 from nextcloud/work/simplify-cleanuppollsjob-constructor
Remove unneeded parameter from CleanupPollsJob constructor
This commit is contained in:
commit
ea53398bd7
2 changed files with 7 additions and 4 deletions
|
@ -701,10 +701,13 @@ class CleanupPollsJob : public QObject
|
|||
QSharedPointer<Vfs> _vfs;
|
||||
|
||||
public:
|
||||
explicit CleanupPollsJob(const QVector<SyncJournalDb::PollInfo> &pollInfos, AccountPtr account, SyncJournalDb *journal, const QString &localPath,
|
||||
const QSharedPointer<Vfs> &vfs, QObject *parent = nullptr)
|
||||
explicit CleanupPollsJob(AccountPtr account,
|
||||
SyncJournalDb *journal,
|
||||
const QString &localPath,
|
||||
const QSharedPointer<Vfs> &vfs,
|
||||
QObject *parent = nullptr)
|
||||
: QObject(parent)
|
||||
, _pollInfos(pollInfos)
|
||||
, _pollInfos(journal->getPollInfos())
|
||||
, _account(account)
|
||||
, _journal(journal)
|
||||
, _localPath(localPath)
|
||||
|
|
|
@ -453,7 +453,7 @@ void SyncEngine::startSync()
|
|||
QVector<SyncJournalDb::PollInfo> pollInfos = _journal->getPollInfos();
|
||||
if (!pollInfos.isEmpty()) {
|
||||
qCInfo(lcEngine) << "Finish Poll jobs before starting a sync";
|
||||
auto *job = new CleanupPollsJob(pollInfos, _account,
|
||||
auto *job = new CleanupPollsJob(_account,
|
||||
_journal, _localPath, _syncOptions._vfs, this);
|
||||
connect(job, &CleanupPollsJob::finished, this, &SyncEngine::startSync);
|
||||
connect(job, &CleanupPollsJob::aborted, this, &SyncEngine::slotCleanPollsJobAborted);
|
||||
|
|
Loading…
Reference in a new issue