mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-12 15:25:34 +08:00
Fix several gcc, cppcheck and clang warnings
This commit is contained in:
@@ -48,7 +48,7 @@ namespace BlackCore
|
|||||||
s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(),
|
s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(),
|
||||||
"componentChanged", this, SIGNAL(componentChanged(uint, uint)));
|
"componentChanged", this, SIGNAL(componentChanged(uint, uint)));
|
||||||
Q_ASSERT(s);
|
Q_ASSERT(s);
|
||||||
|
Q_UNUSED(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ namespace BlackGui
|
|||||||
Q_ASSERT(connected);
|
Q_ASSERT(connected);
|
||||||
connected = this->connect(this->ui->pb_AtcStationsLoadMetar, SIGNAL(clicked()), this, SLOT(getMetar()));
|
connected = this->connect(this->ui->pb_AtcStationsLoadMetar, SIGNAL(clicked()), this, SLOT(getMetar()));
|
||||||
Q_ASSERT(connected);
|
Q_ASSERT(connected);
|
||||||
|
Q_UNUSED(connected);
|
||||||
connect(this, &QTabWidget::currentChanged, this, &CAtcStationComponent::ps_atcStationsTabChanged); // "local" tab changed (booked, online)
|
connect(this, &QTabWidget::currentChanged, this, &CAtcStationComponent::ps_atcStationsTabChanged); // "local" tab changed (booked, online)
|
||||||
connect(this->ui->tvp_AtcStationsOnline, &QTableView::clicked, this, &CAtcStationComponent::ps_onlineAtcStationSelected);
|
connect(this->ui->tvp_AtcStationsOnline, &QTableView::clicked, this, &CAtcStationComponent::ps_onlineAtcStationSelected);
|
||||||
connect(this->ui->tvp_AtcStationsOnline, &CAtcStationView::testRequestDummyAtcOnlineStations, this, &CAtcStationComponent::ps_testCreateDummyOnlineAtcStations);
|
connect(this->ui->tvp_AtcStationsOnline, &CAtcStationView::testRequestDummyAtcOnlineStations, this, &CAtcStationComponent::ps_testCreateDummyOnlineAtcStations);
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ namespace BlackGui
|
|||||||
Q_ASSERT(connected);
|
Q_ASSERT(connected);
|
||||||
connected = this->connect(this->ui->cb_SetupAudioOutputDevice, SIGNAL(currentIndexChanged(int)), this, SLOT(ps_audioDeviceSelected(int)));
|
connected = this->connect(this->ui->cb_SetupAudioOutputDevice, SIGNAL(currentIndexChanged(int)), this, SLOT(ps_audioDeviceSelected(int)));
|
||||||
Q_ASSERT(connected);
|
Q_ASSERT(connected);
|
||||||
|
Q_UNUSED(connected);
|
||||||
|
|
||||||
this->connect(this->ui->pb_SetupAudioMicrophoneTest, &QPushButton::clicked, this, &CAudioSetupComponent::ps_startAudioTest);
|
this->connect(this->ui->pb_SetupAudioMicrophoneTest, &QPushButton::clicked, this, &CAudioSetupComponent::ps_startAudioTest);
|
||||||
this->connect(this->ui->pb_SetupAudioSquelchTest, &QPushButton::clicked, this, &CAudioSetupComponent::ps_startAudioTest);
|
this->connect(this->ui->pb_SetupAudioSquelchTest, &QPushButton::clicked, this, &CAudioSetupComponent::ps_startAudioTest);
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ namespace BlackGui
|
|||||||
// to audio audio context
|
// to audio audio context
|
||||||
c = connect(this->ui->pb_Mute, &QPushButton::toggled, this->getIContextAudio(), &IContextAudio::setMute);
|
c = connect(this->ui->pb_Mute, &QPushButton::toggled, this->getIContextAudio(), &IContextAudio::setMute);
|
||||||
Q_ASSERT(c);
|
Q_ASSERT(c);
|
||||||
|
Q_UNUSED(c);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CAudioVolumeComponent::ps_onMuteChanged(bool muted)
|
void CAudioVolumeComponent::ps_onMuteChanged(bool muted)
|
||||||
|
|||||||
@@ -171,7 +171,6 @@ namespace BlackGui
|
|||||||
}
|
}
|
||||||
else if (this->getIContextAudio())
|
else if (this->getIContextAudio())
|
||||||
{
|
{
|
||||||
CSelcal selcal(selcal);
|
|
||||||
this->getIContextAudio()->playSelcalTone(selcal);
|
this->getIContextAudio()->playSelcalTone(selcal);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -62,8 +62,8 @@ namespace BlackGui
|
|||||||
static const QString &ledsOriginator();
|
static const QString &ledsOriginator();
|
||||||
|
|
||||||
QScopedPointer<BlackGui::CLedWidget> m_ledStandby;
|
QScopedPointer<BlackGui::CLedWidget> m_ledStandby;
|
||||||
QScopedPointer<BlackGui::CLedWidget> m_ledIdent;
|
|
||||||
QScopedPointer<BlackGui::CLedWidget> m_ledModes;
|
QScopedPointer<BlackGui::CLedWidget> m_ledModes;
|
||||||
|
QScopedPointer<BlackGui::CLedWidget> m_ledIdent;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -133,6 +133,7 @@ namespace BlackGui
|
|||||||
connected = this->connect(this->ui->cb_SettingsGuiFontStyle, SIGNAL(currentIndexChanged(QString)), this, SLOT(ps_fontChanged()));
|
connected = this->connect(this->ui->cb_SettingsGuiFontStyle, SIGNAL(currentIndexChanged(QString)), this, SLOT(ps_fontChanged()));
|
||||||
Q_ASSERT(connected);
|
Q_ASSERT(connected);
|
||||||
this->connect(this->ui->tb_SettingsGuiFontColor, &QToolButton::clicked, this, &CSettingsComponent::ps_fontColorDialog);
|
this->connect(this->ui->tb_SettingsGuiFontColor, &QToolButton::clicked, this, &CSettingsComponent::ps_fontColorDialog);
|
||||||
|
Q_UNUSED(connected);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ namespace BlackMisc
|
|||||||
|
|
||||||
// not all classes have implemented nesting
|
// not all classes have implemented nesting
|
||||||
const QString m = QString("Property by index not found (setter), index: ").append(index.toQString());
|
const QString m = QString("Property by index not found (setter), index: ").append(index.toQString());
|
||||||
qFatal(m.toLatin1().constData());
|
qFatal("%s", qPrintable(m));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -88,7 +88,7 @@ namespace BlackMisc
|
|||||||
|
|
||||||
// not all classes have implemented nesting
|
// not all classes have implemented nesting
|
||||||
const QString m = QString("Property by index not found, index: ").append(index.toQString());
|
const QString m = QString("Property by index not found, index: ").append(index.toQString());
|
||||||
qFatal(m.toLatin1().constData());
|
qFatal("%s", qPrintable(m));
|
||||||
return QVariant(m); // avoid compiler warning
|
return QVariant(m); // avoid compiler warning
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -159,8 +159,16 @@ namespace BlackSimPlugin
|
|||||||
if (m_hostStatus == Terminated) return hr;
|
if (m_hostStatus == Terminated) return hr;
|
||||||
|
|
||||||
BlackMisc::CLogMessage(this).info("Hosting terminated!");
|
BlackMisc::CLogMessage(this).info("Hosting terminated!");
|
||||||
hr = m_directPlayPeer->TerminateSession(nullptr, 0, 0);
|
if (FAILED(hr = m_directPlayPeer->TerminateSession(nullptr, 0, 0)))
|
||||||
hr = m_directPlayPeer->Close(0);
|
{
|
||||||
|
return printDirectPlayError(hr);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (FAILED(hr = m_directPlayPeer->Close(0)))
|
||||||
|
{
|
||||||
|
return printDirectPlayError(hr);
|
||||||
|
}
|
||||||
|
|
||||||
m_hostStatus = Terminated;
|
m_hostStatus = Terminated;
|
||||||
|
|
||||||
emit statusChanged(m_hostStatus);
|
emit statusChanged(m_hostStatus);
|
||||||
|
|||||||
Reference in New Issue
Block a user