From aff3ddf4c6cc26f8e57a2f48246a034b33dd2724 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 26 Jul 2015 11:56:32 -0700 Subject: [PATCH] Remove unused parameter --- src/ui/MainWindow.cc | 2 +- src/ui/QGCMAVLinkLogPlayer.cc | 6 ++---- src/ui/QGCMAVLinkLogPlayer.h | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index c8bf39118..771832412 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -395,7 +395,7 @@ void MainWindow::_buildCommonWidgets(void) // Log player // TODO: Make this optional with a preferences setting or under a "View" menu - logPlayer = new QGCMAVLinkLogPlayer(MAVLinkProtocol::instance(), statusBar()); + logPlayer = new QGCMAVLinkLogPlayer(statusBar()); statusBar()->addPermanentWidget(logPlayer); // In order for Qt to save and restore state of widgets all widgets must be created ahead of time. We only create the QDockWidget diff --git a/src/ui/QGCMAVLinkLogPlayer.cc b/src/ui/QGCMAVLinkLogPlayer.cc index 9b942f556..eaf7d5f11 100644 --- a/src/ui/QGCMAVLinkLogPlayer.cc +++ b/src/ui/QGCMAVLinkLogPlayer.cc @@ -13,13 +13,11 @@ #include "QGCFileDialog.h" #include "QGCMessageBox.h" -QGCMAVLinkLogPlayer::QGCMAVLinkLogPlayer(MAVLinkProtocol* mavlink, QWidget *parent) : +QGCMAVLinkLogPlayer::QGCMAVLinkLogPlayer(QWidget *parent) : QWidget(parent), _replayLink(NULL), _ui(new Ui::QGCMAVLinkLogPlayer) -{ - Q_ASSERT(mavlink); - +{ _ui->setupUi(this); _ui->horizontalLayout->setAlignment(Qt::AlignTop); diff --git a/src/ui/QGCMAVLinkLogPlayer.h b/src/ui/QGCMAVLinkLogPlayer.h index 181355b5c..a347e931a 100644 --- a/src/ui/QGCMAVLinkLogPlayer.h +++ b/src/ui/QGCMAVLinkLogPlayer.h @@ -25,7 +25,7 @@ class QGCMAVLinkLogPlayer : public QWidget Q_OBJECT public: - explicit QGCMAVLinkLogPlayer(MAVLinkProtocol* mavlink, QWidget *parent = 0); + explicit QGCMAVLinkLogPlayer(QWidget *parent = 0); ~QGCMAVLinkLogPlayer(); private slots: -- 2.22.0