Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

8 files changed, 117 insertions, 117 deletions

diff --git a/kandy/src/commandscheduler.cpp b/kandy/src/commandscheduler.cpp
index cc18a666a..d6a953906 100644
--- a/kandy/src/commandscheduler.cpp
+++ b/kandy/src/commandscheduler.cpp
@@ -35,8 +35,8 @@ CommandScheduler::CommandScheduler(Modem *modem,TQObject *parent,
   TQObject(parent,name),
   mModem(modem)
 {
-  connect(mModem,TQT_SIGNAL(gotLine(const char *)),
-          TQT_SLOT(processOutput(const char *)));
+  connect(mModem,TQ_SIGNAL(gotLine(const char *)),
+          TQ_SLOT(processOutput(const char *)));
 }
 
 void CommandScheduler::execute(ATCommand *command)
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index 47c16d7d8..cd2e9826f 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -81,12 +81,12 @@ Kandy::Kandy(CommandScheduler *scheduler)
   setAutoSaveSettings();
 
   // allow the view to change the statusbar and caption
-  connect(mView, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
-          this,   TQT_SLOT(changeStatusbar(const TQString&)));
-  connect(mView, TQT_SIGNAL(signalChangeCaption(const TQString&)),
-          this,   TQT_SLOT(changeCaption(const TQString&)));
+  connect(mView, TQ_SIGNAL(signalChangeStatusbar(const TQString&)),
+          this,   TQ_SLOT(changeStatusbar(const TQString&)));
+  connect(mView, TQ_SIGNAL(signalChangeCaption(const TQString&)),
+          this,   TQ_SLOT(changeCaption(const TQString&)));
 
-  connect(mView,TQT_SIGNAL(modifiedChanged(bool)),TQT_SLOT(setTitle()));
+  connect(mView,TQ_SIGNAL(modifiedChanged(bool)),TQ_SLOT(setTitle()));
 
   TDEConfig *config = TDEGlobal::config();
   config->setGroup("General");
@@ -123,26 +123,26 @@ void Kandy::save(const TQString & filename)
 
 void Kandy::setupActions()
 {
-  KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
-  KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
-  KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
-//  KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection());
-  KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+  KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+  KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection());
+  KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
+//  KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection());
+  KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
 
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
     
-  KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-  KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
-  KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+  KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+  KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
+  KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
 
-  new TDEAction(i18n("Mobile GUI"),0,this,TQT_SLOT(showMobileGui()),
+  new TDEAction(i18n("Mobile GUI"),0,this,TQ_SLOT(showMobileGui()),
               actionCollection(),"show_mobilegui");
 
-  mConnectAction = new TDEAction(i18n("Connect"),0,this,TQT_SLOT(modemConnect()),
+  mConnectAction = new TDEAction(i18n("Connect"),0,this,TQ_SLOT(modemConnect()),
                                actionCollection(),"modem_connect");
   mDisconnectAction = new TDEAction(i18n("Disconnect"),0,this,
-                                  TQT_SLOT(modemDisconnect()),actionCollection(),
+                                  TQ_SLOT(modemDisconnect()),actionCollection(),
                                   "modem_disconnect");
 
   createGUI();
@@ -252,7 +252,7 @@ void Kandy::optionsConfigureToolbars()
     // use the standard toolbar editor
     saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
     KEditToolbar dlg(actionCollection());
-    connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig()));
+    connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig()));
     dlg.exec();
 }
 
diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp
index 60ec1a67e..db7781dee 100644
--- a/kandy/src/kandyprefsdialog.cpp
+++ b/kandy/src/kandyprefsdialog.cpp
@@ -292,60 +292,60 @@ void KandyPrefsDialog::setupAddressbookTab()
   }
   
   
