Skip to content
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
1 change: 0 additions & 1 deletion src/controllers/controllerinputmappingtablemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion src/controllers/controlleroutputmappingtablemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 0 additions & 6 deletions src/controllers/controllerpresetfilehandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions src/effects/lv2/lv2manifest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/encoder/encoderrecordingsettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
1 change: 0 additions & 1 deletion src/library/browse/browsetablemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion src/library/crate/cratefeature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,6 @@ void CrateFeature::slotExportPlaylist() {
ConfigKey("[Library]", "UseRelativePathOnExport"));

// Create list of files of the crate
QList<QString> playlist_items;
// Create a new table model since the main one might have an active search.
QScopedPointer<CrateTableModel> pCrateTableModel(
new CrateTableModel(this, m_pLibrary->trackCollections()));
Expand Down
1 change: 0 additions & 1 deletion src/musicbrainz/musicbrainzclient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion src/preferences/dialog/dlgprefdeck.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ DlgPrefDeck::DlgPrefDeck(QWidget * parent, MixxxMainWindow * mixxx,
this,
&DlgPrefDeck::slotTimeFormatChanged);

QLocale locale;
// Track Display model
comboBoxTimeFormat->clear();

Expand Down
1 change: 0 additions & 1 deletion src/test/coverartutils_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ class CoverArtUtilTest : public LibraryTest, public CoverArtCache {
};

TEST_F(CoverArtUtilTest, extractEmbeddedCover) {
QImage cover;
QImage referencePNGImage = QImage(kReferencePNGLocationTest);
QImage referenceJPGImage = QImage(kReferenceJPGLocationTest);

Expand Down
1 change: 0 additions & 1 deletion src/util/db/dbnamedentity.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ class DbNamedEntity: public DbEntity<T> {
DEBUG_ASSERT(!hasName());
}
bool parseName(const QString& name) {
QString normalizedName(normalizeName(name));
if (name.isEmpty()) {
return false;
} else {
Expand Down