Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

10 files changed, 80 insertions, 80 deletions

diff --git a/tdemid/channel.cpp b/tdemid/channel.cpp
index 6b8e23cf..0b03ddc0 100644
--- a/tdemid/channel.cpp
+++ b/tdemid/channel.cpp
@@ -62,7 +62,7 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent)
     for (i=0;i<128;i++)
         instrumentCombo->insertItem(i18n(instrumentName[i]),i);
 
-    connect(instrumentCombo,TQT_SIGNAL(activated(int)),this,TQT_SLOT(pgmChanged(int)));
+    connect(instrumentCombo,TQ_SIGNAL(activated(int)),this,TQ_SLOT(pgmChanged(int)));
 
     forcepgm=new KMidButton(this,"forcepgm");
     forcepgm->setGeometry(135,4,16,16);
@@ -71,7 +71,7 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent)
     button2 = TQPixmap(locate("appdata","icons/button2.xpm"));
     forcepgm->setPixmaps(button1,button2);
     forcepgm->show();
-    connect(forcepgm,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(changeForcedState(bool)));
+    connect(forcepgm,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(changeForcedState(bool)));
 
 }
 
diff --git a/tdemid/channelcfgdlg.cpp b/tdemid/channelcfgdlg.cpp
index e55aaa58..76f6b87a 100644
--- a/tdemid/channelcfgdlg.cpp
+++ b/tdemid/channelcfgdlg.cpp
@@ -27,7 +27,7 @@ ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *parent,const char *na
     topLayout->addWidget( qbg );
     ((ChannelView::lookMode()==0)?rb0:rb1)->setChecked(TRUE);
     
-    connect (qbg, TQT_SIGNAL(pressed(int)),this,TQT_SLOT(modeselected(int)));
+    connect (qbg, TQ_SIGNAL(pressed(int)),this,TQ_SLOT(modeselected(int)));
 }
 
 void ChannelViewConfigDialog::modeselected(int idx)
diff --git a/tdemid/channelview.cpp b/tdemid/channelview.cpp
index 27410baa..32f6472a 100644
--- a/tdemid/channelview.cpp
+++ b/tdemid/channelview.cpp
@@ -40,12 +40,12 @@ ChannelView::ChannelView(void) : TDEMainWindow(0, "ChannelView")
             Channel[i]=new KMidChannel3D(i+1,this);
         else
             Channel[i]=new KMidChannel4D(i+1,this);
-        connect(Channel[i],TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(slottotdemidclient(int *)));
+        connect(Channel[i],TQ_SIGNAL(signalToKMidClient(int *)),this,TQ_SLOT(slottotdemidclient(int *)));
         Channel[i]->setGeometry(5,5+i*CHANNELHEIGHT,width()-20,CHANNELHEIGHT);
         Channel[i]->show();
     }
     scrollbar=new TQScrollBar(1,16,1,1,1,TQt::Vertical,this,"Channelscrollbar");
-    connect(scrollbar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(ScrollChn(int)));
+    connect(scrollbar,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(ScrollChn(int)));
     setScrollBarRange();
 }
 
@@ -150,7 +150,7 @@ void ChannelView::lookMode(int i)
         else
             Channel[i]=new KMidChannel4D(i+1,this);
 
-        connect(Channel[i],TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(slottotdemidclient(int *)));
+        connect(Channel[i],TQ_SIGNAL(signalToKMidClient(int *)),this,TQ_SLOT(slottotdemidclient(int *)));
         Channel[i]->setGeometry(5,5+(i-(scrollbar->value()-1))*CHANNELHEIGHT,width()-20,CHANNELHEIGHT);
         Channel[i]->loadState(tmp,&pgm);
         Channel[i]->show();
