Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 805c2821ceaddada48b346c6d11bd0dc1351a539.

3 files changed, 28 insertions, 28 deletions

diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index e1c17eb6..648fdfb3 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -40,7 +40,7 @@
 #include "kvi_stringconversion.h"
 #include "kvi_options.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #ifdef COMPILE_USE_QT4
 #include <tq3header.h>
@@ -312,7 +312,7 @@ KviRegisteredUsersDialog::~KviRegisteredUsersDialog()
 	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = TQRect(pos().x(),pos().y(),
 			size().width(),size().height());
 #else
-	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = geometry();
+	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = tqgeometry();
 #endif
 
 	g_pRegisteredUsersDialog = 0;
@@ -329,7 +329,7 @@ void KviRegisteredUsersDialog::itemPressed(KviTalListViewItem *it,const TQPoint
 	{
 		KviRegisteredUsersDialogItem *i = (KviRegisteredUsersDialogItem *)it;
 	
-		TQRect r = m_pListView->itemRect(i);
+		TQRect r = m_pListView->tqitemRect(i);
 		int daw = m_pListView->columnWidth(0);
 	
 		TQPoint ppp = m_pListView->mapFromGlobal(pnt);
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index d9caeb43..646261a1 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -41,7 +41,7 @@
 #include "kvi_stringconversion.h"
 #include "kvi_options.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 #ifdef COMPILE_USE_QT4
@@ -217,7 +217,7 @@ KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m)
 	TQGridLayout * g = new TQGridLayout(this,3,2,4,4);
 
 	TQLabel * l = new TQLabel(__tr2qs("Insert a mask for this user.<br>It can contain the wildcard characters '*' and '?'."),this);
-	//l->setAlignment(TQt::AlignCenter);
+	//l->tqsetAlignment(TQt::AlignCenter);
 	g->addMultiCellWidget(l,0,0,0,1);
 
 	KviTalHBox * b = new KviTalHBox(this);
@@ -225,29 +225,29 @@ KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m)
 
 	m_pNickEdit = new TQLineEdit(b);
 	//m_pNickEdit->setMinimumWidth(120);
-	m_pNickEdit->setAlignment(TQt::AlignRight);
+	m_pNickEdit->tqsetAlignment(TQt::AlignRight);
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pNickEdit,__tr2qs("<center>This the <b>nickname</b> that will match this user, default value is the registered name.</center>"));
 #endif
 
 	l = new TQLabel("<center><b>!</b></center>",b);
-	l->setAlignment(TQt::AlignCenter);
+	l->tqsetAlignment(TQt::AlignCenter);
 	//l->setMinimumWidth(40);
 
 	m_pUserEdit = new TQLineEdit(b);
 	//m_pUserEdit->setMinimumWidth(120);
-	m_pUserEdit->setAlignment(TQt::AlignCenter);
+	m_pUserEdit->tqsetAlignment(TQt::AlignCenter);
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pUserEdit,__tr2qs("<center>This the <b>username</b> that will match this user. <b>*</b> will match any username.</center>"));
 #endif
 
 	l = new TQLabel("<center><b>@</b></center>",b);
-	l->setAlignment(TQt::AlignCenter);
+	l->tqsetAlignment(TQt::AlignCenter);
 	//l->setMinimumWidth(40);
 
 	m_pHostEdit = new TQLineEdit(b);
 	//m_pHostEdit->setMinimumWidth(120);
-	m_pHostEdit->setAlignment(TQt::AlignLeft);
+	m_pHostEdit->tqsetAlignment(TQt::AlignLeft);
 #ifdef COMPILE_INFO_TIPS
 	TQToolTip::add(m_pHostEdit,__tr2qs("<center>This the <b>hostname</b> that will match this user. <b>*</b> will match any hostname.</center>"));
 #endif
@@ -460,28 +460,28 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	TQGroupBox * gb = new TQGroupBox(__tr2qs("Ignore features"),vb);
 	connect(m_pIgnoreEnabled,TQT_SIGNAL(toggled(bool)),gb,TQT_SLOT(setEnabled(bool)));
 	
-	TQVBoxLayout * layout = new TQVBoxLayout(gb,20,3);
+	TQVBoxLayout * tqlayout = new TQVBoxLayout(gb,20,3);
 	
 	m_pIgnoreQuery = new KviStyledCheckBox(__tr2qs("Ignore query-messages"),gb);
-	layout->addWidget(m_pIgnoreQuery);
+	tqlayout->addWidget(m_pIgnoreQuery);
 
 	m_pIgnoreChannel = new KviStyledCheckBox(__tr2qs("Ignore channel-messages"),gb);
-	layout->addWidget(m_pIgnoreChannel);
+	tqlayout->addWidget(m_pIgnoreChannel);
 
 	m_pIgnoreNotice = new KviStyledCheckBox(__tr2qs("Ignore notice-messages"),gb);
-	layout->addWidget(m_pIgnoreNotice);
+	tqlayout->addWidget(m_pIgnoreNotice);
 
 	m_pIgnoreCtcp = new KviStyledCheckBox(__tr2qs("Ignore ctcp-messages"),gb);
