From 2d847714ede4042f8a02bb0ed79bf2dc1f069709 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sat, 10 Sep 2011 00:47:56 +0000 Subject: namespace fixes and cleanups --- muse2/ChangeLog | 2 ++ muse2/muse/app.cpp | 4 ++-- muse2/muse/arranger/arranger.cpp | 2 +- muse2/muse/arranger/tlist.cpp | 2 +- muse2/muse/confmport.cpp | 4 ++-- muse2/muse/midiedit/drumedit.cpp | 2 +- muse2/muse/mixer/astrip.cpp | 2 +- muse2/muse/mixer/panknob.cpp | 6 +++--- muse2/muse/plugin.cpp | 2 +- muse2/muse/widgets/noteinfo.h | 2 +- 10 files changed, 15 insertions(+), 13 deletions(-) (limited to 'muse2') diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 76a0d19a..ceb70e70 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -16,6 +16,8 @@ - Test OK here so far, with stress files and complete pre-existing songs, ALSA, Jack, and Synth midi. (Tim) TODO: Restoration of sustain upon play seems broken for a while - try putEvent instead of addScheduledEvent in Audio::startRolling(). + - Cleaned some namespace change artifacts. Fixed signal/slot mechanism related to bigtime, pianoroll, + drumedit (Orcan) 08.09.2011: - Finished namespace MusEWidget. Added namespaces MusEUtil, MusEDialog. (Orcan) 07.09.2011: diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index e3741071..5eaaca72 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -962,7 +962,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow() //-------- View connections connect(viewTransportAction, SIGNAL(toggled(bool)), SLOT(toggleTransport(bool))); - connect(viewBigtimeAction, SIGNAL(toggled(bool)), SLOT(toggleMusEWidget::BigTime(bool))); + connect(viewBigtimeAction, SIGNAL(toggled(bool)), SLOT(toggleBigTime(bool))); connect(viewMixerAAction, SIGNAL(toggled(bool)),SLOT(toggleMixer1(bool))); connect(viewMixerBAction, SIGNAL(toggled(bool)), SLOT(toggleMixer2(bool))); connect(viewCliplistAction, SIGNAL(toggled(bool)), SLOT(startClipList(bool))); @@ -3478,7 +3478,7 @@ void MusE::showBigtime(bool on) } //--------------------------------------------------------- -// toggleMusEWidget::BigTime +// toggleBigTime //--------------------------------------------------------- void MusE::toggleBigTime(bool checked) diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp index 6f5ba175..3052d7d4 100644 --- a/muse2/muse/arranger/arranger.cpp +++ b/muse2/muse/arranger/arranger.cpp @@ -1013,7 +1013,7 @@ void Arranger::genTrackInfo(QWidget* parent) trackInfo->addWidget(midiTrackInfo, 1); trackInfo->addWidget(0, 2); -/// genMusEWidget::MidiTrackInfo(); +/// genMidiTrackInfo(); } //--------------------------------------------------------- diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index 80deb2df..87f5acde 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -570,7 +570,7 @@ void TList::portsPopupMenu(Track* t, int x, int y) { MidiTrack* track = (MidiTrack*)t; - //QMusEWidget::PopupMenu* p = midiPortsPopup(0); + //QPopupMenu* p = midiPortsPopup(0); MidiDevice* md = 0; int port = -1; if(t->type() == Track::AUDIO_SOFTSYNTH) diff --git a/muse2/muse/confmport.cpp b/muse2/muse/confmport.cpp index 42fb5276..ce59b673 100644 --- a/muse2/muse/confmport.cpp +++ b/muse2/muse/confmport.cpp @@ -647,7 +647,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item) act->setEnabled(!song->midis()->empty()); // && midiPorts[no].device()); connect(defpup, SIGNAL(triggered(QAction*)), SLOT(changeDefInputRoutes(QAction*))); - //connect(defpup, SIGNAL(aboutToHide()), MusEGlobal::muse, SLOT(routingMusEWidget::PopupMenuAboutToHide())); + //connect(defpup, SIGNAL(aboutToHide()), MusEGlobal::muse, SLOT(routingPopupMenuAboutToHide())); //defpup->popup(QCursor::pos()); defpup->exec(QCursor::pos()); delete defpup; @@ -690,7 +690,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item) act->setEnabled(!song->midis()->empty()); // && midiPorts[no].device()); connect(defpup, SIGNAL(triggered(QAction*)), SLOT(changeDefOutputRoutes(QAction*))); - //connect(defpup, SIGNAL(aboutToHide()), MusEGlobal::muse, SLOT(routingMusEWidget::PopupMenuAboutToHide())); + //connect(defpup, SIGNAL(aboutToHide()), MusEGlobal::muse, SLOT(routingPopupMenuAboutToHide())); //defpup->popup(QCursor::pos()); defpup->exec(QCursor::pos()); delete defpup; diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp index e8997367..592df7fb 100644 --- a/muse2/muse/midiedit/drumedit.cpp +++ b/muse2/muse/midiedit/drumedit.cpp @@ -412,7 +412,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini split2->setSizes(mops); // By T356. Not much choice but to disable this for now, to stop runaway resize bug. // Can't seem to get the splitter to readjust when manually setting sizes. - //split2->setResizeMode(split1w1, QMusEWidget::Splitter::KeepSize); + //split2->setResizeMode(split1w1, QSplitter::KeepSize); gridS2->setRowStretch(1, 100); gridS2->setColumnStretch(0, 100); diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp index 4084a7d4..1aa9ae2b 100644 --- a/muse2/muse/mixer/astrip.cpp +++ b/muse2/muse/mixer/astrip.cpp @@ -624,7 +624,7 @@ void AudioStrip::updateChannels() } //--------------------------------------------------------- -// addMusEWidget::Knob +// addKnob // type = 0 - panorama // 1 - aux send //--------------------------------------------------------- diff --git a/muse2/muse/mixer/panknob.cpp b/muse2/muse/mixer/panknob.cpp index 077b39e1..f645ddf7 100644 --- a/muse2/muse/mixer/panknob.cpp +++ b/muse2/muse/mixer/panknob.cpp @@ -27,10 +27,10 @@ #include "track.h" //--------------------------------------------------------- -// PanMusEWidget::Knob +// PanKnob //--------------------------------------------------------- -PanMusEWidget::Knob::PanMusEWidget::Knob(QWidget* parent, AudioTrack* s) +PanKnob::PanKnob(QWidget* parent, AudioTrack* s) : MusEWidget::Knob(parent, "pan") { src = s; @@ -41,7 +41,7 @@ PanMusEWidget::Knob::PanMusEWidget::Knob(QWidget* parent, AudioTrack* s) // panChanged //--------------------------------------------------------- -void PanMusEWidget::Knob::valueChanged(double val) +void PanKnob::valueChanged(double val) { //audio->msgSetPan(src, val); // p4.0.21 audio->msgXXX waits. Do we really need to? diff --git a/muse2/muse/plugin.cpp b/muse2/muse/plugin.cpp index 99d89640..75d1ae45 100644 --- a/muse2/muse/plugin.cpp +++ b/muse2/muse/plugin.cpp @@ -3672,7 +3672,7 @@ PluginGui::PluginGui(PluginIBase* p) m->setRange(dlower, dupper); m->setVal(dval); paramsOut[i].actuator = m; -// paramsOut[i].label->setMusEWidget::Slider((MusEWidget::Slider*)params[i].actuator); +// paramsOut[i].label->setSlider((MusEWidget::Slider*)params[i].actuator); //paramsOut[i].actuator->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed)); label->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed)); paramsOut[i].label->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed)); diff --git a/muse2/muse/widgets/noteinfo.h b/muse2/muse/widgets/noteinfo.h index 6ca34a42..9d33db6b 100644 --- a/muse2/muse/widgets/noteinfo.h +++ b/muse2/muse/widgets/noteinfo.h @@ -73,7 +73,7 @@ class NoteInfo : public QToolBar { void setValue(ValType, int); signals: - void valueChanged(NoteInfo::ValType, int); + void valueChanged(MusEWidget::NoteInfo::ValType, int); }; } // namespace MusEWidget -- cgit v1.2.3