diff --git a/tdemid/collectdlg.cpp b/tdemid/collectdlg.cpp
index 4df74df7..226d86d1 100644
--- a/tdemid/collectdlg.cpp
+++ b/tdemid/collectdlg.cpp
@@ -43,18 +43,18 @@ CollectionDialog::CollectionDialog(SLManager *slm,int selC,TQWidget *parent,cons
 setCaption(i18n("Collections Manager"));
 ok=new KPushButton(KStdGuiItem::ok(),this);
 ok->setGeometry(140,200,100,30);
-connect(ok,TQT_SIGNAL(clicked()),TQT_SLOT(accept()) );
+connect(ok,TQ_SIGNAL(clicked()),TQ_SLOT(accept()) );
 cancel=new KPushButton(KStdGuiItem::cancel(),this);
 cancel->setGeometry(250,200,100,30);
-connect(cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject()) );
+connect(cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject()) );
 
 label=new TQLabel(i18n("Available collections:"),this);
 label->adjustSize();
 label->move(10,10);
 collections=new TQListBox(this,"collectionlist");
 collections->setGeometry(10,20+label->height(),340,90);
-connect(collections,TQT_SIGNAL(highlighted(int)),TQT_SLOT(collectionselected(int)));
-connect(collections,TQT_SIGNAL(selected(int)),TQT_SLOT(changeCollectionName(int)));
+connect(collections,TQ_SIGNAL(highlighted(int)),TQ_SLOT(collectionselected(int)));
+connect(collections,TQ_SIGNAL(selected(int)),TQ_SLOT(changeCollectionName(int)));
 slman=slm;
 for (int i=0;i<=slman->numberOfCollections();i++)
     {
@@ -74,7 +74,7 @@ label2->move(10,collections->y()+collections->height()+10);
 
 songs=new TQListBox(this,"songlist");
 songs->setGeometry(10,label2->y()+label2->height()+10,340,120);
-connect(songs,TQT_SIGNAL(highlighted(int)),TQT_SLOT(songselected(int)));
+connect(songs,TQ_SIGNAL(highlighted(int)),TQ_SLOT(songselected(int)));
 currentsl=slman->getCollection(selectedC);
 if (slman->numberOfCollections()>0)
     {
@@ -85,24 +85,24 @@ if (slman->numberOfCollections()>0)
 newC=new TQPushButton(i18n("&New..."),this);
 newC->adjustSize();
 newC->move(360,collections->y()+5);
-connect(newC,TQT_SIGNAL(clicked()),TQT_SLOT(newCollection()) );
+connect(newC,TQ_SIGNAL(clicked()),TQ_SLOT(newCollection()) );
 copyC=new TQPushButton(i18n("&Copy..."),this);
 copyC->adjustSize();
 copyC->move(360,newC->y()+newC->height()+5);
-connect(copyC,TQT_SIGNAL(clicked()),TQT_SLOT(copyCollection()) );
+connect(copyC,TQ_SIGNAL(clicked()),TQ_SLOT(copyCollection()) );
 deleteC=new TQPushButton(i18n("Delete"),this);
 deleteC->adjustSize();
 deleteC->move(360,copyC->y()+copyC->height()+5);
-connect(deleteC,TQT_SIGNAL(clicked()),TQT_SLOT(deleteCollection()) );
+connect(deleteC,TQ_SIGNAL(clicked()),TQ_SLOT(deleteCollection()) );
 
 addS=new TQPushButton(i18n("&Add..."),this);
 addS->adjustSize();
 addS->move(360,songs->y()+5);
-connect(addS,TQT_SIGNAL(clicked()),TQT_SLOT(addSong()) );
+connect(addS,TQ_SIGNAL(clicked()),TQ_SLOT(addSong()) );
 delS=new TQPushButton(i18n("&Remove"),this);
 delS->adjustSize();
 delS->move(360,addS->y()+addS->height()+5);
-connect(delS,TQT_SIGNAL(clicked()),TQT_SLOT(removeSong()) );
+connect(delS,TQ_SIGNAL(clicked()),TQ_SLOT(removeSong()) );
 
 ok->move(ok->x(),songs->y()+songs->height()+10);
 cancel->move(ok->x()+ok->width()+5,ok->y());
diff --git a/tdemid/klcdnumber.cpp b/tdemid/klcdnumber.cpp
index 1d4bab00..57385a39 100644
--- a/tdemid/klcdnumber.cpp
+++ b/tdemid/klcdnumber.cpp
@@ -71,10 +71,10 @@ KLCDNumber::KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *parent,
         downBtn=new KTriangleButton(KTriangleButton::Left,this,"Down");
         upBtn->setGeometry(width()-BUTTONWIDTH,0,BUTTONWIDTH,height());
         downBtn->setGeometry(0,0,BUTTONWIDTH,height());
-        connect(upBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(increaseValue()));
-        connect(downBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(decreaseValue()));
-        connect(upBtn,TQT_SIGNAL(clickedQuickly()),this,TQT_SLOT(increaseValueFast()));
-        connect(downBtn,TQT_SIGNAL(clickedQuickly()),this,TQT_SLOT(decreaseValueFast()));
+        connect(upBtn,TQ_SIGNAL(clicked()),this,TQ_SLOT(increaseValue()));
+        connect(downBtn,TQ_SIGNAL(clicked()),this,TQ_SLOT(decreaseValue()));
+        connect(upBtn,TQ_SIGNAL(clickedQuickly()),this,TQ_SLOT(increaseValueFast()));
+        connect(downBtn,TQ_SIGNAL(clickedQuickly()),this,TQ_SLOT(decreaseValueFast()));
     };
 }
 
