Skip to content
Snippets Groups Projects
Commit 1f22a4b9 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rm parent

parent f8487192
No related branches found
No related tags found
1 merge request!2263make full use of gDoc being global
...@@ -28,9 +28,8 @@ ...@@ -28,9 +28,8 @@
#include <QTextEdit> #include <QTextEdit>
#include <QWidgetAction> #include <QWidgetAction>
InstrumentView::InstrumentView(QWidget* parent) InstrumentView::InstrumentView()
: QWidget(parent) : m_listing(new InstrumentListing(gDoc.get()))
, m_listing(new InstrumentListing(gDoc.get()))
, m_scrollArea(new QScrollArea) , m_scrollArea(new QScrollArea)
{ {
auto* layout = new QVBoxLayout(this); auto* layout = new QVBoxLayout(this);
......
...@@ -28,7 +28,7 @@ class ProjectDocument; ...@@ -28,7 +28,7 @@ class ProjectDocument;
class InstrumentView : public QWidget { class InstrumentView : public QWidget {
Q_OBJECT Q_OBJECT
public: public:
InstrumentView(QWidget* parent); InstrumentView();
private: private:
void showEvent(QShowEvent*) override; void showEvent(QShowEvent*) override;
......
...@@ -225,7 +225,7 @@ void MainWindow::initViews() ...@@ -225,7 +225,7 @@ void MainWindow::initViews()
resetView(GUI::ID::ViewId::Projects, m_projectsView); resetView(GUI::ID::ViewId::Projects, m_projectsView);
if (gDoc) { if (gDoc) {
m_instrumentView = new InstrumentView(this); m_instrumentView = new InstrumentView;
m_sampleView = new SampleView(this, gDoc.get()); m_sampleView = new SampleView(this, gDoc.get());
m_importDataView = new DataView(this, gDoc.get()); m_importDataView = new DataView(this, gDoc.get());
m_simulationView = new SimulationView(this, gDoc.get()); m_simulationView = new SimulationView(this, gDoc.get());
......
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