Remove various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 9b054308cef27a642eaa6e9a86db215151468e0b)

6 files changed, 33 insertions, 33 deletions

diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index b5a6fa3..c73b4ff 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -94,13 +94,13 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
 {
     populate();
 
-    KStdAction::close(TQT_TQOBJECT(this),
+    KStdAction::close(this,
                       TQT_SLOT(slotClose()),
                       actionCollection());
 
     TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                              ("transport-play")));
-    TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this),
+    TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, this,
                 TQT_SIGNAL(play()), actionCollection(), "play");
     // Alternative shortcut for Play
     TDEShortcut playShortcut = play->shortcut();
@@ -109,68 +109,68 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-stop")));
-    new TDEAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this),
+    new TDEAction(i18n("&Stop"), icon, Key_Insert, this,
                 TQT_SIGNAL(stop()), actionCollection(), "stop");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-rewind")));
-    new TDEAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Re&wind"), icon, Key_End, this,
                 TQT_SIGNAL(rewindPlayback()), actionCollection(),
                 "playback_pointer_back_bar");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-ffwd")));
-    new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, TQT_TQOBJECT(this),
+    new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, this,
                 TQT_SIGNAL(fastForwardPlayback()), actionCollection(),
                 "playback_pointer_forward_bar");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-rewind-end")));
-    new TDEAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Rewind to &Beginning"), icon, 0, this,
                 TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
                 "playback_pointer_start");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-ffwd-end")));
-    new TDEAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Fast Forward to &End"), icon, 0, this,
                 TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
                 "playback_pointer_end");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-record")));
-    new TDEAction(i18n("&Record"), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("&Record"), icon, 0, this,
                 TQT_SIGNAL(record()), actionCollection(),
                 "record");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-panic")));
-    new TDEAction(i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Panic"), icon, Key_P + CTRL + ALT, this,
                 TQT_SIGNAL(panic()), actionCollection(),
                 "panic");
 
     unsigned int mixerOptions = m_studio->getMixerDisplayOptions();
 