diff --git a/tdemid/main.cpp b/tdemid/main.cpp
index 40902097..3f12b7c9 100644
--- a/tdemid/main.cpp
+++ b/tdemid/main.cpp
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
 
     app.setMainWidget ( tdemidframe );
 
-    TQObject::connect(&app,TQT_SIGNAL(shutDown()),tdemidframe,TQT_SLOT(shuttingDown()));
+    TQObject::connect(&app,TQ_SIGNAL(shutDown()),tdemidframe,TQ_SLOT(shuttingDown()));
 
     if (app.isRestored())
         {
diff --git a/tdemid/midicfgdlg.cpp b/tdemid/midicfgdlg.cpp
index 446f7e03..010e8f42 100644
--- a/tdemid/midicfgdlg.cpp
+++ b/tdemid/midicfgdlg.cpp
@@ -50,7 +50,7 @@ MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
   topLayout->addWidget(label);
   mididevices=new TQListBox(page,"midideviceslist");
   topLayout->addWidget(mididevices,3);
-  connect(mididevices,TQT_SIGNAL(highlighted(int)),TQT_SLOT(deviceselected(int)));
+  connect(mididevices,TQ_SIGNAL(highlighted(int)),TQ_SLOT(deviceselected(int)));
   devman=dm;
   TQString temp;
   for (int i=0;i<devman->midiPorts()+devman->synthDevices();i++)
@@ -87,11 +87,11 @@ MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
   hbox->addStretch(1);
   mapbrowse=new TQPushButton(i18n("Browse..."),page);
   hbox->addWidget(mapbrowse);
-  connect(mapbrowse,TQT_SIGNAL(clicked()),TQT_SLOT(browseMap()) );
+  connect(mapbrowse,TQ_SIGNAL(clicked()),TQ_SLOT(browseMap()) );
 
   mapnone=new TQPushButton(i18n("None"),page);
   hbox->addWidget(mapnone);
-  connect(mapnone,TQT_SIGNAL(clicked()),TQT_SLOT(noMap()) );
+  connect(mapnone,TQ_SIGNAL(clicked()),TQ_SLOT(noMap()) );
 
   topLayout->addStretch(1);
 
diff --git a/tdemid/tdemid_part.cpp b/tdemid/tdemid_part.cpp
index 17ce3c1b..ed6e062b 100644
--- a/tdemid/tdemid_part.cpp
+++ b/tdemid/tdemid_part.cpp
@@ -78,21 +78,21 @@ TDEInstance *KMidFactory::instance()
 
   // create and connect our actions
    (void)new TDEAction(i18n("Play"), "media-playback-start", 0, this,
-      TQT_SLOT(slotPlay()), actionCollection(),
+      TQ_SLOT(slotPlay()), actionCollection(),
       "play");
 
    (void)new TDEAction(i18n("Stop"), "media-playback-stop", 0, this,
-      TQT_SLOT(slotStop()), actionCollection(),
+      TQ_SLOT(slotStop()), actionCollection(),
       "stop");
 
    (void)new TDEAction(i18n("Backward"),
       "2leftarrow", 0, this,
-      TQT_SLOT(slotBackward()), actionCollection(),
+      TQ_SLOT(slotBackward()), actionCollection(),
       "backward");
 
    (void)new TDEAction(i18n("Forward"),
         "2rightarrow", 0, this,
-      TQT_SLOT(slotForward()), actionCollection(),
+      TQ_SLOT(slotForward()), actionCollection(),
       "forward");
 
   m_extension = new KMidBrowserExtension(this);
@@ -111,7 +111,7 @@ bool KMidPart::openFile()
   widget->openURL(m_file);
   widget->stop();
   widget->show();
-  TQTimer::singleShot(2000, this, TQT_SLOT(slotPlay()));
+  TQTimer::singleShot(2000, this, TQ_SLOT(slotPlay()));
 
   return true;
 }
diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp
index cc6cce2d..dc6f09ae 100644
--- a/tdemid/tdemidclient.cpp
+++ b/tdemid/tdemidclient.cpp
@@ -93,7 +93,7 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
     timebar = new TQSlider(0,240000,30000,60000,TQt::Horizontal, this);
     timebar->setSteps(30000,60000);
     timebar->setValue(0);
-    connect (timebar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotSeek(int)));
+    connect (timebar,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotSeek(int)));
 
     timetags = new QSliderTime(timebar,this);
     timetags->setMinimumSize(timetags->sizeHint());
@@ -109,14 +109,14 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
     tempoLCD->setDefaultValue(120);
     tempoLCD->setUserSetDefaultValue(true);
     tempoLCD->setMinimumSize(tempoLCD->sizeHint());
-    connect(tempoLCD,TQT_SIGNAL(valueChanged(double)),this,TQT_SLOT(slotSetTempo(double)));
+    connect(tempoLCD,TQ_SIGNAL(valueChanged(double)),this,TQ_SLOT(slotSetTempo(double)));
 
     comboSongs = new TQComboBox(FALSE, this,"Songs");
-    connect (comboSongs,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSelectSong(int)));
+    connect (comboSongs,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotSelectSong(int)));
     comboSongs->setMinimumWidth(200);
     
     comboEncodings = new TQComboBox(FALSE, this, "Encodings");
-    connect (comboEncodings,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSelectEncoding(int)));
+    connect (comboEncodings,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotSelectEncoding(int)));
     comboEncodings->insertItem(i18n("Default"));
     comboEncodings->insertStringList( TDEGlobal::charsets()->descriptiveEncodingNames() );
     comboEncodings->setCurrentItem(0);
@@ -130,7 +130,7 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
     volumebar->setValue(100);
     volumebar->setTickmarks(TQSlider::NoMarks);
     volumebar->setTickInterval(50);
-    connect (volumebar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotSetVolume(int)));
+    connect (volumebar,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotSetVolume(int)));
 
     visiblevolumebar=cfg->readNumEntry("ShowVolumeBar",0);
     if (visiblevolumebar) volumebar->show();
@@ -141,9 +141,9 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
     kdispt->show();
 
     timer4timebar=new TQTimer(this);
-    connect (timer4timebar,TQT_SIGNAL(timeout()),this,TQT_SLOT(timebarUpdate()));
+    connect (timer4timebar,TQ_SIGNAL(timeout()),this,TQ_SLOT(timebarUpdate()));
     timer4events=new TQTimer(this);
-    connect (timer4events,TQT_SIGNAL(timeout()),this,TQT_SLOT(processSpecialEvent()));
+    connect (timer4events,TQ_SIGNAL(timeout()),this,TQ_SLOT(processSpecialEvent()));
 
     TQString samplefile =
       TDEGlobal::dirs()->findAllResources("appdata", "fm/*.o3").last();
@@ -372,7 +372,7 @@ int tdemidClient::openURL(const TQString _url)
 	filename = TQString("/tmp/") + u.filename();
 	TDEIO::Job *iojob = TDEIO::copy( u, KURL::fromPathOrURL( filename ) );
 	downloaded=false;
-	connect( iojob, TQT_SIGNAL( result( TDEIO::Job *) ), this, TQT_SLOT(downloadFinished( TDEIO::Job * ) ) );
+	connect( iojob, TQ_SIGNAL( result( TDEIO::Job *) ), this, TQ_SLOT(downloadFinished( TDEIO::Job * ) ) );
 
 	if (!downloaded)
             kapp->enter_loop();
