Rename obsolete tq methods to standard names

15 files changed, 53 insertions, 53 deletions

diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 4f1dedff..7eab5800 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -70,7 +70,7 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *parent,cons
 	l->setWordWrap(true);
 #endif
 	l->setAlignment(TQt::AlignTop);
-	tqlayout()->addWidget(l,0,0);
+	layout()->addWidget(l,0,0);
 }
 
 KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp
index 43cc13e9..770db332 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/optw_antispam.cpp
@@ -47,7 +47,7 @@ KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * parent)
 
 	reenableStuff(true);
 
-	tqlayout()->setRowStretch(2,1);
+	layout()->setRowStretch(2,1);
 }
 
 KviAntispamOptionsWidget::~KviAntispamOptionsWidget()
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index 57b67a48..e403daec 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -311,7 +311,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * pare
 
 
 	createLayout(3,1);
-	tqlayout()->setMargin(10);
+	layout()->setMargin(10);
 
 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Basic Properties","options"));
 	KviTalHBox * hb = new KviTalHBox(gbox);
@@ -492,7 +492,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent
 : KviOptionsWidget(parent)
 {
 	createLayout(4,1);
-	tqlayout()->setMargin(10);
+	layout()->setMargin(10);
 	
 	m_pLocalAvatar = new KviPixmap(KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar));
 
@@ -540,7 +540,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent
 
 	connect(m_pChooseAvatarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseAvatar()));
 
-	tqlayout()->setRowStretch(1,2);
+	layout()->setRowStretch(1,2);
 }
 
 KviIdentityAvatarOptionsWidget::~KviIdentityAvatarOptionsWidget()
@@ -678,7 +678,7 @@ KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * pa
     
 
 	createLayout(2,1);
-	tqlayout()->setMargin(10);
+	layout()->setMargin(10);
 
 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("User Mode","options"));
 	m_pISelector = addBoolSelector(gbox,__tr2qs_ctx("Invisible (+i)","options"),&m_bI);
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
index c1ad6e84..1153365a 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/optw_input.cpp
@@ -92,7 +92,7 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(TQWidget * parent)
 	}
 
 
-	tqlayout()->setRowStretch(7,1);
+	layout()->setRowStretch(7,1);
 }
 
 KviInputLookOptionsWidget::~KviInputLookOptionsWidget()
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index 1e2c998f..e5d0cd53 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -104,13 +104,13 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget *
 
 	m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground,
 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde));
-	tqlayout()->setRowStretch(6,1);
+	layout()->setRowStretch(6,1);
 	connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
 
 #else //!COMPILE_KDE_SUPPORT
 	m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,4,1,4,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground,
 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-	tqlayout()->setRowStretch(4,1);
+	layout()->setRowStretch(4,1);
 #endif //!COMPILE_KDE_SUPPORT
 	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
 	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
@@ -177,7 +177,7 @@ KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(TQWidget * parent)
 	addColorSelector(0,0,0,0,__tr2qs_ctx("Background","options"),KviOption_colorMdiBackground);
 	addPixmapSelector(0,1,0,1,__tr2qs_ctx("Background Image","options"),KviOption_pixmapMdiBackground);
 
-	tqlayout()->setRowStretch(1,1);
+	layout()->setRowStretch(1,1);
 }
 
 KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget()
@@ -204,7 +204,7 @@ KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(TQWidge
 
 	addPixmapSelector(0,8,0,8,__tr2qs_ctx("Background Image","options"),KviOption_pixmapIrcToolBarAppletBackground);
 
-	tqlayout()->setRowStretch(8,1);
+	layout()->setRowStretch(8,1);
 }
 
 KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget()
diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp
index 4bb80f59..52f7cecb 100644
--- a/src/modules/options/optw_ircview.cpp
+++ b/src/modules/options/optw_ircview.cpp
@@ -98,7 +98,7 @@ KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(TQWidget * parent)
 			m_pVerticalAlign->setCurrentItem(0);
 	}
 	
-	tqlayout()->setRowStretch(2,1);
+	layout()->setRowStretch(2,1);
 }
 
 KviIrcViewLookOptionsWidget::~KviIrcViewLookOptionsWidget()
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index b93081e9..c4fb6943 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -77,72 +77,72 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * parent)
 
 	connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentItemChanged(KviTalListViewItem *)));
 
