From b7594100ad3e3bf9455bf69a0929a434cf369e4f Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Thu, 17 Jul 2014 23:16:29 -0700 Subject: [PATCH] APMToolBar no longer takes a parent QWidget argument. --- src/ui/MainWindow.cc | 2 +- src/ui/apmtoolbar.cpp | 2 +- src/ui/apmtoolbar.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 5207099..2f37f7c 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -263,7 +263,7 @@ void MainWindow::init() if (getCustomMode() == CUSTOM_MODE_APM) { // Add the APM 'toolbar' - APMToolBar *apmToolBar = new APMToolBar(this); + APMToolBar *apmToolBar = new APMToolBar(); apmToolBar->setFlightViewAction(ui.actionFlightView); apmToolBar->setFlightPlanViewAction(ui.actionMissionView); apmToolBar->setHardwareViewAction(ui.actionHardwareConfig); diff --git a/src/ui/apmtoolbar.cpp b/src/ui/apmtoolbar.cpp index 78795b8..5a4589d 100644 --- a/src/ui/apmtoolbar.cpp +++ b/src/ui/apmtoolbar.cpp @@ -7,7 +7,7 @@ #include "apmtoolbar.h" -APMToolBar::APMToolBar(QWidget *parent): +APMToolBar::APMToolBar(): QQuickView(), m_uas(0) { // Configure our QML object diff --git a/src/ui/apmtoolbar.h b/src/ui/apmtoolbar.h index 7cbd4c0..5cb93d8 100644 --- a/src/ui/apmtoolbar.h +++ b/src/ui/apmtoolbar.h @@ -11,7 +11,7 @@ class APMToolBar : public QQuickView { Q_OBJECT public: - explicit APMToolBar(QWidget *parent = 0); + explicit APMToolBar(); ~APMToolBar(); void setFlightViewAction(QAction *action);