@@ -1373,8 +1373,8 @@ void tdemidClient::visibleChannelView(int i)
             }
         }
         channelView->show();
-        connect(channelView,TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(communicationFromChannelView(int *)));
-	connect(kapp,TQT_SIGNAL(shutDown()),parentWidget(),TQT_SLOT(shuttingDown()));
+        connect(channelView,TQ_SIGNAL(signalToKMidClient(int *)),this,TQ_SLOT(communicationFromChannelView(int *)));
+	connect(kapp,TQ_SIGNAL(shutDown()),parentWidget(),TQ_SLOT(shuttingDown()));
 
     }
     else if ((channelView!=NULL)&&(i==0))
diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index 609be7dd..88069499 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -68,73 +68,73 @@ tdemidFrame::tdemidFrame(const char *name)
 /*
     kKeysAccel=new TDEAccel(this);
     kKeysAccel->insertItem(i18n("Play/Pause"),"Play/Pause", Key_Space);
-    kKeysAccel->connectItem("Play/Pause", this, TQT_SLOT(spacePressed()));
+    kKeysAccel->connectItem("Play/Pause", this, TQ_SLOT(spacePressed()));
     kKeysAccel->insertItem(i18n("Stop"),"Stop", Key_Backspace);
-    kKeysAccel->connectItem("Stop",tdemidclient,TQT_SLOT(song_Stop()));
+    kKeysAccel->connectItem("Stop",tdemidclient,TQ_SLOT(song_Stop()));
     kKeysAccel->insertItem(i18n("Previous Song"),"Previous Song", Key_Left);
-    kKeysAccel->connectItem("Previous Song",tdemidclient,TQT_SLOT(song_PlayPrevSong()));
+    kKeysAccel->connectItem("Previous Song",tdemidclient,TQ_SLOT(song_PlayPrevSong()));
     kKeysAccel->insertItem(i18n("Next Song"),"Next Song", Key_Right);
-    kKeysAccel->connectItem("Next Song",tdemidclient,TQT_SLOT(song_PlayNextSong()));
+    kKeysAccel->connectItem("Next Song",tdemidclient,TQ_SLOT(song_PlayNextSong()));
     kKeysAccel->insertItem(i18n("Scroll Down Karaoke"),"Scroll down karaoke",Key_Down);
-    kKeysAccel->connectItem("Scroll Down karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollDown()));
+    kKeysAccel->connectItem("Scroll Down karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollDown()));
     kKeysAccel->insertItem(i18n("Scroll Up Karaoke"),"Scroll up karaoke",Key_Up);
-    kKeysAccel->connectItem("Scroll Up Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollUp()));
+    kKeysAccel->connectItem("Scroll Up Karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollUp()));
     kKeysAccel->insertItem(i18n("Scroll Page Down Karaoke"),"Scroll page down karaoke",Key_PageDown);
-    kKeysAccel->connectItem("Scroll Page Down Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollPageDown()));
+    kKeysAccel->connectItem("Scroll Page Down Karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollPageDown()));
     kKeysAccel->insertItem(i18n("Scroll Page Up Karaoke"),"Scroll page up karaoke",Key_PageUp);
-    kKeysAccel->connectItem("Scroll Page Up Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollPageUp()));
+    kKeysAccel->connectItem("Scroll Page Up Karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollPageUp()));
 
     kKeysAccel->readSettings();
 */