-  connect( useHomeSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           HomeSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useHomeSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           HomeSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useWorkSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           WorkSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useWorkSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           WorkSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useMessagingSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           MessagingSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useMessagingSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           MessagingSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useFaxSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           FaxSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useFaxSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           FaxSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useCellSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           CellSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useCellSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           CellSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useVideoSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           VideoSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useVideoSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           VideoSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useMailboxSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           MailboxSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useMailboxSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           MailboxSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useModemSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           ModemSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useModemSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           ModemSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useCarSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           CarSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useCarSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           CarSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( useISDNSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           ISDNSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( useISDNSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           ISDNSuff->label(), TQT_SLOT(setEnabled(bool)) );
-  
-  connect( usePagerSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           PagerSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) );
-  connect( usePagerSuff->checkBox(), TQT_SIGNAL(toggled(bool)),
-           PagerSuff->label(), TQT_SLOT(setEnabled(bool)) );
+  connect( useHomeSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           HomeSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useHomeSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           HomeSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useWorkSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           WorkSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useWorkSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           WorkSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useMessagingSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           MessagingSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useMessagingSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           MessagingSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useFaxSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           FaxSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useFaxSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           FaxSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useCellSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           CellSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useCellSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           CellSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useVideoSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           VideoSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useVideoSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           VideoSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useMailboxSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           MailboxSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useMailboxSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           MailboxSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useModemSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           ModemSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useModemSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           ModemSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useCarSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           CarSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useCarSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           CarSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( useISDNSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           ISDNSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( useISDNSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           ISDNSuff->label(), TQ_SLOT(setEnabled(bool)) );
+  
+  connect( usePagerSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           PagerSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) );
+  connect( usePagerSuff->checkBox(), TQ_SIGNAL(toggled(bool)),
+           PagerSuff->label(), TQ_SLOT(setEnabled(bool)) );
 }
 
 void KandyPrefsDialog::setupWindowsTab()
diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp
index 7f11adc94..51987b30c 100644
--- a/kandy/src/kandyview.cpp
+++ b/kandy/src/kandyview.cpp
@@ -80,24 +80,24 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent)
   mCommandList->addColumn( i18n( "Hex" ) );
   commandLayout->addWidget( mCommandList );
 
-  connect( mCommandList, TQT_SIGNAL( doubleClicked(TQListViewItem*) ),
-           TQT_SLOT( executeCommand() ) );
+  connect( mCommandList, TQ_SIGNAL( doubleClicked(TQListViewItem*) ),
+           TQ_SLOT( executeCommand() ) );
 
   TQPushButton *buttonAdd = new TQPushButton( i18n("Add..."), commandBox );
   commandLayout->addWidget( buttonAdd );
-  connect( buttonAdd, TQT_SIGNAL( clicked() ), TQT_SLOT( addCommand() ) );
+  connect( buttonAdd, TQ_SIGNAL( clicked() ), TQ_SLOT( addCommand() ) );
 
   TQPushButton *buttonEdit = new TQPushButton( i18n("Edit..."), commandBox );
   commandLayout->addWidget( buttonEdit );
-  connect( buttonEdit, TQT_SIGNAL( clicked() ), TQT_SLOT( editCommand() ) );
+  connect( buttonEdit, TQ_SIGNAL( clicked() ), TQ_SLOT( editCommand() ) );
 
   TQPushButton *buttonDelete = new TQPushButton( i18n("Delete"), commandBox );
   commandLayout->addWidget( buttonDelete );
-  connect( buttonDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteCommand() ) );
+  connect( buttonDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteCommand() ) );
 
   TQPushButton *buttonExecute = new TQPushButton( i18n("Execute"), commandBox );
   commandLayout->addWidget( buttonExecute );
-  connect( buttonExecute, TQT_SIGNAL( clicked() ), TQT_SLOT( executeCommand() ) );
+  connect( buttonExecute, TQ_SIGNAL( clicked() ), TQ_SLOT( executeCommand() ) );
 
   TQSplitter *ioSplitter = new TQSplitter( TQt::Vertical, mainSplitter );
 
@@ -132,15 +132,15 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent)
   mResultView = new TQTextEdit( resultBox );
   mResultView->setReadOnly( true );
   