-    (new TDEToggleAction(i18n("Show Audio &Faders"), 0, TQT_TQOBJECT(this),
+    (new TDEToggleAction(i18n("Show Audio &Faders"), 0, this,
                        TQT_SLOT(slotToggleFaders()), actionCollection(),
                        "show_audio_faders"))->setChecked
     (!(mixerOptions & MIXER_OMIT_FADERS));
 
-    (new TDEToggleAction(i18n("Show Synth &Faders"), 0, TQT_TQOBJECT(this),
+    (new TDEToggleAction(i18n("Show Synth &Faders"), 0, this,
                        TQT_SLOT(slotToggleSynthFaders()), actionCollection(),
                        "show_synth_faders"))->setChecked
     (!(mixerOptions & MIXER_OMIT_SYNTH_FADERS));
 
-    (new TDEToggleAction(i18n("Show &Submasters"), 0, TQT_TQOBJECT(this),
+    (new TDEToggleAction(i18n("Show &Submasters"), 0, this,
                        TQT_SLOT(slotToggleSubmasters()), actionCollection(),
                        "show_audio_submasters"))->setChecked
     (!(mixerOptions & MIXER_OMIT_SUBMASTERS));
 
-    (new TDEToggleAction(i18n("Show &Plugin Buttons"), 0, TQT_TQOBJECT(this),
+    (new TDEToggleAction(i18n("Show &Plugin Buttons"), 0, this,
                        TQT_SLOT(slotTogglePluginButtons()), actionCollection(),
                        "show_plugin_buttons"))->setChecked
     (!(mixerOptions & MIXER_OMIT_PLUGINS));
 
-    (new TDEToggleAction(i18n("Show &Unassigned Faders"), 0, TQT_TQOBJECT(this),
+    (new TDEToggleAction(i18n("Show &Unassigned Faders"), 0, this,
                        TQT_SLOT(slotToggleUnassignedFaders()), actionCollection(),
                        "show_unassigned_faders"))->setChecked
     (mixerOptions & MIXER_SHOW_UNASSIGNED_FADERS);
@@ -180,7 +180,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
     for (int i = 1; i <= 16; i *= 2) {
         action =
             new TDERadioAction(i18n("1 Input", "%n Inputs", i),
-                             0, TQT_TQOBJECT(this),
+                             0, this,
                              TQT_SLOT(slotSetInputCountFromAction()), actionCollection(),
                              TQString("inputs_%1").arg(i).ascii());
         action->setExclusiveGroup("inputs");
@@ -190,7 +190,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
 
     action = new TDERadioAction
              (i18n("No Submasters"),
-              0, TQT_TQOBJECT(this),
+              0, this,
               TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
               TQString("submasters_0").ascii());
     action->setExclusiveGroup("submasters");
@@ -199,7 +199,7 @@ AudioMixerWindow::AudioMixerWindow(TQWidget *parent,
     for (int i = 2; i <= 8; i *= 2) {
         action = new TDERadioAction
                  (i18n("1 Submaster", "%n Submasters", i),
-                  0, TQT_TQOBJECT(this),
+                  0, this,
                   TQT_SLOT(slotSetSubmasterCountFromAction()), actionCollection(),
                   TQString("submasters_%1").arg(i).ascii());
         action->setExclusiveGroup("submasters");
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index 78273d8..819f031 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -301,14 +301,14 @@ BankEditorDialog::~BankEditorDialog()
 void
 BankEditorDialog::setupActions()
 {
-    TDEAction* close = KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection());
+    TDEAction* close = KStdAction::close (this, TQT_SLOT(slotFileClose()), actionCollection());
 
     m_closeButton->setText(close->text());
     connect(m_closeButton, TQT_SIGNAL(clicked()),
-            TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()));
+            this, TQT_SLOT(slotFileClose()));
 
-    KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection());
-    KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection());
+    KStdAction::copy (this, TQT_SLOT(slotEditCopy()), actionCollection());
+    KStdAction::paste (this, TQT_SLOT(slotEditPaste()), actionCollection());
 
     // some adjustments
 
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index 34579e0..727110d 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -212,7 +212,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
         layout->addWidget(closeButton);
         layout->addSpacing(5);
 
-        TDEAction* close = KStdAction::close(TQT_TQOBJECT(this),
+        TDEAction* close = KStdAction::close(this,
                                            TQT_SLOT(slotClose()),
                                            actionCollection());
 
diff --git a/src/gui/studio/MidiMixerWindow.cpp b/src/gui/studio/MidiMixerWindow.cpp
index b3ef4f9..5b1184d 100644
--- a/src/gui/studio/MidiMixerWindow.cpp
+++ b/src/gui/studio/MidiMixerWindow.cpp
@@ -70,13 +70,13 @@ MidiMixerWindow::MidiMixerWindow(TQWidget *parent,
     //
     setupTabs();
 
-    KStdAction::close(TQT_TQOBJECT(this),
+    KStdAction::close(this,
                       TQT_SLOT(slotClose()),
                       actionCollection());
 
     TQIconSet icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                              ("transport-play")));
-    TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, TQT_TQOBJECT(this),
+    TDEAction *play = new TDEAction(i18n("&Play"), icon, Key_Enter, this,
                 TQT_SIGNAL(play()), actionCollection(), "play");
     // Alternative shortcut for Play
     TDEShortcut playShortcut = play->shortcut();
@@ -85,42 +85,42 @@ MidiMixerWindow::MidiMixerWindow(TQWidget *parent,
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-stop")));
-    new TDEAction(i18n("&Stop"), icon, Key_Insert, TQT_TQOBJECT(this),
+    new TDEAction(i18n("&Stop"), icon, Key_Insert, this,
                 TQT_SIGNAL(stop()), actionCollection(), "stop");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-rewind")));
-    new TDEAction(i18n("Re&wind"), icon, Key_End, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Re&wind"), icon, Key_End, this,
                 TQT_SIGNAL(rewindPlayback()), actionCollection(),
                 "playback_pointer_back_bar");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-ffwd")));
-    new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, TQT_TQOBJECT(this),
+    new TDEAction(i18n("&Fast Forward"), icon, Key_PageDown, this,
                 TQT_SIGNAL(fastForwardPlayback()), actionCollection(),
                 "playback_pointer_forward_bar");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-rewind-end")));
-    new TDEAction(i18n("Rewind to &Beginning"), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Rewind to &Beginning"), icon, 0, this,
                 TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(),
                 "playback_pointer_start");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-ffwd-end")));
-    new TDEAction(i18n("Fast Forward to &End"), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Fast Forward to &End"), icon, 0, this,
                 TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(),
                 "playback_pointer_end");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-record")));
-    new TDEAction(i18n("&Record"), icon, 0, TQT_TQOBJECT(this),
+    new TDEAction(i18n("&Record"), icon, 0, this,
                 TQT_SIGNAL(record()), actionCollection(),
                 "record");
 
     icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap
                     ("transport-panic")));
-    new TDEAction(i18n("Panic"), icon, Key_P + CTRL + ALT, TQT_TQOBJECT(this),
+    new TDEAction(i18n("Panic"), icon, Key_P + CTRL + ALT, this,
                 TQT_SIGNAL(panic()), actionCollection(),
                 "panic");
 
diff --git a/src/gui/studio/MidiProgramsEditor.cpp b/src/gui/studio/MidiProgramsEditor.cpp
index e06605d..82f2192 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<TQObject*>(sender())));
+    TQPushButton* button = dynamic_cast<TQPushButton*>(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 fb3f77b..4c05314 100644
--- a/src/gui/studio/SynthPluginManagerDialog.cpp
+++ b/src/gui/studio/SynthPluginManagerDialog.cpp
@@ -169,7 +169,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
         layout->addWidget(closeButton);
         layout->addSpacing(5);
 
-        TDEAction* close = KStdAction::close(TQT_TQOBJECT(this),
+        TDEAction* close = KStdAction::close(this,
                                            TQT_SLOT(slotClose()),
                                            actionCollection());