TDE
/
rosegarden
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/rosegarden
0
0
Fork 0
Code Issues Releases Wiki Activity

Drop TQT_BASE_OBJECT* defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 2ec11ba03e)
r14.1.x
Michele Calgaro 1 year ago
parent 4015988ca8
commit 45016a2fba
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

4
src/gui/application/RosegardenGUIApp.cpp
Unescape View File

@ -6902,7 +6902,7 @@ RosegardenGUIApp::slotControlEditorClosed()
for (std::set for (std::set
<ControlEditorDialog *>::iterator i = m_controlEditors.begin(); <ControlEditorDialog *>::iterator i = m_controlEditors.begin();
i != m_controlEditors.end(); ++i) { i != m_controlEditors.end(); ++i) {
if (TQT_BASE_OBJECT(*i) == TQT_BASE_OBJECT_CONST(s)) { if (*i == s) {
m_controlEditors.erase(i); m_controlEditors.erase(i);
RG_DEBUG << "removed control editor dialog, have " << m_controlEditors.size() << " left" << endl; RG_DEBUG << "removed control editor dialog, have " << m_controlEditors.size() << " left" << endl;
return ; return ;
@ -7028,7 +7028,7 @@ RosegardenGUIApp::slotPluginSelected(InstrumentId instrumentId,
{ {
const TQObject *s = sender(); const TQObject *s = sender();
bool fromSynthMgr = (TQT_BASE_OBJECT_CONST(s) == TQT_BASE_OBJECT(m_synthManager)); bool fromSynthMgr = (s == m_synthManager);
// It's assumed that ports etc will already have been set up on // It's assumed that ports etc will already have been set up on
// the AudioPluginInstance before this is invoked. // the AudioPluginInstance before this is invoked.

2
src/gui/editors/matrix/MatrixView.cpp
Unescape View File

@ -2946,7 +2946,7 @@ MatrixView::slotStepByStepTargetRequested(TQObject *obj)
MATRIX_DEBUG << "WARNING: No toggle_step_by_step action" << endl; MATRIX_DEBUG << "WARNING: No toggle_step_by_step action" << endl;
return ; return ;
} }
action->setChecked(TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this)); action->setChecked(obj == this);
} }
void void

2
src/gui/editors/notation/NotationView.cpp
Unescape View File

@ -7374,7 +7374,7 @@ NotationView::slotStepByStepTargetRequested(TQObject *obj)
NOTATION_DEBUG << "WARNING: No toggle_step_by_step action" << endl; NOTATION_DEBUG << "WARNING: No toggle_step_by_step action" << endl;
return ; return ;
} }
action->setChecked(TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this)); action->setChecked(obj == this);
} }
void void

2
src/gui/kdeext/klearlook.cpp
Unescape View File

