From a1ceda9fd05408dff6d2083a084a178f65825fcc Mon Sep 17 00:00:00 2001
From: Matthias Puchner <github@mpuchner.de>
Date: Mon, 23 Aug 2021 14:50:15 +0200
Subject: [PATCH] use document for jobmodel access
...instead of MainWindow
---
GUI/Views/JobView.cpp | 2 +-
GUI/Views/JobWidgets/JobProgressAssistant.cpp | 5 ++---
GUI/Views/JobWidgets/JobProgressAssistant.h | 3 ++-
GUI/mainwindow/mainwindow.cpp | 5 -----
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/GUI/Views/JobView.cpp b/GUI/Views/JobView.cpp
index 5250c6abc9d..ce987983d95 100644
--- a/GUI/Views/JobView.cpp
+++ b/GUI/Views/JobView.cpp
@@ -30,7 +30,7 @@
JobView::JobView(MainWindow* mainWindow, ProjectDocument* document)
: m_docks(new DocksController(this))
- , m_progressAssistant(new JobProgressAssistant(mainWindow))
+ , m_progressAssistant(new JobProgressAssistant(mainWindow, document->jobModel()))
, m_currentItem(nullptr)
, m_activityActions(this)
, m_document(document)
diff --git a/GUI/Views/JobWidgets/JobProgressAssistant.cpp b/GUI/Views/JobWidgets/JobProgressAssistant.cpp
index d5b1ca73240..bbdd4eaf0d2 100644
--- a/GUI/Views/JobWidgets/JobProgressAssistant.cpp
+++ b/GUI/Views/JobWidgets/JobProgressAssistant.cpp
@@ -17,11 +17,10 @@
#include "GUI/mainwindow/mainwindow.h"
#include <QProgressBar>
-JobProgressAssistant::JobProgressAssistant(MainWindow* mainWindow)
+JobProgressAssistant::JobProgressAssistant(MainWindow* mainWindow, JobModel* jobModel)
: QObject(mainWindow), m_mainWindow(mainWindow)
{
- connect(m_mainWindow->jobModel(), &JobModel::globalProgress, this,
- &JobProgressAssistant::onGlobalProgress);
+ connect(jobModel, &JobModel::globalProgress, this, &JobProgressAssistant::onGlobalProgress);
}
void JobProgressAssistant::onGlobalProgress(int progress)
diff --git a/GUI/Views/JobWidgets/JobProgressAssistant.h b/GUI/Views/JobWidgets/JobProgressAssistant.h
index ed90305b43a..85efa05e77e 100644
--- a/GUI/Views/JobWidgets/JobProgressAssistant.h
+++ b/GUI/Views/JobWidgets/JobProgressAssistant.h
@@ -18,13 +18,14 @@
#include <QObject>
class MainWindow;
+class JobModel;
//! The JobProgressAssistant class helps JobView to visualize current progress.
class JobProgressAssistant : public QObject {
Q_OBJECT
public:
- JobProgressAssistant(MainWindow* mainWindow);
+ JobProgressAssistant(MainWindow* mainWindow, JobModel* jobModel);
private slots:
void onGlobalProgress(int progress);
diff --git a/GUI/mainwindow/mainwindow.cpp b/GUI/mainwindow/mainwindow.cpp
index 3cc7c80f014..8641e8ddf0a 100644
--- a/GUI/mainwindow/mainwindow.cpp
+++ b/GUI/mainwindow/mainwindow.cpp
@@ -135,11 +135,6 @@ MainWindow* MainWindow::instance()
return s_instance;
}
-JobModel* MainWindow::jobModel()
-{
- return models()->jobModel();
-}
-
ApplicationModels* MainWindow::models()
{
return m_applicationModels;
--
GitLab