From 4015988ca8f98d6b4fc43cee6cdd3a5895b3c3ca Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 9 Aug 2023 15:33:59 +0900 Subject: [PATCH] Drop TQT_TQ*_CONST defines Signed-off-by: Michele Calgaro (cherry picked from commit 5f88991f1f2ff15f859d2cbd701f26c378841fe0) --- src/gui/application/RosegardenGUIApp.cpp | 4 ++-- src/gui/dialogs/AudioPluginDialog.cpp | 2 +- src/gui/dialogs/EventEditDialog.cpp | 12 +++++------ src/gui/editors/matrix/MatrixView.cpp | 4 ++-- src/gui/editors/notation/FontViewFrame.cpp | 2 +- src/gui/editors/notation/NotationView.cpp | 22 ++++++++++----------- src/gui/studio/AudioMixerWindow.cpp | 16 +++++++-------- src/gui/studio/MidiKeyMappingEditor.cpp | 2 +- src/gui/studio/MidiMixerWindow.cpp | 4 ++-- src/gui/studio/MidiProgramsEditor.cpp | 2 +- src/gui/studio/SynthPluginManagerDialog.cpp | 6 +++--- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp index 5e8e710..af1edf4 100644 --- a/src/gui/application/RosegardenGUIApp.cpp +++ b/src/gui/application/RosegardenGUIApp.cpp @@ -6895,7 +6895,7 @@ RosegardenGUIApp::slotTempoViewClosed() void RosegardenGUIApp::slotControlEditorClosed() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); RG_DEBUG << "RosegardenGUIApp::slotControlEditorClosed" << endl; @@ -7026,7 +7026,7 @@ void RosegardenGUIApp::slotPluginSelected(InstrumentId instrumentId, int index, int plugin) { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); bool fromSynthMgr = (TQT_BASE_OBJECT_CONST(s) == TQT_BASE_OBJECT(m_synthManager)); diff --git a/src/gui/dialogs/AudioPluginDialog.cpp b/src/gui/dialogs/AudioPluginDialog.cpp index b4a4220..51be09c 100644 --- a/src/gui/dialogs/AudioPluginDialog.cpp +++ b/src/gui/dialogs/AudioPluginDialog.cpp @@ -602,7 +602,7 @@ AudioPluginDialog::getProgramsForInstance(AudioPluginInstance *inst, int ¤ void AudioPluginDialog::slotPluginPortChanged(float value) { - const TQObject* object = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject* object = sender(); const PluginControl* control = dynamic_cast(object); diff --git a/src/gui/dialogs/EventEditDialog.cpp b/src/gui/dialogs/EventEditDialog.cpp index c359dc6..8f214c2 100644 --- a/src/gui/dialogs/EventEditDialog.cpp +++ b/src/gui/dialogs/EventEditDialog.cpp @@ -354,7 +354,7 @@ EventEditDialog::slotSubOrderingChanged(int value) void EventEditDialog::slotIntPropertyChanged(int value) { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); const TQSpinBox *spinBox = dynamic_cast(s); if (!spinBox) return ; @@ -367,7 +367,7 @@ EventEditDialog::slotIntPropertyChanged(int value) void EventEditDialog::slotRealTimePropertyChanged(int value) { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); const TQSpinBox *spinBox = dynamic_cast(s); if (!spinBox) return ; @@ -391,7 +391,7 @@ EventEditDialog::slotRealTimePropertyChanged(int value) void EventEditDialog::slotBoolPropertyChanged() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); const TQCheckBox *checkBox = dynamic_cast(s); if (!checkBox) return ; @@ -406,7 +406,7 @@ EventEditDialog::slotBoolPropertyChanged() void EventEditDialog::slotStringPropertyChanged(const TQString &value) { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); const TQLineEdit *lineEdit = dynamic_cast(s); if (!lineEdit) return ; @@ -419,7 +419,7 @@ EventEditDialog::slotStringPropertyChanged(const TQString &value) void EventEditDialog::slotPropertyDeleted() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); const TQPushButton *pushButton = dynamic_cast(s); if (!pushButton) return ; @@ -451,7 +451,7 @@ EventEditDialog::slotPropertyDeleted() void EventEditDialog::slotPropertyMadePersistent() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); const TQPushButton *pushButton = dynamic_cast(s); if (!pushButton) return ; diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp index 8d25ec9..9436beb 100644 --- a/src/gui/editors/matrix/MatrixView.cpp +++ b/src/gui/editors/matrix/MatrixView.cpp @@ -1808,7 +1808,7 @@ void MatrixView::slotVerticalScrollPianoKeyboard(int y) void MatrixView::slotInsertNoteFromAction() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); TQString name = s->name(); Segment &segment = *getCurrentSegment(); @@ -2015,7 +2015,7 @@ MatrixView::slotSetSnapFromIndex(int s) void MatrixView::slotSetSnapFromAction() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); TQString name = s->name(); if (name.left(5) == "snap_") { diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp index b140775..e78e44f 100644 --- a/src/gui/editors/notation/FontViewFrame.cpp +++ b/src/gui/editors/notation/FontViewFrame.cpp @@ -231,7 +231,7 @@ FontViewFrame::hasRow(int r) const for (int c = 0; c < 256; ++c) { FcChar32 ch = r * 256 + c; - if (XftCharExists(TQT_TQPAINTDEVICE_CONST(this)->x11AppDisplay(), (XftFont *)m_tableFont, ch)) { + if (XftCharExists(x11AppDisplay(), (XftFont *)m_tableFont, ch)) { return true; } } diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp index fa56c99..05c48c0 100644 --- a/src/gui/editors/notation/NotationView.cpp +++ b/src/gui/editors/notation/NotationView.cpp @@ -3950,7 +3950,7 @@ void NotationView::readjustCanvasSize() void NotationView::slotNoteAction() { - const TQObject* sigSender = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject* sigSender = sender(); NoteActionDataMap::Iterator noteAct = m_noteActionDataMap->find(sigSender->name()); @@ -3981,7 +3981,7 @@ void NotationView::slotLastNoteAction() void NotationView::slotAddMark() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); if (!m_currentEventSelection) return ; @@ -3995,7 +3995,7 @@ void NotationView::slotAddMark() void NotationView::slotNoteChangeAction() { - const TQObject* sigSender = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject* sigSender = sender(); NoteChangeActionDataMap::Iterator noteAct = m_noteChangeActionDataMap->find(sigSender->name()); @@ -4304,7 +4304,7 @@ NotationView::slotChangeSpacingFromStringValue(const TQString& spacingT) void NotationView::slotChangeSpacingFromAction() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); TQString name = s->name(); if (name.left(8) == "spacing_") { @@ -4364,7 +4364,7 @@ NotationView::slotChangeProportionFromIndex(int n) void NotationView::slotChangeProportionFromAction() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); TQString name = s->name(); if (name.left(11) == "proportion_") { @@ -4413,7 +4413,7 @@ NotationView::slotChangeProportion(int proportion) void NotationView::slotChangeFontFromAction() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); TQString name = s->name(); if (name.left(10) == "note_font_") { name = name.right(name.length() - 10); @@ -4427,7 +4427,7 @@ NotationView::slotChangeFontFromAction() void NotationView::slotChangeFontSizeFromAction() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); TQString name = s->name(); if (name.left(15) == "note_font_size_") { @@ -5557,7 +5557,7 @@ void NotationView::slotTransformsRemoveQuantization() void NotationView::slotSetStyleFromAction() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); TQString name = s->name(); if (!m_currentEventSelection) @@ -5580,7 +5580,7 @@ void NotationView::slotSetStyleFromAction() void NotationView::slotInsertNoteFromAction() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); TQString name = s->name(); Segment &segment = m_staffs[m_currentStaff]->getSegment(); @@ -5907,7 +5907,7 @@ void NotationView::slotAddDotNotationOnly() void NotationView::slotAddSlashes() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); if (!m_currentEventSelection) return ; @@ -5948,7 +5948,7 @@ void NotationView::slotMarksAddFingeringMark() void NotationView::slotMarksAddFingeringMarkFromAction() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); TQString name = s->name(); if (name.left(14) == "add_fingering_") { diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp index f7b752a..4715731 100644 --- a/src/gui/studio/AudioMixerWindow.cpp +++ b/src/gui/studio/AudioMixerWindow.cpp @@ -940,7 +940,7 @@ AudioMixerWindow::updatePluginButtons(int id) void AudioMixerWindow::slotSelectPlugin() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); for (FaderMap::iterator i = m_faders.begin(); i != m_faders.end(); ++i) { @@ -991,7 +991,7 @@ AudioMixerWindow::slotSelectPlugin() void AudioMixerWindow::slotInputChanged() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); for (FaderMap::iterator i = m_faders.begin(); i != m_faders.end(); ++i) { @@ -1004,7 +1004,7 @@ AudioMixerWindow::slotInputChanged() void AudioMixerWindow::slotOutputChanged() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); for (FaderMap::iterator i = m_faders.begin(); i != m_faders.end(); ++i) { @@ -1058,7 +1058,7 @@ AudioMixerWindow::sendControllerRefresh() void AudioMixerWindow::slotFaderLevelChanged(float dB) { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); BussList busses = m_studio->getBusses(); @@ -1138,7 +1138,7 @@ AudioMixerWindow::slotFaderLevelChanged(float dB) void AudioMixerWindow::slotPanChanged(float pan) { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); BussList busses = m_studio->getBusses(); @@ -1206,7 +1206,7 @@ AudioMixerWindow::slotPanChanged(float pan) void AudioMixerWindow::slotChannelsChanged() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); // channels are only switchable on instruments @@ -1442,7 +1442,7 @@ AudioMixerWindow::slotControllerDeviceEventReceived(MappedEvent *e, void AudioMixerWindow::slotSetInputCountFromAction() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); TQString name = s->name(); if (name.left(7) == "inputs_") { @@ -1473,7 +1473,7 @@ AudioMixerWindow::slotSetInputCountFromAction() void AudioMixerWindow::slotSetSubmasterCountFromAction() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); TQString name = s->name(); if (name.left(11) == "submasters_") { diff --git a/src/gui/studio/MidiKeyMappingEditor.cpp b/src/gui/studio/MidiKeyMappingEditor.cpp index c76de77..3664a8a 100644 --- a/src/gui/studio/MidiKeyMappingEditor.cpp +++ b/src/gui/studio/MidiKeyMappingEditor.cpp @@ -160,7 +160,7 @@ MidiKeyMappingEditor::slotNameChanged(const TQString& name) return ; } - TQString senderName = TQT_TQOBJECT_CONST(sender())->name(); + TQString senderName = sender()->name(); // Adjust value back to zero rated // diff --git a/src/gui/studio/MidiMixerWindow.cpp b/src/gui/studio/MidiMixerWindow.cpp index ce70390..cd23fa8 100644 --- a/src/gui/studio/MidiMixerWindow.cpp +++ b/src/gui/studio/MidiMixerWindow.cpp @@ -321,7 +321,7 @@ MidiMixerWindow::addTab(TQWidget *tab, const TQString &title) void MidiMixerWindow::slotFaderLevelChanged(float value) { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); for (FaderVector::const_iterator it = m_faders.begin(); it != m_faders.end(); ++it) { @@ -374,7 +374,7 @@ MidiMixerWindow::slotFaderLevelChanged(float value) void MidiMixerWindow::slotControllerChanged(float value) { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); unsigned int i = 0, j = 0; for (i = 0; i < m_faders.size(); ++i) { diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp index b30fc21..e1ccf30 100644 --- a/src/gui/studio/MidiProgramsEditor.cpp +++ b/src/gui/studio/MidiProgramsEditor.cpp @@ -389,7 +389,7 @@ MidiProgramsEditor::slotNameChanged(const TQString& programName) return ; } - TQString senderName = TQT_TQOBJECT_CONST(sender())->name(); + TQString senderName = sender()->name(); // Adjust value back to zero rated // diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp index 13f641b..de2c3d0 100644 --- a/src/gui/studio/SynthPluginManagerDialog.cpp +++ b/src/gui/studio/SynthPluginManagerDialog.cpp @@ -231,7 +231,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent, void SynthPluginManagerDialog::slotGUIButtonClicked() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); int instrumentNo = -1; @@ -253,7 +253,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent, void SynthPluginManagerDialog::slotControlsButtonClicked() { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); int instrumentNo = -1; @@ -275,7 +275,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent, void SynthPluginManagerDialog::slotPluginChanged(int index) { - const TQObject *s = TQT_TQOBJECT_CONST(const_cast(sender())); + const TQObject *s = sender(); RG_DEBUG << "SynthPluginManagerDialog::slotPluginChanged(" << index << ")" << endl;