From e9f46130c2656aaf299d8793556310c9bf95daee Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 2 Jan 2024 11:38:07 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- src/gui/dialogs/AudioManagerDialog.cpp | 64 ++++++++-------- src/gui/dialogs/AudioPluginDialog.cpp | 36 ++++----- src/gui/dialogs/AudioSplitDialog.cpp | 4 +- src/gui/dialogs/ClefDialog.cpp | 8 +- src/gui/dialogs/ConfigureDialog.cpp | 8 +- src/gui/dialogs/CountdownDialog.cpp | 2 +- src/gui/dialogs/EventEditDialog.cpp | 44 +++++------ src/gui/dialogs/EventFilterDialog.cpp | 36 ++++----- src/gui/dialogs/EventParameterDialog.cpp | 4 +- src/gui/dialogs/IdentifyTextCodecDialog.cpp | 4 +- src/gui/dialogs/InterpretDialog.cpp | 2 +- src/gui/dialogs/IntervalDialog.cpp | 8 +- src/gui/dialogs/KeySignatureDialog.cpp | 16 ++-- src/gui/dialogs/LyricEditDialog.cpp | 4 +- src/gui/dialogs/ManageMetronomeDialog.cpp | 30 ++++---- src/gui/dialogs/PasteNotationDialog.cpp | 4 +- src/gui/dialogs/PitchDialog.cpp | 4 +- src/gui/dialogs/RescaleDialog.cpp | 4 +- src/gui/dialogs/SimpleEventEditDialog.cpp | 64 ++++++++-------- src/gui/dialogs/TempoDialog.cpp | 42 +++++------ src/gui/dialogs/TextEventDialog.cpp | 34 ++++----- src/gui/dialogs/TimeDialog.cpp | 8 +- src/gui/dialogs/TimeSignatureDialog.cpp | 12 +-- src/gui/dialogs/TransportDialog.cpp | 110 ++++++++++++++-------------- src/gui/dialogs/TupletDialog.cpp | 22 +++--- src/gui/dialogs/UseOrnamentDialog.cpp | 2 +- 26 files changed, 288 insertions(+), 288 deletions(-) (limited to 'src/gui/dialogs') diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp index 8827400..7a12b9b 100644 --- a/src/gui/dialogs/AudioManagerDialog.cpp +++ b/src/gui/dialogs/AudioManagerDialog.cpp @@ -128,47 +128,47 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent, TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/transport-play.xpm")); new TDEAction(i18n("&Add Audio File..."), "document-open", 0, this, - TQT_SLOT(slotAdd()), actionCollection(), "add_audio"); + TQ_SLOT(slotAdd()), actionCollection(), "add_audio"); new TDEAction(i18n("&Unload Audio File"), "edit-delete", 0, this, - TQT_SLOT(slotRemove()), + TQ_SLOT(slotRemove()), actionCollection(), "remove_audio"); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/transport-play.xpm")); new TDEAction(i18n("&Play Preview"), icon, 0, this, - TQT_SLOT(slotPlayPreview()), + TQ_SLOT(slotPlayPreview()), actionCollection(), "preview_audio"); /*!!! Not actually implemented -- this never worked right! new TDEAction(i18n("Re&label"), 0, 0, this, - TQT_SLOT(slotRename()), + TQ_SLOT(slotRename()), actionCollection(), "rename_audio"); */ icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/insert_audio_into_track.xpm")); new TDEAction(i18n("&Insert into Selected Audio Track"), - icon, 0, this, TQT_SLOT(slotInsert()), + icon, 0, this, TQ_SLOT(slotInsert()), actionCollection(), "insert_audio"); new TDEAction(i18n("Unload &all Audio Files"), 0, 0, this, - TQT_SLOT(slotRemoveAll()), + TQ_SLOT(slotRemoveAll()), actionCollection(), "remove_all_audio"); new TDEAction(i18n("Unload all &Unused Audio Files"), 0, 0, this, - TQT_SLOT(slotRemoveAllUnused()), + TQ_SLOT(slotRemoveAllUnused()), actionCollection(), "remove_all_unused_audio"); new TDEAction(i18n("&Delete Unused Audio Files..."), 0, 0, this, - TQT_SLOT(slotDeleteUnused()), + TQ_SLOT(slotDeleteUnused()), actionCollection(), "delete_unused_audio"); new TDEAction(i18n("&Export Audio File..."), "fileexport", 0, this, - TQT_SLOT(slotExportAudio()), + TQ_SLOT(slotExportAudio()), actionCollection(), "export_audio"); /* new TDEAction(i18n("Distribute Audio on &MIDI"), 0, 0, this, - TQT_SLOT(slotDistributeOnMidiSegment()), + TQ_SLOT(slotDistributeOnMidiSegment()), actionCollection(), "distribute_audio"); */ @@ -200,11 +200,11 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent, m_fileList->setShowToolTips(true); // connect selection mechanism - connect(m_fileList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(m_fileList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*))); - connect(m_fileList, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), - TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*))); + connect(m_fileList, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), + TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*))); // setup local accelerators // @@ -214,22 +214,22 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent, // m_accelerators->connectItem(m_accelerators->insertItem(Key_Delete), this, - TQT_SLOT(slotRemove())); + TQ_SLOT(slotRemove())); slotPopulateFileList(); // Connect command history for updates // - connect(getCommandHistory(), TQT_SIGNAL(commandExecuted(KCommand *)), - this, TQT_SLOT(slotCommandExecuted(KCommand *))); + connect(getCommandHistory(), TQ_SIGNAL(commandExecuted(KCommand *)), + this, TQ_SLOT(slotCommandExecuted(KCommand *))); //setInitialSize(configDialogSize(AudioManagerDialogConfigGroup)); - connect(m_playTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotCancelPlayingAudio())); + connect(m_playTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotCancelPlayingAudio())); KStdAction::close(this, - TQT_SLOT(slotClose()), + TQ_SLOT(slotClose()), actionCollection()); createGUI("audiomanager.rc"); @@ -1091,12 +1091,12 @@ AudioManagerDialog::addFile(const KURL& kurl) // Connect the progress dialog // - connect(&aFM, TQT_SIGNAL(setProgress(int)), - progressDlg.progressBar(), TQT_SLOT(setValue(int))); - connect(&aFM, TQT_SIGNAL(setOperationName(TQString)), - &progressDlg, TQT_SLOT(slotSetOperationName(TQString))); - connect(&progressDlg, TQT_SIGNAL(cancelClicked()), - &aFM, TQT_SLOT(slotStopImport())); + connect(&aFM, TQ_SIGNAL(setProgress(int)), + progressDlg.progressBar(), TQ_SLOT(setValue(int))); + connect(&aFM, TQ_SIGNAL(setOperationName(TQString)), + &progressDlg, TQ_SLOT(slotSetOperationName(TQString))); + connect(&progressDlg, TQ_SIGNAL(cancelClicked()), + &aFM, TQ_SLOT(slotStopImport())); try { id = aFM.importURL(kurl, m_sampleRate); @@ -1112,10 +1112,10 @@ AudioManagerDialog::addFile(const KURL& kurl) return false; } - disconnect(&progressDlg, TQT_SIGNAL(cancelClicked()), - &aFM, TQT_SLOT(slotStopImport())); - connect(&progressDlg, TQT_SIGNAL(cancelClicked()), - &aFM, TQT_SLOT(slotStopPreview())); + disconnect(&progressDlg, TQ_SIGNAL(cancelClicked()), + &aFM, TQ_SLOT(slotStopImport())); + connect(&progressDlg, TQ_SIGNAL(cancelClicked()), + &aFM, TQ_SLOT(slotStopPreview())); progressDlg.progressBar()->show(); progressDlg.slotSetOperationName(i18n("Generating audio preview...")); @@ -1129,8 +1129,8 @@ AudioManagerDialog::addFile(const KURL& kurl) KMessageBox::information(this, message); } - disconnect(&progressDlg, TQT_SIGNAL(cancelClicked()), - &aFM, TQT_SLOT(slotStopPreview())); + disconnect(&progressDlg, TQ_SIGNAL(cancelClicked()), + &aFM, TQ_SLOT(slotStopPreview())); slotPopulateFileList(); diff --git a/src/gui/dialogs/AudioPluginDialog.cpp b/src/gui/dialogs/AudioPluginDialog.cpp index 8c22d36..03afa0c 100644 --- a/src/gui/dialogs/AudioPluginDialog.cpp +++ b/src/gui/dialogs/AudioPluginDialog.cpp @@ -118,8 +118,8 @@ AudioPluginDialog::AudioPluginDialog(TQWidget *parent, TQToolTip::add (m_bypass, i18n("Bypass this plugin.")); - connect(m_bypass, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotBypassChanged(bool))); + connect(m_bypass, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotBypassChanged(bool))); m_insOuts = new TQLabel(i18n(""), h); @@ -132,29 +132,29 @@ AudioPluginDialog::AudioPluginDialog(TQWidget *parent, TQToolTip::add (m_pluginId, i18n("Unique ID of plugin.")); - connect(m_pluginList, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPluginSelected(int))); + connect(m_pluginList, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPluginSelected(int))); - connect(m_pluginCategoryList, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotCategorySelected(int))); + connect(m_pluginCategoryList, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotCategorySelected(int))); // new line h = new TQHBox(pluginSelectionBox); m_copyButton = new TQPushButton(i18n("Copy"), h); - connect(m_copyButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopy())); + connect(m_copyButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopy())); TQToolTip::add (m_copyButton, i18n("Copy plugin parameters")); m_pasteButton = new TQPushButton(i18n("Paste"), h); - connect(m_pasteButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotPaste())); + connect(m_pasteButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotPaste())); TQToolTip::add (m_pasteButton, i18n("Paste plugin parameters")); m_defaultButton = new TQPushButton(i18n("Default"), h); - connect(m_defaultButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDefault())); + connect(m_defaultButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDefault())); TQToolTip::add (m_defaultButton, i18n("Set to defaults")); @@ -523,8 +523,8 @@ AudioPluginDialog::slotPluginSelected(int i) m_gridLayout->addMultiCellWidget(m_programCombo, 0, 0, 1, m_gridLayout->numCols() - 1, TQt::AlignLeft); - connect(m_programCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotPluginProgramChanged(const TQString &))); + connect(m_programCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotPluginProgramChanged(const TQString &))); m_programCombo->clear(); m_programCombo->insertItem(i18n("")); @@ -553,8 +553,8 @@ AudioPluginDialog::slotPluginSelected(int i) showBounds, portCount > tooManyPorts); - connect(control, TQT_SIGNAL(valueChanged(float)), - this, TQT_SLOT(slotPluginPortChanged(float))); + connect(control, TQ_SIGNAL(valueChanged(float)), + this, TQ_SLOT(slotPluginPortChanged(float))); m_pluginWidgets.push_back(control); } @@ -720,8 +720,8 @@ AudioPluginDialog::updatePluginProgramList() m_programCombo->show(); m_programCombo->blockSignals(true); - connect(m_programCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotPluginProgramChanged(const TQString &))); + connect(m_programCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotPluginProgramChanged(const TQString &))); } else { return ; diff --git a/src/gui/dialogs/AudioSplitDialog.cpp b/src/gui/dialogs/AudioSplitDialog.cpp index 54d68c2..befc019 100644 --- a/src/gui/dialogs/AudioSplitDialog.cpp +++ b/src/gui/dialogs/AudioSplitDialog.cpp @@ -82,8 +82,8 @@ AudioSplitDialog::AudioSplitDialog(TQWidget *parent, new TQLabel(i18n("Threshold"), hbox); m_thresholdSpin = new TQSpinBox(hbox); m_thresholdSpin->setSuffix(" %"); - connect(m_thresholdSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotThresholdChanged(int))); + connect(m_thresholdSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotThresholdChanged(int))); // ensure this is cleared m_previewBoxes.clear(); diff --git a/src/gui/dialogs/ClefDialog.cpp b/src/gui/dialogs/ClefDialog.cpp index 7f5886d..b419006 100644 --- a/src/gui/dialogs/ClefDialog.cpp +++ b/src/gui/dialogs/ClefDialog.cpp @@ -109,10 +109,10 @@ ClefDialog::ClefDialog(TQWidget *parent, conversionFrame->hide(); } - TQObject::connect(clefUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClefUp())); - TQObject::connect(clefDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClefDown())); - TQObject::connect(m_octaveUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOctaveUp())); - TQObject::connect(m_octaveDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOctaveDown())); + TQObject::connect(clefUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClefUp())); + TQObject::connect(clefDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClefDown())); + TQObject::connect(m_octaveUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOctaveUp())); + TQObject::connect(m_octaveDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOctaveDown())); redrawClefPixmap(); } diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp index 0e66780..4f9f22a 100644 --- a/src/gui/dialogs/ConfigureDialog.cpp +++ b/src/gui/dialogs/ConfigureDialog.cpp @@ -78,10 +78,10 @@ ConfigureDialog::ConfigureDialog(RosegardenGUIDoc *doc, page->setPageIndex(pageIndex(pageWidget)); m_configurationPages.push_back(page); - connect(page, TQT_SIGNAL(updateAutoSaveInterval(unsigned int)), - this, TQT_SIGNAL(updateAutoSaveInterval(unsigned int))); - connect(page, TQT_SIGNAL(updateSidebarStyle(unsigned int)), - this, TQT_SIGNAL(updateSidebarStyle(unsigned int))); + connect(page, TQ_SIGNAL(updateAutoSaveInterval(unsigned int)), + this, TQ_SIGNAL(updateAutoSaveInterval(unsigned int))); + connect(page, TQ_SIGNAL(updateSidebarStyle(unsigned int)), + this, TQ_SIGNAL(updateSidebarStyle(unsigned int))); pageWidget = addPage(MIDIConfigurationPage::iconLabel(), MIDIConfigurationPage::title(), diff --git a/src/gui/dialogs/CountdownDialog.cpp b/src/gui/dialogs/CountdownDialog.cpp index 0c76d8f..cdeb4ee 100644 --- a/src/gui/dialogs/CountdownDialog.cpp +++ b/src/gui/dialogs/CountdownDialog.cpp @@ -69,7 +69,7 @@ CountdownDialog::CountdownDialog(TQWidget *parent, int seconds): layout->addWidget(m_progressBar, 0, AlignCenter); layout->addWidget(m_stopButton, 0, AlignRight); - connect (m_stopButton, TQT_SIGNAL(released()), this, TQT_SIGNAL(stopped())); + connect (m_stopButton, TQ_SIGNAL(released()), this, TQ_SIGNAL(stopped())); // Set the total time to show the bar in initial position // diff --git a/src/gui/dialogs/EventEditDialog.cpp b/src/gui/dialogs/EventEditDialog.cpp index 2a865d7..d1ca56e 100644 --- a/src/gui/dialogs/EventEditDialog.cpp +++ b/src/gui/dialogs/EventEditDialog.cpp @@ -92,8 +92,8 @@ EventEditDialog::EventEditDialog(TQWidget *parent, TQSpinBox *absoluteTime = new TQSpinBox (INT_MIN, INT_MAX, Note(Note::Shortest).getDuration(), intrinsicGrid); absoluteTime->setValue(event.getAbsoluteTime()); - TQObject::connect(absoluteTime, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAbsoluteTimeChanged(int))); + TQObject::connect(absoluteTime, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAbsoluteTimeChanged(int))); slotAbsoluteTimeChanged(event.getAbsoluteTime()); new TQLabel(i18n("Duration: "), intrinsicGrid); @@ -105,8 +105,8 @@ EventEditDialog::EventEditDialog(TQWidget *parent, TQSpinBox *duration = new TQSpinBox (0, INT_MAX, Note(Note::Shortest).getDuration(), intrinsicGrid); duration->setValue(event.getDuration()); - TQObject::connect(duration, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotDurationChanged(int))); + TQObject::connect(duration, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotDurationChanged(int))); slotDurationChanged(event.getDuration()); new TQLabel(i18n("Sub-ordering: "), intrinsicGrid); @@ -115,8 +115,8 @@ EventEditDialog::EventEditDialog(TQWidget *parent, TQSpinBox *subOrdering = new TQSpinBox( -100, 100, 1, intrinsicGrid); subOrdering->setValue(event.getSubOrdering()); - TQObject::connect(subOrdering, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotSubOrderingChanged(int))); + TQObject::connect(subOrdering, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotSubOrderingChanged(int))); slotSubOrderingChanged(event.getSubOrdering()); TQGroupBox *persistentBox = new TQGroupBox @@ -184,8 +184,8 @@ EventEditDialog::EventEditDialog(TQWidget *parent, button->setFixedSize(TQSize(24, 24)); TQToolTip::add (button, i18n("Make persistent")); - TQObject::connect(button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotPropertyMadePersistent())); + TQObject::connect(button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotPropertyMadePersistent())); } } } @@ -213,8 +213,8 @@ EventEditDialog::addPersistentProperty(const PropertyName &name) TQSpinBox *spinBox = new TQSpinBox (min, max, 1, m_persistentGrid, strtoqstr(name).ascii()); spinBox->setValue(m_originalEvent.get(name)); - TQObject::connect(spinBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotIntPropertyChanged(int))); + TQObject::connect(spinBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotIntPropertyChanged(int))); spinBox->show(); break; } @@ -228,8 +228,8 @@ case UInt: { TQSpinBox *spinBox = new TQSpinBox (min, max, 1, m_persistentGrid, strtoqstr(name).ascii()); spinBox->setValue(m_originalEvent.get(name)); - TQObject::connect(spinBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotIntPropertyChanged(int))); + TQObject::connect(spinBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotIntPropertyChanged(int))); spinBox->show(); break; } @@ -245,8 +245,8 @@ case UInt: { hbox, TQString(strtoqstr(name) + "%sec").ascii()); spinBox->setValue(realTime.sec); - TQObject::connect(spinBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotRealTimePropertyChanged(int))); + TQObject::connect(spinBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotRealTimePropertyChanged(int))); // nseconds // @@ -255,8 +255,8 @@ case UInt: { hbox, TQString(strtoqstr(name) + "%nsec").ascii()); spinBox->setValue(realTime.nsec); - TQObject::connect(spinBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotRealTimePropertyChanged(int))); + TQObject::connect(spinBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotRealTimePropertyChanged(int))); spinBox->show(); break; } @@ -265,8 +265,8 @@ case UInt: { TQCheckBox *checkBox = new TQCheckBox ("", m_persistentGrid, strtoqstr(name).ascii()); checkBox->setChecked(m_originalEvent.get(name)); - TQObject::connect(checkBox, TQT_SIGNAL(activated()), - this, TQT_SLOT(slotBoolPropertyChanged())); + TQObject::connect(checkBox, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotBoolPropertyChanged())); checkBox->show(); break; } @@ -276,8 +276,8 @@ case UInt: { (strtoqstr(m_originalEvent.get(name)), m_persistentGrid, strtoqstr(name).ascii()); - TQObject::connect(lineEdit, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotStringPropertyChanged(const TQString &))); + TQObject::connect(lineEdit, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotStringPropertyChanged(const TQString &))); lineEdit->show(); break; } @@ -288,8 +288,8 @@ case UInt: { button->setFixedSize(TQSize(24, 24)); TQToolTip::add (button, i18n("Delete this property")); - TQObject::connect(button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotPropertyDeleted())); + TQObject::connect(button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotPropertyDeleted())); button->show(); } diff --git a/src/gui/dialogs/EventFilterDialog.cpp b/src/gui/dialogs/EventFilterDialog.cpp index 89fb947..c767c45 100644 --- a/src/gui/dialogs/EventFilterDialog.cpp +++ b/src/gui/dialogs/EventFilterDialog.cpp @@ -128,8 +128,8 @@ EventFilterDialog::initDialog() cfg->setGroup(EventFilterDialogConfigGroup); m_pitchFromSpinBox->setValue(cfg->readUnsignedNumEntry("pitchfrom", 0)); noteFrameLayout->addWidget(m_pitchFromSpinBox, 1, 2); - connect(m_pitchFromSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotPitchFromChanged(int))); + connect(m_pitchFromSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotPitchFromChanged(int))); m_pitchFromChooserButton = new TQPushButton(i18n("edit"), noteFrame); m_pitchFromChooserButton->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0, @@ -138,8 +138,8 @@ EventFilterDialog::initDialog() TQToolTip::add (m_pitchFromChooserButton, i18n("choose a pitch using a staff")); noteFrameLayout->addWidget(m_pitchFromChooserButton, 1, 3); - connect(m_pitchFromChooserButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotPitchFromChooser())); + connect(m_pitchFromChooserButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotPitchFromChooser())); // Pitch To m_pitchToSpinBox = new TQSpinBox(noteFrame); @@ -147,15 +147,15 @@ EventFilterDialog::initDialog() cfg->setGroup(EventFilterDialogConfigGroup); m_pitchToSpinBox->setValue(cfg->readUnsignedNumEntry("pitchto", 127)); noteFrameLayout->addWidget(m_pitchToSpinBox, 1, 4); - connect(m_pitchToSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotPitchToChanged(int))); + connect(m_pitchToSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotPitchToChanged(int))); m_pitchToChooserButton = new TQPushButton(i18n("edit"), noteFrame); TQToolTip::add (m_pitchToChooserButton, i18n("choose a pitch using a staff")); noteFrameLayout->addWidget(m_pitchToChooserButton, 1, 5); - connect(m_pitchToChooserButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotPitchToChooser())); + connect(m_pitchToChooserButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotPitchToChooser())); // Velocity From/To m_velocityFromSpinBox = new TQSpinBox(noteFrame); @@ -163,30 +163,30 @@ EventFilterDialog::initDialog() cfg->setGroup(EventFilterDialogConfigGroup); m_velocityFromSpinBox->setValue(cfg->readUnsignedNumEntry("velocityfrom", 0)); noteFrameLayout->addWidget(m_velocityFromSpinBox, 2, 2); - connect(m_velocityFromSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotVelocityFromChanged(int))); + connect(m_velocityFromSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotVelocityFromChanged(int))); m_velocityToSpinBox = new TQSpinBox(noteFrame); m_velocityToSpinBox->setMaxValue(127); cfg->setGroup(EventFilterDialogConfigGroup); m_velocityToSpinBox->setValue(cfg->readUnsignedNumEntry("velocityto", 127)); noteFrameLayout->addWidget( m_velocityToSpinBox, 2, 4 ); - connect(m_velocityToSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotVelocityToChanged(int))); + connect(m_velocityToSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotVelocityToChanged(int))); // Duration From/To m_noteDurationFromComboBox = new TQComboBox(0, noteFrame); m_noteDurationFromComboBox->insertItem(i18n("longest")); noteFrameLayout->addWidget(m_noteDurationFromComboBox, 3, 2); - connect(m_noteDurationFromComboBox, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotDurationFromChanged(int))); + connect(m_noteDurationFromComboBox, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotDurationFromChanged(int))); m_noteDurationToComboBox = new TQComboBox(0, noteFrame); m_noteDurationToComboBox->insertItem(i18n("longest")); noteFrameLayout->addWidget(m_noteDurationToComboBox, 3, 4); - connect(m_noteDurationToComboBox, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotDurationToChanged(int))); + connect(m_noteDurationToComboBox, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotDurationToChanged(int))); populateDurationCombos(); @@ -207,8 +207,8 @@ EventFilterDialog::initDialog() (m_buttonNone, i18n("Exclude entire range of values")); buttonLayout->addWidget( m_buttonNone, 0, 1 ); - connect(m_buttonAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToggleAll())); - connect(m_buttonNone, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToggleNone())); + connect(m_buttonAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotToggleAll())); + connect(m_buttonNone, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotToggleNone())); } diff --git a/src/gui/dialogs/EventParameterDialog.cpp b/src/gui/dialogs/EventParameterDialog.cpp index 97ed5c6..a12ccab 100644 --- a/src/gui/dialogs/EventParameterDialog.cpp +++ b/src/gui/dialogs/EventParameterDialog.cpp @@ -80,8 +80,8 @@ EventParameterDialog::EventParameterDialog( text = i18n("Ringing - set %1 alternating from max to min with both dying to zero").arg(strtoqstr(property)); m_patternCombo->insertItem(text); - connect(m_patternCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPatternSelected(int))); + connect(m_patternCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPatternSelected(int))); TQHBox *value1Box = new TQHBox(vBox); m_value1Label = new TQLabel(i18n("Value"), value1Box); diff --git a/src/gui/dialogs/IdentifyTextCodecDialog.cpp b/src/gui/dialogs/IdentifyTextCodecDialog.cpp index e09cb75..e24ea85 100644 --- a/src/gui/dialogs/IdentifyTextCodecDialog.cpp +++ b/src/gui/dialogs/IdentifyTextCodecDialog.cpp @@ -134,8 +134,8 @@ IdentifyTextCodecDialog::IdentifyTextCodecDialog(TQWidget *parent, ++i; } - connect(codecs, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotCodecSelected(int))); + connect(codecs, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotCodecSelected(int))); new TQLabel(i18n("\nExample text from file:"), vbox); m_example = new TQLabel("", vbox); diff --git a/src/gui/dialogs/InterpretDialog.cpp b/src/gui/dialogs/InterpretDialog.cpp index 645d537..b0e81b7 100644 --- a/src/gui/dialogs/InterpretDialog.cpp +++ b/src/gui/dialogs/InterpretDialog.cpp @@ -73,7 +73,7 @@ InterpretDialog::InterpretDialog(TQWidget *parent) : (config->readBoolEntry("interpretarticulate", true)); connect(m_allInterpretations, - TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAllBoxChanged())); + TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAllBoxChanged())); slotAllBoxChanged(); } diff --git a/src/gui/dialogs/IntervalDialog.cpp b/src/gui/dialogs/IntervalDialog.cpp index b226004..ed8eb39 100644 --- a/src/gui/dialogs/IntervalDialog.cpp +++ b/src/gui/dialogs/IntervalDialog.cpp @@ -93,11 +93,11 @@ IntervalDialog::IntervalDialog(TQWidget *parent, bool askChangeKey, bool askTran m_transposeSegmentBack = NULL; } - connect(m_referencenote, TQT_SIGNAL(noteChanged(int,int,int)), - this, TQT_SLOT(slotSetReferenceNote(int,int,int))); + connect(m_referencenote, TQ_SIGNAL(noteChanged(int,int,int)), + this, TQ_SLOT(slotSetReferenceNote(int,int,int))); - connect(m_targetnote, TQT_SIGNAL(noteChanged(int,int,int)), - this, TQT_SLOT(slotSetTargetNote(int,int,int))); + connect(m_targetnote, TQ_SIGNAL(noteChanged(int,int,int)), + this, TQ_SLOT(slotSetTargetNote(int,int,int))); } // number of octaves the notes are apart diff --git a/src/gui/dialogs/KeySignatureDialog.cpp b/src/gui/dialogs/KeySignatureDialog.cpp index b0d42f1..a88177e 100644 --- a/src/gui/dialogs/KeySignatureDialog.cpp +++ b/src/gui/dialogs/KeySignatureDialog.cpp @@ -162,14 +162,14 @@ KeySignatureDialog::KeySignatureDialog(TQWidget *parent, conversionFrame->hide(); } - TQObject::connect(keyUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotKeyUp())); - TQObject::connect(keyDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotKeyDown())); - TQObject::connect(m_keyCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotKeyNameChanged(const TQString &))); - TQObject::connect(m_keyCombo, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotKeyNameChanged(const TQString &))); - TQObject::connect(m_majorMinorCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotMajorMinorChanged(const TQString &))); + TQObject::connect(keyUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotKeyUp())); + TQObject::connect(keyDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotKeyDown())); + TQObject::connect(m_keyCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotKeyNameChanged(const TQString &))); + TQObject::connect(m_keyCombo, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotKeyNameChanged(const TQString &))); + TQObject::connect(m_majorMinorCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotMajorMinorChanged(const TQString &))); } KeySignatureDialog::ConversionType diff --git a/src/gui/dialogs/LyricEditDialog.cpp b/src/gui/dialogs/LyricEditDialog.cpp index 9501925..07b260d 100644 --- a/src/gui/dialogs/LyricEditDialog.cpp +++ b/src/gui/dialogs/LyricEditDialog.cpp @@ -64,9 +64,9 @@ LyricEditDialog::LyricEditDialog(TQWidget *parent, // new TQLabel(i18n("Verse:"), hbox); m_verseNumber = new KComboBox(hbox); m_verseNumber->setEditable(false); - connect(m_verseNumber, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotVerseNumberChanged(int))); + connect(m_verseNumber, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotVerseNumberChanged(int))); m_verseAddButton = new TQPushButton(i18n("Add Verse"), hbox); - connect(m_verseAddButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddVerse())); + connect(m_verseAddButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddVerse())); TQFrame *f = new TQFrame(hbox); hbox->setStretchFactor(f, 10); diff --git a/src/gui/dialogs/ManageMetronomeDialog.cpp b/src/gui/dialogs/ManageMetronomeDialog.cpp index b54d27d..3e70c88 100644 --- a/src/gui/dialogs/ManageMetronomeDialog.cpp +++ b/src/gui/dialogs/ManageMetronomeDialog.cpp @@ -108,8 +108,8 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent, layout->addWidget(new TQLabel(i18n("Instrument"), frame), 1, 0); m_metronomeInstrument = new KComboBox(frame); - connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetModified())); - connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInstrumentChanged(int))); + connect(m_metronomeInstrument, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetModified())); + connect(m_metronomeInstrument, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInstrumentChanged(int))); layout->addWidget(m_metronomeInstrument, 1, 1); TQGroupBox *beatBox = new TQGroupBox @@ -124,58 +124,58 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent, m_metronomeResolution->insertItem(i18n("Bars only")); m_metronomeResolution->insertItem(i18n("Bars and beats")); m_metronomeResolution->insertItem(i18n("Bars, beats, and divisions")); - connect(m_metronomeResolution, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotResolutionChanged(int))); + connect(m_metronomeResolution, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotResolutionChanged(int))); layout->addWidget(m_metronomeResolution, 0, 1); layout->addWidget(new TQLabel(i18n("Bar velocity"), frame), 1, 0); m_metronomeBarVely = new TQSpinBox(frame); m_metronomeBarVely->setMinValue(0); m_metronomeBarVely->setMaxValue(127); - connect(m_metronomeBarVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified())); + connect(m_metronomeBarVely, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetModified())); layout->addWidget(m_metronomeBarVely, 1, 1); layout->addWidget(new TQLabel(i18n("Beat velocity"), frame), 2, 0); m_metronomeBeatVely = new TQSpinBox(frame); m_metronomeBeatVely->setMinValue(0); m_metronomeBeatVely->setMaxValue(127); - connect(m_metronomeBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified())); + connect(m_metronomeBeatVely, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetModified())); layout->addWidget(m_metronomeBeatVely, 2, 1); layout->addWidget(new TQLabel(i18n("Sub-beat velocity"), frame), 3, 0); m_metronomeSubBeatVely = new TQSpinBox(frame); m_metronomeSubBeatVely->setMinValue(0); m_metronomeSubBeatVely->setMaxValue(127); - connect(m_metronomeSubBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified())); + connect(m_metronomeSubBeatVely, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetModified())); layout->addWidget(m_metronomeSubBeatVely, 3, 1); vbox = new TQVBox(hbox); m_metronomePitch = new PitchChooser(i18n("Pitch"), vbox, 60); - connect(m_metronomePitch, TQT_SIGNAL(pitchChanged(int)), this, TQT_SLOT(slotPitchChanged(int))); - connect(m_metronomePitch, TQT_SIGNAL(preview(int)), this, TQT_SLOT(slotPreviewPitch(int))); + connect(m_metronomePitch, TQ_SIGNAL(pitchChanged(int)), this, TQ_SLOT(slotPitchChanged(int))); + connect(m_metronomePitch, TQ_SIGNAL(preview(int)), this, TQ_SLOT(slotPreviewPitch(int))); m_metronomePitchSelector = new KComboBox(m_metronomePitch); m_metronomePitchSelector->insertItem(i18n("for Bar")); m_metronomePitchSelector->insertItem(i18n("for Beat")); m_metronomePitchSelector->insertItem(i18n("for Sub-beat")); - connect(m_metronomePitchSelector, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPitchSelectorChanged(int))); + connect(m_metronomePitchSelector, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPitchSelectorChanged(int))); TQGroupBox *enableBox = new TQGroupBox (1, TQt::Horizontal, i18n("Metronome Activated"), vbox); m_playEnabled = new TQCheckBox(i18n("Playing"), enableBox); m_recordEnabled = new TQCheckBox(i18n("Recording"), enableBox); - connect(m_playEnabled, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetModified())); - connect(m_recordEnabled, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetModified())); + connect(m_playEnabled, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetModified())); + connect(m_recordEnabled, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetModified())); // populate the dialog populate(m_metronomeDevice->currentItem()); // connect up the device list - connect(m_metronomeDevice, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(populate(int))); + connect(m_metronomeDevice, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(populate(int))); // connect up the device list - connect(m_metronomeDevice, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSetModified())); + connect(m_metronomeDevice, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSetModified())); setModified(false); } diff --git a/src/gui/dialogs/PasteNotationDialog.cpp b/src/gui/dialogs/PasteNotationDialog.cpp index 7fe3d7f..02b90d9 100644 --- a/src/gui/dialogs/PasteNotationDialog.cpp +++ b/src/gui/dialogs/PasteNotationDialog.cpp @@ -57,8 +57,8 @@ PasteNotationDialog::PasteNotationDialog(TQWidget *parent, TQRadioButton *button = new TQRadioButton(i->second, pasteTypeGroup); button->setChecked(m_defaultType == i->first); - TQObject::connect(button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotPasteTypeChanged())); + TQObject::connect(button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotPasteTypeChanged())); m_pasteTypeButtons.push_back(button); } diff --git a/src/gui/dialogs/PitchDialog.cpp b/src/gui/dialogs/PitchDialog.cpp index f50ce27..7722116 100644 --- a/src/gui/dialogs/PitchDialog.cpp +++ b/src/gui/dialogs/PitchDialog.cpp @@ -41,8 +41,8 @@ PitchDialog::PitchDialog(TQWidget *parent, TQString title, int defaultPitch) : m_pitchChooser = new PitchChooser(title, vbox, defaultPitch); setButtonText(User1, i18n("Reset")); - connect(this, TQT_SIGNAL(user1Clicked()), - m_pitchChooser, TQT_SLOT(slotResetToDefault())); + connect(this, TQ_SIGNAL(user1Clicked()), + m_pitchChooser, TQ_SLOT(slotResetToDefault())); } int diff --git a/src/gui/dialogs/RescaleDialog.cpp b/src/gui/dialogs/RescaleDialog.cpp index ee52826..9e8e25b 100644 --- a/src/gui/dialogs/RescaleDialog.cpp +++ b/src/gui/dialogs/RescaleDialog.cpp @@ -68,8 +68,8 @@ RescaleDialog::RescaleDialog(TQWidget *parent, } setButtonText(User1, i18n("Reset")); - connect(this, TQT_SIGNAL(user1Clicked()), - m_newDuration, TQT_SLOT(slotResetToDefault())); + connect(this, TQ_SIGNAL(user1Clicked()), + m_newDuration, TQ_SLOT(slotResetToDefault())); } timeT diff --git a/src/gui/dialogs/SimpleEventEditDialog.cpp b/src/gui/dialogs/SimpleEventEditDialog.cpp index 9591d00..98eff51 100644 --- a/src/gui/dialogs/SimpleEventEditDialog.cpp +++ b/src/gui/dialogs/SimpleEventEditDialog.cpp @@ -101,8 +101,8 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, // Connect up the combos // - connect(m_typeCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotEventTypeChanged(int))); + connect(m_typeCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotEventTypeChanged(int))); } else { @@ -119,10 +119,10 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, layout->addWidget(m_timeSpinBox, 1, 1); layout->addWidget(m_timeEditButton, 1, 2); - connect(m_timeSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotAbsoluteTimeChanged(int))); - connect(m_timeEditButton, TQT_SIGNAL(released()), - TQT_SLOT(slotEditAbsoluteTime())); + connect(m_timeSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotAbsoluteTimeChanged(int))); + connect(m_timeEditButton, TQ_SIGNAL(released()), + TQ_SLOT(slotEditAbsoluteTime())); m_durationLabel = new TQLabel(i18n("Duration:"), frame); layout->addWidget(m_durationLabel, 2, 0); @@ -131,10 +131,10 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, layout->addWidget(m_durationSpinBox, 2, 1); layout->addWidget(m_durationEditButton, 2, 2); - connect(m_durationSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotDurationChanged(int))); - connect(m_durationEditButton, TQT_SIGNAL(released()), - TQT_SLOT(slotEditDuration())); + connect(m_durationSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotDurationChanged(int))); + connect(m_durationEditButton, TQ_SIGNAL(released()), + TQ_SLOT(slotEditDuration())); m_pitchLabel = new TQLabel(i18n("Pitch:"), frame); layout->addWidget(m_pitchLabel, 3, 0); @@ -143,10 +143,10 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, layout->addWidget(m_pitchSpinBox, 3, 1); layout->addWidget(m_pitchEditButton, 3, 2); - connect(m_pitchSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotPitchChanged(int))); - connect(m_pitchEditButton, TQT_SIGNAL(released()), - TQT_SLOT(slotEditPitch())); + connect(m_pitchSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotPitchChanged(int))); + connect(m_pitchEditButton, TQ_SIGNAL(released()), + TQ_SLOT(slotEditPitch())); m_pitchSpinBox->setMinValue(MidiMinValue); m_pitchSpinBox->setMaxValue(MidiMaxValue); @@ -163,8 +163,8 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, m_velocitySpinBox = new TQSpinBox(frame); layout->addWidget(m_velocitySpinBox, 5, 1); - connect(m_velocitySpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotVelocityChanged(int))); + connect(m_velocitySpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotVelocityChanged(int))); m_velocitySpinBox->setMinValue(MidiMinValue); m_velocitySpinBox->setMaxValue(MidiMaxValue); @@ -179,12 +179,12 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, m_sysexSaveButton = new TQPushButton(i18n("Save data"), frame); layout->addWidget(m_sysexSaveButton, 4, 2); - connect(m_metaEdit, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(slotMetaChanged(const TQString &))); - connect(m_sysexLoadButton, TQT_SIGNAL(released()), - TQT_SLOT(slotSysexLoad())); - connect(m_sysexSaveButton, TQT_SIGNAL(released()), - TQT_SLOT(slotSysexSave())); + connect(m_metaEdit, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(slotMetaChanged(const TQString &))); + connect(m_sysexLoadButton, TQ_SIGNAL(released()), + TQ_SLOT(slotSysexLoad())); + connect(m_sysexSaveButton, TQ_SIGNAL(released()), + TQ_SLOT(slotSysexSave())); m_notationGroupBox = new TQGroupBox (1, TQt::Horizontal, i18n("Notation Properties"), vbox); @@ -197,8 +197,8 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, layout->addMultiCellWidget(m_lockNotationValues, 0, 0, 0, 2); m_lockNotationValues->setChecked(true); - connect(m_lockNotationValues, TQT_SIGNAL(released()), - TQT_SLOT(slotLockNotationChanged())); + connect(m_lockNotationValues, TQ_SIGNAL(released()), + TQ_SLOT(slotLockNotationChanged())); m_notationTimeLabel = new TQLabel(i18n("Notation time:"), frame); layout->addWidget(m_notationTimeLabel, 1, 0); @@ -207,10 +207,10 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, layout->addWidget(m_notationTimeSpinBox, 1, 1); layout->addWidget(m_notationTimeEditButton, 1, 2); - connect(m_notationTimeSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotNotationAbsoluteTimeChanged(int))); - connect(m_notationTimeEditButton, TQT_SIGNAL(released()), - TQT_SLOT(slotEditNotationAbsoluteTime())); + connect(m_notationTimeSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotNotationAbsoluteTimeChanged(int))); + connect(m_notationTimeEditButton, TQ_SIGNAL(released()), + TQ_SLOT(slotEditNotationAbsoluteTime())); m_notationDurationLabel = new TQLabel(i18n("Notation duration:"), frame); layout->addWidget(m_notationDurationLabel, 2, 0); @@ -219,10 +219,10 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, layout->addWidget(m_notationDurationSpinBox, 2, 1); layout->addWidget(m_notationDurationEditButton, 2, 2); - connect(m_notationDurationSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotNotationDurationChanged(int))); - connect(m_notationDurationEditButton, TQT_SIGNAL(released()), - TQT_SLOT(slotEditNotationDuration())); + connect(m_notationDurationSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotNotationDurationChanged(int))); + connect(m_notationDurationEditButton, TQ_SIGNAL(released()), + TQ_SLOT(slotEditNotationDuration())); setupForEvent(); } diff --git a/src/gui/dialogs/TempoDialog.cpp b/src/gui/dialogs/TempoDialog.cpp index 40843d1..60fd524 100644 --- a/src/gui/dialogs/TempoDialog.cpp +++ b/src/gui/dialogs/TempoDialog.cpp @@ -68,12 +68,12 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc, m_tempoValueSpinBox = new HSpinBox(frame, 0, 100000, 0.0, 1000.0, 5); layout->addWidget(m_tempoValueSpinBox, 0, 2); - connect(m_tempoValueSpinBox, TQT_SIGNAL(valueChanged(const TQString &)), - TQT_SLOT(slotTempoChanged(const TQString &))); + connect(m_tempoValueSpinBox, TQ_SIGNAL(valueChanged(const TQString &)), + TQ_SLOT(slotTempoChanged(const TQString &))); m_tempoTap= new TQPushButton(i18n("Tap"), frame); layout->addWidget(m_tempoTap, 0, 3); - connect(m_tempoTap, TQT_SIGNAL(clicked()), TQT_SLOT(slotTapClicked())); + connect(m_tempoTap, TQ_SIGNAL(clicked()), TQ_SLOT(slotTapClicked())); m_tempoConstant = new TQRadioButton(i18n("Tempo is fixed until the following tempo change"), frame); @@ -91,16 +91,16 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc, layout->addWidget(m_tempoRampToTarget, 3, 1); layout->addWidget(m_tempoTargetSpinBox, 3, 2); - // connect(m_tempoTargetCheckBox, TQT_SIGNAL(clicked()), - // TQT_SLOT(slotTargetCheckBoxClicked())); - connect(m_tempoConstant, TQT_SIGNAL(clicked()), - TQT_SLOT(slotTempoConstantClicked())); - connect(m_tempoRampToNext, TQT_SIGNAL(clicked()), - TQT_SLOT(slotTempoRampToNextClicked())); - connect(m_tempoRampToTarget, TQT_SIGNAL(clicked()), - TQT_SLOT(slotTempoRampToTargetClicked())); - connect(m_tempoTargetSpinBox, TQT_SIGNAL(valueChanged(const TQString &)), - TQT_SLOT(slotTargetChanged(const TQString &))); + // connect(m_tempoTargetCheckBox, TQ_SIGNAL(clicked()), + // TQ_SLOT(slotTargetCheckBoxClicked())); + connect(m_tempoConstant, TQ_SIGNAL(clicked()), + TQ_SLOT(slotTempoConstantClicked())); + connect(m_tempoRampToNext, TQ_SIGNAL(clicked()), + TQ_SLOT(slotTempoRampToNextClicked())); + connect(m_tempoRampToTarget, TQ_SIGNAL(clicked()), + TQ_SLOT(slotTempoRampToTargetClicked())); + connect(m_tempoTargetSpinBox, TQ_SIGNAL(valueChanged(const TQString &)), + TQ_SLOT(slotTargetChanged(const TQString &))); m_tempoBeatLabel = new TQLabel(frame); layout->addWidget(m_tempoBeatLabel, 0, 4); @@ -173,14 +173,14 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc, // new TQLabel(scopeBox); - connect(m_tempoChangeHere, TQT_SIGNAL(clicked()), - TQT_SLOT(slotActionChanged())); - connect(m_tempoChangeBefore, TQT_SIGNAL(clicked()), - TQT_SLOT(slotActionChanged())); - connect(m_tempoChangeStartOfBar, TQT_SIGNAL(clicked()), - TQT_SLOT(slotActionChanged())); - connect(m_tempoChangeGlobal, TQT_SIGNAL(clicked()), - TQT_SLOT(slotActionChanged())); + connect(m_tempoChangeHere, TQ_SIGNAL(clicked()), + TQ_SLOT(slotActionChanged())); + connect(m_tempoChangeBefore, TQ_SIGNAL(clicked()), + TQ_SLOT(slotActionChanged())); + connect(m_tempoChangeStartOfBar, TQ_SIGNAL(clicked()), + TQ_SLOT(slotActionChanged())); + connect(m_tempoChangeGlobal, TQ_SIGNAL(clicked()), + TQ_SLOT(slotActionChanged())); m_tempoChangeHere->setChecked(true); diff --git a/src/gui/dialogs/TextEventDialog.cpp b/src/gui/dialogs/TextEventDialog.cpp index fb6908f..78f5949 100644 --- a/src/gui/dialogs/TextEventDialog.cpp +++ b/src/gui/dialogs/TextEventDialog.cpp @@ -327,23 +327,23 @@ TextEventDialog::TextEventDialog(TQWidget *parent, m_prevLyric = config->readEntry("previous_lyric", ""); m_prevAnnotation = config->readEntry("previous_annotation", ""); - TQObject::connect(m_text, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotTextChanged(const TQString &))); - TQObject::connect(m_typeCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotTypeChanged(const TQString &))); - TQObject::connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotOK())); - TQObject::connect(m_dynamicShortcutCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotDynamicShortcutChanged(const TQString &))); - TQObject::connect(m_directionShortcutCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotDirectionShortcutChanged(const TQString &))); - TQObject::connect(m_localDirectionShortcutCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotLocalDirectionShortcutChanged(const TQString &))); - TQObject::connect(m_tempoShortcutCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotTempoShortcutChanged(const TQString &))); - TQObject::connect(m_localTempoShortcutCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotLocalTempoShortcutChanged(const TQString &))); - TQObject::connect(m_lilyPondDirectiveCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotLilyPondDirectiveChanged(const TQString &))); + TQObject::connect(m_text, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotTextChanged(const TQString &))); + TQObject::connect(m_typeCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotTypeChanged(const TQString &))); + TQObject::connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotOK())); + TQObject::connect(m_dynamicShortcutCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotDynamicShortcutChanged(const TQString &))); + TQObject::connect(m_directionShortcutCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotDirectionShortcutChanged(const TQString &))); + TQObject::connect(m_localDirectionShortcutCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotLocalDirectionShortcutChanged(const TQString &))); + TQObject::connect(m_tempoShortcutCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotTempoShortcutChanged(const TQString &))); + TQObject::connect(m_localTempoShortcutCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotLocalTempoShortcutChanged(const TQString &))); + TQObject::connect(m_lilyPondDirectiveCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotLilyPondDirectiveChanged(const TQString &))); m_text->setFocus(); slotTypeChanged(strtoqstr(getTextType())); diff --git a/src/gui/dialogs/TimeDialog.cpp b/src/gui/dialogs/TimeDialog.cpp index c6c55dc..66a5265 100644 --- a/src/gui/dialogs/TimeDialog.cpp +++ b/src/gui/dialogs/TimeDialog.cpp @@ -47,8 +47,8 @@ TimeDialog::TimeDialog(TQWidget *parent, TQString title, constrainToCompositionDuration); setButtonText(User1, i18n("Reset")); - connect(this, TQT_SIGNAL(user1Clicked()), - m_timeWidget, TQT_SLOT(slotResetToDefault())); + connect(this, TQ_SIGNAL(user1Clicked()), + m_timeWidget, TQ_SLOT(slotResetToDefault())); } TimeDialog::TimeDialog(TQWidget *parent, TQString title, @@ -64,8 +64,8 @@ TimeDialog::TimeDialog(TQWidget *parent, TQString title, constrainToCompositionDuration); setButtonText(User1, i18n("Reset")); - connect(this, TQT_SIGNAL(user1Clicked()), - m_timeWidget, TQT_SLOT(slotResetToDefault())); + connect(this, TQ_SIGNAL(user1Clicked()), + m_timeWidget, TQ_SLOT(slotResetToDefault())); } timeT diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp index 797b5ab..d28752e 100644 --- a/src/gui/dialogs/TimeSignatureDialog.cpp +++ b/src/gui/dialogs/TimeSignatureDialog.cpp @@ -103,10 +103,10 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, BigArrowButton *numUp = new BigArrowButton(numBox, TQt::RightArrow); BigArrowButton *denomUp = new BigArrowButton(denomBox, TQt::RightArrow); - TQObject::connect(numDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNumDown())); - TQObject::connect(numUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNumUp())); - TQObject::connect(denomDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDenomDown())); - TQObject::connect(denomUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDenomUp())); + TQObject::connect(numDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNumDown())); + TQObject::connect(numUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNumUp())); + TQObject::connect(denomDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDenomDown())); + TQObject::connect(denomUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDenomUp())); if (timeEditable) { @@ -190,8 +190,8 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, m_normalizeRestsButton->setChecked (config->readBoolEntry("timesigdialognormalize", true)); - TQObject::connect(m_hideSignatureButton, TQT_SIGNAL(clicked()), this, - TQT_SLOT(slotUpdateCommonTimeButton())); + TQObject::connect(m_hideSignatureButton, TQ_SIGNAL(clicked()), this, + TQ_SLOT(slotUpdateCommonTimeButton())); slotUpdateCommonTimeButton(); m_explanatoryLabel = explanatoryLabel; diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp index 3054e85..78646a0 100644 --- a/src/gui/dialogs/TransportDialog.cpp +++ b/src/gui/dialogs/TransportDialog.cpp @@ -140,41 +140,41 @@ TransportDialog::TransportDialog(TQWidget *parent, m_midiOutTimer = new TQTimer(this); m_clearMetronomeTimer = new TQTimer(this); - connect(m_midiInTimer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotClearMidiInLabel())); + connect(m_midiInTimer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotClearMidiInLabel())); - connect(m_midiOutTimer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotClearMidiOutLabel())); + connect(m_midiOutTimer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotClearMidiOutLabel())); - connect(m_clearMetronomeTimer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotResetBackground())); + connect(m_clearMetronomeTimer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotResetBackground())); m_transport->TimeDisplayLabel->hide(); m_transport->ToEndLabel->hide(); - connect(m_transport->TimeDisplayButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotChangeTimeDisplay())); + connect(m_transport->TimeDisplayButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotChangeTimeDisplay())); - connect(m_transport->ToEndButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotChangeToEnd())); + connect(m_transport->ToEndButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotChangeToEnd())); - connect(m_transport->LoopButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotLoopButtonClicked())); + connect(m_transport->LoopButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotLoopButtonClicked())); - connect(m_transport->PanelOpenButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotPanelOpenButtonClicked())); + connect(m_transport->PanelOpenButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotPanelOpenButtonClicked())); - connect(m_transport->PanelCloseButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotPanelCloseButtonClicked())); + connect(m_transport->PanelCloseButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotPanelCloseButtonClicked())); - connect(m_transport->PanicButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(panic())); + connect(m_transport->PanicButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(panic())); m_panelOpen = *m_transport->PanelOpenButton->pixmap(); m_panelClosed = *m_transport->PanelCloseButton->pixmap(); - connect(m_transport->SetStartLPButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetStartLoopingPointAtMarkerPos())); - connect(m_transport->SetStopLPButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetStopLoopingPointAtMarkerPos())); + connect(m_transport->SetStartLPButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSetStartLoopingPointAtMarkerPos())); + connect(m_transport->SetStopLPButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSetStopLoopingPointAtMarkerPos())); // clear labels // @@ -216,46 +216,46 @@ TransportDialog::TransportDialog(TQWidget *parent, m_transport->TempoDisplay->setFont( localFont ); m_transport->TimeSigDisplay->setFont( localFont ); - connect(m_transport->TempoDisplay, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTempo())); + connect(m_transport->TempoDisplay, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTempo())); - connect(m_transport->TempoDisplay, TQT_SIGNAL(scrollWheel(int)), - this, TQT_SIGNAL(scrollTempo(int))); + connect(m_transport->TempoDisplay, TQ_SIGNAL(scrollWheel(int)), + this, TQ_SIGNAL(scrollTempo(int))); - connect(m_transport->TimeSigDisplay, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTimeSignature())); + connect(m_transport->TimeSigDisplay, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTimeSignature())); // toil through the individual pixmaps - connect(m_transport->NegativePixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); - connect(m_transport->TenHoursPixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); - connect(m_transport->UnitHoursPixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); - connect(m_transport->HourColonPixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); - connect(m_transport->TenMinutesPixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); - connect(m_transport->UnitMinutesPixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); - connect(m_transport->MinuteColonPixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); - connect(m_transport->TenSecondsPixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); - connect(m_transport->UnitSecondsPixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); - connect(m_transport->SecondColonPixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); - connect(m_transport->TenthsPixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); - connect(m_transport->HundredthsPixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); - connect(m_transport->HundredthColonPixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); - connect(m_transport->TenThousandthsPixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); - connect(m_transport->ThousandthsPixmap, TQT_SIGNAL(doubleClicked()), - this, TQT_SLOT(slotEditTime())); + connect(m_transport->NegativePixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); + connect(m_transport->TenHoursPixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); + connect(m_transport->UnitHoursPixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); + connect(m_transport->HourColonPixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); + connect(m_transport->TenMinutesPixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); + connect(m_transport->UnitMinutesPixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); + connect(m_transport->MinuteColonPixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); + connect(m_transport->TenSecondsPixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); + connect(m_transport->UnitSecondsPixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); + connect(m_transport->SecondColonPixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); + connect(m_transport->TenthsPixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); + connect(m_transport->HundredthsPixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); + connect(m_transport->HundredthColonPixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); + connect(m_transport->TenThousandthsPixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); + connect(m_transport->ThousandthsPixmap, TQ_SIGNAL(doubleClicked()), + this, TQ_SLOT(slotEditTime())); // accelerator object // diff --git a/src/gui/dialogs/TupletDialog.cpp b/src/gui/dialogs/TupletDialog.cpp index c6e70ab..b2f7fe6 100644 --- a/src/gui/dialogs/TupletDialog.cpp +++ b/src/gui/dialogs/TupletDialog.cpp @@ -103,7 +103,7 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType, m_hasTimingAlready->setChecked(false); timingLayout->addMultiCellWidget(m_hasTimingAlready, 2, 2, 0, 2); - connect(m_hasTimingAlready, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHasTimingChanged())); + connect(m_hasTimingAlready, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHasTimingChanged())); updateUntupledCombo(); updateTupledCombo(); @@ -157,18 +157,18 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType, updateTimingDisplays(); - TQObject::connect(m_unitCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotUnitChanged(const TQString &))); + TQObject::connect(m_unitCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotUnitChanged(const TQString &))); - TQObject::connect(m_untupledCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotUntupledChanged(const TQString &))); - TQObject::connect(m_untupledCombo, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotUntupledChanged(const TQString &))); + TQObject::connect(m_untupledCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotUntupledChanged(const TQString &))); + TQObject::connect(m_untupledCombo, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotUntupledChanged(const TQString &))); - TQObject::connect(m_tupledCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotTupledChanged(const TQString &))); - TQObject::connect(m_tupledCombo, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotTupledChanged(const TQString &))); + TQObject::connect(m_tupledCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotTupledChanged(const TQString &))); + TQObject::connect(m_tupledCombo, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotTupledChanged(const TQString &))); } void diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp index 48bb828..5d44aeb 100644 --- a/src/gui/dialogs/UseOrnamentDialog.cpp +++ b/src/gui/dialogs/UseOrnamentDialog.cpp @@ -91,7 +91,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent, } m_mark->insertItem(i18n("Text mark")); - connect(m_mark, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMarkChanged(int))); + connect(m_mark, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMarkChanged(int))); m_textLabel = new TQLabel(i18n(" Text: "), frame); layout->addWidget(m_textLabel, 0, 2); -- cgit v1.2.1