-	tqlayout()->addMultiCellWidget(m_pListView,0,0,0,2);
+	layout()->addMultiCellWidget(m_pListView,0,0,0,2);
 
 	TQLabel * l = new TQLabel(__tr2qs_ctx("Description:","options"),this);
-	tqlayout()->addWidget(l,1,0);
+	layout()->addWidget(l,1,0);
 	m_pDescription = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pDescription,1,1,1,2);
+	layout()->addMultiCellWidget(m_pDescription,1,1,1,2);
 
 	l = new TQLabel(__tr2qs_ctx("MIME type:","options"),this);
-	tqlayout()->addWidget(l,2,0);
+	layout()->addWidget(l,2,0);
 	m_pIanaType = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pIanaType,2,2,1,2);
+	layout()->addMultiCellWidget(m_pIanaType,2,2,1,2);
 
 	l = new TQLabel(__tr2qs_ctx("File pattern:","options"),this);
-	tqlayout()->addWidget(l,3,0);
+	layout()->addWidget(l,3,0);
 	m_pFileMask = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pFileMask,3,3,1,2);
+	layout()->addMultiCellWidget(m_pFileMask,3,3,1,2);
 
 	l = new TQLabel(__tr2qs_ctx("Magic bytes:","options"),this);
-	tqlayout()->addWidget(l,4,0);
+	layout()->addWidget(l,4,0);
 	m_pMagicBytes = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2);
+	layout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2);
 
 	l = new TQLabel(__tr2qs_ctx("Save path:","options"),this);
-	tqlayout()->addWidget(l,5,0);
+	layout()->addWidget(l,5,0);
 	m_pSavePath = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pSavePath,5,5,1,2);
+	layout()->addMultiCellWidget(m_pSavePath,5,5,1,2);
 
 	l = new TQLabel(__tr2qs_ctx("Local open command:","options"),this);
-	tqlayout()->addWidget(l,6,0);
+	layout()->addWidget(l,6,0);
 	m_pCommandline = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pCommandline,6,6,1,2);
+	layout()->addMultiCellWidget(m_pCommandline,6,6,1,2);
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(m_pCommandline,__tr2qs_ctx("<center>This field contains the command to execute to open a local file.<br>" \
 		"<tt>$0</tt> is used in place of the filename</center>","options"));
 #endif
 
 	l = new TQLabel(__tr2qs_ctx("Remote open command:","options"),this);
-	tqlayout()->addWidget(l,7,0);
+	layout()->addWidget(l,7,0);
 	m_pRemoteExecCommandline = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2);
+	layout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2);
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(m_pRemoteExecCommandline,__tr2qs_ctx("<center>This field contains the command to execute when automatically opening a received file.<br>" \
 		"<tt>$0</tt> is used in place of the filename</center>","options"));
 #endif
 
 	l = new TQLabel(__tr2qs_ctx("Icon","options"),this);
-	tqlayout()->addWidget(l,8,0);
+	layout()->addWidget(l,8,0);
 	m_pIcon = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pIcon,8,8,1,2);
+	layout()->addMultiCellWidget(m_pIcon,8,8,1,2);
 
 	TQFrame * f = new TQFrame(this);
 	f->setFrameStyle(TQFrame::Sunken | TQFrame::HLine);
-	tqlayout()->addMultiCellWidget(f,9,9,0,2);
+	layout()->addMultiCellWidget(f,9,9,0,2);
 
 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&New","options"),this);
 	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(newMediaType()));
-	tqlayout()->addWidget(b,10,1);
+	layout()->addWidget(b,10,1);
 
 	m_pDelete = new TQPushButton(__tr2qs_ctx("Re&move","options"),this);
 	connect(m_pDelete,TQT_SIGNAL(clicked()),this,TQT_SLOT(delMediaType()));
-	tqlayout()->addWidget(m_pDelete,10,2);
+	layout()->addWidget(m_pDelete,10,2);
 	
 
-	tqlayout()->setColStretch(1,1);
-	tqlayout()->setColStretch(2,1);
-	tqlayout()->setRowStretch(0,1);
+	layout()->setColStretch(1,1);
+	layout()->setColStretch(2,1);
+	layout()->setRowStretch(0,1);
 
 	m_pLastItem = 0;
 
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 568499a9..0a8e70b2 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -186,7 +186,7 @@ KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(TQWidget * parent
 
 	addRowSpacer(0,4,3,4);
 	
-	tqlayout()->setRowStretch(4,1);
+	layout()->setRowStretch(4,1);
 }
 
 KviStandardColorsOptionsWidget::~KviStandardColorsOptionsWidget()
