diff options
| -rw-r--r-- | muse/README | 2 | ||||
| -rw-r--r-- | muse/muse/ctrl/configmidictrl.cpp | 6 | ||||
| -rw-r--r-- | muse/muse/ctrl/ctrldialog.h | 1 | ||||
| -rw-r--r-- | muse/muse/midiedit/dcanvas.cpp | 7 | ||||
| -rw-r--r-- | muse/muse/midiedit/prcanvas.cpp | 7 |
5 files changed, 12 insertions, 11 deletions
diff --git a/muse/README b/muse/README index 8eff931b..f41149d4 100644 --- a/muse/README +++ b/muse/README @@ -23,7 +23,7 @@ details. - CMake 2.4 http:/www.cmake.org/HTML/Download.html - - QT: Qt 4.1.0 or above + - QT: Qt 4.2.0 or above ftp://ftp.trolltech.com/qt/source MusE does _not_ compile with older versions diff --git a/muse/muse/ctrl/configmidictrl.cpp b/muse/muse/ctrl/configmidictrl.cpp index e7352be8..1bbc2241 100644 --- a/muse/muse/ctrl/configmidictrl.cpp +++ b/muse/muse/ctrl/configmidictrl.cpp @@ -47,14 +47,13 @@ ConfigMidiCtrl::ConfigMidiCtrl(MidiTrack* t) //--------------------------------------------------- if (track->type() == Track::MIDI) { -#if 0 MidiTrack* mc = (MidiTrack*)track; portName->setText(track->name()); // // populate popup with all controllers available for // current instrument // - MidiControllerList* mcl = mp->instrument()->controller(); + MidiControllerList* mcl = mc->instrument()->controller(); for (iMidiController ci = mcl->begin(); ci != mcl->end(); ++ci) { iControllerName i; for (i = cn->begin(); i != cn->end(); ++i) { @@ -64,7 +63,6 @@ ConfigMidiCtrl::ConfigMidiCtrl(MidiTrack* t) if (i == cn->end()) availableController->addItem((*ci)->name()); } -#endif } delete cn; @@ -138,7 +136,6 @@ void ConfigMidiCtrl::done(int code) QDialog::done(code); return; } -#if 1 //TODOA if (track->type() == Track::MIDI) { ControllerNameList* cn = track->controllerNames(); MidiInstrument* instr = track->instrument(); @@ -182,7 +179,6 @@ void ConfigMidiCtrl::done(int code) } delete cn; } -#endif QDialog::done(code); } diff --git a/muse/muse/ctrl/ctrldialog.h b/muse/muse/ctrl/ctrldialog.h index 063cfcc2..d3889580 100644 --- a/muse/muse/ctrl/ctrldialog.h +++ b/muse/muse/ctrl/ctrldialog.h @@ -40,6 +40,5 @@ class CtrlDialog : public QDialog, public Ui_CtrlDialogBase { int curId() const; }; - #endif diff --git a/muse/muse/midiedit/dcanvas.cpp b/muse/muse/midiedit/dcanvas.cpp index 9f367683..ed258b73 100644 --- a/muse/muse/midiedit/dcanvas.cpp +++ b/muse/muse/midiedit/dcanvas.cpp @@ -411,6 +411,7 @@ void DrumCanvas::paste() void DrumCanvas::startDrag(CItem* /* item*/, bool /*copymode*/) { +printf("DrumCanvas: startDrag\n"); #if 0 //TD QMimeData* drag = getTextDrag(); if (drag) { @@ -429,6 +430,7 @@ void DrumCanvas::startDrag(CItem* /* item*/, bool /*copymode*/) void DrumCanvas::dragEnterEvent(QDragEnterEvent* /*event*/) { +printf("DrumCanvas: dragEnterEvent\n"); //TD event->accept(Q3TextDrag::canDecode(event)); } @@ -438,7 +440,7 @@ void DrumCanvas::dragEnterEvent(QDragEnterEvent* /*event*/) void DrumCanvas::dragMoveEvent(QDragMoveEvent*) { -//TD printf("drag move %x\n", this); + printf("drag move %p\n", this); } //--------------------------------------------------------- @@ -447,7 +449,7 @@ void DrumCanvas::dragMoveEvent(QDragMoveEvent*) void DrumCanvas::dragLeaveEvent(QDragLeaveEvent*) { -//TD printf("drag leave\n"); + printf("drag leave\n"); } //--------------------------------------------------------- @@ -456,6 +458,7 @@ void DrumCanvas::dragLeaveEvent(QDragLeaveEvent*) void DrumCanvas::viewDropEvent(QDropEvent* /*event*/) { +printf("DrumCanvas: viewDropEvent\n"); #if 0 //TD QString text; if (event->source() == this) { diff --git a/muse/muse/midiedit/prcanvas.cpp b/muse/muse/midiedit/prcanvas.cpp index 96a5d9ba..d80d77ed 100644 --- a/muse/muse/midiedit/prcanvas.cpp +++ b/muse/muse/midiedit/prcanvas.cpp @@ -516,6 +516,7 @@ void PianoCanvas::paste() void PianoCanvas::startDrag(CItem* /*item*/, bool /*copymode*/) { +printf("PianoCanvas: startDrag\n"); QMimeData* drag = getTextDrag(); if (drag) { QApplication::clipboard()->setMimeData(drag); @@ -534,6 +535,7 @@ void PianoCanvas::startDrag(CItem* /*item*/, bool /*copymode*/) void PianoCanvas::dragEnterEvent(QDragEnterEvent*) { +printf("PianoCanvas: dragEnterEvent\n"); //TD event->accept(Q3TextDrag::canDecode(event)); } @@ -543,7 +545,7 @@ void PianoCanvas::dragEnterEvent(QDragEnterEvent*) void PianoCanvas::dragMoveEvent(QDragMoveEvent*) { -// printf("drag move %x\n", this); + printf("drag move %p\n", this); } //--------------------------------------------------------- @@ -552,7 +554,7 @@ void PianoCanvas::dragMoveEvent(QDragMoveEvent*) void PianoCanvas::dragLeaveEvent(QDragLeaveEvent*) { -// printf("drag leave\n"); + printf("drag leave\n"); } //--------------------------------------------------------- @@ -561,6 +563,7 @@ void PianoCanvas::dragLeaveEvent(QDragLeaveEvent*) void PianoCanvas::viewDropEvent(QDropEvent*) { +printf("PianoCanvas: viewDropEvent\n"); #if 0 //TD QString text; if (event->source() == this) { |