@ -747,7 +747,7 @@ bool KlearlookStyle::objectEventHandler( const TQStyleControlElementData &ceData
} }
break; break;
case TQEvent::Leave: case TQEvent::Leave:
if ( hoverWidget && TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget) ) { if ( hoverWidget && object == hoverWidget ) {
oldCursor.setX( -1 ); oldCursor.setX( -1 );
oldCursor.setY( -1 ); oldCursor.setY( -1 );
hoverWidget = NULL; hoverWidget = NULL;

16
src/gui/studio/AudioMixerWindow.cpp
Unescape View File

@ -952,7 +952,7 @@ AudioMixerWindow::slotSelectPlugin()
for (std::vector<TQPushButton *>::iterator pli = i->second.m_plugins.begin(); for (std::vector<TQPushButton *>::iterator pli = i->second.m_plugins.begin();
pli != i->second.m_plugins.end(); ++pli) { pli != i->second.m_plugins.end(); ++pli) {
if (TQT_BASE_OBJECT(*pli) == TQT_BASE_OBJECT_CONST(s)) { if (*pli == s) {
emit selectPlugin(this, i->first, index); emit selectPlugin(this, i->first, index);
return ; return ;
@ -975,7 +975,7 @@ AudioMixerWindow::slotSelectPlugin()
for (std::vector<TQPushButton *>::iterator pli = i->m_plugins.begin(); for (std::vector<TQPushButton *>::iterator pli = i->m_plugins.begin();
pli != i->m_plugins.end(); ++pli) { pli != i->m_plugins.end(); ++pli) {
if (TQT_BASE_OBJECT(*pli) == TQT_BASE_OBJECT_CONST(s)) { if (*pli == s) {
emit selectPlugin(this, b, index); emit selectPlugin(this, b, index);
return ; return ;
@ -1062,7 +1062,7 @@ AudioMixerWindow::slotFaderLevelChanged(float dB)
BussList busses = m_studio->getBusses(); BussList busses = m_studio->getBusses();
if (TQT_BASE_OBJECT(m_master.m_fader) == TQT_BASE_OBJECT_CONST(s)) { if (m_master.m_fader == s) {
if (busses.size() > 0) { if (busses.size() > 0) {
StudioControl::setStudioObjectProperty StudioControl::setStudioObjectProperty
@ -1080,7 +1080,7 @@ AudioMixerWindow::slotFaderLevelChanged(float dB)
for (FaderVector::iterator i = m_submasters.begin(); for (FaderVector::iterator i = m_submasters.begin();
i != m_submasters.end(); ++i) { i != m_submasters.end(); ++i) {
if (TQT_BASE_OBJECT(i->m_fader) == TQT_BASE_OBJECT_CONST(s)) { if (i->m_fader == s) {
if ((int)busses.size() > index) { if ((int)busses.size() > index) {
StudioControl::setStudioObjectProperty StudioControl::setStudioObjectProperty
(MappedObjectId(busses[index]->getMappedId()), (MappedObjectId(busses[index]->getMappedId()),
@ -1100,7 +1100,7 @@ AudioMixerWindow::slotFaderLevelChanged(float dB)
for (FaderMap::iterator i = m_faders.begin(); for (FaderMap::iterator i = m_faders.begin();
i != m_faders.end(); ++i) { i != m_faders.end(); ++i) {
if (TQT_BASE_OBJECT(i->second.m_fader) == TQT_BASE_OBJECT_CONST(s)) { if (i->second.m_fader == s) {
Instrument *instrument = Instrument *instrument =
m_studio->getInstrumentById(i->first); m_studio->getInstrumentById(i->first);
@ -1147,7 +1147,7 @@ AudioMixerWindow::slotPanChanged(float pan)
for (FaderVector::iterator i = m_submasters.begin(); for (FaderVector::iterator i = m_submasters.begin();
i != m_submasters.end(); ++i) { i != m_submasters.end(); ++i) {
if (TQT_BASE_OBJECT(i->m_pan) == TQT_BASE_OBJECT_CONST(s)) { if (i->m_pan == s) {
if ((int)busses.size() > index) { if ((int)busses.size() > index) {
StudioControl::setStudioObjectProperty StudioControl::setStudioObjectProperty
(MappedObjectId(busses[index]->getMappedId()), (MappedObjectId(busses[index]->getMappedId()),
@ -1166,7 +1166,7 @@ AudioMixerWindow::slotPanChanged(float pan)
for (FaderMap::iterator i = m_faders.begin(); for (FaderMap::iterator i = m_faders.begin();
i != m_faders.end(); ++i) { i != m_faders.end(); ++i) {
if (TQT_BASE_OBJECT(i->second.m_pan) == TQT_BASE_OBJECT_CONST(s)) { if (i->second.m_pan == s) {
Instrument *instrument = Instrument *instrument =
m_studio->getInstrumentById(i->first); m_studio->getInstrumentById(i->first);
@ -1216,7 +1216,7 @@ AudioMixerWindow::slotChannelsChanged()
for (FaderMap::iterator i = m_faders.begin(); for (FaderMap::iterator i = m_faders.begin();
i != m_faders.end(); ++i) { i != m_faders.end(); ++i) {
if (TQT_BASE_OBJECT_CONST(s) == TQT_BASE_OBJECT(i->second.m_stereoButton)) { if (s == i->second.m_stereoButton) {
Instrument *instrument = Instrument *instrument =
m_studio->getInstrumentById(i->first); m_studio->getInstrumentById(i->first);

4
src/gui/studio/MidiMixerWindow.cpp
Unescape View File

@ -325,7 +325,7 @@ MidiMixerWindow::slotFaderLevelChanged(float value)
for (FaderVector::const_iterator it = m_faders.begin(); for (FaderVector::const_iterator it = m_faders.begin();
it != m_faders.end(); ++it) { it != m_faders.end(); ++it) {
if (TQT_BASE_OBJECT((*it)->m_volumeFader) == TQT_BASE_OBJECT_CONST(s)) { if ((*it)->m_volumeFader == s) {
Instrument *instr = m_studio-> Instrument *instr = m_studio->
getInstrumentById((*it)->m_id); getInstrumentById((*it)->m_id);
@ -379,7 +379,7 @@ MidiMixerWindow::slotControllerChanged(float value)
for (i = 0; i < m_faders.size(); ++i) { for (i = 0; i < m_faders.size(); ++i) {
for (j = 0; j < m_faders[i]->m_controllerRotaries.size(); ++j) { for (j = 0; j < m_faders[i]->m_controllerRotaries.size(); ++j) {
if (TQT_BASE_OBJECT(m_faders[i]->m_controllerRotaries[j].second) == TQT_BASE_OBJECT_CONST(s)) if (m_faders[i]->m_controllerRotaries[j].second == s)
break; break;
} }

2
src/gui/studio/MidiProgramsEditor.cpp
Unescape View File

@ -442,7 +442,7 @@ MidiProgramsEditor::slotNameChanged(const TQString& programName)
void void
MidiProgramsEditor::slotEntryButtonPressed() MidiProgramsEditor::slotEntryButtonPressed()
{ {
TQPushButton* button = dynamic_cast<TQPushButton*>(TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); TQPushButton* button = dynamic_cast<TQPushButton*>(TQT_TQWIDGET(const_cast<TQObject*>(sender())));
if (!button) { if (!button) {
RG_DEBUG << "MidiProgramsEditor::slotEntryButtonPressed() : %%% ERROR - signal sender is not a TQPushButton\n"; RG_DEBUG << "MidiProgramsEditor::slotEntryButtonPressed() : %%% ERROR - signal sender is not a TQPushButton\n";
return ; return ;

6
src/gui/studio/SynthPluginManagerDialog.cpp
Unescape View File

@ -236,7 +236,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
int instrumentNo = -1; int instrumentNo = -1;
for (unsigned int i = 0; i < m_guiButtons.size(); ++i) { for (unsigned int i = 0; i < m_guiButtons.size(); ++i) {
if (TQT_BASE_OBJECT_CONST(s) == TQT_BASE_OBJECT(m_guiButtons[i])) if (s == m_guiButtons[i])
instrumentNo = i; instrumentNo = i;
} }
@ -258,7 +258,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
int instrumentNo = -1; int instrumentNo = -1;
for (unsigned int i = 0; i < m_controlsButtons.size(); ++i) { for (unsigned int i = 0; i < m_controlsButtons.size(); ++i) {
if (TQT_BASE_OBJECT_CONST(s) == TQT_BASE_OBJECT(m_controlsButtons[i])) if (s == m_controlsButtons[i])
instrumentNo = i; instrumentNo = i;
} }
@ -283,7 +283,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
int instrumentNo = -1; int instrumentNo = -1;
for (unsigned int i = 0; i < m_synthCombos.size(); ++i) { for (unsigned int i = 0; i < m_synthCombos.size(); ++i) {
if (TQT_BASE_OBJECT_CONST(s) == TQT_BASE_OBJECT(m_synthCombos[i])) if (s == m_synthCombos[i])
instrumentNo = i; instrumentNo = i;
} }

4
src/gui/widgets/AudioFaderBox.cpp
Unescape View File

@ -242,8 +242,8 @@ bool
AudioFaderBox::owns(const TQObject *object) AudioFaderBox::owns(const TQObject *object)
{ {
return (object && return (object &&
((TQT_BASE_OBJECT(object->parent()) == TQT_BASE_OBJECT(this)) || ((object->parent() == this) ||
(object->parent() && (TQT_BASE_OBJECT(object->parent()->parent()) == TQT_BASE_OBJECT(this))))); (object->parent() && (object->parent()->parent() == this))));
} }
void void

Write Preview
Loading…
Cancel
Save