feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VcsCommand: Don't store the FutureProgress

Browse Source 
Amends 9891a879aa

Change-Id: I164eda5935847343bf76bfbcf650ba372ccb6681
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-07-13 23:42:11 +02:00
parent 197ad524a6
commit 84de21b702
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/vcsbase/vcscommand.cpp
View File

@@ -28,7 +28,6 @@
#include "vcsoutputwindow.h" #include "vcsoutputwindow.h"
#include "vcsplugin.h" #include "vcsplugin.h"
#include <coreplugin/documentmanager.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
@@ -90,7 +89,7 @@ void VcsCommand::addTask(const QFuture<void> &future)
const QString name = displayName(); const QString name = displayName();
const auto id = Id::fromString(name + QLatin1String(".action")); const auto id = Id::fromString(name + QLatin1String(".action"));
if (hasProgressParser()) { if (hasProgressParser()) {
m_progress = ProgressManager::addTask(future, name, id); ProgressManager::addTask(future, name, id);
} else { } else {
// add a timed tasked based on timeout // add a timed tasked based on timeout
// we cannot access the future interface directly, so we need to create a new one // we cannot access the future interface directly, so we need to create a new one
@@ -103,7 +102,7 @@ void VcsCommand::addTask(const QFuture<void> &future)
watcher->deleteLater(); watcher->deleteLater();
}); });
watcher->setFuture(future); watcher->setFuture(future);
m_progress = ProgressManager::addTimedTask(*fi, name, id, qMax(2, timeoutS() / 5)/*itsmagic*/); ProgressManager::addTimedTask(*fi, name, id, qMax(2, timeoutS() / 5)/*itsmagic*/);
} }
Internal::VcsPlugin::addFuture(future); Internal::VcsPlugin::addFuture(future);

4
src/plugins/vcsbase/vcscommand.h
View File

@@ -25,11 +25,8 @@
#pragma once #pragma once
#include <coreplugin/progressmanager/futureprogress.h>
#include <utils/shellcommand.h> #include <utils/shellcommand.h>
#include <QPointer>
namespace VcsBase { namespace VcsBase {
class VcsCommand : public Utils::ShellCommand class VcsCommand : public Utils::ShellCommand
@@ -43,7 +40,6 @@ private:
void addTask(const QFuture<void> &future); void addTask(const QFuture<void> &future);
void postRunCommand(const Utils::FilePath &workDirectory); void postRunCommand(const Utils::FilePath &workDirectory);
QPointer<Core::FutureProgress> m_progress;
bool m_preventRepositoryChanged; bool m_preventRepositoryChanged;
friend class VcsBaseClientImpl; friend class VcsBaseClientImpl;