Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

3 files changed, 38 insertions, 38 deletions

diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index f4865263..d0eee4a6 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -188,8 +188,8 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 		"Notify list fine-tuning can be performed by editing the entry properties.</center>"));
 #endif // COMPILE_INFO_TIPS
 
-	connect(m_pListView,TQT_SIGNAL(pressed(KviTalListViewItem *,const TQPoint &,int)),this,TQT_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
-	connect(m_pListView,TQT_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQT_SLOT(itemDoubleClicked(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(pressed(KviTalListViewItem *,const TQPoint &,int)),this,TQ_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQ_SLOT(itemDoubleClicked(KviTalListViewItem *)));
 
 	g->addMultiCellWidget(m_pListView,0,1,0,1);
 
@@ -198,7 +198,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 	g->addWidget(vbox,0,2);
 
 	m_pWizardAddButton = new TQPushButton(__tr2qs("Add (Wizard)..."),vbox);
-	connect(m_pWizardAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addWizardClicked()));
+	connect(m_pWizardAddButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addWizardClicked()));
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pWizardAddButton,__tr2qs("Add a registered user by means of a user-friendly wizard."));
 #endif // COMPILE_INFO_TIPS
@@ -206,21 +206,21 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 
 
 	m_pAddButton = new TQPushButton(__tr2qs("&Add..."),vbox);
-	connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked()));
+	connect(m_pAddButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addClicked()));
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pAddButton,__tr2qs("Open the edit dialog to create a new user entry."));
 #endif // COMPILE_INFO_TIPS
 	m_pAddButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));
 	
 	m_pAddGroupButton = new TQPushButton(__tr2qs("&Add Group..."),vbox);
-	connect(m_pAddGroupButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addGroupClicked()));
+	connect(m_pAddGroupButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addGroupClicked()));
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pAddGroupButton,__tr2qs("Adds a new group"));
 #endif // COMPILE_INFO_TIPS
 	m_pAddGroupButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));
 
 	m_pRemoveButton = new TQPushButton(__tr2qs("Re&move"),vbox);
-	connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked()));
+	connect(m_pRemoveButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeClicked()));
 	m_pRemoveButton->setEnabled(false);
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pRemoveButton,__tr2qs("Remove the currently selected entries."));
@@ -229,7 +229,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 
 
 	m_pEditButton = new TQPushButton(__tr2qs("&Edit..."),vbox);
-	connect(m_pEditButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editClicked()));
+	connect(m_pEditButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(editClicked()));
 	m_pEditButton->setEnabled(false);
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pEditButton,__tr2qs("Edit the first selected entry."));
@@ -241,7 +241,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 
 	m_pExportButton = new TQPushButton(__tr("Export To..."),vbox);
 	m_pExportButton->setEnabled(false);
-	connect(m_pExportButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportClicked()));
+	connect(m_pExportButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportClicked()));
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pExportButton,__tr2qs("Export the selected entries to a file.<br>All the data associated with the selected registered users will be exported.<br>You (or anyone else) can later import the entries by using the \"Import\" button."));
 #endif // COMPILE_INFO_TIPS
@@ -249,7 +249,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 
 
 	m_pImportButton = new TQPushButton(__tr("Import From..."),vbox);
-	connect(m_pImportButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(importClicked()));
+	connect(m_pImportButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(importClicked()));
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pImportButton,__tr2qs("Import entries from a file exported earlier by the \"export\" function of this dialog."));
 #endif // COMPILE_INFO_TIPS
@@ -264,12 +264,12 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 
 
 	b = new TQPushButton(__tr2qs("&OK"),hbox);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	//b->setMinimumWidth(120);
 
 	b = new TQPushButton(__tr2qs("Cancel"),hbox);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	//b->setMinimumWidth(120);
 
@@ -279,8 +279,8 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 	g->setColStretch(0,1);
 	g->setRowStretch(1,1);
 
-	connect(m_pListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged()));
-	connect(m_pListView,TQT_SIGNAL(rightButtonClicked ( KviTalListViewItem *, const TQPoint &, int ) ),this,TQT_SLOT(listViewRightButtonClicked ( KviTalListViewItem *, const TQPoint &, int )));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(selectionChanged()));
+	connect(m_pListView,TQ_SIGNAL(rightButtonClicked ( KviTalListViewItem *, const TQPoint &, int ) ),this,TQ_SLOT(listViewRightButtonClicked ( KviTalListViewItem *, const TQPoint &, int )));
 
 	fillList();
 
@@ -428,7 +428,7 @@ void KviRegisteredUsersDialog::listViewRightButtonClicked ( KviTalListViewItem *
 				m_TmpDict.replace(id,g->data());
 			}
 			
