From ef13416bfc43e51ef4e20919e0fab81ae05e0fe2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:14:51 -0600 Subject: Rename old tq methods that no longer need a unique name --- src/gui/application/RosegardenDCOP.h | 2 +- src/gui/application/RosegardenGUIApp.cpp | 68 +++++++++++++-------------- src/gui/application/RosegardenGUIApp.cpp.orig | 68 +++++++++++++-------------- src/gui/application/RosegardenGUIApp.h | 2 +- src/gui/application/RosegardenGUIView.cpp | 6 +-- src/gui/application/RosegardenIface.h | 2 +- src/gui/application/StartupTester.cpp | 2 +- src/gui/application/main.cpp | 2 +- 8 files changed, 76 insertions(+), 76 deletions(-) (limited to 'src/gui/application') diff --git a/src/gui/application/RosegardenDCOP.h b/src/gui/application/RosegardenDCOP.h index e82edbf..749c79b 100644 --- a/src/gui/application/RosegardenDCOP.h +++ b/src/gui/application/RosegardenDCOP.h @@ -44,7 +44,7 @@ typedef enum STARTING_TO_RECORD, RECORDING_ARMED, // gui only state TQUIT -} TransporttqStatus; +} TransportStatus; #endif // _ROSEGARDEN_DCOP_H_ diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp index 268affe..53e262e 100644 --- a/src/gui/application/RosegardenGUIApp.cpp +++ b/src/gui/application/RosegardenGUIApp.cpp @@ -437,7 +437,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, // problems. This warning has to happen early, in case it // affects the ability to load plugins etc from a file on the // command line. - m_seqManager->checkSoundDrivertqStatus(true); + m_seqManager->checkSoundDriverStatus(true); } if (m_view) { @@ -445,7 +445,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, m_view, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *))); } - if (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK) { + if (m_seqManager->getSoundDriverStatus() & AUDIO_OK) { slotStateChanged("got_audio", true); } else { slotStateChanged("got_audio", false); @@ -1631,7 +1631,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument) TQT_TQOBJECT(this), TQT_SLOT(slotDocumentDevicesResyncd())); m_doc->syncDevices(); - m_doc->clearModifiedtqStatus(); + m_doc->clearModifiedStatus(); if (newDocument->getStudio().haveMidiDevices()) { stateChanged("got_midi_devices"); @@ -1658,7 +1658,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument) emit documentChanged(m_doc); - m_doc->clearModifiedtqStatus(); // because it's set as modified by the various + m_doc->clearModifiedStatus(); // because it's set as modified by the various // init operations // TODO: this sucks, have to sort it out somehow. @@ -1739,7 +1739,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType) // Stop if playing // - if (m_seqManager && m_seqManager->getTransporttqStatus() == PLAYING) + if (m_seqManager && m_seqManager->getTransportStatus() == PLAYING) slotStop(); slotEnableTransport(false); @@ -1834,7 +1834,7 @@ RosegardenGUIApp::createDocumentFromRGFile(TQString filePath) newDoc->setAbsFilePath(info.absFilePath()); newDoc->setTitle(info.fileName()); } else { - newDoc->clearModifiedtqStatus(); + newDoc->clearModifiedStatus(); } } else { delete newDoc; @@ -4236,7 +4236,7 @@ RosegardenGUIApp::slotUpdatePlaybackPosition() // std::cerr << "RosegardenGUIApp::slotUpdatePlaybackPosition: mapper timeT = " << elapsedTime << std::endl; - if (m_seqManager->getTransporttqStatus() == RECORDING) { + if (m_seqManager->getTransportStatus() == RECORDING) { MappedComposition mC; if (mapper->getRecordedEvents(mC) > 0) { @@ -4358,10 +4358,10 @@ void RosegardenGUIApp::slotSetPointerPosition(timeT t) // std::cerr << "RosegardenGUIApp::slotSetPointerPosition: t = " << t << std::endl; if (m_seqManager) { - if ( m_seqManager->getTransporttqStatus() == PLAYING || - m_seqManager->getTransporttqStatus() == RECORDING ) { + if ( m_seqManager->getTransportStatus() == PLAYING || + m_seqManager->getTransportStatus() == RECORDING ) { if (t > comp.getEndMarker()) { - if (m_seqManager->getTransporttqStatus() == PLAYING) { + if (m_seqManager->getTransportStatus() == PLAYING) { slotStop(); t = comp.getEndMarker(); @@ -4477,8 +4477,8 @@ void RosegardenGUIApp::slotDisplayBarTime(timeT t) void RosegardenGUIApp::slotRefreshTimeDisplay() { - if ( m_seqManager->getTransporttqStatus() == PLAYING || - m_seqManager->getTransporttqStatus() == RECORDING ) { + if ( m_seqManager->getTransportStatus() == PLAYING || + m_seqManager->getTransportStatus() == RECORDING ) { return ; // it'll be refreshed in a moment anyway } slotSetPointerPosition(m_doc->getComposition().getPosition()); @@ -4560,7 +4560,7 @@ void RosegardenGUIApp::slotTestStartupTester() } #ifdef HAVE_LIBJACK - if (m_seqManager && (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK)) { + if (m_seqManager && (m_seqManager->getSoundDriverStatus() & AUDIO_OK)) { m_haveAudioImporter = m_startupTester->haveAudioFileImporter(&missing); @@ -4623,7 +4623,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) if (isSequencerRunning()) { RG_DEBUG << "RosegardenGUIApp::launchSequencer() - sequencer already running - returning\n"; - if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false); + if (m_seqManager) m_seqManager->checkSoundDriverStatus(false); return true; } @@ -4639,7 +4639,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) << "existing DCOP registered sequencer found\n"; if (useExisting) { - if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false); + if (m_seqManager) m_seqManager->checkSoundDriverStatus(false); m_sequencerProcess = (KProcess*)SequencerExternal; return true; } @@ -4733,7 +4733,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) try { // if (m_seqManager) { // RG_DEBUG << "RosegardenGUIApp::launchSequencer : checking sound driver status\n"; - // m_seqManager->checkSoundDrivertqStatus(); + // m_seqManager->checkSoundDriverStatus(); // } stateChanged("sequencer_running"); @@ -5168,9 +5168,9 @@ RosegardenGUIApp::slotToggleMetronome() { Composition &comp = m_doc->getComposition(); - if (m_seqManager->getTransporttqStatus() == STARTING_TO_RECORD || - m_seqManager->getTransporttqStatus() == RECORDING || - m_seqManager->getTransporttqStatus() == RECORDING_ARMED) { + if (m_seqManager->getTransportStatus() == STARTING_TO_RECORD || + m_seqManager->getTransportStatus() == RECORDING || + m_seqManager->getTransportStatus() == RECORDING_ARMED) { if (comp.useRecordMetronome()) comp.setRecordMetronome(false); else @@ -5192,7 +5192,7 @@ RosegardenGUIApp::slotRewindToBeginning() { // ignore requests if recording // - if (m_seqManager->getTransporttqStatus() == RECORDING) + if (m_seqManager->getTransportStatus() == RECORDING) return ; m_seqManager->rewindToBeginning(); @@ -5203,7 +5203,7 @@ RosegardenGUIApp::slotFastForwardToEnd() { // ignore requests if recording // - if (m_seqManager->getTransporttqStatus() == RECORDING) + if (m_seqManager->getTransportStatus() == RECORDING) return ; m_seqManager->fastForwardToEnd(); @@ -5213,18 +5213,18 @@ void RosegardenGUIApp::slotSetPlayPosition(timeT time) { RG_DEBUG << "RosegardenGUIApp::slotSetPlayPosition(" << time << ")" << endl; - if (m_seqManager->getTransporttqStatus() == RECORDING) + if (m_seqManager->getTransportStatus() == RECORDING) return ; m_doc->slotSetPointerPosition(time); - if (m_seqManager->getTransporttqStatus() == PLAYING) + if (m_seqManager->getTransportStatus() == PLAYING) return ; slotPlay(); } -void RosegardenGUIApp::notifySequencertqStatus(int status) +void RosegardenGUIApp::notifySequencerStatus(int status) { stateChanged("not_playing", (status == PLAYING || @@ -5232,7 +5232,7 @@ void RosegardenGUIApp::notifySequencertqStatus(int status) KXMLGUIClient::StateReverse : KXMLGUIClient::StateNoReverse); if (m_seqManager) - m_seqManager->setTransporttqStatus((TransporttqStatus) status); + m_seqManager->setTransportStatus((TransportStatus) status); } void RosegardenGUIApp::processAsynchronousMidi(const MappedComposition &mC) @@ -5261,10 +5261,10 @@ RosegardenGUIApp::slotRecord() return ; } - if (m_seqManager->getTransporttqStatus() == RECORDING) { + if (m_seqManager->getTransportStatus() == RECORDING) { slotStop(); return ; - } else if (m_seqManager->getTransporttqStatus() == PLAYING) { + } else if (m_seqManager->getTransportStatus() == PLAYING) { slotToggleRecord(); return ; } @@ -5398,7 +5398,7 @@ void RosegardenGUIApp::slotPlay() // slotRecord ensures we don't toggle the recording state in // SequenceManager) // - if (m_seqManager->getTransporttqStatus() == RECORDING_ARMED) { + if (m_seqManager->getTransportStatus() == RECORDING_ARMED) { slotRecord(); return ; } @@ -5481,7 +5481,7 @@ void RosegardenGUIApp::slotRewind() { // ignore requests if recording // - if (m_seqManager->getTransporttqStatus() == RECORDING) + if (m_seqManager->getTransportStatus() == RECORDING) return ; if (m_seqManager) m_seqManager->rewind(); @@ -5491,7 +5491,7 @@ void RosegardenGUIApp::slotFastforward() { // ignore requests if recording // - if (m_seqManager->getTransporttqStatus() == RECORDING) + if (m_seqManager->getTransportStatus() == RECORDING) return ; if (m_seqManager) @@ -6307,8 +6307,8 @@ RosegardenGUIApp::slotAudioManager() connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()), m_audioManagerDialog, TQT_SLOT(close())); - m_audioManagerDialog->setAudioSubsystemtqStatus( - m_seqManager->getSoundDrivertqStatus() & AUDIO_OK); + m_audioManagerDialog->setAudioSubsystemStatus( + m_seqManager->getSoundDriverStatus() & AUDIO_OK); plugAccelerators(m_audioManagerDialog, m_audioManagerDialog->getAccelerators()); @@ -7942,8 +7942,8 @@ void RosegardenGUIApp::slotAutoSave() { if (!m_seqManager || - m_seqManager->getTransporttqStatus() == PLAYING || - m_seqManager->getTransporttqStatus() == RECORDING) + m_seqManager->getTransportStatus() == PLAYING || + m_seqManager->getTransportStatus() == RECORDING) return ; KConfig* config = kapp->config(); diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig index 0b6e768..331096d 100644 --- a/src/gui/application/RosegardenGUIApp.cpp.orig +++ b/src/gui/application/RosegardenGUIApp.cpp.orig @@ -437,7 +437,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, // problems. This warning has to happen early, in case it // affects the ability to load plugins etc from a file on the // command line. - m_seqManager->checkSoundDrivertqStatus(true); + m_seqManager->checkSoundDriverStatus(true); } if (m_view) { @@ -445,7 +445,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer, m_view, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *))); } - if (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK) { + if (m_seqManager->getSoundDriverStatus() & AUDIO_OK) { slotStateChanged("got_audio", true); } else { slotStateChanged("got_audio", false); @@ -1631,7 +1631,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument) this, TQT_SLOT(slotDocumentDevicesResyncd())); m_doc->syncDevices(); - m_doc->clearModifiedtqStatus(); + m_doc->clearModifiedStatus(); if (newDocument->getStudio().haveMidiDevices()) { stateChanged("got_midi_devices"); @@ -1658,7 +1658,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument) emit documentChanged(m_doc); - m_doc->clearModifiedtqStatus(); // because it's set as modified by the various + m_doc->clearModifiedStatus(); // because it's set as modified by the various // init operations // TODO: this sucks, have to sort it out somehow. @@ -1739,7 +1739,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType) // Stop if playing // - if (m_seqManager && m_seqManager->getTransporttqStatus() == PLAYING) + if (m_seqManager && m_seqManager->getTransportStatus() == PLAYING) slotStop(); slotEnableTransport(false); @@ -1834,7 +1834,7 @@ RosegardenGUIApp::createDocumentFromRGFile(TQString filePath) newDoc->setAbsFilePath(info.absFilePath()); newDoc->setTitle(info.fileName()); } else { - newDoc->clearModifiedtqStatus(); + newDoc->clearModifiedStatus(); } } else { delete newDoc; @@ -4236,7 +4236,7 @@ RosegardenGUIApp::slotUpdatePlaybackPosition() // std::cerr << "RosegardenGUIApp::slotUpdatePlaybackPosition: mapper timeT = " << elapsedTime << std::endl; - if (m_seqManager->getTransporttqStatus() == RECORDING) { + if (m_seqManager->getTransportStatus() == RECORDING) { MappedComposition mC; if (mapper->getRecordedEvents(mC) > 0) { @@ -4358,10 +4358,10 @@ void RosegardenGUIApp::slotSetPointerPosition(timeT t) // std::cerr << "RosegardenGUIApp::slotSetPointerPosition: t = " << t << std::endl; if (m_seqManager) { - if ( m_seqManager->getTransporttqStatus() == PLAYING || - m_seqManager->getTransporttqStatus() == RECORDING ) { + if ( m_seqManager->getTransportStatus() == PLAYING || + m_seqManager->getTransportStatus() == RECORDING ) { if (t > comp.getEndMarker()) { - if (m_seqManager->getTransporttqStatus() == PLAYING) { + if (m_seqManager->getTransportStatus() == PLAYING) { slotStop(); t = comp.getEndMarker(); @@ -4477,8 +4477,8 @@ void RosegardenGUIApp::slotDisplayBarTime(timeT t) void RosegardenGUIApp::slotRefreshTimeDisplay() { - if ( m_seqManager->getTransporttqStatus() == PLAYING || - m_seqManager->getTransporttqStatus() == RECORDING ) { + if ( m_seqManager->getTransportStatus() == PLAYING || + m_seqManager->getTransportStatus() == RECORDING ) { return ; // it'll be refreshed in a moment anyway } slotSetPointerPosition(m_doc->getComposition().getPosition()); @@ -4560,7 +4560,7 @@ void RosegardenGUIApp::slotTestStartupTester() } #ifdef HAVE_LIBJACK - if (m_seqManager && (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK)) { + if (m_seqManager && (m_seqManager->getSoundDriverStatus() & AUDIO_OK)) { m_haveAudioImporter = m_startupTester->haveAudioFileImporter(&missing); @@ -4623,7 +4623,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) if (isSequencerRunning()) { RG_DEBUG << "RosegardenGUIApp::launchSequencer() - sequencer already running - returning\n"; - if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false); + if (m_seqManager) m_seqManager->checkSoundDriverStatus(false); return true; } @@ -4639,7 +4639,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) << "existing DCOP registered sequencer found\n"; if (useExisting) { - if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false); + if (m_seqManager) m_seqManager->checkSoundDriverStatus(false); m_sequencerProcess = (KProcess*)SequencerExternal; return true; } @@ -4733,7 +4733,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting) try { // if (m_seqManager) { // RG_DEBUG << "RosegardenGUIApp::launchSequencer : checking sound driver status\n"; - // m_seqManager->checkSoundDrivertqStatus(); + // m_seqManager->checkSoundDriverStatus(); // } stateChanged("sequencer_running"); @@ -5168,9 +5168,9 @@ RosegardenGUIApp::slotToggleMetronome() { Composition &comp = m_doc->getComposition(); - if (m_seqManager->getTransporttqStatus() == STARTING_TO_RECORD || - m_seqManager->getTransporttqStatus() == RECORDING || - m_seqManager->getTransporttqStatus() == RECORDING_ARMED) { + if (m_seqManager->getTransportStatus() == STARTING_TO_RECORD || + m_seqManager->getTransportStatus() == RECORDING || + m_seqManager->getTransportStatus() == RECORDING_ARMED) { if (comp.useRecordMetronome()) comp.setRecordMetronome(false); else @@ -5192,7 +5192,7 @@ RosegardenGUIApp::slotRewindToBeginning() { // ignore requests if recording // - if (m_seqManager->getTransporttqStatus() == RECORDING) + if (m_seqManager->getTransportStatus() == RECORDING) return ; m_seqManager->rewindToBeginning(); @@ -5203,7 +5203,7 @@ RosegardenGUIApp::slotFastForwardToEnd() { // ignore requests if recording // - if (m_seqManager->getTransporttqStatus() == RECORDING) + if (m_seqManager->getTransportStatus() == RECORDING) return ; m_seqManager->fastForwardToEnd(); @@ -5213,18 +5213,18 @@ void RosegardenGUIApp::slotSetPlayPosition(timeT time) { RG_DEBUG << "RosegardenGUIApp::slotSetPlayPosition(" << time << ")" << endl; - if (m_seqManager->getTransporttqStatus() == RECORDING) + if (m_seqManager->getTransportStatus() == RECORDING) return ; m_doc->slotSetPointerPosition(time); - if (m_seqManager->getTransporttqStatus() == PLAYING) + if (m_seqManager->getTransportStatus() == PLAYING) return ; slotPlay(); } -void RosegardenGUIApp::notifySequencertqStatus(int status) +void RosegardenGUIApp::notifySequencerStatus(int status) { stateChanged("not_playing", (status == PLAYING || @@ -5232,7 +5232,7 @@ void RosegardenGUIApp::notifySequencertqStatus(int status) KXMLGUIClient::StateReverse : KXMLGUIClient::StateNoReverse); if (m_seqManager) - m_seqManager->setTransporttqStatus((TransporttqStatus) status); + m_seqManager->setTransportStatus((TransportStatus) status); } void RosegardenGUIApp::processAsynchronousMidi(const MappedComposition &mC) @@ -5261,10 +5261,10 @@ RosegardenGUIApp::slotRecord() return ; } - if (m_seqManager->getTransporttqStatus() == RECORDING) { + if (m_seqManager->getTransportStatus() == RECORDING) { slotStop(); return ; - } else if (m_seqManager->getTransporttqStatus() == PLAYING) { + } else if (m_seqManager->getTransportStatus() == PLAYING) { slotToggleRecord(); return ; } @@ -5398,7 +5398,7 @@ void RosegardenGUIApp::slotPlay() // slotRecord ensures we don't toggle the recording state in // SequenceManager) // - if (m_seqManager->getTransporttqStatus() == RECORDING_ARMED) { + if (m_seqManager->getTransportStatus() == RECORDING_ARMED) { slotRecord(); return ; } @@ -5481,7 +5481,7 @@ void RosegardenGUIApp::slotRewind() { // ignore requests if recording // - if (m_seqManager->getTransporttqStatus() == RECORDING) + if (m_seqManager->getTransportStatus() == RECORDING) return ; if (m_seqManager) m_seqManager->rewind(); @@ -5491,7 +5491,7 @@ void RosegardenGUIApp::slotFastforward() { // ignore requests if recording // - if (m_seqManager->getTransporttqStatus() == RECORDING) + if (m_seqManager->getTransportStatus() == RECORDING) return ; if (m_seqManager) @@ -6307,8 +6307,8 @@ RosegardenGUIApp::slotAudioManager() connect(this, TQT_SIGNAL(documentAboutToChange()), m_audioManagerDialog, TQT_SLOT(close())); - m_audioManagerDialog->setAudioSubsystemtqStatus( - m_seqManager->getSoundDrivertqStatus() & AUDIO_OK); + m_audioManagerDialog->setAudioSubsystemStatus( + m_seqManager->getSoundDriverStatus() & AUDIO_OK); plugAccelerators(m_audioManagerDialog, m_audioManagerDialog->getAccelerators()); @@ -7912,8 +7912,8 @@ void RosegardenGUIApp::slotAutoSave() { if (!m_seqManager || - m_seqManager->getTransporttqStatus() == PLAYING || - m_seqManager->getTransporttqStatus() == RECORDING) + m_seqManager->getTransportStatus() == PLAYING || + m_seqManager->getTransportStatus() == RECORDING) return ; KConfig* config = kapp->config(); diff --git a/src/gui/application/RosegardenGUIApp.h b/src/gui/application/RosegardenGUIApp.h index 6aeeb7a..a8c2a3f 100644 --- a/src/gui/application/RosegardenGUIApp.h +++ b/src/gui/application/RosegardenGUIApp.h @@ -280,7 +280,7 @@ public: /** * Set the sequencer status - pass through DCOP as an int */ - virtual void notifySequencertqStatus(int status); + virtual void notifySequencerStatus(int status); /** * Handle some random incoming MIDI events. diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp index 702e6db..f736ff9 100644 --- a/src/gui/application/RosegardenGUIView.cpp +++ b/src/gui/application/RosegardenGUIView.cpp @@ -1196,7 +1196,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper) bool toSet = false; if (states[instrumentId] == newState && - (getDocument()->getSequenceManager()->getTransporttqStatus() + (getDocument()->getSequenceManager()->getTransportStatus() != STOPPED)) { if (info.level != 0 || info.levelRight != 0) { @@ -1212,7 +1212,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper) if (recStates[instrumentId] == newState && instrument->getType() == Instrument::Audio && - (getDocument()->getSequenceManager()->getTransporttqStatus() + (getDocument()->getSequenceManager()->getTransportStatus() != PLAYING)) { if (recInfo.level != 0 || recInfo.levelRight != 0) { @@ -1238,7 +1238,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper) if (info.level == 0) continue; - if (getDocument()->getSequenceManager()->getTransporttqStatus() + if (getDocument()->getSequenceManager()->getTransportStatus() != STOPPED) { // The information in 'info' is specific for this instrument, not diff --git a/src/gui/application/RosegardenIface.h b/src/gui/application/RosegardenIface.h index 04ab1a2..046033c 100644 --- a/src/gui/application/RosegardenIface.h +++ b/src/gui/application/RosegardenIface.h @@ -86,7 +86,7 @@ k_dcop: // Sequencer updates GUI with status // - virtual void notifySequencertqStatus(int status) = 0; + virtual void notifySequencerStatus(int status) = 0; // Used to map unexpected (async) MIDI events to the user interface. // We can show these on the Transport or on a MIDI Mixer. diff --git a/src/gui/application/StartupTester.cpp b/src/gui/application/StartupTester.cpp index 7a7850b..74704e1 100644 --- a/src/gui/application/StartupTester.cpp +++ b/src/gui/application/StartupTester.cpp @@ -147,7 +147,7 @@ StartupTester::isReady() void StartupTester::stdoutReceived(KProcess *, char *buffer, int len) { - m_stdoutBuffer += TQString::tqfromLatin1(buffer, len); + m_stdoutBuffer += TQString::fromLatin1(buffer, len); } void diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp index ff03584..3b42d7b 100644 --- a/src/gui/application/main.cpp +++ b/src/gui/application/main.cpp @@ -722,7 +722,7 @@ int main(int argc, char *argv[]) TQVBox *mw = dialog->makeVBoxMainWidget(); TQHBox *hb = new TQHBox(mw); TQLabel *image = new TQLabel(hb); - image->tqsetAlignment(TQt::AlignTop); + image->setAlignment(TQt::AlignTop); TQString iconFile = locate("appdata", "pixmaps/misc/welcome-icon.png"); if (!iconFile.isNull()) { image->setPixmap(TQPixmap(iconFile)); -- cgit v1.2.1