From f747181690ab29525b26d0a2a9f1ca258fb56943 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Tue, 21 Jan 2020 13:21:41 +0100 Subject: [PATCH 1/3] encoder/encoderrecordingsettings: Add missing override to setCompression --- src/encoder/encoderrecordingsettings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/encoder/encoderrecordingsettings.h b/src/encoder/encoderrecordingsettings.h index 2a12835d11b6..6ea1b69c5d03 100644 --- a/src/encoder/encoderrecordingsettings.h +++ b/src/encoder/encoderrecordingsettings.h @@ -28,7 +28,7 @@ class EncoderRecordingSettings : public EncoderSettings { } // Sets the compression level - virtual void setCompression(int compression) { + void setCompression(int compression) override { Q_UNUSED(compression); DEBUG_ASSERT(!"unimplemented"); } From d831169b407cbea083394c432169e66193df8038 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Tue, 21 Jan 2020 13:28:39 +0100 Subject: [PATCH 2/3] util/db/dbnamedentity: Remove unused QString variable Fixes this warning: src/util/db/dbnamedentity.h:33:9: warning: unused QString [-Wclazy-unused-non-trivial-variable] QString normalizedName(normalizeName(name)); ^ --- src/util/db/dbnamedentity.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/db/dbnamedentity.h b/src/util/db/dbnamedentity.h index 4d4ad10235b7..cecbef5aab9e 100644 --- a/src/util/db/dbnamedentity.h +++ b/src/util/db/dbnamedentity.h @@ -30,7 +30,6 @@ class DbNamedEntity: public DbEntity { DEBUG_ASSERT(!hasName()); } bool parseName(const QString& name) { - QString normalizedName(normalizeName(name)); if (name.isEmpty()) { return false; } else { From 7a9459a1623929330e08022e9d2ca85afbcd327f Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Tue, 21 Jan 2020 13:40:00 +0100 Subject: [PATCH 3/3] Remove a bunch of unused non-trivial variables src/controllers/controllerinputmappingtablemodel.cpp:186:9: warning: unused QString [-Wclazy-unused-non-trivial-variable] src/controllers/controlleroutputmappingtablemodel.cpp:154:9: warning: unused QString [-Wclazy-unused-non-trivial-variable] src/controllers/controllerpresetfilehandler.cpp:39:5: warning: unused QString [-Wclazy-unused-non-trivial-variable] src/effects/lv2/lv2manifest.cpp:45:17: warning: unused QString [-Wclazy-unused-non-trivial-variable] src/effects/lv2/lv2manifest.cpp:50:17: warning: unused QString [-Wclazy-unused-non-trivial-variable] src/library/browse/browsetablemodel.cpp:301:5: warning: unused QString [-Wclazy-unused-non-trivial-variable] src/library/crate/cratefeature.cpp:725:5: warning: unused QList [-Wclazy-unused-non-trivial-variable] src/musicbrainz/musicbrainzclient.cpp:139:9: warning: unused QString [-Wclazy-unused-non-trivial-variable] src/preferences/dialog/dlgprefdeck.cpp:118:5: warning: unused QLocale [-Wclazy-unused-non-trivial-variable] src/preferences/dialog/dlgprefeq.cpp:389:9: warning: unused QString [-Wclazy-unused-non-trivial-variable] src/preferences/dialog/dlgprefeq.cpp:413:9: warning: unused QString [-Wclazy-unused-non-trivial-variable] src/skin/legacyskinparser.cpp:1991:5: warning: unused QDomNode [-Wclazy-unused-non-trivial-variable] src/test/coverartutils_test.cpp:53:5: warning: unused QImage [-Wclazy-unused-non-trivial-variable] src/util/db/dbnamedentity.h:33:9: warning: unused QString [-Wclazy-unused-non-trivial-variable] --- src/controllers/controllerinputmappingtablemodel.cpp | 1 - src/controllers/controlleroutputmappingtablemodel.cpp | 1 - src/controllers/controllerpresetfilehandler.cpp | 6 ------ src/effects/lv2/lv2manifest.cpp | 2 -- src/library/browse/browsetablemodel.cpp | 1 - src/library/crate/cratefeature.cpp | 1 - src/musicbrainz/musicbrainzclient.cpp | 1 - src/preferences/dialog/dlgprefdeck.cpp | 1 - src/test/coverartutils_test.cpp | 1 - 9 files changed, 15 deletions(-) diff --git a/src/controllers/controllerinputmappingtablemodel.cpp b/src/controllers/controllerinputmappingtablemodel.cpp index 44e686132a03..456e0556307e 100644 --- a/src/controllers/controllerinputmappingtablemodel.cpp +++ b/src/controllers/controllerinputmappingtablemodel.cpp @@ -183,7 +183,6 @@ QVariant ControllerInputMappingTableModel::data(const QModelIndex& index, } const MidiInputMapping& mapping = m_midiInputMappings.at(row); - QString value; switch (column) { case MIDI_COLUMN_CHANNEL: return MidiUtils::channelFromStatus(mapping.key.status); diff --git a/src/controllers/controlleroutputmappingtablemodel.cpp b/src/controllers/controlleroutputmappingtablemodel.cpp index eb2da9d606e7..7dc3756e4146 100644 --- a/src/controllers/controlleroutputmappingtablemodel.cpp +++ b/src/controllers/controlleroutputmappingtablemodel.cpp @@ -151,7 +151,6 @@ QVariant ControllerOutputMappingTableModel::data(const QModelIndex& index, } const MidiOutputMapping& mapping = m_midiOutputMappings.at(row); - QString value; switch (column) { case MIDI_COLUMN_CHANNEL: return MidiUtils::channelFromStatus(mapping.output.status); diff --git a/src/controllers/controllerpresetfilehandler.cpp b/src/controllers/controllerpresetfilehandler.cpp index 52c77c96a535..f50b8bd1b23f 100644 --- a/src/controllers/controllerpresetfilehandler.cpp +++ b/src/controllers/controllerpresetfilehandler.cpp @@ -32,12 +32,6 @@ ControllerPresetPointer ControllerPresetFileHandler::loadPreset(const QString& p return ControllerPresetPointer(); } - // TODO(XXX): This means filenames can't have .foo.midi.xml filenames. We - // should regex match against the end. - // NOTE(rryan): We prepend a dot because all the XXX_PRESET_EXTENSION - // defines include the dot. - QString extension = "." + scriptPathInfo.completeSuffix(); - ControllerPresetFileHandler* pHandler = NULL; if (scriptPath.endsWith(MIDI_PRESET_EXTENSION, Qt::CaseInsensitive)) { pHandler = new MidiControllerPresetFileHandler(); diff --git a/src/effects/lv2/lv2manifest.cpp b/src/effects/lv2/lv2manifest.cpp index b41915fe8195..3607b394a95b 100644 --- a/src/effects/lv2/lv2manifest.cpp +++ b/src/effects/lv2/lv2manifest.cpp @@ -42,12 +42,10 @@ LV2Manifest::LV2Manifest(const LilvPlugin* plug, audioPortIndices.append(i); inputPorts++; info = lilv_port_get_name(m_pLV2plugin, port); - QString paramName = lilv_node_as_string(info); } else if (lilv_port_is_a(m_pLV2plugin, port, properties["output_port"])) { audioPortIndices.append(i); outputPorts++; info = lilv_port_get_name(m_pLV2plugin, port); - QString paramName = lilv_node_as_string(info); } } diff --git a/src/library/browse/browsetablemodel.cpp b/src/library/browse/browsetablemodel.cpp index 12856dd39097..085bc6181010 100644 --- a/src/library/browse/browsetablemodel.cpp +++ b/src/library/browse/browsetablemodel.cpp @@ -298,7 +298,6 @@ Qt::ItemFlags BrowseTableModel::flags(const QModelIndex &index) const { // waveform widget to load a track into a Player). defaultFlags |= Qt::ItemIsDragEnabled; - QString track_location = getTrackLocation(index); int column = index.column(); switch (column) { diff --git a/src/library/crate/cratefeature.cpp b/src/library/crate/cratefeature.cpp index f201115fcba3..0dd77ffaa892 100644 --- a/src/library/crate/cratefeature.cpp +++ b/src/library/crate/cratefeature.cpp @@ -722,7 +722,6 @@ void CrateFeature::slotExportPlaylist() { ConfigKey("[Library]", "UseRelativePathOnExport")); // Create list of files of the crate - QList playlist_items; // Create a new table model since the main one might have an active search. QScopedPointer pCrateTableModel( new CrateTableModel(this, m_pLibrary->trackCollections())); diff --git a/src/musicbrainz/musicbrainzclient.cpp b/src/musicbrainz/musicbrainzclient.cpp index 8341c048b63d..a7027c4efdfa 100644 --- a/src/musicbrainz/musicbrainzclient.cpp +++ b/src/musicbrainz/musicbrainzclient.cpp @@ -136,7 +136,6 @@ void MusicBrainzClient::replyFinished() { QString message = jsonObject["error"].toString(); QStringList propertyNames; QStringList propertyKeys; - QString strReply = (QString)reply->readAll(); emit networkError( reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), "MusicBrainz", message, kDefaultErrorCode); diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp index af130ff1254c..e6c2ced3be24 100644 --- a/src/preferences/dialog/dlgprefdeck.cpp +++ b/src/preferences/dialog/dlgprefdeck.cpp @@ -115,7 +115,6 @@ DlgPrefDeck::DlgPrefDeck(QWidget * parent, MixxxMainWindow * mixxx, this, &DlgPrefDeck::slotTimeFormatChanged); - QLocale locale; // Track Display model comboBoxTimeFormat->clear(); diff --git a/src/test/coverartutils_test.cpp b/src/test/coverartutils_test.cpp index 9282176c972f..2f93c469c36d 100644 --- a/src/test/coverartutils_test.cpp +++ b/src/test/coverartutils_test.cpp @@ -50,7 +50,6 @@ class CoverArtUtilTest : public LibraryTest, public CoverArtCache { }; TEST_F(CoverArtUtilTest, extractEmbeddedCover) { - QImage cover; QImage referencePNGImage = QImage(kReferencePNGLocationTest); QImage referenceJPGImage = QImage(kReferenceJPGLocationTest);