Browse Source

APMToolBar no longer takes a parent QWidget argument.

QGC4.4
Bryant Mairs 11 years ago
parent
commit
b7594100ad
  1. 2
      src/ui/MainWindow.cc
  2. 2
      src/ui/apmtoolbar.cpp
  3. 2
      src/ui/apmtoolbar.h

2
src/ui/MainWindow.cc

@ -263,7 +263,7 @@ void MainWindow::init()
if (getCustomMode() == CUSTOM_MODE_APM) { if (getCustomMode() == CUSTOM_MODE_APM) {
// Add the APM 'toolbar' // Add the APM 'toolbar'
APMToolBar *apmToolBar = new APMToolBar(this); APMToolBar *apmToolBar = new APMToolBar();
apmToolBar->setFlightViewAction(ui.actionFlightView); apmToolBar->setFlightViewAction(ui.actionFlightView);
apmToolBar->setFlightPlanViewAction(ui.actionMissionView); apmToolBar->setFlightPlanViewAction(ui.actionMissionView);
apmToolBar->setHardwareViewAction(ui.actionHardwareConfig); apmToolBar->setHardwareViewAction(ui.actionHardwareConfig);

2
src/ui/apmtoolbar.cpp

@ -7,7 +7,7 @@
#include "apmtoolbar.h" #include "apmtoolbar.h"
APMToolBar::APMToolBar(QWidget *parent): APMToolBar::APMToolBar():
QQuickView(), m_uas(0) QQuickView(), m_uas(0)
{ {
// Configure our QML object // Configure our QML object

2
src/ui/apmtoolbar.h

@ -11,7 +11,7 @@ class APMToolBar : public QQuickView
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit APMToolBar(QWidget *parent = 0); explicit APMToolBar();
~APMToolBar(); ~APMToolBar();
void setFlightViewAction(QAction *action); void setFlightViewAction(QAction *action);

Loading…
Cancel
Save