-    KStdAction::open(this, TQT_SLOT(file_Open()), actionCollection());
+    KStdAction::open(this, TQ_SLOT(file_Open()), actionCollection());
     (void)new TDEAction(i18n("&Save Lyrics..."), 0, this,
-	TQT_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics");
-    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+	TQ_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics");
+    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 
     (void)new TDEAction(i18n("&Play"), "media-playback-start", TQt::Key_Space,
-		tdemidclient, TQT_SLOT(slotPlay()), actionCollection(), "song_play");
+		tdemidclient, TQ_SLOT(slotPlay()), actionCollection(), "song_play");
     (void)new TDEAction(i18n("P&ause"), "media-playback-pause", TQt::Key_P, tdemidclient,
-			TQT_SLOT(slotPause()), actionCollection(), "song_pause");
+			TQ_SLOT(slotPause()), actionCollection(), "song_pause");
     (void)new TDEAction(i18n("&Stop"), "media-playback-stop", TQt::Key_Backspace,
-		tdemidclient, TQT_SLOT(slotStop()), actionCollection(), "song_stop");
+		tdemidclient, TQ_SLOT(slotStop()), actionCollection(), "song_stop");
 
     (void)new TDEAction(i18n("P&revious Song"), "media-skip-backward", Key_Left,
-		tdemidclient, TQT_SLOT(slotPrevSong()), actionCollection(),
+		tdemidclient, TQ_SLOT(slotPrevSong()), actionCollection(),
 		"song_previous");
     (void)new TDEAction(i18n("&Next Song"), "media-skip-forward", Key_Right,
-		tdemidclient, TQT_SLOT(slotNextSong()), actionCollection(),
+		tdemidclient, TQ_SLOT(slotNextSong()), actionCollection(),
 		"song_next");
-    (void)new TDEToggleAction(i18n("&Loop"), 0, this, TQT_SLOT(song_Loop()),
+    (void)new TDEToggleAction(i18n("&Loop"), 0, this, TQ_SLOT(song_Loop()),
 		actionCollection(), "song_loop");
 
     (void)new TDEAction(i18n("Rewind"), "2leftarrow", 0, tdemidclient,
-		TQT_SLOT(slotRewind()), actionCollection(), "song_rewind");
+		TQ_SLOT(slotRewind()), actionCollection(), "song_rewind");
 
     (void)new TDEAction(i18n("Forward"), "2rightarrow", 0, tdemidclient,
-		TQT_SLOT(slotForward()), actionCollection(), "song_forward");
+		TQ_SLOT(slotForward()), actionCollection(), "song_forward");
 
-    (void)new TDEAction(i18n("&Organize..."), 0, this, TQT_SLOT(collect_organize()),
+    (void)new TDEAction(i18n("&Organize..."), 0, this, TQ_SLOT(collect_organize()),
 		actionCollection(), "collect_organize");
 
     TQStringList playmodes;
     playmodes.append(i18n("In Order"));
     playmodes.append(i18n("Shuffle"));
 
-    TDESelectAction *act=new TDESelectAction(i18n("Play Order"), 0, /*this, TQT_SLOT(collect_PlayOrder(int)),*/
+    TDESelectAction *act=new TDESelectAction(i18n("Play Order"), 0, /*this, TQ_SLOT(collect_PlayOrder(int)),*/
                       actionCollection(), "play_order");
-    connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(collect_PlayOrder(int)));
+    connect(act,TQ_SIGNAL(activated(int)),this, TQ_SLOT(collect_PlayOrder(int)));
     act->setItems(playmodes);
 
     (void)new TDEToggleAction(i18n("Auto-Add to Collection"), 0, this,
-	TQT_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd");
+	TQ_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd");
 
     playmodes.clear();
     playmodes.append(i18n("&General MIDI"));
     playmodes.append(i18n("&MT-32"));
 
-    act=new TDESelectAction(i18n("File Type"), 0,/* this, TQT_SLOT(options_FileType(int)),*/
+    act=new TDESelectAction(i18n("File Type"), 0,/* this, TQ_SLOT(options_FileType(int)),*/
                       actionCollection(), "file_type");
-    connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_FileType(int)));
+    connect(act,TQ_SIGNAL(activated(int)),this, TQ_SLOT(options_FileType(int)));
     act->setItems(playmodes);
 
     playmodes.clear();
@@ -142,35 +142,35 @@ tdemidFrame::tdemidFrame(const char *name)
     playmodes.append(i18n("&Lyric Events"));
 
     act=new TDESelectAction(i18n("Display Events"), Key_T, /*this,
-		TQT_SLOT(options_DisplayEvents(int)),*/ actionCollection(),
+		TQ_SLOT(options_DisplayEvents(int)),*/ actionCollection(),
 		"display_events");
-    connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_DisplayEvents(int)));
+    connect(act,TQ_SIGNAL(activated(int)),this, TQ_SLOT(options_DisplayEvents(int)));
     act->setItems(playmodes);
 
     (void)new TDEToggleAction(i18n("Automatic Text Chooser"), 0, this,
-		TQT_SLOT(options_AutomaticText()), actionCollection(),
+		TQ_SLOT(options_AutomaticText()), actionCollection(),
 		"option_automatictext");
 
     TDEToggleAction* togact = new TDEToggleAction(i18n("Show &Volume Bar"), "volume",
-		0, this, TQT_SLOT(options_ShowVolumeBar()), actionCollection(),
+		0, this, TQ_SLOT(options_ShowVolumeBar()), actionCollection(),
 		"toggle_volumebar");
     togact->setCheckedState(i18n("Hide &Volume Bar"));
 
     togact = new TDEToggleAction(i18n("Show &Channel View"), "piano",
-		0, this, TQT_SLOT(options_ShowChannelView()), actionCollection(),
+		0, this, TQ_SLOT(options_ShowChannelView()), actionCollection(),
 		"toggle_channelview");
     togact->setCheckedState(i18n("Hide &Channel View"));
 
     (void)new TDEAction(i18n("Channel View &Options..."), 0, this,
-		TQT_SLOT(options_ChannelViewOptions()), actionCollection(),
+		TQ_SLOT(options_ChannelViewOptions()), actionCollection(),
 		"channelview_options");
 
     (void)new TDEAction(i18n("&Font Change..."), 0, this,
-		TQT_SLOT(options_FontChange()), actionCollection(),
+		TQ_SLOT(options_FontChange()), actionCollection(),
 		"change_font");
 
     (void)new TDEAction(i18n("MIDI &Setup..."), 0, this,
-		TQT_SLOT(options_MidiSetup()), actionCollection(), "midi_setup");
+		TQ_SLOT(options_MidiSetup()), actionCollection(), "midi_setup");
 
 
     setupGUI((ToolBar | Keys | StatusBar | Save | Create ), "tdemidui.rc" );
