From c6611272c2bc4a42580848946c8c5d81bb0409c7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:57:20 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 805c2821ceaddada48b346c6d11bd0dc1351a539.
---
 src/modules/options/dialog.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/modules/options/dialog.cpp')

diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 8b7242fb..b00eba60 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -32,7 +32,7 @@
 #include "kvi_module.h"
 #include "kvi_styled_controls.h"
 #include "kvi_pointerhashtable.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include "kvi_accel.h"
 #include <tqlabel.h>
 #include "kvi_tal_vbox.h"
@@ -69,8 +69,8 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *parent,cons
 #ifdef COMPILE_USE_QT4
 	l->setWordWrap(true);
 #endif
-	l->setAlignment(TQt::AlignTop);
-	layout()->addWidget(l,0,0);
+	l->tqsetAlignment(TQt::AlignTop);
+	tqlayout()->addWidget(l,0,0);
 }
 
 KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
@@ -179,7 +179,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 					"</td>" \
 				"</tr>" \
 			"</table>"
-		).arg(szDialogTitle).arg(szDialog).arg(szInfoTips).arg(szOkCancelButtons);
+		).tqarg(szDialogTitle).tqarg(szDialog).tqarg(szInfoTips).tqarg(szOkCancelButtons);
 
 	TQString szCaption = szDialogTitle + " - KVIrc";
 	setCaption(szCaption);
@@ -534,10 +534,10 @@ void KviOptionsDialog::fillListView(KviTalListViewItem * p,KviPointerList<KviOpt
 		{
 			if(e->bIsContainer)
 			{
-				// it's a container: add only eventual not contained children (containers or explicitly marked as not contained)
+				// it's a container: add only eventual not contained tqchildren (containers or explicitly marked as not contained)
 				fillListView(it,e->pChildList,szGroup,true);
 			} else {
-				// it's not a container, add any children
+				// it's not a container, add any tqchildren
 				fillListView(it,e->pChildList,szGroup,false);
 			}
 		}
@@ -578,7 +578,7 @@ KviOptionsListViewItem * KviOptionsDialog::findItemByPage(KviOptionsListViewItem
 	if(it->m_pOptionsWidget == pPage)return it;
 
 	KviOptionsListViewItem *i;
-	// run through the children
+	// run through the tqchildren
 	i = (KviOptionsListViewItem *)(it->firstChild());
 	if(i)
 	{
@@ -586,7 +586,7 @@ KviOptionsListViewItem * KviOptionsDialog::findItemByPage(KviOptionsListViewItem
 		if(i)return i;
 	}
 	
-	// not found in the children tree.. look in the next sibling
+	// not found in the tqchildren tree.. look in the next sibling
 	i = (KviOptionsListViewItem *)(it->nextSibling());
 	if(i)
 	{
@@ -647,7 +647,7 @@ void KviOptionsDialog::closeEvent(TQCloseEvent *e)
 
 void KviOptionsDialog::recursiveCommit(KviOptionsListViewItem *it)
 {
-	// First commit the children
+	// First commit the tqchildren
 	if(!it) return;
 	KviOptionsListViewItem *it2 = (KviOptionsListViewItem *)it->firstChild();
 	while(it2)
-- 
cgit v1.2.1