Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

9 files changed, 88 insertions, 88 deletions

diff --git a/src/knutclient.cpp b/src/knutclient.cpp
index b310a57..0acbe3a 100644
--- a/src/knutclient.cpp
+++ b/src/knutclient.cpp
@@ -53,10 +53,10 @@ KNutClient::KNutClient(bool noDock, TQObject* parent, const char *name) : TQObje
   analogRecords = new KNutVarData();
 
   m_upsTimer = new TQTimer (this);
-  connect( m_upsTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
+  connect( m_upsTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
 
   m_reconnectTimer = new TQTimer(this);
-  connect( m_reconnectTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotReconnectTimeout()) );
+  connect( m_reconnectTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotReconnectTimeout()) );
 
 
   //  data for combo
@@ -71,16 +71,16 @@ KNutClient::KNutClient(bool noDock, TQObject* parent, const char *name) : TQObje
     m_myDock = new KNutDock(&m_mainUpsInfo,&settingData,upsRecords);
 
     m_myDock->show();
-    connect(m_myDock, TQT_SIGNAL(endApplication()), this, TQT_SLOT(slotExitApplication()));
-    connect(m_myDock, TQT_SIGNAL(activeMainWindow()), this, TQT_SLOT(slotActiveMainWindow()));
-    connect(m_myDock, TQT_SIGNAL(minimize()), this, TQT_SLOT(closeMainWindow()));
-    connect(m_myDock, TQT_SIGNAL(UPSChanged(TQString)), this, TQT_SLOT(slotSetNewUPS (TQString)));
-
-    connect(m_myDock, TQT_SIGNAL(preferences()),this, TQT_SLOT(slotPreferenceUps()));
-    connect(m_myDock, TQT_SIGNAL(printUPSVars()),this, TQT_SLOT(slotPrintUPSVars()));
-    connect(m_myDock, TQT_SIGNAL(instComms()),this, TQT_SLOT(slotInstComms()));
-    connect(m_myDock, TQT_SIGNAL(RWVars()),this, TQT_SLOT(slotRWVars()));
-    connect(m_myDock, TQT_SIGNAL(makeRefreshConnection()),this, TQT_SLOT(slotRefreshConnection()));
+    connect(m_myDock, TQ_SIGNAL(endApplication()), this, TQ_SLOT(slotExitApplication()));
+    connect(m_myDock, TQ_SIGNAL(activeMainWindow()), this, TQ_SLOT(slotActiveMainWindow()));
+    connect(m_myDock, TQ_SIGNAL(minimize()), this, TQ_SLOT(closeMainWindow()));
+    connect(m_myDock, TQ_SIGNAL(UPSChanged(TQString)), this, TQ_SLOT(slotSetNewUPS (TQString)));
+
+    connect(m_myDock, TQ_SIGNAL(preferences()),this, TQ_SLOT(slotPreferenceUps()));
+    connect(m_myDock, TQ_SIGNAL(printUPSVars()),this, TQ_SLOT(slotPrintUPSVars()));
+    connect(m_myDock, TQ_SIGNAL(instComms()),this, TQ_SLOT(slotInstComms()));
+    connect(m_myDock, TQ_SIGNAL(RWVars()),this, TQ_SLOT(slotRWVars()));
+    connect(m_myDock, TQ_SIGNAL(makeRefreshConnection()),this, TQ_SLOT(slotRefreshConnection()));
     }
 
   addEventString(i18n("Ready."));
@@ -99,11 +99,11 @@ KNutClient::KNutClient(bool noDock, TQObject* parent, const char *name) : TQObje
   m_mainUpsInfo.upsNet = new KNutNet( m_mainUpsInfo.record.upsAddress, m_mainUpsInfo.record.upsName, m_mainUpsInfo.record.port,5,200);
 
 
-  connect(m_mainUpsInfo.upsNet, TQT_SIGNAL(firstConnection(void)),this, TQT_SLOT(slotFirstConnection(void)));
-  connect(m_mainUpsInfo.upsNet, TQT_SIGNAL(connectionError(int)),this, TQT_SLOT(slotErrorConnection(int)));
-  connect(m_mainUpsInfo.upsNet, TQT_SIGNAL(connectionClosed(void )),this, TQT_SLOT(slotConnectionClosed(void)));
-  connect(m_mainUpsInfo.upsNet, TQT_SIGNAL(tryFirstConnection(int )),this, TQT_SLOT(slotTryFirstConnection(int)));
-  connect(m_mainUpsInfo.upsNet, TQT_SIGNAL(tryRepeatFirstConnection(int )),this, TQT_SLOT(slotTryReepatFirstConnection( int )));
+  connect(m_mainUpsInfo.upsNet, TQ_SIGNAL(firstConnection(void)),this, TQ_SLOT(slotFirstConnection(void)));
+  connect(m_mainUpsInfo.upsNet, TQ_SIGNAL(connectionError(int)),this, TQ_SLOT(slotErrorConnection(int)));
+  connect(m_mainUpsInfo.upsNet, TQ_SIGNAL(connectionClosed(void )),this, TQ_SLOT(slotConnectionClosed(void)));
+  connect(m_mainUpsInfo.upsNet, TQ_SIGNAL(tryFirstConnection(int )),this, TQ_SLOT(slotTryFirstConnection(int)));
+  connect(m_mainUpsInfo.upsNet, TQ_SIGNAL(tryRepeatFirstConnection(int )),this, TQ_SLOT(slotTryReepatFirstConnection( int )));
 
 
 // state of connection to usbd, this isn't state of knutnet
@@ -925,7 +925,7 @@ void KNutClient::slotSetNewUPS (TQString name) {
 void KNutClient::slotPreferenceUps (void) {
 
   KNutPrefDlg* prefDlg = new KNutPrefDlg ( upsRecords, analogRecords, &settingData, m_mainUpsInfo.record.name ); // aktivujeme dialog pro preference
-  connect (prefDlg,TQT_SIGNAL(signalChangeConfig(unsigned int)),this,TQT_SLOT(slotSetConfig(unsigned int)));
+  connect (prefDlg,TQ_SIGNAL(signalChangeConfig(unsigned int)),this,TQ_SLOT(slotSetConfig(unsigned int)));
   prefDlg->exec();
   delete prefDlg;
   }
@@ -1065,7 +1065,7 @@ void KNutClient::slotRWVars(void) {
     if (!m_mainUpsInfo.errorUpsData) {
       if (m_mainUpsInfo.upsNet->readNumberVars (KNutNet::RWVars)) {
         KNutRWVar *windowRWVars = new KNutRWVar(&m_mainUpsInfo.name,&m_mainUpsInfo.password,m_mainUpsInfo.record.userName,m_mainUpsInfo.record.password,m_mainUpsInfo.upsNet);
-        connect (windowRWVars,TQT_SIGNAL(signalChangeRWVars(TQString)),this,TQT_SLOT(slotChangeRWVars(TQString)));
+        connect (windowRWVars,TQ_SIGNAL(signalChangeRWVars(TQString)),this,TQ_SLOT(slotChangeRWVars(TQString)));
         if (windowRWVars->upsOk())  windowRWVars->exec();
         delete windowRWVars;
        }
@@ -1152,19 +1152,19 @@ void KNutClient::exitMainWindow (void) {
 void KNutClient::makeMainWindow (void) {
 
   mainWindow = new KNutMainWindow(m_listKNutEvent ,&m_mainUpsInfo, &settingData, upsRecords, analogRecords);
-  connect(mainWindow, TQT_SIGNAL(UPSChanged (TQString)), this, TQT_SLOT(slotSetNewUPS (TQString)));
-  connect(mainWindow, TQT_SIGNAL(preferenceUps()),this, TQT_SLOT(slotPreferenceUps()));
-  connect(mainWindow, TQT_SIGNAL(showUPSVars()),this, TQT_SLOT(slotPrintUPSVars()));
-  connect(mainWindow, TQT_SIGNAL(makeInstComms()),this, TQT_SLOT(slotInstComms()));
-  connect(mainWindow, TQT_SIGNAL(makeRWVars()),this, TQT_SLOT(slotRWVars()));
-  connect(mainWindow, TQT_SIGNAL(makeRefreshConnection()),this, TQT_SLOT(slotRefreshConnection()));
-  connect(mainWindow, TQT_SIGNAL(saveConf()),this, TQT_SLOT(slotSaveConf()));
+  connect(mainWindow, TQ_SIGNAL(UPSChanged (TQString)), this, TQ_SLOT(slotSetNewUPS (TQString)));
+  connect(mainWindow, TQ_SIGNAL(preferenceUps()),this, TQ_SLOT(slotPreferenceUps()));
+  connect(mainWindow, TQ_SIGNAL(showUPSVars()),this, TQ_SLOT(slotPrintUPSVars()));
+  connect(mainWindow, TQ_SIGNAL(makeInstComms()),this, TQ_SLOT(slotInstComms()));
+  connect(mainWindow, TQ_SIGNAL(makeRWVars()),this, TQ_SLOT(slotRWVars()));
+  connect(mainWindow, TQ_SIGNAL(makeRefreshConnection()),this, TQ_SLOT(slotRefreshConnection()));
+  connect(mainWindow, TQ_SIGNAL(saveConf()),this, TQ_SLOT(slotSaveConf()));
 
 
 
 
-  connect(mainWindow, TQT_SIGNAL(endApplication()), this, TQT_SLOT(slotExitApplication()));
-  connect(mainWindow, TQT_SIGNAL(destroyed()), this, TQT_SLOT(exitMainWindow()));
+  connect(mainWindow, TQ_SIGNAL(endApplication()), this, TQ_SLOT(slotExitApplication()));
+  connect(mainWindow, TQ_SIGNAL(destroyed()), this, TQ_SLOT(exitMainWindow()));
   }
 
 
@@ -1220,7 +1220,7 @@ void KNutClient::slotExitApplication(void) {
   m_upsTimer->stop();
   if (mainWindow) {
     // odpojime protoze exitMainWindow by byl vykonan az po zkonceni procedury;
-    disconnect(mainWindow, TQT_SIGNAL(destroyed()), this, TQT_SLOT(exitMainWindow()));
+    disconnect(mainWindow, TQ_SIGNAL(destroyed()), this, TQ_SLOT(exitMainWindow()));
     delete mainWindow;
     mainWindow = 0;
     }
diff --git a/src/knutdock.cpp b/src/knutdock.cpp
index 4fee99b..b565ec5 100644
--- a/src/knutdock.cpp
+++ b/src/knutdock.cpp
@@ -626,9 +626,9 @@ void KNutDock::createUpsMenu(void) {
   int n = m_upsRecords->getCount();
   for (int i =0; i < n; i++) {
     if (m_activeUpsInfo->record.name == m_upsRecords->getName(i))
-      m_upsServerMenu->insertItem(kapp->miniIcon(),m_upsRecords->getName(i), this, TQT_SLOT(slotUpsName(int)),0,101+i);
+      m_upsServerMenu->insertItem(kapp->miniIcon(),m_upsRecords->getName(i), this, TQ_SLOT(slotUpsName(int)),0,101+i);
     else
-      m_upsServerMenu->insertItem(m_upsRecords->getName(i), this, TQT_SLOT(slotUpsName(int)),0,101+i);
+      m_upsServerMenu->insertItem(m_upsRecords->getName(i), this, TQ_SLOT(slotUpsName(int)),0,101+i);
     }
   }
 
@@ -642,19 +642,19 @@ void KNutDock::createMainMenu(void) {
   m_menu->insertSeparator();
   m_menu->insertItem("UPS",m_upsServerMenu);
   m_menu->insertSeparator();
-  m_menu->insertItem(i18n("&Showing UPS variables and commands"), this, TQT_SLOT(slotPrintUPSVars()));
-  m_menu->insertItem(i18n("&Running instant commands"), this, TQT_SLOT(slotInstComms()));
-  m_menu->insertItem(i18n("Setting R&W variables"), this, TQT_SLOT(slotRWVars()));
+  m_menu->insertItem(i18n("&Showing UPS variables and commands"), this, TQ_SLOT(slotPrintUPSVars()));
+  m_menu->insertItem(i18n("&Running instant commands"), this, TQ_SLOT(slotInstComms()));
+  m_menu->insertItem(i18n("Setting R&W variables"), this, TQ_SLOT(slotRWVars()));
   m_menu->insertSeparator();
-  m_menu->insertItem(SmallIcon("reload"),i18n("Reconnect"), this, TQT_SLOT(slotRefreshConnection()));
+  m_menu->insertItem(SmallIcon("reload"),i18n("Reconnect"), this, TQ_SLOT(slotRefreshConnection()));
   m_menu->insertSeparator();
-  m_menu->insertItem(SmallIcon("configure"),i18n("&Preferences"), this, TQT_SLOT(slotPreferences()));
+  m_menu->insertItem(SmallIcon("configure"),i18n("&Preferences"), this, TQ_SLOT(slotPreferences()));
   m_menu->insertSeparator();
-  m_menu->insertItem(kapp->miniIcon(),i18n("&About KNutClient"), this, TQT_SLOT(slotShowMyAbout()));
+  m_menu->insertItem(kapp->miniIcon(),i18n("&About KNutClient"), this, TQ_SLOT(slotShowMyAbout()));
   m_menu->insertSeparator();
-  m_menu->insertItem(i18n("&Minimize"), this, TQT_SLOT(slotMinimize()));
+  m_menu->insertItem(i18n("&Minimize"), this, TQ_SLOT(slotMinimize()));
   m_menu->insertSeparator();
-  m_menu->insertItem (SmallIcon("system-log-out"),i18n("&Exit"),this ,TQT_SLOT(slotExitApplication()));
+  m_menu->insertItem (SmallIcon("system-log-out"),i18n("&Exit"),this ,TQ_SLOT(slotExitApplication()));
   }
 
 
diff --git a/src/knutmainwindow.cpp b/src/knutmainwindow.cpp
index 2f2537f..4e4791f 100644
--- a/src/knutmainwindow.cpp
+++ b/src/knutmainwindow.cpp
@@ -588,7 +588,7 @@ void KNutMainWindow::hideConnectPB ( void ) {
 /*********************************************************************************************/
 
 
-//this TQT_SLOT is for older KDE only
+//this slot is for older KDE only
 void KNutMainWindow::slotShowToolBar(void) {
 
   if(toolBar("mainToolBar")->isVisible()) toolBar("mainToolBar")->hide();
@@ -728,7 +728,7 @@ void KNutMainWindow::initToolBar ( void ) {
   TQLabel *upsNazev = new TQLabel ("UPS : ",toolBar("mainToolBar"));
   // upsNazev is connected on toolBaar, dosn't need to call desctructor
   toolBar ("mainToolBar")->insertWidget (0,upsNazev->sizeHint().width(),upsNazev);
-  toolBar ("mainToolBar")->insertCombo("",1,false, TQT_SIGNAL (activated (const TQString &)),this, TQT_SLOT (slotChangeUPS (const TQString &)));
+  toolBar ("mainToolBar")->insertCombo("",1,false, TQ_SIGNAL (activated (const TQString &)),this, TQ_SLOT (slotChangeUPS (const TQString &)));
   // bude se pouze vybirat-------------------^^^
   KComboBox *combo = toolBar("mainToolBar")->getCombo(1);
   combo->clear();
@@ -741,16 +741,16 @@ void KNutMainWindow::initToolBar ( void ) {
 void KNutMainWindow::initAction ( void ) {
 
   // TDEAction and KStdAction must be to make before command createGUI, function initToolBar is runed after create GUI
-  m_quit = KStdAction::quit (this, TQT_SLOT (slotCloseKnutClient()), actionCollection());
+  m_quit = KStdAction::quit (this, TQ_SLOT (slotCloseKnutClient()), actionCollection());
   m_quit->setStatusText(i18n("Quits the application"));
 
-  m_preferencesUps = KStdAction::preferences (this, TQT_SLOT (slotPreferencesUps()), actionCollection(),"options_configure");
-  new TDEAction(i18n("&Showing UPS variables and commands"),0,this, TQT_SLOT(slotPrintUPSVars()),actionCollection(),"printupsvars");
-  new TDEAction(i18n("&Running instant commands"),0,this, TQT_SLOT(slotInstComms()),actionCollection(),"instcomms");
-  new TDEAction(i18n("Setting R&W variables"),0,this, TQT_SLOT(slotRWVars()),actionCollection(),"rwvars");
+  m_preferencesUps = KStdAction::preferences (this, TQ_SLOT (slotPreferencesUps()), actionCollection(),"options_configure");
+  new TDEAction(i18n("&Showing UPS variables and commands"),0,this, TQ_SLOT(slotPrintUPSVars()),actionCollection(),"printupsvars");
+  new TDEAction(i18n("&Running instant commands"),0,this, TQ_SLOT(slotInstComms()),actionCollection(),"instcomms");
+  new TDEAction(i18n("Setting R&W variables"),0,this, TQ_SLOT(slotRWVars()),actionCollection(),"rwvars");
 
 ///////////////////
-//   KStdAction::showToolbar (this, TQT_SLOT (slotShowToolBar()), actionCollection()); 
+//   KStdAction::showToolbar (this, TQ_SLOT (slotShowToolBar()), actionCollection()); 
 //  setStandardToolBarMenuEnabled(true); since KDE version 3.1
 
 // since version 3.1
@@ -760,25 +760,25 @@ void KNutMainWindow::initAction ( void ) {
         #if TDE_VERSION_MINOR >= 1
           setStandardToolBarMenuEnabled(true);
         #else
-          KStdAction::showToolbar (this, TQT_SLOT (slotShowToolBar()), actionCollection());
+          KStdAction::showToolbar (this, TQ_SLOT (slotShowToolBar()), actionCollection());
         #endif
       #else
-        KStdAction::showToolbar (this, TQT_SLOT (slotShowToolBar()), actionCollection());
+        KStdAction::showToolbar (this, TQ_SLOT (slotShowToolBar()), actionCollection());
       #endif
     #else
-      KStdAction::showToolbar (this, TQT_SLOT (slotShowToolBar()), actionCollection());
+      KStdAction::showToolbar (this, TQ_SLOT (slotShowToolBar()), actionCollection());
     #endif
   #else
-    KStdAction::showToolbar (this, TQT_SLOT (slotShowToolBar()), actionCollection());
+    KStdAction::showToolbar (this, TQ_SLOT (slotShowToolBar()), actionCollection());
   #endif
 
 
-  KStdAction::showStatusbar (this, TQT_SLOT (slotShowStatusBar()), actionCollection());
+  KStdAction::showStatusbar (this, TQ_SLOT (slotShowStatusBar()), actionCollection());
 
-  m_descriptionAction = new TDEToggleAction(i18n("&Using descriptions"),0,this, TQT_SLOT(slotDescription()),actionCollection(),"use_description");
+  m_descriptionAction = new TDEToggleAction(i18n("&Using descriptions"),0,this, TQ_SLOT(slotDescription()),actionCollection(),"use_description");
 
-  KStdAction::keyBindings( this, TQT_SLOT(slotConfigureKeys()),actionCollection());
-  new TDEAction (i18n("Reconnect"),"reload",Key_F5,this, TQT_SLOT(slotRefreshConnection()),actionCollection(),"reconnect");
+  KStdAction::keyBindings( this, TQ_SLOT(slotConfigureKeys()),actionCollection());
+  new TDEAction (i18n("Reconnect"),"reload",Key_F5,this, TQ_SLOT(slotRefreshConnection()),actionCollection(),"reconnect");
   }
 
 void KNutMainWindow::initVars ( void ) {
diff --git a/src/knutmessage.cpp b/src/knutmessage.cpp
index 40cc661..d9061ea 100644
--- a/src/knutmessage.cpp
+++ b/src/knutmessage.cpp
@@ -63,7 +63,7 @@ KNutMessage::KNutMessage(const TQString messageText, const typeOfMessage type, c
        m_messageTimer->start(maxTime*1000);
      else
        m_messageTimer->start(timeValidity*1000);
-     connect (m_messageTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(timeout()));
+     connect (m_messageTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(timeout()));
      disableResize();
     }
   }
diff --git a/src/knutmessagemanager.cpp b/src/knutmessagemanager.cpp
index c13e288..08a0c5c 100644
--- a/src/knutmessagemanager.cpp
+++ b/src/knutmessagemanager.cpp
@@ -39,9 +39,9 @@ KNutMessageManager::~KNutMessageManager(){
 void KNutMessageManager::deleteMessage (void) {
 
   if (m_myMess) {
-    disconnect (m_myMess,TQT_SIGNAL(finished()),this,TQT_SLOT(slotFinishedMessage()));
-    disconnect (m_myMess,TQT_SIGNAL(endMessage()),this,TQT_SLOT(slotEndMessage()));
-    disconnect (m_myMess,TQT_SIGNAL(messageMoved(int,int)),this,TQT_SLOT(slotMessageMoved(int,int)));
+    disconnect (m_myMess,TQ_SIGNAL(finished()),this,TQ_SLOT(slotFinishedMessage()));
+    disconnect (m_myMess,TQ_SIGNAL(endMessage()),this,TQ_SLOT(slotEndMessage()));
+    disconnect (m_myMess,TQ_SIGNAL(messageMoved(int,int)),this,TQ_SLOT(slotMessageMoved(int,int)));
     m_myMess->hide();
     delete m_myMess;
     m_myMess = 0;
@@ -82,18 +82,18 @@ long int timeOfMessageValidity;
     }
 
   m_myMess->show();
-  connect (m_myMess,TQT_SIGNAL(finished()),this,TQT_SLOT(slotFinishedMessage()));
-  connect (m_myMess,TQT_SIGNAL(endMessage()),this,TQT_SLOT(slotEndMessage()));
-  connect (m_myMess,TQT_SIGNAL(messageMoved(int,int)),this,TQT_SLOT(slotMessageMoved(int,int)));
+  connect (m_myMess,TQ_SIGNAL(finished()),this,TQ_SLOT(slotFinishedMessage()));
+  connect (m_myMess,TQ_SIGNAL(endMessage()),this,TQ_SLOT(slotEndMessage()));
+  connect (m_myMess,TQ_SIGNAL(messageMoved(int,int)),this,TQ_SLOT(slotMessageMoved(int,int)));
   }
 
 
 void KNutMessageManager::slotFinishedMessage (void) {
 
   if (m_myMess) {
-    disconnect (m_myMess,TQT_SIGNAL(finished()),this,TQT_SLOT(slotFinishedMessage()));
-    disconnect (m_myMess,TQT_SIGNAL(endMessage()),this,TQT_SLOT(slotEndMessage()));
-    disconnect (m_myMess,TQT_SIGNAL(messageMoved(int,int)),this,TQT_SLOT(slotMessageMoved(int,int)));
+    disconnect (m_myMess,TQ_SIGNAL(finished()),this,TQ_SLOT(slotFinishedMessage()));
+    disconnect (m_myMess,TQ_SIGNAL(endMessage()),this,TQ_SLOT(slotEndMessage()));
+    disconnect (m_myMess,TQ_SIGNAL(messageMoved(int,int)),this,TQ_SLOT(slotMessageMoved(int,int)));
     m_myMess->hide();
     m_myMess->deleteLater();
     m_myMess=0;
diff --git a/src/knutnet.cpp b/src/knutnet.cpp
index f049a52..e857dd4 100644
--- a/src/knutnet.cpp
+++ b/src/knutnet.cpp
@@ -53,15 +53,15 @@ KNutNet::KNutNet (const TQString upsAddress, const TQString upsName, const unsig
   m_description = false; // popis neni natazen  - description is not loaded
 
   m_unConnectTimer = new TQTimer( this );
-  connect( m_unConnectTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimerReconnect()) );
+  connect( m_unConnectTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimerReconnect()) );
 
   m_error = NoError;
 
   m_commandSocket = new TQSocket( this );
-  connect( m_commandSocket, TQT_SIGNAL( hostFound()),this, TQT_SLOT( slotHostFound()));
-  connect( m_commandSocket, TQT_SIGNAL( connected()),this,TQT_SLOT( slotConnected()));
-  connect( m_commandSocket, TQT_SIGNAL( connectionClosed()),this, TQT_SLOT( slotConnectionClosed()));
-  connect( m_commandSocket, TQT_SIGNAL( error(int)),this, TQT_SLOT( slotConnectionError(int)));
+  connect( m_commandSocket, TQ_SIGNAL( hostFound()),this, TQ_SLOT( slotHostFound()));
+  connect( m_commandSocket, TQ_SIGNAL( connected()),this,TQ_SLOT( slotConnected()));
+  connect( m_commandSocket, TQ_SIGNAL( connectionClosed()),this, TQ_SLOT( slotConnectionClosed()));
+  connect( m_commandSocket, TQ_SIGNAL( error(int)),this, TQ_SLOT( slotConnectionError(int)));
   }
 
 
@@ -97,7 +97,7 @@ void KNutNet::close (void) {
     m_commandSocket->close(); // closes the socket
 
     if ( m_commandSocket->state() == TQSocket::Closing ) {
-      connect( m_commandSocket, TQT_SIGNAL(delayedCloseFinished()),this,TQT_SLOT(slotClosed()) );
+      connect( m_commandSocket, TQ_SIGNAL(delayedCloseFinished()),this,TQ_SLOT(slotClosed()) );
       }
     else {
       slotClosed();
@@ -107,7 +107,7 @@ void KNutNet::close (void) {
 
 void KNutNet::slotClosed (void) {
 
-  disconnect( m_commandSocket,TQT_SIGNAL(delayedCloseFinished()),this, TQT_SLOT(slotClosed()) );
+  disconnect( m_commandSocket,TQ_SIGNAL(delayedCloseFinished()),this, TQ_SLOT(slotClosed()) );
   m_state = Idle;
   }
 
diff --git a/src/knutprefdlg.cpp b/src/knutprefdlg.cpp
index bc9cf2a..2390cdd 100644
--- a/src/knutprefdlg.cpp
+++ b/src/knutprefdlg.cpp
@@ -612,15 +612,15 @@ void KNutPrefDlg::initSetting () {
   m_xfer->setChecked(m_settingData->lowHighXfer);
   m_voltageGroup->setEnabled(!m_settingData->lowHighXfer);
   m_frequencyGroup->setEnabled(!m_settingData->lowHighXfer);
-  connect (m_xfer,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableVoltage(bool)));
-  connect (m_xfer,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableFrequency(bool)));
+  connect (m_xfer,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableVoltage(bool)));
+  connect (m_xfer,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableFrequency(bool)));
 
 
   m_checkBoxCbc->setChecked(m_settingData->customBColor); 
   m_BGButton->setColor(m_settingData->mainBackgroundColor);
   m_BGButton->setEnabled(m_settingData->customBColor);
   m_mainBackgroundColorLabel->setEnabled(m_settingData->customBColor);
-  connect (m_checkBoxCbc,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotUseCustomBColor(bool)));
+  connect (m_checkBoxCbc,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotUseCustomBColor(bool)));
   }
 
 void KNutPrefDlg::initUps () {
@@ -654,10 +654,10 @@ void KNutPrefDlg::initUps () {
 
   upsLayout->addStretch( 10 );
 
-  connect (newButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNewUps()));
-  connect (editButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotEditUps()));
-  connect (deleteButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotDeleteUps()));
-  connect (m_listBox2,TQT_SIGNAL(doubleClicked(TQListBoxItem*, const TQPoint&)),this,TQT_SLOT(slotEditUps()));
+  connect (newButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotNewUps()));
+  connect (editButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotEditUps()));
+  connect (deleteButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotDeleteUps()));
+  connect (m_listBox2,TQ_SIGNAL(doubleClicked(TQListBoxItem*, const TQPoint&)),this,TQ_SLOT(slotEditUps()));
 
   }
 
@@ -755,8 +755,8 @@ void KNutPrefDlg::initDock () {
 
   setTopLayout->addStretch( 20 );
 
-  connect (m_checkBoxCbi,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotUseCustomBIconColor(bool)));
-  connect (m_iconRadioButton1,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotSetPictureKI(bool)));
+  connect (m_checkBoxCbi,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotUseCustomBIconColor(bool)));
+  connect (m_iconRadioButton1,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotSetPictureKI(bool)));
 
   }
 