@@ -212,14 +212,14 @@ tdemidFrame::tdemidFrame(const char *name)
 
     setAcceptDrops(true);
 
-    connect( tdemidclient, TQT_SIGNAL( mustRechooseTextEvent() ),
-             this, TQT_SLOT( rechooseTextEvent() ) );
+    connect( tdemidclient, TQ_SIGNAL( mustRechooseTextEvent() ),
+             this, TQ_SLOT( rechooseTextEvent() ) );
 
-    connect( tdemidclient, TQT_SIGNAL( stopPause() ),
-             this, TQT_SLOT( song_stopPause() ) );
+    connect( tdemidclient, TQ_SIGNAL( stopPause() ),
+             this, TQ_SLOT( song_stopPause() ) );
 
-//    connect( tdemidclient, TQT_SIGNAL( channelView_Destroyed() ),
-//             this, TQT_SLOT( channelViewDestroyed() ) );
+//    connect( tdemidclient, TQ_SIGNAL( channelView_Destroyed() ),
+//             this, TQ_SLOT( channelViewDestroyed() ) );
 
     TDECmdLineArgs * args = TDECmdLineArgs::parsedArgs();
 
@@ -258,7 +258,7 @@ tdemidFrame::tdemidFrame(const char *name)
         /*
          kKeys->addKey("Play/Pause",Key_Space);
          kKeys->registerWidget("KMidFrame",this);
-         kKeys->connectFunction("KMidFrame","Play/Pause",this,TQT_SLOT(spacePressed()));
+         kKeys->connectFunction("KMidFrame","Play/Pause",this,TQ_SLOT(spacePressed()));
          */
 //    kKeysAccel->writeSettings(cfg);
 
@@ -599,7 +599,7 @@ void tdemidFrame::options_ShowChannelView()
   } else
   {
     tdemidclient->visibleChannelView(1);
-    connect (tdemidclient->getChannelView(),TQT_SIGNAL(destroyMe()),this,TQT_SLOT(channelViewDestroyed()));
+    connect (tdemidclient->getChannelView(),TQ_SIGNAL(destroyMe()),this,TQ_SLOT(channelViewDestroyed()));
   }
 
 }