-	layout->addWidget(m_pIgnoreCtcp);
+	tqlayout->addWidget(m_pIgnoreCtcp);
 
 	m_pIgnoreInvite = new KviStyledCheckBox(__tr2qs("Ignore invites"),gb);
-	layout->addWidget(m_pIgnoreInvite);
+	tqlayout->addWidget(m_pIgnoreInvite);
 
 	m_pIgnoreDcc = new KviStyledCheckBox(__tr2qs("Ignore DCCs"),gb);
-	layout->addWidget(m_pIgnoreDcc);
+	tqlayout->addWidget(m_pIgnoreDcc);
 
 	TQWidget *w = new TQWidget(vb);
-	w->setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored);
+	w->tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored);
 
 	addTab(vb,__tr2qs("Ignore"));
 
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index f720a8b8..e42b3c33 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -40,7 +40,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvariant.h>
 #include <tqframe.h>
 
@@ -91,7 +91,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
     m_pPage1Layout->addWidget(m_pLabel1, 0, 0);
 
     m_pEditRealName = new TQLineEdit(m_pPage1);
-    //m_pEditRealName->setAlignment(int(TQLineEdit::AlignHCenter));
+    //m_pEditRealName->tqsetAlignment(int(TQLineEdit::AlignHCenter));
 
     m_pPage1Layout->addWidget(m_pEditRealName,1,0);
     addPage( m_pPage1,__tr2qs("Step 1: Entry Name"));
@@ -120,13 +120,13 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 	//KviIrcMask masktempl(szMask.ptr());
 
     m_pNicknameEdit1 = new TQLineEdit(m_pPage2);
-    m_pNicknameEdit1->setAlignment(TQt::AlignRight);
+    m_pNicknameEdit1->tqsetAlignment(TQt::AlignRight);
 	if(mask.nick() != "*")m_pNicknameEdit1->setText(mask.nick());
 	connect(m_pNicknameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
     m_pPage2Layout->addWidget( m_pNicknameEdit1, 1, 0 );
 
     m_pUsernameEdit1 = new TQLineEdit(m_pPage2);
-    m_pUsernameEdit1->setAlignment(TQt::AlignHCenter);
+    m_pUsernameEdit1->tqsetAlignment(TQt::AlignHCenter);
 	if(mask.hasUser())m_pUsernameEdit1->setText(mask.user());
 	connect(m_pUsernameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
     m_pPage2Layout->addWidget(m_pUsernameEdit1,1,2);
@@ -137,11 +137,11 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 	m_pPage2Layout->addWidget(m_pHostEdit1,1,4);
 
     m_pNicknameEdit2 = new TQLineEdit(m_pPage2);
-    m_pNicknameEdit2->setAlignment(TQt::AlignRight);
+    m_pNicknameEdit2->tqsetAlignment(TQt::AlignRight);
     m_pPage2Layout->addWidget(m_pNicknameEdit2,2,0);
 
     m_pUsernameEdit2 = new TQLineEdit(m_pPage2);
-    m_pUsernameEdit2->setAlignment(TQt::AlignHCenter);
+    m_pUsernameEdit2->tqsetAlignment(TQt::AlignHCenter);
     m_pPage2Layout->addWidget(m_pUsernameEdit2,2,2);
 
     m_pHostEdit2 = new TQLineEdit(m_pPage2);
@@ -149,22 +149,22 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 
     TextLabel10_2 = new TQLabel(m_pPage2);
     TextLabel10_2->setText("<center><b>!</b></center>");
-    TextLabel10_2->setAlignment(int(TQt::AlignCenter));
+    TextLabel10_2->tqsetAlignment(int(TQt::AlignCenter));
     m_pPage2Layout->addWidget(TextLabel10_2,2,1);
 
     TextLabel10 = new TQLabel(m_pPage2);
     TextLabel10->setText("<center><b>!</b></center>");
-    TextLabel10->setAlignment(int(TQt::AlignCenter));
+    TextLabel10->tqsetAlignment(int(TQt::AlignCenter));
     m_pPage2Layout->addWidget(TextLabel10,1,1);
 
     TextLabel10_3 = new TQLabel(m_pPage2);
     TextLabel10_3->setText("<center><b>@</b></center>");
-    TextLabel10_3->setAlignment(int(TQt::AlignCenter));
+    TextLabel10_3->tqsetAlignment(int(TQt::AlignCenter));
     m_pPage2Layout->addWidget(TextLabel10_3,1,3);
 
     TextLabel10_3_2 = new TQLabel(m_pPage2);
     TextLabel10_3_2->setText("<center><b>@</b></center>");
-    TextLabel10_3_2->setAlignment(int(TQt::AlignCenter));
+    TextLabel10_3_2->tqsetAlignment(int(TQt::AlignCenter));
     m_pPage2Layout->addWidget(TextLabel10_3_2,2,3);
 
     addPage(m_pPage2,__tr2qs("Step 2: Mask Selection"));