@@ -464,8 +464,8 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent)
 		it = new KviMessageListViewItem(m_pListView,i);
 	}
 
-	tqlayout()->setRowStretch(0,1);
-	tqlayout()->setColStretch(0,1);
+	layout()->setRowStretch(0,1);
+	layout()->setColStretch(0,1);
 
 	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(itemChanged(KviTalListViewItem *)));
 	connect(m_pForeListBox,TQT_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQT_SLOT(colorChanged(KviTalListBoxItem *)));
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index 19a7683d..612627f9 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -236,7 +236,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * parent)
 {
 	createLayout(3,3);
 	
-	TQGridLayout * gl = tqlayout();
+	TQGridLayout * gl = layout();
 
 	KviNickServRuleSet * rs = g_pNickServRuleSet;
 	bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false;
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index f5db3256..aa9cedac 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -104,7 +104,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
 
 
 	KviTalGroupBox * gbox = addGroupBox(0,2,1,2,2,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),this);
-	//TQGridLayout * gl = new TQGridLayout(gbox->tqlayout());
+	//TQGridLayout * gl = new TQGridLayout(gbox->layout());
 	//gl->setMargin(2);
 	//gl->setSpacing(4);
 
@@ -147,8 +147,8 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
 
 	fillProxyList();
 
-	tqlayout()->setRowStretch(0,1);
-	tqlayout()->setColStretch(0,1);
+	layout()->setRowStretch(0,1);
+	layout()->setColStretch(0,1);
 
 	m_pContextPopup = new KviTalPopupMenu(this);
 
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 2c26ac52..3706f10c 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -1192,10 +1192,10 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 
 	fillServerList();
 
-	tqlayout()->setRowStretch(0,1);
-	//tqlayout()->setColStretch(1,5);
-	//tqlayout()->setColStretch(2,2);
-	tqlayout()->setColStretch(0,1);
+	layout()->setRowStretch(0,1);
+	//layout()->setColStretch(1,5);
+	//layout()->setColStretch(2,2);
+	layout()->setColStretch(0,1);
 	setMinimumWidth(320);
 }
 
diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp
index 201766cd..0c85ea7e 100644
--- a/src/modules/options/optw_taskbar.cpp
+++ b/src/modules/options/optw_taskbar.cpp
@@ -161,7 +161,7 @@ KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(TQW
 			m_pVerticalAlign->setCurrentItem(0);
 	}
 
-	tqlayout()->setRowStretch(1,1);
+	layout()->setRowStretch(1,1);
 }
 
 
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index 7f861823..bbd2290f 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -160,14 +160,14 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * parent)
 		++it;
 	}
 
-	tqlayout()->addMultiCellWidget(m_pTable,0,0,0,1);
+	layout()->addMultiCellWidget(m_pTable,0,0,0,1);
 
 	m_pAdd = new TQPushButton(__tr2qs_ctx("Add","options"),this);
-	tqlayout()->addWidget(m_pAdd,1,0);
+	layout()->addWidget(m_pAdd,1,0);
 	connect(m_pAdd,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked()));
 
 	m_pDel = new TQPushButton(__tr2qs_ctx("Delete","options"),this);
-	tqlayout()->addWidget(m_pDel,1,1);
+	layout()->addWidget(m_pDel,1,1);
 	connect(m_pDel,TQT_SIGNAL(clicked()),this,TQT_SLOT(delClicked()));
 
 	m_pDel->setEnabled(false);
diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp
index ec076dac..904eeaee 100644
--- a/src/modules/options/optw_topiclabel.cpp
+++ b/src/modules/options/optw_topiclabel.cpp
@@ -33,7 +33,7 @@ KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(TQWidget *p):KviO
 	addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Background color","options"), KviOption_colorLabelBackground);
 	addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image","options"), KviOption_pixmapLabelBackground);
 	
-	tqlayout()->setRowStretch(3, 1);
+	layout()->setRowStretch(3, 1);
 }
 
 KviTopicLabelLookOptionsWidget::~KviTopicLabelLookOptionsWidget()
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index 9785cf22..595db91e 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -178,8 +178,8 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(T
 
 
 
-	//tqlayout()->setColStretch(0,1);
-	tqlayout()->setRowStretch(1,1);
+	//layout()->setColStretch(0,1);
+	layout()->setRowStretch(1,1);
 }
 
 KviUserListLookBackgroundOptionsWidget::~KviUserListLookBackgroundOptionsWidget()