Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More warning fixes #4118

Merged
merged 5 commits into from
Jul 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/controllers/midi/hss1394controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ void DeviceChannelListener::Reconnected() {

Hss1394Controller::Hss1394Controller(
const hss1394::TNodeInfo& deviceInfo,
int deviceIndex,
UserSettingsPointer pConfig)
int deviceIndex)
: MidiController(),
m_deviceInfo(deviceInfo),
m_iDeviceIndex(deviceIndex) {
Expand Down
3 changes: 1 addition & 2 deletions src/controllers/midi/hss1394controller.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ class Hss1394Controller : public MidiController {
public:
Hss1394Controller(
const hss1394::TNodeInfo& deviceInfo,
int deviceIndex,
UserSettingsPointer pConfig);
int deviceIndex);
~Hss1394Controller() override;

private slots:
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/midi/hss1394enumerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ QList<Controller*> Hss1394Enumerator::queryDevices() {
QString("%1").arg(tNodeInfo.uProtocolVersion, 0, 16));
qDebug() << " " << message;
Hss1394Controller* currentDevice = new Hss1394Controller(
tNodeInfo, i, m_pConfig);
tNodeInfo, i);
m_devices.push_back(currentDevice);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/encoder/encoderopus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ void EncoderOpus::pushTagsPacket() {
int commentCount = 0;

const char* vendorString = opus_get_version_string();
int vendorStringLength = strlen(vendorString);
int vendorStringLength = static_cast<int>(strlen(vendorString));

// == Compute tags frame size ==
// - Magic signature: 8 bytes
Expand Down
2 changes: 1 addition & 1 deletion src/engine/sync/synccontrol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ void SyncControl::updateAudible() {
if (channelIndex >= 0) {
CSAMPLE_GAIN gain = getEngineMaster()->getMasterGain(channelIndex);
bool newAudible = gain > CSAMPLE_GAIN_ZERO;
if (m_audible != newAudible) {
if (static_cast<bool>(m_audible) != newAudible) {
m_audible = newAudible;
m_pEngineSync->notifyPlayingAudible(this, m_pPlayButton->toBool() && m_audible);
}
Expand Down
1 change: 1 addition & 0 deletions src/library/export/dlglibraryexport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ void DlgLibraryExport::checkExistingDatabase() {
}

} catch (std::exception& e) {
Q_UNUSED(e);
m_pExistingDatabaseLabel->setText(
tr("A database already exists in the chosen directory, "
"but there was a problem loading it. Export is not "
Expand Down
2 changes: 1 addition & 1 deletion src/widget/wtracktableviewheader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ HeaderViewState::HeaderViewState(const QString& base64serialized) {
QString HeaderViewState::saveState() const {
// Serialize the proto to a byte array, then encode the array as Base64.
#if GOOGLE_PROTOBUF_VERSION >= 3001000
size_t size = m_view_state.ByteSizeLong();
int size = static_cast<int>(m_view_state.ByteSizeLong());
#else
int size = m_view_state.ByteSize();
#endif
Expand Down