diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:16:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:16:04 -0600 |
| commit | 990bf92fa5cefbe5ebb34a172d18bb3df745bd7a (patch) | |
| tree | a458e45739951ac897cb2ca9cd172a30bdcc6e2f /src/gui/studio/MidiProgramsEditor.cpp | |
| parent | fb3718a55f355cd22f9eb9fa4e89cd3b84b8c9ca (diff) | |
| download | rosegarden-990bf92fa5cefbe5ebb34a172d18bb3df745bd7a.tar.gz rosegarden-990bf92fa5cefbe5ebb34a172d18bb3df745bd7a.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/studio/MidiProgramsEditor.cpp')
| -rw-r--r-- | src/gui/studio/MidiProgramsEditor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp index 64a9e02..25cad16 100644 --- a/src/gui/studio/MidiProgramsEditor.cpp +++ b/src/gui/studio/MidiProgramsEditor.cpp @@ -293,7 +293,7 @@ MidiProgramsEditor::slotNewPercussion() RG_DEBUG << "MidiProgramsEditor::slotNewPercussion" << endl; bool percussion = m_percussion->isChecked(); m_percussion->blockSignals(true); - if (banklistContains(MidiBank(percussion, m_msb->value(), m_lsb->value()))) { + if (bantdelistContains(MidiBank(percussion, m_msb->value(), m_lsb->value()))) { RG_DEBUG << "MidiProgramsEditor::slotNewPercussion: calling setChecked(" << !percussion << ")" << endl; m_percussion->setChecked(!percussion); } else { @@ -547,7 +547,7 @@ int MidiProgramsEditor::ensureUniqueMSB(int msb, bool ascending) { int newMSB = msb; - while (banklistContains(MidiBank(m_percussion->isChecked(), + while (bantdelistContains(MidiBank(m_percussion->isChecked(), newMSB, m_lsb->value())) && newMSB < 128 && newMSB > -1) @@ -566,7 +566,7 @@ int MidiProgramsEditor::ensureUniqueLSB(int lsb, bool ascending) { int newLSB = lsb; - while (banklistContains(MidiBank(m_percussion->isChecked(), + while (bantdelistContains(MidiBank(m_percussion->isChecked(), m_msb->value(), newLSB)) && newLSB < 128 && newLSB > -1) @@ -582,7 +582,7 @@ MidiProgramsEditor::ensureUniqueLSB(int lsb, bool ascending) } bool -MidiProgramsEditor::banklistContains(const MidiBank &bank) +MidiProgramsEditor::bantdelistContains(const MidiBank &bank) { BankList::iterator it; |