From 4d2596efa41296ccc1673cbba770ad7fb60857b0 Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Wed, 11 Jun 2014 14:28:50 -0700 Subject: [PATCH] Removed unused width/height from Primary Flight Display constructor. --- src/ui/MainWindow.cc | 6 +++--- src/ui/PrimaryFlightDisplay.cc | 5 +---- src/ui/PrimaryFlightDisplay.h | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 9e37f9b9f..364c9d926 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -679,8 +679,8 @@ void MainWindow::buildCommonWidgets() createDockWidget(engineeringView,new HUD(320,240,this),tr("Video Downlink"),"HEAD_UP_DISPLAY_DOCKWIDGET",VIEW_ENGINEER,Qt::RightDockWidgetArea); - createDockWidget(simView,new PrimaryFlightDisplay(320,240,this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",VIEW_SIMULATION,Qt::RightDockWidgetArea); - createDockWidget(pilotView,new PrimaryFlightDisplay(320,240,this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",VIEW_FLIGHT,Qt::LeftDockWidgetArea); + createDockWidget(simView,new PrimaryFlightDisplay(this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",VIEW_SIMULATION,Qt::RightDockWidgetArea); + createDockWidget(pilotView,new PrimaryFlightDisplay(this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",VIEW_FLIGHT,Qt::LeftDockWidgetArea); QGCTabbedInfoView *infoview = new QGCTabbedInfoView(this); infoview->addSource(mavlinkDecoder); @@ -852,7 +852,7 @@ void MainWindow::loadDockWidget(const QString& name) } else if (name == "PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET") { - createDockWidget(centerStack->currentWidget(),new PrimaryFlightDisplay(320,240,this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",currentView,Qt::RightDockWidgetArea); + createDockWidget(centerStack->currentWidget(),new PrimaryFlightDisplay(this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",currentView,Qt::RightDockWidgetArea); } else if (name == "HEAD_UP_DISPLAY_DOCKWIDGET") { diff --git a/src/ui/PrimaryFlightDisplay.cc b/src/ui/PrimaryFlightDisplay.cc index 9f6c43ac9..f5fd0d87b 100644 --- a/src/ui/PrimaryFlightDisplay.cc +++ b/src/ui/PrimaryFlightDisplay.cc @@ -107,7 +107,7 @@ const QString PrimaryFlightDisplay::compassWindNames[] = { QString("NW") }; -PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *parent) : +PrimaryFlightDisplay::PrimaryFlightDisplay(QWidget *parent) : QWidget(parent), _valuesChanged(false), @@ -146,9 +146,6 @@ PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *paren font("Bitstream Vera Sans"), refreshTimer(new QTimer(this)) { - Q_UNUSED(width); - Q_UNUSED(height); - setMinimumSize(120, 80); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); diff --git a/src/ui/PrimaryFlightDisplay.h b/src/ui/PrimaryFlightDisplay.h index b4236e339..0be9bb2e5 100644 --- a/src/ui/PrimaryFlightDisplay.h +++ b/src/ui/PrimaryFlightDisplay.h @@ -9,7 +9,7 @@ class PrimaryFlightDisplay : public QWidget { Q_OBJECT public: - PrimaryFlightDisplay(int width = 640, int height = 480, QWidget* parent = NULL); + PrimaryFlightDisplay(QWidget* parent = NULL); ~PrimaryFlightDisplay(); public slots: -- 2.22.0