-			connect(groups,TQT_SIGNAL(activated ( int )),this,TQT_SLOT(moveToGroupMenuClicked(int)));
+			connect(groups,TQ_SIGNAL(activated ( int )),this,TQ_SLOT(moveToGroupMenuClicked(int)));
 			
 			KviTalPopupMenu *mainPopup = new KviTalPopupMenu;
 			mainPopup->insertItem(__tr("Move to group"),groups);
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 6a82fa7e..2da4c6f9 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -92,18 +92,18 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(TQWidget * p,KviPointerHa
 	m_pTable->horizontalHeader()->setLabel(1,__tr2qs("Value"));
 
 	m_pTable->setMinimumSize(250,250);
-	//connect(m_pTable,TQT_SIGNAL(valueChanged(int,int)),this,TQT_SLOT(propertyValueChanged(int,int)));
+	//connect(m_pTable,TQ_SIGNAL(valueChanged(int,int)),this,TQ_SLOT(propertyValueChanged(int,int)));
 
 	KviTalVBox * vb = new KviTalVBox(this);
 	vb->setSpacing(4);
 	g->addWidget(vb,0,2);
 
 	m_pAddButton = new TQPushButton(__tr2qs("&New"),vb);
-	connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked()));
+	connect(m_pAddButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addClicked()));
 	m_pAddButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));
 
 	m_pDelButton = new TQPushButton(__tr2qs("&Remove"),vb);
-	connect(m_pDelButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delClicked()));
+	connect(m_pDelButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(delClicked()));
 	m_pDelButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM)));
 
 	KviTalHBox * b = new KviTalHBox(this);
@@ -111,12 +111,12 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(TQWidget * p,KviPointerHa
 	g->addMultiCellWidget(b,2,2,1,2);
 
 	TQPushButton * pb = new TQPushButton(__tr2qs("&OK"),b);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 
 
 	pb = new TQPushButton(__tr2qs("Cancel"),b);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 	pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 
 	g->setRowStretch(1,1);
@@ -255,11 +255,11 @@ KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m)
 	g->addWidget(b,2,1);
 
 	TQPushButton * pb = new TQPushButton(__tr2qs("&OK"),b);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	//pb->setMinimumWidth(120);
 
 	pb = new TQPushButton(__tr2qs("Cancel"),b);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 	//pb->setMinimumWidth(120);
 
 
@@ -346,7 +346,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	g->addMultiCellWidget(l,3,3,0,1);
 
 	m_pMaskListBox = new KviTalListBox(p1);
-	connect(m_pMaskListBox,TQT_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQT_SLOT(maskCurrentChanged(KviTalListBoxItem *)));
+	connect(m_pMaskListBox,TQ_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQ_SLOT(maskCurrentChanged(KviTalListBoxItem *)));
 	m_pMaskListBox->setMinimumSize(300,200);
 
 	g->addMultiCellWidget(m_pMaskListBox,4,4,0,1);
@@ -356,17 +356,17 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	b->setSpacing(4);
 
 	m_pAddMaskButton = new TQPushButton(__tr2qs("&Add..."),b);
-	connect(m_pAddMaskButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addMaskClicked()));
+	connect(m_pAddMaskButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addMaskClicked()));
 	m_pAddMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM)));
 
 	m_pDelMaskButton = new TQPushButton(__tr2qs("Re&move"),b);
 	m_pDelMaskButton->setEnabled(false);
-	connect(m_pDelMaskButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delMaskClicked()));
+	connect(m_pDelMaskButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(delMaskClicked()));
 	m_pDelMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM)));
 
 	m_pEditMaskButton = new TQPushButton(__tr2qs("&Edit"),b);
 	m_pEditMaskButton->setEnabled(false);
-	connect(m_pEditMaskButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editMaskClicked()));
+	connect(m_pEditMaskButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(editMaskClicked()));
 	m_pEditMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EDITITEM)));
 
 	g->setRowStretch(4,1);
@@ -386,7 +386,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	l = new TQLabel(__tr2qs("Notify nicknames:"),p2);
 	l->setEnabled(m_pNotifyCheck->isChecked());
 	g->addWidget(l,1,0);
-	connect(m_pNotifyCheck,TQT_SIGNAL(toggled(bool)),l,TQT_SLOT(setEnabled(bool)));
+	connect(m_pNotifyCheck,TQ_SIGNAL(toggled(bool)),l,TQ_SLOT(setEnabled(bool)));
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pNotifyCheck,__tr2qs("<center>You can enter a space separated list of nicknames.</center>"));
 #endif
@@ -395,7 +395,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	m_pNotifyNick = new TQLineEdit(p2);
 	m_pNotifyNick->setEnabled(false);
 	g->addMultiCellWidget(m_pNotifyNick,1,1,1,2);
-	connect(m_pNotifyCheck,TQT_SIGNAL(toggled(bool)),m_pNotifyNick,TQT_SLOT(setEnabled(bool)));
+	connect(m_pNotifyCheck,TQ_SIGNAL(toggled(bool)),m_pNotifyNick,TQ_SLOT(setEnabled(bool)));
 
 
 	f = new TQFrame(p2);
