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

TaskTree: Unify done / errorOccurred signals

Browse Source 
Get rid of TaskTree::errorOccurred signal. Provide additional
DoneResult arg for done signal.

Task-number: QTCREATORBUG-29834
Change-Id: I31a3a0701a14246b01f65303a1295f014c855ecf
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2023-11-03 15:53:01 +01:00
parent d2500dc77b
commit fbe359308d
21 changed files with 79 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/diffeditor/diffeditorcontroller.cpp
View File

@@ -110,20 +110,16 @@ void DiffEditorController::requestReload()
{
m_document->beginReload();
m_taskTree.reset(new TaskTree(m_reloadRecipe));
connect(m_taskTree.get(), &TaskTree::done, this, [this] { reloadFinished(true); });
connect(m_taskTree.get(), &TaskTree::errorOccurred, this, [this] { reloadFinished(false); });
connect(m_taskTree.get(), &TaskTree::done, this, [this](DoneWith result) {
if (m_taskTree)
m_taskTree.release()->deleteLater();
m_document->endReload(result == DoneWith::Success);
});
auto progress = new TaskProgress(m_taskTree.get());
progress->setDisplayName(m_displayName);
m_taskTree->start();
}
void DiffEditorController::reloadFinished(bool success)
{
if (m_taskTree)
m_taskTree.release()->deleteLater();
m_document->endReload(success);
}
void DiffEditorController::addExtraActions(QMenu *menu, int fileIndex, int chunkIndex,
const ChunkSelection &selection)
{

1
src/plugins/diffeditor/diffeditorcontroller.h
View File

@@ -66,7 +66,6 @@ protected:
void forceContextLineCount(int lines);
private:
void reloadFinished(bool success);
friend class Internal::DiffEditorWidgetController;
virtual void addExtraActions(QMenu *menu, int fileIndex, int chunkIndex,
const ChunkSelection &selection);