Skip to content
Snippets Groups Projects
Commit a1ceda9f authored by Matthias Puchner's avatar Matthias Puchner
Browse files

use document for jobmodel access

...instead of MainWindow
parent 2c2dc9d9
No related branches found
No related tags found
1 merge request!290Refactor Application Models
......@@ -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)
......
......@@ -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)
......
......@@ -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);
......
......@@ -135,11 +135,6 @@ MainWindow* MainWindow::instance()
return s_instance;
}
JobModel* MainWindow::jobModel()
{
return models()->jobModel();
}
ApplicationModels* MainWindow::models()
{
return m_applicationModels;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment