Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

7 files changed, 79 insertions, 79 deletions

diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp
index 0c51ea4a..56c69852 100644
--- a/krfb/kcm_krfb/kcm_krfb.cpp
+++ b/krfb/kcm_krfb/kcm_krfb.cpp
@@ -75,19 +75,19 @@ KcmKRfb::KcmKRfb(TQWidget *p, const char *name, const TQStringList &) :
 
 	load();
 
-	connect(m_confWidget->passwordInput, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()) );
-	connect(m_confWidget->allowUninvitedCB, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) );
-	connect(m_confWidget->enableSLPCB, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) );
-	connect(m_confWidget->confirmConnectionsCB, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) );
-	connect(m_confWidget->allowDesktopControlCB, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) );
-	connect(m_confWidget->autoPortCB, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) );
-	connect(m_confWidget->portInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(configChanged()) );
-	connect((TQObject*)m_confWidget->manageInvitations, TQT_SIGNAL(clicked()), 
-		&m_configuration, TQT_SLOT(showManageInvitationsDialog()) );
-	connect(&m_configuration, TQT_SIGNAL(invitationNumChanged(int)), 
-		this, TQT_SLOT(setInvitationNum(int)));
+	connect(m_confWidget->passwordInput, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged()) );
+	connect(m_confWidget->allowUninvitedCB, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) );
+	connect(m_confWidget->enableSLPCB, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) );
+	connect(m_confWidget->confirmConnectionsCB, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) );
+	connect(m_confWidget->allowDesktopControlCB, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) );
+	connect(m_confWidget->autoPortCB, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) );
+	connect(m_confWidget->portInput, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(configChanged()) );
+	connect((TQObject*)m_confWidget->manageInvitations, TQ_SIGNAL(clicked()), 
+		&m_configuration, TQ_SLOT(showManageInvitationsDialog()) );
+	connect(&m_configuration, TQ_SIGNAL(invitationNumChanged(int)), 
+		this, TQ_SLOT(setInvitationNum(int)));
 	setInvitationNum(m_configuration.invitations().size());
-	connect(m_confWidget->disableBackgroundCB, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) );
+	connect(m_confWidget->disableBackgroundCB, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) );
 }
 
 void KcmKRfb::configChanged() {
diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp
index 9828ebd1..692e6ea7 100644
--- a/krfb/kinetd/kinetd.cpp
+++ b/krfb/kinetd/kinetd.cpp
@@ -77,8 +77,8 @@ bool PortListener::acquirePort() {
 		delete m_socket;
 		m_socket = new TDEServerSocket(m_port, false);
 	}
-	connect(m_socket, TQT_SIGNAL(accepted(TDESocket*)),
-		TQT_SLOT(accepted(TDESocket*)));
+	connect(m_socket, TQ_SIGNAL(accepted(TDESocket*)),
+		TQ_SLOT(accepted(TDESocket*)));
 
 	bool s = m_registerService;
 	bool sd =m_dnssdRegister;
@@ -421,9 +421,9 @@ KInetD::KInetD(TQCString &n) :
 		m_srvreg = 0;
 	}
 	m_portListeners.setAutoDelete(true);
-	connect(&m_expirationTimer, TQT_SIGNAL(timeout()), TQT_SLOT(setExpirationTimer()));
-	connect(&m_portRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(portRetryTimer()));
-	connect(&m_reregistrationTimer, TQT_SIGNAL(timeout()), TQT_SLOT(reregistrationTimer()));
+	connect(&m_expirationTimer, TQ_SIGNAL(timeout()), TQ_SLOT(setExpirationTimer()));
+	connect(&m_portRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(portRetryTimer()));
+	connect(&m_reregistrationTimer, TQ_SIGNAL(timeout()), TQ_SLOT(reregistrationTimer()));
 	loadServiceList();
 }
 
diff --git a/krfb/krfb/configuration.cpp b/krfb/krfb/configuration.cpp
index c4acbfe4..b197ea13 100644
--- a/krfb/krfb/configuration.cpp
+++ b/krfb/krfb/configuration.cpp
@@ -58,29 +58,29 @@ Configuration::Configuration(krfb_mode mode) :
 
     connectDCOPSignal( 0, "KRFB::ConfigChanged", "KRFB_ConfigChanged()",
 						"updateTDEConfig()", false );
-	connect(invMngDlg.newPersonalInvitationButton, TQT_SIGNAL(clicked()),
-		TQT_SLOT(showPersonalInvitationDialog()));
-	connect(invMngDlg.newEmailInvitationButton, TQT_SIGNAL(clicked()), TQT_SLOT(inviteEmail()));
-	connect(invMngDlg.deleteOneButton, TQT_SIGNAL(clicked()), TQT_SLOT(invMngDlgDeleteOnePressed()));
-	connect(invMngDlg.deleteAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(invMngDlgDeleteAllPressed()));
+	connect(invMngDlg.newPersonalInvitationButton, TQ_SIGNAL(clicked()),
+		TQ_SLOT(showPersonalInvitationDialog()));
+	connect(invMngDlg.newEmailInvitationButton, TQ_SIGNAL(clicked()), TQ_SLOT(inviteEmail()));
+	connect(invMngDlg.deleteOneButton, TQ_SIGNAL(clicked()), TQ_SLOT(invMngDlgDeleteOnePressed()));
+	connect(invMngDlg.deleteAllButton, TQ_SIGNAL(clicked()), TQ_SLOT(invMngDlgDeleteAllPressed()));
 	invMngDlg.listView->setSelectionMode(TQListView::Extended);
 	invMngDlg.listView->setMinimumSize(TQSize(400, 100)); // TQTs size is much to small
 
-	connect(&invDlg, TQT_SIGNAL(createInviteClicked()),
-		TQT_SLOT(showPersonalInvitationDialog()));
-	connect(&invDlg, TQT_SIGNAL(emailInviteClicked()),
-		TQT_SLOT(inviteEmail()));
-	connect(&invDlg, TQT_SIGNAL(manageInviteClicked()),
-		TQT_SLOT(showManageInvitationsDialog()));
-	connect(&invDlg, TQT_SIGNAL(configureClicked()),
-		TQT_SLOT(showConfigurationModule()));
-	connect(this, TQT_SIGNAL(invitationNumChanged(int)),
-		&invDlg, TQT_SLOT(setInviteCount(int)));
-	connect(this, TQT_SIGNAL(invitationNumChanged(int)),
-		&invMngDlg, TQT_SLOT(listSizeChanged(int)));
+	connect(&invDlg, TQ_SIGNAL(createInviteClicked()),
+		TQ_SLOT(showPersonalInvitationDialog()));
+	connect(&invDlg, TQ_SIGNAL(emailInviteClicked()),
+		TQ_SLOT(inviteEmail()));
+	connect(&invDlg, TQ_SIGNAL(manageInviteClicked()),
+		TQ_SLOT(showManageInvitationsDialog()));
+	connect(&invDlg, TQ_SIGNAL(configureClicked()),
+		TQ_SLOT(showConfigurationModule()));
+	connect(this, TQ_SIGNAL(invitationNumChanged(int)),
+		&invDlg, TQ_SLOT(setInviteCount(int)));
+	connect(this, TQ_SIGNAL(invitationNumChanged(int)),
+		&invMngDlg, TQ_SLOT(listSizeChanged(int)));
         emit invitationNumChanged(invitationList.size());
 
-	connect(&refreshTimer, TQT_SIGNAL(timeout()), TQT_SLOT(refreshTimeout()));
+	connect(&refreshTimer, TQ_SIGNAL(timeout()), TQ_SLOT(refreshTimeout()));
 	refreshTimer.start(1000*60);
 }
 
diff --git a/krfb/krfb/invitedialog.cpp b/krfb/krfb/invitedialog.cpp
index 59d62fb7..62fdde38 100644
--- a/krfb/krfb/invitedialog.cpp
+++ b/krfb/krfb/invitedialog.cpp
@@ -38,12 +38,12 @@ InviteDialog::InviteDialog( TQWidget *parent, const char *name )
 
   setButtonGuiItem( User1, KStdGuiItem::configure() );
 
-  connect( m_inviteWidget->btnCreateInvite, TQT_SIGNAL( clicked() ),
-           TQT_SIGNAL( createInviteClicked() ) );
-  connect( m_inviteWidget->btnEmailInvite, TQT_SIGNAL( clicked() ),
-           TQT_SIGNAL( emailInviteClicked() ) );
-  connect( m_inviteWidget->btnManageInvite, TQT_SIGNAL( clicked() ),
-           TQT_SIGNAL( manageInviteClicked() ) );
+  connect( m_inviteWidget->btnCreateInvite, TQ_SIGNAL( clicked() ),
+           TQ_SIGNAL( createInviteClicked() ) );
+  connect( m_inviteWidget->btnEmailInvite, TQ_SIGNAL( clicked() ),
+           TQ_SIGNAL( emailInviteClicked() ) );
+  connect( m_inviteWidget->btnManageInvite, TQ_SIGNAL( clicked() ),
+           TQ_SIGNAL( manageInviteClicked() ) );
 }
 
 void InviteDialog::slotUser1()
diff --git a/krfb/krfb/main.cpp b/krfb/krfb/main.cpp
index 3ec53e3f..a9c4a6c7 100644
--- a/krfb/krfb/main.cpp
+++ b/krfb/krfb/main.cpp
@@ -145,33 +145,33 @@ int main(int argc, char *argv[])
 	RFBController controller(config);
 	KRfbIfaceImpl dcopiface(&controller);
 
-	TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), // dont show passivepopup
-			 &trayicon, TQT_SLOT(prepareQuit()));
-	TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()),
-			 &controller, TQT_SLOT(closeConnection()));
-
-	TQObject::connect(&trayicon, TQT_SIGNAL(showManageInvitations()),
-			 config, TQT_SLOT(showManageInvitationsDialog()));
-	TQObject::connect(&trayicon, TQT_SIGNAL(enableDesktopControl(bool)),
-			 &controller, TQT_SLOT(enableDesktopControl(bool)));
-	TQObject::connect(&trayicon, TQT_SIGNAL(diconnectedMessageDisplayed()),
-			 &app, TQT_SLOT(quit()));
-
-	TQObject::connect(&dcopiface, TQT_SIGNAL(exitApp()),
-			 &controller, TQT_SLOT(closeConnection()));
-	TQObject::connect(&dcopiface, TQT_SIGNAL(exitApp()),
-			 &app, TQT_SLOT(quit()));
-
-	TQObject::connect(&controller, TQT_SIGNAL(sessionRefused()),
-			 &app, TQT_SLOT(quit()));
-	TQObject::connect(&controller, TQT_SIGNAL(sessionEstablished(TQString)),
-			 &trayicon, TQT_SLOT(showConnectedMessage(TQString)));
-	TQObject::connect(&controller, TQT_SIGNAL(sessionFinished()),
-			 &trayicon, TQT_SLOT(showDisconnectedMessage()));
-	TQObject::connect(&controller, TQT_SIGNAL(desktopControlSettingChanged(bool)),
-			 &trayicon, TQT_SLOT(setDesktopControlSetting(bool)));
-	TQObject::connect(&controller, TQT_SIGNAL(quitApp()),
-			 &app, TQT_SLOT(quit()));
+	TQObject::connect(&app, TQ_SIGNAL(lastWindowClosed()), // dont show passivepopup
+			 &trayicon, TQ_SLOT(prepareQuit()));
+	TQObject::connect(&app, TQ_SIGNAL(lastWindowClosed()),
+			 &controller, TQ_SLOT(closeConnection()));
+
+	TQObject::connect(&trayicon, TQ_SIGNAL(showManageInvitations()),
+			 config, TQ_SLOT(showManageInvitationsDialog()));
+	TQObject::connect(&trayicon, TQ_SIGNAL(enableDesktopControl(bool)),
+			 &controller, TQ_SLOT(enableDesktopControl(bool)));
+	TQObject::connect(&trayicon, TQ_SIGNAL(diconnectedMessageDisplayed()),
+			 &app, TQ_SLOT(quit()));
+
+	TQObject::connect(&dcopiface, TQ_SIGNAL(exitApp()),
+			 &controller, TQ_SLOT(closeConnection()));
+	TQObject::connect(&dcopiface, TQ_SIGNAL(exitApp()),
+			 &app, TQ_SLOT(quit()));
+
+	TQObject::connect(&controller, TQ_SIGNAL(sessionRefused()),
+			 &app, TQ_SLOT(quit()));
+	TQObject::connect(&controller, TQ_SIGNAL(sessionEstablished(TQString)),
+			 &trayicon, TQ_SLOT(showConnectedMessage(TQString)));
+	TQObject::connect(&controller, TQ_SIGNAL(sessionFinished()),
+			 &trayicon, TQ_SLOT(showDisconnectedMessage()));
+	TQObject::connect(&controller, TQ_SIGNAL(desktopControlSettingChanged(bool)),
+			 &trayicon, TQ_SLOT(setDesktopControlSetting(bool)));
+	TQObject::connect(&controller, TQ_SIGNAL(quitApp()),
+			 &app, TQ_SLOT(quit()));
 
 	sigset_t sigs;
 	sigemptyset(&sigs);
diff --git a/krfb/krfb/rfbcontroller.cpp b/krfb/krfb/rfbcontroller.cpp
index fe6aee94..9abe8c5f 100644
--- a/krfb/krfb/rfbcontroller.cpp
+++ b/krfb/krfb/rfbcontroller.cpp
@@ -411,14 +411,14 @@ RFBController::RFBController(Configuration *c) :
 	forcedClose(false)
 {
 	self = this;
-	connect(&dialog, TQT_SIGNAL(okClicked()), TQT_SLOT(dialogAccepted()));
-	connect(&dialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(dialogRefused()));
-	connect(&initIdleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAsyncEvents()));
-	connect(&idleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleSlot()));
+	connect(&dialog, TQ_SIGNAL(okClicked()), TQ_SLOT(dialogAccepted()));
+	connect(&dialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(dialogRefused()));
+	connect(&initIdleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAsyncEvents()));
+	connect(&idleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(idleSlot()));
 
 	clipboard = TQApplication::clipboard();
-	connect(clipboard, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
-	connect(clipboard, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged()));
+	connect(clipboard, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged()));
+	connect(clipboard, TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clipboardChanged()));
 
 	asyncQueue.setAutoDelete(true);
 
@@ -543,7 +543,7 @@ void RFBController::stopServer(bool xtestUngrab)
 
 	if (xtestUngrab) {
 		disabler.disable = true;
-		TQTimer::singleShot(0, &disabler, TQT_SLOT(exec()));
+		TQTimer::singleShot(0, &disabler, TQ_SLOT(exec()));
 	}
 }
 
diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp
index 92d0d494..792f771d 100644
--- a/krfb/krfb/trayicon.cpp
+++ b/krfb/krfb/trayicon.cpp
@@ -61,7 +61,7 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) :
 	TQToolTip::add(this, i18n("Desktop Sharing - connecting"));
 
 	manageInvitationsAction = new TDEAction(i18n("Manage &Invitations"), TQString(),
-					      0, this, TQT_SIGNAL(showManageInvitations()),
+					      0, this, TQ_SIGNAL(showManageInvitations()),
 					      &actionCollection);
 	manageInvitationsAction->plug(contextMenu());
 
@@ -71,11 +71,11 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) :
 	enableControlAction->setCheckedState(i18n("Disable Remote Control"));
 	enableControlAction->plug(contextMenu());
 	enableControlAction->setEnabled(false);
-	connect(enableControlAction, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(enableDesktopControl(bool)));
+	connect(enableControlAction, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(enableDesktopControl(bool)));
 
 	contextMenu()->insertSeparator();
 
-	aboutAction = KStdAction::aboutApp(this, TQT_SLOT(showAbout()), &actionCollection);
+	aboutAction = KStdAction::aboutApp(this, TQ_SLOT(showAbout()), &actionCollection);
 	aboutAction->plug(contextMenu());
 
 	show();
@@ -114,7 +114,7 @@ void TrayIcon::showDisconnectedMessage() {
 						    i18n("The remote user has closed the connection."),
 						    trayIconClosed,
 						    this);
-	connect(p, TQT_SIGNAL(hidden()), this, TQT_SIGNAL(diconnectedMessageDisplayed()));
+	connect(p, TQ_SIGNAL(hidden()), this, TQ_SIGNAL(diconnectedMessageDisplayed()));
 }
 
 void TrayIcon::setDesktopControlSetting(bool b) {