@@ -842,7 +842,7 @@ void KNutPrefDlg::initPanel () {
   m_BGPButton->setEnabled(m_settingData->customBPanelColor);
   m_panelBackgroundColorLabel->setEnabled(m_settingData->customBPanelColor);
   m_panelBackgroundColorLabel->setEnabled(m_settingData->customBPanelColor);
-  connect (m_checkBoxCbpc,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotUseCustomBPanelColor(bool)));
+  connect (m_checkBoxCbpc,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotUseCustomBPanelColor(bool)));
 
   }
 
@@ -878,8 +878,8 @@ void KNutPrefDlg::initFonts () {
   m_settingFont = MAIN_PANEL_FONT; // sets font for Main Panel /  nastavujeme font pro Main Panel
   m_fontWidget->setFont(m_mPanelFont);
   m_fontWidget->setEnabled(m_settingData->customFont);
-  connect (panelFonts,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotChangeSettingFont(int)));
-  connect (m_customFont,TQT_SIGNAL(toggled(bool)),m_fontWidget,TQT_SLOT(setEnabled(bool)));
+  connect (panelFonts,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotChangeSettingFont(int)));
+  connect (m_customFont,TQ_SIGNAL(toggled(bool)),m_fontWidget,TQ_SLOT(setEnabled(bool)));
   }
 
 void KNutPrefDlg::initAnalog () {
@@ -970,8 +970,8 @@ void KNutPrefDlg::initAnalog () {
   m_digitalProcesingOfPointers->setCurrentItem(m_settingData->typeDigitalProcessing);
 
 
-  connect (m_checkBoxCbac,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotUseCustomBAnalogColor(bool)));
-  connect (m_checkBoxCoac,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotUseCustomOAnalogColor(bool)));
+  connect (m_checkBoxCbac,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotUseCustomBAnalogColor(bool)));
+  connect (m_checkBoxCoac,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotUseCustomOAnalogColor(bool)));
   }
 
 
diff --git a/src/knutprintupsvar.cpp b/src/knutprintupsvar.cpp
index 6f0b42e..dd66ac8 100644
--- a/src/knutprintupsvar.cpp
+++ b/src/knutprintupsvar.cpp
@@ -135,7 +135,7 @@ KNutPrintUpsVar::KNutPrintUpsVar(KNutNet* const upsNet, const bool useDescriptio
        }
      }
 
-    connect (this,TQT_SIGNAL(user1Clicked()),this,TQT_SLOT(slotReloadVars()));
+    connect (this,TQ_SIGNAL(user1Clicked()),this,TQ_SLOT(slotReloadVars()));
     } // end else
   }
 
diff --git a/src/knutrwvar.cpp b/src/knutrwvar.cpp
index ee5dda2..4f9c2f9 100644
--- a/src/knutrwvar.cpp
+++ b/src/knutrwvar.cpp
@@ -116,7 +116,7 @@ KNutRWVar::KNutRWVar(TQString* userName, TQString* userPassword, const TQString
       m_valueVarLine->show();
       m_upsValueType=true;
       }
-    connect (m_rWVarBox,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotChangeVar(int)));
+    connect (m_rWVarBox,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotChangeVar(int)));
     }
   }