@@ -429,7 +429,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	g->addWidget(m_pCustomColorSelector,5,2);
 	
 	TQPushButton * pb = new TQPushButton(__tr2qs("All Properties..."),p2);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(editAllPropertiesClicked()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(editAllPropertiesClicked()));
 	g->addWidget(pb,6,2);
 
 	g->setColStretch(1,1);
@@ -444,7 +444,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	m_pIgnoreEnabled = new KviStyledCheckBox(__tr2qs("Enable ignore for this user"),vb);
 
 	TQGroupBox * gb = new TQGroupBox(__tr2qs("Ignore features"),vb);
-	connect(m_pIgnoreEnabled,TQT_SIGNAL(toggled(bool)),gb,TQT_SLOT(setEnabled(bool)));
+	connect(m_pIgnoreEnabled,TQ_SIGNAL(toggled(bool)),gb,TQ_SLOT(setEnabled(bool)));
 	
 	TQVBoxLayout * layout = new TQVBoxLayout(gb,20,3);
 	
@@ -473,8 +473,8 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 
 	setCancelButton(__tr2qs("Cancel"));
 	setOkButton(__tr2qs("&OK"));
-	connect(this,TQT_SIGNAL(applyButtonPressed()),this,TQT_SLOT(okClicked()));
-	connect(this,TQT_SIGNAL(cancelButtonPressed()),this,TQT_SLOT(reject()));
+	connect(this,TQ_SIGNAL(applyButtonPressed()),this,TQ_SLOT(okClicked()));
+	connect(this,TQ_SIGNAL(cancelButtonPressed()),this,TQ_SLOT(reject()));
 
 	if(r)
 	{
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index e0e49a4b..f77a4350 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -95,7 +95,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 
 	if(mask.nick() != "*")m_pEditRealName->setText(mask.nick());
 
-	connect(m_pEditRealName,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(realNameChanged(const TQString &)));
+	connect(m_pEditRealName,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(realNameChanged(const TQString &)));
 
 	// PAGE 2
 
@@ -119,18 +119,18 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
     m_pNicknameEdit1 = new TQLineEdit(m_pPage2);
     m_pNicknameEdit1->setAlignment(TQt::AlignRight);
 	if(mask.nick() != "*")m_pNicknameEdit1->setText(mask.nick());
-	connect(m_pNicknameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
+	connect(m_pNicknameEdit1,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(maskChanged(const TQString &)));
     m_pPage2Layout->addWidget( m_pNicknameEdit1, 1, 0 );
 
     m_pUsernameEdit1 = new TQLineEdit(m_pPage2);
     m_pUsernameEdit1->setAlignment(TQt::AlignHCenter);
 	if(mask.hasUser())m_pUsernameEdit1->setText(mask.user());
-	connect(m_pUsernameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
+	connect(m_pUsernameEdit1,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(maskChanged(const TQString &)));
     m_pPage2Layout->addWidget(m_pUsernameEdit1,1,2);
 
 	m_pHostEdit1 = new TQLineEdit(m_pPage2);
 	if(mask.hasHost())m_pHostEdit1->setText(mask.host());
-	connect(m_pHostEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
+	connect(m_pHostEdit1,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(maskChanged(const TQString &)));
 	m_pPage2Layout->addWidget(m_pHostEdit1,1,4);
 
     m_pNicknameEdit2 = new TQLineEdit(m_pPage2);
@@ -211,7 +211,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
     m_pNotifyCheck = new TQCheckBox(m_pPage4);
     m_pNotifyCheck->setText(__tr2qs("Add this user to the notify list"));
 	m_pNotifyCheck->setChecked(false);
-	connect(m_pNotifyCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(notifyCheckToggled(bool)));
+	connect(m_pNotifyCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(notifyCheckToggled(bool)));
     m_pPage4Layout->addMultiCellWidget(m_pNotifyCheck,2,2,0,1);
 
     m_pNotifyNickLabel1 = new TQLabel(m_pPage4);
@@ -224,11 +224,11 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 
     m_pNotifyNickEdit1 = new TQLineEdit(m_pPage4);
 	if(mask.nick() != "*")m_pNotifyNickEdit1->setText(mask.nick());
-	connect(m_pNotifyNickEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(notifyNickChanged(const TQString &)));
+	connect(m_pNotifyNickEdit1,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(notifyNickChanged(const TQString &)));
     m_pPage4Layout->addWidget(m_pNotifyNickEdit1,3,1);
 
     m_pNotifyNickEdit2 = new TQLineEdit(m_pPage4);
-	connect(m_pNotifyNickEdit2,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(notifyNickChanged(const TQString &)));
+	connect(m_pNotifyNickEdit2,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(notifyNickChanged(const TQString &)));
     m_pPage4Layout->addWidget(m_pNotifyNickEdit2,4,1);
 
 	m_pPage4Layout->setRowStretch(0,1);