Drop TQT_BASE_OBJECT* defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 2ec11ba03e87e734e3fa95f59385049feb82098b)

9 files changed, 21 insertions, 21 deletions

diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index af1edf4..29d2bc2 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -6902,7 +6902,7 @@ RosegardenGUIApp::slotControlEditorClosed()
     for (std::set
                 <ControlEditorDialog *>::iterator i = m_controlEditors.begin();
                 i != m_controlEditors.end(); ++i) {
-            if (TQT_BASE_OBJECT(*i) == TQT_BASE_OBJECT_CONST(s)) {
+            if (*i == s) {
                 m_controlEditors.erase(i);
                 RG_DEBUG << "removed control editor dialog, have " << m_controlEditors.size() << " left" << endl;
                 return ;
@@ -7028,7 +7028,7 @@ RosegardenGUIApp::slotPluginSelected(InstrumentId instrumentId,
 {
     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
     // the AudioPluginInstance before this is invoked.
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 9436beb..972ed08 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -2946,7 +2946,7 @@ MatrixView::slotStepByStepTargetRequested(TQObject *obj)
         MATRIX_DEBUG << "WARNING: No toggle_step_by_step action" << endl;
         return ;
     }
-    action->setChecked(TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this));
+    action->setChecked(obj == this);
 }
 
 void
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 05c48c0..e5d84c5 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -7374,7 +7374,7 @@ NotationView::slotStepByStepTargetRequested(TQObject *obj)
         NOTATION_DEBUG << "WARNING: No toggle_step_by_step action" << endl;
         return ;
     }
-    action->setChecked(TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this));
+    action->setChecked(obj == this);
 }
 
 void
diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp
index 28e9838..324c7f5 100644
--- a/src/gui/kdeext/klearlook.cpp
+++ b/src/gui/kdeext/klearlook.cpp
@@ -747,7 +747,7 @@ bool KlearlookStyle::objectEventHandler( const TQStyleControlElementData &ceData
 			}
 			break;
 			case TQEvent::Leave:
-			if ( hoverWidget && TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget) ) {
+			if ( hoverWidget && object == hoverWidget ) {
 				oldCursor.setX( -1 );
 				oldCursor.setY( -1 );
 				hoverWidget = NULL;
diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index 4715731..b5a6fa3 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -952,7 +952,7 @@ AudioMixerWindow::slotSelectPlugin()
         for (std::vector<TQPushButton *>::iterator pli = i->second.m_plugins.begin();
                 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);
                 return ;
@@ -975,7 +975,7 @@ AudioMixerWindow::slotSelectPlugin()
         for (std::vector<TQPushButton *>::iterator pli = i->m_plugins.begin();
                 pli != i->m_plugins.end(); ++pli) {
 
-            if (TQT_BASE_OBJECT(*pli) == TQT_BASE_OBJECT_CONST(s)) {
+            if (*pli == s) {
 
                 emit selectPlugin(this, b, index);
                 return ;
@@ -1062,7 +1062,7 @@ AudioMixerWindow::slotFaderLevelChanged(float dB)
 
     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) {
             StudioControl::setStudioObjectProperty
@@ -1080,7 +1080,7 @@ AudioMixerWindow::slotFaderLevelChanged(float dB)
     for (FaderVector::iterator i = m_submasters.begin();
             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) {
                 StudioControl::setStudioObjectProperty
                 (MappedObjectId(busses[index]->getMappedId()),
@@ -1100,7 +1100,7 @@ AudioMixerWindow::slotFaderLevelChanged(float dB)
     for (FaderMap::iterator i = m_faders.begin();
             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 =
                 m_studio->getInstrumentById(i->first);
@@ -1147,7 +1147,7 @@ AudioMixerWindow::slotPanChanged(float pan)
     for (FaderVector::iterator i = m_submasters.begin();
             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) {
                 StudioControl::setStudioObjectProperty
                 (MappedObjectId(busses[index]->getMappedId()),
@@ -1166,7 +1166,7 @@ AudioMixerWindow::slotPanChanged(float pan)
     for (FaderMap::iterator i = m_faders.begin();
             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 =
                 m_studio->getInstrumentById(i->first);
@@ -1216,7 +1216,7 @@ AudioMixerWindow::slotChannelsChanged()
     for (FaderMap::iterator i = m_faders.begin();
             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 =
                 m_studio->getInstrumentById(i->first);
diff --git a/src/gui/studio/MidiMixerWindow.cpp b/src/gui/studio/MidiMixerWindow.cpp
index cd23fa8..b3ef4f9 100644
--- a/src/gui/studio/MidiMixerWindow.cpp
+++ b/src/gui/studio/MidiMixerWindow.cpp
@@ -325,7 +325,7 @@ MidiMixerWindow::slotFaderLevelChanged(float value)
 
     for (FaderVector::const_iterator it = m_faders.begin();
             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->
                                 getInstrumentById((*it)->m_id);
 
@@ -379,7 +379,7 @@ MidiMixerWindow::slotControllerChanged(float value)
 
     for (i = 0; i < m_faders.size(); ++i) {
         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;
         }
 
diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp
index e1ccf30..e06605d 100644
--- a/src/gui/studio/MidiProgramsEditor.cpp
+++ b/src/gui/studio/MidiProgramsEditor.cpp
@@ -442,7 +442,7 @@ MidiProgramsEditor::slotNameChanged(const TQString& programName)
 void
 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) {
         RG_DEBUG << "MidiProgramsEditor::slotEntryButtonPressed() : %%% ERROR - signal sender is not a TQPushButton\n";
         return ;
diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp
index de2c3d0..4feb191 100644
--- a/src/gui/studio/SynthPluginManagerDialog.cpp
+++ b/src/gui/studio/SynthPluginManagerDialog.cpp
@@ -236,7 +236,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
         int instrumentNo = -1;
 
         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;
         }
 
@@ -258,7 +258,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
         int instrumentNo = -1;
 
         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;
         }
 
@@ -283,7 +283,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
         int instrumentNo = -1;
 
         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;
         }
 
diff --git a/src/gui/widgets/AudioFaderBox.cpp b/src/gui/widgets/AudioFaderBox.cpp
index 2862f3c..a39209e 100644
--- a/src/gui/widgets/AudioFaderBox.cpp
+++ b/src/gui/widgets/AudioFaderBox.cpp
@@ -242,8 +242,8 @@ bool
 AudioFaderBox::owns(const TQObject *object)
 {
     return (object &&
-            ((TQT_BASE_OBJECT(object->parent()) == TQT_BASE_OBJECT(this)) ||
-             (object->parent() && (TQT_BASE_OBJECT(object->parent()->parent()) == TQT_BASE_OBJECT(this)))));
+            ((object->parent() == this) ||
+             (object->parent() && (object->parent()->parent() == this))));
 }
 
 void