From d7b26227655d9d44164ce115bdca5a6808d353dc Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 11 Jan 2014 18:40:20 -0800 Subject: [PATCH] Unused formal parameter, unused local variable and a couple unreachable code changes --- src/uas/UAS.cc | 5 +++++ src/ui/HUD.cc | 12 +++++++++++- src/ui/MainWindow.cc | 1 + src/ui/PrimaryFlightDisplay.cc | 2 ++ src/ui/QGCHilConfiguration.cc | 2 +- src/ui/QGCPX4VehicleConfig.cc | 2 ++ src/ui/UASRawStatusView.cpp | 1 + src/ui/configuration/AP2ConfigWidget.cc | 5 ++++- src/ui/configuration/AccelCalibrationConfig.cc | 5 +++++ src/ui/configuration/AdvParameterList.cc | 4 +++- src/ui/configuration/AdvancedParamConfig.cc | 3 +++ src/ui/configuration/AirspeedConfig.cc | 3 +++ src/ui/configuration/ApmFirmwareConfig.cc | 1 + src/ui/configuration/ApmPlaneLevel.cc | 3 +++ src/ui/configuration/ArduCopterPidConfig.cc | 3 +++ src/ui/configuration/ArduPlanePidConfig.cc | 3 +++ src/ui/configuration/ArduRoverPidConfig.cc | 3 +++ src/ui/configuration/BatteryMonitorConfig.cc | 9 +++++++++ src/ui/configuration/CameraGimbalConfig.cc | 3 +++ src/ui/configuration/CompassConfig.cc | 3 +++ src/ui/configuration/FailSafeConfig.cc | 7 +++++++ src/ui/configuration/FrameTypeConfig.cc | 3 +++ src/ui/configuration/OpticalFlowConfig.cc | 3 +++ src/ui/configuration/ParamWidget.cc | 4 ++++ src/ui/configuration/RadioCalibrationConfig.cc | 7 ++++++- src/ui/configuration/SonarConfig.cc | 5 +++++ src/ui/configuration/StandardParamConfig.cc | 3 +++ src/ui/configuration/terminalconsole.cpp | 1 + src/ui/designer/QGCRadioChannelDisplay.cpp | 2 ++ src/ui/designer/QGCToolWidget.cc | 4 ++++ src/ui/linechart/IncrementalPlot.h | 2 -- src/ui/uas/UASQuickView.cc | 3 +++ src/ui/uas/UASQuickViewGaugeItem.cc | 2 ++ src/ui/uas/UASQuickViewItemSelect.cc | 2 ++ src/ui/uas/UASQuickViewTextItem.cc | 4 ++++ src/ui/uas/UASQuickViewTextItem.h | 1 - 36 files changed, 118 insertions(+), 8 deletions(-) diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index 291237424..dcc1768f1 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -3070,6 +3070,11 @@ void UAS::sendHilGroundTruth(quint64 time_us, float roll, float pitch, float yaw float pitchspeed, float yawspeed, double lat, double lon, double alt, float vx, float vy, float vz, float ind_airspeed, float true_airspeed, float xacc, float yacc, float zacc) { + Q_UNUSED(time_us); + Q_UNUSED(xacc); + Q_UNUSED(yacc); + Q_UNUSED(zacc); + float q[4]; double cosPhi_2 = cos(double(roll) / 2.0); diff --git a/src/ui/HUD.cc b/src/ui/HUD.cc index 2c424b1b8..13c134eef 100644 --- a/src/ui/HUD.cc +++ b/src/ui/HUD.cc @@ -117,6 +117,9 @@ HUD::HUD(int width, int height, QWidget* parent) imageRequested(false), image(NULL) { + Q_UNUSED(width); + Q_UNUSED(height); + // Set auto fill to false setAutoFillBackground(false); @@ -501,11 +504,18 @@ void HUD::paintText(QString text, QColor color, float fontSize, float refX, floa */ void HUD::setupGLView(float referencePositionX, float referencePositionY, float referenceWidth, float referenceHeight) { + Q_UNUSED(referencePositionX); + Q_UNUSED(referencePositionY); + Q_UNUSED(referenceWidth); + Q_UNUSED(referenceHeight); +#if 0 + // code ifdef'ed out but left in to silence warnings int pixelWidth = (int)(referenceWidth * scalingFactor); int pixelHeight = (int)(referenceHeight * scalingFactor); // Translate and scale the GL view in the virtual reference coordinate units on the screen int pixelPositionX = (int)((referencePositionX * scalingFactor) + xCenterOffset); int pixelPositionY = this->height() - (referencePositionY * scalingFactor) + yCenterOffset - pixelHeight; +#endif } void HUD::paintRollPitchStrips() @@ -515,7 +525,7 @@ void HUD::paintRollPitchStrips() void HUD::paintEvent(QPaintEvent *event) { - + Q_UNUSED(event); paintHUD(); } diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index a958dc1ed..653648401 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -800,6 +800,7 @@ void MainWindow::loadDockWidget(const QString& name) void MainWindow::addToCentralStackedWidget(QWidget* widget, VIEW_SECTIONS viewSection, const QString& title) { + Q_UNUSED(viewSection); Q_UNUSED(title); Q_ASSERT(widget->objectName().length() != 0); diff --git a/src/ui/PrimaryFlightDisplay.cc b/src/ui/PrimaryFlightDisplay.cc index b50503fcd..9a206fae8 100644 --- a/src/ui/PrimaryFlightDisplay.cc +++ b/src/ui/PrimaryFlightDisplay.cc @@ -606,6 +606,8 @@ void PrimaryFlightDisplay::drawPitchScale( bool drawNumbersRight ) { + Q_UNUSED(intrusion); + float displayPitch = this->pitch; if (isnan(displayPitch)) displayPitch = 0; diff --git a/src/ui/QGCHilConfiguration.cc b/src/ui/QGCHilConfiguration.cc index e501e8c6a..8d2a52af4 100644 --- a/src/ui/QGCHilConfiguration.cc +++ b/src/ui/QGCHilConfiguration.cc @@ -48,7 +48,7 @@ QGCHilConfiguration::~QGCHilConfiguration() void QGCHilConfiguration::setVersion(QString version) { - + Q_UNUSED(version); } void QGCHilConfiguration::on_simComboBox_currentIndexChanged(int index) diff --git a/src/ui/QGCPX4VehicleConfig.cc b/src/ui/QGCPX4VehicleConfig.cc index 831b74b94..5ab600af7 100644 --- a/src/ui/QGCPX4VehicleConfig.cc +++ b/src/ui/QGCPX4VehicleConfig.cc @@ -355,6 +355,8 @@ void QGCPX4VehicleConfig::toggleCalibrationRC(bool enabled) void QGCPX4VehicleConfig::toggleSpektrumPairing(bool enabled) { + Q_UNUSED(enabled); + if (!ui->dsm2RadioButton->isChecked() && !ui->dsmxRadioButton && !ui->dsmx8RadioButton) { // Reject QMessageBox warnMsgBox; diff --git a/src/ui/UASRawStatusView.cpp b/src/ui/UASRawStatusView.cpp index b46af5026..1862ea7a3 100644 --- a/src/ui/UASRawStatusView.cpp +++ b/src/ui/UASRawStatusView.cpp @@ -47,6 +47,7 @@ void UASRawStatusView::valueChanged(const int uasId, const QString& name, const } void UASRawStatusView::resizeEvent(QResizeEvent *event) { + Q_UNUSED(event); m_tableDirty = true; } diff --git a/src/ui/configuration/AP2ConfigWidget.cc b/src/ui/configuration/AP2ConfigWidget.cc index 3ce8751b7..d48158b32 100644 --- a/src/ui/configuration/AP2ConfigWidget.cc +++ b/src/ui/configuration/AP2ConfigWidget.cc @@ -25,7 +25,10 @@ void AP2ConfigWidget::activeUASSet(UASInterface *uas) void AP2ConfigWidget::parameterChanged(int uas, int component, QString parameterName, QVariant value) { - + Q_UNUSED(uas); + Q_UNUSED(component); + Q_UNUSED(parameterName); + Q_UNUSED(value); } void AP2ConfigWidget::showNullMAVErrorMessageBox() { diff --git a/src/ui/configuration/AccelCalibrationConfig.cc b/src/ui/configuration/AccelCalibrationConfig.cc index f552580d1..8be791352 100644 --- a/src/ui/configuration/AccelCalibrationConfig.cc +++ b/src/ui/configuration/AccelCalibrationConfig.cc @@ -71,6 +71,8 @@ void AccelCalibrationConfig::calibrateButtonClicked() } void AccelCalibrationConfig::hideEvent(QHideEvent *evt) { + Q_UNUSED(evt); + if (!m_uas || !m_accelAckCount) { return; @@ -82,6 +84,9 @@ void AccelCalibrationConfig::hideEvent(QHideEvent *evt) } void AccelCalibrationConfig::uasTextMessageReceived(int uasid, int componentid, int severity, QString text) { + Q_UNUSED(uasid); + Q_UNUSED(componentid); + //command received: " Severity 1 //Place APM Level and press any key" severity 5 if (severity == 5) diff --git a/src/ui/configuration/AdvParameterList.cc b/src/ui/configuration/AdvParameterList.cc index 24a5bc384..bc0bb6702 100644 --- a/src/ui/configuration/AdvParameterList.cc +++ b/src/ui/configuration/AdvParameterList.cc @@ -25,7 +25,9 @@ void AdvParameterList::setParameterMetaData(QString name,QString humanname,QStri void AdvParameterList::parameterChanged(int uas, int component, QString parameterName, QVariant value) { - + Q_UNUSED(uas); + Q_UNUSED(component); + if (!m_paramValueMap.contains(parameterName)) { ui.tableWidget->setRowCount(ui.tableWidget->rowCount()+1); diff --git a/src/ui/configuration/AdvancedParamConfig.cc b/src/ui/configuration/AdvancedParamConfig.cc index 98f0c1c62..8edbe1fd6 100644 --- a/src/ui/configuration/AdvancedParamConfig.cc +++ b/src/ui/configuration/AdvancedParamConfig.cc @@ -33,6 +33,9 @@ void AdvancedParamConfig::addCombo(QString title,QString description,QString par } void AdvancedParamConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + if (m_paramToWidgetMap.contains(parameterName)) { if (value.type() == QVariant::Double) diff --git a/src/ui/configuration/AirspeedConfig.cc b/src/ui/configuration/AirspeedConfig.cc index 27699996b..25da75fc2 100644 --- a/src/ui/configuration/AirspeedConfig.cc +++ b/src/ui/configuration/AirspeedConfig.cc @@ -14,6 +14,9 @@ AirspeedConfig::~AirspeedConfig() } void AirspeedConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + if (parameterName == "ARSPD_ENABLE") { if (value.toInt() == 0) diff --git a/src/ui/configuration/ApmFirmwareConfig.cc b/src/ui/configuration/ApmFirmwareConfig.cc index 4ef8950d5..0468b24d1 100644 --- a/src/ui/configuration/ApmFirmwareConfig.cc +++ b/src/ui/configuration/ApmFirmwareConfig.cc @@ -387,6 +387,7 @@ void ApmFirmwareConfig::flashButtonClicked() void ApmFirmwareConfig::firmwareListError(QNetworkReply::NetworkError error) { + Q_UNUSED(error); QNetworkReply *reply = qobject_cast(sender()); qDebug() << "Error!" << reply->errorString(); } diff --git a/src/ui/configuration/ApmPlaneLevel.cc b/src/ui/configuration/ApmPlaneLevel.cc index 49b1b20f5..3bda80e92 100644 --- a/src/ui/configuration/ApmPlaneLevel.cc +++ b/src/ui/configuration/ApmPlaneLevel.cc @@ -52,6 +52,9 @@ void ApmPlaneLevel::manualCheckBoxToggled(bool checked) } void ApmPlaneLevel::parameterChanged(int uas, int component, QString parameterName, QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + if (parameterName == "MANUAL_LEVEL") { if (value.toInt() == 1) diff --git a/src/ui/configuration/ArduCopterPidConfig.cc b/src/ui/configuration/ArduCopterPidConfig.cc index 7d5f274cb..632d3d17c 100644 --- a/src/ui/configuration/ArduCopterPidConfig.cc +++ b/src/ui/configuration/ArduCopterPidConfig.cc @@ -139,6 +139,9 @@ ArduCopterPidConfig::~ArduCopterPidConfig() } void ArduCopterPidConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + if (m_nameToBoxMap.contains(parameterName)) { m_nameToBoxMap[parameterName]->setValue(value.toDouble()); diff --git a/src/ui/configuration/ArduPlanePidConfig.cc b/src/ui/configuration/ArduPlanePidConfig.cc index 157c2db38..13db80b96 100644 --- a/src/ui/configuration/ArduPlanePidConfig.cc +++ b/src/ui/configuration/ArduPlanePidConfig.cc @@ -66,6 +66,9 @@ ArduPlanePidConfig::~ArduPlanePidConfig() } void ArduPlanePidConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + if (m_nameToBoxMap.contains(parameterName)) { m_nameToBoxMap[parameterName]->setValue(value.toDouble()); diff --git a/src/ui/configuration/ArduRoverPidConfig.cc b/src/ui/configuration/ArduRoverPidConfig.cc index e84d79943..026bb8350 100644 --- a/src/ui/configuration/ArduRoverPidConfig.cc +++ b/src/ui/configuration/ArduRoverPidConfig.cc @@ -73,6 +73,9 @@ void ArduRoverPidConfig::refreshButtonClicked() void ArduRoverPidConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + if (nameToBoxMap.contains(parameterName)) { nameToBoxMap[parameterName]->setValue(value.toFloat()); diff --git a/src/ui/configuration/BatteryMonitorConfig.cc b/src/ui/configuration/BatteryMonitorConfig.cc index 68692aa62..a4d3ca319 100644 --- a/src/ui/configuration/BatteryMonitorConfig.cc +++ b/src/ui/configuration/BatteryMonitorConfig.cc @@ -49,6 +49,7 @@ void BatteryMonitorConfig::activeUASSet(UASInterface *uas) } void BatteryMonitorConfig::alertOnLowClicked(bool checked) { + Q_UNUSED(checked); } void BatteryMonitorConfig::calcDividerSet() @@ -246,6 +247,11 @@ BatteryMonitorConfig::~BatteryMonitorConfig() } void BatteryMonitorConfig::batteryChanged(UASInterface* uas, double voltage, double current, double percent, int seconds) { + Q_UNUSED(uas); + Q_UNUSED(current); + Q_UNUSED(percent); + Q_UNUSED(seconds); + ui.calcVoltsLineEdit->setText(QString::number(voltage,'f',2)); if (ui.measuredVoltsLineEdit->text() == "") { @@ -255,6 +261,9 @@ void BatteryMonitorConfig::batteryChanged(UASInterface* uas, double voltage, dou void BatteryMonitorConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + if (parameterName == "VOLT_DIVIDER") { ui.calcDividerLineEdit->setText(QString::number(value.toFloat(),'f',4)); diff --git a/src/ui/configuration/CameraGimbalConfig.cc b/src/ui/configuration/CameraGimbalConfig.cc index 6b14b1a46..7d4317e48 100644 --- a/src/ui/configuration/CameraGimbalConfig.cc +++ b/src/ui/configuration/CameraGimbalConfig.cc @@ -265,6 +265,9 @@ CameraGimbalConfig::~CameraGimbalConfig() void CameraGimbalConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + if (parameterName == "MNT_ANGMIN_TIL") //TILT { ui.tiltAngleMinSpinBox->setValue(value.toInt() / 100.0); diff --git a/src/ui/configuration/CompassConfig.cc b/src/ui/configuration/CompassConfig.cc index 610d354ed..411cf79b6 100644 --- a/src/ui/configuration/CompassConfig.cc +++ b/src/ui/configuration/CompassConfig.cc @@ -46,6 +46,9 @@ CompassConfig::~CompassConfig() } void CompassConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + if (parameterName == "MAG_ENABLE") { if (value.toInt() == 0) diff --git a/src/ui/configuration/FailSafeConfig.cc b/src/ui/configuration/FailSafeConfig.cc index 9d177cc73..f032541b1 100644 --- a/src/ui/configuration/FailSafeConfig.cc +++ b/src/ui/configuration/FailSafeConfig.cc @@ -278,6 +278,9 @@ void FailSafeConfig::activeUASSet(UASInterface *uas) } void FailSafeConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + //Arducopter if (parameterName == "FS_THR_ENABLE") { @@ -414,6 +417,8 @@ void FailSafeConfig::remoteControlChannelRawChanges(int chan,float value) } void FailSafeConfig::hilActuatorsChanged(uint64_t time, float act1, float act2, float act3, float act4, float act5, float act6, float act7, float act8) { + Q_UNUSED(time); + ui.radio1Out->setValue(act1); ui.radio2Out->setValue(act2); ui.radio3Out->setValue(act3); @@ -425,6 +430,8 @@ void FailSafeConfig::hilActuatorsChanged(uint64_t time, float act1, float act2, } void FailSafeConfig::gpsStatusChanged(UASInterface* uas,int fixtype) { + Q_UNUSED(uas); + if (fixtype == 0 || fixtype == 1) { ui.gpsLabel->setText("

None

"); diff --git a/src/ui/configuration/FrameTypeConfig.cc b/src/ui/configuration/FrameTypeConfig.cc index 8c123c69f..9d8803c26 100644 --- a/src/ui/configuration/FrameTypeConfig.cc +++ b/src/ui/configuration/FrameTypeConfig.cc @@ -52,6 +52,9 @@ FrameTypeConfig::~FrameTypeConfig() } void FrameTypeConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + if (parameterName == "FRAME") { ui.xRadioButton->setEnabled(true); diff --git a/src/ui/configuration/OpticalFlowConfig.cc b/src/ui/configuration/OpticalFlowConfig.cc index 3e8bdb8b7..89f305582 100644 --- a/src/ui/configuration/OpticalFlowConfig.cc +++ b/src/ui/configuration/OpticalFlowConfig.cc @@ -13,6 +13,9 @@ OpticalFlowConfig::~OpticalFlowConfig() } void OpticalFlowConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + if (parameterName == "FLOW_ENABLE") { if (value.toInt() == 0) diff --git a/src/ui/configuration/ParamWidget.cc b/src/ui/configuration/ParamWidget.cc index b9fb03c72..aef3e3e3e 100644 --- a/src/ui/configuration/ParamWidget.cc +++ b/src/ui/configuration/ParamWidget.cc @@ -48,6 +48,8 @@ ParamWidget::~ParamWidget() void ParamWidget::setupInt(QString title,QString description,int value,int min,int max) { + Q_UNUSED(value); + type = INT; ui.titleLabel->setText("

" + title + "

"); ui.descriptionLabel->setText(description); @@ -71,6 +73,8 @@ void ParamWidget::setupInt(QString title,QString description,int value,int min,i void ParamWidget::setupDouble(QString title,QString description,double value,double min,double max) { + Q_UNUSED(value); + type = DOUBLE; ui.titleLabel->setText("

" + title + "

"); ui.descriptionLabel->setText(description); diff --git a/src/ui/configuration/RadioCalibrationConfig.cc b/src/ui/configuration/RadioCalibrationConfig.cc index eb9db6fca..7dd5189af 100644 --- a/src/ui/configuration/RadioCalibrationConfig.cc +++ b/src/ui/configuration/RadioCalibrationConfig.cc @@ -119,7 +119,10 @@ void RadioCalibrationConfig::remoteControlChannelRawChanged(int chan,float val) void RadioCalibrationConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) { - + Q_UNUSED(uas); + Q_UNUSED(component); + Q_UNUSED(parameterName); + Q_UNUSED(value); } void RadioCalibrationConfig::guiUpdateTimerTick() { @@ -153,10 +156,12 @@ void RadioCalibrationConfig::guiUpdateTimerTick() } void RadioCalibrationConfig::showEvent(QShowEvent *event) { + Q_UNUSED(event); guiUpdateTimer->start(100); } void RadioCalibrationConfig::hideEvent(QHideEvent *event) { + Q_UNUSED(event); guiUpdateTimer->stop(); } void RadioCalibrationConfig::calibrateButtonClicked() diff --git a/src/ui/configuration/SonarConfig.cc b/src/ui/configuration/SonarConfig.cc index fb8c4687b..2826804fb 100644 --- a/src/ui/configuration/SonarConfig.cc +++ b/src/ui/configuration/SonarConfig.cc @@ -32,6 +32,8 @@ void SonarConfig::checkBoxToggled(bool enabled) } void SonarConfig::sonarTypeChanged(int index) { + Q_UNUSED(index); + if (!m_uas) { QMessageBox::information(0,tr("Error"),tr("Please connect to a MAV before attempting to set configuration")); @@ -42,6 +44,9 @@ void SonarConfig::sonarTypeChanged(int index) void SonarConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + if (parameterName == "SONAR_ENABLE") { if (value.toInt() == 0) diff --git a/src/ui/configuration/StandardParamConfig.cc b/src/ui/configuration/StandardParamConfig.cc index 0f43a9225..509a109ee 100644 --- a/src/ui/configuration/StandardParamConfig.cc +++ b/src/ui/configuration/StandardParamConfig.cc @@ -31,6 +31,9 @@ void StandardParamConfig::addCombo(QString title,QString description,QString par } void StandardParamConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + if (paramToWidgetMap.contains(parameterName)) { if (value.type() == QVariant::Double) diff --git a/src/ui/configuration/terminalconsole.cpp b/src/ui/configuration/terminalconsole.cpp index 66ef54691..86df9e4f8 100644 --- a/src/ui/configuration/terminalconsole.cpp +++ b/src/ui/configuration/terminalconsole.cpp @@ -257,6 +257,7 @@ void TerminalConsole::setBaudRate(int index) void TerminalConsole::setLink(int index) { + Q_UNUSED(index); m_settings.name = ui->linkComboBox->currentText(); qDebug() << "Changed Link to:" << m_settings.name; diff --git a/src/ui/designer/QGCRadioChannelDisplay.cpp b/src/ui/designer/QGCRadioChannelDisplay.cpp index 275afc28e..b2d4b0dd0 100644 --- a/src/ui/designer/QGCRadioChannelDisplay.cpp +++ b/src/ui/designer/QGCRadioChannelDisplay.cpp @@ -34,6 +34,8 @@ void QGCRadioChannelDisplay::setOrientation(Qt::Orientation orient) void QGCRadioChannelDisplay::paintEvent(QPaintEvent *event) { + Q_UNUSED(event); + //Values range from 0-3000. //1500 is the middle, static servo value. QPainter painter(this); diff --git a/src/ui/designer/QGCToolWidget.cc b/src/ui/designer/QGCToolWidget.cc index 2eeae5b26..69dc906d0 100644 --- a/src/ui/designer/QGCToolWidget.cc +++ b/src/ui/designer/QGCToolWidget.cc @@ -192,6 +192,10 @@ QList QGCToolWidget::getParamList() } void QGCToolWidget::setParameterValue(int uas, int component, QString parameterName, const QVariant value) { + Q_UNUSED(uas); + Q_UNUSED(component); + Q_UNUSED(value); + QString widgetName = getTitle(); int size = settingsMap["count"].toInt(); if (paramToItemMap.contains(parameterName)) diff --git a/src/ui/linechart/IncrementalPlot.h b/src/ui/linechart/IncrementalPlot.h index cb9784ee7..66f2b0734 100644 --- a/src/ui/linechart/IncrementalPlot.h +++ b/src/ui/linechart/IncrementalPlot.h @@ -61,8 +61,6 @@ private: int d_count; QwtArray d_x; QwtArray d_y; - QTimer *d_timer; - int d_timerCount; }; /** diff --git a/src/ui/uas/UASQuickView.cc b/src/ui/uas/UASQuickView.cc index 668ae999e..1054a3e40 100644 --- a/src/ui/uas/UASQuickView.cc +++ b/src/ui/uas/UASQuickView.cc @@ -190,6 +190,7 @@ void UASQuickView::sortItems(int columncount) } void UASQuickView::resizeEvent(QResizeEvent *evt) { + Q_UNUSED(evt); recalculateItemTextSizing(); } void UASQuickView::recalculateItemTextSizing() @@ -273,6 +274,8 @@ void UASQuickView::valueChanged(const int uasId, const QString& name, const QStr { Q_UNUSED(uasId); Q_UNUSED(unit); + Q_UNUSED(msec); + bool ok; double value = variant.toDouble(&ok); QMetaType::Type metaType = static_cast(variant.type()); diff --git a/src/ui/uas/UASQuickViewGaugeItem.cc b/src/ui/uas/UASQuickViewGaugeItem.cc index 0446e5280..6fac0f2ae 100644 --- a/src/ui/uas/UASQuickViewGaugeItem.cc +++ b/src/ui/uas/UASQuickViewGaugeItem.cc @@ -15,6 +15,8 @@ void UASQuickViewGaugeItem::setTitle(QString title) } void UASQuickViewGaugeItem::resizeEvent(QResizeEvent *event) { + Q_UNUSED(event); + QFont valuefont = valueLabel->font(); QFont titlefont = titleLabel->font(); valuefont.setPixelSize(this->height() / 2.0); diff --git a/src/ui/uas/UASQuickViewItemSelect.cc b/src/ui/uas/UASQuickViewItemSelect.cc index 6536529ca..124c635ae 100644 --- a/src/ui/uas/UASQuickViewItemSelect.cc +++ b/src/ui/uas/UASQuickViewItemSelect.cc @@ -59,6 +59,8 @@ void UASQuickViewItemSelect::addItem(QString item,bool enabled) } void UASQuickViewItemSelect::resizeEvent(QResizeEvent *event) { + Q_UNUSED(event); + /*for (int i=0;iremoveWidget(m_checkBoxList[i]); diff --git a/src/ui/uas/UASQuickViewTextItem.cc b/src/ui/uas/UASQuickViewTextItem.cc index f5b89c1f9..f55dff6a1 100644 --- a/src/ui/uas/UASQuickViewTextItem.cc +++ b/src/ui/uas/UASQuickViewTextItem.cc @@ -119,7 +119,10 @@ void UASQuickViewTextItem::setValuePixelSize(int size) void UASQuickViewTextItem::resizeEvent(QResizeEvent *event) { + Q_UNUSED(event); return; +#if 0 + // code ifdef'ed out to silence warnings QFont valuefont = valueLabel->font(); QFont titlefont = titleLabel->font(); valuefont.setPixelSize(this->height()); @@ -158,4 +161,5 @@ titlefont.setPixelSize(valuefont.pixelSize() / 2.0); valueLabel->setFont(valuefont); titleLabel->setFont(titlefont); update(); +#endif } diff --git a/src/ui/uas/UASQuickViewTextItem.h b/src/ui/uas/UASQuickViewTextItem.h index 698c358f9..6f8946915 100644 --- a/src/ui/uas/UASQuickViewTextItem.h +++ b/src/ui/uas/UASQuickViewTextItem.h @@ -17,7 +17,6 @@ protected: private: QLabel *titleLabel; QLabel *valueLabel; - QSpacerItem *spacerItem; }; #endif // UASQUICKVIEWTEXTITEM_H -- 2.22.0