-  connect (mInput,TQT_SIGNAL(returnPressed()),TQT_SLOT(processLastLine()));
+  connect (mInput,TQ_SIGNAL(returnPressed()),TQ_SLOT(processLastLine()));
 
-  connect(mScheduler->modem(),TQT_SIGNAL(gotLine(const char *)),
-          TQT_SLOT(appendOutput(const char *)));
+  connect(mScheduler->modem(),TQ_SIGNAL(gotLine(const char *)),
+          TQ_SLOT(appendOutput(const char *)));
 
-  connect(mScheduler,TQT_SIGNAL(result(const TQString &)),
-          mResultView,TQT_SLOT(setText(const TQString &)));
-  connect(mScheduler,TQT_SIGNAL(commandProcessed(ATCommand *)),
-          TQT_SLOT(setResult(ATCommand *)));
+  connect(mScheduler,TQ_SIGNAL(result(const TQString &)),
+          mResultView,TQ_SLOT(setText(const TQString &)));
+  connect(mScheduler,TQ_SIGNAL(commandProcessed(ATCommand *)),
+          TQ_SLOT(setResult(ATCommand *)));
 }
 
 KandyView::~KandyView()
@@ -158,7 +158,7 @@ void KandyView::importPhonebook()
 {
 #if 0
   createMobileGui();
-  connect (mMobileGui,TQT_SIGNAL(phonebookRead()),mMobileGui,TQT_SLOT(writeKab()));
+  connect (mMobileGui,TQ_SIGNAL(phonebookRead()),mMobileGui,TQ_SLOT(writeKab()));
   mMobileGui->readPhonebook();
 #endif
 }
diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp
index a22229d52..00ca8764b 100644
--- a/kandy/src/main.cpp
+++ b/kandy/src/main.cpp
@@ -135,18 +135,18 @@ int main(int argc, char **argv)
 
     args->clear();
 
-    TQObject::connect(k,TQT_SIGNAL(showMobileWin()),m,TQT_SLOT(show()));
-    TQObject::connect(m,TQT_SIGNAL(showTerminalWin()),k,TQT_SLOT(show()));
-    TQObject::connect(m,TQT_SIGNAL(showPreferencesWin()),
-                     k,TQT_SLOT(optionsPreferences()));
-
-    TQObject::connect( m->view(), TQT_SIGNAL( connectModem() ), k,
-                      TQT_SLOT( modemConnect() ) );
-    TQObject::connect( m->view(), TQT_SIGNAL( disconnectModem() ), k,
-                      TQT_SLOT( modemDisconnect() ) );
-
-    TQObject::connect( modem, TQT_SIGNAL( errorMessage( const TQString & ) ),
-                      k, TQT_SLOT( showErrorMessage( const TQString & ) ) );
+    TQObject::connect(k,TQ_SIGNAL(showMobileWin()),m,TQ_SLOT(show()));
+    TQObject::connect(m,TQ_SIGNAL(showTerminalWin()),k,TQ_SLOT(show()));
+    TQObject::connect(m,TQ_SIGNAL(showPreferencesWin()),
+                     k,TQ_SLOT(optionsPreferences()));
+
+    TQObject::connect( m->view(), TQ_SIGNAL( connectModem() ), k,
+                      TQ_SLOT( modemConnect() ) );
+    TQObject::connect( m->view(), TQ_SIGNAL( disconnectModem() ), k,
+                      TQ_SLOT( modemDisconnect() ) );
+
+    TQObject::connect( modem, TQ_SIGNAL( errorMessage( const TQString & ) ),
+                      k, TQ_SLOT( showErrorMessage( const TQString & ) ) );
 
     initModem( modem );
 
diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp
index 819d7e0fa..eb1f79a76 100644
--- a/kandy/src/mobilegui.cpp
+++ b/kandy/src/mobilegui.cpp
@@ -220,10 +220,10 @@ MobileGui::MobileGui( CommandScheduler *scheduler, KandyPrefs *kprefs,
   setMobState( UNLOADED );
 
   // Setup signal handlers
-  connect( mScheduler, TQT_SIGNAL( commandProcessed( ATCommand * ) ),
-           TQT_SLOT( processResult( ATCommand * ) ) );
-  connect( mScheduler->modem(), TQT_SIGNAL( gotLine( const char * ) ),
-           TQT_SLOT( termAddOutput( const char * ) ) );
+  connect( mScheduler, TQ_SIGNAL( commandProcessed( ATCommand * ) ),
+           TQ_SLOT( processResult( ATCommand * ) ) );
+  connect( mScheduler->modem(), TQ_SIGNAL( gotLine( const char * ) ),
+           TQ_SLOT( termAddOutput( const char * ) ) );
 }
 
 
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 497a3ec42..277ec288d 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -55,10 +55,10 @@ MobileMain::MobileMain(CommandScheduler *scheduler, KandyPrefs *prefs)
   setupActions();
 
   statusBar()->insertItem(i18n(" Disconnected "),1,0,true);
-  connect(mView,TQT_SIGNAL(statusMessage(const TQString &)),
-          TQT_SLOT(showStatusMessage(const TQString &)));
-  connect(mView,TQT_SIGNAL(transienStatusMessage(const TQString &)),
-          TQT_SLOT(showTransienStatusMessage(const TQString &)));
+  connect(mView,TQ_SIGNAL(statusMessage(const TQString &)),
+          TQ_SLOT(showStatusMessage(const TQString &)));
+  connect(mView,TQ_SIGNAL(transienStatusMessage(const TQString &)),
+          TQ_SLOT(showTransienStatusMessage(const TQString &)));
 
   statusBar()->show();
 
@@ -71,17 +71,17 @@ MobileMain::~MobileMain()
 
 void MobileMain::setupActions()
 {
-  KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+  KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
 
-  new TDEAction(i18n("Terminal"),0,this,TQT_SLOT(showTerminal()),
+  new TDEAction(i18n("Terminal"),0,this,TQ_SLOT(showTerminal()),
               actionCollection(),"show_terminal");
 
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
    
-  KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-  KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
-  KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+  KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+  KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
+  KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
 
   createGUI("kandymobileui.rc");
 }
@@ -130,7 +130,7 @@ void MobileMain::optionsConfigureToolbars()
     // use the standard toolbar editor
     saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
     KEditToolbar dlg(actionCollection());
-    connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig()));
+    connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig()));
     dlg.exec();
 }
 
diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp
index 2a275bf4d..ef16d00d9 100644
--- a/kandy/src/modem.cpp
+++ b/kandy/src/modem.cpp
@@ -84,7 +84,7 @@ Modem::Modem( KandyPrefs *kprefs, TQObject *parent, const char *name ) :
 
   timer = new TQTimer( this, "modemtimer" );
   TQ_CHECK_PTR( timer );
-  connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( timerDone() ) );
+  connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( timerDone() ) );
 
   init();
   xreset();
@@ -234,7 +234,7 @@ bool Modem::open()
   sn = new TQSocketNotifier( fd, TQSocketNotifier::Read, this,
                             "modemsocketnotifier" );
   TQ_CHECK_PTR( sn );
-  connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readChar( int ) ) );
+  connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readChar( int ) ) );
 
   mOpen = true;
 
@@ -372,7 +372,7 @@ void Modem::timerStart( int msec )
 void Modem::receiveXModem( bool crc )
 {
   disconnect( sn, 0, this, 0 );
-  connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readXChar( int ) ) );
+  connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readXChar( int ) ) );
 
   xcrc = crc;
 
@@ -598,7 +598,7 @@ void Modem::xreset()
 
   if ( sn ) {
     disconnect( sn, 0, this, 0 );
-    connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readChar( int ) ) );
+    connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readChar( int ) ) );
   }
 }