diff --git a/mainwindow.h b/mainwindow.h index f7ce0ac..2b493bd 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -21,10 +21,9 @@ class MainWindow : public QMainWindow { protected: void customEvent(QEvent *event) override; - // bool eventFilter(QObject *obj, QEvent *ev) override; public: - MainWindow(hwinf *hw, Worker *worker, Update *update, QWidget *parent = nullptr); + MainWindow(Worker *worker, QWidget *parent = nullptr); ~MainWindow(); static const int START_PROGRESS_LOOP = -1; @@ -35,10 +34,9 @@ public: static const int BL_STOP_COUNT = 5; // int progressValue() const { return m_progressValue; } - hwinf *getPlugin() { return m_hw; } - hwinf const *getPlugin() const { return m_hw; } - Update *getUpdate() { return m_update; } - Update const *getUpdate() const { return m_update; } + //hwinf *getPlugin() { return m_hw; } + //hwinf const *getPlugin() const { return m_hw; } + UpdateDcEvent::UpdateStep updateStep() const { return m_updateStep; } void setUpdateStep(UpdateDcEvent::UpdateStep updateStep) { m_updateStep = updateStep; } @@ -72,14 +70,13 @@ private: void onShowMessage(QString, QString); Ui::MainWindow *ui; - hwinf *m_hw; Worker *m_worker; + hwinf *m_hw = nullptr; int const m_width; QTimer *m_startTimer; QTimer *m_exitTimer; bool m_progressRunning; //int m_progressValue; - Update *m_update; UpdateDcEvent::UpdateStep m_updateStep; }; #endif // MAINWINDOW_H