From b82c8e78663f15a3afc968fcda44c23a80fb2f84 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 4 Mar 2015 18:06:38 -0800 Subject: [PATCH] Add parent in constructor --- src/ui/toolbar/MainToolBar.cc | 5 +++-- src/ui/toolbar/MainToolBar.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ui/toolbar/MainToolBar.cc b/src/ui/toolbar/MainToolBar.cc index c4435540d..2091dac8f 100644 --- a/src/ui/toolbar/MainToolBar.cc +++ b/src/ui/toolbar/MainToolBar.cc @@ -35,8 +35,9 @@ This file is part of the QGROUNDCONTROL project #include "UASMessageHandler.h" #include "UASMessageView.h" -MainToolBar::MainToolBar() - : _mav(NULL) +MainToolBar::MainToolBar(QWidget* parent) + : QGCQmlWidgetHolder(parent) + , _mav(NULL) , _toolBar(NULL) , _currentView(ViewNone) , _batteryVoltage(0.0) diff --git a/src/ui/toolbar/MainToolBar.h b/src/ui/toolbar/MainToolBar.h index 3764b1b77..9d9fab3a4 100644 --- a/src/ui/toolbar/MainToolBar.h +++ b/src/ui/toolbar/MainToolBar.h @@ -42,7 +42,7 @@ class MainToolBar : public QGCQmlWidgetHolder Q_ENUMS(ViewType_t) Q_ENUMS(MessageType_t) public: - MainToolBar(); + MainToolBar(QWidget* parent = NULL); ~MainToolBar(); typedef enum { -- 2.22.0